Update to reorder patch, tested with 5.8.6 and 5.8.7, resolves bug 95770

(Portage version: 2.0.51.22-r1)

6 files changed, 17 insertions, 1094 deletions

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index 2b1af7c5c240..aa0a0ea93b9b 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/perl
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.142 2005/07/28 12:07:43 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.143 2005/07/28 13:43:18 mcummings Exp $
+
+  28 Jul 2005; Michael Cummings <mcummings@gentoo.org>
+  files/perl-reorder-INC.patch, -perl-5.8.5-r5.ebuild, -perl-5.8.6-r4.ebuild:
+  Update to reorder patch, tested with 5.8.6 and 5.8.7, resolves bug 95770
+
+  28 Jul 2005; Michael Cummings <mcummings@gentoo.org> -perl-5.8.5-r5.ebuild,
+  -perl-5.8.6-r4.ebuild:
+  Cleaning up now that we have keywords up to date
 
   28 Jul 2005; Herbie Hopkins <herbs@gentoo.org> perl-5.8.6-r5.ebuild:
   Stable on amd64.
@@ -20,7 +28,7 @@
   03 Jul 2005; Michael Hanselmann <hansmi@gentoo.org> perl-5.8.6-r5.ebuild:
   Stable on ppc.
 
-  02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> perl-5.8.6-r5.ebuild:
+  02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> perl-5.8.6-r5.ebuild:
   Stable on alpha.
 
   02 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org> perl-5.8.6-r5.ebuild:
@@ -223,7 +231,7 @@
   06 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> perl-5.8.5-r2.ebuild:
   Stable on sparc wrt #66360
 
-  05 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> perl-5.8.5-r2.ebuild:
+  05 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> perl-5.8.5-r2.ebuild:
   Stable on alpha, bug 66360.
 
   05 Dec 2004; Markus Rothe <corsair@gentoo.org> perl-5.8.5-r2.ebuild:
@@ -318,7 +326,7 @@
   18 Aug 2004; Aron Griffis <agriffis@gentoo.org> perl-5.8.4-r1.ebuild:
   stable on alpha
 
-  13 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> perl-5.8.4.ebuild:
+  13 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> perl-5.8.4.ebuild:
   Stable on alpha.
 
   07 Aug 2004; Robert Coie <rac@gentoo.org> perl-5.8.2-r1.ebuild,
diff --git a/dev-lang/perl/files/digest-perl-5.8.5-r5 b/dev-lang/perl/files/digest-perl-5.8.5-r5
deleted file mode 100644
index a774272cdab6..000000000000
--- a/dev-lang/perl/files/digest-perl-5.8.5-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 49baa8d7d29b4a9713c06edeb81e6b1b perl-5.8.5.tar.gz 11930764
diff --git a/dev-lang/perl/files/digest-perl-5.8.6-r4 b/dev-lang/perl/files/digest-perl-5.8.6-r4
deleted file mode 100644
index 666169141e1e..000000000000
--- a/dev-lang/perl/files/digest-perl-5.8.6-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3d030b6ff2a433840edb1a407d18dc0a perl-5.8.6.tar.bz2 9693085
diff --git a/dev-lang/perl/files/perl-reorder-INC.patch b/dev-lang/perl/files/perl-reorder-INC.patch
index c934b4135a13..cc314d97d314 100644
--- a/dev-lang/perl/files/perl-reorder-INC.patch
+++ b/dev-lang/perl/files/perl-reorder-INC.patch
@@ -1,6 +1,6 @@
---- perl.c.orig	2003-07-10 22:09:00.000000000 -0700
-+++ perl.c	2003-07-10 22:30:21.000000000 -0700
-@@ -3932,9 +3932,9 @@
+--- perl.c.orig	2005-07-26 13:04:54.000000000 -0400
++++ perl.c	2005-07-26 13:05:05.000000000 -0400
+@@ -4397,9 +4397,9 @@ S_init_perllib(pTHX)
      incpush(APPLLIB_EXP, TRUE, TRUE, TRUE);
  #endif
  
@@ -13,7 +13,7 @@
  #ifdef MACOS_TRADITIONAL
      {
  	Stat_t tmpstatbuf;
-@@ -3961,8 +3961,6 @@
+@@ -4426,8 +4426,6 @@ S_init_perllib(pTHX)
  #endif
  #if defined(WIN32)
      incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
@@ -22,7 +22,7 @@
  #endif
  
  #ifdef SITEARCH_EXP
-@@ -4006,6 +4004,60 @@
+@@ -4471,6 +4469,15 @@ S_init_perllib(pTHX)
      incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE);
  #endif
  
@@ -34,51 +34,6 @@
 +
 +    incpush("/usr/local/lib/site_perl", TRUE, FALSE, TRUE);
 +
