sci-biology/maqview: Fix compilation with gcc-4.7, #451438

Package-Manager: portage-2.2.0_alpha159/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

5 files changed, 75 insertions, 19 deletions

diff --git a/sci-biology/maqview/ChangeLog b/sci-biology/maqview/ChangeLog
index 992e25e9600a..128aeb6b2483 100644
--- a/sci-biology/maqview/ChangeLog
+++ b/sci-biology/maqview/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-biology/maqview
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/maqview/ChangeLog,v 1.6 2011/05/11 19:19:47 angelos Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/maqview/ChangeLog,v 1.7 2013/01/23 12:15:56 jlec Exp $
+
+*maqview-0.2.5-r2 (23 Jan 2013)
+
+  23 Jan 2013; Justin Lecher <jlec@gentoo.org> +maqview-0.2.5-r2.ebuild,
+  +files/maqview-0.2.5-gcc4.7.patch, metadata.xml:
+  Fix compilation with gcc-4.7, #451438
 
   11 May 2011; Christoph Mende <angelos@gentoo.org> maqview-0.2.5-r1.ebuild:
   Stable on amd64 wrt bug #298094
diff --git a/sci-biology/maqview/Manifest b/sci-biology/maqview/Manifest
index 0ea7f28d621c..afa868042f88 100644
--- a/sci-biology/maqview/Manifest
+++ b/sci-biology/maqview/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-AUX 0.2.5-ldflags.patch 1335 RMD160 16ec62f6fbeb18d04faa2007a6f27c6b8c8ba522 SHA1 c93cf468e7832363935370234a3f55273583e2f2 SHA256 0876b98428f7964be91fb27f853458ba557ca8bf7eb313e416ece5a869a31efe
-AUX 0.2.5-zlib.patch 1437 RMD160 5899b4a88ac3abd81d301ff7225ef99ab013ff07 SHA1 8360080bba3ee73f2874f4a378ce3e568c14edc5 SHA256 0952ca78e6ec4474063e2049294f432abe28890e76923fdb69b262a8a0b73d26
-DIST maqview-0.2.5.tar.gz 383410 RMD160 4fbc58f8e015dbe712f2dce4ec074c85b95ebed1 SHA1 567e867d23c3a0855a989a17f1a59814eafef329 SHA256 156794f114a00bb455a47ccefa50782441dc1b9668b6e7439ce0674060c085cb
-EBUILD maqview-0.2.5-r1.ebuild 691 RMD160 b1057b21730ab4a14862be332a147115dd000a2a SHA1 33249c94c606e713c695f51de564881283cbb88a SHA256 0ae5250e91ef64c85dd5dd4c4874f1ff564f5b79cdf6e2e0fc23bfb44cb62edc
-EBUILD maqview-0.2.5.ebuild 693 RMD160 4469f2865c8ce58827583d8b7a739bdd7335a809 SHA1 56b04fb8e9e7c199fd496de030950455c4d19896 SHA256 3ea751f1768b69499e959f239996956c8e36bc2c3023a670053a7b5256a7d38a
-MISC ChangeLog 1070 RMD160 75b5ab806696b972a9f88840545ad2602698a55e SHA1 aa1996613f93834aa383b5414386a3d166489e46 SHA256 1011090ab18973a0570bea13dfef161074aafa5576f0d20e0ef07f3dabc6eca3
-MISC metadata.xml 259 RMD160 d9d81b67d635fabd81aef8ae0edf971211ae9072 SHA1 8e32f751c67ff891fa35405a2cf6fb33752d6eb1 SHA256 541c3fbcf299d9a8ccf4132ee61f9e53a5d737cefdaa6fdc77764d8d4c7f3110
+AUX 0.2.5-ldflags.patch 1335 SHA256 0876b98428f7964be91fb27f853458ba557ca8bf7eb313e416ece5a869a31efe SHA512 ae034ae1279e49c71f9daf658aece35063c56afc7ac3269d21d21a2f5b6f8e7974be48c82b52f4d250a9dcacfd5e8c9208b40c904ff73af8592c7f39395c6b6e WHIRLPOOL 8b4530a4220b8cd70fd1c33bb6dd19e6cecf8e9c434d9ca55df5e956b19ffa03f8ee7385ae369b6e7e291ddcab5e6d4ca6663744573aaad1080201314001a400
+AUX 0.2.5-zlib.patch 1437 SHA256 0952ca78e6ec4474063e2049294f432abe28890e76923fdb69b262a8a0b73d26 SHA512 7925f70d1f68bfa4fa87134d8ef20b05a6f022b1a9478a8e594e7b655852d858c0928b101f7eafd4e1ef44a17f8d353d49a6d1ede4072ac85ec452f75bd06c03 WHIRLPOOL 4b5fffeae840e49d372c3e8399da7cef708fbd6fbe45e2f5074751a37bdf0b66bb299c33ea2cc61b20abbe55e108b14f9d3bfc640c4aa89af3b0520dd34f606b
+AUX maqview-0.2.5-gcc4.7.patch 575 SHA256 c5474002f6624d688fce6fea700334d09971987720a11321363631217c87e20e SHA512 277086e1d6d536ae368083032421029d64d5173e643edaafbad2833d56e8ec283152a49d9874a7142333e0fee976d3600ed118b6beb0482ec7e0e95f4a36fba4 WHIRLPOOL dfbbaf4cfe1f85b8aaa0a7517cbe62f3df861e3ccc8c64a45b865270b50091eb9b41d9c1cfb8286e736817b62a9f21358a58ff0413eaae5a4c04a6bccae41163
+DIST maqview-0.2.5.tar.gz 383410 SHA256 156794f114a00bb455a47ccefa50782441dc1b9668b6e7439ce0674060c085cb SHA512 40bed0a1005ca96fdb12773cd9c22ddc926fe722c64652031609a17a50ff725a3dc117d51f4f27eda68b48861da78427469aaedff744f29921236b486396aed6 WHIRLPOOL 0ba5a15a1317b4bb78458b9e282348983be9e2c30980aef4e35a9f5dacfff57226eaa4403fb0b9d9d448ba033409d548db224ed544ad365226a8fb59be8b743e
+EBUILD maqview-0.2.5-r1.ebuild 691 SHA256 0ae5250e91ef64c85dd5dd4c4874f1ff564f5b79cdf6e2e0fc23bfb44cb62edc SHA512 a83a9f0a4e9a02e3776efddea8f02c00e6ef5c3328041f002c953d4ee3049e940f553827d7d370692d7e34be3285c79802280d1575077c472486cc7ef01f6746 WHIRLPOOL e24827cb9f3065103292b27aec05410aecca2325188a4c5b331c8e279155689df571cf178a5aac31edbdc401242aa9013c030394e915db3864b78ba5b4594e51
+EBUILD maqview-0.2.5-r2.ebuild 717 SHA256 26a2a31b68d4a64e1af61fbcd097008cbedcacede4a9668d1b17b3dcce0c395a SHA512 ac4313090b000c4c75dc08166546e2d741a3a43340a3dba7c7177c46d533882ec1a52ed3f240bf7ab21f7ca4db9e019fe00ebc989d754e1e248ff22096e5e31f WHIRLPOOL f2b85e96749553286948c1ab710bc091966e1750caa2838c2711c625e0cd4278228e743aacfaceea20dcae17ae1ee16f2552a41890b7aa60241ef2d1477052ad
+EBUILD maqview-0.2.5.ebuild 693 SHA256 3ea751f1768b69499e959f239996956c8e36bc2c3023a670053a7b5256a7d38a SHA512 09c0c78f54408afd57124528143051778b3ce50cc90ba59c8eb74c22bace43100452ece52646c16be1a57e3a85165ea1fbc2a4c53457281aaaaa628d627851bb WHIRLPOOL 557063bc3af8e4ae82d7cadd6d3951592209e00e7a53d37f339d97664aeb88690410ceb9ddd81aed86424481c3d506c2ee9094c047a7191fc3b4052cc465ea5f
+MISC ChangeLog 1265 SHA256 60fd138932856c92a9e0e2b2d2b848870cef891d5837902f656d7500a6792083 SHA512 f8e106b5f2f7ee77dfea65212b833c0cf1ddd1b0661a253476956244a02bb38ba1daf02a37e34be18db6c16c583825e27db7bb658cd3b75fc14178646c82a202 WHIRLPOOL b510da3fb1ccb2f8e60f9a4149f5e45f2fae451b46744e38bbd4431a47aaff54319c374c48a6e152b5fe312fe2358d23ff5b285e91bfa278a6b758c97167cfbd
+MISC metadata.xml 266 SHA256 98c7d1da8a728a1f1d796a79d51f25e4164e24048ec1aacbbf0ae2ffb171ff35 SHA512 879cdcca092d4c82b8c63672c91e08e7b01e81419d2c7c7b766de96ba2a32dd1e21c18968ed7172eec8604f52c92b19a31773f428bce9461d9b8190384680194 WHIRLPOOL 0f46288ab7090ad3da5b31816792427e4ad1a950e39a503bb406ebe8789cffedd9c85b46bfbf040fffb8aad443f512c28716a0a6436d0c06309155277060cdcd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk3K4VgACgkQmWq1bYTyC0PnzQD/TnSGA2PjixzgbSlWm+9aPIgv
-4aAFWSdXLDLWy5HSg8YBAKI2Wql5jbRuwmzxbwoIHaCDZ+0oCI7wokjtOaEi7iTo
-=JHOp
+iEYEAREKAAYFAlD/1H0ACgkQgAnW8HDreRbeCwCfWjAcyizx/qTMbN8fZUPoH9hJ
+dvEAn1fWfjRdrYa1YhlHkTy/ucA15RjS
+=bG8X
 -----END PGP SIGNATURE-----
