Some tweaks to perl-5.8.8 installation

(Portage version: 2.1_pre3-r1)

4 files changed, 121 insertions, 31 deletions

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index c76b2ab9a246..55fac6f27053 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,10 @@
 # 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.187 2006/01/22 17:04:10 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.188 2006/01/24 17:15:13 mcummings Exp $
+
+  24 Jan 2006; Michael Cummings <mcummings@gentoo.org>
+  +files/perl-5.8.8_rc1-reorder-INC.patch, perl-5.8.8_rc1.ebuild:
+  Some tweaks to perl-5.8.8 installation
 
 *perl-5.8.8_rc1 (22 Jan 2006)
 
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 5cecdffe5da3..65c052e610a0 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 26d7850e833f0ad4f02178a52d61df87 ChangeLog 47403
 MD5 bd75f0242e3b7791803d089c38a3f920 files/CAN-2005-0156-suid.patch 703
 MD5 2bd41aec5e22962224dc9376e27bdde3 files/CAN-2005-0448-rmtree.patch 7629
@@ -22,6 +19,7 @@ MD5 044b90a8895f8a03bef8e4cf5759eecc files/perl-5.8.7-MakeMaker-RUNPATH.patch 85
 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 c2612d59f380ad6e0c2de4d941e83dfd files/perl-cleaner 8879
 MD5 cc54c9f18cd584f4cac0ec109eae9335 files/perl-exp_intwrap.patch 1635
 MD5 060e9f10466fdc1268c75a7cf4dcbc7c files/perl-h2ph-ansi-header.patch 446
@@ -43,11 +41,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 b28377350cf285f5f92167966de7a755 perl-5.8.8_rc1.ebuild 19684
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFD07sGtG5z4I8BtQoRAh5cAJ9GNDc2EpFcEjNq/p6W3IYLZH1HjwCePdOW
-qFDbvAyQkQH+0nVwX4X1uU0=
-=czGd
------END PGP SIGNATURE-----
+MD5 f478081b20e3493983c68d4c807890cf perl-5.8.8_rc1.ebuild 19673
diff --git a/dev-lang/perl/files/perl-5.8.8_rc1-reorder-INC.patch b/dev-lang/perl/files/perl-5.8.8_rc1-reorder-INC.patch
new file mode 100644
index 000000000000..11c56929cf1a
--- /dev/null
+++ b/dev-lang/perl/files/perl-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/dev-lang/perl/perl-5.8.8_rc1.ebuild b/dev-lang/perl/perl-5.8.8_rc1.ebuild
index 4c27da0355f6..875fdf9d8d65 100644
--- a/dev-lang/perl/perl-5.8.8_rc1.ebuild
+++ b/dev-lang/perl/perl-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/dev-lang/perl/perl-5.8.8_rc1.ebuild,v 1.1 2006/01/22 17:04:10 mcummings Exp $
+# $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 $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -20,20 +20,24 @@ 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"
-PERL_OLDVERSEN="5.8.0 5.8.2 5.8.4 5.8.5 5.8.6"
+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 )
 	gdbm? ( >=sys-libs/gdbm-1.8.3 )
-	>=sys-devel/libperl-${PV}
+	~sys-devel/libperl-${PV}
 	!<perl-core/ExtUtils-MakeMaker-6.17
 	!<perl-core/File-Spec-0.87
 	!<perl-core/Test-Simple-0.47-r1"
 
-RDEPEND=">=sys-devel/libperl-${PV}
+RDEPEND="~sys-devel/libperl-${PV}
 	berkdb? ( sys-libs/db )
 	gdbm? ( >=sys-libs/gdbm-1.8.3 )"
 
-PDEPEND="app-admin/perl-cleaner"
+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"
 
 pkg_setup() {
 	# I think this should rather be displayed if you *have* 'ithreads'
@@ -85,7 +89,7 @@ src_unpack() {
 	# when people (or ebuilds) install different versiosn of modules
 	# that are in the core, by rearranging the @INC directory to look
 	# site -> vendor -> core.
-	cd ${S}; epatch ${FILESDIR}/${PN}-reorder-INC.patch
+	cd ${S}; epatch ${FILESDIR}/${P}-reorder-INC.patch
 
 	# some well-intentioned stuff in http://groups.google.com/groups?hl=en&lr=&ie=UTF-8&selm=Pine.SOL.4.10.10205231231200.5399-100000%40maxwell.phys.lafayette.edu
 	# attempts to avoid bringing cccdlflags to bear on static
@@ -295,19 +299,6 @@ src_install() {
 	fi
 	make DESTDIR="${D}" ${installtarget} || die "Unable to make ${installtarget}"
 
-	# 2004.07.28 rac
-
-	# suidperl has had a history of security trouble, and the
-	# perldelta has recommended against using it for a while.  genone
-	# alerted me to the fact that the hardlinks aren't carrying
-	# through the staging directory, and we end up with four copies of
-	# perl, basically.  two normal, two suid.  fix this up here, and
-	# delete suidperl entirely.  if this causes outrage, here's where
-	# to fix.
-
-	# Moved to a use flag enablement - bug 64823 - mcummings
-	#rm ${D}/usr/bin/sperl${PV}
-	#rm ${D}/usr/bin/suidperl
 	rm ${D}/usr/bin/perl
 	ln -s perl${MY_PV} ${D}/usr/bin/perl
 
@@ -371,6 +362,17 @@ EOF
 	# CAN patch in bug 79685
 	epatch ${FILESDIR}/${P}-CAN-2005-0448-rmtree.patch
 
+	# Remove those items we PDPEND on
+	rm -f ${D}/usr/bin/instmodsh
+	rm -f ${D}/usr/bin/pod2usage
+	rm -f ${D}/usr/bin/podchecker
+	rm -f ${D}/usr/bin/podselect
+	rm -f ${D}/usr/bin/prove
+	rm -f ${D}/usr/share/man/man1/pod2usage*
+	rm -f ${D}/usr/share/man/man1/podchecker*
+	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
 		src_remove_extra_files
 	fi