We do not want the build root in the linked perl module's RUNPATH, so

strip paths containing PORTAGE_TMPDIR if its set.  This is for the
MakeMaker module, bug #105054.

Package-Manager: portage-2.0.52-r1

7 files changed, 1330 insertions, 21 deletions

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index a90111f0906e..3f5d72073f5b 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,16 @@
 # 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.153 2005/09/17 10:43:42 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.154 2005/09/20 09:19:04 azarah Exp $
+
+*perl-5.8.7-r1 (20 Sep 2005)
+*perl-5.8.6-r6 (20 Sep 2005)
+
+  20 Sep 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/perl-5.8.7-MakeMaker-RUNPATH.patch, +perl-5.8.6-r6.ebuild,
+  +perl-5.8.7-r1.ebuild:
+  We do not want the build root in the linked perl module's RUNPATH, so
+  strip paths containing PORTAGE_TMPDIR if its set.  This is for the
+  MakeMaker module, bug #105054.
 
   05 Sep 2005; Herbie Hopkins <herbs@gentoo.org> perl-5.8.7.ebuild:
   More multilib fixes thanks to Christophe Saout, bug 104509.
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 3add6deb788a..7c5fcffdd5de 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,35 +1,40 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+MD5 f7a29917785a169a590b91421e465169 perl-5.8.7-r1.ebuild 19476
 MD5 933d62fc4adab220ae0707bf6ba26f25 perl-5.8.6-r5.ebuild 17611
+MD5 67b81e8b0343ff57efad2b79bd4b4497 ChangeLog 42812
 MD5 4f053817f817904cf1ad814f1811161e perl-5.8.7.ebuild 19239
-MD5 225a3f9121b31c4924121082c7927235 ChangeLog 42433
-MD5 bd75f0242e3b7791803d089c38a3f920 files/CAN-2005-0156-suid.patch 703
-MD5 2bd41aec5e22962224dc9376e27bdde3 files/CAN-2005-0448-rmtree.patch 7629
-MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-perl-5.8.6-r5 64
-MD5 c10e44e47d7f702efe7d4009064a97ca files/digest-perl-5.8.7 64
-MD5 154013a841cbb251d7b63fb006b4006f files/file_path_rmtree.patch 1068
-MD5 44e1f1420947cc552c66fb434ba4c855 files/perl-5.8.4-NDBM-GDBM-compat.patch 428
+MD5 2e7f462545894d769b10023fea1927a8 perl-5.8.6-r6.ebuild 17860
+MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 MD5 5dfd23c2236b382d031a9513bc12f3f1 files/perl-5.8.5-tempfiles.patch 2113
-MD5 c5cc36940b2488a37c3dc2287f6e672c files/perl-5.8.6-tempfiles.patch 2115
-MD5 fd8a46de4b22dbf9146a6d0459e812c4 files/perl-5.8.7-CAN-2005-0448-rmtree.patch 6961
-MD5 528fa2521c530d5a47df32b663e629af files/perl-5.8.7-regexp-nossp.patch 460
-MD5 26a1e7c48c7f68f39db4262500f6a1d8 files/perl-5.8.7-tempfiles.patch 1007
+MD5 01af75daf3d222a668059e90d78a1f9d files/perl-nonblock.patch 400
 MD5 c2612d59f380ad6e0c2de4d941e83dfd files/perl-cleaner 8879
-MD5 060e9f10466fdc1268c75a7cf4dcbc7c files/perl-h2ph-ansi-header.patch 446
 MD5 076dcbef37263d6dd7af719b55cfc2de files/perl-noksh.patch 611
-MD5 01af75daf3d222a668059e90d78a1f9d files/perl-nonblock.patch 400
-MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-perldoc-emptydirs.patch 489
-MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-picdl.patch 250
+MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-perl-5.8.6-r6 64
 MD5 4e99f7529e149661372283c981cf17ff files/perl-prelink-lpthread.patch 476
 MD5 f7324a62f22aabde3387b7e8a8b2106e files/perl-reorder-INC.patch 1141
-MD5 f98759a75347e0b54190850b8295c2cb files/perl-tempfiles.patch 2023
 MD5 ce442db939c59218a16be167f793b817 files/perl-uclibc.patch 573