-+#ifdef PERL_INC_VERSION_LIST
-+{
-+  struct stat s;
-+
-+  /* add small buffer in case old versions are longer than the current version */
-+  char sitearch[sizeof(SITEARCH_EXP)+16] = SITEARCH_EXP;
-+  char sitelib[sizeof(SITELIB_EXP)+16] = SITELIB_EXP;
-+  char const *vers[] = { PERL_INC_VERSION_LIST };
-+  char const **p;
-+
-+  char *arch_vers = strrchr(sitearch, '/');
-+  char *lib_vers = strrchr(sitelib, '/');
-+
-+  if (arch_vers && isdigit(*++arch_vers))
-+    *arch_vers = 0;
-+  else
-+    arch_vers = 0;
-+
-+  if (lib_vers && isdigit(*++lib_vers))
-+    *lib_vers = 0;
-+  else
-+    lib_vers = 0;
-+
-+  /* there is some duplication here as incpush does something similar
-+     internally, but required as sitearch is not a subdirectory of
-+     sitelib */
-+
-+  for (p = vers; *p; p++)
-+    {
-+      if (arch_vers)
-+	{
-+	  strcpy(arch_vers, *p);
-+	  if (PerlLIO_stat(sitearch, &s) >= 0 && S_ISDIR(s.st_mode))
-+	    incpush(sitearch, FALSE, FALSE, TRUE);
-+	}
-+
-+      if (lib_vers)
-+	{
-+	  strcpy(lib_vers, *p);
-+	  if (PerlLIO_stat(sitelib, &s) >= 0 && S_ISDIR(s.st_mode))
-+	    incpush(sitelib, FALSE, FALSE, TRUE);
-+	}
-+    }
-+}
-+#endif
 +
  #ifdef PERL_OTHERLIBDIRS
      incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE);
