Fix double declare (for gcc-4.7) in bug 424099

Package-Manager: portage-2.1.11.3/cvs/Linux x86_64

4 files changed, 29 insertions, 11 deletions

diff --git a/sci-mathematics/gfan/ChangeLog b/sci-mathematics/gfan/ChangeLog
index 202795250738..6a2e3e9fab6e 100644
--- a/sci-mathematics/gfan/ChangeLog
+++ b/sci-mathematics/gfan/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/gfan
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gfan/ChangeLog,v 1.9 2011/12/14 09:00:45 phajdan.jr Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gfan/ChangeLog,v 1.10 2012/06/30 02:06:45 tomka Exp $
+
+  30 Jun 2012; Thomas Kahle <tomka@gentoo.org> gfan-0.5.ebuild,
+  +files/gfan-0.5-double-declare-fix.patch:
+  Fix double declare (for gcc-4.7) in bug 424099
 
   14 Dec 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> gfan-0.5.ebuild:
   x86 stable wrt bug #393785
diff --git a/sci-mathematics/gfan/Manifest b/sci-mathematics/gfan/Manifest
index 624e3eebf0c2..e9f746d7554c 100644
--- a/sci-mathematics/gfan/Manifest
+++ b/sci-mathematics/gfan/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX gfan-0.4-fix-polynomial.patch 449 RMD160 582a3e6555a9def0b10104e40ddba31920135fb0 SHA1 b4237acc4225c17e54abdafaa164c91c69bd9d9e SHA256 28026edf2bd35e0f518a263c4a9466a007bce0d17d28d6e4cc14ac423cb94753
 AUX gfan-0.4-gcc45.patch 265 RMD160 234c52f93317b04534bd8250aad98c3c2ae1c050 SHA1 23d86ce705c16245cf8d314b1a582286d0ba1f2d SHA256 0840ea5682218dca6441b00cfa86bd4d20631c0faab488997a48a8253ede22e0
+AUX gfan-0.5-double-declare-fix.patch 470 RMD160 ead0037e343f1fe704f3b3d88655e220c82db5b7 SHA1 d4c9a6fd2f58db18803d69a0c548d4b3d675f601 SHA256 3dbd642c4bfb349b89d85ff1eb366b58e9895233c92e4580ba98dfab8a3dca66
 DIST gfan0.4plus.tar.gz 748514 RMD160 d8a1f235878c7d207e26c00e9097dfea548540e7 SHA1 e8e3f2c2f730c88d0c556f5b0fdf3a99b66b9bac SHA256 bdc4f608df6bda56fdb1bf253fba8e9d9c98dec6915a80a1da9d9ee4210cfff3
 DIST gfan0.5.tar.gz 1134987 RMD160 be0084e82832db02a65e3bff93b823f56c6aa902 SHA1 ea795044e057dafc9eca7bf56b8f44a2c7f3686e SHA256 d7307c8979220adc0a7ce5acf472178a6c280c963967df6241392ed9954cc1fb
 EBUILD gfan-0.4-r1.ebuild 1073 RMD160 1a9f1cc430a8e241f33917b6d83456219467ac76 SHA1 5dcc6478676d42ad2c583c317f4727919e4661d0 SHA256 7ac983cbe3ff318dff574f56b02e52ef8e0eea6ead66772ae294586154603f4a
-EBUILD gfan-0.5.ebuild 866 RMD160 1bd36882ea8c2c5543a532e6ef3cab79b17c2901 SHA1 edb130587f0d2a0e3ab2caf5ca8c9556e81d0029 SHA256 cf62bce70348742f176f6c5f7881b9a0f4136b775a76d58029e34bd147db9ecb
-MISC ChangeLog 1418 RMD160 ff6060897869c1afea1163d6e771f9f9a4dea86c SHA1 f111313845dbd0153707fce1012a7e4889e0c11a SHA256 a7efea6e7cdf22ad5ba738abd1ea91eea282949a8f8fd2fddfffbf05babc34d6
+EBUILD gfan-0.5.ebuild 913 RMD160 6a102ec16709ade9f139f6b1624486438ef6c670 SHA1 af94a0b4a62be4e49116567387c5c4611acf134a SHA256 439552446f4c5740f43a86502bd3e5d126b606d884aca846fd288a267d760ff0
+MISC ChangeLog 1572 RMD160 ab4aa7ae78007aa75e0caa26e4b98e59dbc6ec8a SHA1 88144d27bc4e8bf812a4521e89c0975519d80043 SHA256 5fab6c03811af82d12b57da5ff8570bf0938be0c58abfaec9b06517f4f751aca
 MISC metadata.xml 388 RMD160 873d560bf87a33c6a7714cad17aaca8b709580a2 SHA1 b6ae58d5e3dddf212cedd4a8ad7abd4e7da5eb50 SHA256 25dda739fd01dd8f3510b4f5757e07a46f3f21245d4e9e043a343522e7177e37
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAk7oZcgACgkQuUQtlDBCeQJuHgCdERvbO99uDbUQkp9+Wl3hOWEg
-BGkAoIeQa/Zi4rEVcYBKc1eYD19fpwnH
-=Pd1O
+iF4EAREIAAYFAk/uXzwACgkQid6yGVZcMrx6HQD+OE+OibtLdEVKSmQyekucrlQB
+ExrnjUnYm4o/41Muy/YA/jilFzMog0kJVGnsH33kPXAri5uMzZbhUsroPcb4reN8
+=19u9
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/gfan/files/gfan-0.5-double-declare-fix.patch b/sci-mathematics/gfan/files/gfan-0.5-double-declare-fix.patch
new file mode 100644
index 000000000000..239540884011
--- /dev/null
+++ b/sci-mathematics/gfan/files/gfan-0.5-double-declare-fix.patch
@@ -0,0 +1,12 @@
+diff -U 3 -dHrN gfan0.5/app_minkowski.cpp gfan0.5-new/app_minkowski.cpp
+--- gfan0.5/app_minkowski.cpp	2011-01-23 12:21:47.000000000 -0500
++++ gfan0.5-new/app_minkowski.cpp	2012-06-29 15:23:48.604280985 -0400
+@@ -160,7 +160,7 @@
+ 	    //log0 fprintf(Stderr,"4");
+ 	    f.insert(c);
+ 	    //log0 fprintf(Stderr,"5\n");
+-	    static int i;
++	    //	    static int i;
+ 	    //log0 fprintf(Stderr,"inserted:%i\n",++i);
+ 	  }
+ 	log1 fprintf(Stderr,"Resolving symmetries.\n");
diff --git a/sci-mathematics/gfan/gfan-0.5.ebuild b/sci-mathematics/gfan/gfan-0.5.ebuild
index dd9a24914c35..4f1ed07d1241 100644
--- a/sci-mathematics/gfan/gfan-0.5.ebuild
+++ b/sci-mathematics/gfan/gfan-0.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gfan/gfan-0.5.ebuild,v 1.6 2011/12/14 09:00:45 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/gfan/gfan-0.5.ebuild,v 1.7 2012/06/30 02:06:45 tomka Exp $
 
 EAPI="3"
 
@@ -22,6 +22,7 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/${PN}${PV}/"
 
 src_prepare () {
+	epatch "${FILESDIR}/${P}-double-declare-fix.patch"
 	sed -i -e "s/-O2/${CXXFLAGS}/" \
 		-e "/GPROFFLAG =/d" \
 		-e "s/g++/$(tc-getCXX)/" \