- fixed the lib64 patch that was breaking on amd64 32ul.

Package-Manager: portage-2.1.3.9

5 files changed, 49 insertions, 44 deletions

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index 949f5fe7ab97..2d0bfc2b6859 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/perl
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.258 2007/11/14 01:11:18 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.259 2007/11/18 07:04:34 solar Exp $
+
+  18 Nov 2007; <solar@gentoo.org> -files/perl-5.8.8-lib64.patch,
+  +files/perl-5.8.8-libbits.patch, perl-5.8.8-r2.ebuild,
+  perl-5.8.8-r3.ebuild:
+  - fixed the lib64 patch that was breaking on amd64 32ul.
 
   14 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org> perl-5.8.8-r3.ebuild:
   Stable on amd64 wrt bug #198196.
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 478af2957f41..327dba826a39 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX perl-5.8.7-MakeMaker-RUNPATH.patch 859 RMD160 b0e95fcd9b1bbc085e9986f8910e3fbcf3f78eb2 SHA1 1e7c2f05ffaf8f6aee753ab106a9798e6920ff06 SHA256 3d327c525e0cf57899eca48d417fa4363f40da9b0d6b70b61e951521749047ab
 MD5 044b90a8895f8a03bef8e4cf5759eecc files/perl-5.8.7-MakeMaker-RUNPATH.patch 859
 RMD160 b0e95fcd9b1bbc085e9986f8910e3fbcf3f78eb2 files/perl-5.8.7-MakeMaker-RUNPATH.patch 859
@@ -33,10 +30,10 @@ AUX perl-5.8.8-gcc42-command-line.patch 497 RMD160 5fe723ae71be6c6316f11ca2219f4
 MD5 565a8ae3144b4a695c0525fcb587476a files/perl-5.8.8-gcc42-command-line.patch 497
 RMD160 5fe723ae71be6c6316f11ca2219f489fce60101c files/perl-5.8.8-gcc42-command-line.patch 497
 SHA256 946d02284221bc3615e1f03afda1735e6da0296b03315e2a644bd784ad6f76d1 files/perl-5.8.8-gcc42-command-line.patch 497
-AUX perl-5.8.8-lib64.patch 3393 RMD160 406206c33b10b4af8cb2d1aba2fa6aadf5d9eea6 SHA1 d2e3bced513435dd66634d89938d65aa5839e7a8 SHA256 3efe8048934093a1a66bc37b22fbb56a6e10df2940bb85b57802c9129c9bd1bd
-MD5 b67f84d9f78688c8d1d06503241d0f6d files/perl-5.8.8-lib64.patch 3393
-RMD160 406206c33b10b4af8cb2d1aba2fa6aadf5d9eea6 files/perl-5.8.8-lib64.patch 3393
-SHA256 3efe8048934093a1a66bc37b22fbb56a6e10df2940bb85b57802c9129c9bd1bd files/perl-5.8.8-lib64.patch 3393
+AUX perl-5.8.8-libbits.patch 3417 RMD160 56a56ffc18af62bf2735a62797bb29c12ff3a3dd SHA1 2432c3d8f98baadace064b795cc580c80bebdedf SHA256 084a55f7cdffa615ddb0cf57d2028a16f4ca5120202af9dbacd90bcdf03774e6
+MD5 1d001887fe18a600a8ed401155f90a63 files/perl-5.8.8-libbits.patch 3417
+RMD160 56a56ffc18af62bf2735a62797bb29c12ff3a3dd files/perl-5.8.8-libbits.patch 3417
+SHA256 084a55f7cdffa615ddb0cf57d2028a16f4ca5120202af9dbacd90bcdf03774e6 files/perl-5.8.8-libbits.patch 3417
 AUX perl-5.8.8-links.patch 2925 RMD160 68116f3922d1e4d818cf65965b1886fc55b14faf SHA1 849ef26d29369470985eb54ede94a6be6764878b SHA256 aeecee505f05ab0d7336142119f7a3e6d061b8fd2c7bbf9bd88cfb0421323bea
 MD5 e1310772583a085881cd30e53546410d files/perl-5.8.8-links.patch 2925
 RMD160 68116f3922d1e4d818cf65965b1886fc55b14faf files/perl-5.8.8-links.patch 2925
