Move elibtoolize up so it patches configure correctly #327091 by Alan Hourihane....

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

diff --git a/dev-libs/gmp/ChangeLog b/dev-libs/gmp/ChangeLog
index 759585c79f0c15fd98bad3c2277410e62c61ec30..269827600cd82bc806129d15ad1f4d1bc1ef9df1 100644 (file)
--- a/dev-libs/gmp/ChangeLog
+++ b/dev-libs/gmp/ChangeLog
@@ -1,6 +1,11 @@
 # 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.134 2010/07/04 21:08:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.135 2010/07/09 22:54:27 vapier Exp $
+
+  09 Jul 2010; Mike Frysinger <vapier@gentoo.org> gmp-5.0.1.ebuild:
+  Move elibtoolize up so it patches configure correctly #327091 by Alan
+  Hourihane. Tweak wrapper syntax for crappy shells #327077 by vlad f
+  halilov. Drop old mpfr configure option as it no longer exists.
 
   04 Jul 2010; Mike Frysinger <vapier@gentoo.org> gmp-5.0.1.ebuild:
   Move into unstable.

diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index a7e3c6555f9c112c7aff2ce914e85e2d07a56d9f..e01a15c274d6364b92bf3cb918332b9ae159692b 100644 (file)
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -8,13 +8,13 @@ AUX gmp-5.0.0-s390.diff 1839 RMD160 2b83f296906a7a15add19b126f73059571b8880e SHA
 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 2300 RMD160 5afd3b3b618e9f0af08f9ed1caf32ce67d3537a4 SHA1 a61c7a43cd8271f0782e3bfdae8e0451ab835dd3 SHA256 3aaece4a6a506c72cca97db4d08f124dba50e551d8706e425414c9931a8e31ba
-MISC ChangeLog 17725 RMD160 41e551497f44023cd7157f885b2d88dffb751c3e SHA1 a6ca648f746714d08cd761f654f9b811545544e4 SHA256 5df882eb85e9db894bf04077320ffa43aab452060e946380c2854f894fbadf96
+EBUILD gmp-5.0.1.ebuild 2344 RMD160 7b1d855521566a257032e4134ca2cd3fcd24ce18 SHA1 d6681ca7559e1427113c4e167662dab7b8a94146 SHA256 35a4bd4d5a2d94a2990ba000c5c1a0f6684a0c4d32c25ea44b6b3f1d1169b672
+MISC ChangeLog 18002 RMD160 f00101596f8a71e3bafcb2c7ff454524f48598e7 SHA1 09ea83367b15a514529a5ba950f4de01671c3505 SHA256 31efef08301100bfd635fe9270defdcdd10150c215862a1645675b37ec465622
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF4EAREIAAYFAkww9/kACgkQTwhj9JtAlp6vvAEAsn9g1Adrf4wD5tcODiydXg52
-RbGq+YdyLhg1/iFv6LIA/ipAjO2AUXGKb2AH/cu+WpeMxe68JURZNKMJQ+xwb7d1
-=9g5J
+iF4EAREIAAYFAkw3qC8ACgkQTwhj9JtAlp5cigD/SAJzX092lH2YzJdvd80VkZIm
+ysDAoFMrAFajMeQCpLsA/jO4KkzR1bSJ+sZrIyzOd0Vla/4OTuQDwteBgk5B5Mos
+=dMmn
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/gmp/gmp-5.0.1.ebuild b/dev-libs/gmp/gmp-5.0.1.ebuild
index 29c16dd4a01b78f4d603312e3b829d5b4031f4df..e287b26e2e472bd57397baa28def0db4fab06fd6 100644 (file)
--- 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.3 2010/07/04 21:08:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.0.1.ebuild,v 1.4 2010/07/09 22:54:27 vapier Exp $
 
 inherit flag-o-matic eutils libtool flag-o-matic
 
@@ -21,17 +21,17 @@ src_unpack() {
        epatch "${FILESDIR}"/${PN}-4.1.4-noexecstack.patch
        epatch "${FILESDIR}"/${PN}-5.0.0-s390.diff
 
-       # GMP uses the "ABI" env var during configure as does Gentoo (econf)
+       # note: we cannot run autotools here as gcc depends on this package
+       elibtoolize
+
+       # GMP uses the "ABI" env var during configure as does Gentoo (econf).
+       # So, to avoid patching the source constantly, wrap things up.
        mv configure configure.wrapped || die
        cat <<-\EOF > configure
        #!/bin/sh
-       export ABI=$GMPABI
-       exec "${0}.wrapped" "$@"
+       exec env ABI="$GMPABI" "${0}.wrapped" "$@"
        EOF
        chmod a+rx configure
-
-       # note: we cannot run autotools here as gcc depends on this package
-       elibtoolize
 }
 
 src_compile() {
@@ -53,7 +53,6 @@ src_compile() {
        tc-export CC
        econf \
                --localstatedir=/var/state/gmp \
-               --disable-mpfr \
                --disable-mpbsd \
                $(use_enable !nocxx cxx) \
                || die "configure failed"