Cleaning up; bug 142940, updating h2ph options for multilib boxes

Package-Manager: portage-2.1.1_pre3-r1

3 files changed, 22 insertions, 679 deletions

diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 2114015fbf50..e79f54ba63eb 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX perl-5.8.7-CAN-2005-0448-rmtree.patch 6961 RMD160 bf242f32c1e1450a7d4d252cdc54cace36b50c62 SHA1 97d1f3a3b2d75b7a82983b1f98d4445ff82d2c19 SHA256 d6565afabbc35e0e1aeecfb469eaf037f892834312a7c2616357a309cd56e3f1
 MD5 fd8a46de4b22dbf9146a6d0459e812c4 files/perl-5.8.7-CAN-2005-0448-rmtree.patch 6961
 RMD160 bf242f32c1e1450a7d4d252cdc54cace36b50c62 files/perl-5.8.7-CAN-2005-0448-rmtree.patch 6961
@@ -88,32 +91,32 @@ RMD160 4a889fa029fb77e7454ed0c6f7870359340df672 files/perl-reorder-INC.patch 114
 SHA256 4e075cb6b6b418ab3b2a6f6b9af633ac51cc7d7749330d3981fa69d0f2d16564 files/perl-reorder-INC.patch 1141
 DIST perl-5.8.7.tar.bz2 9839086 RMD160 110c286d73fd89e25da8ea394e763f209a76d283 SHA1 c9477c6fe76b200033694bdc555a0276523d4228 SHA256 3c7e9ff6697c5266a8ce8ddc0a6a958c07c706612f0780aed897684f51e504ba
 DIST perl-5.8.8.tar.bz2 10123359 RMD160 e78f26d9b96e6db35f946ad4ff55e3a69385c71b SHA1 4aab490040727ca4419098720eca2ba4367df539 SHA256 818a140d9c04ea8dab3a05104b34ced7f7d9d0a91bfed91baf89a84d0dfb1bc9
-EBUILD perl-5.8.7-r2.ebuild 19481 RMD160 d6c3620e7f41e41a8df03bfec33e4bf9a8a12b35 SHA1 b73a44ac4e7064a38aed634bb518fd561ce7308a SHA256 e7cba5d2f71c0bda3fa51e34f326c30e0cb3ff40541ec8ef8c648a2abb7f0ac0
-MD5 75679bd47dd365acd1e733785b05e5b4 perl-5.8.7-r2.ebuild 19481
-RMD160 d6c3620e7f41e41a8df03bfec33e4bf9a8a12b35 perl-5.8.7-r2.ebuild 19481
-SHA256 e7cba5d2f71c0bda3fa51e34f326c30e0cb3ff40541ec8ef8c648a2abb7f0ac0 perl-5.8.7-r2.ebuild 19481
-EBUILD perl-5.8.7-r3.ebuild 19566 RMD160 49e29ac7af9b56ee084903df2a217a0107ea2b94 SHA1 14a9f61a8436ba042010c24add173b14852d65ea SHA256 fd88c4c7762ab9456966174ebb78eafd80783015f7e504f2c2ceb78d68b7d9ec
-MD5 209dc85dead34797824bbaf1cd018568 perl-5.8.7-r3.ebuild 19566
-RMD160 49e29ac7af9b56ee084903df2a217a0107ea2b94 perl-5.8.7-r3.ebuild 19566
-SHA256 fd88c4c7762ab9456966174ebb78eafd80783015f7e504f2c2ceb78d68b7d9ec perl-5.8.7-r3.ebuild 19566
-EBUILD perl-5.8.8-r2.ebuild 18035 RMD160 15b596151b5518628002e3eb576b5bd0ce5b3c32 SHA1 feb8f48479e85a2678008cb57734f5e32269dc3b SHA256 40c03455d30d77f56a73991450261f6877788fa478e68ea9087eff616219d37f
-MD5 d0ab172c6b579bbe3dd13d7d81fd568b perl-5.8.8-r2.ebuild 18035
-RMD160 15b596151b5518628002e3eb576b5bd0ce5b3c32 perl-5.8.8-r2.ebuild 18035
-SHA256 40c03455d30d77f56a73991450261f6877788fa478e68ea9087eff616219d37f perl-5.8.8-r2.ebuild 18035
-MISC ChangeLog 52733 RMD160 62f795fc37be4435f87f0ffb3c4ed637c0a5a616 SHA1 5333da06e3dbc76ce665511e6bba2445d8ad86a0 SHA256 f2bed7214c231346b774c63dc6e9516708f6309d4f886b26a05e9f204ad0bec4
-MD5 e670e5d06bf1e7cffcb2ec1ff4350473 ChangeLog 52733
-RMD160 62f795fc37be4435f87f0ffb3c4ed637c0a5a616 ChangeLog 52733
-SHA256 f2bed7214c231346b774c63dc6e9516708f6309d4f886b26a05e9f204ad0bec4 ChangeLog 52733
+EBUILD perl-5.8.7-r3.ebuild 19588 RMD160 249cb26da092171c1f4251ab34f2def5ee47336d SHA1 66c2a1b9673c51fdd04c4449a9425c9b010871c9 SHA256 c8a3f30366782f0ce97b0eed2d7845370a92e6f11dd23f6c7cc197c28dfd4201
+MD5 db11096167a4695bf062411a5e163343 perl-5.8.7-r3.ebuild 19588
+RMD160 249cb26da092171c1f4251ab34f2def5ee47336d perl-5.8.7-r3.ebuild 19588
+SHA256 c8a3f30366782f0ce97b0eed2d7845370a92e6f11dd23f6c7cc197c28dfd4201 perl-5.8.7-r3.ebuild 19588
+EBUILD perl-5.8.8-r2.ebuild 18058 RMD160 68d1cc676b532626cdc7580a60d5428f78a3c921 SHA1 a1296f853021f5cf87150c691a27dafd21c68309 SHA256 1e8c7aae62361ef83423d8290064b8c4d4d41d373da10a09a1815bd5d6e31cca
+MD5 83048c6b2f32313f9def2eb411bd6428 perl-5.8.8-r2.ebuild 18058
+RMD160 68d1cc676b532626cdc7580a60d5428f78a3c921 perl-5.8.8-r2.ebuild 18058
+SHA256 1e8c7aae62361ef83423d8290064b8c4d4d41d373da10a09a1815bd5d6e31cca perl-5.8.8-r2.ebuild 18058
+MISC ChangeLog 52932 RMD160 6f4ca34f9ed5808b06f3de72f40126750259248c SHA1 cf5875cc1e0b2eb89b32f90f2981ff131d3491c0 SHA256 04c035851bf44251e64a77302847c7c44f9814ac6df6b34c8744b5b03c676ef1
+MD5 2f92392ac5478d56422d84810f94b36e ChangeLog 52932
+RMD160 6f4ca34f9ed5808b06f3de72f40126750259248c ChangeLog 52932
+SHA256 04c035851bf44251e64a77302847c7c44f9814ac6df6b34c8744b5b03c676ef1 ChangeLog 52932
 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 RMD160 647980838c590f54441a053916ea629e53e551c0 metadata.xml 305
 SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca metadata.xml 305
