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

(Portage version: 2.1.3.9)

4 files changed, 33 insertions, 18 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/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)"