Reverting solars changes; bug #199518

Package-Manager: portage-2.1.3.19

4 files changed, 23 insertions, 29 deletions

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index 2d0bfc2b6859..7fcfea0e28e7 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,10 @@
 # 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.259 2007/11/18 07:04:34 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.260 2007/11/18 17:37:25 ian Exp $
+
+  18 Nov 2007; Christian Hartmann <ian@gentoo.org> perl-5.8.8-r2.ebuild,
+  perl-5.8.8-r3.ebuild:
+  Reverting solars changes; bug #199518
 
   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,
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 327dba826a39..70d67cc357e6 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -83,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 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
+EBUILD perl-5.8.8-r2.ebuild 18885 RMD160 a2fe509eb159ee5d68e8056d74d777c344fbe966 SHA1 6ba3eee6bbf75bcac19c62412ddccae82df89ac6 SHA256 ca91f7d786ff1ae22b024afa54c80a83fcbbd2cb60b15f0f1f2eed89a9efb85b
+MD5 9d9e1710ff04a439570400f7de41c572 perl-5.8.8-r2.ebuild 18885
+RMD160 a2fe509eb159ee5d68e8056d74d777c344fbe966 perl-5.8.8-r2.ebuild 18885
+SHA256 ca91f7d786ff1ae22b024afa54c80a83fcbbd2cb60b15f0f1f2eed89a9efb85b perl-5.8.8-r2.ebuild 18885
+EBUILD perl-5.8.8-r3.ebuild 19128 RMD160 bc810dd871ce1454f9e72418a74ada4f155ce782 SHA1 1791dc3244e17cea4743c9376b407de3cb2837ba SHA256 eb31f2e1886392a37475a65185c51d0306e10d5e53427a51fc2b23d7f5ea0fab
+MD5 58c273c037fec5e9d4f1f4a6e42c34b5 perl-5.8.8-r3.ebuild 19128
+RMD160 bc810dd871ce1454f9e72418a74ada4f155ce782 perl-5.8.8-r3.ebuild 19128
+SHA256 eb31f2e1886392a37475a65185c51d0306e10d5e53427a51fc2b23d7f5ea0fab perl-5.8.8-r3.ebuild 19128
+MISC ChangeLog 57348 RMD160 ddb92db33796c2a0f8a139026be44d4ea5537c19 SHA1 8fb12348e5741d67b22dc1e124ded3f8e25423eb SHA256 9d749b578653f83c96dc20a5387bbae984849572c959c8c27cde037e09f97890
+MD5 7ff2c5a9f86fe23f28633ee7f9ff00d4 ChangeLog 57348
+RMD160 ddb92db33796c2a0f8a139026be44d4ea5537c19 ChangeLog 57348
+SHA256 9d749b578653f83c96dc20a5387bbae984849572c959c8c27cde037e09f97890 ChangeLog 57348
 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 RMD160 647980838c590f54441a053916ea629e53e551c0 metadata.xml 305
diff --git a/dev-lang/perl/perl-5.8.8-r2.ebuild b/dev-lang/perl/perl-5.8.8-r2.ebuild
index 8c3bb974d093..20ae23e3d5b0 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.43 2007/11/18 07:04:34 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r2.ebuild,v 1.44 2007/11/18 17:37:25 ian Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -123,7 +123,8 @@ src_unpack() {
 	# filter it otherwise configure fails. See #125535.
 	epatch ${FILESDIR}/perl-hppa-pa7200-configure.patch
 
-	epatch ${FILESDIR}/${P}-libbits.patch
+	#[[ ${get_libdir} == lib64 ]] && cd ${S} && epatch ${FILESDIR}/${P}-lib64.patch
+	use amd64 || use ppc64 && cd ${S} && epatch ${FILESDIR}/${P}-lib64.patch
 
 	[[ ${CHOST} == *-dragonfly* ]] && cd ${S} && epatch ${FILESDIR}/${P}-dragonfly-clean.patch
 	[[ ${CHOST} == *-freebsd* ]] && cd ${S} && epatch ${FILESDIR}/${P}-fbsdhints.patch
@@ -246,12 +247,6 @@ 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 03d7b18cf3fb..55352b979b02 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.9 2007/11/18 07:04:34 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r3.ebuild,v 1.10 2007/11/18 17:37:25 ian Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -123,7 +123,8 @@ src_unpack() {
 	# filter it otherwise configure fails. See #125535.
 	epatch "${FILESDIR}"/perl-hppa-pa7200-configure.patch
 
-	epatch "${FILESDIR}"/${P}-libbits.patch
+	#[[ ${get_libdir} == lib64 ]] && cd ${S} && epatch ${FILESDIR}/${P}-lib64.patch
+	use amd64 || use ppc64 && cd "${S}" && epatch "${FILESDIR}"/${P}-lib64.patch
 
 	[[ ${CHOST} == *-dragonfly* ]] && cd "${S}" && epatch "${FILESDIR}"/${P}-dragonfly-clean.patch
 	[[ ${CHOST} == *-freebsd* ]] && cd "${S}" && epatch "${FILESDIR}"/${P}-fbsdhints.patch
@@ -250,12 +251,6 @@ 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)"