diff --git a/sci-biology/maqview/files/maqview-0.2.5-gcc4.7.patch b/sci-biology/maqview/files/maqview-0.2.5-gcc4.7.patch
new file mode 100644
index 000000000000..043208bb79b5
--- /dev/null
+++ b/sci-biology/maqview/files/maqview-0.2.5-gcc4.7.patch
@@ -0,0 +1,16 @@
+ stdhash.hh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/stdhash.hh b/stdhash.hh
+index eaf98af..f22c5a6 100644
+--- a/stdhash.hh
++++ b/stdhash.hh
+@@ -493,7 +493,7 @@ public:
+ 	inline bool insert(const keytype_t &key, const valtype_t &val) {
+ 		rehash();
+ 		hashint_t i;
+-		int ret = direct_insert_aux(key, this->n_capacity, this->keys, this->flags, &i);
++		int ret = this->direct_insert_aux(key, this->n_capacity, this->keys, this->flags, &i);
+ 		vals[i] = val;
+ 		if (ret == 0) return true;
+ 		if (ret == 1) { ++(this->n_size); ++(this->n_occupied); }
diff --git a/sci-biology/maqview/maqview-0.2.5-r2.ebuild b/sci-biology/maqview/maqview-0.2.5-r2.ebuild
new file mode 100644
index 000000000000..9b2f707e508b
--- /dev/null
+++ b/sci-biology/maqview/maqview-0.2.5-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/maqview/maqview-0.2.5-r2.ebuild,v 1.1 2013/01/23 12:15:56 jlec Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils
+
+DESCRIPTION="GUI for sci-biology/maq, a short read mapping assembler"
+HOMEPAGE="http://maq.sourceforge.net/"
+SRC_URI="mirror://sourceforge/maq/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	media-libs/freeglut
+	sys-libs/zlib"
+RDEPEND="${DEPEND}
+	sci-biology/maq"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-ldflags.patch
+	"${FILESDIR}"/${PV}-zlib.patch
+	"${FILESDIR}"/${P}-gcc4.7.patch
+	)
diff --git a/sci-biology/maqview/metadata.xml b/sci-biology/maqview/metadata.xml
index 3302123e5718..fc7c76942a10 100644
--- a/sci-biology/maqview/metadata.xml
+++ b/sci-biology/maqview/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>weaver@gentoo.org</email>
-		<name>Andrey Kislyuk</name>
-	</maintainer>
-	<herd>sci-biology</herd>
+  <maintainer>
+    <email>weaver@gentoo.org</email>
+    <name>Andrey Kislyuk</name>
+  </maintainer>
+  <herd>sci-biology</herd>
 </pkgmetadata>