cleanup

(Portage version: 2.0.51-r13)

15 files changed, 7 insertions, 2632 deletions

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index c248cdc5622b..7ece688cc828 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/perl
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.106 2005/01/31 10:18:07 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.107 2005/02/05 11:24:37 mcummings Exp $
+
+  05 Feb 2005; Michael Cummings <mcummings@gentoo.org>
+  -perl-5.8.2-r1.ebuild, -perl-5.8.4-r1.ebuild, -perl-5.8.5-r1.ebuild,
+  -perl-5.8.5-r2.ebuild, -perl-5.8.5.ebuild, -perl-5.8.6-r1.ebuild,
+  -perl-5.8.6.ebuild:
+  Cleaning up old, unused ebuilds
 
   31 Jan 2005; Michael Cummings <mcummings@gentoo.org> files/perl-cleaner:
   swtaylor came up with a quicker way to generate the module list, plus a more
diff --git a/dev-lang/perl/files/digest-perl-5.8.2-r1 b/dev-lang/perl/files/digest-perl-5.8.2-r1
deleted file mode 100644
index 03c9dcc55731..000000000000
--- a/dev-lang/perl/files/digest-perl-5.8.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fa356b74f99166b63a68a322c3c68f91 perl-5.8.2.tar.gz 11896287
diff --git a/dev-lang/perl/files/digest-perl-5.8.4-r1 b/dev-lang/perl/files/digest-perl-5.8.4-r1
deleted file mode 100644
index a13f719f8c75..000000000000
--- a/dev-lang/perl/files/digest-perl-5.8.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 912050a9cb6b0f415b76ba56052fb4cf perl-5.8.4.tar.gz 12094233
diff --git a/dev-lang/perl/files/digest-perl-5.8.5 b/dev-lang/perl/files/digest-perl-5.8.5
deleted file mode 100644
index a774272cdab6..000000000000
--- a/dev-lang/perl/files/digest-perl-5.8.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 49baa8d7d29b4a9713c06edeb81e6b1b perl-5.8.5.tar.gz 11930764
diff --git a/dev-lang/perl/files/digest-perl-5.8.5-r1 b/dev-lang/perl/files/digest-perl-5.8.5-r1
deleted file mode 100644
index a774272cdab6..000000000000
--- a/dev-lang/perl/files/digest-perl-5.8.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 49baa8d7d29b4a9713c06edeb81e6b1b perl-5.8.5.tar.gz 11930764
diff --git a/dev-lang/perl/files/digest-perl-5.8.5-r2 b/dev-lang/perl/files/digest-perl-5.8.5-r2
deleted file mode 100644
index a774272cdab6..000000000000
--- a/dev-lang/perl/files/digest-perl-5.8.5-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 49baa8d7d29b4a9713c06edeb81e6b1b perl-5.8.5.tar.gz 11930764
diff --git a/dev-lang/perl/files/digest-perl-5.8.6 b/dev-lang/perl/files/digest-perl-5.8.6
deleted file mode 100644
index 666169141e1e..000000000000
--- a/dev-lang/perl/files/digest-perl-5.8.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3d030b6ff2a433840edb1a407d18dc0a perl-5.8.6.tar.bz2 9693085
diff --git a/dev-lang/perl/files/digest-perl-5.8.6-r1 b/dev-lang/perl/files/digest-perl-5.8.6-r1
deleted file mode 100644
index 666169141e1e..000000000000
--- a/dev-lang/perl/files/digest-perl-5.8.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3d030b6ff2a433840edb1a407d18dc0a perl-5.8.6.tar.bz2 9693085
diff --git a/dev-lang/perl/perl-5.8.2-r1.ebuild b/dev-lang/perl/perl-5.8.2-r1.ebuild
deleted file mode 100644
index 9de19fd7bc55..000000000000
--- a/dev-lang/perl/perl-5.8.2-r1.ebuild
+++ /dev/null
@@ -1,330 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.2-r1.ebuild,v 1.24 2005/01/16 17:56:50 eradicator Exp $
-
-inherit eutils flag-o-matic gcc
-
-# The slot of this binary compat version of libperl.so
-PERLSLOT="1"
-
-SHORT_PV="${PV%.*}"
-MY_P="perl-${PV/_rc/-RC}"
-DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="ftp://ftp.perl.org/pub/CPAN/src/${MY_P}.tar.gz"
-HOMEPAGE="http://www.perl.org/"
-SLOT="0"
-LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
-LICENSE="Artistic GPL-2"
-KEYWORDS="x86 amd64 sparc ppc alpha mips hppa ia64 ppc64"
-IUSE="berkdb debug doc gdbm ithreads perlsuid uclibc"
-
-DEPEND="!uclibc? ( sys-apps/groff )
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	>=sys-apps/portage-2.0.48-r4
-	>=sys-devel/libperl-${PV}
-	!<dev-perl/ExtUtils-MakeMaker-6.17
-	!<dev-perl/File-Spec-0.84-r1
-	!<dev-perl/Test-Simple-0.47-r1"
-RDEPEND=">=sys-devel/libperl-${PV}
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
-
-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 ""
-		ewarn "PLEASE NOTE: You are compiling perl-5.8 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. "
-		ewarn ""
-		epause 10
-	else
-		ewarn ""
-		ewarn "PLEASE NOTE: If you want to compile perl-5.8 with"
-		ewarn "threading enabled , you must restart this emerge"
-		ewarn "with USE=ithreads emerge...."
-		ewarn "Threading is not supported by all applications "
-		ewarn "that compile against perl. You use threading at "
-		ewarn "your own discretion. "
-		ewarn ""
-	fi
-
-	if [ ! -f "${ROOT}/usr/lib/${LIBPERL}" ]
-	then
-		# Make sure we have libperl installed ...
-		eerror "Cannot find ${ROOT}/usr/lib/${LIBPERL}!  Make sure that you"
-		eerror "have sys-libs/libperl installed properly ..."
-		die "Cannot find /usr/lib/${LIBPERL}!"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# 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}/${P}-prelink-lpthread.patch
-
-	# Patch perldoc to not abort when it attempts to search
-	# nonexistent directories; fixes bug #16589.
-	# <rac@gentoo.org> (28 Feb 2003)
-
-	cd ${S}; epatch ${FILESDIR}/${P}-perldoc-emptydirs.patch
-
-	# this lays the groundwork for solving the issue of what happens
-	# when people (or ebuilds) install different versiosn of modules
-	# that are in the core, by rearranging the @INC directory to look
-	# site -> vendor -> core.
-	cd ${S}; epatch ${FILESDIR}/${P}-reorder-INC.patch
-
-	# 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}/${P}-picdl.patch
-
-	# uclibc support
-	epatch ${FILESDIR}/perl-5.8.2-uclibc.patch
-}
-
-src_compile() {
-	# Perl has problems compiling with -Os in your flags with glibc
-	use uclibc || replace-flags "-Os" "-O2"
-	# This flag makes compiling crash in interesting ways
-	filter-flags -malign-double
-
-	export LC_ALL="C"
-	local myconf=""
-
-	if use ithreads
-	then
-		einfo "using ithreads"
-		mythreading="-multi"
-		myconf="-Dusethreads ${myconf}"
-		myarch="${CHOST%%-*}-linux-thread"
-	else
-		myarch="${CHOST%%-*}-linux"
-	fi
-
-	if use gdbm
-	then
-		myconf="${myconf} -Di_gdbm"
-	fi
-	if use berkdb
-	then
-		myconf="${myconf} -Di_db"
-
-		# ndbm.h is only provided by db1 (and perhaps by gdbm in
-		# error). an alternate approach here would be to check for the
-		# presence (or some string therein) of /usr/include/ndbm.h
-		# itself.
-
-		if has_version '=sys-libs/db-1*'
-		then
-			myconf="${myconf} -Di_ndbm"
-		else
-			myconf="${myconf} -Ui_ndbm"
-		fi
-	else
-		myconf="${myconf} -Ui_db -Ui_ndbm"
-	fi
-	if use mips
-	then
-		# this is needed because gcc 3.3-compiled kernels will hang
-		# the machine trying to run this test - check with `Kumba
-		# <rac@gentoo.org> 2003.06.26
-		myconf="${myconf} -Dd_u32align"
-	fi
-
-	if use debug
-	then
-		CFLAGS="${CFLAGS} -g"
-	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 sparc
-	then
-		myconf="${myconf} -Ud_longdbl"
-	fi
-
-	if use alpha && "$(gcc-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
-
-	# These are temporary fixes. Need to edit the build so that that libraries created
-	# only get compiled with -fPIC, since they get linked into shared objects, they
-	# must be compiled with -fPIC.  Don't have time to parse through the build system
-	# at this time.
-	[ "${ARCH}" = "hppa" ] && append-flags -fPIC
-#	[ "${ARCH}" = "amd64" ] && append-flags -fPIC
-
-	sh Configure -des \
-		-Darchname="${myarch}" \
-		-Dcccdlflags='-fPIC' \
-		-Dccdlflags='-rdynamic' \
-		-Dcc="${CC:-gcc}" \
-		-Dprefix='/usr' \
-		-Dvendorprefix='/usr' \
-		-Dsiteprefix='/usr' \
-		-Dlocincpth=' ' \
-		-Doptimize="${CFLAGS}" \
-		-Duselargefiles \
-		-Dd_semctl_semun \
-		-Dscriptdir=/usr/bin \
-		-Dman3ext='3pm' \
-		-Dcf_by='Gentoo' \
-		-Ud_csh \
-		${myconf} || die "Unable to configure"
-
-	MAKEOPTS="${MAKEOPTS} -j1" emake || die "Unable to make"
-
-	emake -i test CCDLFLAGS=
-}
-
-src_install() {
-
-	export LC_ALL="C"
-
-	# Need to do this, else apps do not link to dynamic version of
-	# the library ...
-	local coredir="/usr/lib/perl5/${PV}/${myarch}${mythreading}/CORE"
-	dodir ${coredir}
-	dosym ../../../../${LIBPERL} ${coredir}/${LIBPERL}
-	dosym ../../../../${LIBPERL} ${coredir}/libperl.so.${PERLSLOT}
-	dosym ../../../../${LIBPERL} ${coredir}/libperl.so
-
-	# Fix for "stupid" modules and programs
-	dodir /usr/lib/perl5/site_perl/${PV}/${myarch}${mythreading}
-
-	make DESTDIR="${D}" \
-		INSTALLMAN1DIR="${D}/usr/share/man/man1" \
-		INSTALLMAN3DIR="${D}/usr/share/man/man3" \
-		install || die "Unable to make install"
-
-	cp -f utils/h2ph utils/h2ph_patched
-	epatch ${FILESDIR}/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch
-
-	LD_LIBRARY_PATH=. ./perl -Ilib utils/h2ph_patched \
-		-a -d ${D}/usr/lib/perl5/${PV}/${myarch}${mythreading} <<EOF
-asm/termios.h
-syscall.h
-syslimits.h
-syslog.h
-sys/ioctl.h
-sys/socket.h
-sys/time.h
-wait.h
-EOF
-
-	# This is to fix a missing c flag for backwards compat
-	for i in `find ${D}/usr/lib/perl5 -iname "Config.pm"`;do
-		sed -e "s:ccflags=':ccflags='-DPERL5 :" \
-		    -e "s:cppflags=':cppflags='-DPERL5 :" \
-			${i} > ${i}.new &&\
-			mv ${i}.new ${i} || die "Sed failed"
-	done
-
-	# A poor fix for the miniperl issues
-	dosed 's:./miniperl:/usr/bin/perl:' /usr/lib/perl5/${PV}/ExtUtils/xsubpp
-	fperms 0444 /usr/lib/perl5/${PV}/ExtUtils/xsubpp
-	dosed 's:./miniperl:/usr/bin/perl:' /usr/bin/xsubpp
-	fperms 0755 /usr/bin/xsubpp
-
-	./perl installman \
-		--destdir="${D}" --man1ext='1' --man3ext='3'
-
-	# This removes ${D} from Config.pm and .packlist
-	for i in `find ${D} -iname "Config.pm"` `find ${D} -iname ".packlist"`;do
-		einfo "Removing ${D} from ${i}..."
-		sed -e "s:${D}::" ${i} > ${i}.new &&\
-			mv ${i}.new ${i} || die "Sed failed"
-	done
-
-	dodoc Changes* Artistic Copying README Todo* AUTHORS
-
-	if use doc
-	then
-		# HTML Documentation
-		# We expect errors, warnings, and such with the following.
-
-		dodir /usr/share/doc/${PF}/html
-		./perl installhtml \
-			--podroot='.' \
-			--podpath='lib:ext:pod:vms' \
-			--recurse \
-			--htmldir="${D}/usr/share/doc/${PF}/html" \
-			--libpods='perlfunc:perlguts:perlvar:perlrun:perlop'
-	fi
-}
-
-pkg_postinst() {
-
-	# Make sure we do not have stale/invalid libperl.so 's ...
-	if [ -f "${ROOT}usr/lib/libperl.so" -a ! -L "${ROOT}usr/lib/libperl.so" ]
-	then
-		mv -f ${ROOT}usr/lib/libperl.so ${ROOT}usr/lib/libperl.so.old
-	fi
-
-	local perllib="`readlink -f ${ROOT}usr/lib/libperl.so | sed -e 's:^.*/::'`"
-
-	# If we are installing perl, we need the /usr/lib/libperl.so symlink to
-	# point to the version of perl we are running, else builing something
-	# against libperl.so will break ...
-	if [ "${perllib}" != "${LIBPERL}" ]
-	then
-		# Delete stale symlinks
-		rm -f ${ROOT}usr/lib/libperl.so
-		rm -f ${ROOT}usr/lib/libperl.so.${PERLSLOT}
-		# Regenerate libperl.so.${PERLSLOT}
-		ln -snf ${LIBPERL} ${ROOT}usr/lib/libperl.so.${PERLSLOT}
-		# Create libperl.so (we use the *soname* versioned lib here ..)
-		ln -snf libperl.so.${PERLSLOT} ${ROOT}usr/lib/libperl.so
-	fi
-
-	if [ "${ROOT}" = "/" ]
-	then
-		ebegin "Converting C header files to the corresponding Perl format"
-		cd /usr/include; h2ph * sys/* arpa/* netinet/* bits/* security/* asm/*
-	fi
-
-	eerror ""
-	eerror "If this is an upgrade to a perl 5.6.1 system,"
-	eerror "~OR~ an upgrade to a previous Gentoo release"
-	eerror "of perl 5.8.0, prior to -r8 "
-	eerror "you may need to recompile applications that"
-	eerror "were emerged against the old libperl.so"
-	eerror ""
-	eerror "${FILESDIR}/libperl_rebuilder "
-	eerror "is provided to assist with this. "
-	eerror "PLEASE DO NOT INTERRUPT THE RUNNING OF THIS SCRIPT."
-	eerror "Part of the rebuilding of applications compiled against "
-	eerror "your old libperl involves temporarily unmerging"
-	eerror "them - interruptions could leave you with unmerged"
-	eerror "packages before they can be remerged."
-	eerror ""
-	eerror "If you have run the rebuilder and a package still gives"
-	eerror "you trouble, and re-emerging it fails to correct"
-	eerror "the problem, please check http://bugs.gentoo.org/"
-	eerror "for more information or to report a bug."
-	eerror ""
-	eerror ""
-}
diff --git a/dev-lang/perl/perl-5.8.4-r1.ebuild b/dev-lang/perl/perl-5.8.4-r1.ebuild
deleted file mode 100644
index 53af1a5efae8..000000000000
--- a/dev-lang/perl/perl-5.8.4-r1.ebuild
+++ /dev/null
@@ -1,395 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.4-r1.ebuild,v 1.21 2005/01/16 17:56:50 eradicator Exp $
-
-inherit eutils flag-o-matic gcc
-
-# The slot of this binary compat version of libperl.so
-PERLSLOT="1"
-
-SHORT_PV="${PV%.*}"
-MY_P="perl-${PV/_rc/-RC}"
-DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="ftp://ftp.perl.org/pub/CPAN/src/${MY_P}.tar.gz"
-HOMEPAGE="http://www.perl.org/"
-LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
-
-LICENSE="Artistic GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ~ppc64 s390 sh"
-IUSE="berkdb debug doc gdbm ithreads perlsuid uclibc"
-
-DEPEND="!uclibc? ( sys-apps/groff )
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	>=sys-apps/portage-2.0.48-r4
-	>=sys-devel/libperl-${PV}
-	!<dev-perl/ExtUtils-MakeMaker-6.17
-	!<dev-perl/File-Spec-0.84-r1
-	!<dev-perl/Test-Simple-0.47-r1"
-RDEPEND=">=sys-devel/libperl-${PV}
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
-
-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 ""
-		ewarn "PLEASE NOTE: You are compiling perl-5.8 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. "
-		ewarn ""
-		epause 10
-	else
-		ewarn ""
-		ewarn "PLEASE NOTE: If you want to compile perl-5.8 with"
-		ewarn "threading enabled , you must restart this emerge"
-		ewarn "with USE=ithreads emerge...."
-		ewarn "Threading is not supported by all applications "
-		ewarn "that compile against perl. You use threading at "
-		ewarn "your own discretion. "
-		ewarn ""
-	fi
-
-	if [ ! -f "${ROOT}/usr/lib/${LIBPERL}" ]
-	then
-		# Make sure we have libperl installed ...
-		eerror "Cannot find ${ROOT}/usr/lib/${LIBPERL}!  Make sure that you"
-		eerror "have sys-libs/libperl installed properly ..."
-		die "Cannot find /usr/lib/${LIBPERL}!"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# 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}/${P}-prelink-lpthread.patch
-
-	# Patch perldoc to not abort when it attempts to search
-	# nonexistent directories; fixes bug #16589.
-	# <rac@gentoo.org> (28 Feb 2003)
-
-	cd ${S}; epatch ${FILESDIR}/${P}-perldoc-emptydirs.patch
-
-	# this lays the groundwork for solving the issue of what happens
-	# when people (or ebuilds) install different versiosn of modules
-	# that are in the core, by rearranging the @INC directory to look
-	# site -> vendor -> core.
-	cd ${S}; epatch ${FILESDIR}/${P}-reorder-INC.patch
-
-	# 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}/${P}-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}/${P}-noksh.patch
-
-	# see bug 52660
-	# i'm not entirely thrilled with this has_version, but can't see
-	# how else to handle it. attempting to link libgdbm_compat is
-	# fatal on systems where it doesn't exist.
-
-	has_version ">=sys-libs/gdbm-1.8.3" && epatch ${FILESDIR}/${P}-NDBM-GDBM-compat.patch
-
-	# uclibc support
-	epatch ${FILESDIR}/perl-5.8.2-uclibc.patch
-
-	# this one only affects sparc64, as best weeve and rac can tell,
-	# but seems sane for all linux.  we don't have to worry about
-	# drifting into obscure SysV non-posix semantics, and the current
-	# code in IO.xs that checks for this sort of thing dies in LDAP on
-	# sparc64.
-
-	epatch ${FILESDIR}/${P}-nonblock.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 uclibc || replace-flags "-Os" "-O2"
-	# This flag makes compiling crash in interesting ways
-	filter-flags -malign-double
-
-	export LC_ALL="C"
-	local myconf=""
-
-	if use ithreads
-	then
-		einfo "using ithreads"
-		mythreading="-multi"
-		myconf="-Dusethreads ${myconf}"
-		myarch="${CHOST%%-*}-linux-thread"
-	else
-		myarch="${CHOST%%-*}-linux"
-	fi
-
-	# 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 && "$(gcc-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
-
-	# These are temporary fixes. Need to edit the build so that that libraries created
-	# only get compiled with -fPIC, since they get linked into shared objects, they
-	# must be compiled with -fPIC.  Don't have time to parse through the build system
-	# at this time.
-	[ "${ARCH}" = "hppa" ] && append-flags -fPIC
-#	[ "${ARCH}" = "amd64" ] && append-flags -fPIC
-
-	sh Configure -des \
-		-Darchname="${myarch}" \
-		-Dcccdlflags='-fPIC' \
-		-Dccdlflags='-rdynamic' \
-		-Dcc="${CC:-gcc}" \
-		-Dprefix='/usr' \
-		-Dvendorprefix='/usr' \
-		-Dsiteprefix='/usr' \
-		-Dlocincpth=' ' \
-		-Doptimize="${CFLAGS}" \
-		-Duselargefiles \
-		-Dd_semctl_semun \
-		-Dscriptdir=/usr/bin \
-		-Dman1dir=/usr/share/man/man1 \
-		-Dman3dir=/usr/share/man/man3 \
-		-Dinstallman1dir=${D}/usr/share/man/man1 \
-		-Dinstallman3dir=${D}/usr/share/man/man3 \
-		-Dman1ext='1' \
-		-Dman3ext='3pm' \
-		-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"
-
-
-	# i want people to have to take actions to disable tests, because
-	# they reveal lots of important problems in clear ways.  if that
-	# happens, you can revisit this, but portage .51 will call
-	# src_test if FEATURES=maketest is enabled, and we'll call it here
-	# if it isn't.
-
-	if ! hasq maketest $FEATURES; then
-		src_test
-	fi
-}
-
-src_test() {
-	use 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 ../../../../${LIBPERL} ${coredir}/${LIBPERL}
-	dosym ../../../../${LIBPERL} ${coredir}/libperl.so.${PERLSLOT}
-	dosym ../../../../${LIBPERL} ${coredir}/libperl.so
-
-	# Fix for "stupid" modules and programs
-	dodir /usr/lib/perl5/site_perl/${PV}/${myarch}${mythreading}
-
-	make DESTDIR="${D}" install || die "Unable to make install"
-
-	# 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}/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch
-
-	LD_LIBRARY_PATH=. ./perl -Ilib utils/h2ph_patched \
-		-a -d ${D}/usr/lib/perl5/${PV}/${myarch}${mythreading} <<EOF
-asm/termios.h
-syscall.h
-syslimits.h
-syslog.h
-sys/ioctl.h
-sys/socket.h
-sys/time.h
-wait.h
-EOF
-
-	# This is to fix a missing c flag for backwards compat
-	for i in `find ${D}/usr/lib/perl5 -iname "Config.pm"`;do
-		sed -e "s:ccflags=':ccflags='-DPERL5 :" \
-		    -e "s:cppflags=':cppflags='-DPERL5 :" \
-			${i} > ${i}.new &&\
-			mv ${i}.new ${i} || die "Sed failed"
-	done
-
-	# A poor fix for the miniperl issues
-	dosed 's:./miniperl:/usr/bin/perl:' /usr/lib/perl5/${PV}/ExtUtils/xsubpp
-	fperms 0444 /usr/lib/perl5/${PV}/ExtUtils/xsubpp
-	dosed 's:./miniperl:/usr/bin/perl:' /usr/bin/xsubpp
-	fperms 0755 /usr/bin/xsubpp
-
-	# 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
-}
-
-pkg_postinst() {
-
-	# Make sure we do not have stale/invalid libperl.so 's ...
-	if [ -f "${ROOT}usr/lib/libperl.so" -a ! -L "${ROOT}usr/lib/libperl.so" ]
-	then
-		mv -f ${ROOT}usr/lib/libperl.so ${ROOT}usr/lib/libperl.so.old
-	fi
-
-	local perllib="`readlink -f ${ROOT}usr/lib/libperl.so | sed -e 's:^.*/::'`"
-
-	# If we are installing perl, we need the /usr/lib/libperl.so symlink to
-	# point to the version of perl we are running, else builing something
-	# against libperl.so will break ...
-	if [ "${perllib}" != "${LIBPERL}" ]
-	then
-		# Delete stale symlinks
-		rm -f ${ROOT}usr/lib/libperl.so
-		rm -f ${ROOT}usr/lib/libperl.so.${PERLSLOT}
-		# Regenerate libperl.so.${PERLSLOT}
-		ln -snf ${LIBPERL} ${ROOT}usr/lib/libperl.so.${PERLSLOT}
-		# Create libperl.so (we use the *soname* versioned lib here ..)
-		ln -snf libperl.so.${PERLSLOT} ${ROOT}usr/lib/libperl.so
-	fi
-
-	if [ "${ROOT}" = "/" ]
-	then
-		ebegin "Converting C header files to the corresponding Perl format"
-		cd /usr/include; h2ph * sys/* arpa/* netinet/* bits/* security/* asm/*
-	fi
-
-	eerror ""
-	eerror "If this is an upgrade to a perl 5.6.1 system,"
-	eerror "~OR~ an upgrade to a previous Gentoo release"
-	eerror "of perl 5.8.0, prior to -r8 "
-	eerror "you may need to recompile applications that"
-	eerror "were emerged against the old libperl.so"
-	eerror ""
-	eerror "${FILESDIR}/libperl_rebuilder "
-	eerror "is provided to assist with this. "
-	eerror "PLEASE DO NOT INTERRUPT THE RUNNING OF THIS SCRIPT."
-	eerror "Part of the rebuilding of applications compiled against "
-	eerror "your old libperl involves temporarily unmerging"
-	eerror "them - interruptions could leave you with unmerged"
-	eerror "packages before they can be remerged."
-	eerror ""
-	eerror "If you have run the rebuilder and a package still gives"
-	eerror "you trouble, and re-emerging it fails to correct"
-	eerror "the problem, please check http://bugs.gentoo.org/"
-	eerror "for more information or to report a bug."
-	eerror ""
-	eerror ""
-}
diff --git a/dev-lang/perl/perl-5.8.5-r1.ebuild b/dev-lang/perl/perl-5.8.5-r1.ebuild
deleted file mode 100644
index dc9aa4770fcf..000000000000
--- a/dev-lang/perl/perl-5.8.5-r1.ebuild
+++ /dev/null
@@ -1,374 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.5-r1.ebuild,v 1.3 2005/01/16 17:56:50 eradicator Exp $
-
-inherit eutils flag-o-matic gcc
-
-# The slot of this binary compat version of libperl.so
-PERLSLOT="1"
-
-SHORT_PV="${PV%.*}"
-MY_P="perl-${PV/_rc/-RC}"
-DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="ftp://ftp.perl.org/pub/CPAN/src/${MY_P}.tar.gz"
-HOMEPAGE="http://www.perl.org/"
-LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
-
-LICENSE="Artistic GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390 ~sh"
-IUSE="berkdb debug doc gdbm ithreads perlsuid uclibc"
-PERL_OLDVERSEN="5.8.2 5.8.4"
-
-DEPEND="!uclibc? ( sys-apps/groff )
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.3 )
-	>=sys-apps/portage-2.0.48-r4
-	>=sys-devel/libperl-${PV}
-	!<dev-perl/ExtUtils-MakeMaker-6.17
-	!<dev-perl/File-Spec-0.84-r1
-	!<dev-perl/Test-Simple-0.47-r1"
-RDEPEND=">=sys-devel/libperl-${PV}
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.3 )"
-
-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 ""
-		ewarn "PLEASE NOTE: You are compiling perl-5.8 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. "
-		ewarn ""
-		epause 10
-	else
-		ewarn ""
-		ewarn "PLEASE NOTE: If you want to compile perl-5.8 with"
-		ewarn "threading enabled , you must restart this emerge"
-		ewarn "with USE=ithreads emerge...."
-		ewarn "Threading is not supported by all applications "
-		ewarn "that compile against perl. You use threading at "
-		ewarn "your own discretion. "
-		ewarn ""
-	fi
-
-	if [ ! -f "${ROOT}/usr/lib/${LIBPERL}" ]
-	then
-		# Make sure we have libperl installed ...
-		eerror "Cannot find ${ROOT}/usr/lib/${LIBPERL}!  Make sure that you"
-		eerror "have sys-libs/libperl installed properly ..."
-		die "Cannot find /usr/lib/${LIBPERL}!"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# 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}/${P}-prelink-lpthread.patch
-
-	# Patch perldoc to not abort when it attempts to search
-	# nonexistent directories; fixes bug #16589.
-	# <rac@gentoo.org> (28 Feb 2003)
-
-	cd ${S}; epatch ${FILESDIR}/${P}-perldoc-emptydirs.patch
-
-	# this lays the groundwork for solving the issue of what happens
-	# when people (or ebuilds) install different versiosn of modules
-	# that are in the core, by rearranging the @INC directory to look
-	# site -> vendor -> core.
-	cd ${S}; epatch ${FILESDIR}/${P}-reorder-INC.patch
-
-	# 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}/${P}-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}/${P}-noksh.patch
-
-	# uclibc support
-	epatch ${FILESDIR}/perl-5.8.2-uclibc.patch
-
-	# this one only affects sparc64, as best weeve and rac can tell,
-	# but seems sane for all linux.  we don't have to worry about
-	# drifting into obscure SysV non-posix semantics, and the current
-	# code in IO.xs that checks for this sort of thing dies in LDAP on
-	# sparc64.
-
-	epatch ${FILESDIR}/${P}-nonblock.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 uclibc || replace-flags "-Os" "-O2"
-	# This flag makes compiling crash in interesting ways
-	filter-flags -malign-double
-
-	export LC_ALL="C"
-	local myconf=""
-
-	if use ithreads
-	then
-		einfo "using ithreads"
-		mythreading="-multi"
-		myconf="-Dusethreads ${myconf}"
-		myarch="${CHOST%%-*}-linux-thread"
-	else
-		myarch="${CHOST%%-*}-linux"
-	fi
-
-	local inclist=$(for v in $PERL_OLDVERSEN; do echo -n "$v $v/$myarch "; 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 && "$(gcc-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
-
-	sh Configure -des \
-		-Darchname="${myarch}" \
-		-Dcccdlflags='-fPIC' \
-		-Dccdlflags='-rdynamic' \
-		-Dcc="${CC:-gcc}" \
-		-Dprefix='/usr' \
-		-Dvendorprefix='/usr' \
-		-Dsiteprefix='/usr' \
-		-Dlocincpth=' ' \
-		-Doptimize="${CFLAGS}" \
-		-Duselargefiles \
-		-Dd_semctl_semun \
-		-Dscriptdir=/usr/bin \
-		-Dman1dir=/usr/share/man/man1 \
-		-Dman3dir=/usr/share/man/man3 \
-		-Dinstallman1dir=${D}/usr/share/man/man1 \
-		-Dinstallman3dir=${D}/usr/share/man/man3 \
-		-Dman1ext='1' \
-		-Dman3ext='3pm' \
-		-Dinc_version_list="$inclist" \
-		-Dcf_by='Gentoo' \
-		-Ud_csh \
-		${myconf} || die "Unable to configure"
-}
-
-src_compile() {
-
-	# would like to bracket this with a test for the existence of a
-	# dotfile, but can't clean it automatically now.
-
-	src_configure
-
-	emake -j1 || die "Unable to make"
-}
-
-src_test() {
-	use 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 ../../../../${LIBPERL} ${coredir}/${LIBPERL}
-	dosym ../../../../${LIBPERL} ${coredir}/libperl.so.${PERLSLOT}
-	dosym ../../../../${LIBPERL} ${coredir}/libperl.so
-
-	# Fix for "stupid" modules and programs
-	dodir /usr/lib/perl5/site_perl/${PV}/${myarch}${mythreading}
-
-	make DESTDIR="${D}" install || die "Unable to make install"
-
-	# 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}/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch
-
-	LD_LIBRARY_PATH=. ./perl -Ilib utils/h2ph_patched \
-		-a -d ${D}/usr/lib/perl5/${PV}/${myarch}${mythreading} <<EOF
-asm/termios.h
-syscall.h
-syslimits.h
-syslog.h
-sys/ioctl.h
-sys/socket.h
-sys/time.h
-wait.h
-EOF
-
-	# This is to fix a missing c flag for backwards compat
-	for i in `find ${D}/usr/lib/perl5 -iname "Config.pm"`;do
-		sed -e "s:ccflags=':ccflags='-DPERL5 :" \
-		    -e "s:cppflags=':cppflags='-DPERL5 :" \
-			${i} > ${i}.new &&\
-			mv ${i}.new ${i} || die "Sed failed"
-	done
-
-	# A poor fix for the miniperl issues
-	dosed 's:./miniperl:/usr/bin/perl:' /usr/lib/perl5/${PV}/ExtUtils/xsubpp
-	fperms 0444 /usr/lib/perl5/${PV}/ExtUtils/xsubpp
-	dosed 's:./miniperl:/usr/bin/perl:' /usr/bin/xsubpp
-	fperms 0755 /usr/bin/xsubpp
-
-	# 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
-}
-
-pkg_postinst() {
-
-	# Make sure we do not have stale/invalid libperl.so 's ...
-	if [ -f "${ROOT}usr/lib/libperl.so" -a ! -L "${ROOT}usr/lib/libperl.so" ]
-	then
-		mv -f ${ROOT}usr/lib/libperl.so ${ROOT}usr/lib/libperl.so.old
-	fi
-
-	local perllib="`readlink -f ${ROOT}usr/lib/libperl.so | sed -e 's:^.*/::'`"
-
-	# If we are installing perl, we need the /usr/lib/libperl.so symlink to
-	# point to the version of perl we are running, else builing something
-	# against libperl.so will break ...
-	if [ "${perllib}" != "${LIBPERL}" ]
-	then
-		# Delete stale symlinks
-		rm -f ${ROOT}usr/lib/libperl.so
-		rm -f ${ROOT}usr/lib/libperl.so.${PERLSLOT}
-		# Regenerate libperl.so.${PERLSLOT}
-		ln -snf ${LIBPERL} ${ROOT}usr/lib/libperl.so.${PERLSLOT}
-		# Create libperl.so (we use the *soname* versioned lib here ..)
-		ln -snf libperl.so.${PERLSLOT} ${ROOT}usr/lib/libperl.so
-	fi
-
-	if [ "${ROOT}" = "/" ]
-	then
-		ebegin "Converting C header files to the corresponding Perl format"
-		cd /usr/include; h2ph * sys/* arpa/* netinet/* bits/* security/* asm/*
-	fi
-
-	eerror ""
-	eerror "If this is an upgrade to a perl 5.6.1 system,"
-	eerror "~OR~ an upgrade to a previous Gentoo release"
-	eerror "of perl 5.8.0, prior to -r8 "
-	eerror "you may need to recompile applications that"
-	eerror "were emerged against the old libperl.so"
-	eerror ""
-	eerror "${FILESDIR}/libperl_rebuilder "
-	eerror "is provided to assist with this. "
-	eerror "PLEASE DO NOT INTERRUPT THE RUNNING OF THIS SCRIPT."
-	eerror "Part of the rebuilding of applications compiled against "
-	eerror "your old libperl involves temporarily unmerging"
-	eerror "them - interruptions could leave you with unmerged"
-	eerror "packages before they can be remerged."
-	eerror ""
-	eerror "If you have run the rebuilder and a package still gives"
-	eerror "you trouble, and re-emerging it fails to correct"
-	eerror "the problem, please check http://bugs.gentoo.org/"
-	eerror "for more information or to report a bug."
-	eerror ""
-	eerror ""
-}
diff --git a/dev-lang/perl/perl-5.8.5-r2.ebuild b/dev-lang/perl/perl-5.8.5-r2.ebuild
deleted file mode 100644
index 836505804549..000000000000
--- a/dev-lang/perl/perl-5.8.5-r2.ebuild
+++ /dev/null
@@ -1,385 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.5-r2.ebuild,v 1.7 2005/01/16 17:56:50 eradicator Exp $
-
-inherit eutils flag-o-matic gcc
-
-# The slot of this binary compat version of libperl.so
-PERLSLOT="1"
-
-SHORT_PV="${PV%.*}"
-MY_P="perl-${PV/_rc/-RC}"
-DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="ftp://ftp.perl.org/pub/CPAN/src/${MY_P}.tar.gz"
-HOMEPAGE="http://www.perl.org/"
-LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
-
-LICENSE="Artistic GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390 sh"
-IUSE="berkdb debug doc gdbm ithreads perlsuid uclibc"
-PERL_OLDVERSEN="5.8.2 5.8.4"
-
-DEPEND="!uclibc? ( sys-apps/groff )
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.3 )
-	>=sys-apps/portage-2.0.48-r4
-	>=sys-devel/libperl-${PV}
-	!<dev-perl/ExtUtils-MakeMaker-6.17
-	!<dev-perl/File-Spec-0.84-r1
-	!<dev-perl/Test-Simple-0.47-r1"
-RDEPEND=">=sys-devel/libperl-${PV}
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.3 )"
-
-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 ""
-		ewarn "PLEASE NOTE: You are compiling perl-5.8 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. "
-		ewarn ""
-		epause 10
-	else
-		ewarn ""
-		ewarn "PLEASE NOTE: If you want to compile perl-5.8 with"
-		ewarn "threading enabled , you must restart this emerge"
-		ewarn "with USE=ithreads emerge...."
-		ewarn "Threading is not supported by all applications "
-		ewarn "that compile against perl. You use threading at "
-		ewarn "your own discretion. "
-		ewarn ""
-	fi
-
-	if [ ! -f "${ROOT}/usr/lib/${LIBPERL}" ]
-	then
-		# Make sure we have libperl installed ...
-		eerror "Cannot find ${ROOT}/usr/lib/${LIBPERL}!  Make sure that you"
-		eerror "have sys-libs/libperl installed properly ..."
-		die "Cannot find /usr/lib/${LIBPERL}!"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# 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}/${P}-prelink-lpthread.patch
-
-	# Patch perldoc to not abort when it attempts to search
-	# nonexistent directories; fixes bug #16589.
-	# <rac@gentoo.org> (28 Feb 2003)
-
-	cd ${S}; epatch ${FILESDIR}/${P}-perldoc-emptydirs.patch
-
-	# this lays the groundwork for solving the issue of what happens
-	# when people (or ebuilds) install different versiosn of modules
-	# that are in the core, by rearranging the @INC directory to look
-	# site -> vendor -> core.
-	cd ${S}; epatch ${FILESDIR}/${P}-reorder-INC.patch
-
-	# 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}/${P}-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}/${P}-noksh.patch
-
-	# uclibc support
-	epatch ${FILESDIR}/perl-5.8.2-uclibc.patch
-
-	# this one only affects sparc64, as best weeve and rac can tell,
-	# but seems sane for all linux.  we don't have to worry about
-	# drifting into obscure SysV non-posix semantics, and the current
-	# code in IO.xs that checks for this sort of thing dies in LDAP on
-	# sparc64.
-
-	epatch ${FILESDIR}/${P}-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
-}
-
-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 uclibc || replace-flags "-Os" "-O2"
-	# This flag makes compiling crash in interesting ways
-	filter-flags -malign-double
-
-	export LC_ALL="C"
-	local myconf=""
-
-	if use ithreads
-	then
-		einfo "using ithreads"
-		mythreading="-multi"
-		myconf="-Dusethreads ${myconf}"
-		myarch="${CHOST%%-*}-linux-thread"
-	else
-		myarch="${CHOST%%-*}-linux"
-	fi
-
-	local inclist=$(for v in $PERL_OLDVERSEN; do echo -n "$v $v/$myarch "; 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 && "$(gcc-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)"
-
-	sh Configure -des \
-		-Darchname="${myarch}" \
-		-Dcccdlflags='-fPIC' \
-		-Dccdlflags='-rdynamic' \
-		-Dcc="${CC:-gcc}" \
-		-Dprefix='/usr' \
-		-Dvendorprefix='/usr' \
-		-Dsiteprefix='/usr' \
-		-Dlocincpth=' ' \
-		-Doptimize="${CFLAGS}" \
-		-Duselargefiles \
-		-Dd_semctl_semun \
-		-Dscriptdir=/usr/bin \
-		-Dman1dir=/usr/share/man/man1 \
-		-Dman3dir=/usr/share/man/man3 \
-		-Dinstallman1dir=${D}/usr/share/man/man1 \
-		-Dinstallman3dir=${D}/usr/share/man/man3 \
-		-Dman1ext='1' \
-		-Dman3ext='3pm' \
-		-Dinc_version_list="$inclist" \
-		-Dcf_by='Gentoo' \
-		-Ud_csh \
-		${myconf} || die "Unable to configure"
-}
-
-src_compile() {
-
-	# would like to bracket this with a test for the existence of a
-	# dotfile, but can't clean it automatically now.
-
-	src_configure
-
-	emake -j1 || die "Unable to make"
-}
-
-src_test() {
-	use 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 ../../../../${LIBPERL} ${coredir}/${LIBPERL}
-	dosym ../../../../${LIBPERL} ${coredir}/libperl.so.${PERLSLOT}
-	dosym ../../../../${LIBPERL} ${coredir}/libperl.so
-
-	# Fix for "stupid" modules and programs
-	dodir /usr/lib/perl5/site_perl/${PV}/${myarch}${mythreading}
-
-	make DESTDIR="${D}" install || die "Unable to make install"
-
-	# 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}/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch
-
-	LD_LIBRARY_PATH=. ./perl -Ilib utils/h2ph_patched \
-		-a -d ${D}/usr/lib/perl5/${PV}/${myarch}${mythreading} <<EOF
-asm/termios.h
-syscall.h
-syslimits.h
-syslog.h
-sys/ioctl.h
-sys/socket.h
-sys/time.h
-wait.h
-EOF
-
-	# This is to fix a missing c flag for backwards compat
-	for i in `find ${D}/usr/lib/perl5 -iname "Config.pm"`;do
-		sed -e "s:ccflags=':ccflags='-DPERL5 :" \
-		    -e "s:cppflags=':cppflags='-DPERL5 :" \
-			${i} > ${i}.new &&\
-			mv ${i}.new ${i} || die "Sed failed"
-	done
-
-	# A poor fix for the miniperl issues
-	dosed 's:./miniperl:/usr/bin/perl:' /usr/lib/perl5/${PV}/ExtUtils/xsubpp
-	fperms 0444 /usr/lib/perl5/${PV}/ExtUtils/xsubpp
-	dosed 's:./miniperl:/usr/bin/perl:' /usr/bin/xsubpp
-	fperms 0755 /usr/bin/xsubpp
-
-	# 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
-}
-
-pkg_postinst() {
-
-	# Make sure we do not have stale/invalid libperl.so 's ...
-	if [ -f "${ROOT}usr/lib/libperl.so" -a ! -L "${ROOT}usr/lib/libperl.so" ]
-	then
-		mv -f ${ROOT}usr/lib/libperl.so ${ROOT}usr/lib/libperl.so.old
-	fi
-
-	local perllib="`readlink -f ${ROOT}usr/lib/libperl.so | sed -e 's:^.*/::'`"
-
-	# If we are installing perl, we need the /usr/lib/libperl.so symlink to
-	# point to the version of perl we are running, else builing something
-	# against libperl.so will break ...
-	if [ "${perllib}" != "${LIBPERL}" ]
-	then
-		# Delete stale symlinks
-		rm -f ${ROOT}usr/lib/libperl.so
-		rm -f ${ROOT}usr/lib/libperl.so.${PERLSLOT}
-		# Regenerate libperl.so.${PERLSLOT}
-		ln -snf ${LIBPERL} ${ROOT}usr/lib/libperl.so.${PERLSLOT}
-		# Create libperl.so (we use the *soname* versioned lib here ..)
-		ln -snf libperl.so.${PERLSLOT} ${ROOT}usr/lib/libperl.so
-	fi
-
-	if [ "${ROOT}" = "/" ]
-	then
-		ebegin "Converting C header files to the corresponding Perl format"
-		cd /usr/include; h2ph * sys/* arpa/* netinet/* bits/* security/* asm/*
-	fi
-
-	eerror ""
-	eerror "If this is an upgrade to a perl 5.6.1 system,"
-	eerror "~OR~ an upgrade to a previous Gentoo release"
-	eerror "of perl 5.8.0, prior to -r8 "
-	eerror "you may need to recompile applications that"
-	eerror "were emerged against the old libperl.so"
-	eerror ""
-	eerror "${FILESDIR}/libperl_rebuilder "
-	eerror "is provided to assist with this. "
-	eerror "PLEASE DO NOT INTERRUPT THE RUNNING OF THIS SCRIPT."
-	eerror "Part of the rebuilding of applications compiled against "
-	eerror "your old libperl involves temporarily unmerging"
-	eerror "them - interruptions could leave you with unmerged"
-	eerror "packages before they can be remerged."
-	eerror ""
-	eerror "If you have run the rebuilder and a package still gives"
-	eerror "you trouble, and re-emerging it fails to correct"
-	eerror "the problem, please check http://bugs.gentoo.org/"
-	eerror "for more information or to report a bug."
-	eerror ""
-	eerror ""
-}
diff --git a/dev-lang/perl/perl-5.8.5.ebuild b/dev-lang/perl/perl-5.8.5.ebuild
deleted file mode 100644
index d2845d288ca1..000000000000
--- a/dev-lang/perl/perl-5.8.5.ebuild
+++ /dev/null
@@ -1,379 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.5.ebuild,v 1.12 2005/01/16 17:56:50 eradicator Exp $
-
-inherit eutils flag-o-matic gcc
-
-# The slot of this binary compat version of libperl.so
-PERLSLOT="1"
-
-SHORT_PV="${PV%.*}"
-MY_P="perl-${PV/_rc/-RC}"
-DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="ftp://ftp.perl.org/pub/CPAN/src/${MY_P}.tar.gz"
-HOMEPAGE="http://www.perl.org/"
-LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
-
-LICENSE="Artistic GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390 ~sh"
-IUSE="berkdb debug doc gdbm ithreads perlsuid uclibc"
-
-DEPEND="!uclibc? ( sys-apps/groff )
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.3 )
-	>=sys-apps/portage-2.0.48-r4
-	>=sys-devel/libperl-${PV}
-	!<dev-perl/ExtUtils-MakeMaker-6.17
-	!<dev-perl/File-Spec-0.84-r1
-	!<dev-perl/Test-Simple-0.47-r1"
-RDEPEND=">=sys-devel/libperl-${PV}
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.3 )"
-
-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 ""
-		ewarn "PLEASE NOTE: You are compiling perl-5.8 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. "
-		ewarn ""
-		epause 10
-	else
-		ewarn ""
-		ewarn "PLEASE NOTE: If you want to compile perl-5.8 with"
-		ewarn "threading enabled , you must restart this emerge"
-		ewarn "with USE=ithreads emerge...."
-		ewarn "Threading is not supported by all applications "
-		ewarn "that compile against perl. You use threading at "
-		ewarn "your own discretion. "
-		ewarn ""
-	fi
-
-	if [ ! -f "${ROOT}/usr/lib/${LIBPERL}" ]
-	then
-		# Make sure we have libperl installed ...
-		eerror "Cannot find ${ROOT}/usr/lib/${LIBPERL}!  Make sure that you"
-		eerror "have sys-libs/libperl installed properly ..."
-		die "Cannot find /usr/lib/${LIBPERL}!"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# 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}/${P}-prelink-lpthread.patch
-
-	# Patch perldoc to not abort when it attempts to search
-	# nonexistent directories; fixes bug #16589.
-	# <rac@gentoo.org> (28 Feb 2003)
-
-	cd ${S}; epatch ${FILESDIR}/${P}-perldoc-emptydirs.patch
-
-	# this lays the groundwork for solving the issue of what happens
-	# when people (or ebuilds) install different versiosn of modules
-	# that are in the core, by rearranging the @INC directory to look
-	# site -> vendor -> core.
-	cd ${S}; epatch ${FILESDIR}/${P}-reorder-INC.patch
-
-	# 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}/${P}-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}/${P}-noksh.patch
-
-	# uclibc support
-	epatch ${FILESDIR}/perl-5.8.2-uclibc.patch
-
-	# this one only affects sparc64, as best weeve and rac can tell,
-	# but seems sane for all linux.  we don't have to worry about
-	# drifting into obscure SysV non-posix semantics, and the current
-	# code in IO.xs that checks for this sort of thing dies in LDAP on
-	# sparc64.
-
-	epatch ${FILESDIR}/${P}-nonblock.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 uclibc || replace-flags "-Os" "-O2"
-	# This flag makes compiling crash in interesting ways
-	filter-flags -malign-double
-
-	export LC_ALL="C"
-	local myconf=""
-
-	if use ithreads
-	then
-		einfo "using ithreads"
-		mythreading="-multi"
-		myconf="-Dusethreads ${myconf}"
-		myarch="${CHOST%%-*}-linux-thread"
-	else
-		myarch="${CHOST%%-*}-linux"
-	fi
-
-	# 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 && "$(gcc-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
-
-	sh Configure -des \
-		-Darchname="${myarch}" \
-		-Dcccdlflags='-fPIC' \
-		-Dccdlflags='-rdynamic' \
-		-Dcc="${CC:-gcc}" \
-		-Dprefix='/usr' \
-		-Dvendorprefix='/usr' \
-		-Dsiteprefix='/usr' \
-		-Dlocincpth=' ' \
-		-Doptimize="${CFLAGS}" \
-		-Duselargefiles \
-		-Dd_semctl_semun \
-		-Dscriptdir=/usr/bin \
-		-Dman1dir=/usr/share/man/man1 \
-		-Dman3dir=/usr/share/man/man3 \
-		-Dinstallman1dir=${D}/usr/share/man/man1 \
-		-Dinstallman3dir=${D}/usr/share/man/man3 \
-		-Dman1ext='1' \
-		-Dman3ext='3pm' \
-		-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"
-
-	# i want people to have to take actions to disable tests, because
-	# they reveal lots of important problems in clear ways.  if that
-	# happens, you can revisit this, but portage .51 will call
-	# src_test if FEATURES=maketest is enabled, and we'll call it here
-	# if it isn't.
-
-	if ! hasq maketest $FEATURES; then
-		src_test
-	fi
-}
-
-src_test() {
-	use 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 ../../../../${LIBPERL} ${coredir}/${LIBPERL}
-	dosym ../../../../${LIBPERL} ${coredir}/libperl.so.${PERLSLOT}
-	dosym ../../../../${LIBPERL} ${coredir}/libperl.so
-
-	# Fix for "stupid" modules and programs
-	dodir /usr/lib/perl5/site_perl/${PV}/${myarch}${mythreading}
-
-	make DESTDIR="${D}" install || die "Unable to make install"
-
-	# 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}/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch
-
-	LD_LIBRARY_PATH=. ./perl -Ilib utils/h2ph_patched \
-		-a -d ${D}/usr/lib/perl5/${PV}/${myarch}${mythreading} <<EOF
-asm/termios.h
-syscall.h
-syslimits.h
-syslog.h
-sys/ioctl.h
-sys/socket.h
-sys/time.h
-wait.h
-EOF
-
-	# This is to fix a missing c flag for backwards compat
-	for i in `find ${D}/usr/lib/perl5 -iname "Config.pm"`;do
-		sed -e "s:ccflags=':ccflags='-DPERL5 :" \
-		    -e "s:cppflags=':cppflags='-DPERL5 :" \
-			${i} > ${i}.new &&\
-			mv ${i}.new ${i} || die "Sed failed"
-	done
-
-	# A poor fix for the miniperl issues
-	dosed 's:./miniperl:/usr/bin/perl:' /usr/lib/perl5/${PV}/ExtUtils/xsubpp
-	fperms 0444 /usr/lib/perl5/${PV}/ExtUtils/xsubpp
-	dosed 's:./miniperl:/usr/bin/perl:' /usr/bin/xsubpp
-	fperms 0755 /usr/bin/xsubpp
-
-	# 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
-}
-
-pkg_postinst() {
-
-	# Make sure we do not have stale/invalid libperl.so 's ...
-	if [ -f "${ROOT}usr/lib/libperl.so" -a ! -L "${ROOT}usr/lib/libperl.so" ]
-	then
-		mv -f ${ROOT}usr/lib/libperl.so ${ROOT}usr/lib/libperl.so.old
-	fi
-
-	local perllib="`readlink -f ${ROOT}usr/lib/libperl.so | sed -e 's:^.*/::'`"
-
-	# If we are installing perl, we need the /usr/lib/libperl.so symlink to
-	# point to the version of perl we are running, else builing something
-	# against libperl.so will break ...
-	if [ "${perllib}" != "${LIBPERL}" ]
-	then
-		# Delete stale symlinks
-		rm -f ${ROOT}usr/lib/libperl.so
-		rm -f ${ROOT}usr/lib/libperl.so.${PERLSLOT}
-		# Regenerate libperl.so.${PERLSLOT}
-		ln -snf ${LIBPERL} ${ROOT}usr/lib/libperl.so.${PERLSLOT}
-		# Create libperl.so (we use the *soname* versioned lib here ..)
-		ln -snf libperl.so.${PERLSLOT} ${ROOT}usr/lib/libperl.so
-	fi
-
-	if [ "${ROOT}" = "/" ]
-	then
-		ebegin "Converting C header files to the corresponding Perl format"
-		cd /usr/include; h2ph * sys/* arpa/* netinet/* bits/* security/* asm/*
-	fi
-
-	eerror ""
-	eerror "If this is an upgrade to a perl 5.6.1 system,"
-	eerror "~OR~ an upgrade to a previous Gentoo release"
-	eerror "of perl 5.8.0, prior to -r8 "
-	eerror "you may need to recompile applications that"
-	eerror "were emerged against the old libperl.so"
-	eerror ""
-	eerror "${FILESDIR}/libperl_rebuilder "
-	eerror "is provided to assist with this. "
-	eerror "PLEASE DO NOT INTERRUPT THE RUNNING OF THIS SCRIPT."
-	eerror "Part of the rebuilding of applications compiled against "
-	eerror "your old libperl involves temporarily unmerging"
-	eerror "them - interruptions could leave you with unmerged"
-	eerror "packages before they can be remerged."
-	eerror ""
-	eerror "If you have run the rebuilder and a package still gives"
-	eerror "you trouble, and re-emerging it fails to correct"
-	eerror "the problem, please check http://bugs.gentoo.org/"
-	eerror "for more information or to report a bug."
-	eerror ""
-	eerror ""
-}
diff --git a/dev-lang/perl/perl-5.8.6-r1.ebuild b/dev-lang/perl/perl-5.8.6-r1.ebuild
deleted file mode 100644
index 79548d574da4..000000000000
--- a/dev-lang/perl/perl-5.8.6-r1.ebuild
+++ /dev/null
@@ -1,385 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.6-r1.ebuild,v 1.2 2005/01/16 17:56:50 eradicator Exp $
-
-inherit eutils flag-o-matic gcc
-
-# The slot of this binary compat version of libperl.so
-PERLSLOT="1"
-
-SHORT_PV="${PV%.*}"
-MY_P="perl-${PV/_rc/-RC}"
-DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="ftp://ftp.perl.org/pub/CPAN/src/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.perl.org/"
-LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
-
-LICENSE="Artistic GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390 ~sh"
-IUSE="berkdb debug doc gdbm ithreads perlsuid uclibc"
-PERL_OLDVERSEN="5.8.2 5.8.4 5.8.5"
-
-DEPEND="!uclibc? ( sys-apps/groff )
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.3 )
-	>=sys-apps/portage-2.0.48-r4
-	>=sys-devel/libperl-${PV}
-	!<dev-perl/ExtUtils-MakeMaker-6.17
-	!<dev-perl/File-Spec-0.87
-	!<dev-perl/Test-Simple-0.47-r1"
-RDEPEND=">=sys-devel/libperl-${PV}
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.3 )"
-
-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 ""
-		ewarn "PLEASE NOTE: You are compiling perl-5.8 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. "
-		ewarn ""
-		epause 10
-	else
-		ewarn ""
-		ewarn "PLEASE NOTE: If you want to compile perl-5.8 with"
-		ewarn "threading enabled , you must restart this emerge"
-		ewarn "with USE=ithreads emerge...."
-		ewarn "Threading is not supported by all applications "
-		ewarn "that compile against perl. You use threading at "
-		ewarn "your own discretion. "
-		ewarn ""
-	fi
-
-	if [ ! -f "${ROOT}/usr/lib/${LIBPERL}" ]
-	then
-		# Make sure we have libperl installed ...
-		eerror "Cannot find ${ROOT}/usr/lib/${LIBPERL}!  Make sure that you"
-		eerror "have sys-libs/libperl installed properly ..."
-		die "Cannot find /usr/lib/${LIBPERL}!"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# 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}/${P}-prelink-lpthread.patch
-
-	# Patch perldoc to not abort when it attempts to search
-	# nonexistent directories; fixes bug #16589.
-	# <rac@gentoo.org> (28 Feb 2003)
-
-	cd ${S}; epatch ${FILESDIR}/${P}-perldoc-emptydirs.patch
-
-	# this lays the groundwork for solving the issue of what happens
-	# when people (or ebuilds) install different versiosn of modules
-	# that are in the core, by rearranging the @INC directory to look
-	# site -> vendor -> core.
-	cd ${S}; epatch ${FILESDIR}/${P}-reorder-INC.patch
-
-	# 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}/${P}-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}/${P}-noksh.patch
-
-	# uclibc support
-	epatch ${FILESDIR}/perl-5.8.2-uclibc.patch
-
-	# this one only affects sparc64, as best weeve and rac can tell,
-	# but seems sane for all linux.  we don't have to worry about
-	# drifting into obscure SysV non-posix semantics, and the current
-	# code in IO.xs that checks for this sort of thing dies in LDAP on
-	# sparc64.
-
-	#epatch ${FILESDIR}/${P}-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
-}
-
-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 uclibc || replace-flags "-Os" "-O2"
-	# This flag makes compiling crash in interesting ways
-	filter-flags -malign-double
-
-	export LC_ALL="C"
-	local myconf=""
-
-	if use ithreads
-	then
-		einfo "using ithreads"
-		mythreading="-multi"
-		myconf="-Dusethreads ${myconf}"
-		myarch="${CHOST%%-*}-linux-thread"
-	else
-		myarch="${CHOST%%-*}-linux"
-	fi
-
-	local inclist=$(for v in $PERL_OLDVERSEN; do echo -n "$v $v/$myarch "; 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 && "$(gcc-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)"
-
-	sh Configure -des \
-		-Darchname="${myarch}" \
-		-Dcccdlflags='-fPIC' \
-		-Dccdlflags='-rdynamic' \
-		-Dcc="${CC:-gcc}" \
-		-Dprefix='/usr' \
-		-Dvendorprefix='/usr' \
-		-Dsiteprefix='/usr' \
-		-Dlocincpth=' ' \
-		-Doptimize="${CFLAGS}" \
-		-Duselargefiles \
-		-Dd_semctl_semun \
-		-Dscriptdir=/usr/bin \
-		-Dman1dir=/usr/share/man/man1 \
-		-Dman3dir=/usr/share/man/man3 \
-		-Dinstallman1dir=${D}/usr/share/man/man1 \
-		-Dinstallman3dir=${D}/usr/share/man/man3 \
-		-Dman1ext='1' \
-		-Dman3ext='3pm' \
-		-Dinc_version_list="$inclist" \
-		-Dcf_by='Gentoo' \
-		-Ud_csh \
-		${myconf} || die "Unable to configure"
-}
-
-src_compile() {
-
-	# would like to bracket this with a test for the existence of a
-	# dotfile, but can't clean it automatically now.
-
-	src_configure
-
-	emake -j1 || die "Unable to make"
-}
-
-src_test() {
-	use 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 ../../../../${LIBPERL} ${coredir}/${LIBPERL}
-	dosym ../../../../${LIBPERL} ${coredir}/libperl.so.${PERLSLOT}
-	dosym ../../../../${LIBPERL} ${coredir}/libperl.so
-
-	# Fix for "stupid" modules and programs
-	dodir /usr/lib/perl5/site_perl/${PV}/${myarch}${mythreading}
-
-	make DESTDIR="${D}" install || die "Unable to make install"
-
-	# 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}/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch
-
-	LD_LIBRARY_PATH=. ./perl -Ilib utils/h2ph_patched \
-		-a -d ${D}/usr/lib/perl5/${PV}/${myarch}${mythreading} <<EOF
-asm/termios.h
-syscall.h
-syslimits.h
-syslog.h
-sys/ioctl.h
-sys/socket.h
-sys/time.h
-wait.h
-EOF
-
-	# This is to fix a missing c flag for backwards compat
-	for i in `find ${D}/usr/lib/perl5 -iname "Config.pm"`;do
-		sed -e "s:ccflags=':ccflags='-DPERL5 :" \
-		    -e "s:cppflags=':cppflags='-DPERL5 :" \
-			${i} > ${i}.new &&\
-			mv ${i}.new ${i} || die "Sed failed"
-	done
-
-	# A poor fix for the miniperl issues
-	dosed 's:./miniperl:/usr/bin/perl:' /usr/lib/perl5/${PV}/ExtUtils/xsubpp
-	fperms 0444 /usr/lib/perl5/${PV}/ExtUtils/xsubpp
-	dosed 's:./miniperl:/usr/bin/perl:' /usr/bin/xsubpp
-	fperms 0755 /usr/bin/xsubpp
-
-	# 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
-}
-
-pkg_postinst() {
-
-	# Make sure we do not have stale/invalid libperl.so 's ...
-	if [ -f "${ROOT}usr/lib/libperl.so" -a ! -L "${ROOT}usr/lib/libperl.so" ]
-	then
-		mv -f ${ROOT}usr/lib/libperl.so ${ROOT}usr/lib/libperl.so.old
-	fi
-
-	local perllib="`readlink -f ${ROOT}usr/lib/libperl.so | sed -e 's:^.*/::'`"
-
-	# If we are installing perl, we need the /usr/lib/libperl.so symlink to
-	# point to the version of perl we are running, else builing something
-	# against libperl.so will break ...
-	if [ "${perllib}" != "${LIBPERL}" ]
-	then
-		# Delete stale symlinks
-		rm -f ${ROOT}usr/lib/libperl.so
-		rm -f ${ROOT}usr/lib/libperl.so.${PERLSLOT}
-		# Regenerate libperl.so.${PERLSLOT}
-		ln -snf ${LIBPERL} ${ROOT}usr/lib/libperl.so.${PERLSLOT}
-		# Create libperl.so (we use the *soname* versioned lib here ..)
-		ln -snf libperl.so.${PERLSLOT} ${ROOT}usr/lib/libperl.so
-	fi
-
-	if [ "${ROOT}" = "/" ]
-	then
-		ebegin "Converting C header files to the corresponding Perl format"
-		cd /usr/include; h2ph * sys/* arpa/* netinet/* bits/* security/* asm/*
-	fi
-
-	eerror ""
-	eerror "If this is an upgrade to a perl 5.6.1 system,"
-	eerror "~OR~ an upgrade to a previous Gentoo release"
-	eerror "of perl 5.8.0, prior to -r8 "
-	eerror "you may need to recompile applications that"
-	eerror "were emerged against the old libperl.so"
-	eerror ""
-	eerror "${FILESDIR}/libperl_rebuilder "
-	eerror "is provided to assist with this. "
-	eerror "PLEASE DO NOT INTERRUPT THE RUNNING OF THIS SCRIPT."
-	eerror "Part of the rebuilding of applications compiled against "
-	eerror "your old libperl involves temporarily unmerging"
-	eerror "them - interruptions could leave you with unmerged"
-	eerror "packages before they can be remerged."
-	eerror ""
-	eerror "If you have run the rebuilder and a package still gives"
-	eerror "you trouble, and re-emerging it fails to correct"
-	eerror "the problem, please check http://bugs.gentoo.org/"
-	eerror "for more information or to report a bug."
-	eerror ""
-	eerror ""
-}
diff --git a/dev-lang/perl/perl-5.8.6.ebuild b/dev-lang/perl/perl-5.8.6.ebuild
deleted file mode 100644
index 580e5141a05f..000000000000
--- a/dev-lang/perl/perl-5.8.6.ebuild
+++ /dev/null
@@ -1,376 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.6.ebuild,v 1.3 2005/01/16 17:56:50 eradicator Exp $
-
-inherit eutils flag-o-matic gcc
-
-# The slot of this binary compat version of libperl.so
-PERLSLOT="1"
-
-SHORT_PV="${PV%.*}"
-MY_P="perl-${PV/_rc/-RC}"
-DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="ftp://ftp.perl.org/pub/CPAN/src/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.perl.org/"
-LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
-
-LICENSE="Artistic GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390 ~sh"
-IUSE="berkdb debug doc gdbm ithreads perlsuid uclibc"
-PERL_OLDVERSEN="5.8.2 5.8.4 5.8.5"
-
-DEPEND="!uclibc? ( sys-apps/groff )
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.3 )
-	>=sys-apps/portage-2.0.48-r4
-	>=sys-devel/libperl-${PV}
-	!<dev-perl/ExtUtils-MakeMaker-6.17
-	!<dev-perl/File-Spec-0.87
-	!<dev-perl/Test-Simple-0.47-r1"
-RDEPEND=">=sys-devel/libperl-${PV}
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.3 )"
-
-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 ""
-		ewarn "PLEASE NOTE: You are compiling perl-5.8 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. "
-		ewarn ""
-		epause 10
-	else
-		ewarn ""
-		ewarn "PLEASE NOTE: If you want to compile perl-5.8 with"
-		ewarn "threading enabled , you must restart this emerge"
-		ewarn "with USE=ithreads emerge...."
-		ewarn "Threading is not supported by all applications "
-		ewarn "that compile against perl. You use threading at "
-		ewarn "your own discretion. "
-		ewarn ""
-	fi
-
-	if [ ! -f "${ROOT}/usr/lib/${LIBPERL}" ]
-	then
-		# Make sure we have libperl installed ...
-		eerror "Cannot find ${ROOT}/usr/lib/${LIBPERL}!  Make sure that you"
-		eerror "have sys-libs/libperl installed properly ..."
-		die "Cannot find /usr/lib/${LIBPERL}!"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# 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}/${P}-prelink-lpthread.patch
-
-	# Patch perldoc to not abort when it attempts to search
-	# nonexistent directories; fixes bug #16589.
-	# <rac@gentoo.org> (28 Feb 2003)
-
-	cd ${S}; epatch ${FILESDIR}/${P}-perldoc-emptydirs.patch
-
-	# this lays the groundwork for solving the issue of what happens
-	# when people (or ebuilds) install different versiosn of modules
-	# that are in the core, by rearranging the @INC directory to look
-	# site -> vendor -> core.
-	cd ${S}; epatch ${FILESDIR}/${P}-reorder-INC.patch
-
-	# 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}/${P}-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}/${P}-noksh.patch
-
-	# uclibc support
-	epatch ${FILESDIR}/perl-5.8.2-uclibc.patch
-
-	# this one only affects sparc64, as best weeve and rac can tell,
-	# but seems sane for all linux.  we don't have to worry about
-	# drifting into obscure SysV non-posix semantics, and the current
-	# code in IO.xs that checks for this sort of thing dies in LDAP on
-	# sparc64.
-
-	#epatch ${FILESDIR}/${P}-nonblock.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 uclibc || replace-flags "-Os" "-O2"
-	# This flag makes compiling crash in interesting ways
-	filter-flags -malign-double
-
-	export LC_ALL="C"
-	local myconf=""
-
-	if use ithreads
-	then
-		einfo "using ithreads"
-		mythreading="-multi"
-		myconf="-Dusethreads ${myconf}"
-		myarch="${CHOST%%-*}-linux-thread"
-	else
-		myarch="${CHOST%%-*}-linux"
-	fi
-
-	local inclist=$(for v in $PERL_OLDVERSEN; do echo -n "$v $v/$myarch "; 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 && "$(gcc-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)"
-
-	sh Configure -des \
-		-Darchname="${myarch}" \
-		-Dcccdlflags='-fPIC' \
-		-Dccdlflags='-rdynamic' \
-		-Dcc="${CC:-gcc}" \
-		-Dprefix='/usr' \
-		-Dvendorprefix='/usr' \
-		-Dsiteprefix='/usr' \
-		-Dlocincpth=' ' \
-		-Doptimize="${CFLAGS}" \
-		-Duselargefiles \
-		-Dd_semctl_semun \
-		-Dscriptdir=/usr/bin \
-		-Dman1dir=/usr/share/man/man1 \
-		-Dman3dir=/usr/share/man/man3 \
-		-Dinstallman1dir=${D}/usr/share/man/man1 \
-		-Dinstallman3dir=${D}/usr/share/man/man3 \
-		-Dman1ext='1' \
-		-Dman3ext='3pm' \
-		-Dinc_version_list="$inclist" \
-		-Dcf_by='Gentoo' \
-		-Ud_csh \
-		${myconf} || die "Unable to configure"
-}
-
-src_compile() {
-
-	# would like to bracket this with a test for the existence of a
-	# dotfile, but can't clean it automatically now.
-
-	src_configure
-
-	emake -j1 || die "Unable to make"
-}
-
-src_test() {
-	use 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 ../../../../${LIBPERL} ${coredir}/${LIBPERL}
-	dosym ../../../../${LIBPERL} ${coredir}/libperl.so.${PERLSLOT}
-	dosym ../../../../${LIBPERL} ${coredir}/libperl.so
-
-	# Fix for "stupid" modules and programs
-	dodir /usr/lib/perl5/site_perl/${PV}/${myarch}${mythreading}
-
-	make DESTDIR="${D}" install || die "Unable to make install"
-
-	# 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}/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch
-
-	LD_LIBRARY_PATH=. ./perl -Ilib utils/h2ph_patched \
-		-a -d ${D}/usr/lib/perl5/${PV}/${myarch}${mythreading} <<EOF
-asm/termios.h
-syscall.h
-syslimits.h
-syslog.h
-sys/ioctl.h
-sys/socket.h
-sys/time.h
-wait.h
-EOF
-
-	# This is to fix a missing c flag for backwards compat
-	for i in `find ${D}/usr/lib/perl5 -iname "Config.pm"`;do
-		sed -e "s:ccflags=':ccflags='-DPERL5 :" \
-		    -e "s:cppflags=':cppflags='-DPERL5 :" \
-			${i} > ${i}.new &&\
-			mv ${i}.new ${i} || die "Sed failed"
-	done
-
-	# A poor fix for the miniperl issues
-	dosed 's:./miniperl:/usr/bin/perl:' /usr/lib/perl5/${PV}/ExtUtils/xsubpp
-	fperms 0444 /usr/lib/perl5/${PV}/ExtUtils/xsubpp
-	dosed 's:./miniperl:/usr/bin/perl:' /usr/bin/xsubpp
-	fperms 0755 /usr/bin/xsubpp
-
-	# 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
-}
-
-pkg_postinst() {
-
-	# Make sure we do not have stale/invalid libperl.so 's ...
-	if [ -f "${ROOT}usr/lib/libperl.so" -a ! -L "${ROOT}usr/lib/libperl.so" ]
-	then
-		mv -f ${ROOT}usr/lib/libperl.so ${ROOT}usr/lib/libperl.so.old
-	fi
-
-	local perllib="`readlink -f ${ROOT}usr/lib/libperl.so | sed -e 's:^.*/::'`"
-
-	# If we are installing perl, we need the /usr/lib/libperl.so symlink to
-	# point to the version of perl we are running, else builing something
-	# against libperl.so will break ...
-	if [ "${perllib}" != "${LIBPERL}" ]
-	then
-		# Delete stale symlinks
-		rm -f ${ROOT}usr/lib/libperl.so
-		rm -f ${ROOT}usr/lib/libperl.so.${PERLSLOT}
-		# Regenerate libperl.so.${PERLSLOT}
-		ln -snf ${LIBPERL} ${ROOT}usr/lib/libperl.so.${PERLSLOT}
-		# Create libperl.so (we use the *soname* versioned lib here ..)
-		ln -snf libperl.so.${PERLSLOT} ${ROOT}usr/lib/libperl.so
-	fi
-
-	if [ "${ROOT}" = "/" ]
-	then
-		ebegin "Converting C header files to the corresponding Perl format"
-		cd /usr/include; h2ph * sys/* arpa/* netinet/* bits/* security/* asm/*
-	fi
-
-	eerror ""
-	eerror "If this is an upgrade to a perl 5.6.1 system,"
-	eerror "~OR~ an upgrade to a previous Gentoo release"
-	eerror "of perl 5.8.0, prior to -r8 "
-	eerror "you may need to recompile applications that"
-	eerror "were emerged against the old libperl.so"
-	eerror ""
-	eerror "${FILESDIR}/libperl_rebuilder "
-	eerror "is provided to assist with this. "
-	eerror "PLEASE DO NOT INTERRUPT THE RUNNING OF THIS SCRIPT."
-	eerror "Part of the rebuilding of applications compiled against "
-	eerror "your old libperl involves temporarily unmerging"
-	eerror "them - interruptions could leave you with unmerged"
-	eerror "packages before they can be remerged."
-	eerror ""
-	eerror "If you have run the rebuilder and a package still gives"
-	eerror "you trouble, and re-emerging it fails to correct"
-	eerror "the problem, please check http://bugs.gentoo.org/"
-	eerror "for more information or to report a bug."
-	eerror ""
-	eerror ""
-}