adding 5.8.1_rc1

6 files changed, 450 insertions, 18 deletions

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index a57bac1b4e3f..c67236d090c4 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/perl
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.24 2003/07/01 15:20:00 todd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.25 2003/07/11 06:02:44 rac Exp $
+
+*perl-5.8.1_rc1 (10 Jul 2003)
+
+  10 Jul 2003; <rac@gentoo.org> perl-5.8.1_rc1.ebuild,
+  files/perl-5.8.1_rc1-reorder-INC.patch,
+  files/perl-5.8.1_rc1-sockatmark-should-__THROW.patch:
+  Add 5.8.1_rc1.  Experimental.
 
   01 Jul 2003; Todd Sunderlin <todd@gentoo.org> perl-5.8.0-r11.ebuild:
   set stable on sparc
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index e9b260f77e14..ac45468cd249 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,25 +1,29 @@
-MD5 5447a43bbb86b09231a373cbf67c01f9 ChangeLog 16819
-MD5 01b216e82ad890302a0becdc19244a10 perl-5.6.1-r10.ebuild 6819
-MD5 fdccad58d0969a57dc5a284b9e385889 perl-5.6.1-r11.ebuild 6276
+MD5 e17d94a31ec95ba063e25a5e7bb14cc5 perl-5.6.1-r12.ebuild 7227
+MD5 8fcf12ec7cba47cb0796ccef222eaaaf perl-5.8.1_rc1.ebuild 10217
 MD5 a591187e67b485b42c12fd7719f84a13 perl-5.8.0-r10.ebuild 14065
 MD5 3dc77560d588871c4db09b8a86737f6d perl-5.8.0-r9.ebuild 13569
-MD5 e17d94a31ec95ba063e25a5e7bb14cc5 perl-5.6.1-r12.ebuild 7227
-MD5 186dda3b08c276a87766d479faf6f912 perl-5.8.0-r11.ebuild 9900
 MD5 03adaa32dd959f253bebfaf666eb7310 perl-5.8.0-r12.ebuild 10254
-MD5 ea9bf02b28e73e19dc85eb07f2347460 files/5.6.1-builtin-fixup.diff 777
-MD5 28fe3868fd4e47ca609f7af6156c94ea files/5.6.1-op-test-fix.diff 503
-MD5 6b85fd38953aa08ceab8d0fa92cdd2ac files/digest-perl-5.6.1-r10 859
-MD5 5dee2b8a9e5e840e7379f11ae07eb68c files/digest-perl-5.6.1-r11 859
-MD5 9810be5a789a6d0bde088fef8fb261a4 files/digest-perl-5.8.0-r10 861
-MD5 cc61dca6d96347b5d93cfdde1514feb4 files/digest-perl-5.8.0-r9 860
-MD5 d2af75f06a64c5934db314ff38939cdd files/libperl-5.8.0-create-libperl-soname.patch 424
-MD5 b8480b2ccbf7d5a7fe543b9e6f8dbc14 files/libperl_rebuilder 10260
+MD5 fdccad58d0969a57dc5a284b9e385889 perl-5.6.1-r11.ebuild 6276
+MD5 c985a4134fad63be5976cc1affc0a29c ChangeLog 17035
+MD5 186dda3b08c276a87766d479faf6f912 perl-5.8.0-r11.ebuild 9900
+MD5 01b216e82ad890302a0becdc19244a10 perl-5.6.1-r10.ebuild 6819
 MD5 060e9f10466fdc1268c75a7cf4dcbc7c files/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch 446
 MD5 4e49da394d326bcb744c7990bd27d6ac files/perl-5.8.0-perldoc-emptydirs.patch 461
-MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.0-prelink-lpthread.patch 476
-MD5 393b3dff879c892d461901183d3b0055 files/perl-5.8.0-sockatmark-should-__THROW.patch 402
-MD5 803b7c028f59008ea1e6d577e5c0bab0 files/stat.t 8884
+MD5 6b85fd38953aa08ceab8d0fa92cdd2ac files/digest-perl-5.6.1-r10 859
+MD5 5dee2b8a9e5e840e7379f11ae07eb68c files/digest-perl-5.6.1-r11 859
 MD5 9f290d90a6928f0b9662b20c1426c48a files/digest-perl-5.6.1-r12 198
+MD5 28fe3868fd4e47ca609f7af6156c94ea files/5.6.1-op-test-fix.diff 503
+MD5 b8480b2ccbf7d5a7fe543b9e6f8dbc14 files/libperl_rebuilder 10260
+MD5 ea9bf02b28e73e19dc85eb07f2347460 files/5.6.1-builtin-fixup.diff 777
+MD5 0a2e349a2e2fa8c18192d5e908f8533f files/perl-5.8.1_rc1-sockatmark-should-__THROW.patch 379
+MD5 013255dc6a00399b13caaf899a72e8db files/perl-5.8.0-reorder-INC.patch 2292
+MD5 9810be5a789a6d0bde088fef8fb261a4 files/digest-perl-5.8.0-r10 861
 MD5 5c83a2e6f630182b708d39c7de034075 files/digest-perl-5.8.0-r11 188
 MD5 5c83a2e6f630182b708d39c7de034075 files/digest-perl-5.8.0-r12 188