@@ -86,18 +83,18 @@ MD5 528fa2521c530d5a47df32b663e629af files/perl-regexp-nossp.patch 460
 RMD160 dde3a25904275896e98d7b7f3a02926c8dbc5ca5 files/perl-regexp-nossp.patch 460
 SHA256 e2d923711bb856b3c7f790dbc1cd1f468d647c1e50a3ff8a18745023c73b3e36 files/perl-regexp-nossp.patch 460
 DIST perl-5.8.8.tar.bz2 10123359 RMD160 e78f26d9b96e6db35f946ad4ff55e3a69385c71b SHA1 4aab490040727ca4419098720eca2ba4367df539 SHA256 818a140d9c04ea8dab3a05104b34ced7f7d9d0a91bfed91baf89a84d0dfb1bc9
-EBUILD perl-5.8.8-r2.ebuild 18889 RMD160 7825093b411d8ff82e9f2e784d1af7574e6ab8fa SHA1 3b2a3cf7f77ec76c6b5c2144f7519283c0c37757 SHA256 4598e8112aebf1ff49036a970e92f4ede36c1fa4a21b78930d5b4ccde6e7275a
-MD5 3d94bd8712184532e8e12bfbaadd70de perl-5.8.8-r2.ebuild 18889
-RMD160 7825093b411d8ff82e9f2e784d1af7574e6ab8fa perl-5.8.8-r2.ebuild 18889
-SHA256 4598e8112aebf1ff49036a970e92f4ede36c1fa4a21b78930d5b4ccde6e7275a perl-5.8.8-r2.ebuild 18889
-EBUILD perl-5.8.8-r3.ebuild 19132 RMD160 be1e9be46506b6b27d9108338e4f5d94baaf2447 SHA1 9a52dd596a0c5126bec375862f7b63dd6f8aba86 SHA256 e4ae13e992a356dc59aa1292490efc446bb6bde976a2ec07d8fd28de5daac37b
-MD5 66742e49c08d721d6a5a372b1cb39714 perl-5.8.8-r3.ebuild 19132
-RMD160 be1e9be46506b6b27d9108338e4f5d94baaf2447 perl-5.8.8-r3.ebuild 19132
-SHA256 e4ae13e992a356dc59aa1292490efc446bb6bde976a2ec07d8fd28de5daac37b perl-5.8.8-r3.ebuild 19132
-MISC ChangeLog 57009 RMD160 6d2bae9154ad0edf1672d652753f5a56b439b3cf SHA1 253d60065f856edd7da054ee51bf213c48c51982 SHA256 5b5ba9fba609e0ae4d43efa9d37b5112ee592c0292960a8ce816c30d398c89d5
-MD5 afbf18e28876d98c1b514388f278dedd ChangeLog 57009
-RMD160 6d2bae9154ad0edf1672d652753f5a56b439b3cf ChangeLog 57009
-SHA256 5b5ba9fba609e0ae4d43efa9d37b5112ee592c0292960a8ce816c30d398c89d5 ChangeLog 57009
+EBUILD perl-5.8.8-r2.ebuild 18881 RMD160 1552586d88d035fd1ffc10e53319f43f0d041031 SHA1 dd787af32ffc8735b3ccb36da425ce5014b3f7f0 SHA256 2a765656ecabad084e4a07c03a3fbaedbeaa3863b77f4265452391a4d15b1782
+MD5 805048ad01164451fbb75179b68f7379 perl-5.8.8-r2.ebuild 18881
+RMD160 1552586d88d035fd1ffc10e53319f43f0d041031 perl-5.8.8-r2.ebuild 18881
+SHA256 2a765656ecabad084e4a07c03a3fbaedbeaa3863b77f4265452391a4d15b1782 perl-5.8.8-r2.ebuild 18881
+EBUILD perl-5.8.8-r3.ebuild 19121 RMD160 6d6b3f36aede832b209dcd4311039ea56b8eca83 SHA1 26d9dee928c153d8de1f53d1eb09e3ae74eb2b23 SHA256 86257aae00d400fc662326648e8a3852fa3f279d1ba30c2b4476d47376d9d396
+MD5 b3eee4bc1c251e209e34525bef0a6dbf perl-5.8.8-r3.ebuild 19121
+RMD160 6d6b3f36aede832b209dcd4311039ea56b8eca83 perl-5.8.8-r3.ebuild 19121
+SHA256 86257aae00d400fc662326648e8a3852fa3f279d1ba30c2b4476d47376d9d396 perl-5.8.8-r3.ebuild 19121
+MISC ChangeLog 57212 RMD160 6caa8259a7c87cdec5ad8f02a340dbf668ff571f SHA1 43777caa23f4bf65852ae7a411aa5505458b52e0 SHA256 5a61f74eca21704c740f6d68045598630ca852dc868bb6432d86d20acf919912
+MD5 459701e1957b9ca78f16832a0f964a20 ChangeLog 57212
+RMD160 6caa8259a7c87cdec5ad8f02a340dbf668ff571f ChangeLog 57212
+SHA256 5a61f74eca21704c740f6d68045598630ca852dc868bb6432d86d20acf919912 ChangeLog 57212
 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 RMD160 647980838c590f54441a053916ea629e53e551c0 metadata.xml 305
