Some tweaks to libperl-5.8.8 installation

(Portage version: 2.1_pre3-r1)

4 files changed, 102 insertions, 14 deletions

diff --git a/sys-devel/libperl/ChangeLog b/sys-devel/libperl/ChangeLog
index 4f28fcf17db8..73d377999e88 100644
--- a/sys-devel/libperl/ChangeLog
+++ b/sys-devel/libperl/ChangeLog
@@ -1,6 +1,10 @@
 # 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.96 2006/01/22 22:28:48 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/ChangeLog,v 1.97 2006/01/24 17:13:55 mcummings Exp $
+
+  24 Jan 2006; Michael Cummings <mcummings@gentoo.org>
+  +files/libperl-5.8.8_rc1-reorder-INC.patch, libperl-5.8.8_rc1.ebuild:
+  Some tweaks to libperl-5.8.8 installation
 
   22 Jan 2006; Michael Cummings <mcummings@gentoo.org>
   libperl-5.8.8_rc1.ebuild:
diff --git a/sys-devel/libperl/Manifest b/sys-devel/libperl/Manifest
index 771d99fd160b..606e85bdb355 100644
--- a/sys-devel/libperl/Manifest
+++ b/sys-devel/libperl/Manifest
@@ -1,12 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 4323e8acb0316f56cff43622e3366f1b ChangeLog 14193
 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 ce442db939c59218a16be167f793b817 files/libperl-5.8.2-uclibc.patch 573
+MD5 f6c5dc893c771f72cc183c946628d35e files/libperl-5.8.8_rc1-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
@@ -14,12 +12,5 @@ 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 9ad37c2c3b25a2918c497617c9df4d74 libperl-5.8.8_rc1.ebuild 11342
+MD5 0a6f6dcc001e75875a8ee6602e3d46e5 libperl-5.8.8_rc1.ebuild 11341
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFD1AcatG5z4I8BtQoRAiU7AJ42LY83ePMU5lqLZoOjYDXihKOGKACeM+vJ
-BUD4vexSUDfUyudDJ/N2CSs=
-=SR8E
------END PGP SIGNATURE-----
diff --git a/sys-devel/libperl/files/libperl-5.8.8_rc1-reorder-INC.patch b/sys-devel/libperl/files/libperl-5.8.8_rc1-reorder-INC.patch
new file mode 100644
index 000000000000..11c56929cf1a
--- /dev/null
+++ b/sys-devel/libperl/files/libperl-5.8.8_rc1-reorder-INC.patch
@@ -0,0 +1,93 @@
+--- perl.c.orig	2006-01-24 09:57:33.000000000 -0500
++++ perl.c	2006-01-24 10:03:15.000000000 -0500
+@@ -4777,9 +4777,9 @@ S_init_perllib(pTHX)
+     incpush(APPLLIB_EXP, TRUE, TRUE, TRUE);
+ #endif
+ 
+-#ifdef ARCHLIB_EXP
+-    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
+-#endif
++    /* for configuration where /usr is mounted ro (CPAN::Config, Net::Config) */
++    incpush("/etc/perl", FALSE, FALSE, TRUE);
++
+ #ifdef MACOS_TRADITIONAL
+     {
+ 	Stat_t tmpstatbuf;
+@@ -4806,51 +4806,58 @@ S_init_perllib(pTHX)
+ #endif
+ #if defined(WIN32)
+     incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
+-#else
+-    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
+ #endif
+ 
+-#ifdef SITEARCH_EXP
+-    /* sitearch is always relative to sitelib on Windows for
++#ifdef PERL_VENDORARCH_EXP
++    /* vendorarch is always relative to vendorlib on Windows for
+      * DLL-based path intuition to work correctly */
+ #  if !defined(WIN32)
+-    incpush(SITEARCH_EXP, FALSE, FALSE, TRUE);
++    incpush(PERL_VENDORARCH_EXP, FALSE, FALSE, TRUE);
+ #  endif
+ #endif
+ 
+-#ifdef SITELIB_EXP
++#ifdef PERL_VENDORLIB_EXP
+ #  if defined(WIN32)
+-    /* this picks up sitearch as well */
+-    incpush(SITELIB_EXP, TRUE, FALSE, TRUE);
++    incpush(PERL_VENDORLIB_EXP, TRUE, FALSE, TRUE);	/* this picks up vendorarch as well */
+ #  else
+-    incpush(SITELIB_EXP, FALSE, FALSE, TRUE);
++    incpush(PERL_VENDORLIB_EXP, FALSE, FALSE, TRUE);
+ #  endif
+ #endif
+ 
+-#ifdef SITELIB_STEM /* Search for version-specific dirs below here */
+-    incpush(SITELIB_STEM, FALSE, TRUE, TRUE);
++#ifdef PERL_VENDORLIB_STEM /* Search for version-specific dirs below here */
++    incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE);
+ #endif
+ 
+-#ifdef PERL_VENDORARCH_EXP
+-    /* vendorarch is always relative to vendorlib on Windows for
++#ifdef SITEARCH_EXP
++    /* sitearch is always relative to sitelib on Windows for
+      * DLL-based path intuition to work correctly */
+ #  if !defined(WIN32)
+-    incpush(PERL_VENDORARCH_EXP, FALSE, FALSE, TRUE);
++    incpush(SITEARCH_EXP, FALSE, FALSE, TRUE);
+ #  endif
+ #endif
+ 
+-#ifdef PERL_VENDORLIB_EXP
++#ifdef SITELIB_EXP
+ #  if defined(WIN32)
+-    incpush(PERL_VENDORLIB_EXP, TRUE, FALSE, TRUE);	/* this picks up vendorarch as well */
++    /* this picks up sitearch as well */
++    incpush(SITELIB_EXP, TRUE, FALSE, TRUE);
+ #  else
+-    incpush(PERL_VENDORLIB_EXP, FALSE, FALSE, TRUE);
++    incpush(SITELIB_EXP, FALSE, FALSE, TRUE);
+ #  endif
+ #endif
+ 
+-#ifdef PERL_VENDORLIB_STEM /* Search for version-specific dirs below here */
+-    incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE);
++#ifdef SITELIB_STEM /* Search for version-specific dirs below here */
++    incpush(SITELIB_STEM, FALSE, TRUE, TRUE);
+ #endif
+ 
++    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
++    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
++
++    /* Non-versioned site directory for local modules and for
++       compatability with the previous packages' site dirs */
++
++    incpush("/usr/local/lib/site_perl", TRUE, FALSE, TRUE);
++
++
+ #ifdef PERL_OTHERLIBDIRS
+     incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE);
+ #endif
diff --git a/sys-devel/libperl/libperl-5.8.8_rc1.ebuild b/sys-devel/libperl/libperl-5.8.8_rc1.ebuild
index 5479072d894b..487c5128d12b 100644
--- a/sys-devel/libperl/libperl-5.8.8_rc1.ebuild
+++ b/sys-devel/libperl/libperl-5.8.8_rc1.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.2 2006/01/22 22:28:48 mcummings Exp $
+# $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 $
 
 # The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
 #
@@ -133,7 +133,7 @@ src_unpack() {
 	cd ${S}; epatch ${FILESDIR}/${PN}-noksh.patch
 
 	# we need the same @INC-inversion magic here we do in perl
-	cd ${S}; epatch ${FILESDIR}/${PN}-reorder-INC.patch
+	cd ${S}; epatch ${FILESDIR}/${P}-reorder-INC.patch
 }
 
 src_compile() {