Perl 5.8.8, with amd64 fixes, RUNPATH fixes, a completely reversed INC, and a shiny set of changes.

(Portage version: 2.1_pre3-r1)

10 files changed, 362 insertions, 73 deletions

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index 55fac6f27053..86bf67ba06bb 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-lang/perl
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.188 2006/01/24 17:15:13 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.189 2006/02/07 15:20:50 mcummings Exp $
+
+*perl-5.8.8 (07 Feb 2006)
+
+  07 Feb 2006; Michael Cummings <mcummings@gentoo.org>
+  +files/perl-5.8.8-CAN-2005-0448-rmtree.patch,
+  +files/perl-5.8.8-USE_MM_LD_RUN_PATH.patch, +files/perl-5.8.8-lib64.patch,
+  +files/perl-5.8.8-links.patch, +files/perl-5.8.8-reorder-INC.patch,
+  -files/perl-5.8.8_rc1-CAN-2005-0448-rmtree.patch,
+  -files/perl-5.8.8_rc1-reorder-INC.patch, -perl-5.8.8_rc1.ebuild,
+  +perl-5.8.8.ebuild:
+  Perl 5.8.8, with amd64 fixes, RUNPATH fixes, a completely reversed INC, and
+  a shiny set of changes.
 
   24 Jan 2006; Michael Cummings <mcummings@gentoo.org>
   +files/perl-5.8.8_rc1-reorder-INC.patch, perl-5.8.8_rc1.ebuild:
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index fbce2095a49b..ab0adbfcf192 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 6e743f7b9d93319ad66ad8007d0d980d ChangeLog 47566
 MD5 bd75f0242e3b7791803d089c38a3f920 files/CAN-2005-0156-suid.patch 703
 MD5 2bd41aec5e22962224dc9376e27bdde3 files/CAN-2005-0448-rmtree.patch 7629
@@ -12,7 +9,7 @@ MD5 c10e44e47d7f702efe7d4009064a97ca files/digest-perl-5.8.7 64
 MD5 c10e44e47d7f702efe7d4009064a97ca files/digest-perl-5.8.7-r1 64
 MD5 c10e44e47d7f702efe7d4009064a97ca files/digest-perl-5.8.7-r2 64
 MD5 c10e44e47d7f702efe7d4009064a97ca files/digest-perl-5.8.7-r3 64
-MD5 29f64534d1e8811edf2072a58d4b600b files/digest-perl-5.8.8_rc1 69
+MD5 f408b45cbe8f14c380ae6ffce87c01c4 files/digest-perl-5.8.8 65
 MD5 154013a841cbb251d7b63fb006b4006f files/file_path_rmtree.patch 1068
 MD5 44e1f1420947cc552c66fb434ba4c855 files/perl-5.8.4-NDBM-GDBM-compat.patch 428
 MD5 5dfd23c2236b382d031a9513bc12f3f1 files/perl-5.8.5-tempfiles.patch 2113
@@ -21,8 +18,11 @@ MD5 fd8a46de4b22dbf9146a6d0459e812c4 files/perl-5.8.7-CAN-2005-0448-rmtree.patch
 MD5 044b90a8895f8a03bef8e4cf5759eecc files/perl-5.8.7-MakeMaker-RUNPATH.patch 859
 MD5 528fa2521c530d5a47df32b663e629af files/perl-5.8.7-regexp-nossp.patch 460
 MD5 26a1e7c48c7f68f39db4262500f6a1d8 files/perl-5.8.7-tempfiles.patch 1007