diff --git a/dev-lang/perl/perl-5.8.5-r5.ebuild b/dev-lang/perl/perl-5.8.5-r5.ebuild
deleted file mode 100644
index 31853945a08b..000000000000
--- a/dev-lang/perl/perl-5.8.5-r5.ebuild
+++ /dev/null
@@ -1,429 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.5-r5.ebuild,v 1.12 2005/06/29 22:14:31 mcummings Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-# The slot of this binary compat version of libperl.so
-PERLSLOT="1"
-
-SHORT_PV="${PV%.*}"
-MY_P="perl-${PV/_rc/-RC}"
-DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="ftp://ftp.perl.org/pub/CPAN/src/${MY_P}.tar.gz"
-HOMEPAGE="http://www.perl.org/"
-LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
-
-LICENSE="Artistic GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390 sh "
-IUSE="berkdb debug doc gdbm ithreads perlsuid"
-PERL_OLDVERSEN="5.8.0 5.8.2 5.8.4"
-
-DEPEND="!elibc_uclibc? ( sys-apps/groff )
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.3 )
-	>=sys-devel/libperl-${PV}
-	!<perl-core/ExtUtils-MakeMaker-6.17
-	!<perl-core/File-Spec-0.84-r1
-	!<perl-core/Test-Simple-0.47-r1"
-RDEPEND=">=sys-devel/libperl-${PV}
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.3 )"
-
-pkg_setup() {
-	# I think this should rather be displayed if you *have* 'ithreads'
-	# in USE if it could break things ...
-	if use ithreads
-	then
-		ewarn ""
-		ewarn "PLEASE NOTE: You are compiling perl-5.8 with"
-		ewarn "interpreter-level threading enabled."
-		ewarn "Threading is not supported by all applications "
-		ewarn "that compile against perl. You use threading at "
-		ewarn "your own discretion. "
-		ewarn ""
-		epause 10
-	else
-		ewarn ""
-		ewarn "PLEASE NOTE: If you want to compile perl-5.8 with"
-		ewarn "threading enabled , you must restart this emerge"
-		ewarn "with USE=ithreads emerge...."
-		ewarn "Threading is not supported by all applications "
-		ewarn "that compile against perl. You use threading at "
-		ewarn "your own discretion. "
-		ewarn ""
-	fi
-
-	if [ ! -f "${ROOT}/usr/lib/${LIBPERL}" ]
-	then
-		# Make sure we have libperl installed ...
-		eerror "Cannot find ${ROOT}/usr/lib/${LIBPERL}!  Make sure that you"
-		eerror "have sys-libs/libperl installed properly ..."
-		die "Cannot find /usr/lib/${LIBPERL}!"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Get -lpthread linked before -lc.  This is needed
-	# when using glibc >= 2.3, or else runtime signal
-	# handling breaks.  Fixes bug #14380.
-	# <rac@gentoo.org> (14 Feb 2003)
-	# reinstated to try to avoid sdl segfaults 03.10.02
-	cd ${S}; epatch ${FILESDIR}/${PN}-prelink-lpthread.patch
-
-	# Patch perldoc to not abort when it attempts to search
-	# nonexistent directories; fixes bug #16589.
-	# <rac@gentoo.org> (28 Feb 2003)
-
-	cd ${S}; epatch ${FILESDIR}/${PN}-perldoc-emptydirs.patch
-
-	# this lays the groundwork for solving the issue of what happens
-	# 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
-
-	# 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
-	# extensions (like DynaLoader).  i believe this is
-	# counterproductive on a Gentoo system which has both a shared
-	# and static libperl, so effectively revert this here.
-	cd ${S}; epatch ${FILESDIR}/${PN}-picdl.patch
-
-	# Configure makes an unwarranted assumption that /bin/ksh is a
-	# good shell. This patch makes it revert to using /bin/sh unless
-	# /bin/ksh really is executable. Should fix bug 42665.
-	# rac 2004.06.09
-	cd ${S}; epatch ${FILESDIR}/${PN}-noksh.patch
-
-	# uclibc support
-	epatch ${FILESDIR}/${PN}-uclibc.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
-
-	# An additional tempfile patch, bug 75696
-	#epatch ${FILESDIR}/file_path_rmtree.patch
-
-	# Bug 80460, perlsuid vulnerability
-	if use perlsuid
-	then
-		epatch ${FILESDIR}/CAN-2005-0156-suid.patch
-	fi
-
-}
-
-src_configure() {
-	# some arches and -O do not mix :)
-	use arm && replace-flags -O? -O1
-	use ppc && replace-flags -O? -O1
-	use ia64 && replace-flags -O? -O1
-	# Perl has problems compiling with -Os in your flags with glibc
-	use elibc_uclibc || replace-flags "-Os" "-O2"
-	# This flag makes compiling crash in interesting ways
-	filter-flags -malign-double
-
-	export LC_ALL="C"
-	local myconf=""
-
-	if use ithreads
-	then
-		einfo "using ithreads"
-		mythreading="-multi"
-		myconf="-Dusethreads ${myconf}"
-		myarch="${CHOST%%-*}-linux-thread"
-	else
-		myarch="${CHOST%%-*}-linux"
-	fi
-
-	local inclist=$(for v in $PERL_OLDVERSEN; do echo -n "$v $v/$myarch$mythreading "; done)
-
-	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
-
-	myndbm='U'
-	mygdbm='U'
-	mydb='U'
-
-	if use gdbm
-	then
-		mygdbm='D'
-		myndbm='D'
-	fi
-	if use berkdb
-	then
-		mydb='D'
-		has_version '=sys-libs/db-1*' && myndbm='D'
-	fi
-
-	myconf="${myconf} -${myndbm}i_ndbm -${mygdbm}i_gdbm -${mydb}i_db"
-
-	if use mips
-	then
-		# this is needed because gcc 3.3-compiled kernels will hang
-		# the machine trying to run this test - check with `Kumba
-		# <rac@gentoo.org> 2003.06.26
-		myconf="${myconf} -Dd_u32align"
-	fi
-
-	if use perlsuid
-	then
-		myconf="${myconf} -Dd_dosuid"
-		ewarn "You have enabled Perl's suid compile. Please"
-		ewarn "read http://perldoc.com/perl5.8.2/INSTALL.html#suidperl"
-		epause 3
-	fi
-
-	if use debug
-	then
-		CFLAGS="${CFLAGS} -g"
-	fi
-
-	if use sparc
-	then
-		myconf="${myconf} -Ud_longdbl"
-	fi
-
-	if use alpha && "$(tc-getCC)" == "ccc"
-	then
-		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
-		myconf="${myconf} -Ui_db -Ui_ndbm"
-	fi
-
-	[ -n "${ABI}" ] && myconf="${myconf} -Dusrinc=$(get_ml_incdir)"
-
-	sh Configure -des \
-		-Darchname="${myarch}" \
-		-Dcccdlflags='-fPIC' \
-		-Dccdlflags='-rdynamic' \
-		-Dcc="$(tc-getCC)" \
-		-Dprefix='/usr' \
-		-Dvendorprefix='/usr' \
-		-Dsiteprefix='/usr' \
-		-Dlocincpth=' ' \
-		-Doptimize="${CFLAGS}" \
-		-Duselargefiles \
-		-Dd_semctl_semun \
-		-Dscriptdir=/usr/bin \
-		-Dman1dir=/usr/share/man/man1 \
-		-Dman3dir=/usr/share/man/man3 \
-		-Dinstallman1dir=${D}/usr/share/man/man1 \
-		-Dinstallman3dir=${D}/usr/share/man/man3 \
-		-Dman1ext='1' \
-		-Dman3ext='3pm' \
-		-Dinc_version_list="$inclist" \
-		-Dcf_by='Gentoo' \
-		-Ud_csh \
-		${myconf} || die "Unable to configure"
-}
-
-src_compile() {
-
-	# would like to bracket this with a test for the existence of a
-	# dotfile, but can't clean it automatically now.
-
-	src_configure
-
-	emake -j1 || die "Unable to make"
-}
-
-src_test() {
-	use elibc_uclibc && export MAKEOPTS="${MAKEOPTS} -j1"
-	emake -i test CCDLFLAGS= || die "test failed"
-}
-
-src_install() {
-
-	export LC_ALL="C"
-
-	# Need to do this, else apps do not link to dynamic version of
-	# the library ...
-	local coredir="/usr/lib/perl5/${PV}/${myarch}${mythreading}/CORE"
-	dodir ${coredir}
-	dosym ../../../../${LIBPERL} ${coredir}/${LIBPERL}
-	dosym ../../../../${LIBPERL} ${coredir}/libperl.so.${PERLSLOT}
-	dosym ../../../../${LIBPERL} ${coredir}/libperl.so
-
-	# Fix for "stupid" modules and programs
-	dodir /usr/lib/perl5/site_perl/${PV}/${myarch}${mythreading}
-
-	make DESTDIR="${D}" install || die "Unable to make install"
-
-	# 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${PV} ${D}/usr/bin/perl
-
-	cp -f utils/h2ph utils/h2ph_patched
-	epatch ${FILESDIR}/${PN}-h2ph-ansi-header.patch
-
-	LD_LIBRARY_PATH=. ./perl -Ilib utils/h2ph_patched \
-		-a -d ${D}/usr/lib/perl5/${PV}/${myarch}${mythreading} <<EOF
-asm/termios.h
-syscall.h
-syslimits.h
-syslog.h
-sys/ioctl.h
-sys/socket.h
-sys/time.h
-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
-		sed -e "s:ccflags=':ccflags='-DPERL5 :" \
-		    -e "s:cppflags=':cppflags='-DPERL5 :" \
-			${i} > ${i}.new &&\
-			mv ${i}.new ${i} || die "Sed failed"
-	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/bin/xsubpp
-	fperms 0755 /usr/bin/xsubpp
-
-	# This removes ${D} from Config.pm and .packlist
-	for i in `find ${D} -iname "Config.pm"` `find ${D} -iname ".packlist"`;do
-		einfo "Removing ${D} from ${i}..."
-		sed -e "s:${D}::" ${i} > ${i}.new &&\
-			mv ${i}.new ${i} || die "Sed failed"
-	done
-
-	# Note: find out from psm why we would need/want this.
-	# ( use berkdb && has_version '=sys-libs/db-1*' ) || 
-	#	find ${D} -name "*NDBM*" | xargs rm -f
-
-	dodoc Changes* Artistic Copying README Todo* AUTHORS
-
-	if use doc
-	then
-		# HTML Documentation
-		# We expect errors, warnings, and such with the following.
-
-		dodir /usr/share/doc/${PF}/html
-		./perl installhtml \
-			--podroot='.' \
-			--podpath='lib:ext:pod:vms' \
-			--recurse \
-			--htmldir="${D}/usr/share/doc/${PF}/html" \
-			--libpods='perlfunc:perlguts:perlvar:perlrun:perlop'
-	fi
-	cd `find ${D} -name Path.pm|sed -e 's/Path.pm//'`
-	# CAN patch in bug 79685
-	epatch ${FILESDIR}/CAN-2005-0448-rmtree.patch
-}
-
-pkg_postinst() {
-	# Make sure we do not have stale/invalid libperl.so 's ...
-	if [ -f "${ROOT}usr/lib/libperl.so" -a ! -L "${ROOT}usr/lib/libperl.so" ]
-	then
-		mv -f ${ROOT}usr/lib/libperl.so ${ROOT}usr/lib/libperl.so.old
-	fi
-
-	local perllib="`readlink -f ${ROOT}usr/lib/libperl.so | sed -e 's:^.*/::'`"
-
-	# If we are installing perl, we need the /usr/lib/libperl.so symlink to
-	# point to the version of perl we are running, else builing something
-	# against libperl.so will break ...
-	if [ "${perllib}" != "${LIBPERL}" ]
-	then
-		# Delete stale symlinks
-		rm -f ${ROOT}usr/lib/libperl.so
-		rm -f ${ROOT}usr/lib/libperl.so.${PERLSLOT}
-		# Regenerate libperl.so.${PERLSLOT}
-		ln -snf ${LIBPERL} ${ROOT}usr/lib/libperl.so.${PERLSLOT}
-		# Create libperl.so (we use the *soname* versioned lib here ..)
-		ln -snf libperl.so.${PERLSLOT} ${ROOT}usr/lib/libperl.so
-	fi
-
-	INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${PV}'|etc|local|perl$/; print "$line\n" }')
-	if [ "${ROOT}" = "/" ]
-	then
-		ebegin "Removing old .ph files"
-		for DIR in $INC; do
-			if [ -d ${ROOT}/$DIR ]; then
-				for file in $(find ${ROOT}/$DIR -name "*.ph" -type f); do
-					rm ${ROOT}/$file
-					einfo "<< $file"
-				done
-			fi
-		done
-		# Silently remove the now empty dirs
-		for DIR in $INC; do
-		   if [ -d ${ROOT}/$DIR ]; then
-		       for $empty in $(find ${ROOT}/$DIR -type d); do
-			   		rmdir $empty >/dev/null 2>&1
-			   done
-		   fi
-		done
-		ebegin "Converting C header files to the corresponding Perl format"
-		cd /usr/include;
-		h2ph * sys/* arpa/* netinet/* bits/* security/* asm/* gnu/* linux/*
-		cd /usr/include/linux;
-		h2ph *
-	fi
-
-# This has been moved into a function because rumor has it that a future release
-# of portage will allow us to check what version was just removed - which means
-# we will be able to invoke this only as needed :)
-
-	# Tried doing this via  -z, but $INC is too big...
-	if [ "${INC}x" != "x" ]; then
-		cleaner_msg
-		epause 10
-	fi
-
-}
-
-cleaner_msg() {
-	eerror "You have changed versions of perl. It is recommended"
-	eerror "that you run"
-	eerror "dev-lang/perl/files/perl-cleaner "
-	eerror "to assist with this transition. This script is capable"
-	eerror "of cleaning out old .ph files, rebuilding modules for "
-	eerror "your new version of perl, as well as re-emerging"
-	eerror "applications that compiled against your old libperl.so"
-	eerror
-	eerror "PLEASE DO NOT INTERRUPT THE RUNNING OF THIS SCRIPT."
-	eerror "Part of the rebuilding of applications compiled against "
-	eerror "your old libperl involves temporarily unmerging"
-	eerror "them - interruptions could leave you with unmerged"
-	eerror "packages before they can be remerged."
-	eerror ""
-	eerror "If you have run the rebuilder and a package still gives"
-	eerror "you trouble, and re-emerging it fails to correct"
-	eerror "the problem, please check http://bugs.gentoo.org/"
-	eerror "for more information or to report a bug."
-	eerror ""
-	eerror ""
-
-}
diff --git a/dev-lang/perl/perl-5.8.6-r4.ebuild b/dev-lang/perl/perl-5.8.6-r4.ebuild
deleted file mode 100644
index ea0adaa1920b..000000000000
--- a/dev-lang/perl/perl-5.8.6-r4.ebuild
+++ /dev/null
@@ -1,609 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.6-r4.ebuild,v 1.15 2005/06/30 15:09:11 mcummings Exp $
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-# The slot of this binary compat version of libperl.so
-PERLSLOT="1"
-
-SHORT_PV="${PV%.*}"
-MY_P="perl-${PV/_rc/-RC}"
-DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="ftp://ftp.perl.org/pub/CPAN/src/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.perl.org/"
-LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
-
-LICENSE="Artistic GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~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"
-
-DEPEND="!elibc_uclibc? ( sys-apps/groff )
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.3 )
-	>=sys-devel/libperl-${PV}-r1
-	!<perl-core/ExtUtils-MakeMaker-6.17
-	!<perl-core/File-Spec-0.87
-	!<perl-core/Test-Simple-0.47-r1"
-
-RDEPEND=">=sys-devel/libperl-${PV}-r1
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.3 )"
-
-PDEPEND="app-admin/perl-cleaner"
-
-pkg_setup() {
-	# I think this should rather be displayed if you *have* 'ithreads'
-	# in USE if it could break things ...
-	if use ithreads
-	then
-		ewarn "PLEASE NOTE: You are compiling perl-5.8 with"
-		ewarn "interpreter-level threading enabled."
-		ewarn "Threading is not supported by all applications "
-		ewarn "that compile against perl. You use threading at "
-		ewarn "your own discretion. "
-		epause 10
-	else
-		einfo "PLEASE NOTE: If you want to compile perl-5.8 with"
-		einfo "interpreter-level threading enabled , you must "
-		einfo "restart this emerge with USE=ithreads"
-		einfo "Interpreter-level threading is not supported by "
-		einfo "all applications that compile against perl."
-	fi
-
-	if [ ! -f "${ROOT}/usr/$(get_libdir)/${LIBPERL}" ]
-	then
-		# Make sure we have libperl installed ...
-		eerror "Cannot find ${ROOT}/usr/$(get_libdir)/${LIBPERL}!  Make sure that you"
-		eerror "have sys-libs/libperl installed properly ..."
-		die "Cannot find ${ROOT}/usr/$(get_libdir)/${LIBPERL}!"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Get -lpthread linked before -lc.  This is needed
-	# when using glibc >= 2.3, or else runtime signal
-	# handling breaks.  Fixes bug #14380.
-	# <rac@gentoo.org> (14 Feb 2003)
-	# reinstated to try to avoid sdl segfaults 03.10.02
-	cd ${S}; epatch ${FILESDIR}/${PN}-prelink-lpthread.patch
-
-	# Patch perldoc to not abort when it attempts to search
-	# nonexistent directories; fixes bug #16589.
-	# <rac@gentoo.org> (28 Feb 2003)
-
-	cd ${S}; epatch ${FILESDIR}/${PN}-perldoc-emptydirs.patch
-
-	# this lays the groundwork for solving the issue of what happens
-	# 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
-
-	# 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
-	# extensions (like DynaLoader).  i believe this is
-	# counterproductive on a Gentoo system which has both a shared
-	# and static libperl, so effectively revert this here.
-	cd ${S}; epatch ${FILESDIR}/${PN}-picdl.patch
-
-	# Configure makes an unwarranted assumption that /bin/ksh is a
-	# good shell. This patch makes it revert to using /bin/sh unless
-	# /bin/ksh really is executable. Should fix bug 42665.
-	# rac 2004.06.09
-	cd ${S}; epatch ${FILESDIR}/${PN}-noksh.patch
-
-	# uclibc support
-	epatch ${FILESDIR}/${PN}-uclibc.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
-
-	# An additional tempfile patch, bug 75696
-	#epatch ${FILESDIR}/file_path_rmtree.patch
-
-	# Bug 80460, perlsuid vulnerability
-	if use perlsuid
-	then
-		epatch ${FILESDIR}/CAN-2005-0156-suid.patch
-	fi
-
-}
-
-src_configure() {
-
-	# some arches and -O do not mix :)
-	use arm && replace-flags -O? -O1
-	use ppc && replace-flags -O? -O1
-	use ia64 && replace-flags -O? -O1
-	# Perl has problems compiling with -Os in your flags with glibc
-	use elibc_uclibc || replace-flags "-Os" "-O2"
-	# This flag makes compiling crash in interesting ways
-	filter-flags -malign-double
-
-	export LC_ALL="C"
-	local myconf=""
-
-	if [[ ${KERNEL} == "FreeBSD" && "${ELIBC}" = "FreeBSD" ]]; then
-		osname="freebsd"
-	else
-		# Default setting
-		osname="linux"
-	fi
-
-	if use ithreads
-	then
-		einfo "using ithreads"
-		mythreading="-multi"
-		myconf="-Dusethreads ${myconf}"
-		myarch=$(get_abi_CHOST)
-		myarch="${myarch%%-*}-${osname}-thread"
-	else
-		myarch=$(get_abi_CHOST)
-		myarch="${myarch%%-*}-${osname}"
-	fi
-
-	local inclist=$(for v in $PERL_OLDVERSEN; do echo -n "$v $v/$myarch$mythreading "; done)
-
-	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
-
-	myndbm='U'
-	mygdbm='U'
-	mydb='U'
-
-	if use gdbm
-	then
-		mygdbm='D'
-		myndbm='D'
-	fi
-	if use berkdb
-	then
-		mydb='D'
-		has_version '=sys-libs/db-1*' && myndbm='D'
-	fi
-
-	myconf="${myconf} -${myndbm}i_ndbm -${mygdbm}i_gdbm -${mydb}i_db"
-
-	if use mips
-	then
-		# this is needed because gcc 3.3-compiled kernels will hang
-		# the machine trying to run this test - check with `Kumba
-		# <rac@gentoo.org> 2003.06.26
-		myconf="${myconf} -Dd_u32align"
-	fi
-
-	if use perlsuid
-	then
-		myconf="${myconf} -Dd_dosuid"
-		ewarn "You have enabled Perl's suid compile. Please"
-		ewarn "read http://perldoc.com/perl5.8.2/INSTALL.html#suidperl"
-		epause 3
-	fi
-
-	if use debug
-	then
-		CFLAGS="${CFLAGS} -g"
-	fi
-
-	if use sparc
-	then
-		myconf="${myconf} -Ud_longdbl"
-	fi
-
-	if use alpha && "$(tc-getCC)" == "ccc"
-	then
-		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
-		myconf="${myconf} -Ui_db -Ui_ndbm"
-	fi
-
-	[ -n "${ABI}" ] && myconf="${myconf} -Dusrinc=$(get_ml_incdir)"
-
-	[[ ${ELIBC} == "FreeBSD" ]] && myconf="${myconf} -Dlibc=/usr/lib/libc.a"
-
-	sh Configure -des \
-		-Darchname="${myarch}" \
-		-Dcccdlflags='-fPIC' \
-		-Dccdlflags='-rdynamic' \
-		-Dcc="$(tc-getCC)" \
-		-Dprefix='/usr' \
-		-Dvendorprefix='/usr' \
-		-Dsiteprefix='/usr' \
-		-Dlocincpth=' ' \
-		-Doptimize="${CFLAGS}" \
-		-Duselargefiles \
-		-Dd_semctl_semun \
-		-Dscriptdir=/usr/bin \
-		-Dman1dir=/usr/share/man/man1 \
-		-Dman3dir=/usr/share/man/man3 \
-		-Dinstallman1dir=${D}/usr/share/man/man1 \
-		-Dinstallman3dir=${D}/usr/share/man/man3 \
-		-Dman1ext='1' \
-		-Dman3ext='3pm' \
-		-Dinc_version_list="$inclist" \
-		-Dcf_by='Gentoo' \
-		-Ud_csh \
-		${myconf} || die "Unable to configure"
-}
-
-src_compile() {
-
-	# would like to bracket this with a test for the existence of a
-	# dotfile, but can't clean it automatically now.
-
-	src_configure
-
-	emake -j1 || die "Unable to make"
-}
-
-src_test() {
-	use elibc_uclibc && export MAKEOPTS="${MAKEOPTS} -j1"
-	emake -i test CCDLFLAGS= || die "test failed"
-}
-
-src_install() {
-
-	export LC_ALL="C"
-
-	# Need to do this, else apps do not link to dynamic version of
-	# the library ...
-	local coredir="/usr/lib/perl5/${PV}/${myarch}${mythreading}/CORE"
-	dodir ${coredir}
-	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/${LIBPERL}
-	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl.so.${PERLSLOT}
-	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl.so
-
-	# Fix for "stupid" modules and programs
-	dodir /usr/lib/perl5/site_perl/${PV}/${myarch}${mythreading}
-
-	local installtarget=install
-	if use minimal || use build ; then
-		installtarget=install.perl
-	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${PV} ${D}/usr/bin/perl
-
-	cp -f utils/h2ph utils/h2ph_patched
-	epatch ${FILESDIR}/${PN}-h2ph-ansi-header.patch
-
-	LD_LIBRARY_PATH=. ./perl -Ilib utils/h2ph_patched \
-		-a -d ${D}/usr/lib/perl5/${PV}/${myarch}${mythreading} <<EOF
-asm/termios.h
-syscall.h
-syslimits.h
-syslog.h
-sys/ioctl.h
-sys/socket.h
-sys/time.h
-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
-		sed -e "s:ccflags=':ccflags='-DPERL5 :" \
-		    -e "s:cppflags=':cppflags='-DPERL5 :" \
-			${i} > ${i}.new &&\
-			mv ${i}.new ${i} || die "Sed failed"
-	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/bin/xsubpp
-	fperms 0755 /usr/bin/xsubpp
-
-	# This removes ${D} from Config.pm and .packlist
-	for i in `find ${D} -iname "Config.pm"` `find ${D} -iname ".packlist"`;do
-		einfo "Removing ${D} from ${i}..."
-		sed -e "s:${D}::" ${i} > ${i}.new &&\
-			mv ${i}.new ${i} || die "Sed failed"
-	done
-
-	# Note: find out from psm why we would need/want this.
-	# ( use berkdb && has_version '=sys-libs/db-1*' ) || 
-	#	find ${D} -name "*NDBM*" | xargs rm -f
-
-	dodoc Changes* Artistic Copying README Todo* AUTHORS
-
-	if use doc
-	then
-		# HTML Documentation
-		# We expect errors, warnings, and such with the following.
-
-		dodir /usr/share/doc/${PF}/html
-		./perl installhtml \
-			--podroot='.' \
-			--podpath='lib:ext:pod:vms' \
-			--recurse \
-			--htmldir="${D}/usr/share/doc/${PF}/html" \
-			--libpods='perlfunc:perlguts:perlvar:perlrun:perlop'
-	fi
-	cd `find ${D} -name Path.pm|sed -e 's/Path.pm//'`
-	# CAN patch in bug 79685
-	epatch ${FILESDIR}/CAN-2005-0448-rmtree.patch
-
-	if use minimal || use build ; then
-		src_remove_extra_files
-	fi
-
-}
-
-src_remove_extra_files()
-{
-	local prefix="./usr" # ./ is important
-	local bindir="${prefix}/bin"
-	local perlroot="${prefix}/lib/perl5" # perl installs per-arch dirs
-	local prV="${perlroot}/${PV}"
-	# myarch and mythreading are defined inside src_configure()
-	local prVA="${prV}/${myarch}${mythreading}"
-
-	# I made this list from the Mandr*, Debian and ex-Connectiva perl-base list
-	# Then, I added several files to get GNU autotools running
-	# FIXME: should this be in a separated file to be sourced?
-	local MINIMAL_PERL_INSTALL="
-	${bindir}/h2ph
-	${bindir}/perl
-	${bindir}/perl${PV}
-	${bindir}/pod2man
-	${prV}/attributes.pm
-	${prV}/AutoLoader.pm
-	${prV}/autouse.pm
-	${prV}/base.pm
-	${prV}/bigint.pm
-	${prV}/bignum.pm
-	${prV}/bigrat.pm
-	${prV}/blib.pm
-	${prV}/bytes_heavy.pl
-	${prV}/bytes.pm
-	${prV}/Carp/Heavy.pm
-	${prV}/Carp.pm
-	${prV}/charnames.pm
-	${prV}/Class/Struct.pm
-	${prV}/constant.pm
-	${prV}/diagnostics.pm
-	${prV}/DirHandle.pm
-	${prV}/Exporter/Heavy.pm
-	${prV}/Exporter.pm
-	${prV}/fields.pm
-	${prV}/File/Basename.pm
-	${prV}/File/Compare.pm
-	${prV}/File/Copy.pm
-	${prV}/File/Find.pm
-	${prV}/FileHandle.pm
-	${prV}/File/Path.pm
-	${prV}/File/Spec.pm
-	${prV}/File/Spec/Unix.pm
-	${prV}/File/stat.pm
-	${prV}/filetest.pm
-	${prVA}/attrs.pm
-	${prVA}/auto/attrs
-	${prVA}/auto/Cwd/Cwd.so
-	${prVA}/auto/Data/Dumper/Dumper.so
-	${prVA}/auto/DynaLoader/dl_findfile.al
-	${prVA}/auto/Fcntl/Fcntl.so
-	${prVA}/auto/File/Glob/Glob.so
-	${prVA}/auto/IO/IO.so
-	${prVA}/auto/POSIX/autosplit.ix
-	${prVA}/auto/POSIX/fstat.al
-	${prVA}/auto/POSIX/load_imports.al
-	${prVA}/auto/POSIX/POSIX.bs
-	${prVA}/auto/POSIX/POSIX.so
-	${prVA}/auto/POSIX/stat.al
-	${prVA}/auto/POSIX/tmpfile.al
-	${prVA}/auto/re/re.so
-	${prVA}/auto/Socket/Socket.so
-	${prVA}/auto/Storable/autosplit.ix
-	${prVA}/auto/Storable/_retrieve.al
-	${prVA}/auto/Storable/retrieve.al
-	${prVA}/auto/Storable/Storable.so
-	${prVA}/auto/Storable/_store.al
-	${prVA}/auto/Storable/store.al
-	${prVA}/B/Deparse.pm
-	${prVA}/B.pm
-	${prVA}/Config.pm
-	${prVA}/Config_heavy.pl
-	${prVA}/CORE/libperl.so
-	${prVA}/Cwd.pm
-	${prVA}/Data/Dumper.pm
-	${prVA}/DynaLoader.pm
-	${prVA}/encoding.pm
-	${prVA}/Errno.pm
-	${prVA}/Fcntl.pm
-	${prVA}/File/Glob.pm
-	${prVA}/_h2ph_pre.ph
-	${prVA}/IO/File.pm
-	${prVA}/IO/Handle.pm
-	${prVA}/IO/Pipe.pm
-	${prVA}/IO.pm
-	${prVA}/IO/Seekable.pm
-	${prVA}/IO/Select.pm
-	${prVA}/IO/Socket.pm
-	${prVA}/lib.pm
-	${prVA}/NDBM_File.pm
-	${prVA}/ops.pm
-	${prVA}/POSIX.pm
-	${prVA}/re.pm
-	${prVA}/Socket.pm
-	${prVA}/Storable.pm
-	${prVA}/threads
-	${prVA}/threads.pm
-	${prVA}/XSLoader.pm
-	${prV}/Getopt/Long.pm
-	${prV}/Getopt/Std.pm
-	${prV}/if.pm
-	${prV}/integer.pm
-	${prV}/IO/Socket/INET.pm
-	${prV}/IO/Socket/UNIX.pm
-	${prV}/IPC/Open2.pm
-	${prV}/IPC/Open3.pm
-	${prV}/less.pm
-	${prV}/List/Util.pm
-	${prV}/locale.pm
-	${prV}/open.pm
-	${prV}/overload.pm
-	${prV}/Pod/InputObjects.pm
-	${prV}/Pod/Man.pm
-	${prV}/Pod/ParseLink.pm
-	${prV}/Pod/Parser.pm
-	${prV}/Pod/Select.pm
-	${prV}/Pod/Text.pm
-	${prV}/Pod/Usage.pm
-	${prV}/PerlIO.pm
-	${prV}/Scalar/Util.pm
-	${prV}/SelectSaver.pm
-	${prV}/sigtrap.pm
-	${prV}/sort.pm
-	${prV}/stat.pl
-	${prV}/strict.pm
-	${prV}/subs.pm
-	${prV}/Symbol.pm
-	${prV}/Text/ParseWords.pm
-	${prV}/Text/Tabs.pm
-	${prV}/Text/Wrap.pm
-	${prV}/Time/Local.pm
-	${prV}/unicore/Canonical.pl
-	${prV}/unicore/Exact.pl
-	${prV}/unicore/lib/gc_sc/Digit.pl
-	${prV}/unicore/lib/gc_sc/Word.pl
-	${prV}/unicore/PVA.pl
-	${prV}/unicore/To/Fold.pl
-	${prV}/unicore/To/Lower.pl
-	${prV}/unicore/To/Upper.pl
-	${prV}/utf8_heavy.pl
-	${prV}/utf8.pm
-	${prV}/vars.pm
-	${prV}/vmsish.pm
-	${prV}/warnings
-	${prV}/warnings.pm
-	${prV}/warnings/register.pm"
-
-	if use perlsuid ; then
-		MINIMAL_PERL_INSTALL="${MINIMAL_PERL_INSTALL}
-		${bindir}/suidperl
-		${bindir}/sperl${PV}"
-	fi
-
-	pushd ${D} > /dev/null
-	# Remove cruft
-	einfo "Removing files that are not in the minimal install"
-	for f in $(find . -type f); do
-		has ${f} ${MINIMAL_PERL_INSTALL} || rm -f ${f}
-	done
-	# Remove empty directories
-	find . -depth -type d | xargs -r rmdir &> /dev/null
-	popd > /dev/null
-}
-
-pkg_postinst() {
-	# Make sure we do not have stale/invalid libperl.so 's ...
-	if [ -f "${ROOT}usr/$(get_libdir)/libperl.so" -a ! -L "${ROOT}usr/$(get_libdir)/libperl.so" ]
-	then
-		mv -f ${ROOT}usr/$(get_libdir)/libperl.so ${ROOT}usr/$(get_libdir)/libperl.so.old
-	fi
-
-	local perllib="`readlink -f ${ROOT}usr/$(get_libdir)/libperl.so | sed -e 's:^.*/::'`"
-
-	# If we are installing perl, we need the /usr/lib/libperl.so symlink to
-	# point to the version of perl we are running, else builing something
-	# against libperl.so will break ...
-	if [ "${perllib}" != "${LIBPERL}" ]
-	then
-		# Delete stale symlinks
-		rm -f ${ROOT}usr/$(get_libdir)/libperl.so
-		rm -f ${ROOT}usr/$(get_libdir)/libperl.so.${PERLSLOT}
-		# Regenerate libperl.so.${PERLSLOT}
-		ln -snf ${LIBPERL} ${ROOT}usr/$(get_libdir)/libperl.so.${PERLSLOT}
-		# Create libperl.so (we use the *soname* versioned lib here ..)
-		ln -snf libperl.so.${PERLSLOT} ${ROOT}usr/$(get_libdir)/libperl.so
-	fi
-
-	INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${PV}'|etc|local|perl$/; print "$line\n" }')
-	if [ "${ROOT}" = "/" ]
-	then
-		ebegin "Removing old .ph files"
-		for DIR in $INC; do
-			if [ -d ${ROOT}/$DIR ]; then
-				for file in $(find ${ROOT}/$DIR -name "*.ph" -type f); do
-					rm ${ROOT}/$file
-					einfo "<< $file"
-				done
-			fi
-		done
-		# Silently remove the now empty dirs
-		for DIR in $INC; do
-		   if [ -d ${ROOT}/$DIR ]; then
-		   	find ${ROOT}/$DIR -depth -type d | xargs -r rmdir &> /dev/null
-		   fi
-		done
-		ebegin "Converting C header files to the corresponding Perl format"
-		cd /usr/include;
-		h2ph * sys/* arpa/* netinet/* bits/* security/* asm/* gnu/* linux/*
-		cd /usr/include/linux;
-		h2ph *
-	fi
-
-# This has been moved into a function because rumor has it that a future release
-# of portage will allow us to check what version was just removed - which means
-# we will be able to invoke this only as needed :)
-	# Tried doing this via  -z, but $INC is too big...
-	if [ "${INC}x" != "x" ]; then
-		cleaner_msg
-		epause 10
-	fi
-}
-
-cleaner_msg() {
-	eerror "You have had multiple versions of perl. It is recommended"
-	eerror "that you run perl-cleaner now. perl-cleaner will"
-	eerror "assist with this transition. This script is capable"
-	eerror "of cleaning out old .ph files, rebuilding modules for "
-	eerror "your new version of perl, as well as re-emerging"
-	eerror "applications that compiled against your old libperl.so"
-	eerror
-	eerror "PLEASE DO NOT INTERRUPT THE RUNNING OF THIS SCRIPT."
-	eerror "Part of the rebuilding of applications compiled against "
-	eerror "your old libperl involves temporarily unmerging"
-	eerror "them - interruptions could leave you with unmerged"
-	eerror "packages before they can be remerged."
-	eerror ""
-	eerror "If you have run perl-cleaner and a package still gives"
-	eerror "you trouble, and re-emerging it fails to correct"
-	eerror "the problem, please check http://bugs.gentoo.org/"
-	eerror "for more information or to report a bug."
-	eerror ""
-	eerror ""
-
-}