Fix hppa2.0 vs hppa1.1 handling.

Package-Manager: portage-2.0.54

2 files changed, 17 insertions, 58 deletions

diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index 6ee1a6bb5cd4..d2448bd0608b 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -1,79 +1,23 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 9e9c047598bd57e3486d061964bbe05c ChangeLog 9573
-RMD160 5cd06025d08bdb2063ab129d0a72355c8f82af55 ChangeLog 9573
-SHA256 11d5abebf4c0cc5f8f3719900b5d81dbd6a4cffbf1706e28c48eef57ae0ed0a9 ChangeLog 9573
 MD5 3ffd372397aa4b63f5a08f711df8e02c files/4.1.4/gmp-impl.h.MPF_SIGNIFICANT_DIGITS.diff 1182
-RMD160 5da50181e41afa8947f3c2caae818726fad4f410 files/4.1.4/gmp-impl.h.MPF_SIGNIFICANT_DIGITS.diff 1182
-SHA256 16685e619524f7af6eba7c3d8cc98eddcb60ddbd82ad62f55af78763768d6858 files/4.1.4/gmp-impl.h.MPF_SIGNIFICANT_DIGITS.diff 1182
 MD5 62a1429c81d8b2631590acf519385b7c files/4.1.4/gmp-impl.h.MPN_SIZEINBASE.diff 1315
-RMD160 be5a37a6a2dd53745904e01ea363a265d4b0752b files/4.1.4/gmp-impl.h.MPN_SIZEINBASE.diff 1315
-SHA256 9e0abb46d1f50d8dd38f96ed7c27d45e8b0fc7c9a59c24ac8688716f0bc41437 files/4.1.4/gmp-impl.h.MPN_SIZEINBASE.diff 1315
 MD5 9ed7fdde964f92400549a7a4bc2d1982 files/4.1.4/gmp-impl.h.x86.ULONG_PARITY.diff 1357
-RMD160 48937aaf7ec5f698085705c5b00f4d7c85460e51 files/4.1.4/gmp-impl.h.x86.ULONG_PARITY.diff 1357
-SHA256 5a4e53ec4e669dac1ef9da68111c4a336950d58e8f3539927fad232472d064c6 files/4.1.4/gmp-impl.h.x86.ULONG_PARITY.diff 1357
 MD5 4083cba7bced11f16a6672b2bbcbb364 files/4.1.4/mpn_rootrem.c.diff 813
-RMD160 a0c4ebacd92da15fdaf17f92b6d41dec7e90a4d1 files/4.1.4/mpn_rootrem.c.diff 813
-SHA256 089de5b8222b65ae826b1ff10e793fbb749bb3c39d6058bd1553fb74893532e1 files/4.1.4/mpn_rootrem.c.diff 813
 MD5 1dbc1772df649dae89ad8e00042c5b46 files/amd64.patch 1166
-RMD160 ca9575e56aa20dd5dd26b9f05f25d20009f66cd9 files/amd64.patch 1166
-SHA256 02785a9ca4130ef3e3af7219134495ef17ae19907b41848d1a13e263df38b3ca files/amd64.patch 1166
 MD5 8c7f521cf77fb56ab019223cf92a6bca files/digest-gmp-4.1.4 62
-RMD160 868be7bc26131dd31e20097095525cad698e29ca files/digest-gmp-4.1.4 62
-SHA256 cf25d365d4ac3ebbb3e5e542cda0196516532ff6f391a9675e597b669312f9be files/digest-gmp-4.1.4 62
 MD5 b330f02d3e3d3d78a1891eb8b683e14a files/digest-gmp-4.1.4-r1 294
-RMD160 ba49a102546c04c179d3f07a9876d27e6da8db53 files/digest-gmp-4.1.4-r1 294
-SHA256 ee78212ed8f80991c77a9fbc0ff711e9cc0088bedfc463810865057727639439 files/digest-gmp-4.1.4-r1 294
 MD5 e9d24618243d8e46e39eebb5b35b16d9 files/digest-gmp-4.1.4-r2 125