-MD5 fd8a46de4b22dbf9146a6d0459e812c4 files/perl-5.8.8_rc1-CAN-2005-0448-rmtree.patch 6961
-MD5 f6c5dc893c771f72cc183c946628d35e files/perl-5.8.8_rc1-reorder-INC.patch 3046
+MD5 fd8a46de4b22dbf9146a6d0459e812c4 files/perl-5.8.8-CAN-2005-0448-rmtree.patch 6961
+MD5 93a7b749eec75f6ba4bc7c4edf3a0ccd files/perl-5.8.8-USE_MM_LD_RUN_PATH.patch 4963
+MD5 b67f84d9f78688c8d1d06503241d0f6d files/perl-5.8.8-lib64.patch 3393
+MD5 e1310772583a085881cd30e53546410d files/perl-5.8.8-links.patch 2925
+MD5 f6c5dc893c771f72cc183c946628d35e files/perl-5.8.8-reorder-INC.patch 3046
 MD5 c2612d59f380ad6e0c2de4d941e83dfd files/perl-cleaner 8879
 MD5 cc54c9f18cd584f4cac0ec109eae9335 files/perl-exp_intwrap.patch 1635
 MD5 060e9f10466fdc1268c75a7cf4dcbc7c files/perl-h2ph-ansi-header.patch 446
@@ -44,11 +44,4 @@ MD5 36f0bd0344966231663c7d99c94d3997 perl-5.8.7-r1.ebuild 19456
 MD5 3f172d664435893f2cfaaf21865c6cb7 perl-5.8.7-r2.ebuild 19525
 MD5 4f26a59cea9d114b7ee5e3e338df38df perl-5.8.7-r3.ebuild 19608
 MD5 8617318edb0a9de62024383369894fd2 perl-5.8.7.ebuild 19224
