libperl 5.8.8, shiny and new.

Package-Manager: portage-2.1_pre3-r1

7 files changed, 129 insertions, 21 deletions

diff --git a/sys-devel/libperl/ChangeLog b/sys-devel/libperl/ChangeLog
index 73d377999e88..6a89256d7393 100644
--- a/sys-devel/libperl/ChangeLog
+++ b/sys-devel/libperl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-devel/libperl
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/ChangeLog,v 1.97 2006/01/24 17:13:55 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/ChangeLog,v 1.98 2006/02/07 15:21:25 mcummings Exp $
+
+*libperl-5.8.8 (07 Feb 2006)
+
+  07 Feb 2006; Michael Cummings <mcummings@gentoo.org>
+  +files/libperl-5.8.8-lib64.patch, +files/libperl-5.8.8-reorder-INC.patch,
+  -files/libperl-5.8.8_rc1-reorder-INC.patch, -libperl-5.8.8_rc1.ebuild,
+  +libperl-5.8.8.ebuild:
+  libperl 5.8.8, shiny and new.
 
   24 Jan 2006; Michael Cummings <mcummings@gentoo.org>
   +files/libperl-5.8.8_rc1-reorder-INC.patch, libperl-5.8.8_rc1.ebuild:
diff --git a/sys-devel/libperl/Manifest b/sys-devel/libperl/Manifest
index b4c2ee2d0263..32cefdf21a01 100644
--- a/sys-devel/libperl/Manifest
+++ b/sys-devel/libperl/Manifest
@@ -1,13 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5b84eacbccbc52c5e12a88271862d7dd ChangeLog 14365
+MD5 8f531ce72813b8fc68d15c3fa275146b ChangeLog 14657
 MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-libperl-5.8.6 64
 MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-libperl-5.8.6-r1 64
 MD5 c10e44e47d7f702efe7d4009064a97ca files/digest-libperl-5.8.7 64
-MD5 29f64534d1e8811edf2072a58d4b600b files/digest-libperl-5.8.8_rc1 69
+MD5 f408b45cbe8f14c380ae6ffce87c01c4 files/digest-libperl-5.8.8 65
 MD5 ce442db939c59218a16be167f793b817 files/libperl-5.8.2-uclibc.patch 573
-MD5 f6c5dc893c771f72cc183c946628d35e files/libperl-5.8.8_rc1-reorder-INC.patch 3046
+MD5 b67f84d9f78688c8d1d06503241d0f6d files/libperl-5.8.8-lib64.patch 3393
+MD5 f6c5dc893c771f72cc183c946628d35e files/libperl-5.8.8-reorder-INC.patch 3046
 MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-create-libperl-soname.patch 417
 MD5 076dcbef37263d6dd7af719b55cfc2de files/libperl-noksh.patch 611
 MD5 f7324a62f22aabde3387b7e8a8b2106e files/libperl-reorder-INC.patch 1141
@@ -15,12 +16,12 @@ MD5 ce442db939c59218a16be167f793b817 files/libperl-uclibc.patch 573
 MD5 820e89622ea2fd58728c9c34fe72a5ff libperl-5.8.6-r1.ebuild 10584
 MD5 659c5dad609e390b9210cc05a4909003 libperl-5.8.6.ebuild 10588
 MD5 4bc541a781cafd9a9e54efd62d45b1e7 libperl-5.8.7.ebuild 10987
