Add 5.8.4

9 files changed, 444 insertions, 37 deletions

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index a0184dc3ca77..fd8ccc63b730 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/perl
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.57 2004/04/28 06:06:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.58 2004/05/03 22:17:53 rac Exp $
+
+*perl-5.8.4 (03 May 2004)
+
+  03 May 2004; Robert Coie <rac@gentoo.org> perl-5.8.4.ebuild,
+  files/5.6.1-builtin-fixup.diff, files/5.6.1-op-test-fix.diff,
+  files/perl-5.8.4-perldoc-emptydirs.patch, files/perl-5.8.4-picdl.patch,
+  files/perl-5.8.4-reorder-INC.patch:
+  Add 5.8.4
 
   28 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
   Clean up `use` syntax and remove ${CC} usage.
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index c4441188c627..c11a453eda49 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,19 +1,22 @@
 MD5 fa4915afd0b15c3ddec152f35b0858a6 perl-5.8.2-r1.ebuild 9888
+MD5 c25e7eff0b721251d272bb60cb0e1d78 perl-5.8.4.ebuild 9902
 MD5 acae99825f1a01315e1771d09ddcba9f perl-5.8.3.ebuild 9902
-MD5 d48429968aba7666fd7bf15b72bfaf72 ChangeLog 23356
+MD5 cbea19bcefca1d1382004cf0751f5251 ChangeLog 23632
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 MD5 060e9f10466fdc1268c75a7cf4dcbc7c files/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch 446
-MD5 28fe3868fd4e47ca609f7af6156c94ea files/5.6.1-op-test-fix.diff 503
+MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-5.8.4-picdl.patch 250
 MD5 b8480b2ccbf7d5a7fe543b9e6f8dbc14 files/libperl_rebuilder 10260
-MD5 ea9bf02b28e73e19dc85eb07f2347460 files/5.6.1-builtin-fixup.diff 777
+MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.4-reorder-INC.patch 2211
 MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.2-reorder-INC.patch 2211
 MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.3-prelink-lpthread.patch 476
 MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-5.8.2-perldoc-emptydirs.patch 489
 MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.2-prelink-lpthread.patch 476
 MD5 35eb3b7645102bbcc4088d900dc28984 files/digest-perl-5.8.3 64
+MD5 93155b02a7e9d3cdc6d6934ce78d9f11 files/digest-perl-5.8.4 64
 MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-5.8.3-perldoc-emptydirs.patch 489
 MD5 803b7c028f59008ea1e6d577e5c0bab0 files/stat.t 8884
 MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-5.8.2-picdl.patch 250
+MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-5.8.4-perldoc-emptydirs.patch 489
 MD5 8381e239056a7895edf8f3c6c05c835c files/digest-perl-5.8.2-r1 64
 MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.3-reorder-INC.patch 2211
 MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-5.8.3-picdl.patch 250