-RMD160 1d09c542122f675a68166c1ee21f17d2a2d5d9d7 files/digest-gmp-4.1.4-r2 125
-SHA256 9f51dc5a4ce56ee4e493f4164cf9b99f9f54ceee401ab6255e418c0436afe8f9 files/digest-gmp-4.1.4-r2 125
 MD5 e9d24618243d8e46e39eebb5b35b16d9 files/digest-gmp-4.1.4-r3 125
-RMD160 1d09c542122f675a68166c1ee21f17d2a2d5d9d7 files/digest-gmp-4.1.4-r3 125
-SHA256 9f51dc5a4ce56ee4e493f4164cf9b99f9f54ceee401ab6255e418c0436afe8f9 files/digest-gmp-4.1.4-r3 125
 MD5 553564c5562a6bcea4253fb391092fca files/gmp-4.1.4-ABI-multilib.patch 3671
-RMD160 d0d0b56ac8ed1648a79f978e0864a99269520aa8 files/gmp-4.1.4-ABI-multilib.patch 3671
-SHA256 db4cf637596d69f7b0de87f740d17bc58bcb58f414a64c2c75e2941920d2a794 files/gmp-4.1.4-ABI-multilib.patch 3671
 MD5 d420152880c4ac501005f2a4fe93136f files/gmp-4.1.4-asm-dots.patch 391
-RMD160 3304c06e350e9aefc80855c11726fd92b675d21f files/gmp-4.1.4-asm-dots.patch 391
-SHA256 97490cf6e52efd8ad0158ecdab416cc2ff96e4933bd2aa47cc8b7c9cef3d5b91 files/gmp-4.1.4-asm-dots.patch 391
 MD5 ee91d8f397ce79dd0ff7e4ae48a47b21 files/gmp-4.1.4-multilib.patch 2864
-RMD160 707ed6bdca664ab07c7dcd48a4657f92b4b9cd62 files/gmp-4.1.4-multilib.patch 2864
-SHA256 11519c27029e0627ef9652cbcebdff689dfaecfb9aa9f6fd9a121bda0ee8d989 files/gmp-4.1.4-multilib.patch 2864
 MD5 cb63e3b3f3f4ba8ff2c9c05597a1d78b files/gmp-4.1.4-noexecstack.patch 489
-RMD160 e58517b928f97ec58fc13549a35927aea337a60f files/gmp-4.1.4-noexecstack.patch 489
-SHA256 5d6edea21033e8e77f4060a96a0a4bbc97438632d036b886732449ffbff91efc files/gmp-4.1.4-noexecstack.patch 489
 MD5 bbd0e9615a3d4c4e30f13fe0ce4a0d63 files/gmp-4.1.4-nostackexec.patch 333
-RMD160 2552417332eacce3a91bf455b42ace6a24f9ce78 files/gmp-4.1.4-nostackexec.patch 333
-SHA256 c2038c83eebba11293794af93d3cdf94b23cc1c7da70337474e1bd14ace2934b files/gmp-4.1.4-nostackexec.patch 333
 MD5 d2af66806a8974a7be3bf44cebef957d files/gmp-4.1.4-ppc64-asm-dots.patch 591
-RMD160 93723091cc2bf41de13a4270ac35bc350aeffaae files/gmp-4.1.4-ppc64-asm-dots.patch 591
-SHA256 71e2c485c5f76b3b0923c3c20e3707ac9dc9cab0aec48694a4f0b86a368d1f10 files/gmp-4.1.4-ppc64-asm-dots.patch 591
 MD5 b52419c7a4ccb630ec3e44cc7ea926c9 files/gmp-hppa-2.0.patch 16826
-RMD160 5d969976cf326bd90ade9870f8c1c9b15877a695 files/gmp-hppa-2.0.patch 16826
-SHA256 0c3b7eff32fa92c9e9fa7469d422bef6550345a63f770be4bf7acdf329ef2c64 files/gmp-hppa-2.0.patch 16826
 MD5 d70b080c2f0efd82a800ba8a1af7b305 files/ppc64-gmp-acinclude.patch 474
