Fixed linear solving with gcc-4.7, bug #423617

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

4 files changed, 33 insertions, 8 deletions

diff --git a/sci-mathematics/pari/ChangeLog b/sci-mathematics/pari/ChangeLog
index f7bcb8286e3f..2f23e8526fe1 100644
--- a/sci-mathematics/pari/ChangeLog
+++ b/sci-mathematics/pari/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/pari
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/ChangeLog,v 1.87 2012/03/06 17:06:06 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/ChangeLog,v 1.88 2012/06/28 04:57:27 bicatali Exp $
+
+  28 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/pari-2.5.1-gcc47.patch, pari-2.5.1.ebuild:
+  Fixed linear solving with gcc-4.7, bug #423617
 
 *pari-2.5.1 (06 Mar 2012)
 
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index 7d6b6b88497b..58841edbfad5 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -8,6 +8,7 @@ AUX pari-2.3.5-doc-make.patch 1358 RMD160 3ce51d8a71d75902c79c1c24c4e65f6b20b73c
 AUX pari-2.5.0-doc-make.patch 2280 RMD160 7db274a387b81a57620329b6dc117eee990ce648 SHA1 25f001a0e0552f97f20ad56ba158f995c5a72df2 SHA256 e28a0c8db09f02c30499f606fafa9ebaa5e09bbc25dd87f1ff9ba6cf316b5338
 AUX pari-2.5.0-macos.patch 827 RMD160 f1e25cc609f509952373221bcb0a349787b1e498 SHA1 81c0b4fbf4cea073d16219944d3622dc8094dc71 SHA256 0ababf5c7c182b8f8fb46d35f2064a517d5487811e77743b7f64d12c075ed6ac
 AUX pari-2.5.0-mp.c.patch 673 RMD160 552aba40307a314b14d0623c4b042c36f60d9931 SHA1 29c78c99e666e58917e9a31ca6376280d7f7a7e7 SHA256 78db2dcf22cd8f6231926402b69e6b29683fed46c06468d661e6d94d39e07fa8
+AUX pari-2.5.1-gcc47.patch 609 RMD160 e94a057a4bc4af47dd6ae1bd04b89c9ffe4eed68 SHA1 b78dce0bfd73d2fba3b10b73d340a059d33c9f6e SHA256 f450cf7a7642f08abdb59a9c2ec206371cd29b4da771563c323dd756de300294
 DIST elldata.tgz 14185595 RMD160 ddac2454fc65b7f5ddfbf1d39d96a3e51b8eef5c SHA1 f9705a2a11f1622ebcc4e6b8f3780af8a178da9e SHA256 4102c23fdbeadc89b47ba31d05fc58cd3c3e0cca216b11ec5c3be1330d4a5218
 DIST galdata.tgz 53229 RMD160 488afbddf7026dd6d0c9ebbed72cb14c8c37173e SHA1 0fe78ed49e197066708a3fc3753b2651107a1264 SHA256 b7c1650099b24a20bdade47a85a928351c586287f0d4c73933313873e63290dd
 DIST nftables.tgz 8393731 RMD160 48a9c48246f91c1983712682937d666ba1ae6458 SHA1 90df66222346b0dbca68925671a374f5e286daeb SHA256 8dd3393ce6b3cfcf599f094f7b22bdffe17c3ba25deb912513d54676bd7cfe92
@@ -19,13 +20,13 @@ DIST seadata.tgz 19214199 RMD160 e88637426f74c5223068fc2d916741c10d8279e4 SHA1 f
 EBUILD pari-2.3.4-r1.ebuild 4223 RMD160 86b57d4c795fa2eea90363da83828aec98cd96fd SHA1 94eac2f9c2d3c6f20c1a1b0c5ba2e51da813250d SHA256 9e4257bd9ddb0a0a564f234cf36246ec115b63d61279a26d6fe329fbd23fd2be
 EBUILD pari-2.3.5.ebuild 4487 RMD160 98c55182f27da23196285a2b7defbf738b54015c SHA1 18b42289a75d7d71af3539a69e23b733a6e08780 SHA256 4496e8b1f23ebd02ea28655618e73f8755ea28a93515dd025cb8f5968e2878bc
 EBUILD pari-2.5.0-r3.ebuild 4025 RMD160 7a8a65657caabfb76132c8a16542aca9b7b4e992 SHA1 b980265f507a1512a72a6dc8aaba33c50bb188b1 SHA256 f1a7aab704a92ee750695e9537e87d1ba1c53eee9f462adc812350d88e193feb