-MD5 5f8f6e58a90510d80087aa68ab862e98 perl-5.8.8_rc1.ebuild 19673
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD4DBQFD1mCYtG5z4I8BtQoRArPPAJi6CUm6sXnTn90+FpW2AouC4TEiAJ0SJSKc
-x6OziTq6sgJXTT04neYaYw==
-=UOTq
------END PGP SIGNATURE-----
+MD5 dd1ab21cb4fa851372b717011ba360e5 perl-5.8.8.ebuild 19143
diff --git a/dev-lang/perl/files/digest-perl-5.8.8 b/dev-lang/perl/files/digest-perl-5.8.8
new file mode 100644
index 000000000000..b172ce39e3ef
--- /dev/null
+++ b/dev-lang/perl/files/digest-perl-5.8.8
@@ -0,0 +1 @@
+MD5 a377c0c67ab43fd96eeec29ce19e8382 perl-5.8.8.tar.bz2 10123359
diff --git a/dev-lang/perl/files/digest-perl-5.8.8_rc1 b/dev-lang/perl/files/digest-perl-5.8.8_rc1
deleted file mode 100644
index ea4ce0d8601a..000000000000
--- a/dev-lang/perl/files/digest-perl-5.8.8_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1d7ca5a1059d91af7f6e613130c0334b perl-5.8.8-RC1.tar.bz2 10128298
diff --git a/dev-lang/perl/files/perl-5.8.8_rc1-CAN-2005-0448-rmtree.patch b/dev-lang/perl/files/perl-5.8.8-CAN-2005-0448-rmtree.patch
index 0bee3e107ebf..0bee3e107ebf 100644
--- a/dev-lang/perl/files/perl-5.8.8_rc1-CAN-2005-0448-rmtree.patch
+++ b/dev-lang/perl/files/perl-5.8.8-CAN-2005-0448-rmtree.patch
diff --git a/dev-lang/perl/files/perl-5.8.8-USE_MM_LD_RUN_PATH.patch b/dev-lang/perl/files/perl-5.8.8-USE_MM_LD_RUN_PATH.patch
new file mode 100644
index 000000000000..edcfc6a41b53
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.8-USE_MM_LD_RUN_PATH.patch
@@ -0,0 +1,111 @@
+diff -Naurp perl-5.8.8-orig/lib/ExtUtils/Liblist.pm perl-5.8.8/lib/ExtUtils/Liblist.pm
+--- perl-5.8.8-orig/lib/ExtUtils/Liblist.pm	2003-04-07 14:58:17.000000000 -0400
++++ perl-5.8.8/lib/ExtUtils/Liblist.pm	2006-02-07 09:57:04.000000000 -0500
+@@ -87,6 +87,11 @@ libraries.  LD_RUN_PATH is a colon separ
+ in LDLOADLIBS. It is passed as an environment variable to the process
+ that links the shared library.
+ 
++The Red Hat extension: This generation of LD_RUN_PATH is disabled by default.
++To use the generated LD_RUN_PATH for all links, set the USE_MM_LD_RUN_PATH
++MakeMaker object attribute / argument, (or set the $USE_MM_LD_RUN_PATH
++environment variable).
++
+ =head2 BSLOADLIBS
+ 
+ List of those libraries that are needed but can be linked in
+diff -Naurp perl-5.8.8-orig/lib/ExtUtils/MM_Unix.pm perl-5.8.8/lib/ExtUtils/MM_Unix.pm
+--- perl-5.8.8-orig/lib/ExtUtils/MM_Unix.pm	2005-05-21 05:42:56.000000000 -0400
++++ perl-5.8.8/lib/ExtUtils/MM_Unix.pm	2006-02-07 09:56:08.000000000 -0500
+@@ -941,7 +941,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $
+     }
+ 
+     my $ld_run_path_shell = "";
+-    if ($self->{LD_RUN_PATH} ne "") {
++	if (($self->{LD_RUN_PATH} ne "") && ($self->{USE_MM_LD_RUN_PATH})) {
+ 	$ld_run_path_shell = 'LD_RUN_PATH="$(LD_RUN_PATH)" ';
+     }
+ 
+diff -Naurp perl-5.8.8-orig/lib/ExtUtils/MakeMaker.pm perl-5.8.8/lib/ExtUtils/MakeMaker.pm
+--- perl-5.8.8-orig/lib/ExtUtils/MakeMaker.pm	2005-10-21 10:11:04.000000000 -0400
++++ perl-5.8.8/lib/ExtUtils/MakeMaker.pm	2006-02-07 09:55:03.000000000 -0500
+@@ -233,7 +233,7 @@ sub full_setup {
+     PERL_SRC PERM_RW PERM_RWX
+     PL_FILES PM PM_FILTER PMLIBDIRS POLLUTE PPM_INSTALL_EXEC
+     PPM_INSTALL_SCRIPT PREREQ_FATAL PREREQ_PM PREREQ_PRINT PRINT_PREREQ
+-    SIGN SKIP TYPEMAPS VERSION VERSION_FROM XS XSOPT XSPROTOARG
++	SKIP TYPEMAPS USE_MM_LD_RUN_PATH VERSION VERSION_FROM XS XSOPT XSPROTOARG
+     XS_VERSION clean depend dist dynamic_lib linkext macro realclean
+     tool_autosplit
+ 
+@@ -371,6 +371,26 @@ sub new {
+         exit 0;
+    }
+ 
++    # USE_MM_LD_RUN_PATH - borrowed from RedHat to disable automatic RPATH generation
++    if ( ( ! $self->{USE_MM_LD_RUN_PATH} )
++       &&( ("@ARGV" =~ /\bUSE_MM_LD_RUN_PATH(=([01]))?\b/)
++        ||( exists( $ENV{USE_MM_LD_RUN_PATH} )
++           &&( $ENV{USE_MM_LD_RUN_PATH} =~ /([01])?$/ )
++           )
++        )
++       )
++    {
++       my $v = $1;
++       if( $v )
++       {
++           $v = ($v=~/=([01])$/)[0];
++       }else
++       {
++           $v = 1;
++       };
++       $self->{USE_MM_LD_RUN_PATH}=$v;
++    };
++
+     print STDOUT "MakeMaker (v$VERSION)\n" if $Verbose;
+     if (-f "MANIFEST" && ! -f "Makefile"){
+         check_manifest();
+@@ -2057,6 +2077,44 @@ precedence.  A typemap in the current di
+ precedence, even if it isn't listed in TYPEMAPS.  The default system
+ typemap has lowest precedence.
+ 
++=item USE_MM_LD_RUN_PATH
++
++boolean
++This feature is borrowed from Red Hat to deal with RPATH issues.
++Please see bug 81745 - http://bugs.gentoo.org/81745 - for more
++information.
++
++The Red Hat perl MakeMaker distribution differs from the standard
++upstream release in that it disables use of the MakeMaker generated
++LD_RUN_PATH by default, UNLESS this attribute is specified , or the
++USE_MM_LD_RUN_PATH environment variable is set during the MakeMaker run.
++
++The upstream MakeMaker will set the ld(1) environment variable LD_RUN_PATH
++to the concatenation of every -L ld(1) option directory in which a -l ld(1)
++option library is found, which is used as the ld(1) -rpath option if none
++is specified. This means that, if your application builds shared libraries
++and your MakeMaker application links to them, that the absolute paths of the
++libraries in the build tree will be inserted into the RPATH header of all
++MakeMaker generated binaries, and that such binaries will be unable to link
++to these libraries if they do not still reside in the build tree directories
++(unlikely) or in the system library directories (/lib or /usr/lib), regardless
++of any LD_LIBRARY_PATH setting. So if you specified -L../mylib -lmylib , and
++your 'libmylib.so' gets installed into /some_directory_other_than_usr_lib,
++your MakeMaker application will be unable to link to it, even if LD_LIBRARY_PATH
++is set to include /some_directory_other_than_usr_lib, because RPATH overrides
++LD_LIBRARY_PATH.
++
++So for Red Hat MakeMaker builds LD_RUN_PATH is NOT generated by default for
++every link. You can still use explicit -rpath ld options or the LD_RUN_PATH
++environment variable during the build to generate an RPATH for the binaries.
++
++You can set the USE_MM_LD_RUN_PATH attribute to 1 on the MakeMaker command
++line or in the WriteMakefile arguments to enable generation of LD_RUN_PATH
++for every link command.
++
++USE_MM_LD_RUN_PATH will default to 1 (LD_RUN_PATH will be used) IF the
++$USE_MM_LD_RUN_PATH environment variable is set during a MakeMaker run.
++
+ =item VENDORPREFIX
+ 
+ Like PERLPREFIX, but only for the vendor install locations.
diff --git a/dev-lang/perl/files/perl-5.8.8-lib64.patch b/dev-lang/perl/files/perl-5.8.8-lib64.patch
new file mode 100644
index 000000000000..dcc91846d69d
--- /dev/null
+++ b/dev-lang/perl/files/perl-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/dev-lang/perl/files/perl-5.8.8-links.patch b/dev-lang/perl/files/perl-5.8.8-links.patch
new file mode 100644
index 000000000000..22e74b3a68be
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.8-links.patch
@@ -0,0 +1,86 @@
+--- lib/CPAN/FirstTime.pm.orig	2006-02-06 07:50:13.000000000 -0500
++++ lib/CPAN/FirstTime.pm	2006-02-06 07:50:28.000000000 -0500
+@@ -292,7 +292,7 @@ by ENTER.
+     my(@path) = split /$Config{'path_sep'}/, $ENV{'PATH'};
+     local $^W = $old_warn;
+     my $progname;
+-    for $progname (qw/gzip tar unzip make lynx wget ncftpget ncftp ftp gpg/){
++    for $progname (qw/gzip tar unzip make links lynx wget ncftpget ncftp ftp gpg/){
+       if ($^O eq 'MacOS') {
+           $CPAN::Config->{$progname} = 'not_here';
+           next;
+--- lib/CPAN.pm.orig	2006-02-06 07:54:43.000000000 -0500
++++ lib/CPAN.pm	2006-02-06 07:52:59.000000000 -0500
+@@ -2604,7 +2604,7 @@ sub hosthard {
+ 
+ 	$self->debug("localizing funkyftpwise[$url]") if $CPAN::DEBUG;
+ 	my($f,$funkyftp);
+-	for $f ('lynx','ncftpget','ncftp','wget') {
++	for $f ('links','lynx','ncftpget','ncftp','wget') {
+ 	  next unless exists $CPAN::Config->{$f};
+ 	  $funkyftp = $CPAN::Config->{$f};
+ 	  next unless defined $funkyftp;
+@@ -2613,7 +2613,7 @@ sub hosthard {
+ 	  ($asl_ungz = $aslocal) =~ s/\.gz//;
+           $asl_gz = "$asl_ungz.gz";
+ 	  my($src_switch) = "";
+-	  if ($f eq "lynx"){
++	  if (($f eq "lynx")||($f eq "links")){
+ 	    $src_switch = " -source";
+ 	  } elsif ($f eq "ncftp"){
+ 	    $src_switch = " -c";
+@@ -2637,10 +2637,14 @@ Trying with "$funkyftp$src_switch" to ge
+ 	  my($wstatus);
+ 	  if (($wstatus = system($system)) == 0
+ 	      &&
+-	      ($f eq "lynx" ?
++	      (($f eq "lynx" ?
+ 	       -s $asl_ungz # lynx returns 0 when it fails somewhere
+ 	       : 1
+-	      )
++	      )||
++	      ($f eq "links" ?
++	       -s $asl_ungz # links returns 0 when it fails somewhere
++	       : 1
++	      ))
+ 	     ) {
+ 	    if (-s $aslocal) {
+ 	      # Looks good
+@@ -2695,7 +2699,7 @@ returned status $estatus (wstat $wstatus
+ });
+ 	  }
+           return if $CPAN::Signal;
+-	} # lynx,ncftpget,ncftp
++	} # links,lynx,ncftpget,ncftp
+     } # host
+ }
+ 
+@@ -6022,7 +6026,7 @@ stalled.
+ 
+ The CPAN module is designed to automate the make and install of perl
+ modules and extensions. It includes some primitive searching capabilities and
+-knows how to use Net::FTP or LWP (or lynx or an external ftp client)
++knows how to use Net::FTP or LWP (or lynx or links or an external ftp client)
+ to fetch the raw data from the net.
+ 
+ Modules are fetched from one or more of the mirrored CPAN
+@@ -6975,16 +6979,18 @@ or
+ 
+ =back
+ 
+-=head2 Configuring lynx or ncftp for going through a firewall
++=head2 Configuring links or lynx or ncftp for going through a firewall
+ 
+ If you can go through your firewall with e.g. lynx, presumably with a
+ command such as
+ 
+     /usr/local/bin/lynx -pscott:tiger
++    /usr/local/bin/links -pscott:tiger
+ 
+ then you would configure CPAN.pm with the command
+ 
+     o conf lynx "/usr/local/bin/lynx -pscott:tiger"
++    o conf links "/usr/local/bin/links -pscott:tiger"
+ 
+ That's all. Similarly for ncftp or ftp, you would configure something
+ like
diff --git a/dev-lang/perl/files/perl-5.8.8_rc1-reorder-INC.patch b/dev-lang/perl/files/perl-5.8.8-reorder-INC.patch
index 11c56929cf1a..11c56929cf1a 100644
--- a/dev-lang/perl/files/perl-5.8.8_rc1-reorder-INC.patch
+++ b/dev-lang/perl/files/perl-5.8.8-reorder-INC.patch
diff --git a/dev-lang/perl/perl-5.8.8_rc1.ebuild b/dev-lang/perl/perl-5.8.8.ebuild
index 875fdf9d8d65..fca0f13f9274 100644
--- a/dev-lang/perl/perl-5.8.8_rc1.ebuild
+++ b/dev-lang/perl/perl-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/dev-lang/perl/perl-5.8.8_rc1.ebuild,v 1.2 2006/01/24 17:15:13 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8.ebuild,v 1.1 2006/02/07 15:20:50 mcummings Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -12,14 +12,14 @@ MY_P="perl-${PV/_rc/-RC}"
 MY_PV="${PV%_rc*}"
 DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
 S="${WORKDIR}/${MY_P}"
-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/"
 LIBPERL="libperl$(get_libname ${PERLSLOT}.${SHORT_PV})"
 
 LICENSE="Artistic GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="berkdb debug doc gdbm ithreads perlsuid build minimal"
+IUSE="berkdb debug doc gdbm ithreads perlsuid build"
 PERL_OLDVERSEN="5.8.0 5.8.2 5.8.4 5.8.5 5.8.6 5.8.7"
 
 DEPEND="berkdb? ( sys-libs/db )
@@ -33,11 +33,33 @@ RDEPEND="~sys-devel/libperl-${PV}
 	berkdb? ( sys-libs/db )
 	gdbm? ( >=sys-libs/gdbm-1.8.3 )"
 
-PDEPEND="app-admin/perl-cleaner
-		>=perl-core/PodParser-1.32
-		>=perl-core/Test-Harness-2.56
-		>=perl-core/Test-Simple-0.62
-		>=perl-core/ExtUtils-MakeMaker-6.30"
+PDEPEND="app-admin/perl-cleaner"
+
+PROVIDE="virtual/perl-CGI-3.15
+		virtual/perl-DB_File-1.814
+		virtual/perl-digest-base-1.00
+		virtual/perl-Digest-MD5-2.36
+		virtual/perl-ExtUtils-MakeMaker-6.30
+		virtual/perl-File-Spec-3.15
+		virtual/perl-File-Temp-0.16
+		virtual/perl-Getopt-Long-2.35
+		virtual/perl-MIME-Base64-3.07
+		virtual/perl-Math-BigInt-1.77
+		virtual/perl-Memoize-1.01
+		virtual/perl-PodParser-1.32
+		virtual/perl-Safe-2.12
+		virtual/perl-Scalar-List-Utils-1.18
+		virtual/perl-Storable-2.15
+		virtual/perl-Sys-Syslog-0.13
+		virtual/perl-Test-1.25
+		virtual/perl-Test-Harness-2.56
+		virtual/perl-Test-Simple-0.62
+		virtual/perl-Text-Balanced-1.95
+		virtual/perl-Time-HiRes-1.86
+		virtual/perl-Time-Local-1.11
+		virtual/perl-libnet-1.19
+		virtual/perl-locale-maketext-1.09
+		virtual/perl-net-ping-2.31"
 
 pkg_setup() {
 	# I think this should rather be displayed if you *have* 'ithreads'
@@ -52,14 +74,6 @@ pkg_setup() {
 		epause 5
 	fi
 
-	if use minimal
-	then
-		ewarn "You have the minimal USE flag set. The resulting"
-		ewarn "perl is stripped of most of its module functionality"
-		ewarn "and is intended for minmal use case where you need"
-		ewarn "just the perl interpreter, no extras."
-	fi
-
 	if [ ! -f "${ROOT}/usr/$(get_libdir)/${LIBPERL}" ]
 	then
 		# Make sure we have libperl installed ...
@@ -104,23 +118,6 @@ src_unpack() {
 	# rac 2004.06.09
 	cd ${S}; epatch ${FILESDIR}/${PN}-noksh.patch
 
-	# this one only affects sparc64, as best weeve and rac can tell,
-	# but seems sane for all linux.  we don't have to worry about
-	# drifting into obscure SysV non-posix semantics, and the current
-	# code in IO.xs that checks for this sort of thing dies in LDAP on
-	# sparc64.
-
-	#epatch ${FILESDIR}/${PN}-nonblock.patch
-
-	# since we build in non-world-writeable portage directories, none
-	# of the .t sections of the original version of this patch matter
-	# much.  the PPPort section is apparently obsolete, because i see
-	# no /tmp in there now.  ditto on perlbug.SH, which has secure
-	# tempfile handling if resources are present.  originally from bug
-	# 66360.
-
-	#epatch ${FILESDIR}/${P}-tempfiles.patch
-
 	# We do not want the build root in the linked perl module's RUNPATH, so
 	# strip paths containing PORTAGE_TMPDIR if its set.  This is for the
 	# MakeMaker module, bug #105054.
@@ -132,10 +129,12 @@ src_unpack() {
 	# temporally disable ssp on two regexp files till upstream has a 
 	# chance to work it out. Bug #97452
 	[[ -n $(test-flags -fno-stack-protector) ]] && \
-		epatch "${FILESDIR}"/${PN}-regexp-nossp.patch
+		epatch ${FILESDIR}/${PN}-regexp-nossp.patch
+
+	use amd64 && cd ${S} && epatch ${FILESDIR}/${P}-lib64.patch
 
-	# Bug 114113
-	#cd ${S}; epatch ${FILESDIR}/perl-exp_intwrap.patch
+	cd ${S}; epatch ${FILESDIR}/${P}-USE_MM_LD_RUN_PATH.patch
+	cd ${S}; epatch ${FILESDIR}/${P}-links.patch
 
 }
 
@@ -169,10 +168,10 @@ src_configure() {
 		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
 
@@ -216,6 +215,7 @@ src_configure() {
 	if use debug
 	then
 		CFLAGS="${CFLAGS} -g"
+		myconf="${myconf} -DDEBUGGING"
 	fi
 
 	if use sparc
@@ -231,11 +231,10 @@ src_configure() {
 
 	[ -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) \
-		/usr/$(get_libdir)'"
+		myconf="${myconf} -Dlibpth='/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)'"
 	fi
 
 	sh Configure -des \
@@ -284,17 +283,17 @@ src_install() {
 
 	# Need to do this, else apps do not link to dynamic version of
 	# the library ...
-	local coredir="/usr/lib/perl5/${MY_PV}/${myarch}${mythreading}/CORE"
+	local coredir="/usr/$(get_libdir)/perl5/${MY_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/${MY_PV}/${myarch}${mythreading}
+	dodir /usr/$(get_libdir)/perl5/site_perl/${MY_PV}/${myarch}${mythreading}
 
 	local installtarget=install
-	if use minimal || use build ; then
+	if use build ; then
 		installtarget=install.perl
 	fi
 	make DESTDIR="${D}" ${installtarget} || die "Unable to make ${installtarget}"
@@ -307,7 +306,7 @@ src_install() {
 
 
 	LD_LIBRARY_PATH=. ./perl -Ilib utils/h2ph_patched \
-		-a -d ${D}/usr/lib/perl5/${MY_PV}/${myarch}${mythreading} <<EOF
+		-a -d ${D}/usr/$(get_libdir)/perl5/${MY_PV}/${myarch}${mythreading} <<EOF
 asm/termios.h
 syscall.h
 syslimits.h
@@ -319,7 +318,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 &&\
@@ -327,8 +326,8 @@ EOF
 	done
 
 	# A poor fix for the miniperl issues
-	dosed 's:./miniperl:/usr/bin/perl:' /usr/lib/perl5/${MY_PV}/ExtUtils/xsubpp
-	fperms 0444 /usr/lib/perl5/${MY_PV}/ExtUtils/xsubpp
+	dosed 's:./miniperl:/usr/bin/perl:' /usr/$(get_libdir)/perl5/${MY_PV}/ExtUtils/xsubpp
+	fperms 0444 /usr/$(get_libdir)/perl5/${MY_PV}/ExtUtils/xsubpp
 	dosed 's:./miniperl:/usr/bin/perl:' /usr/bin/xsubpp
 	fperms 0755 /usr/bin/xsubpp
 
@@ -373,7 +372,7 @@ EOF
 	rm -f ${D}/usr/share/man/man1/podselect*
 	rm -f ${D}/usr/share/man/man1/prove*
 	rm -f ${D}/usr/share/man/man1/instmodsh*
-	if use minimal || use build ; then
+	if use build ; then
 		src_remove_extra_files
 	fi
 
@@ -553,14 +552,6 @@ src_remove_extra_files()
 	${prV}/warnings.pm
 	${prV}/warnings/register.pm"
 
-	# Catch the headers in CORE
-	if use minimal ; then
-		for header in `find ${D}${prVA} -name "*.h"|sed -e "s:${D}::g"`; do
-			#header=`echo $head|sed -e "s:${D}::g"`
-			MINIMAL_PERL_INSTALL="${MINIMAL_PERL_INSTALL}
-			$header"
-		done
-	fi
 
 	if use perlsuid ; then
 		MINIMAL_PERL_INSTALL="${MINIMAL_PERL_INSTALL}