-MD5 c132f06fc62e9feaf9a4055ad81b1d64 libperl-5.8.8_rc1.ebuild 11341
+MD5 9453e190a0f92580bd4fbab285fefe6b libperl-5.8.8.ebuild 11465
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFD1mBJtG5z4I8BtQoRAnJNAKCI39bel0czmi7oWayKJqMx55wDkQCfUTrO
-ZhUVbSKEfq4FFxTSFPnY874=
-=Vgrz
+iD8DBQFD6Lr4tG5z4I8BtQoRAlvMAJoCf3qU0dG2DR7lBAYWV/VwEpkvngCfbVq0
+r/jD9dAPFwJ4Hp4HkCefkss=
+=rP17
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/libperl/files/digest-libperl-5.8.8 b/sys-devel/libperl/files/digest-libperl-5.8.8
new file mode 100644
index 000000000000..b172ce39e3ef
--- /dev/null
+++ b/sys-devel/libperl/files/digest-libperl-5.8.8
@@ -0,0 +1 @@
+MD5 a377c0c67ab43fd96eeec29ce19e8382 perl-5.8.8.tar.bz2 10123359
diff --git a/sys-devel/libperl/files/digest-libperl-5.8.8_rc1 b/sys-devel/libperl/files/digest-libperl-5.8.8_rc1
deleted file mode 100644
index ea4ce0d8601a..000000000000
--- a/sys-devel/libperl/files/digest-libperl-5.8.8_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1d7ca5a1059d91af7f6e613130c0334b perl-5.8.8-RC1.tar.bz2 10128298
diff --git a/sys-devel/libperl/files/libperl-5.8.8-lib64.patch b/sys-devel/libperl/files/libperl-5.8.8-lib64.patch
new file mode 100644
index 000000000000..dcc91846d69d
--- /dev/null
+++ b/sys-devel/libperl/files/libperl-5.8.8-lib64.patch
@@ -0,0 +1,96 @@
+--- Configure.orig	2006-02-03 16:15:00.000000000 -0500
++++ Configure	2006-02-03 16:25:04.000000000 -0500
+@@ -1256,17 +1256,24 @@ locincpth="$locincpth /opt/gnu/include /
+ : no include file wanted by default
+ inclwanted=''
+ 
++: determine libdir name
++: Should be */lib64 on x86-64, sparc64, ppc64
++case `arch` in
++  x86_64) lib='lib64';;
++  *) lib='lib';;
++esac
++  
+ groupstype=''
+ libnames=''
+ : change the next line if compiling for Xenix/286 on Xenix/386
+ xlibpth='/usr/lib/386 /lib/386'
+ : Possible local library directories to search.
+-loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
+-loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
++loclibpth="/usr/local/$lib /opt/local/$lib /usr/gnu/$lib"
++loclibpth="$loclibpth /opt/gnu/$lib /usr/GNU/$lib /opt/GNU/$lib"
+ 
+ : general looking path for locating libraries
+-glibpth="/lib /usr/lib $xlibpth"
+-glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
++glibpth="/$lib /usr/$lib $xlibpth"
++glibpth="$glibpth /usr/ccs/$lib /usr/ucblib /usr/local/$lib"
+ test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
+ test -f /shlib/libc.so     && glibpth="/shlib $glibpth"
+ 
+@@ -5951,8 +5958,8 @@ fi
+ : Reproduce behavior of 5.005 and earlier, maybe drop that in 5.7.
+ case "$installstyle" in
+ '')	case "$prefix" in
+-		*perl*) dflt='lib';;
+-		*) dflt='lib/perl5' ;;
++		*perl*) dflt='lib64';;
++		*) dflt='lib64/perl5' ;;
+ 	esac
+ 	;;
+ *)	dflt="$installstyle" ;;
+@@ -5968,8 +5975,8 @@ installstyle=$dflt
+ : /opt/perl/lib/perl5... would be redundant.
+ : The default "style" setting is made in installstyle.U
+ 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 ;;
+ esac
+ eval $prefixit
+ $cat <<EOM
+@@ -6471,8 +6478,8 @@ siteprefixexp="$ansexp"
+ prog=`echo $package | $sed 's/-*[0-9.]*$//'`
+ case "$sitelib" in
+ '') 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 ;;
+ 	esac
+ 	;;
+ *)	dflt="$sitelib"
+@@ -6598,8 +6605,8 @@ case "$vendorprefix" in
+ 	'')
+ 		prog=`echo $package | $sed 's/-*[0-9.]*$//'`
+ 		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 ;;
+ 		esac
+ 		;;
+ 	*)	dflt="$vendorlib"
+@@ -10556,9 +10563,9 @@ else
+ 		else
+ 			for net in net socket
+ 			do
+-				if test -f /usr/lib/lib$net$_a; then
+-					( ($nm $nm_opt /usr/lib/lib$net$_a | eval $nm_extract) ||  \
+-					$ar t /usr/lib/lib$net$_a) 2>/dev/null >> libc.list
++				if test -f /usr/$lib/lib$net$_a; then
++					( ($nm $nm_opt /usr/$lib/lib$net$_a | eval $nm_extract) ||  \
++					$ar t /usr/$lib/lib$net$_a) 2>/dev/null >> libc.list
+ 					if $contains socket libc.list >/dev/null 2>&1; then
+ 						d_socket="$define"
+ 						socketlib="-l$net"
+@@ -21677,6 +21684,7 @@ ldflags='$ldflags'
+ ldflags_uselargefiles='$ldflags_uselargefiles'
+ ldlibpthname='$ldlibpthname'
+ less='$less'
++lib='$lib'
+ lib_ext='$lib_ext'
+ libc='$libc'
+ libperl='$libperl'
diff --git a/sys-devel/libperl/files/libperl-5.8.8_rc1-reorder-INC.patch b/sys-devel/libperl/files/libperl-5.8.8-reorder-INC.patch
index 11c56929cf1a..11c56929cf1a 100644
--- a/sys-devel/libperl/files/libperl-5.8.8_rc1-reorder-INC.patch
+++ b/sys-devel/libperl/files/libperl-5.8.8-reorder-INC.patch
diff --git a/sys-devel/libperl/libperl-5.8.8_rc1.ebuild b/sys-devel/libperl/libperl-5.8.8.ebuild
index 487c5128d12b..97210f700e55 100644
--- a/sys-devel/libperl/libperl-5.8.8_rc1.ebuild
+++ b/sys-devel/libperl/libperl-5.8.8.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/sys-devel/libperl/libperl-5.8.8_rc1.ebuild,v 1.3 2006/01/24 17:13:55 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.8.ebuild,v 1.1 2006/02/07 15:21:25 mcummings Exp $
 
 # The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
 #
