Add test fix from upstream.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 56 insertions, 4 deletions

diff --git a/dev-libs/gmp/ChangeLog b/dev-libs/gmp/ChangeLog
index 62ab174bef23..0c5afda264aa 100644
--- a/dev-libs/gmp/ChangeLog
+++ b/dev-libs/gmp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/gmp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.136 2010/07/27 02:33:18 zorry Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.137 2010/08/30 17:58:19 vapier Exp $
+
+  30 Aug 2010; Mike Frysinger <vapier@gentoo.org> gmp-5.0.1.ebuild,
+  +files/gmp-5.0.1-perfpow-test.patch:
+  Add test fix from upstream.
 
   27 Jul 2010; Magnus Granberg <zorry@gentoo.org> gmp-5.0.1.ebuild,
   +files/gmp-5.0.1-x86-nopie-tests.patch:
diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index 437563a8eb58..bfe1f14cb513 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -1,11 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX gmp-4.1.4-noexecstack.patch 474 RMD160 22aa94eded1650432202b93a79900be1c85a779b SHA1 fd7ca0feb59aa319ba30bdbc71b7796a0a457d76 SHA256 68601777151a1628d7bc839eddd037685c5d2e76c9453166890a5eb3cf6000c3
 AUX gmp-4.2.1-s390.diff 1848 RMD160 04eecb2aaae4c444841e40b33abd38a662254632 SHA1 38ba90ffd6cd9d66e07c5f71b4608e3ad9d32a6b SHA256 13c6b01e71534af2c353d79b7afd171f158b8fa6e3299e0f7c0335e516ce67ec
 AUX gmp-4.3.2-ABI-multilib.patch 8883 RMD160 e6a41f288643af4a518ecc19ca5b04eb7f59a8a6 SHA1 4bb36169fd5d0e768b91a92194c6937680ab4b84 SHA256 772c003810d5f8073e6c2b6fea4ba7dfe38d7f7b14c25995be7d1ee7f45ab59f
 AUX gmp-5.0.0-s390.diff 1839 RMD160 2b83f296906a7a15add19b126f73059571b8880e SHA1 f5ca3a792c89384d3e7dd5ff36041b5d679ed76f SHA256 e4ca88304a072ad29387ad7893efc28ee2ce600dfe020f35f80e939c83c31b0c
+AUX gmp-5.0.1-perfpow-test.patch 1071 RMD160 1af4778602a55cda15763687329348c5ebd6f2fb SHA1 3f3ecf0b97d6b70e36bd0179f45b436e7c41d7e5 SHA256 a2fec6646f36d49dbeda9a520d682a26e560d1c3a5f78f3537d1889a71eb8e1f
 AUX gmp-5.0.1-x86-nopie-tests.patch 3798 RMD160 2086849c394e35753ca84a464ac9e0c32165fd23 SHA1 97a0ce472b36754ecdd5416bd7c5a2aad4766087 SHA256 3f108ece1cf1f18afd8a36f2b9f03eeb32afa9c4937c707bce840bd62824a61a
 DIST gmp-4.3.2.tar.bz2 1897483 RMD160 a8f3f41501ece290c348aeb4444bbea40bc53e71 SHA1 c011e8feaf1bb89158bd55eaabd7ef8fdd101a2c SHA256 936162c0312886c21581002b79932829aa048cfaf9937c6265aeaa14f1cd1775
 DIST gmp-5.0.1.tar.bz2 2006109 RMD160 3e89ebf5294639e1c926b92d9786bbdd0c8fa587 SHA1 6340edc7ceb95f9015a758c7c0d196eb0f441d49 SHA256 a2a610f01fd3298dc08c87bf30498c2402590e1bcb227fc40b15ee6d280939fb
 EBUILD gmp-4.3.2.ebuild 2077 RMD160 d18d5f9dbd088734180ab6850640c077d4b5117d SHA1 f28f05c8e4468cfa4168c87e5aa8f83fe8be90b0 SHA256 d720ce4ada3dbfac3090661f531ede2c32e5396cc8dc7bbbaee4d06d6a43b56e