@@ -108,10 +105,3 @@ SHA256 1067b25eabccaa2d61cfc9db27e31c6b18d075e440713e44dcde000c71bbf178 files/di
 MD5 750a1b4341f04665c5ce30e14a302f96 files/digest-perl-5.8.8-r3 241
 RMD160 a339ac2a520b2fd2f458daf89cd89eb36a8c98b2 files/digest-perl-5.8.8-r3 241
 SHA256 1067b25eabccaa2d61cfc9db27e31c6b18d075e440713e44dcde000c71bbf178 files/digest-perl-5.8.8-r3 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHOks4kT4lNIS36YERAhzgAJ95oI7aAjqmN79bkxwPnB1F7+SF/ACggjip
-Kanca8eE3fEPX+CGMCD4TSc=
-=tB5O
------END PGP SIGNATURE-----
diff --git a/dev-lang/perl/files/perl-5.8.8-lib64.patch b/dev-lang/perl/files/perl-5.8.8-libbits.patch
index dcc91846d69d..963434d65356 100644
--- a/dev-lang/perl/files/perl-5.8.8-lib64.patch
+++ b/dev-lang/perl/files/perl-5.8.8-libbits.patch
@@ -5,9 +5,9 @@
  inclwanted=''
  
 +: determine libdir name
-+: Should be */lib64 on x86-64, sparc64, ppc64
-+case `arch` in
-+  x86_64) lib='lib64';;
++: Should be */lib32 on x86-64, sparc64, ppc64
++case ${BITS} in
++  32) lib='lib32';; 64) lib='lib64';;
 +  *) lib='lib';;
 +esac
 +  
@@ -35,8 +35,8 @@
  '')	case "$prefix" in
 -		*perl*) dflt='lib';;
 -		*) dflt='lib/perl5' ;;
-+		*perl*) dflt='lib64';;
-+		*) dflt='lib64/perl5' ;;
++		*perl*) dflt='lib32';;
++		*) dflt='lib32/perl5' ;;
  	esac
  	;;
  *)	dflt="$installstyle" ;;
@@ -46,8 +46,8 @@
  case "$installstyle" in
 -*lib/perl5*) set dflt privlib lib/$package/$version ;;
 -*)	 set dflt privlib lib/$version ;;
-+*lib64/perl5*) set dflt privlib lib64/$package/$version ;;
-+*)	 set dflt privlib lib64/$version ;;
++*${lib}/perl5*) set dflt privlib ${lib}/$package/$version ;;
++*)	 set dflt privlib ${lib}/$version ;;
  esac
  eval $prefixit
  $cat <<EOM
@@ -57,8 +57,8 @@
  '') case "$installstyle" in
 -	*lib/perl5*) dflt=$siteprefix/lib/$package/site_$prog/$version ;;
 -	*)	 dflt=$siteprefix/lib/site_$prog/$version ;;
-+	*lib64/perl5*) dflt=$siteprefix/lib64/$package/site_$prog/$version ;;
-+	*)	 dflt=$siteprefix/lib64/site_$prog/$version ;;
++	*${lib}/perl5*) dflt=$siteprefix/${lib}/$package/site_$prog/$version ;;
++	*)	 dflt=$siteprefix/${lib}/site_$prog/$version ;;
  	esac
  	;;
  *)	dflt="$sitelib"