-EBUILD pari-2.5.1.ebuild 4022 RMD160 0ab3ab0c7dfabbf4cee8e97c9eb8f074aa75fdfe SHA1 8b34585d30147e146e7f63fa1782350dee7ed41d SHA256 2ab7afc52c291d0d167dfd147af5237d571634d9e7aac46df3431761635198b0
-MISC ChangeLog 16253 RMD160 c4018a234a97fe0088c76107f0f39c00e4cca346 SHA1 cc09c6eb63f19cacb9f3252fc800c6539d7402f1 SHA256 536967a89fcf9155b002d9f2b0c4ff49bbdb233e2b2341e215da0278cee6e668
+EBUILD pari-2.5.1.ebuild 4101 RMD160 0f44945fdbcdc3868347e12cb7e603b450dffa31 SHA1 cff3bd7c86ce5a5a26718b8c2fc7503895f8b513 SHA256 3b2150622d9a25872dcb2ce5b8fbd2f0ad91be17f5a3698d48604331cc18b4f9
+MISC ChangeLog 16410 RMD160 27beeb8dbaec4ce7c278e03ad19ab67ee6e49353 SHA1 d2e744b52aabe193f453a2b47500ce777a6f871c SHA256 304945954371ad0350d977d42f5456bc5a9ea16f2f34ca9c2d3515c2d4189f18
 MISC metadata.xml 1110 RMD160 9f77b92fc473dc18364cda6049ae65c01656d14d SHA1 643003b3881bb599e57c8346073b2c4dc185ee15 SHA256 6efe59c37d2ff1b960324b5f0736e25ce2a8b3e9dc67d9b5482a9d808ba44d0b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk9WRAYACgkQ1ycZbhPLE2A7SgCeIjJbryP9wDoozzf+qeVUdCA3
-V+0An0IdKJxprcHOZ83G19zD8p2iWkeH
-=sa9u
+iEYEARECAAYFAk/r5EAACgkQ1ycZbhPLE2BcHACcCAvuLDO/TFz9sezZ/JgdHQ0e
+X5wAnjzuX6IyTaNd4LoH0VmVm35pDpdu
+=zFaD
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/pari/files/pari-2.5.1-gcc47.patch b/sci-mathematics/pari/files/pari-2.5.1-gcc47.patch
new file mode 100644
index 000000000000..e7b27159fa06
--- /dev/null
+++ b/sci-mathematics/pari/files/pari-2.5.1-gcc47.patch
@@ -0,0 +1,18 @@
+Index: pari-2.5.1/src/basemath/bibli2.c
+===================================================================
+--- pari-2.5.1.orig/src/basemath/bibli2.c	2012-01-26 17:26:13.000000000 +0100
++++ pari-2.5.1/src/basemath/bibli2.c	2012-06-04 10:08:41.000000000 +0200
+@@ -1394,12 +1394,12 @@
+   int (*CMP)(void*,GEN,GEN);
+   int (*cmp)(GEN,GEN) = (flag & cmp_LEX)? &lexcmp: &gcmp;
+   void *E;
++  struct veccmp_s v;
+ 
+   if (flag < 0 || flag > (cmp_REV|cmp_LEX|cmp_IND|cmp_UNIQ))
+     pari_err(flagerr,"vecsort");
+   if (k) {
+     long i, j, l, lk, tx, lx;
+-    struct veccmp_s v;
+     GEN y;
+ 
+     /* cf init_sort */
diff --git a/sci-mathematics/pari/pari-2.5.1.ebuild b/sci-mathematics/pari/pari-2.5.1.ebuild
index 3cd3ed374b5d..b3f62ff4dc68 100644
--- a/sci-mathematics/pari/pari-2.5.1.ebuild
+++ b/sci-mathematics/pari/pari-2.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/pari-2.5.1.ebuild,v 1.1 2012/03/06 17:06:06 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari/pari-2.5.1.ebuild,v 1.2 2012/06/28 04:57:27 bicatali Exp $
 
 EAPI="4"
 
@@ -43,6 +43,8 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}"-2.5.0-mp.c.patch
 	# OS X: add -install_name to the linker option
 	epatch "${FILESDIR}/${PN}"-2.5.0-macos.patch
+	# from debian, fies bug #423617
+	epatch "${FILESDIR}/${PN}"-2.5.1-gcc47.patch
 
 	# disable default building of docs during install
 	sed -i \