replace some more ABIs with GMPABI; fix taken from kanaka's auto-multilib overlay

Package-Manager: portage-2.1.2-r9

diff --git a/dev-libs/gmp/ChangeLog b/dev-libs/gmp/ChangeLog
index 868494f2e09a841ae32a972d6580a02139dea7eb..52d7c9ec0317a9ad1b879d4aaae728b29db0f75f 100644 (file)
--- a/dev-libs/gmp/ChangeLog
+++ b/dev-libs/gmp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/gmp
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.84 2006/10/20 00:19:49 kloeri Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.85 2007/02/22 12:09:46 blubb Exp $
+
+  22 Feb 2007; Simon Stelling <blubb@gentoo.org> gmp-4.2.1.ebuild:
+  replace some more ABIs with GMPABI; fix taken from kanaka's auto-multilib
+  overlay
 
   20 Oct 2006; Bryan Østergaard <kloeri@gentoo.org> gmp-4.2.1.ebuild:
   Stable on Alpha.

diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index 408dcdd926f46a983144ea9c0aeae0e61a51f844..ccea0f47764af9848171d0b893d2c9e5f916b2a5 100644 (file)
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 4.2.1/aix.m4-RW.diff 529 RMD160 33b9e308733fda096601efdaab15764796484fca SHA1 82978580fc9819c246f975598d276a02f529b957 SHA256 0636df524109a52e9705355952097017242ade4527a0fbb0961fd288334c9ded
 MD5 fa553f0a338347c619138645ab7dd4a3 files/4.2.1/aix.m4-RW.diff 529
 RMD160 33b9e308733fda096601efdaab15764796484fca files/4.2.1/aix.m4-RW.diff 529
@@ -27,14 +24,18 @@ RMD160 934645555459cabcf4c2f0e1ea0a6a7143387a81 files/gmp-4.2.1-ABI-multilib.pat
 SHA256 d5fa3b9cd07036abc99d8356ffd82935aa63b2aab53ffb49eb0f4004d35964aa files/gmp-4.2.1-ABI-multilib.patch 12390
 DIST gmp-4.2.1.tar.bz2 1726453 RMD160 831e02a36ac7b466857f8fafeffad7d51f7656e7 SHA1 00a97f0ec1eb1d9429ab5c64be6889e8a497425e SHA256 d07ffcb37eecec35c5ec72516d10b35fdf6e6fef1fcf1dcd37e30b8cbf8bf941
 DIST gmp-man-4.2.1.pdf 996792 RMD160 3f8ea92b95e985d09ed8d5b45952ccf98fbd9dac SHA1 e1f3f84b38d6c459220dbd14015d440cd59195d1 SHA256 3bee6b5285eea339a5ea949cd9db12fe5f676f15beff8ae9cbee0011be24beef
