update perl patch from http://bugs.gentoo.org/show_bug.cgi?id=134650

5 files changed, 802 insertions, 2 deletions

diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 255c6b1..1cf0b3b 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,5 +1,5 @@
 AUX Makefile.SH.patch 8484 RMD160 5e4e2c6628f9528edc4f53bbf6730accd2c52bb2 SHA1 89bf18040a20b803e38c3f7d2c15efd6d4429ab8 SHA256 01cc2c3cfd1175c5f031d6bb1e5167427813a7bd6f1f3d97b923c0086ac77955
-AUX config-bits 29915 RMD160 6d2e4f4b32c72dff0f0d55d0490459efa9d705de SHA1 abaa8948a466f6faa22f70192f1f8b7f284983e8 SHA256 42ff75e16eccff094cacb74d9d3cdfa0365d5ceb55aee7ee58d33b9108550b2a
+AUX config-bits 30029 RMD160 4b216885476a81d382f71f405e7ff5a6f2fafb18 SHA1 af85bb5922c33426edb828a14846ee49ed3bc345 SHA256 ac15eb6b1e25070cb36880765c79cbac24b748562efca2614ddfe1066d0e7aa8
 AUX letgcc-find-errno.patch 1434 RMD160 939d8375f667ef341c0bcdb86a6386dcac776c96 SHA1 1c11211c20710b49dc78554db9c3b31638671bd1 SHA256 c9177630da71bb8e864ac76181d69b8216c95564fd1a074bf922fac0b2982547
 AUX native-perlinc.patch 982 RMD160 8567629f6f254cba86de92d502636cb890a149eb SHA1 b7bcc3728682b867700a14b87e55507771953ae2 SHA256 692c7a0341f5f2c6f1e6fdcb0a96c351d53db7db0b9ad98f9d90758a62d3f498
 AUX perl-5.8.7-MakeMaker-RUNPATH.patch 859 RMD160 b0e95fcd9b1bbc085e9986f8910e3fbcf3f78eb2 SHA1 1e7c2f05ffaf8f6aee753ab106a9798e6920ff06 SHA256 3d327c525e0cf57899eca48d417fa4363f40da9b0d6b70b61e951521749047ab
@@ -36,6 +36,7 @@ DIST perl-5.10.1-9.tar.bz2 7388 RMD160 3758c2c78e22ed55fb90db283cfd9e5998535903
 DIST perl-5.10.1.tar.bz2 11608061 RMD160 840b3a5ac3d7f517770ce789676ebd9154d9ee5a SHA1 98b762b5cd4fb76dd354dfa5ba0d21bc2acacaf2 SHA256 9385f2c8c2ca8b1dc4a7c31903f1f8dc8f2ba867dc2a9e5c93012ed6b564e826
 DIST perl-5.8.8.tar.bz2 10123359 RMD160 e78f26d9b96e6db35f946ad4ff55e3a69385c71b SHA1 4aab490040727ca4419098720eca2ba4367df539 SHA256 818a140d9c04ea8dab3a05104b34ced7f7d9d0a91bfed91baf89a84d0dfb1bc9
 EBUILD perl-5.10.1.ebuild 17857 RMD160 3d0ee78b539a6a4780ba510bfdab3707e566bc3e SHA1 786109962e605ca838cc1647240effc43dce03c6 SHA256 2cf0d8a9f7558850dd5deb845af96c432fa3e55a1c115703599d72091d018030