diff --git a/dev-lang/perl/files/5.6.1-builtin-fixup.diff b/dev-lang/perl/files/5.6.1-builtin-fixup.diff
deleted file mode 100644
index a1f0735dda2a..000000000000
--- a/dev-lang/perl/files/5.6.1-builtin-fixup.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur perl-5.6.1.orig/makedepend.SH perl-5.6.1/makedepend.SH
---- perl-5.6.1.orig/makedepend.SH	2001-03-19 07:33:17.000000000 +0000
-+++ perl-5.6.1/makedepend.SH	2002-05-27 02:27:08.000000000 +0000
-@@ -141,6 +141,8 @@
-         $cppstdin $finc -I. $cppflags $cppminus <UU/$file.c |
-         $sed \
-     	    -e '/^#.*<stdin>/d' \
-+            -e '/^#.*<built-in>/d' \
-+            -e '/^#.*<command line>/d' \
- 	    -e '/^#.*"-"/d' \
- 	    -e 's#\.[0-9][0-9]*\.c#'"$file.c#" \
- 	    -e 's/^[	 ]*#[	 ]*line/#/' \
-@@ -155,6 +157,8 @@
-         $sed \
- 	    -e '1d' \
- 	    -e '/^#.*<stdin>/d' \
-+            -e '/^#.*<built-in>/d' \
-+            -e '/^#.*<command line>/d' \
- 	    -e '/^#.*"-"/d' \
- 	    -e 's#\.[0-9][0-9]*\.c#'"$file.c#" \
- 	    -e 's/^[	 ]*#[	 ]*line/#/' \
-
diff --git a/dev-lang/perl/files/5.6.1-op-test-fix.diff b/dev-lang/perl/files/5.6.1-op-test-fix.diff
deleted file mode 100644
index ab22b07b65b4..000000000000
--- a/dev-lang/perl/files/5.6.1-op-test-fix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- t/op/stat.t.orig	2003-02-14 18:38:23.000000000 +0000
-+++ t/op/stat.t	2003-02-14 18:39:34.000000000 +0000
-@@ -180,7 +180,7 @@
- die "Can't run op/stat.t test 35 without pwd working" unless $cwd;
- my @bin = grep {-d} ($^O eq 'machten' ?
- 		     qw(/usr/bin /bin) :
--		     qw(/sbin /usr/sbin /bin /usr/bin));
-+		     qw(/sbin /usr/sbin /bin /usr/bin /usr/lib/misc));
- unless (@bin) { print ("not ok 35\n"), goto tty_test; }
- for my $bin (@bin) {
-     opendir BIN, $bin or die "Can't opendir $bin: $!";
diff --git a/dev-lang/perl/files/digest-perl-5.8.4 b/dev-lang/perl/files/digest-perl-5.8.4
new file mode 100644
index 000000000000..a13f719f8c75
--- /dev/null
+++ b/dev-lang/perl/files/digest-perl-5.8.4
@@ -0,0 +1 @@
+MD5 912050a9cb6b0f415b76ba56052fb4cf perl-5.8.4.tar.gz 12094233
diff --git a/dev-lang/perl/files/perl-5.8.4-perldoc-emptydirs.patch b/dev-lang/perl/files/perl-5.8.4-perldoc-emptydirs.patch
new file mode 100644
index 000000000000..650248c509e8
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.4-perldoc-emptydirs.patch
@@ -0,0 +1,10 @@
+--- lib/Pod/Perldoc.pm.orig	2003-10-22 13:02:15.000000000 -0700
++++ lib/Pod/Perldoc.pm	2003-10-22 13:02:36.000000000 -0700
+@@ -1513,6 +1513,7 @@
+     $self->{'target'} = (splitdir $s)[-1];  # XXX: why not use File::Basename?
+     for ($i=0; $i<@dirs; $i++) {
+ 	$dir = $dirs[$i];
++	next unless -d $dir;
+ 	($dir = VMS::Filespec::unixpath($dir)) =~ s!/\z!! if IS_VMS;
+ 	if (       (! $self->opt_m && ( $ret = $self->check_file($dir,"$s.pod")))
+ 		or ( $ret = $self->check_file($dir,"$s.pm"))
diff --git a/dev-lang/perl/files/perl-5.8.4-picdl.patch b/dev-lang/perl/files/perl-5.8.4-picdl.patch
new file mode 100644
index 000000000000..f69a6800cf48
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.4-picdl.patch
@@ -0,0 +1,13 @@
+--- Makefile.SH.orig	2003-11-29 01:16:15.000000000 -0800
++++ Makefile.SH	2003-11-29 01:16:52.000000000 -0800
+@@ -129,8 +129,8 @@
+ 
+ 	;;
+ 
+-*)	pldlflags=''
+-	static_target='static'
++*)	pldlflags="$cccdlflags"
++	static_target='static_pic'
+ 	;;
+ esac
+ 
diff --git a/dev-lang/perl/files/perl-5.8.4-reorder-INC.patch b/dev-lang/perl/files/perl-5.8.4-reorder-INC.patch
new file mode 100644
index 000000000000..c934b4135a13
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.4-reorder-INC.patch
@@ -0,0 +1,85 @@
+--- 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 @@
+     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;
+@@ -3961,8 +3961,6 @@
+ #endif
+ #if defined(WIN32)
+     incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
+-#else
+-    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
+ #endif
+ 
+ #ifdef SITEARCH_EXP
+@@ -4006,6 +4004,60 @@
+     incpush(PERL_VENDORLIB_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_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);
+ #endif
diff --git a/dev-lang/perl/perl-5.8.4.ebuild b/dev-lang/perl/perl-5.8.4.ebuild
new file mode 100644
index 000000000000..44797e175c94
--- /dev/null
+++ b/dev-lang/perl/perl-5.8.4.ebuild
@@ -0,0 +1,320 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.4.ebuild,v 1.1 2004/05/03 22:17:53 rac Exp $
+
+inherit eutils flag-o-matic gcc
+
+# The slot of this binary compat version of libperl.so
+PERLSLOT="1"
+
+SHORT_PV="`echo ${PV} | cut -d. -f1,2`"
+DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
+SAFE_VERSION="2.09"
+MY_P="perl-`echo $PV | sed 's/_rc/-RC/'`"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="ftp://ftp.perl.org/pub/CPAN/src/${MY_P}.tar.gz"
+#ftp://ftp.perl.org/pub/CPAN/modules/by-module/DB_File/DB_File-${DB_FILE_VERSION}.tar.gz
+#ftp://ftp.perl.org/pub/CPAN/modules/by-module/Safe/Safe-${SAFE_VERSION}.tar.gz"
+HOMEPAGE="http://www.perl.org/"
+LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
+LICENSE="Artistic GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~ppc64 ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390"
+IUSE="berkdb doc gdbm threads"
+
+DEPEND="sys-apps/groff
+	berkdb? ( sys-libs/db )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	>=sys-apps/portage-2.0.48-r4
+	>=sys-devel/libperl-${PV}
+	!<dev-perl/ExtUtils-MakeMaker-6.05-r6
+	!<dev-perl/File-Spec-0.84-r1
+	!<dev-perl/Test-Simple-0.47-r1"
+RDEPEND="berkdb? ( sys-libs/db )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
+
+pkg_setup() {
+	# I think this should rather be displayed if you *have* 'threads'
+	# in USE if it could break things ...
+	if use threads
+	then
+		ewarn ""
+		ewarn "PLEASE NOTE: You are compiling perl-5.8 with"
+		ewarn "threading enabled."
+		ewarn "Threading is not supported by all applications "
+		ewarn "that compile against perl. You use threading at "
+		ewarn "your own discretion. "
+		ewarn ""
+		sleep 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=threads 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 /usr/lib/${LIBPERL} ]
+	then
+		# Make sure we have libperl installed ...
+		eerror "Cannot find /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}/${P}-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}/${P}-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}/${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
+	# 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}/${P}-picdl.patch
+}
+
+src_compile() {
+	# Perl has problems compiling with -Os in your flags
+	replace-flags "-Os" "-O2"
+	# This flag makes compiling crash in interesting ways
+	filter-flags -malign-double
+
+	export LC_ALL="C"
+	local myconf=""
+
+	if use threads
+	then
+		einfo "using threads"
+		mythreading="-multi"
+		myconf="-Dusethreads ${myconf}"
+		myarch="${CHOST%%-*}-linux-thread"
+	else
+		myarch="${CHOST%%-*}-linux"
+	fi
+
+	if use gdbm
+	then
+		myconf="${myconf} -Di_gdbm"
+	fi
+	if use berkdb
+	then
+		myconf="${myconf} -Di_db"
+
+		# ndbm.h is only provided by db1 (and perhaps by gdbm in
+		# error). an alternate approach here would be to check for the
+		# presence (or some string therein) of /usr/include/ndbm.h
+		# itself.
+
+		if has_version '=sys-libs/db-1*'
+		then
+			myconf="${myconf} -Di_ndbm"
+		else
+			myconf="${myconf} -Ui_ndbm"
+		fi
+	else
+		myconf="${myconf} -Ui_db -Ui_ndbm"
+	fi
+	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 sparc
+	then
+		myconf="${myconf} -Ud_longdbl"
+	fi
+	if use sparc64
+	then
+		myconf="${myconf} -Ud_longdbl"
+	fi
+
+	if use alpha && "$(gcc-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
+
+	# These are temporary fixes. Need to edit the build so that that libraries created
+	# only get compiled with -fPIC, since they get linked into shared objects, they
+	# must be compiled with -fPIC.  Don't have time to parse through the build system
+	# at this time.
+	[ "${ARCH}" = "hppa" ] && append-flags -fPIC
+#	[ "${ARCH}" = "amd64" ] && append-flags -fPIC
+
+	sh Configure -des \
+		-Darchname="${myarch}" \
+		-Dcccdlflags='-fPIC' \
+		-Dccdlflags='-rdynamic' \
+		-Dcc="${CC:-gcc}" \
+		-Dprefix='/usr' \
+		-Dvendorprefix='/usr' \
+		-Dsiteprefix='/usr' \
+		-Dlocincpth=' ' \
+		-Doptimize="${CFLAGS}" \
+		-Duselargefiles \
+		-Dd_dosuid \
+		-Dd_semctl_semun \
+		-Dscriptdir=/usr/bin \
+		-Dman3ext='3pm' \
+		-Dcf_by='Gentoo' \
+		-Ud_csh \
+		${myconf} || die "Unable to configure"
+
+	MAKEOPTS="${MAKEOPTS} -j1" emake || die "Unable to make"
+
+	emake -i test CCDLFLAGS=
+}
+
+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}" \
+		INSTALLMAN1DIR="${D}/usr/share/man/man1" \
+		INSTALLMAN3DIR="${D}/usr/share/man/man3" \
+		install || die "Unable to make install"
+
+	cp -f utils/h2ph utils/h2ph_patched
+	epatch ${FILESDIR}/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_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
+
+	./perl installman \
+		--destdir="${D}" --man1ext='1' --man3ext='3'
+
+	# 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
+
+	dodoc Changes* Artistic Copying README Todo* AUTHORS
+
+	if [ -n "`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
+}
+
+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
+
+	if [ "${ROOT}" = "/" ]
+	then
+		ebegin "Converting C header files to the corresponding Perl format"
+		cd /usr/include; find ./ -name "*.h" -type f -exec h2ph {} \;
+	fi
+
+	eerror ""
+	eerror "If this is an upgrade to a perl 5.6.1 system,"
+	eerror "~OR~ an upgrade to a previous Gentoo release"
+	eerror "of perl 5.8.0, prior to -r8 "
+	eerror "you may need to recompile applications that"
+	eerror "were emerged against the old libperl.so"
+	eerror ""
+	eerror "${FILESDIR}/libperl_rebuilder "
+	eerror "is provided to assist with this. "
+	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 ""
+}