Drop -Dusrinc=$(get_ml_incdir) (#357737). Cleanup

Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64

9 files changed, 19 insertions, 1294 deletions

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index 43e4577ccb86..7f421561a412 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/perl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.359 2011/01/22 11:19:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.360 2011/03/07 11:35:06 tove Exp $
+
+  07 Mar 2011; Torsten Veller <tove@gentoo.org> perl-5.8.8-r8.ebuild,
+  perl-5.10.1.ebuild, -perl-5.12.2-r4.ebuild, -perl-5.12.2-r5.ebuild,
+  perl-5.12.2-r6.ebuild, perl-5.12.3.ebuild:
+  Drop -Dusrinc=$(get_ml_incdir) (#357737). Cleanup
 
   22 Jan 2011; Raúl Porcel <armin76@gentoo.org> perl-5.12.2-r6.ebuild:
   alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #351699
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 8f4b1c58631f..fdcab9586da2 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -27,18 +27,14 @@ AUX perl-prelink-lpthread.patch 476 RMD160 f3252258e5f7a0f82b5f9ea49598ea9f4b0b4
 AUX perl-regexp-nossp.patch 460 RMD160 dde3a25904275896e98d7b7f3a02926c8dbc5ca5 SHA1 e7de561f7885fb3d49635fa2dc733c0eed63b987 SHA256 e2d923711bb856b3c7f790dbc1cd1f468d647c1e50a3ff8a18745023c73b3e36
 DIST perl-5.10.1-9.tar.bz2 7388 RMD160 3758c2c78e22ed55fb90db283cfd9e5998535903 SHA1 edd1150deee51079be514f8ae8a3b14b1912c0ef SHA256 bd84671e6686288c098c26c0a61d1b8471ab38d8c16fb87571011398770cef44
 DIST perl-5.10.1.tar.bz2 11608061 RMD160 840b3a5ac3d7f517770ce789676ebd9154d9ee5a SHA1 98b762b5cd4fb76dd354dfa5ba0d21bc2acacaf2 SHA256 9385f2c8c2ca8b1dc4a7c31903f1f8dc8f2ba867dc2a9e5c93012ed6b564e826
-DIST perl-5.12.2-7.tar.bz2 10320 RMD160 1569e88d680b9c69671b932ccbbdc2239a7f2745 SHA1 d75b69b31e7c3216533cca7adb055325b0bf8758 SHA256 af42adffba012dfdeab683902618802f25dd47c872f816b38c44d27fd2d6738d
-DIST perl-5.12.2-8.tar.bz2 10840 RMD160 237521dcee0a4495dd5e2a84df26de1240738886 SHA1 35575d3c84c7c6ae747787902d75e971859f4ae5 SHA256 48924e5467edff3e38cd6edf3977bfb3513b0b2521a1898c3ad083fcd72967b5
 DIST perl-5.12.2-9.tar.bz2 28124 RMD160 1d870edc1c2a429bbdaf24c919fb9e7efdc3d0d1 SHA1 f3dd0d46404279b810cee6b1c0e9d9ee49acc61f SHA256 88975b0d149f56420607df3ee352cc99dd7a86015052a9a90581ae06e92b5816
 DIST perl-5.12.2.tar.bz2 12348985 RMD160 c41fa3ef2c982172f73d5ddfd695cde747a92e95 SHA1 75dbbdfa5bf8d4fc813503253e2b58486fa5a4eb SHA256 3b9a75fe4ae7a9a2a17be8c8c64754ef6fd706ca528170737b03e3db7d8eae0e
 DIST perl-5.12.3-1.tar.bz2 8054 RMD160 f10a9eb37cb976d40868936d85d1413ca28d6e67 SHA1 2b7e2a9379182f6f5da03441c71e720efc59da10 SHA256 5712e8bffc44d1b2b1760e37e053ef481b1ab8e8691137eddd780784dfe4f615
 DIST perl-5.12.3.tar.bz2 12041247 RMD160 e3c5825aa800e2304dd815858880372500a4f9a0 SHA1 86d77c6cbc7a60068dc14c88ffd0729324d1174f SHA256 7e3ce3f19f2290c2a2a43a98bcf8cb0ccb69b652d67ddc629544339edc6c7343
 DIST perl-5.8.8.tar.bz2 10123359 RMD160 e78f26d9b96e6db35f946ad4ff55e3a69385c71b SHA1 4aab490040727ca4419098720eca2ba4367df539 SHA256 818a140d9c04ea8dab3a05104b34ced7f7d9d0a91bfed91baf89a84d0dfb1bc9
-EBUILD perl-5.10.1.ebuild 18185 RMD160 0e3b9ab08c0466a9de90151af365197c6bc4c17f SHA1 b426fe6fb590fa43b86d1058e1b90cc7b4f02b44 SHA256 a895a1b9398fd9f2573930e53d12ce75d12e0d7e581fdd62d699417ab548086d
-EBUILD perl-5.12.2-r4.ebuild 19403 RMD160 b57721ac3c9d994c89a5c6f3fd00558af026b8cf SHA1 e48cb9b4ac946c5b13ccf4d07a8b75046052ac54 SHA256 4e77f870aef14f01310561ce1c9e57b428de09aa3b9c375bdab4193b79f09d89
-EBUILD perl-5.12.2-r5.ebuild 19413 RMD160 555c9152353dc43e435f3c36e7373df6f39cc10b SHA1 a0f8d0d42bbb52704479d0c8aa888c9021c5addf SHA256 fff5053aecafb2245da0d463609d5c3f5795608a8b96e235c163097c245aebef
-EBUILD perl-5.12.2-r6.ebuild 19424 RMD160 68e6f427f730c4161795f6c66fcb7e9fa9d16a23 SHA1 5d6bf80750c5a14ce54c7209dc047736ca9b29f9 SHA256 f12c66d31d17967f7aab0555437953359c1cc2bb843b4fed1ced1d7f89d86577
-EBUILD perl-5.12.3.ebuild 19436 RMD160 f47905cac619e821148a296785695dd1887b291d SHA1 cef49725d957fe9006053b21f18845dbeb9a2817 SHA256 59acb9e2884228234a9b7e68a175165959c5def905114c12c5ad14430a29d22f
-EBUILD perl-5.8.8-r8.ebuild 20741 RMD160 387b31d0dc009abe64da05b927805dabde836ed3 SHA1 5db4fd908882140e56f6b385c28cdb6047b62bfc SHA256 b8e94ef00fadabccc97547611e9216b60b880f7896cefc713436c797565118ad
-MISC ChangeLog 70361 RMD160 db4bf0341a0cf05e0746e20693f8a965334e7ecb SHA1 157b324c13b52dbfe703e5bcf0b879d8bb60d1c3 SHA256 c9662a92ed804845e8f431b7fb841dc8049d3f19530742137ed0ae0bef41844c
+EBUILD perl-5.10.1.ebuild 18125 RMD160 061e49a2031f270f2804923069d98ddf0a8edd40 SHA1 cb35c08fe202cd4e1eae39439cc307193a4bc72d SHA256 ed5ca8861b704f9dbfaa9cadddbe464644dfe93bdefe71d3118abd7d0c935776
+EBUILD perl-5.12.2-r6.ebuild 19364 RMD160 72e25dbd34a8d83c394fd79cc1504eb8c136df02 SHA1 50188994dc6c4db95997df7fea8a1731140be40b SHA256 dda4237f99b44567f529997f66d8c11e19237354e05c28212a4b518b2febe79e
+EBUILD perl-5.12.3.ebuild 19379 RMD160 fe52e4685f96b940966426f760199ba904e7f9f9 SHA1 7bf42b651539b51213b6ff3e2340dba0ec7549b8 SHA256 ce31cbfbf672704da9e0c9fe59aa0f55f13bb4eea899ef7e999ea9ec1ba731ee
+EBUILD perl-5.8.8-r8.ebuild 20681 RMD160 62e5201adf9909e1f2c357009b3bfac7d5061e40 SHA1 16c5ca7e6c625dc2122e1a314b0ed24e328fcc02 SHA256 b0d069d16f895c0084b4fdf8aedc0b104832fdffeebd8181ec12f48712010c3e
+MISC ChangeLog 70596 RMD160 90bb8ed36e4ed72fadafb6dd6e2ceedbaa1ff481 SHA1 c4b0f07d8d6746600c4b5fc5bb3bb403499085b3 SHA256 a6686fedb7dc6bd29d0efb2b654e590c88631130eec05db40d7148729f24c988
 MISC metadata.xml 451 RMD160 8424230d79d13df7462c454050058b3526a78e92 SHA1 1ae85db5c1c1fc6413ca324ebc93b6894831b437 SHA256 49e06011c113616fa1f618cf58d42c2d6abbce5f71936f109b6ae3a5dfff587c
diff --git a/dev-lang/perl/perl-5.10.1.ebuild b/dev-lang/perl/perl-5.10.1.ebuild
index 6cc7f62d1049..1da67cc62249 100644
--- a/dev-lang/perl/perl-5.10.1.ebuild
+++ b/dev-lang/perl/perl-5.10.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.10.1.ebuild,v 1.21 2010/03/31 18:49:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.10.1.ebuild,v 1.22 2011/03/07 11:35:06 tove Exp $
 
 EAPI=2
 
@@ -189,7 +189,6 @@ src_configure() {
 	fi
 
 	local inclist=$(for v in ${PERL_OLDVERSEN}; do echo -n "${v} ${v}/${myarch}${mythreading}"; done )
-	[[ -n "${ABI}" ]] && myconf "-Dusrinc=$(get_ml_incdir)"
 
 	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
 
diff --git a/dev-lang/perl/perl-5.12.2-r4.ebuild b/dev-lang/perl/perl-5.12.2-r4.ebuild
deleted file mode 100644
index fca949f9611e..000000000000
--- a/dev-lang/perl/perl-5.12.2-r4.ebuild
+++ /dev/null
@@ -1,636 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.12.2-r4.ebuild,v 1.8 2010/12/10 20:10:54 ranger Exp $
-
-EAPI=3
-
-inherit eutils alternatives flag-o-matic toolchain-funcs multilib
-
-PATCH_VER=7
-
-PERL_OLDVERSEN="5.12.1 5.12.0"
-
-SHORT_PV="${PV%.*}"
-MY_P="perl-${PV/_rc/-RC}"
-MY_PV="${PV%_rc*}"
-
-DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
-
-SRC_URI="
-	mirror://cpan/src/${MY_P}.tar.bz2
-	mirror://cpan/authors/id/J/JE/JESSE/${MY_P}.tar.bz2
-	mirror://gentoo/${MY_P}-${PATCH_VER}.tar.bz2
-	http://dev.gentoo.org/~tove/files/${MY_P}-${PATCH_VER}.tar.bz2"
-#	mirror://cpan/src/${MY_P}.tar.bz2
-#	mirror://gentoo/${MY_P}-${PATCH_VER}.tar.bz2
-HOMEPAGE="http://www.perl.org/"
-
-LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="berkdb build debug doc gdbm ithreads"
-
-COMMON_DEPEND="berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.3 )
-	>=sys-devel/libperl-5.10.1
-	!!<sys-devel/libperl-5.10.1
-	app-arch/bzip2
-	sys-libs/zlib"
-DEPEND="${COMMON_DEPEND}
-	elibc_FreeBSD? ( sys-freebsd/freebsd-mk-defs )"
-RDEPEND="${COMMON_DEPEND}"
-PDEPEND=">=app-admin/perl-cleaner-2.5"
-
-S="${WORKDIR}/${MY_P}"
-
-dual_scripts() {
-	src_remove_dual_scripts perl-core/Archive-Tar        1.54    ptar ptardiff
-	src_remove_dual_scripts perl-core/Digest-SHA         5.47    shasum
-	src_remove_dual_scripts perl-core/CPAN               1.9456  cpan
-	src_remove_dual_scripts perl-core/CPANPLUS           0.90    cpanp cpan2dist cpanp-run-perl
-	src_remove_dual_scripts perl-core/Encode             2.39    enc2xs piconv
-	src_remove_dual_scripts perl-core/ExtUtils-MakeMaker 6.56    instmodsh
-	src_remove_dual_scripts perl-core/Module-Build       0.3603  config_data
-	src_remove_dual_scripts perl-core/Module-CoreList    2.38    corelist
-	src_remove_dual_scripts perl-core/PodParser          1.37    pod2usage podchecker podselect
-	src_remove_dual_scripts perl-core/Test-Harness       3.17    prove
-	src_remove_dual_scripts perl-core/podlators          2.3.1   pod2man pod2text
-}
-
-pkg_setup() {
-	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
-		mythreading="-multi"
-		myarch="${CHOST%%-*}-${osname}-thread"
-	else
-		myarch="${CHOST%%-*}-${osname}"
-	fi
-	if use debug ; then
-		myarch="${myarch}-debug"
-	fi
-
-	LIBPERL="libperl$(get_libname ${MY_PV} )"
-	PRIV_LIB="/usr/$(get_libdir)/perl5/${MY_PV}"
-	ARCH_LIB="/usr/$(get_libdir)/perl5/${MY_PV}/${myarch}${mythreading}"
-	SITE_LIB="/usr/$(get_libdir)/perl5/site_perl/${MY_PV}"
-	SITE_ARCH="/usr/$(get_libdir)/perl5/site_perl/${MY_PV}/${myarch}${mythreading}"
-	VENDOR_LIB="/usr/$(get_libdir)/perl5/vendor_perl/${MY_PV}"
-	VENDOR_ARCH="/usr/$(get_libdir)/perl5/vendor_perl/${MY_PV}/${myarch}${mythreading}"
-
-	if use ithreads ; then
-		echo ""
-		ewarn "THREADS WARNING:"
-		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. "
-	fi
-	if has_version "<dev-lang/perl-${SHORT_PV}" ; then
-		echo ""
-		ewarn "UPDATE THE PERL MODULES:"
-		ewarn "After updating dev-lang/perl you must reinstall"
-		ewarn "the installed perl modules."
-		ewarn "Use: perl-cleaner --all"
-	elif has_version dev-lang/perl ; then
-		# doesnot work
-		#if ! has_version dev-lang/perl[ithreads=,debug=] ; then
-		#if ! has_version dev-lang/perl[ithreads=] || ! has_version dev-lang/perl[debug=] ; then
-		if (   use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
-		   ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
-		   (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
-		   ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
-			echo ""
-			ewarn "TOGGLED USE-FLAGS WARNING:"
-			ewarn "You changed one of the use-flags ithreads or debug."
-			ewarn "You must rebuild all perl-modules installed."
-			ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl"
-		fi
-	fi
-	dual_scripts
-}
-
-src_prepare_update_patchlevel_h() {
-	[[ -f ${WORKDIR}/perl-patch/series ]] || return 0
-
-	while read patch level ; do
-		sed -i -e "s/^\t,NULL$/	,\"${patch//__/_}\"\n&/" "${S}"/patchlevel.h || die
-	done < "${WORKDIR}"/perl-patch/series
-}
-
-src_prepare() {
-	EPATCH_SOURCE="${WORKDIR}/perl-patch" \
-	EPATCH_SUFFIX="diff" \
-	EPATCH_FORCE="yes" \
-	epatch
-
-	src_prepare_update_patchlevel_h
-
-	# pod/perltoc.pod fails
-	# lib/ExtUtils/t/Embed.t fails
-	ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV})
-	ln -s ${LIBPERL} libperl$(get_libname )
-}
-
-myconf() {
-	# the myconf array is declared in src_configure
-	myconf=( "${myconf[@]}" "$@" )
-}
-
-src_configure() {
-	declare -a myconf
-
-	export LC_ALL="C"
-
-	# some arches and -O do not mix :)
-	use ppc && 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"
-	# Fixes bug #143895 on gcc-4.1.1
-	filter-flags "-fsched2-use-superblocks"
-
-	# 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
-	use mips && myconf -Dd_u32align
-
-	use sparc && myconf -Ud_longdbl
-
-	# 266337
-	export BUILD_BZIP2=0
-	export BZIP2_INCLUDE=/usr/include
-	export BZIP2_LIB=/usr/$(get_libdir)
-	cat <<-EOF > "${S}/cpan/Compress-Raw-Zlib/config.in"
-		BUILD_ZLIB = False
-		INCLUDE = /usr/include
-		LIB = /usr/$(get_libdir)
-
-		OLD_ZLIB = False
-		GZIP_OS_CODE = AUTO_DETECT
-	EOF
-
-	# 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 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
-
-	use ithreads && myconf -Dusethreads
-
-	if use debug ; then
-		append-cflags "-g"
-		myconf -DDEBUGGING
-	elif [[ ${CFLAGS} == *-g* ]] ; then
-		myconf -DDEBUGGING=-g
-	else
-		myconf -DDEBUGGING=none
-	fi
-
-	if [[ -n ${PERL_OLDVERSEN} ]] ; then
-		local inclist=$(for v in ${PERL_OLDVERSEN}; do echo -n "${v}/${myarch}${mythreading} ${v} "; done )
-		myconf -Dinc_version_list="$inclist"
-	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
-
-	sh Configure \
-		-des \
-		-Duseshrplib \
-		-Darchname="${myarch}" \
-		-Dcc="$(tc-getCC)" \
-		-Doptimize="${CFLAGS}" \
-		-Dldflags="${LDFLAGS}" \
-		-Dprefix='/usr' \
-		-Dsiteprefix='/usr' \
-		-Dvendorprefix='/usr' \
-		-Dscriptdir='/usr/bin' \
-		-Dprivlib="${PRIV_LIB}" \
-		-Darchlib="${ARCH_LIB}" \
-		-Dsitelib="${SITE_LIB}" \
-		-Dsitearch="${SITE_ARCH}" \
-		-Dvendorlib="${VENDOR_LIB}" \
-		-Dvendorarch="${VENDOR_ARCH}" \
-		-Dman1dir=/usr/share/man/man1 \
-		-Dman3dir=/usr/share/man/man3 \
-		-Dsiteman1dir=/usr/share/man/man1 \
-		-Dsiteman3dir=/usr/share/man/man3 \
-		-Dvendorman1dir=/usr/share/man/man1 \
-		-Dvendorman3dir=/usr/share/man/man3 \
-		-Dman1ext='1' \
-		-Dman3ext='3pm' \
-		-Dlibperl="${LIBPERL}" \
-		-Dlocincpth=' ' \
-		-Duselargefiles \
-		-Dd_semctl_semun \
-		-Dcf_by='Gentoo' \
-		-Dmyhostname='localhost' \
-		-Dperladmin='root@localhost' \
-		-Dinstallusrbinperl='n' \
-		-Ud_csh \
-		-Uusenm \
-		"${myconf[@]}" || die "Unable to configure"
-}
-
-src_compile() {
-	# bug 331113
-	emake -j1 || die "emake failed"
-}
-
-src_test() {
-	if [[ ${EUID} == 0 ]] ; then
-		ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
-		return 0
-	fi
-	use elibc_uclibc && export MAKEOPTS+=" -j1"
-	TEST_JOBS=$(echo -j1 ${MAKEOPTS} | sed -r 's/.*(-j[[:space:]]*|--jobs=)([[:digit:]]+).*/\2/' ) \
-		make test_harness || die "test failed"
-}
-
-src_install() {
-	local i
-	local coredir="${ARCH_LIB}/CORE"
-
-#	# Fix for "stupid" modules and programs
-#	dodir ${SITE_ARCH} ${SITE_LIB}
-#	keepdir "${VENDOR_ARCH}" #338802 for enc2xs
-
-	local installtarget=install
-	if use build ; then
-		installtarget=install.perl
-	fi
-	make DESTDIR="${D}" ${installtarget} || die "Unable to make ${installtarget}"
-
-	rm -f "${D}"/usr/bin/perl
-	ln -s perl${MY_PV} "${D}"/usr/bin/perl
-
-	dolib.so "${D}"/${coredir}/${LIBPERL} || die
-	dosym ${LIBPERL} /usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die
-	dosym ${LIBPERL} /usr/$(get_libdir)/libperl$(get_libname) || die
-	rm -f "${D}"/${coredir}/${LIBPERL}
-	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/${LIBPERL}
-	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname ${SHORT_PV})
-	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname)
-
-	rm -rf "${D}"/usr/share/man/man3 || die "Unable to remove module man pages"
-
-#	# 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
-	for i in $(find "${D}" -iname "Config.pm" ) ; do
-		einfo "Removing ${D} from ${i}..."
-		sed -i -e "s:${D}::" "${i}" || die "Sed failed"
-	done
-
-	find "${D}" -type f -name .packlist -delete || die
-
-	# 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* README AUTHORS || die
-
-	if use doc ; then
-		# HTML Documentation
-		# We expect errors, warnings, and such with the following.
-
-		dodir /usr/share/doc/${PF}/html
-		LD_LIBRARY_PATH=. ./perl installhtml \
-			--podroot='.' \
-			--podpath='lib:ext:pod:vms' \
-			--recurse \
-			--htmldir="${D}/usr/share/doc/${PF}/html" \
-			--libpods='perlfunc:perlguts:perlvar:perlrun:perlop'
-	fi
-
-	if use build ; then
-		src_remove_extra_files
-	fi
-
-	dual_scripts
-}
-
-pkg_postinst() {
-	dual_scripts
-
-	if [[ "${ROOT}" = "/" ]] ; then
-		local INC DIR file
-		INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${MY_PV}'|etc|local|perl$/; print "$line\n" }')
-		ebegin "Removing old .ph files"
-		for DIR in ${INC} ; do
-			if [[ -d "${DIR}" ]] ; then
-				for file in $(find "${DIR}" -name "*.ph" -type f ) ; do
-					rm -f "${file}"
-					einfo "<< ${file}"
-				done
-			fi
-		done
-		# Silently remove the now empty dirs
-		for DIR in ${INC} ; do
-			if [[ -d "${DIR}" ]] ; then
-				find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
-			fi
-		done
-		if ! use build ; then
-			ebegin "Generating ConfigLocal.pm (ignore any error)"
-			enc2xs -C
-		fi
-		ebegin "Converting C header files to the corresponding Perl format (ignore any error)"
-		pushd /usr/include >/dev/null
-			h2ph -Q -a -d ${ARCH_LIB} \
-				asm/termios.h syscall.h syslimits.h syslog.h sys/ioctl.h \
-				sys/socket.h sys/time.h wait.h sysexits.h
-		popd >/dev/null
-
-# 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
-		#fi
-	fi
-}
-
-pkg_postrm(){
-	dual_scripts
-
-#	if [[ -e ${ARCH_LIB}/Encode/ConfigLocal.pm ]] ; then
-#		ebegin "Removing ConfigLocal.pm"
-#		rm "${ARCH_LIB}/Encode/ConfigLocal.pm"
-#	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 ""
-}
-
-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
-			alternatives_auto_makesym "/usr/bin/${i}" "/usr/bin/${i}-[0-9]*"
-			if [[ ${i} != cpanp-run-perl ]] ; then
-				ff=`echo ${ROOT}/usr/share/man/man1/${i}-${ver}-${P}.1*`
-				ff=${ff##*.1}
-				alternatives_auto_makesym "/usr/share/man/man1/${i}.1${ff}" "/usr/share/man/man1/${i}-[0-9]*"
-			fi
-		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
-			if ! [[ -f "${D}"/usr/bin/${i} ]] ; then
-				use build || ewarn "/usr/bin/${i} does not exist!"
-				continue
-			fi
-			mv "${D}"/usr/bin/${i}{,-${ver}-${P}} || die
-			if [[ -f ${D}/usr/share/man/man1/${i}.1 ]] ; then
-				mv "${D}"/usr/share/man/man1/${i}{.1,-${ver}-${P}.1} || die
-			else
-				echo "/usr/share/man/man1/${i}.1 does not exist!"
-			fi
-		done
-	fi
-}
-
-src_remove_extra_files() {
-	local prefix="./usr" # ./ is important
-	local bindir="${prefix}/bin"
-	local libdir="${prefix}/$(get_libdir)"
-
-	# 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
-	${libdir}/${LIBPERL}
-	${libdir}/libperl$(get_libname)
-	${libdir}/libperl$(get_libname ${SHORT_PV})
-	.${PRIV_LIB}/AutoLoader.pm
-	.${PRIV_LIB}/B/Deparse.pm
-	.${PRIV_LIB}/Carp.pm
-	.${PRIV_LIB}/Carp/Heavy.pm
-	.${PRIV_LIB}/Class/Struct.pm
-	.${PRIV_LIB}/DirHandle.pm
-	.${PRIV_LIB}/Exporter.pm
-	.${PRIV_LIB}/Exporter/Heavy.pm
-	.${PRIV_LIB}/ExtUtils/Command.pm
-	.${PRIV_LIB}/ExtUtils/Command/MM.pm
-	.${PRIV_LIB}/ExtUtils/Constant.pm
-	.${PRIV_LIB}/ExtUtils/Constant/Base.pm
-	.${PRIV_LIB}/ExtUtils/Constant/Utils.pm
-	.${PRIV_LIB}/ExtUtils/Constant/XS.pm
-	.${PRIV_LIB}/ExtUtils/Embed.pm
-	.${PRIV_LIB}/ExtUtils/Install.pm
-	.${PRIV_LIB}/ExtUtils/Installed.pm
-	.${PRIV_LIB}/ExtUtils/Liblist.pm
-	.${PRIV_LIB}/ExtUtils/Liblist/Kid.pm
-	.${PRIV_LIB}/ExtUtils/MM.pm
-	.${PRIV_LIB}/ExtUtils/MM_Any.pm
-	.${PRIV_LIB}/ExtUtils/MM_MacOS.pm
-	.${PRIV_LIB}/ExtUtils/MM_Unix.pm
-	.${PRIV_LIB}/ExtUtils/MY.pm
-	.${PRIV_LIB}/ExtUtils/MakeMaker.pm
-	.${PRIV_LIB}/ExtUtils/Manifest.pm
-	.${PRIV_LIB}/ExtUtils/Miniperl.pm
-	.${PRIV_LIB}/ExtUtils/Mkbootstrap.pm
-	.${PRIV_LIB}/ExtUtils/Mksymlists.pm
-	.${PRIV_LIB}/ExtUtils/Packlist.pm
-	.${PRIV_LIB}/ExtUtils/testlib.pm
-	.${PRIV_LIB}/File/Basename.pm
-	.${PRIV_LIB}/File/Compare.pm
-	.${PRIV_LIB}/File/Copy.pm
-	.${PRIV_LIB}/File/Find.pm
-	.${PRIV_LIB}/File/Path.pm
-	.${PRIV_LIB}/File/stat.pm
-	.${PRIV_LIB}/FileHandle.pm
-	.${PRIV_LIB}/Getopt/Long.pm
-	.${PRIV_LIB}/Getopt/Std.pm
-	.${PRIV_LIB}/IPC/Open2.pm
-	.${PRIV_LIB}/IPC/Open3.pm
-	.${PRIV_LIB}/PerlIO.pm
-	.${PRIV_LIB}/Pod/InputObjects.pm
-	.${PRIV_LIB}/Pod/Man.pm
-	.${PRIV_LIB}/Pod/ParseLink.pm
-	.${PRIV_LIB}/Pod/Parser.pm
-	.${PRIV_LIB}/Pod/Select.pm
-	.${PRIV_LIB}/Pod/Text.pm
-	.${PRIV_LIB}/Pod/Usage.pm
-	.${PRIV_LIB}/SelectSaver.pm
-	.${PRIV_LIB}/Symbol.pm
-	.${PRIV_LIB}/Text/ParseWords.pm
-	.${PRIV_LIB}/Text/Tabs.pm
-	.${PRIV_LIB}/Text/Wrap.pm
-	.${PRIV_LIB}/Tie/Hash.pm
-	.${PRIV_LIB}/Time/Local.pm
-	.${PRIV_LIB}/XSLoader.pm
-	.${PRIV_LIB}/autouse.pm
-	.${PRIV_LIB}/base.pm
-	.${PRIV_LIB}/bigint.pm
-	.${PRIV_LIB}/bignum.pm
-	.${PRIV_LIB}/bigrat.pm
-	.${PRIV_LIB}/blib.pm
-	.${PRIV_LIB}/bytes.pm
-	.${PRIV_LIB}/bytes_heavy.pl
-	.${PRIV_LIB}/charnames.pm
-	.${PRIV_LIB}/constant.pm
-	.${PRIV_LIB}/diagnostics.pm
-	.${PRIV_LIB}/fields.pm
-	.${PRIV_LIB}/filetest.pm
-	.${PRIV_LIB}/if.pm
-	.${PRIV_LIB}/integer.pm
-	.${PRIV_LIB}/less.pm
-	.${PRIV_LIB}/locale.pm
-	.${PRIV_LIB}/open.pm
-	.${PRIV_LIB}/overload.pm
-	.${PRIV_LIB}/sigtrap.pm
-	.${PRIV_LIB}/sort.pm
-	.${PRIV_LIB}/stat.pl
-	.${PRIV_LIB}/strict.pm
-	.${PRIV_LIB}/subs.pm
-	.${PRIV_LIB}/unicore/To/Fold.pl
-	.${PRIV_LIB}/unicore/To/Lower.pl
-	.${PRIV_LIB}/unicore/To/Upper.pl
-	.${PRIV_LIB}/utf8.pm
-	.${PRIV_LIB}/utf8_heavy.pl
-	.${PRIV_LIB}/vars.pm
-	.${PRIV_LIB}/vmsish.pm
-	.${PRIV_LIB}/warnings
-	.${PRIV_LIB}/warnings.pm
-	.${PRIV_LIB}/warnings/register.pm
-	.${ARCH_LIB}/B.pm
-	.${ARCH_LIB}/CORE/libperl$(get_libname)
-	.${ARCH_LIB}/Config.pm
-	.${ARCH_LIB}/Config_heavy.pl
-	.${ARCH_LIB}/Cwd.pm
-	.${ARCH_LIB}/Data/Dumper.pm
-	.${ARCH_LIB}/DynaLoader.pm
-	.${ARCH_LIB}/Errno.pm
-	.${ARCH_LIB}/Fcntl.pm
-	.${ARCH_LIB}/File/Glob.pm
-	.${ARCH_LIB}/File/Spec.pm
-	.${ARCH_LIB}/File/Spec/Unix.pm
-	.${ARCH_LIB}/IO.pm
-	.${ARCH_LIB}/IO/File.pm
-	.${ARCH_LIB}/IO/Handle.pm
-	.${ARCH_LIB}/IO/Pipe.pm
-	.${ARCH_LIB}/IO/Seekable.pm
-	.${ARCH_LIB}/IO/Select.pm
-	.${ARCH_LIB}/IO/Socket.pm
-	.${ARCH_LIB}/IO/Socket/INET.pm
-	.${ARCH_LIB}/IO/Socket/UNIX.pm
-	.${ARCH_LIB}/List/Util.pm
-	.${ARCH_LIB}/NDBM_File.pm
-	.${ARCH_LIB}/POSIX.pm
-	.${ARCH_LIB}/Scalar/Util.pm
-	.${ARCH_LIB}/Socket.pm
-	.${ARCH_LIB}/Storable.pm
-	.${ARCH_LIB}/attributes.pm
-	.${ARCH_LIB}/auto/Cwd/Cwd$(get_libname)
-	.${ARCH_LIB}/auto/Data/Dumper/Dumper$(get_libname)
-	.${ARCH_LIB}/auto/DynaLoader/dl_findfile.al
-	.${ARCH_LIB}/auto/Fcntl/Fcntl$(get_libname)
-	.${ARCH_LIB}/auto/File/Glob/Glob$(get_libname)
-	.${ARCH_LIB}/auto/IO/IO$(get_libname)
-	.${ARCH_LIB}/auto/POSIX/POSIX$(get_libname)
-	.${ARCH_LIB}/auto/POSIX/autosplit.ix
-	.${ARCH_LIB}/auto/POSIX/fstat.al
-	.${ARCH_LIB}/auto/POSIX/load_imports.al
-	.${ARCH_LIB}/auto/POSIX/stat.al
-	.${ARCH_LIB}/auto/POSIX/tmpfile.al
-	.${ARCH_LIB}/auto/Socket/Socket$(get_libname)
-	.${ARCH_LIB}/auto/Storable/Storable$(get_libname)
-	.${ARCH_LIB}/auto/Storable/_retrieve.al
-	.${ARCH_LIB}/auto/Storable/_store.al
-	.${ARCH_LIB}/auto/Storable/autosplit.ix
-	.${ARCH_LIB}/auto/Storable/retrieve.al
-	.${ARCH_LIB}/auto/Storable/store.al
-	.${ARCH_LIB}/auto/re/re$(get_libname)
-	.${ARCH_LIB}/encoding.pm
-	.${ARCH_LIB}/lib.pm
-	.${ARCH_LIB}/ops.pm
-	.${ARCH_LIB}/re.pm
-	.${ARCH_LIB}/threads.pm
-"
-
-	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 -print0 | xargs -0 -r rmdir &> /dev/null
-	#for f in ${MINIMAL_PERL_INSTALL} ; do
-	#	[[ -e $f ]] || ewarn "$f unused in MINIMAL_PERL_INSTALL"
-	#done
-	popd > /dev/null
-}
diff --git a/dev-lang/perl/perl-5.12.2-r5.ebuild b/dev-lang/perl/perl-5.12.2-r5.ebuild
deleted file mode 100644
index df0010f1a229..000000000000
--- a/dev-lang/perl/perl-5.12.2-r5.ebuild
+++ /dev/null
@@ -1,636 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.12.2-r5.ebuild,v 1.1 2010/12/13 11:39:55 tove Exp $
-
-EAPI=3
-
-inherit eutils alternatives flag-o-matic toolchain-funcs multilib
-
-PATCH_VER=8
-
-PERL_OLDVERSEN="5.12.1 5.12.0"
-
-SHORT_PV="${PV%.*}"
-MY_P="perl-${PV/_rc/-RC}"
-MY_PV="${PV%_rc*}"
-
-DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
-
-SRC_URI="
-	mirror://cpan/src/${MY_P}.tar.bz2
-	mirror://cpan/authors/id/J/JE/JESSE/${MY_P}.tar.bz2
-	mirror://gentoo/${MY_P}-${PATCH_VER}.tar.bz2
-	http://dev.gentoo.org/~tove/files/${MY_P}-${PATCH_VER}.tar.bz2"
-#	mirror://cpan/src/${MY_P}.tar.bz2
-#	mirror://gentoo/${MY_P}-${PATCH_VER}.tar.bz2
-HOMEPAGE="http://www.perl.org/"
-
-LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="berkdb build debug doc gdbm ithreads"
-
-COMMON_DEPEND="berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.3 )
-	>=sys-devel/libperl-5.10.1
-	!!<sys-devel/libperl-5.10.1
-	app-arch/bzip2
-	sys-libs/zlib"
-DEPEND="${COMMON_DEPEND}
-	elibc_FreeBSD? ( sys-freebsd/freebsd-mk-defs )"
-RDEPEND="${COMMON_DEPEND}"
-PDEPEND=">=app-admin/perl-cleaner-2.5"
-
-S="${WORKDIR}/${MY_P}"
-
-dual_scripts() {
-	src_remove_dual_scripts perl-core/Archive-Tar        1.54    ptar ptardiff
-	src_remove_dual_scripts perl-core/Digest-SHA         5.47    shasum
-	src_remove_dual_scripts perl-core/CPAN               1.9456  cpan
-	src_remove_dual_scripts perl-core/CPANPLUS           0.90    cpanp cpan2dist cpanp-run-perl
-	src_remove_dual_scripts perl-core/Encode             2.39    enc2xs piconv
-	src_remove_dual_scripts perl-core/ExtUtils-MakeMaker 6.56    instmodsh
-	src_remove_dual_scripts perl-core/Module-Build       0.3603  config_data
-	src_remove_dual_scripts perl-core/Module-CoreList    2.38    corelist
-	src_remove_dual_scripts perl-core/PodParser          1.37    pod2usage podchecker podselect
-	src_remove_dual_scripts perl-core/Test-Harness       3.17    prove
-	src_remove_dual_scripts perl-core/podlators          2.3.1   pod2man pod2text
-}
-
-pkg_setup() {
-	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
-		mythreading="-multi"
-		myarch="${CHOST%%-*}-${osname}-thread"
-	else
-		myarch="${CHOST%%-*}-${osname}"
-	fi
-	if use debug ; then
-		myarch="${myarch}-debug"
-	fi
-
-	LIBPERL="libperl$(get_libname ${MY_PV} )"
-	PRIV_LIB="/usr/$(get_libdir)/perl5/${MY_PV}"
-	ARCH_LIB="/usr/$(get_libdir)/perl5/${MY_PV}/${myarch}${mythreading}"
-	SITE_LIB="/usr/$(get_libdir)/perl5/site_perl/${MY_PV}"
-	SITE_ARCH="/usr/$(get_libdir)/perl5/site_perl/${MY_PV}/${myarch}${mythreading}"
-	VENDOR_LIB="/usr/$(get_libdir)/perl5/vendor_perl/${MY_PV}"
-	VENDOR_ARCH="/usr/$(get_libdir)/perl5/vendor_perl/${MY_PV}/${myarch}${mythreading}"
-
-	if use ithreads ; then
-		echo ""
-		ewarn "THREADS WARNING:"
-		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. "
-	fi
-	if has_version "<dev-lang/perl-${SHORT_PV}" ; then
-		echo ""
-		ewarn "UPDATE THE PERL MODULES:"
-		ewarn "After updating dev-lang/perl you must reinstall"
-		ewarn "the installed perl modules."
-		ewarn "Use: perl-cleaner --all"
-	elif has_version dev-lang/perl ; then
-		# doesnot work
-		#if ! has_version dev-lang/perl[ithreads=,debug=] ; then
-		#if ! has_version dev-lang/perl[ithreads=] || ! has_version dev-lang/perl[debug=] ; then
-		if (   use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
-		   ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
-		   (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
-		   ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
-			echo ""
-			ewarn "TOGGLED USE-FLAGS WARNING:"
-			ewarn "You changed one of the use-flags ithreads or debug."
-			ewarn "You must rebuild all perl-modules installed."
-			ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl"
-		fi
-	fi
-	dual_scripts
-}
-
-src_prepare_update_patchlevel_h() {
-	[[ -f ${WORKDIR}/perl-patch/series ]] || return 0
-
-	while read patch level ; do
-		sed -i -e "s/^\t,NULL$/	,\"${patch//__/_}\"\n&/" "${S}"/patchlevel.h || die
-	done < "${WORKDIR}"/perl-patch/series
-}
-
-src_prepare() {
-	EPATCH_SOURCE="${WORKDIR}/perl-patch" \
-	EPATCH_SUFFIX="diff" \
-	EPATCH_FORCE="yes" \
-	epatch
-
-	src_prepare_update_patchlevel_h
-
-	# pod/perltoc.pod fails
-	# lib/ExtUtils/t/Embed.t fails
-	ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV})
-	ln -s ${LIBPERL} libperl$(get_libname )
-}
-
-myconf() {
-	# the myconf array is declared in src_configure
-	myconf=( "${myconf[@]}" "$@" )
-}
-
-src_configure() {
-	declare -a myconf
-
-	export LC_ALL="C"
-
-	# some arches and -O do not mix :)
-	use ppc && 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"
-	# Fixes bug #143895 on gcc-4.1.1
-	filter-flags "-fsched2-use-superblocks"
-
-	# 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
-	use mips && myconf -Dd_u32align
-
-	use sparc && myconf -Ud_longdbl
-
-	# 266337
-	export BUILD_BZIP2=0
-	export BZIP2_INCLUDE=/usr/include
-	export BZIP2_LIB=/usr/$(get_libdir)
-	cat <<-EOF > "${S}/cpan/Compress-Raw-Zlib/config.in"
-		BUILD_ZLIB = False
-		INCLUDE = /usr/include
-		LIB = /usr/$(get_libdir)
-
-		OLD_ZLIB = False
-		GZIP_OS_CODE = AUTO_DETECT
-	EOF
-
-	# 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 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
-
-	use ithreads && myconf -Dusethreads
-
-	if use debug ; then
-		append-cflags "-g"
-		myconf -DDEBUGGING
-	elif [[ ${CFLAGS} == *-g* ]] ; then
-		myconf -DDEBUGGING=-g
-	else
-		myconf -DDEBUGGING=none
-	fi
-
-	if [[ -n ${PERL_OLDVERSEN} ]] ; then
-		local inclist=$(for v in ${PERL_OLDVERSEN}; do echo -n "${v}/${myarch}${mythreading} ${v} "; done )
-		myconf -Dinc_version_list="$inclist"
-	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
-
-	sh Configure \
-		-des \
-		-Duseshrplib \
-		-Darchname="${myarch}" \
-		-Dcc="$(tc-getCC)" \
-		-Doptimize="${CFLAGS}" \
-		-Dldflags="${LDFLAGS}" \
-		-Dprefix='/usr' \
-		-Dsiteprefix='/usr' \
-		-Dvendorprefix='/usr' \
-		-Dscriptdir='/usr/bin' \
-		-Dprivlib="${PRIV_LIB}" \
-		-Darchlib="${ARCH_LIB}" \
-		-Dsitelib="${SITE_LIB}" \
-		-Dsitearch="${SITE_ARCH}" \
-		-Dvendorlib="${VENDOR_LIB}" \
-		-Dvendorarch="${VENDOR_ARCH}" \
-		-Dman1dir=/usr/share/man/man1 \
-		-Dman3dir=/usr/share/man/man3 \
-		-Dsiteman1dir=/usr/share/man/man1 \
-		-Dsiteman3dir=/usr/share/man/man3 \
-		-Dvendorman1dir=/usr/share/man/man1 \
-		-Dvendorman3dir=/usr/share/man/man3 \
-		-Dman1ext='1' \
-		-Dman3ext='3pm' \
-		-Dlibperl="${LIBPERL}" \
-		-Dlocincpth=' ' \
-		-Duselargefiles \
-		-Dd_semctl_semun \
-		-Dcf_by='Gentoo' \
-		-Dmyhostname='localhost' \
-		-Dperladmin='root@localhost' \
-		-Dinstallusrbinperl='n' \
-		-Ud_csh \
-		-Uusenm \
-		"${myconf[@]}" || die "Unable to configure"
-}
-
-src_compile() {
-	# bug 331113
-	emake -j1 || die "emake failed"
-}
-
-src_test() {
-	if [[ ${EUID} == 0 ]] ; then
-		ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
-		return 0
-	fi
-	use elibc_uclibc && export MAKEOPTS+=" -j1"
-	TEST_JOBS=$(echo -j1 ${MAKEOPTS} | sed -r 's/.*(-j[[:space:]]*|--jobs=)([[:digit:]]+).*/\2/' ) \
-		make test_harness || die "test failed"
-}
-
-src_install() {
-	local i
-	local coredir="${ARCH_LIB}/CORE"
-
-#	# Fix for "stupid" modules and programs
-#	dodir ${SITE_ARCH} ${SITE_LIB}
-#	keepdir "${VENDOR_ARCH}" #338802 for enc2xs
-
-	local installtarget=install
-	if use build ; then
-		installtarget=install.perl
-	fi
-	make DESTDIR="${D}" ${installtarget} || die "Unable to make ${installtarget}"
-
-	rm -f "${D}"/usr/bin/perl
-	ln -s perl${MY_PV} "${D}"/usr/bin/perl
-
-	dolib.so "${D}"/${coredir}/${LIBPERL} || die
-	dosym ${LIBPERL} /usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die
-	dosym ${LIBPERL} /usr/$(get_libdir)/libperl$(get_libname) || die
-	rm -f "${D}"/${coredir}/${LIBPERL}
-	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/${LIBPERL}
-	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname ${SHORT_PV})
-	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname)
-
-	rm -rf "${D}"/usr/share/man/man3 || die "Unable to remove module man pages"
-
-#	# 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
-	for i in $(find "${D}" -iname "Config.pm" ) ; do
-		einfo "Removing ${D} from ${i}..."
-		sed -i -e "s:${D}::" "${i}" || die "Sed failed"
-	done
-
-	find "${D}" -type f -name .packlist -delete || die
-
-	# 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* README AUTHORS || die
-
-	if use doc ; then
-		# HTML Documentation
-		# We expect errors, warnings, and such with the following.
-
-		dodir /usr/share/doc/${PF}/html
-		LD_LIBRARY_PATH=. ./perl installhtml \
-			--podroot='.' \
-			--podpath='lib:ext:pod:vms' \
-			--recurse \
-			--htmldir="${D}/usr/share/doc/${PF}/html" \
-			--libpods='perlfunc:perlguts:perlvar:perlrun:perlop'
-	fi
-
-	if use build ; then
-		src_remove_extra_files
-	fi
-
-	dual_scripts
-}
-
-pkg_postinst() {
-	dual_scripts
-
-	if [[ "${ROOT}" = "/" ]] ; then
-		local INC DIR file
-		INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${MY_PV}'|etc|local|perl$/; print "$line\n" }')
-		ebegin "Removing old .ph files"
-		for DIR in ${INC} ; do
-			if [[ -d "${DIR}" ]] ; then
-				for file in $(find "${DIR}" -name "*.ph" -type f ) ; do
-					rm -f "${file}"
-					einfo "<< ${file}"
-				done
-			fi
-		done
-		# Silently remove the now empty dirs
-		for DIR in ${INC} ; do
-			if [[ -d "${DIR}" ]] ; then
-				find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
-			fi
-		done
-		if ! use build ; then
-			ebegin "Generating ConfigLocal.pm (ignore any error)"
-			enc2xs -C
-		fi
-		ebegin "Converting C header files to the corresponding Perl format (ignore any error)"
-		pushd /usr/include >/dev/null
-			h2ph -Q -a -d ${ARCH_LIB} \
-				asm/termios.h syscall.h syslimits.h syslog.h sys/ioctl.h \
-				sys/socket.h sys/time.h wait.h sysexits.h
-		popd >/dev/null
-
-# 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
-		#fi
-	fi
-}
-
-pkg_postrm(){
-	dual_scripts
-
-#	if [[ -e ${ARCH_LIB}/Encode/ConfigLocal.pm ]] ; then
-#		ebegin "Removing ConfigLocal.pm"
-#		rm "${ARCH_LIB}/Encode/ConfigLocal.pm"
-#	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 ""
-}
-
-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
-			alternatives_auto_makesym "/usr/bin/${i}" "/usr/bin/${i}-[0-9]*"
-			if [[ ${i} != cpanp-run-perl ]] ; then
-				ff=`echo ${ROOT}/usr/share/man/man1/${i}-${ver}-${P}.1*`
-				ff=${ff##*.1}
-				alternatives_auto_makesym "/usr/share/man/man1/${i}.1${ff}" "/usr/share/man/man1/${i}-[0-9]*"
-			fi
-		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
-			if ! [[ -f "${D}"/usr/bin/${i} ]] ; then
-				use build || ewarn "/usr/bin/${i} does not exist!"
-				continue
-			fi
-			mv "${D}"/usr/bin/${i}{,-${ver}-${P}} || die
-			if [[ -f ${D}/usr/share/man/man1/${i}.1 ]] ; then
-				mv "${D}"/usr/share/man/man1/${i}{.1,-${ver}-${P}.1} || die
-			else
-				echo "/usr/share/man/man1/${i}.1 does not exist!"
-			fi
-		done
-	fi
-}
-
-src_remove_extra_files() {
-	local prefix="./usr" # ./ is important
-	local bindir="${prefix}/bin"
-	local libdir="${prefix}/$(get_libdir)"
-
-	# 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
-	${libdir}/${LIBPERL}
-	${libdir}/libperl$(get_libname)
-	${libdir}/libperl$(get_libname ${SHORT_PV})
-	.${PRIV_LIB}/AutoLoader.pm
-	.${PRIV_LIB}/B/Deparse.pm
-	.${PRIV_LIB}/Carp.pm
-	.${PRIV_LIB}/Carp/Heavy.pm
-	.${PRIV_LIB}/Class/Struct.pm
-	.${PRIV_LIB}/DirHandle.pm
-	.${PRIV_LIB}/Exporter.pm
-	.${PRIV_LIB}/Exporter/Heavy.pm
-	.${PRIV_LIB}/ExtUtils/Command.pm
-	.${PRIV_LIB}/ExtUtils/Command/MM.pm
-	.${PRIV_LIB}/ExtUtils/Constant.pm
-	.${PRIV_LIB}/ExtUtils/Constant/Base.pm
-	.${PRIV_LIB}/ExtUtils/Constant/Utils.pm
-	.${PRIV_LIB}/ExtUtils/Constant/XS.pm
-	.${PRIV_LIB}/ExtUtils/Embed.pm
-	.${PRIV_LIB}/ExtUtils/Install.pm
-	.${PRIV_LIB}/ExtUtils/Installed.pm
-	.${PRIV_LIB}/ExtUtils/Liblist.pm
-	.${PRIV_LIB}/ExtUtils/Liblist/Kid.pm
-	.${PRIV_LIB}/ExtUtils/MM.pm
-	.${PRIV_LIB}/ExtUtils/MM_Any.pm
-	.${PRIV_LIB}/ExtUtils/MM_MacOS.pm
-	.${PRIV_LIB}/ExtUtils/MM_Unix.pm
-	.${PRIV_LIB}/ExtUtils/MY.pm
-	.${PRIV_LIB}/ExtUtils/MakeMaker.pm
-	.${PRIV_LIB}/ExtUtils/Manifest.pm
-	.${PRIV_LIB}/ExtUtils/Miniperl.pm
-	.${PRIV_LIB}/ExtUtils/Mkbootstrap.pm
-	.${PRIV_LIB}/ExtUtils/Mksymlists.pm
-	.${PRIV_LIB}/ExtUtils/Packlist.pm
-	.${PRIV_LIB}/ExtUtils/testlib.pm
-	.${PRIV_LIB}/File/Basename.pm
-	.${PRIV_LIB}/File/Compare.pm
-	.${PRIV_LIB}/File/Copy.pm
-	.${PRIV_LIB}/File/Find.pm
-	.${PRIV_LIB}/File/Path.pm
-	.${PRIV_LIB}/File/stat.pm
-	.${PRIV_LIB}/FileHandle.pm
-	.${PRIV_LIB}/Getopt/Long.pm
-	.${PRIV_LIB}/Getopt/Std.pm
-	.${PRIV_LIB}/IPC/Open2.pm
-	.${PRIV_LIB}/IPC/Open3.pm
-	.${PRIV_LIB}/PerlIO.pm
-	.${PRIV_LIB}/Pod/InputObjects.pm
-	.${PRIV_LIB}/Pod/Man.pm
-	.${PRIV_LIB}/Pod/ParseLink.pm
-	.${PRIV_LIB}/Pod/Parser.pm
-	.${PRIV_LIB}/Pod/Select.pm
-	.${PRIV_LIB}/Pod/Text.pm
-	.${PRIV_LIB}/Pod/Usage.pm
-	.${PRIV_LIB}/SelectSaver.pm
-	.${PRIV_LIB}/Symbol.pm
-	.${PRIV_LIB}/Text/ParseWords.pm
-	.${PRIV_LIB}/Text/Tabs.pm
-	.${PRIV_LIB}/Text/Wrap.pm
-	.${PRIV_LIB}/Tie/Hash.pm
-	.${PRIV_LIB}/Time/Local.pm
-	.${PRIV_LIB}/XSLoader.pm
-	.${PRIV_LIB}/autouse.pm
-	.${PRIV_LIB}/base.pm
-	.${PRIV_LIB}/bigint.pm
-	.${PRIV_LIB}/bignum.pm
-	.${PRIV_LIB}/bigrat.pm
-	.${PRIV_LIB}/blib.pm
-	.${PRIV_LIB}/bytes.pm
-	.${PRIV_LIB}/bytes_heavy.pl
-	.${PRIV_LIB}/charnames.pm
-	.${PRIV_LIB}/constant.pm
-	.${PRIV_LIB}/diagnostics.pm
-	.${PRIV_LIB}/fields.pm
-	.${PRIV_LIB}/filetest.pm
-	.${PRIV_LIB}/if.pm
-	.${PRIV_LIB}/integer.pm
-	.${PRIV_LIB}/less.pm
-	.${PRIV_LIB}/locale.pm
-	.${PRIV_LIB}/open.pm
-	.${PRIV_LIB}/overload.pm
-	.${PRIV_LIB}/sigtrap.pm
-	.${PRIV_LIB}/sort.pm
-	.${PRIV_LIB}/stat.pl
-	.${PRIV_LIB}/strict.pm
-	.${PRIV_LIB}/subs.pm
-	.${PRIV_LIB}/unicore/To/Fold.pl
-	.${PRIV_LIB}/unicore/To/Lower.pl
-	.${PRIV_LIB}/unicore/To/Upper.pl
-	.${PRIV_LIB}/utf8.pm
-	.${PRIV_LIB}/utf8_heavy.pl
-	.${PRIV_LIB}/vars.pm
-	.${PRIV_LIB}/vmsish.pm
-	.${PRIV_LIB}/warnings
-	.${PRIV_LIB}/warnings.pm
-	.${PRIV_LIB}/warnings/register.pm
-	.${ARCH_LIB}/B.pm
-	.${ARCH_LIB}/CORE/libperl$(get_libname)
-	.${ARCH_LIB}/Config.pm
-	.${ARCH_LIB}/Config_heavy.pl
-	.${ARCH_LIB}/Cwd.pm
-	.${ARCH_LIB}/Data/Dumper.pm
-	.${ARCH_LIB}/DynaLoader.pm
-	.${ARCH_LIB}/Errno.pm
-	.${ARCH_LIB}/Fcntl.pm
-	.${ARCH_LIB}/File/Glob.pm
-	.${ARCH_LIB}/File/Spec.pm
-	.${ARCH_LIB}/File/Spec/Unix.pm
-	.${ARCH_LIB}/IO.pm
-	.${ARCH_LIB}/IO/File.pm
-	.${ARCH_LIB}/IO/Handle.pm
-	.${ARCH_LIB}/IO/Pipe.pm
-	.${ARCH_LIB}/IO/Seekable.pm
-	.${ARCH_LIB}/IO/Select.pm
-	.${ARCH_LIB}/IO/Socket.pm
-	.${ARCH_LIB}/IO/Socket/INET.pm
-	.${ARCH_LIB}/IO/Socket/UNIX.pm
-	.${ARCH_LIB}/List/Util.pm
-	.${ARCH_LIB}/NDBM_File.pm
-	.${ARCH_LIB}/POSIX.pm
-	.${ARCH_LIB}/Scalar/Util.pm
-	.${ARCH_LIB}/Socket.pm
-	.${ARCH_LIB}/Storable.pm
-	.${ARCH_LIB}/attributes.pm
-	.${ARCH_LIB}/auto/Cwd/Cwd$(get_libname)
-	.${ARCH_LIB}/auto/Data/Dumper/Dumper$(get_libname)
-	.${ARCH_LIB}/auto/DynaLoader/dl_findfile.al
-	.${ARCH_LIB}/auto/Fcntl/Fcntl$(get_libname)
-	.${ARCH_LIB}/auto/File/Glob/Glob$(get_libname)
-	.${ARCH_LIB}/auto/IO/IO$(get_libname)
-	.${ARCH_LIB}/auto/POSIX/POSIX$(get_libname)
-	.${ARCH_LIB}/auto/POSIX/autosplit.ix
-	.${ARCH_LIB}/auto/POSIX/fstat.al
-	.${ARCH_LIB}/auto/POSIX/load_imports.al
-	.${ARCH_LIB}/auto/POSIX/stat.al
-	.${ARCH_LIB}/auto/POSIX/tmpfile.al
-	.${ARCH_LIB}/auto/Socket/Socket$(get_libname)
-	.${ARCH_LIB}/auto/Storable/Storable$(get_libname)
-	.${ARCH_LIB}/auto/Storable/_retrieve.al
-	.${ARCH_LIB}/auto/Storable/_store.al
-	.${ARCH_LIB}/auto/Storable/autosplit.ix
-	.${ARCH_LIB}/auto/Storable/retrieve.al
-	.${ARCH_LIB}/auto/Storable/store.al
-	.${ARCH_LIB}/auto/re/re$(get_libname)
-	.${ARCH_LIB}/encoding.pm
-	.${ARCH_LIB}/lib.pm
-	.${ARCH_LIB}/ops.pm
-	.${ARCH_LIB}/re.pm
-	.${ARCH_LIB}/threads.pm
-"
-
-	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 -print0 | xargs -0 -r rmdir &> /dev/null
-	#for f in ${MINIMAL_PERL_INSTALL} ; do
-	#	[[ -e $f ]] || ewarn "$f unused in MINIMAL_PERL_INSTALL"
-	#done
-	popd > /dev/null
-}
diff --git a/dev-lang/perl/perl-5.12.2-r6.ebuild b/dev-lang/perl/perl-5.12.2-r6.ebuild
index fda6ee54eddf..a589be41e397 100644
--- a/dev-lang/perl/perl-5.12.2-r6.ebuild
+++ b/dev-lang/perl/perl-5.12.2-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.12.2-r6.ebuild,v 1.6 2011/01/22 11:19:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.12.2-r6.ebuild,v 1.7 2011/03/07 11:35:06 tove Exp $
 
 EAPI=3
 