+EBUILD perl-5.8.8-r10.ebuild 23702 RMD160 ca5484f7943e51e0496be72a2c667f4e56c58500 SHA1 ad692cbc39fd37dd1a5a43fe9638e8bfab09ea2d SHA256 27ff636420d4865b712e03f9cf5c47e9bf3fd8fa573631b9d2191db41782e251
 EBUILD perl-5.8.8-r8.ebuild 20808 RMD160 7804830579a9a3318c0d7473e134d52bd0fcd8b1 SHA1 72acea9f3223f422d8303665ac567480091571be SHA256 7c7256bd7d5e30bab02f522d77ae6abfd20e048056e3e155decd38ea35156037
 EBUILD perl-5.8.8-r9.ebuild 23699 RMD160 f90b5fd2781ae8be97f9e2c4f73d03f55bc8677f SHA1 d602014d03002323e1bfec0b441a8f70814d90d3 SHA256 b8925839a776041412ecd32a6c5e3e0751db8ead9b956d9e718b2678d61c76b9
 MISC ChangeLog 64477 RMD160 a2c1aa2c453247953a241bd8b4f8f298bd122de0 SHA1 865017eca08ee3bb5d19eaab4c725d4c4df81f1a SHA256 3f5b630f07b7786bdf367845d2a058d5a144e6f7c9e8ab9c9a5f6d11c4987d08
diff --git a/dev-lang/perl/files/config-bits b/dev-lang/perl/files/config-bits
index cce5d75..02a7cf8 100644
--- a/dev-lang/perl/files/config-bits
+++ b/dev-lang/perl/files/config-bits
@@ -149,6 +149,10 @@ d_chroot='define'
 d_chsize='undef'
 d_class='undef'
 d_clearenv='define'
+d_clock='define'
+d_clock_getres='define'
+d_clock_gettime='define'
+d_clock_nanosleep='define'
 d_closedir='define'
 d_cmsghdr_s='define'
 d_const='define'
@@ -336,6 +340,7 @@ d_msgsnd='define'
 d_msync='define'
 d_munmap='define'
 d_mymalloc='undef'
+d_nanosleep='define'
 d_nice='define'
 d_nl_langinfo='define'
 d_nv_zero_is_allbits_zero='define'