@@ -63,7 +63,7 @@ SHORT_PV="${PV%.*}"
 MY_P="perl-${PV/_rc/-RC}"
 S="${WORKDIR}/${MY_P}"
 DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
-SRC_URI="ftp://ftp.cpan.org/pub/CPAN/authors/id/N/NW/NWCLARK/${MY_P}.tar.bz2"
+SRC_URI="ftp://ftp.cpan.org/pub/CPAN/src/${MY_P}.tar.bz2"
 HOMEPAGE="http://www.perl.org"
 SLOT="${PERLSLOT}"
 LIBPERL="libperl$(get_libname ${PERLSLOT}.${SHORT_PV})"
@@ -88,7 +88,7 @@ RDEPEND="
 	berkdb? ( sys-libs/db )
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
 
-PDEPEND=">=dev-lang/perl-${PV}"
+PDEPEND="~dev-lang/perl-${PV}"
 
 pkg_setup() {
 	# I think this should rather be displayed if you *have* 'ithreads'
@@ -134,6 +134,8 @@ src_unpack() {
 
 	# we need the same @INC-inversion magic here we do in perl
 	cd ${S}; epatch ${FILESDIR}/${P}-reorder-INC.patch
+
+	use amd64 && cd ${S} && epatch ${FILESDIR}/${P}-lib64.patch
 }
 
 src_compile() {
@@ -166,10 +168,10 @@ src_compile() {
 		einfo "using ithreads"
 		mythreading="-multi"
 		myconf="-Dusethreads ${myconf}"
-		myarch=$(get_abi_CHOST)
+		myarch=${CHOST}
 		myarch="${myarch%%-*}-${osname}-thread"
 	else
-		myarch=$(get_abi_CHOST)
+		myarch=${CHOST}
 		myarch="${myarch%%-*}-${osname}"
 	fi
 
@@ -205,6 +207,7 @@ src_compile() {
 	if use debug
 	then
 		CFLAGS="${CFLAGS} -g"
+		myconf="${myconf} -DDEBUGGING"
 	fi
 
 	if use sparc
@@ -222,7 +225,7 @@ src_compile() {
 
 	[ -n "${ABI}" ] && myconf="${myconf} -Dusrinc=$(get_ml_incdir)"
 
-	[[ ${ELIBC} == "FreeBSD" ]] && myconf="${myconf} -Dlibc=/usr/lib/libc.a"
+	[[ ${ELIBC} == "FreeBSD" ]] && myconf="${myconf} -Dlibc=/usr/$(get_libdir)/libc.a"
 
 	if [[ $(get_libdir) != "lib" ]] ; then
 		myconf="${myconf} -Dlibpth='/usr/local/$(get_libdir) /$(get_libdir) \
@@ -265,14 +268,14 @@ src_install() {
 	else
 		# Need to do this, else apps do not link to dynamic version of
 		# the library ...
-		local coredir="/usr/lib/perl5/${PV}/${myarch}${mythreading}/CORE"
+		local coredir="/usr/$(get_libdir)/perl5/${PV}/${myarch}${mythreading}/CORE"
 		dodir ${coredir}
 		dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/${LIBPERL}
 		dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname ${PERLSLOT})
 		dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname)
 
 		# Fix for "stupid" modules and programs
-		dodir /usr/lib/perl5/site_perl/${PV}/${myarch}${mythreading}
+		dodir /usr/$(get_libdir)/perl5/site_perl/${PV}/${myarch}${mythreading}
 
 		make DESTDIR="${D}" \
 			INSTALLMAN1DIR="${D}/usr/share/man/man1" \
@@ -282,7 +285,7 @@ src_install() {
 		cp -f utils/h2ph utils/h2ph_patched
 
 		LD_LIBRARY_PATH=. ./perl -Ilib utils/h2ph_patched \
-			-a -d ${D}/usr/lib/perl5/${PV}/${myarch}${mythreading} <<EOF
+			-a -d ${D}/usr/$(get_libdir)/perl5/${PV}/${myarch}${mythreading} <<EOF
 asm/termios.h
 syscall.h
 syslimits.h
@@ -294,7 +297,7 @@ wait.h
 EOF
 
 		# This is to fix a missing c flag for backwards compat
-		for i in `find ${D}/usr/lib/perl5 -iname "Config.pm"`;do
+		for i in `find ${D}/usr/$(get_libdir)/perl5 -iname "Config.pm"`;do
 			sed -e "s:ccflags=':ccflags='-DPERL5 :" \
 			    -e "s:cppflags=':cppflags='-DPERL5 :" \
 				${i} > ${i}.new &&\
@@ -302,8 +305,8 @@ EOF
 		done
 
 		# A poor fix for the miniperl issues
-		dosed 's:./miniperl:/usr/bin/perl:' /usr/lib/perl5/${PV}/ExtUtils/xsubpp
-		fperms 0444 /usr/lib/perl5/${PV}/ExtUtils/xsubpp
+		dosed 's:./miniperl:/usr/bin/perl:' /usr/$(get_libdir)/perl5/${PV}/ExtUtils/xsubpp
+		fperms 0444 /usr/$(get_libdir)/perl5/${PV}/ExtUtils/xsubpp
 		dosed 's:./miniperl:/usr/bin/perl:' /usr/bin/xsubpp
 		fperms 0755 /usr/bin/xsubpp