@@ -219,7 +219,6 @@ src_configure() {
 		local inclist=$(for v in ${PERL_OLDVERSEN}; do echo -n "${v}/${myarch}${mythreading} ${v} "; done )
 		myconf -Dinc_version_list="$inclist"
 	fi
-	[[ -n "${ABI}" ]] && myconf "-Dusrinc=$(get_ml_incdir)"
 
 	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
 
diff --git a/dev-lang/perl/perl-5.12.3.ebuild b/dev-lang/perl/perl-5.12.3.ebuild
index 2f63cafb6c38..6a4f3cfee10c 100644
--- a/dev-lang/perl/perl-5.12.3.ebuild
+++ b/dev-lang/perl/perl-5.12.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.12.3.ebuild,v 1.1 2011/01/22 09:41:54 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.12.3.ebuild,v 1.2 2011/03/07 11:35:06 tove Exp $
 
 EAPI=3
 
@@ -219,7 +219,6 @@ src_configure() {
 		local inclist=$(for v in ${PERL_OLDVERSEN}; do echo -n "${v}/${myarch}${mythreading} ${v} "; done )
 		myconf -Dinc_version_list="$inclist"
 	fi
-	[[ -n "${ABI}" ]] && myconf "-Dusrinc=$(get_ml_incdir)"
 
 	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
 
diff --git a/dev-lang/perl/perl-5.8.8-r8.ebuild b/dev-lang/perl/perl-5.8.8-r8.ebuild
index bafbe7df677e..ba7e86582955 100644
--- a/dev-lang/perl/perl-5.8.8-r8.ebuild
+++ b/dev-lang/perl/perl-5.8.8-r8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r8.ebuild,v 1.11 2010/03/31 18:49:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r8.ebuild,v 1.12 2011/03/07 11:35:06 tove Exp $
 
 inherit eutils alternatives flag-o-matic toolchain-funcs multilib
 
@@ -272,7 +272,6 @@ src_configure() {
 		myconf -Ui_db -Ui_ndbm
 	fi
 
-	[[ -n "${ABI}" ]] && myconf "-Dusrinc=$(get_ml_incdir)"
 
 	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
 
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index c1094cc95c9e..938ca246a98e 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -8,7 +8,7 @@ DIST ruby-patches-1.9.2.tar.bz2 2272 RMD160 d10f950c40384fe41f7eba14e55621aaa7c0
 DIST ruby-patches-1.9.2_rc2-r1.tar.bz2 2403 RMD160 345fcf857e8760f66ded3759a9a84d4a4d94b067 SHA1 985dbbec258c319d1a256c53af1f79148cc7bdf6 SHA256 2b1b45ad4195fc8aba26858fc4ca31769a9c49af9711902bac95732baf26ed0f
 EBUILD ruby-1.8.7_p302.ebuild 5589 RMD160 102e3c9b2eda884dd55dc881ba675e29326ee81e SHA1 9224783424b418825d60bf8ddb4013b0133b6c17 SHA256 f115820b90b813850879da466efc6d77f7ee3c482cb4e2031d0451523801c73d
 EBUILD ruby-1.8.7_p334.ebuild 5590 RMD160 29338e6e7a6595bd3581bcd52ab7e81b43dff3db SHA1 f0a9a9332479ea907727735f25e4fe0f3b48885d SHA256 9bcddb584d5482b33a7da3d56849df58bb26a6e65451bce8250cd8eb2f34a6f8
-EBUILD ruby-1.9.2.ebuild 6118 RMD160 04596eb5aea5f179d100cd11fbe65d5fd143a583 SHA1 171cbb9f56e44c0973de3bff2ab440b3a906ad9d SHA256 4a9b2f480d07011cc6e78955851f72656496206903a4ab74e82979e457d63d5d
+EBUILD ruby-1.9.2.ebuild 6167 RMD160 927a2240a001007f328d03f3e5a3bdcdde29a1ed SHA1 adf557b0afd014fa185775d1180d0c176c19785c SHA256 988c808180d94ced9569be8f7b9b3decccc359df01eb5f5ac80f9edc02eae28d
 EBUILD ruby-1.9.2_rc2-r1.ebuild 5831 RMD160 0ea468ff652e77e0961c842b9532b5eb38b95572 SHA1 aece647c15994af766adacb44b11e112bfa2306d SHA256 27be9162a4c84a4cb51931cdd6f5d37ddf7331a01a1e5479d56c5e4704c65871
-MISC ChangeLog 75019 RMD160 8e68859a9f0f65c1dbca00c2190ae5a0612b2db3 SHA1 4798e114e83330a10261e432933e4dea5ebc9c29 SHA256 8175845d78b0d9c8f4a45f2bc01943819e67a98d19c728f8a6b63afbecd7a729
+MISC ChangeLog 75133 RMD160 bdc3107c127195e55e7fb0acc589d92363bd15b8 SHA1 33b36b7082a4fde1cb7db663d6bf94457dfdaa85 SHA256 25eafb1cff6e9b43c2b0f60b87f50bc0797d0df100364dba6367695b0ad38170
 MISC metadata.xml 1388 RMD160 2e3de2f87f5bade79976069f8a4e89ecff342d10 SHA1 a0ed685628b1f5de88e81e1aacc56c28bb2bb52f SHA256 365a88ae053d47050b6b50d05eb518755a3aeb0c91ca77d2d8eeabfd24a2447f