-EBUILD gmp-4.2.1.ebuild 1740 RMD160 29c1239af8f5327f3d8e8b7229128df9d350826a SHA1 7a7cb887fca1ae6e57da968c9310cdde1526853b SHA256 e0473ec9e2d231edc6b902f1beb306abc05c00240b8b3142429b1b8122ccf59f
-MD5 b8f1a8e9d4e6625c84b9d9686c7d9dbf gmp-4.2.1.ebuild 1740
-RMD160 29c1239af8f5327f3d8e8b7229128df9d350826a gmp-4.2.1.ebuild 1740
-SHA256 e0473ec9e2d231edc6b902f1beb306abc05c00240b8b3142429b1b8122ccf59f gmp-4.2.1.ebuild 1740
-MISC ChangeLog 11481 RMD160 638a2a5f50551f0e8d5a0d38367f46e96604205d SHA1 7b2e4b1a51b2c86cd4303e08b49f9210e5fa2e73 SHA256 093c64b4c6d87a1e7bbb65e2168a5c05cb3e474cc3399cb13f7fa747d5c9a8a3
-MD5 f78742fece09546fff4fe82d0aafcb94 ChangeLog 11481
-RMD160 638a2a5f50551f0e8d5a0d38367f46e96604205d ChangeLog 11481
-SHA256 093c64b4c6d87a1e7bbb65e2168a5c05cb3e474cc3399cb13f7fa747d5c9a8a3 ChangeLog 11481
+EBUILD gmp-4.2.1.ebuild 2233 RMD160 199c2151db014379c2937107619df574b8406910 SHA1 d2981a7024d2727cc70eb29d32f8a10fd4fdb799 SHA256 ee0225f211df423960758783b9f8fe8e7ea9c0acc9dede31d27849215cf3e1e4
+MD5 924ef74fe3f697e02d2a8eeb0785540e gmp-4.2.1.ebuild 2233
+RMD160 199c2151db014379c2937107619df574b8406910 gmp-4.2.1.ebuild 2233
+SHA256 ee0225f211df423960758783b9f8fe8e7ea9c0acc9dede31d27849215cf3e1e4 gmp-4.2.1.ebuild 2233
+MISC ChangeLog 11634 RMD160 4e2e372af9da00896851e901805e65e73ffffb4f SHA1 22e5732ed35959c35e7ebd351ed13f45c02d4ac4 SHA256 1ad73f75d4358e4e0ddfcd4a944c08957d3707a7a0784b3316b36d2f93395f8e
+MD5 be276d0769a70392a45323b6b8b7c56a ChangeLog 11634
+RMD160 4e2e372af9da00896851e901805e65e73ffffb4f ChangeLog 11634
+SHA256 1ad73f75d4358e4e0ddfcd4a944c08957d3707a7a0784b3316b36d2f93395f8e ChangeLog 11634
+MISC gmp-4.2.1.ebuild.orig 1740 RMD160 29c1239af8f5327f3d8e8b7229128df9d350826a SHA1 7a7cb887fca1ae6e57da968c9310cdde1526853b SHA256 e0473ec9e2d231edc6b902f1beb306abc05c00240b8b3142429b1b8122ccf59f
+MD5 b8f1a8e9d4e6625c84b9d9686c7d9dbf gmp-4.2.1.ebuild.orig 1740
+RMD160 29c1239af8f5327f3d8e8b7229128df9d350826a gmp-4.2.1.ebuild.orig 1740
+SHA256 e0473ec9e2d231edc6b902f1beb306abc05c00240b8b3142429b1b8122ccf59f gmp-4.2.1.ebuild.orig 1740
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
@@ -42,10 +43,3 @@ SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a metadata
 MD5 d87bd044c3923c0796531c3bf8576c9f files/digest-gmp-4.2.1 467
 RMD160 98ab335c8f75e99dfd7ddc3d8997efb97f8ef99e files/digest-gmp-4.2.1 467
 SHA256 72f6e7bb87de1a79792e7c22a78d0e16956ec7e0b80a13c7de181b691a627db9 files/digest-gmp-4.2.1 467
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFFi7KkK9sYciBdMQMRAhOSAJ9DZqzow2NTv+q1u0kuRFNQUPs2KQCggI/g
-p/PiIf7/xth5rz2zK67Okus=
-=WrjO
------END PGP SIGNATURE-----

diff --git a/dev-libs/gmp/gmp-4.2.1.ebuild b/dev-libs/gmp/gmp-4.2.1.ebuild
index add459265a98b7a190bd2fc851c8c6b22b670478..20051451b0e46ba2ea68b3261fb6f2f4b8526748 100644 (file)
--- a/dev-libs/gmp/gmp-4.2.1.ebuild
+++ b/dev-libs/gmp/gmp-4.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-4.2.1.ebuild,v 1.14 2006/10/20 00:19:49 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-4.2.1.ebuild,v 1.15 2007/02/22 12:09:46 blubb Exp $
 
 inherit flag-o-matic eutils libtool
 
@@ -27,6 +27,9 @@ src_unpack () {
        epatch "${FILESDIR}"/${PN}-4.1.4-noexecstack.patch
        epatch "${FILESDIR}"/${P}-ABI-multilib.patch
 
+       sed -i -e 's:ABI = @ABI@:GMPABI = @GMPABI@:' ${S}/Makefile.in \
+               ${S}/*/Makefile.in ${S}/*/*/Makefile.in
+
        # note: we cannot run autotools here as gcc depends on this package
        elibtoolize
 }
@@ -38,6 +41,17 @@ src_compile() {
                export CHOST="${CHOST/2.0/1.1}"
        fi
 
+       # ABI mappings (needs all architectures supported)
+       if [ -n "${ABI}" ]; then
+               [ "${ABI}" = "32" ] && export GMPABI=32
+               [ "${ABI}" = "64" ] && export GMPABI=64
+               [ "${ABI}" = "x86" ] && export GMPABI=32
+               [ "${ABI}" = "amd64" ] && export GMPABI=64
+               [ "${ABI}" = "n64" ] && export GMPABI=64
+               [ "${ABI}" = "o32" ] && export GMPABI=o32
+               [ "${ABI}" = "n32" ] && export GMPABI=n32
+       fi
+
        econf \
                --localstatedir=/var/state/gmp \
                --disable-mpfr \