-EBUILD gmp-5.0.1.ebuild 2509 RMD160 4b00c0d4f22d728248a56890174391cc2d7f051f SHA1 305be2e7ee82e3e9cb0010bf531be14bc23291ac SHA256 da0291b89ce1fb7ba3e303efc1215af4945f59fd98b600a1f4005d5dba8a15a5
-MISC ChangeLog 18160 RMD160 7683f512ab8169bccbe4a016768658a6130dfed8 SHA1 590e2e255e176fed8469dc1e972c60bfde88ab60 SHA256 36cadacf08b77d68831f0a789aef86b1bdddbb3f3c6c9e1c815b4111ca58abdc
+EBUILD gmp-5.0.1.ebuild 2556 RMD160 5c738543c473fadb3b3773ae1b7502c55c8a95bd SHA1 1da0bfb8e9f2b6936b9ce6db51dcfe2f778c46d6 SHA256 82ebc5c6f6f0e610f5a04d61586ec3a3fac7bbbdd302daeebe8e62094d3d4aa5
+MISC ChangeLog 18299 RMD160 640a9e64ae5190936410b6d5cb0bc7bc2561cae7 SHA1 2fe21989ac7c7b5d29d4c05d5e3bdb86a800ef8e SHA256 97871fbb489885efb60007f0d5287030130256585b91bd5c9bb033d0aa5af781
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iF4EAREIAAYFAkx78RwACgkQTwhj9JtAlp4u+QEAsWxKALKkG+TMJgSosMqx9pbO
+9b9DPPUXQxEkUCQOKO0A/Rc+gnTk01F7qrWFonkji25pv8WEfA29ENq4BLjz1PlX
+=q6JC
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/gmp/files/gmp-5.0.1-perfpow-test.patch b/dev-libs/gmp/files/gmp-5.0.1-perfpow-test.patch
new file mode 100644
index 000000000000..d1b8706082f0
--- /dev/null
+++ b/dev-libs/gmp/files/gmp-5.0.1-perfpow-test.patch
@@ -0,0 +1,36 @@
+
+# HG changeset patch
+# User Torbjorn Granlund <tege@gmplib.org>
+# Date 1267122532 -3600
+# Node ID 794410151f5f966bcb5c3489b6441614990efe7c
+# Parent  948660e2e56d9cfaae035082b8fd473985505fb6
+Fix a test case to work for long long limbs.
+
+2010-02-25  Torbjorn Granlund  <tege@gmplib.org>
+
+	* tests/mpz/t-perfpow.c (check_random): Use mp_limb_t type for limb
+	variables.
+
+diff -r 948660e2e56d -r 794410151f5f tests/mpz/t-perfpow.c
+--- a/tests/mpz/t-perfpow.c	Thu Feb 25 16:08:21 2010 +0100
++++ b/tests/mpz/t-perfpow.c	Thu Feb 25 19:28:52 2010 +0100
+@@ -2,7 +2,7 @@
+ 
+    Contributed to the GNU project by Torbjorn Granlund and Martin Boij.
+ 
+-Copyright 2008, 2009 Free Software Foundation, Inc.
++Copyright 2008, 2009, 2010 Free Software Foundation, Inc.
+ 
+ This file is part of the GNU MP Library.
+ 
+@@ -109,7 +109,8 @@
+ {
+   mpz_t n, np, temp, primes[NRP];
+   int i, j, k, unique, destroy, res;
+-  unsigned long int nrprimes, primebits, g, exp[NRP], e;
++  unsigned long int nrprimes, primebits;
++  mp_limb_t g, exp[NRP], e;
+   gmp_randstate_ptr rands;
+ 
+   rands = RANDS;
+
diff --git a/dev-libs/gmp/gmp-5.0.1.ebuild b/dev-libs/gmp/gmp-5.0.1.ebuild
index 5e092832b44e..6709126a9fd8 100644
--- a/dev-libs/gmp/gmp-5.0.1.ebuild
+++ b/dev-libs/gmp/gmp-5.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.0.1.ebuild,v 1.5 2010/07/27 02:33:18 zorry Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.0.1.ebuild,v 1.6 2010/08/30 17:58:19 vapier Exp $
 
 inherit flag-o-matic eutils libtool flag-o-matic toolchain-funcs
 
@@ -19,6 +19,7 @@ src_unpack() {
 	cd "${S}"
 	[[ -d ${FILESDIR}/${PV} ]] && EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV}
 	epatch "${FILESDIR}"/${PN}-4.1.4-noexecstack.patch
+	epatch "${FILESDIR}"/${P}-perfpow-test.patch
 	epatch "${FILESDIR}"/${PN}-5.0.0-s390.diff
 
 	# disable -fPIE -pie in the tests for x86  #236054