diff --git a/dev-lang/perl/perl-5.8.8-r10.ebuild b/dev-lang/perl/perl-5.8.8-r10.ebuild
new file mode 100644
index 0000000..82518ff
--- /dev/null
+++ b/dev-lang/perl/perl-5.8.8-r10.ebuild
@@ -0,0 +1,789 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header:
+
+inherit eutils alternatives 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}"
+MY_PV="${PV%_rc*}"
+DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="mirror://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 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="berkdb debug doc gdbm ithreads perlsuid build elibc_FreeBSD"
+PERL_OLDVERSEN="5.8.0 5.8.2 5.8.4 5.8.5 5.8.6 5.8.7"
+
+DEPEND="berkdb? ( sys-libs/db )
+	gdbm? ( >=sys-libs/gdbm-1.8.3 )
+	>=sys-devel/libperl-${PV}-r1
+	elibc_FreeBSD? ( sys-freebsd/freebsd-mk-defs )
+	<sys-devel/libperl-5.9
+	!<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 )
+	build? (
+		!perl-core/Test-Harness
+		!perl-core/PodParser
+		!dev-perl/Locale-gettext
+	)"
+
+PDEPEND=">=app-admin/perl-cleaner-1.03"
+
+# Cross-compiled build can't use a bootstrapped miniperl so
+# it uses native perl.
+if tc-is-cross-compiler; then
+	export HOSTPERL="/usr/bin/perl${PV}"
+
+	# Can't run cross-compiled perl & can't test cross-compiled libs with native perl
+	RESTRICT="test"
+else
+	export HOSTPERL='./perl'
+fi
+
+dual_scripts() {
+	src_remove_dual_scripts perl-core/Encode             2.12    enc2xs piconv
+	src_remove_dual_scripts perl-core/PodParser          1.32    pod2usage podchecker podselect
+	src_remove_dual_scripts perl-core/ExtUtils-MakeMaker 6.30    instmodsh
+	src_remove_dual_scripts perl-core/Test-Harness       2.56    prove
+	src_remove_dual_scripts perl-core/CPAN               1.76_02 cpan
+	src_remove_dual_scripts perl-core/podlators          1.37    pod2man pod2text
+}
+
+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 tc-is-cross-compiler ; then
+		ewarn "It appears you are cross-compiling ${PN}."
+		ewarn "You must have libperl-${PV} (>=libperl-5.8.8-r3) and"
+		ewarn "perl-${PV} (>=perl-5.8.8-r9) installed on your"
+		ewarn "native build system or this build might fail."
+		epause 5
+	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
+	dual_scripts
+}
+
+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}"/${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}"/${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
+
+	# makedepend.SH contains a syntax error which is ignored by bash but causes
+	# dash to abort
+	epatch "${FILESDIR}"/${P}-makedepend-syntax.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
+	[[ -n $(test-flags -fno-stack-protector) ]] && \
+		epatch "${FILESDIR}"/${PN}-regexp-nossp.patch
+
+	# On PA7200, uname -a contains a single quote and we need to
+	# filter it otherwise configure fails. See #125535.
+	epatch "${FILESDIR}"/perl-hppa-pa7200-configure.patch
+
+	case "$(get_libdir)" in
+		lib64) cd "${S}" && epatch "${FILESDIR}"/${P}-lib64.patch;;
+		lib32) cd "${S}" && epatch "${FILESDIR}"/${P}-lib32.patch;;
+		lib) true;;
+		*) die "Something's wrong with your libdir, don't know how to treat it.";;
+	esac
+
+	[[ ${CHOST} == *-dragonfly* ]] && cd "${S}" && epatch "${FILESDIR}"/${P}-dragonfly-clean.patch
+	[[ ${CHOST} == *-freebsd* ]] && cd "${S}" && epatch "${FILESDIR}"/${P}-fbsdhints.patch
+	cd "${S}"; epatch "${FILESDIR}"/${P}-USE_MM_LD_RUN_PATH.patch
+	cd "${S}"; epatch "${FILESDIR}"/${P}-links.patch
+	# c++ patch - should address swig related items
+	cd "${S}"; epatch "${FILESDIR}"/${P}-cplusplus.patch
+
+	epatch "${FILESDIR}"/${P}-gcc42-command-line.patch
+
+	# Newer linux-headers don't include asm/page.h. Fix this.
+	# Patch from bug 168312, thanks Peter!
+	echo "#include <asm/page.h>" | $(tc-getCPP) > /dev/null 2>&1 || \
+		epatch "${FILESDIR}"/${P}-asm-page-h-compile-failure.patch
+
+	# Also add the directory prefix of the current file when the quote syntax is
+	# used; 'require' will only look in @INC, not the current directory.
+	epatch "${FILESDIR}"/${PN}-fix_h2ph_include_quote.patch
+
+	# perlcc fix patch - bug #181229
+	epatch "${FILESDIR}"/${P}-perlcc.patch
+
+	# libnet hostname test patch
+	epatch "${FILESDIR}"/${P}-libnet-hostname.patch
+
+	# patch to fix bug #198196
+	# UTF/Regular expressions boundary error (CVE-2007-5116)
+	epatch "${FILESDIR}"/${P}-utf8-boundary.patch
+
+	# patch to fix bug #219203
+	epatch "${FILESDIR}"/${P}-CVE-2008-1927.patch
+
+	epatch "${FILESDIR}"/${P}-CAN-2005-0448-rmtree-2.patch
+	epatch "${FILESDIR}"/${P}-fix_file_path_chdir.patch
+
+	# Respect CFLAGS even for linking when done with compiler
+	epatch "${FILESDIR}"/${P}-ccld-cflags.patch
+
+	# Check the environment for {PERL_LIB}, {PERL_ARCHLIB}
+	# and {PERL_INC} and use relative headers
+	epatch "${FILESDIR}"/native-perlinc.patch
+
+	# Dynamically load modules from ${PERLHOSTLIB} to
+	# use while compiling
+	epatch "${FILESDIR}"/perl-dynloader.patch
+	
+	# Use Config_heavy.pl from ${PERL_ARCHLIB}
+	epatch "${FILESDIR}"/perl-configpm-switch.patch
+
+	if tc-is-cross-compiler; then
+		# Use ${HOSTPERL}, not miniperl, for cross-compiling
+		epatch "${FILESDIR}"/Makefile.SH.patch
+
+		epatch "${FILESDIR}"/perl-moreconfig.patch
+		epatch "${FILESDIR}"/letgcc-find-errno.patch
+	fi
+}
+
+myconf() {
+	# the myconf array is declared in src_configure
+	myconf=( "${myconf[@]}" "$@" )
+}
+
+src_configure() {
+	declare -a myconf
+
+	# 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"
+	( gcc-specs-ssp && use ia64 ) && append-flags -fno-stack-protector
+	# This flag makes compiling crash in interesting ways
+	filter-flags -malign-double
+	# Fixes bug #97645
+	use ppc && filter-flags -mpowerpc-gpopt
+	# Fixes bug #143895 on gcc-4.1.1
+	filter-flags "-fsched2-use-superblocks"
+
+	export LC_ALL="C"
+
+	case ${CHOST} in
+		*-freebsd*) osname="freebsd" ;;
+		*-dragonfly*) osname="dragonfly" ;;
+		*-netbsd*) osname="netbsd" ;;
+		*-openbsd*) osname="openbsd" ;;
+		*-darwin*) osname="darwin" ;;
+
+		*) osname="linux" ;;
+	esac
+
+	if use ithreads
+	then
+		einfo "using ithreads"
+		mythreading="-multi"
+		myconf -Dusethreads
+		myarch=${CHOST}
+		myarch="${myarch%%-*}-${osname}-thread"
+	else
+		myarch=${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 "-${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 -Dd_u32align
+	fi
+
+	if use perlsuid
+	then
+		myconf -Dd_dosuid
+		ewarn "You have enabled Perl's suid compile. Please"
+		ewarn "read http://search.cpan.org/~nwclark/perl-5.8.8/INSTALL#suidperl"
+		epause 3
+	fi
+
+	if use debug
+	then
+		CFLAGS="${CFLAGS} -g"
+		myconf -DDEBUGGING
+	fi
+
+	if use sparc
+	then
+		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 -Ui_db -Ui_ndbm
+	fi
+
+	[[ -n "${ABI}" ]] && myconf "-Dusrinc=$(get_ml_incdir)"
+
+	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
+
+	if [[ $(get_libdir) != "lib" ]] ; then
+		# We need to use " and not ', as the written config.sh use ' ...
+		myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
+	fi
+
+	if tc-is-cross-compiler; then
+		# ${S}/config.sh is generated from config-bits.
+		# Bash substitution is used to alter options for each build
+
+		source "${FILESDIR}"/config-bits || die "sourcing of config-bits failed"
+		make_configsh || die "make_configsh failed"
+
+		sed -i -e "s|/usr/include|${ROOT}usr/include|g" \
+			"${S}"/ext/Errno/Errno_pm.PL || die "sed of ${S}/ext/Errno/Errno_pm.PL failed"
+		
+		sh Configure -S $(use debug && echo '-DDEBUGGING') || die "Unable to configure"
+	else
+		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 \
+			-Dusenm \
+			"${myconf[@]}" || die "Unable to configure"
+	fi
+}
+
+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"
+	
+	if tc-is-cross-compiler; then
+		# Cross-compile build uses host library
+		export PERLHOSTLIB="$(${HOSTPERL} -V:archlib | cut -d \' -f 2)"
+		
+		emake -j1 more || die "Unable to make more"
+
+		mkdir -p "${S}"/fake_config_library || die "Unable to mkdir ${S}/fake_config_library"
+		cp -f "${S}"/lib/Config.pm "${S}"/fake_config_library \
+			|| die "Unable to copy ${S}/lib/Config.pm"
+
+		emake -j1 more2 "PERLRUN=${HOSTPERL} \
+			-I${S}/fake_config_library -MConfig" || die "Unable to make more2"
+		emake -j1 more3 "PERLRUN=${HOSTPERL} \
+			-I${S}/fake_config_library -MConfig" || die "Unable to make more3"
+		emake -j1 more4 "PERLRUN=${HOSTPERL} \
+			-I${S}/fake_config_library -MConfig" || die "Unable to make more4"
+
+		rm -rf "${S}"/install_me_here || die "Unable to remove ${S}/install_me_here"
+
+		for f in `find "${S}"/lib -name install_me_here` ; do
+			cp -r "${f}"/* "${S}"/install_me_here/ || die "Unable to copy ${f}/*" 
+		done
+
+		for f in `find "${S}"/lib -name install_me_here` ; do
+			rm -rf "${f}" || die "Unable to remove ${f}" 
+		done
+	fi
+}
+
+src_test() {
+	use elibc_uclibc && export MAKEOPTS="${MAKEOPTS} -j1"
+	emake -i test CCDLFLAGS= || die "test failed"
+}
+
+src_install() {
+
+	export LC_ALL="C"
+
+	# Cross-compile build uses host library
+	tc-is-cross-compiler && \
+		export PERLHOSTLIB="$(${HOSTPERL} -V:archlib | cut -d \' -f 2)"
+
+	# Need to do this, else apps do not link to dynamic version of
+	# the library ...
+	local coredir="/usr/$(get_libdir)/perl5/${MY_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/$(get_libdir)/perl5/site_perl/${MY_PV}/${myarch}${mythreading}
+
+	local installtarget=install
+	if use build ; then
+		installtarget=install.perl
+	fi
+	make DESTDIR="${D}" ${installtarget} || die "Unable to make ${installtarget}"
+
+	rm "${D}"/usr/bin/perl
+	ln -s perl${MY_PV} "${D}"/usr/bin/perl
+
+	cp -f utils/h2ph utils/h2ph_patched
+	epatch "${FILESDIR}"/${PN}-h2ph-ansi-header.patch
+
+	LD_LIBRARY_PATH=. ${HOSTPERL} -Ilib utils/h2ph_patched \
+		-a -d "${D}"/usr/$(get_libdir)/perl5/${MY_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/$(get_libdir)/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/$(get_libdir)/perl5/${MY_PV}/ExtUtils/xsubpp
+	fperms 0444 /usr/$(get_libdir)/perl5/${MY_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
+
+	# Don't let the cross-compiled build try to
+	# Install another libperl
+	tc-is-cross-compiler && \
+		rm -f "${D}"/usr/$(get_libdir)/${LIBPERL}
+
+	# 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
+		${HOSTPERL} 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-2.patch
+
+	dual_scripts
+
+	if use build ; then
+		src_remove_extra_files
+	fi
+}
+
+pkg_postinst() {
+	dual_scripts
+	INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${MY_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 "Generating ConfigLocal.pm (ignore any error)"
+		enc2xs -C
+		ebegin "Converting C header files to the corresponding Perl format"
+		cd /usr/include;
+		h2ph *
+		h2ph -r sys/* arpa/* netinet/* bits/* security/* asm/* gnu/* linux/* gentoo*
+		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
+}
+
+pkg_postrm() {
+	dual_scripts
+}
+
+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 ""
+}
+
+src_remove_dual_scripts() {
+	local i pkg ver ff
+	pkg="$1"
+	ver="$2"
+	shift 2
+	if has "${EBUILD_PHASE:-none}" "postinst" "postrm" ;then
+		for i in "$@" ; do
+			ff=`echo ${ROOT}/usr/share/man/man1/${i}-${ver}-${P}.1*`
+			ff=${ff##*.1}
+			alternatives_auto_makesym "/usr/bin/${i}" "/usr/bin/${i}-[0-9]*"
+			alternatives_auto_makesym "/usr/share/man/man1/${i}.1${ff}" "/usr/share/man/man1/${i}-[0-9]*"
+		done
+	elif has "${EBUILD_PHASE:-none}" "setup" ; then
+		for i in "$@" ; do
+			if [[ -f ${ROOT}/usr/bin/${i} && ! -h ${ROOT}/usr/bin/${i} ]] ; then
+				has_version ${pkg} && ewarn "You must reinstall $pkg !"
+				break
+			fi
+		done
+	else
+		for i in "$@" ; do
+			mv "${D}"/usr/bin/${i}{,-${ver}-${P}} || die
+			mv "${D}"/usr/share/man/man1/${i}{.1,-${ver}-${P}.1} || \
+				echo "/usr/share/man/man1/${i}.1 does not exist!"
+		done
+	fi
+}
+
+src_remove_extra_files() {
+	local prefix="./usr" # ./ is important
+	local bindir="${prefix}/bin"
+	local perlroot="${prefix}/$(get_libdir)/perl5" # perl installs per-arch dirs
+	local prV="${perlroot}/${MY_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${MY_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/assert.al
+	${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"
+
+	if use perlsuid ; then
+		MINIMAL_PERL_INSTALL="${MINIMAL_PERL_INSTALL}
+		${bindir}/suidperl
+		${bindir}/sperl${MY_PV}"
+	fi
+
+	pushd "${D}" > /dev/null
+	# Remove cruft
+	einfo "Removing files that are not in the minimal install"
+	echo "${MINIMAL_PERL_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
+}
diff --git a/sys-devel/libperl/Manifest b/sys-devel/libperl/Manifest
index 5b2d431..6429768 100644
--- a/sys-devel/libperl/Manifest
+++ b/sys-devel/libperl/Manifest
@@ -1,5 +1,5 @@
 AUX Makefile.SH.patch 8484 RMD160 5e4e2c6628f9528edc4f53bbf6730accd2c52bb2 SHA1 89bf18040a20b803e38c3f7d2c15efd6d4429ab8 SHA256 01cc2c3cfd1175c5f031d6bb1e5167427813a7bd6f1f3d97b923c0086ac77955
-AUX config-bits 29915 RMD160 6d2e4f4b32c72dff0f0d55d0490459efa9d705de SHA1 abaa8948a466f6faa22f70192f1f8b7f284983e8 SHA256 42ff75e16eccff094cacb74d9d3cdfa0365d5ceb55aee7ee58d33b9108550b2a
+AUX config-bits 30029 RMD160 4b216885476a81d382f71f405e7ff5a6f2fafb18 SHA1 af85bb5922c33426edb828a14846ee49ed3bc345 SHA256 ac15eb6b1e25070cb36880765c79cbac24b748562efca2614ddfe1066d0e7aa8
 AUX letgcc-find-errno.patch 1434 RMD160 939d8375f667ef341c0bcdb86a6386dcac776c96 SHA1 1c11211c20710b49dc78554db9c3b31638671bd1 SHA256 c9177630da71bb8e864ac76181d69b8216c95564fd1a074bf922fac0b2982547
 AUX libperl-5.8.8-CVE-2008-1927.patch 8129 RMD160 523467accd75f42ea254b1aed219efbfc2c32637 SHA1 0a36c92bb3c59064f3370376a76ef66c63fb1ba4 SHA256 614ebf7a0885fb5f7203627a3051f4df8fee2988d6bfec5a3d8fe70d97f9e45b
 AUX libperl-5.8.8-ccld-cflags.patch 334 RMD160 cedae5a13f77ca057e3a2b7719e3ffd16890f918 SHA1 ac40a4456fa9027febb423cf194b17eb2cca5eb6 SHA256 f2af08a63056970ff5183d27bf017d2f919482a4897512d096f4747b9951fff9
diff --git a/sys-devel/libperl/files/config-bits b/sys-devel/libperl/files/config-bits
index cce5d75..02a7cf8 100644
--- a/sys-devel/libperl/files/config-bits
+++ b/sys-devel/libperl/files/config-bits
@@ -149,6 +149,10 @@ d_chroot='define'
 d_chsize='undef'
 d_class='undef'
 d_clearenv='define'
+d_clock='define'
+d_clock_getres='define'
+d_clock_gettime='define'
+d_clock_nanosleep='define'
 d_closedir='define'
 d_cmsghdr_s='define'
 d_const='define'
@@ -336,6 +340,7 @@ d_msgsnd='define'
 d_msync='define'
 d_munmap='define'
 d_mymalloc='undef'
+d_nanosleep='define'
 d_nice='define'
 d_nl_langinfo='define'
 d_nv_zero_is_allbits_zero='define'