@@ -68,8 +68,8 @@
  		case "$installstyle" in
 -		*lib/perl5*) dflt=$vendorprefix/lib/$package/vendor_$prog/$version ;;
 -		*)	     dflt=$vendorprefix/lib/vendor_$prog/$version ;;
-+		*lib64/perl5*) dflt=$vendorprefix/lib64/$package/vendor_$prog/$version ;;
-+		*)	     dflt=$vendorprefix/lib64/vendor_$prog/$version ;;
++		*${lib}/perl5*) dflt=$vendorprefix/${lib}/$package/vendor_$prog/$version ;;
++		*)	     dflt=$vendorprefix/${lib}/vendor_$prog/$version ;;
  		esac
  		;;
  	*)	dflt="$vendorlib"
diff --git a/dev-lang/perl/perl-5.8.8-r2.ebuild b/dev-lang/perl/perl-5.8.8-r2.ebuild
index 34f84b0880dd..8c3bb974d093 100644
--- a/dev-lang/perl/perl-5.8.8-r2.ebuild
+++ b/dev-lang/perl/perl-5.8.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r2.ebuild,v 1.42 2007/11/03 16:49:43 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r2.ebuild,v 1.43 2007/11/18 07:04:34 solar Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -123,8 +123,7 @@ src_unpack() {
 	# filter it otherwise configure fails. See #125535.
 	epatch ${FILESDIR}/perl-hppa-pa7200-configure.patch
 
-	#[[ ${get_libdir} == lib64 ]] && cd ${S} && epatch ${FILESDIR}/${P}-lib64.patch
-	use amd64 || use ppc64 && cd ${S} && epatch ${FILESDIR}/${P}-lib64.patch
+	epatch ${FILESDIR}/${P}-libbits.patch
 
 	[[ ${CHOST} == *-dragonfly* ]] && cd ${S} && epatch ${FILESDIR}/${P}-dragonfly-clean.patch
 	[[ ${CHOST} == *-freebsd* ]] && cd ${S} && epatch ${FILESDIR}/${P}-fbsdhints.patch
@@ -247,6 +246,12 @@ src_configure() {
 
 	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
 
+	case "$(get_libdir)" in
+		lib)   export BITS="";;
+		lib32) export BITS=32;;
+		lib64) export BITS=64;;
+	esac
+
 	if [[ $(get_libdir) != "lib" ]] ; then
 		# We need to use " and not ', as the written config.sh use ' ...
 		myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
diff --git a/dev-lang/perl/perl-5.8.8-r3.ebuild b/dev-lang/perl/perl-5.8.8-r3.ebuild
index c82bf0ad0036..03d7b18cf3fb 100644
--- a/dev-lang/perl/perl-5.8.8-r3.ebuild
+++ b/dev-lang/perl/perl-5.8.8-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r3.ebuild,v 1.8 2007/11/14 01:11:18 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r3.ebuild,v 1.9 2007/11/18 07:04:34 solar Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -123,8 +123,7 @@ src_unpack() {
 	# filter it otherwise configure fails. See #125535.
 	epatch "${FILESDIR}"/perl-hppa-pa7200-configure.patch
 
-	#[[ ${get_libdir} == lib64 ]] && cd ${S} && epatch ${FILESDIR}/${P}-lib64.patch
-	use amd64 || use ppc64 && cd "${S}" && epatch "${FILESDIR}"/${P}-lib64.patch
+	epatch "${FILESDIR}"/${P}-libbits.patch
 
 	[[ ${CHOST} == *-dragonfly* ]] && cd "${S}" && epatch "${FILESDIR}"/${P}-dragonfly-clean.patch
 	[[ ${CHOST} == *-freebsd* ]] && cd "${S}" && epatch "${FILESDIR}"/${P}-fbsdhints.patch
@@ -251,6 +250,12 @@ src_configure() {
 
 	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
 
+	case "$(get_libdir)" in
+		lib)   export BITS="";;
+		lib32) export BITS=32;;
+		lib64) export BITS=64;;
+	esac
+
 	if [[ $(get_libdir) != "lib" ]] ; then
 		# We need to use " and not ', as the written config.sh use ' ...
 		myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"