Fix logic for applying the lib64 patch, use get_libdir to decide (should fix 32-bit userland profiles).

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

3 files changed, 16 insertions, 12 deletions

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index 182560d8e5d3..7056cb3b9acc 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/perl
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.275 2009/01/28 09:54:09 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.276 2009/03/11 21:47:17 flameeyes Exp $
+
+  11 Mar 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  perl-5.8.8-r6.ebuild:
+  Fix logic for applying the lib64 patch, use get_libdir to decide (should
+  fix 32-bit userland profiles).
 
 *perl-5.8.8-r6 (28 Jan 2009)
 
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index a46b50139d71..c29612aa0639 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -30,13 +30,13 @@ EBUILD perl-5.8.8-r2.ebuild 18896 RMD160 50dea3ec5837278cae6a39da93f489e8044a278
 EBUILD perl-5.8.8-r3.ebuild 19135 RMD160 ca0b9eb44dc513f36d5c5f3e5737bb905302aa4e SHA1 89ad554b2a3b1d8ef68ab613a6f58879cece5615 SHA256 accc5dfa49afc829439d6a9bd4b1cb4de6752f4bada5800555c2f3511d782b09
 EBUILD perl-5.8.8-r4.ebuild 19134 RMD160 3e9ce03261a16fe7b7bf1a5f1d60e2b327baa47b SHA1 76c394bed4e3cecd186cb79e7e11d0bd07860705 SHA256 32664950c3a585ac8f3ab91df8528b9d8cb4974112df39123218960b68a03b95
 EBUILD perl-5.8.8-r5.ebuild 19212 RMD160 b693b4e8b81979178d2df73b26753652b19f60ca SHA1 0adc7b96cdca57bd2195e6c3f7df00415c7c446a SHA256 526506064432153284dc446d0f613104fbfabcff93ad917db7da920f9f296ad9
-EBUILD perl-5.8.8-r6.ebuild 19281 RMD160 4812f16b14d2508cb00fe57466f7803c13ad309b SHA1 93ef5256544180ae47df9afc21ba834dcacfc1f3 SHA256 c51e0666a11089e9a45d9785b0fadc91dfdaad1ff9c8124f0d98b5f6e7957ecc
-MISC ChangeLog 59451 RMD160 30c2aa531e971927bb5e6bc7b55541a0a7bb15bb SHA1 fea2dff710e636e8d814474e6269ace1f6f0baa6 SHA256 a318e4f285a48e76c39087d84969b5ccb54d126a05dc63ce01e1d01c326a4c30
+EBUILD perl-5.8.8-r6.ebuild 19205 RMD160 34c37e049dac215dc40ccde433e915b22e8eb38e SHA1 e2ac6b04733991806ace3651551d3085c7c58319 SHA256 48ebbac92aeccdcf37b446c689e6e76287c450771420488a95c0fb7cf671083d
+MISC ChangeLog 59645 RMD160 b68bc58a56ceebe8d884a570d671fb263301029f SHA1 5f2f4e59a1908970a20eeedd26e337c57e49366a SHA256 70b393a34b5e7cb4363e7dc04a682b49b8ca28565b48c6084a3a9b8c6d604c24
 MISC metadata.xml 451 RMD160 8424230d79d13df7462c454050058b3526a78e92 SHA1 1ae85db5c1c1fc6413ca324ebc93b6894831b437 SHA256 49e06011c113616fa1f618cf58d42c2d6abbce5f71936f109b6ae3a5dfff587c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkmAKycACgkQV3J2n04EauzY5wCfU64uC/FJiaaBbdSHS+0Q43E4
-SlgAn1KFY907+DjYTQgfoRGHEcvzxNxb
-=9+w7
+iEYEARECAAYFAkm4MYMACgkQAiZjviIA2Xg7FQCgr5xA3AQ4X4tmHN1I04yWY8lw
+9h0AoLwsDG4Rh/bXoBlFlxwmFxDr56Yu
+=N2Lm
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/perl/perl-5.8.8-r6.ebuild b/dev-lang/perl/perl-5.8.8-r6.ebuild
index 7ac0c9eab671..02c3fa42ae5e 100644
--- a/dev-lang/perl/perl-5.8.8-r6.ebuild
+++ b/dev-lang/perl/perl-5.8.8-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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-r6.ebuild,v 1.1 2009/01/28 09:54:09 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r6.ebuild,v 1.2 2009/03/11 21:47:17 flameeyes 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
+	[[ $(get_libdir) == lib64 ]] && 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
@@ -344,7 +343,7 @@ EOF
 	# This is to fix a missing c flag for backwards compat
 	for i in `find "${D}"/usr/$(get_libdir)/perl5 -iname "Config.pm"`;do
 		sed -e "s:ccflags=':ccflags='-DPERL5 :" \
-		    -e "s:cppflags=':cppflags='-DPERL5 :" \
+			-e "s:cppflags=':cppflags='-DPERL5 :" \
 			${i} > ${i}.new &&\
 			mv ${i}.new ${i} || die "Sed failed"
 	done
@@ -609,7 +608,7 @@ pkg_postinst() {
 		# Silently remove the now empty dirs
 		for DIR in $INC; do
 		   if [[ -d "${ROOT}"/$DIR ]]; then
-		   	find "${ROOT}"/$DIR -depth -type d | xargs -r rmdir &> /dev/null
+			find "${ROOT}"/$DIR -depth -type d | xargs -r rmdir &> /dev/null
 		   fi
 		done
 		ebegin "Generating ConfigLocal.pm (ignore any error)"