+MD5 26a1e7c48c7f68f39db4262500f6a1d8 files/perl-5.8.7-tempfiles.patch 1007
+MD5 154013a841cbb251d7b63fb006b4006f files/file_path_rmtree.patch 1068
+MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-perl-5.8.6-r5 64
+MD5 528fa2521c530d5a47df32b663e629af files/perl-5.8.7-regexp-nossp.patch 460
+MD5 044b90a8895f8a03bef8e4cf5759eecc files/perl-5.8.7-MakeMaker-RUNPATH.patch 859
+MD5 2bd41aec5e22962224dc9376e27bdde3 files/CAN-2005-0448-rmtree.patch 7629
+MD5 44e1f1420947cc552c66fb434ba4c855 files/perl-5.8.4-NDBM-GDBM-compat.patch 428
+MD5 c10e44e47d7f702efe7d4009064a97ca files/digest-perl-5.8.7-r1 64
+MD5 fd8a46de4b22dbf9146a6d0459e812c4 files/perl-5.8.7-CAN-2005-0448-rmtree.patch 6961
+MD5 f98759a75347e0b54190850b8295c2cb files/perl-tempfiles.patch 2023
+MD5 c5cc36940b2488a37c3dc2287f6e672c files/perl-5.8.6-tempfiles.patch 2115
+MD5 bd75f0242e3b7791803d089c38a3f920 files/CAN-2005-0156-suid.patch 703
+MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-perldoc-emptydirs.patch 489
+MD5 060e9f10466fdc1268c75a7cf4dcbc7c files/perl-h2ph-ansi-header.patch 446
+MD5 c10e44e47d7f702efe7d4009064a97ca files/digest-perl-5.8.7 64
+MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-picdl.patch 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDK/NyKf2g/qXtneoRAoxKAJsHkytgi7C3FJFjec9Tw7YGfeykEwCggR/m
-/7EBpJQY2G5jGJRrHpf/2W8=
-=zMhg
+iD8DBQFDL9Ru1ZcsMnZjRyIRAj4uAKCyOopPZLVOQm2yNB+jkNMGQqtZZwCfXJEH
+f9nJz7U+B9KAk2FmdzlxphA=
+=fS28
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/perl/files/digest-perl-5.8.6-r6 b/dev-lang/perl/files/digest-perl-5.8.6-r6
new file mode 100644
index 000000000000..666169141e1e
--- /dev/null
+++ b/dev-lang/perl/files/digest-perl-5.8.6-r6
@@ -0,0 +1 @@
+MD5 3d030b6ff2a433840edb1a407d18dc0a perl-5.8.6.tar.bz2 9693085
diff --git a/dev-lang/perl/files/digest-perl-5.8.7-r1 b/dev-lang/perl/files/digest-perl-5.8.7-r1
new file mode 100644
index 000000000000..7407844a5a36
--- /dev/null
+++ b/dev-lang/perl/files/digest-perl-5.8.7-r1
@@ -0,0 +1 @@
+MD5 9a175d6ccbb5d9b41ffac5073ff9cc3c perl-5.8.7.tar.bz2 9839086
diff --git a/dev-lang/perl/files/perl-5.8.7-MakeMaker-RUNPATH.patch b/dev-lang/perl/files/perl-5.8.7-MakeMaker-RUNPATH.patch
new file mode 100644
index 000000000000..c442defa5d68
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.7-MakeMaker-RUNPATH.patch
@@ -0,0 +1,21 @@
+Bug #105054.
+
+We do not want the build root in the linked perl module's RUNPATH, so strip
+paths containing PORTAGE_TMPDIR if its set.
+
+--- perl-5.8.7/lib/ExtUtils/MM_Unix.pm	2005-09-10 14:06:59.000000000 +0200
++++ perl-5.8.7.az/lib/ExtUtils/MM_Unix.pm	2005-09-10 15:25:52.000000000 +0200
+@@ -1915,6 +1915,13 @@
+ 	    # LD_RUN_PATH now computed by ExtUtils::Liblist
+ 	    ($self->{EXTRALIBS},  $self->{BSLOADLIBS}, 
+              $self->{LDLOADLIBS}, $self->{LD_RUN_PATH}) = @libs;
++	    # We do not want the build root in RPATH
++	    if (exists $ENV{PORTAGE_TMPDIR}) {
++	      # If we have PORTAGE_TMPDIR set, strip that, as just testing for
++	      # /usr and /opt might not be sufficient
++	      $self->{LD_RUN_PATH} = join ':', grep !/^\Q$ENV{PORTAGE_TMPDIR}/,
++	                             split /:/, $self->{LD_RUN_PATH};
++	    }
+ 	    last;
+ 	}
+     }
diff --git a/dev-lang/perl/perl-5.8.6-r6.ebuild b/dev-lang/perl/perl-5.8.6-r6.ebuild
new file mode 100644
index 000000000000..b7bea457d72e
--- /dev/null
+++ b/dev-lang/perl/perl-5.8.6-r6.ebuild
@@ -0,0 +1,617 @@
+# 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-r6.ebuild,v 1.1 2005/09/20 09:19:05 azarah 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 ~m68k ~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="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 ${MY_P} 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 5
+	fi
+
+	if use minimal
+	then
+		ewarn "You have the minimal USE flag set. The resulting"
+		ewarn "perl is stripped of most of its module functionality"
+		ewarn "and is intended for minmal use case where you need"
+		ewarn "just the perl interpreter, no extras."
+	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
+
+	# We do not want the build root in the linked perl module's RUNPATH, so
+	# strip paths containing PORTAGE_TMPDIR if its set.  This is for the
+	# MakeMaker module, bug #105054.
+	epatch ${FILESDIR}/${PN}-5.8.7-MakeMaker-RUNPATH.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
+	# Fixes bug #97645
+	use ppc && filter-flags -mpowerpc-gpopt
+
+	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 ""
+
+}
diff --git a/dev-lang/perl/perl-5.8.7-r1.ebuild b/dev-lang/perl/perl-5.8.7-r1.ebuild
new file mode 100644
index 000000000000..0f9fddab5b61
--- /dev/null
+++ b/dev-lang/perl/perl-5.8.7-r1.ebuild
@@ -0,0 +1,654 @@
+# 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.7-r1.ebuild,v 1.1 2005/09/20 09:19:05 azarah 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$(get_libname ${PERLSLOT}.${SHORT_PV})"
+
+LICENSE="Artistic GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~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"
+
+DEPEND="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.87
+	!<perl-core/Test-Simple-0.47-r1"
+
+RDEPEND=">=sys-devel/libperl-${PV}
+	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 ${MY_P} 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 5
+	fi
+
+	if use minimal
+	then
+		ewarn "You have the minimal USE flag set. The resulting"
+		ewarn "perl is stripped of most of its module functionality"
+		ewarn "and is intended for minmal use case where you need"
+		ewarn "just the perl interpreter, no extras."
+	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
+
+	# 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
+
+	# We do not want the build root in the linked perl module's RUNPATH, so
+	# strip paths containing PORTAGE_TMPDIR if its set.  This is for the
+	# MakeMaker module, bug #105054.
+	epatch ${FILESDIR}/${PN}-5.8.7-MakeMaker-RUNPATH.patch
+
+	# Starting and hopefully ending with 5.8.7 we observe stack 
+	# corruption with the regexp handling in perls DynaLoader code 
+	# with ssp enabled. This become fatal during compile time so we 
+	# temporally disable ssp on two regexp files till upstream has a 
+	# chance to work it out. Bug #97452
+	use userland_Darwin || epatch "${FILESDIR}"/${P}-regexp-nossp.patch
+}
+
+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
+	# Fixes bug #97645
+	use ppc && filter-flags -mpowerpc-gpopt
+
+	export LC_ALL="C"
+	local myconf=""
+
+	if [[ ${KERNEL} == "FreeBSD" && "${ELIBC}" = "FreeBSD" ]]; then
+		osname="freebsd"
+	elif [[ ${USERLAND} == "Darwin" ]]; then
+		osname="darwin"
+	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"
+
+	if [[ $(get_libdir) != "lib" ]] ; then
+		myconf="${myconf} -Dlibpth='/usr/local/$(get_libdir) /$(get_libdir) \
+		/usr/$(get_libdir)'"
+	fi
+
+	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$(get_libname ${PERLSLOT})
+	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname)
+
+	# 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}/${P}-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}/ExtUtils/Command.pm
+	${prV}/ExtUtils/Constant.pm
+	${prV}/ExtUtils/Embed.pm
+	${prV}/ExtUtils/Installed.pm
+	${prV}/ExtUtils/Install.pm
+	${prV}/ExtUtils/Liblist.pm
+	${prV}/ExtUtils/MakeMaker.pm
+	${prV}/ExtUtils/Manifest.pm
+	${prV}/ExtUtils/Mkbootstrap.pm
+	${prV}/ExtUtils/Mksymlists.pm
+	${prV}/ExtUtils/MM_Any.pm
+	${prV}/ExtUtils/MM_MacOS.pm
+	${prV}/ExtUtils/MM.pm
+	${prV}/ExtUtils/MM_Unix.pm
+	${prV}/ExtUtils/MY.pm
+	${prV}/ExtUtils/Packlist.pm
+	${prV}/ExtUtils/testlib.pm
+	${prV}/ExtUtils/Miniperl.pm
+	${prV}/ExtUtils/Command/MM.pm
+	${prV}/ExtUtils/Constant/Base.pm
+	${prV}/ExtUtils/Constant/Utils.pm
+	${prV}/ExtUtils/Constant/XS.pm
+	${prV}/ExtUtils/Liblist/Kid.pm
+	${prV}/ExtUtils/MakeMaker/bytes.pm
+	${prV}/ExtUtils/MakeMaker/vmsish.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.$(get_libname)
+	${prVA}/auto/Data/Dumper/Dumper.$(get_libname)
+	${prVA}/auto/DynaLoader/dl_findfile.al
+	${prVA}/auto/Fcntl/Fcntl.$(get_libname)
+	${prVA}/auto/File/Glob/Glob.$(get_libname)
+	${prVA}/auto/IO/IO.$(get_libname)
+	${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.$(get_libname)
+	${prVA}/auto/POSIX/stat.al
+	${prVA}/auto/POSIX/tmpfile.al
+	${prVA}/auto/re/re.$(get_libname)
+	${prVA}/auto/Socket/Socket.$(get_libname)
+	${prVA}/auto/Storable/autosplit.ix
+	${prVA}/auto/Storable/_retrieve.al
+	${prVA}/auto/Storable/retrieve.al
+	${prVA}/auto/Storable/Storable.$(get_libname)
+	${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$(get_libname)
+	${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"
+
+	# Catch the headers in CORE
+	if use minimal ; then
+		for header in `find ${D}${prVA} -name "*.h"|sed -e "s:${D}::g"`; do
+			#header=`echo $head|sed -e "s:${D}::g"`
+			MINIMAL_PERL_INSTALL="${MINIMAL_PERL_INSTALL}
+			$header"
+		done
+	fi
+
+	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"
+	echo "${MINIMAL_PERL_INSTALL}"
+	sleep 120
+	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$(get_libname)" -a ! -L "${ROOT}usr/$(get_libdir)/libperl$(get_libname)" ]
+	then
+		mv -f ${ROOT}usr/$(get_libdir)/libperl$(get_libname) ${ROOT}usr/$(get_libdir)/libperl$(get_libname).old
+	fi
+
+	local perllib="`readlink -f ${ROOT}usr/$(get_libdir)/libperl$(get_libname) | 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$(get_libname)
+		rm -f ${ROOT}usr/$(get_libdir)/libperl$(get_libname ${PERLSLOT})
+		# Regenerate libperl.so.${PERLSLOT}
+		ln -snf ${LIBPERL} ${ROOT}usr/$(get_libdir)/libperl$(get_libname).${PERLSLOT}
+		# Create libperl.so (we use the *soname* versioned lib here ..)
+		ln -snf libperl$(get_libname ${PERLSLOT}) ${ROOT}usr/$(get_libdir)/libperl$(get_libname)
+	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 5
+	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$(get_libname)"
+	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 ""
+
+}