-RMD160 f9ecc59ebdee8e90b36fedde5af898522fc42db4 files/ppc64-gmp-acinclude.patch 474
-SHA256 ec025fd569a096ce8b59146a9f9200947b121ccded6821875d4ad2194765ed53 files/ppc64-gmp-acinclude.patch 474
 MD5 4010682280bcdc0914108efb2a1b4f0f gmp-4.1.4-r1.ebuild 1957
-RMD160 512b8f9d46cce8081232d5755029faf8b26624a4 gmp-4.1.4-r1.ebuild 1957
-SHA256 8b6928ad15a7731d3f983931d74329339b544701223205a9e99a0d1e53b5b370 gmp-4.1.4-r1.ebuild 1957
 MD5 51183ba73620dcb842ad5e09a3e22424 gmp-4.1.4-r2.ebuild 1916
-RMD160 11a247c308ce7b324d3cd319382cec55ba77b1e5 gmp-4.1.4-r2.ebuild 1916
-SHA256 a3fd751bd461e3a3bef43898eccdc03ac3023313ba0154678f394ba81b3d228b gmp-4.1.4-r2.ebuild 1916
-MD5 8c52ebd507a339eeac680ddc144e6f1f gmp-4.1.4-r3.ebuild 1521
-RMD160 6e6452bc4d6ee8af1b5e04279dfcfbf4691bcb7c gmp-4.1.4-r3.ebuild 1521
-SHA256 356adeaf69f3809bee8bddcf6e24873304eaceee317e477001ecd3ae21bbd3ec gmp-4.1.4-r3.ebuild 1521
+MD5 5aa4eb3fc3f41aa513126a329ad1b073 gmp-4.1.4-r3.ebuild 1809
 MD5 e4c9a9c68f00f70850342b2bf9acf4a7 gmp-4.1.4.ebuild 1907
-RMD160 0244852e1b01091623b16bb2dd20d767cb96e01f gmp-4.1.4.ebuild 1907
-SHA256 48234fe275f5dc6096c42d621125101fa995b02e60c1288f645592bf879ebff4 gmp-4.1.4.ebuild 1907
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
-RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
-SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a metadata.xml 162
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFELCKhAiZjviIA2XgRAkLTAKCkE4qC7LPWn1/fN4ZHpT/hVRDhSwCgsvtD
-BfLFSYQnh9bPkyMsqDF6NAQ=
-=/Z57
------END PGP SIGNATURE-----
diff --git a/dev-libs/gmp/gmp-4.1.4-r3.ebuild b/dev-libs/gmp/gmp-4.1.4-r3.ebuild
index 3c0182e5fd88..e791d854fc2f 100644
--- a/dev-libs/gmp/gmp-4.1.4-r3.ebuild
+++ b/dev-libs/gmp/gmp-4.1.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-4.1.4-r3.ebuild,v 1.11 2006/03/30 18:25:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-4.1.4-r3.ebuild,v 1.12 2006/04/07 09:45:50 gmsoft Exp $
 
 inherit flag-o-matic eutils libtool
 
@@ -33,6 +33,13 @@ src_unpack () {
 src_compile() {
 	filter-flags -ffast-math
 
+
+	# GMP beleives hppa2.0 is 64bit
+	if [[ ${CHOST} == hppa2.0-* ]] ; then
+		is_hppa_2_0=1
+		export CHOST="${CHOST/2.0/1.1}"
+	fi
+
 	# FreeBSD libc already have bsdmp
 	econf \
 		--localstatedir=/var/state/gmp \
@@ -40,6 +47,14 @@ src_compile() {
 		$(use_enable !nocxx cxx) \
 		$(use_enable !elibc_FreeBSD mpbsd) \
 		|| die "configure failed"
+
+	# Fix the ABI for hppa2.0
+	if [ ! -z "${is_hppa_2_0}" ]; then
+		sed -i "${S}/config.h" -e 's:pa32/hppa1_1:pa32/hppa2_0:'
+		export CHOST="${CHOST/1.1/2.0}"
+	fi
+
+
 	emake || die "emake failed"
 }