-MD5 39fdfa293f0e32ebaea0e6e06f6fd6bd files/digest-perl-5.8.7-r2 238
-RMD160 52b06a8955d4544064a20d3abe57b1cf85a4dd91 files/digest-perl-5.8.7-r2 238
-SHA256 f1b8dc5213cf0ea98d0c513e5e353ee24cdda01e0a3e49d2fef241d796e6ba68 files/digest-perl-5.8.7-r2 238
 MD5 39fdfa293f0e32ebaea0e6e06f6fd6bd files/digest-perl-5.8.7-r3 238
 RMD160 52b06a8955d4544064a20d3abe57b1cf85a4dd91 files/digest-perl-5.8.7-r3 238
 SHA256 f1b8dc5213cf0ea98d0c513e5e353ee24cdda01e0a3e49d2fef241d796e6ba68 files/digest-perl-5.8.7-r3 238
 MD5 750a1b4341f04665c5ce30e14a302f96 files/digest-perl-5.8.8-r2 241
 RMD160 a339ac2a520b2fd2f458daf89cd89eb36a8c98b2 files/digest-perl-5.8.8-r2 241
 SHA256 1067b25eabccaa2d61cfc9db27e31c6b18d075e440713e44dcde000c71bbf178 files/digest-perl-5.8.8-r2 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFE5joetG5z4I8BtQoRAkSbAJ0aUbZA9jm+ceqsPqAqfuktpiGr3wCdGpCv
+L+gaTsA89pCz1+9W1K9Y9Zg=
+=SsEm
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/perl/files/digest-perl-5.8.7-r2 b/dev-lang/perl/files/digest-perl-5.8.7-r2
deleted file mode 100644
index ac4cf904484c..000000000000
--- a/dev-lang/perl/files/digest-perl-5.8.7-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9a175d6ccbb5d9b41ffac5073ff9cc3c perl-5.8.7.tar.bz2 9839086
-RMD160 110c286d73fd89e25da8ea394e763f209a76d283 perl-5.8.7.tar.bz2 9839086
-SHA256 3c7e9ff6697c5266a8ce8ddc0a6a958c07c706612f0780aed897684f51e504ba perl-5.8.7.tar.bz2 9839086
diff --git a/dev-lang/perl/perl-5.8.7-r2.ebuild b/dev-lang/perl/perl-5.8.7-r2.ebuild
deleted file mode 100644
index e2a188979d0d..000000000000
--- a/dev-lang/perl/perl-5.8.7-r2.ebuild
+++ /dev/null
@@ -1,657 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.7-r2.ebuild,v 1.9 2006/08/13 11:27:27 yuval 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 Report 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 ~ppc-macos ppc64 ~s390 ~sh sparc ~x86"
-IUSE="berkdb debug doc gdbm ithreads perlsuid build minimal"
-PERL_OLDVERSEN="5.8.0 5.8.2 5.8.4 5.8.5 5.8.6"
-
-DEPEND="berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.3 )
-	>=sys-devel/libperl-${PV}
-	!<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
-
-	# Bug 114113
-	cd ${S}; epatch ${FILESDIR}/perl-exp_intwrap.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=""
-
-	case ${CHOST} in
-		*-freebsd*) osname="freebsd" ;;
-		*-netbsd*) osname="netbsd" ;;
-		*-openbsd*) osname="openbsd" ;;
-		*-darwin*) osname="darwin" ;;
-
-		*) osname="linux" ;;
-	esac
-
-	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=/usr/share/man/man1 \
-		-Dinstallman3dir=/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 ""
-
-}