-MD5 013255dc6a00399b13caaf899a72e8db files/perl-5.8.0-reorder-INC.patch 2292
+MD5 ac9dfab35984723656c734b7312bf403 files/digest-perl-5.8.1_rc1 65
+MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.1_rc1-reorder-INC.patch 2211
+MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.0-prelink-lpthread.patch 476
+MD5 803b7c028f59008ea1e6d577e5c0bab0 files/stat.t 8884
+MD5 cc61dca6d96347b5d93cfdde1514feb4 files/digest-perl-5.8.0-r9 860
+MD5 393b3dff879c892d461901183d3b0055 files/perl-5.8.0-sockatmark-should-__THROW.patch 402
+MD5 d2af75f06a64c5934db314ff38939cdd files/libperl-5.8.0-create-libperl-soname.patch 424
diff --git a/dev-lang/perl/files/digest-perl-5.8.1_rc1 b/dev-lang/perl/files/digest-perl-5.8.1_rc1
new file mode 100644
index 000000000000..42ba63bbdfcf
--- /dev/null
+++ b/dev-lang/perl/files/digest-perl-5.8.1_rc1
@@ -0,0 +1 @@
+MD5 7bab1b831161575f134a67b7789d213e perl-5.8.1-RC1.tgz 11664242
diff --git a/dev-lang/perl/files/perl-5.8.1_rc1-reorder-INC.patch b/dev-lang/perl/files/perl-5.8.1_rc1-reorder-INC.patch
new file mode 100644
index 000000000000..c934b4135a13
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.1_rc1-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/files/perl-5.8.1_rc1-sockatmark-should-__THROW.patch b/dev-lang/perl/files/perl-5.8.1_rc1-sockatmark-should-__THROW.patch
new file mode 100644
index 000000000000..bbc1c4a68907
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.1_rc1-sockatmark-should-__THROW.patch
@@ -0,0 +1,11 @@
+--- perl.h.orig	2003-07-10 15:53:31.000000000 -0700
++++ perl.h	2003-07-10 16:06:30.000000000 -0700
+@@ -736,7 +736,7 @@
+ /* sockatmark() is so new (2001) that many places might have it hidden
+  * behind some -D_BLAH_BLAH_SOURCE guard. */
+ #if defined(HAS_SOCKATMARK) && !defined(HAS_SOCKATMARK_PROTO)
+-int sockatmark(int);
++int sockatmark(int) __THROW;
+ #endif
+ 
+ #ifdef SETERRNO
diff --git a/dev-lang/perl/perl-5.8.1_rc1.ebuild b/dev-lang/perl/perl-5.8.1_rc1.ebuild
new file mode 100644
index 000000000000..ef61b53c6804
--- /dev/null
+++ b/dev-lang/perl/perl-5.8.1_rc1.ebuild
@@ -0,0 +1,324 @@
+# Copyright 1999-2003 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.1_rc1.ebuild,v 1.1 2003/07/11 06:02:48 rac Exp $
+
+inherit eutils flag-o-matic 
+
+# 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
+
+# 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="http://www.cpan.org/authors/id/J/JH/JHI/${MY_P}.tgz"
+#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/"
+SLOT="0"
+LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
+LICENSE="Artistic GPL-2"
+KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~alpha ~mips ~hppa"
+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.45-r5
+	=sys-devel/libperl-${SHORT_PV}*
+	!<=dev-perl/ExtUtils-MakeMaker-6.05-r5
+	!<=dev-perl/File-Spec-0.82"
+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 [ -n "`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}
+
+	# Fix the definition of 'int sockatmark(int);' in perl.h to have __THROW.
+	# This fixes bug #12605.
+	# <azarah@gentoo.org> (28 Dec 2002).
+	cd ${S}; epatch ${FILESDIR}/${P}-sockatmark-should-__THROW.patch
+
+	# 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)
+
+	# Disabled because 5.8.1_rc1 does not segfault with the test in
+	# bug #14380, even though /usr/bin/perl is not linked with
+	# -lpthread.  May need further investigation.
+	# <rac@gentoo.org> (10 Jul 2003)
+
+	#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)
+
+	# we are using the vendor directory now, so it should not be
+	# empty.  this patch doesn't come close to applying, so leaving
+	# off for now.
+	# <rac@gentoo.org> (10 Jul 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
+}
+
+src_compile() {
+
+	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 -Di_ndbm"
+	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
+	
+cat > config.over <<EOF
+installprefix=${D}/usr
+installarchlib=\`echo \$installarchlib | sed "s!\$prefix!\$installprefix!"\`
+installbin=\`echo \$installbin | sed "s!\$prefix!\$installprefix!"\`
+installman1dir=\`echo \$installman1dir | sed "s!\$prefix!\$installprefix!"\`
+installman3dir=\`echo \$installman3dir | sed "s!\$prefix!\$installprefix!"\`
+installman1dir=\`echo \$installman1dir | sed "s!/share/share/!/share/!"\`
+installman3dir=\`echo \$installman3dir | sed "s!/share/share/!/share/!"\`
+installman1dir=\`echo \$installman1dir | sed "s!/usr/man/!/usr/share/man/!"\`
+installman3dir=\`echo \$installman3dir | sed "s!/usr/man/!/usr/share/man/!"\`
+man1ext=1
+man3ext=3pm
+installprivlib=\`echo \$installprivlib | sed "s!\$prefix!\$installprefix!"\`
+installscript=\`echo \$installscript | sed "s!\$prefix!\$installprefix!"\`
+installsitelib=\`echo \$installsitelib | sed "s!\$prefix!\$installprefix!"\`
+installsitearch=\`echo \$installsitearch | sed "s!\$prefix!\$installprefix!"\`
+EOF
+	sleep 10
+	sh Configure -des \
+		-Darchname="${myarch}" \
+		-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 \
+		--man1dir="${D}/usr/share/man/man1" --man1ext='1' \
+		--man3dir="${D}/usr/share/man/man3" --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; h2ph *.h sys/*.h
+	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 ""
+}
+
+