clean house, readd prelink pthread

13 files changed, 33 insertions, 1373 deletions

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index 562c3fe12dc2..f0385cfe6666 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/perl
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.38 2003/09/29 22:19:04 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.39 2003/10/02 21:18:08 rac Exp $
+
+*perl-5.8.1-r2 (02 Oct 2003)
+
+  02 Oct 2003; <rac@gentoo.org> perl-5.8.1-r2.ebuild, perl-5.8.1.ebuild,
+  perl-5.8.1_rc1.ebuild, perl-5.8.1_rc2.ebuild, perl-5.8.1_rc3.ebuild,
+  perl-5.8.1_rc4.ebuild, files/perl-5.8.1-prelink-lpthread.patch:
+  Clean house, readd pthread prelink patch to avoid reported sdl segfaulting.
+  Thanks to lisa for the report.
 
 *perl-5.8.1-r1 (29 Sep 2003)
 
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index c23977f7d338..801631e51167 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,17 +1,13 @@
 MD5 5e2ced5e0d331faea9122a21c49957b0 perl-5.6.1-r12.ebuild 7089
-MD5 d45968fa52ba2a4b1fd3b54d0be0f9a9 perl-5.8.1_rc1.ebuild 10455
 MD5 d26bc7eb5e1baa52c15368a7d80d6cc9 perl-5.8.1-r1.ebuild 8698
 MD5 51da78b2203cbf4e81dafb6e24dd2e22 perl-5.8.0-r10.ebuild 14009
 MD5 907c3574f85470b1f2148180f7321f20 perl-5.8.0-r9.ebuild 13534
-MD5 69e9d22842c4ef144b83b1efc487949b perl-5.8.1_rc3.ebuild 10458
-MD5 7eff7397793b17d81d6681e4532152e6 perl-5.8.1.ebuild 9750
 MD5 220bd838139aaf17ec8f8f6cc1a37c61 perl-5.8.0-r12.ebuild 10316
 MD5 33226bb561cd0f81cc4f7756c0f7f4c5 perl-5.6.1-r11.ebuild 6141
-MD5 aa2447b410ec708d954d6049da67e5fa perl-5.8.1_rc2.ebuild 10458
-MD5 6d5b53cdb8bb0474218b696fde92cb60 ChangeLog 19150
+MD5 863b06cc6152eca909af4ffa51169d5f perl-5.8.1-r2.ebuild 8985
+MD5 8414f5fcf5d9470acc74d05b6a277619 ChangeLog 19502
 MD5 31f5ae7d2343aa4819b892820b0ccaf7 perl-5.8.0-r11.ebuild 9890
 MD5 0339818063f904e5a6ebe6b16b4d819f perl-5.6.1-r10.ebuild 6666
-MD5 14cea63702f7654ee5ea0ab212a23004 perl-5.8.1_rc4.ebuild 10458
 MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.1_rc2-reorder-INC.patch 2211
 MD5 060e9f10466fdc1268c75a7cf4dcbc7c files/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch 446
 MD5 0a2e349a2e2fa8c18192d5e908f8533f files/perl-5.8.1_rc2-sockatmark-should-__THROW.patch 379
@@ -24,19 +20,16 @@ MD5 b8480b2ccbf7d5a7fe543b9e6f8dbc14 files/libperl_rebuilder 10260
 MD5 ea9bf02b28e73e19dc85eb07f2347460 files/5.6.1-builtin-fixup.diff 777
 MD5 0a2e349a2e2fa8c18192d5e908f8533f files/perl-5.8.1_rc1-sockatmark-should-__THROW.patch 379
 MD5 013255dc6a00399b13caaf899a72e8db files/perl-5.8.0-reorder-INC.patch 2292
-MD5 3ec3358c13c85372c9a668f361d1f244 files/digest-perl-5.8.1 64
 MD5 8605f033c451df987f4631bbf9d7b481 files/digest-perl-5.8.0-r10 64
 MD5 5c83a2e6f630182b708d39c7de034075 files/digest-perl-5.8.0-r11 188
 MD5 5c83a2e6f630182b708d39c7de034075 files/digest-perl-5.8.0-r12 188
-MD5 ac9dfab35984723656c734b7312bf403 files/digest-perl-5.8.1_rc1 65
-MD5 4f40eefa1f841e15d6aad9b6e005b4f5 files/digest-perl-5.8.1_rc2 68
-MD5 db6a67eaf2ca2718e246175b302792c3 files/digest-perl-5.8.1_rc3 68
-MD5 90002fb6fca19736b002d7e14282b41f files/digest-perl-5.8.1_rc4 68
 MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.1_rc1-reorder-INC.patch 2211
+MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.1-prelink-lpthread.patch 476
 MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.0-prelink-lpthread.patch 476
 MD5 803b7c028f59008ea1e6d577e5c0bab0 files/stat.t 8884
 MD5 cc61dca6d96347b5d93cfdde1514feb4 files/digest-perl-5.8.0-r9 860
 MD5 3ec3358c13c85372c9a668f361d1f244 files/digest-perl-5.8.1-r1 64
+MD5 3ec3358c13c85372c9a668f361d1f244 files/digest-perl-5.8.1-r2 64
 MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.1-reorder-INC.patch 2211
 MD5 393b3dff879c892d461901183d3b0055 files/perl-5.8.0-sockatmark-should-__THROW.patch 402
 MD5 d2af75f06a64c5934db314ff38939cdd files/libperl-5.8.0-create-libperl-soname.patch 424
diff --git a/dev-lang/perl/files/digest-perl-5.8.1 b/dev-lang/perl/files/digest-perl-5.8.1-r2
index d6b20a4562d1..d6b20a4562d1 100644
--- a/dev-lang/perl/files/digest-perl-5.8.1
+++ b/dev-lang/perl/files/digest-perl-5.8.1-r2
diff --git a/dev-lang/perl/files/digest-perl-5.8.1_rc1 b/dev-lang/perl/files/digest-perl-5.8.1_rc1
deleted file mode 100644
index 42ba63bbdfcf..000000000000
--- a/dev-lang/perl/files/digest-perl-5.8.1_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7bab1b831161575f134a67b7789d213e perl-5.8.1-RC1.tgz 11664242
diff --git a/dev-lang/perl/files/digest-perl-5.8.1_rc2 b/dev-lang/perl/files/digest-perl-5.8.1_rc2
deleted file mode 100644
index 6ecd3eeb13bd..000000000000
--- a/dev-lang/perl/files/digest-perl-5.8.1_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 990f43a087111a8a244d5ed9d39538fc perl-5.8.1-RC2.tar.gz 11668523
diff --git a/dev-lang/perl/files/digest-perl-5.8.1_rc3 b/dev-lang/perl/files/digest-perl-5.8.1_rc3
deleted file mode 100644
index 8eb8b06affd4..000000000000
--- a/dev-lang/perl/files/digest-perl-5.8.1_rc3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 074d9e82811c3a6ea8008864eaec9f9c perl-5.8.1-RC3.tar.gz 11707152
diff --git a/dev-lang/perl/files/digest-perl-5.8.1_rc4 b/dev-lang/perl/files/digest-perl-5.8.1_rc4
deleted file mode 100644
index d2f80ac0f02c..000000000000
--- a/dev-lang/perl/files/digest-perl-5.8.1_rc4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 265f852e57eb8fd98fdb678ef0d7d3f6 perl-5.8.1-RC4.tar.gz 11716254
diff --git a/dev-lang/perl/files/perl-5.8.1-prelink-lpthread.patch b/dev-lang/perl/files/perl-5.8.1-prelink-lpthread.patch
new file mode 100644
index 000000000000..d38497e0aebe
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.1-prelink-lpthread.patch
@@ -0,0 +1,11 @@
+--- hints/linux.sh.orig	2003-02-14 18:11:50.000000000 -0800
++++ hints/linux.sh	2003-02-14 18:12:01.000000000 -0800
+@@ -43,7 +43,7 @@
+ # 'kaffe' has a /usr/lib/libnet.so which is not at all relevent for perl.
+ set `echo X "$libswanted "| sed -e 's/ bsd / /' -e 's/ net / /'`
+ shift
+-libswanted="$*"
++libswanted="pthread $*"
+ 
+ # If you have glibc, then report the version for ./myconfig bug reporting.
+ # (Configure doesn't need to know the specific version since it just uses
diff --git a/dev-lang/perl/perl-5.8.1.ebuild b/dev-lang/perl/perl-5.8.1-r2.ebuild
index c62d3bb4d880..d045184e21b8 100644
--- a/dev-lang/perl/perl-5.8.1.ebuild
+++ b/dev-lang/perl/perl-5.8.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.1.ebuild,v 1.1 2003/09/27 23:16:37 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.1-r2.ebuild,v 1.1 2003/10/02 21:18:08 rac Exp $
 
 inherit eutils flag-o-matic
 
@@ -75,6 +75,13 @@ 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)
@@ -142,25 +149,6 @@ src_compile() {
 
 	[ "${ARCH}" = "hppa" ] && append-flags -fPIC
 
-
-cat > config.over <<EOF
-installprefix=${D}/usr
-installarchlib=\`echo \$installarchlib | sed "s!\$prefix!\$installprefix!"\`
-installbin=\`echo \$installbin | sed "s!\$prefix!\$installprefix!"\`
-installman1dir=\`echo \$installman1dir | sed "s!\$prefix!\$installprefix!"\`
-installman3dir=\`echo \$installman3dir | sed "s!\$prefix!\$installprefix!"\`
-installman1dir=\`echo \$installman1dir | sed "s!/share/share/!/share/!"\`
-installman3dir=\`echo \$installman3dir | sed "s!/share/share/!/share/!"\`
-installman1dir=\`echo \$installman1dir | sed "s!/usr/man/!/usr/share/man/!"\`
-installman3dir=\`echo \$installman3dir | sed "s!/usr/man/!/usr/share/man/!"\`
-man1ext=1
-man3ext=3pm
-installprivlib=\`echo \$installprivlib | sed "s!\$prefix!\$installprefix!"\`
-installscript=\`echo \$installscript | sed "s!\$prefix!\$installprefix!"\`
-installsitelib=\`echo \$installsitelib | sed "s!\$prefix!\$installprefix!"\`
-installsitearch=\`echo \$installsitearch | sed "s!\$prefix!\$installprefix!"\`
-EOF
-	sleep 10
 	sh Configure -des \
 		-Darchname="${myarch}" \
 		-Dcc="${CC:-gcc}" \
@@ -233,8 +221,7 @@ EOF
 	fperms 0755 /usr/bin/xsubpp
 
 	./perl installman \
-		--man1dir="${D}/usr/share/man/man1" --man1ext='1' \
-		--man3dir="${D}/usr/share/man/man3" --man3ext='3'
+		--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
diff --git a/dev-lang/perl/perl-5.8.1_rc1.ebuild b/dev-lang/perl/perl-5.8.1_rc1.ebuild
deleted file mode 100644
index 0a62e7ac949c..000000000000
--- a/dev-lang/perl/perl-5.8.1_rc1.ebuild
+++ /dev/null
@@ -1,333 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.1_rc1.ebuild,v 1.10 2003/09/06 22:27:51 msterret Exp $
-
-inherit eutils flag-o-matic
-
-# Perl has problems compiling with -Os in your flags
-replace-flags "-Os" "-O2"
-# This flag makes compiling crash in interesting ways
-filter-flags -malign-double
-
-# The slot of this binary compat version of libperl.so
-PERLSLOT="1"
-
-SHORT_PV="`echo ${PV} | cut -d. -f1,2`"
-DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
-SAFE_VERSION="2.09"
-MY_P="perl-`echo $PV | sed 's/_rc/-RC/'`"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="http://www.cpan.org/authors/id/J/JH/JHI/${MY_P}.tgz"
-#ftp://ftp.perl.org/pub/CPAN/src/${MY_P}.tar.gz
-#ftp://ftp.perl.org/pub/CPAN/modules/by-module/DB_File/DB_File-${DB_FILE_VERSION}.tar.gz
-#ftp://ftp.perl.org/pub/CPAN/modules/by-module/Safe/Safe-${SAFE_VERSION}.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"
-IUSE="berkdb doc gdbm threads"
-
-DEPEND="sys-apps/groff
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	>=sys-apps/portage-2.0.48-r4
-	=sys-devel/libperl-${SHORT_PV}*
-	!<dev-perl/ExtUtils-MakeMaker-6.05-r6
-	!<dev-perl/File-Spec-0.84-r1
-	!<dev-perl/Test-Simple-0.47-r1"
-RDEPEND="berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
-
-pkg_setup() {
-	# I think this should rather be displayed if you *have* 'threads'
-	# in USE if it could break things ...
-	if [ -n "`use threads`" ]
-	then
-		ewarn ""
-		ewarn "PLEASE NOTE: You are compiling perl-5.8 with"
-		ewarn "threading enabled."
-		ewarn "Threading is not supported by all applications "
-		ewarn "that compile against perl. You use threading at "
-		ewarn "your own discretion. "
-		ewarn ""
-		sleep 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=threads 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 /usr/lib/${LIBPERL} ]
-	then
-		# Make sure we have libperl installed ...
-		eerror "Cannot find /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}
-
-	# Fix the definition of 'int sockatmark(int);' in perl.h to have __THROW.
-	# This fixes bug #12605.
-	# <azarah@gentoo.org> (28 Dec 2002).
-	cd ${S}; epatch ${FILESDIR}/${P}-sockatmark-should-__THROW.patch
-
-	# 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)
-
-	# Disabled because 5.8.1_rc1 does not segfault with the test in
-	# bug #14380, even though /usr/bin/perl is not linked with
-	# -lpthread.  May need further investigation.
-	# <rac@gentoo.org> (10 Jul 2003)
-
-	#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)
-
-	# we are using the vendor directory now, so it should not be
-	# empty.  this patch doesn't come close to applying, so leaving
-	# off for now.
-	# <rac@gentoo.org> (10 Jul 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
-}
-
-src_compile() {
-
-	export LC_ALL="C"
-	local myconf=""
-
-	if [ "`use threads`" ]
-	then
-		einfo "using threads"
-		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 -Di_ndbm"
-	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 sparc`" ]
-	then
-		myconf="${myconf} -Ud_longdbl"
-	fi
-	if [ "`use sparc64`" ]
-	then
-		myconf="${myconf} -Ud_longdbl"
-	fi
-
-	if [ "`use alpha`" -a "${CC}" == "ccc" ]
-	then
-		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
-		myconf="${myconf} -Ui_db -Ui_ndbm"
-	fi
-
-	[ "${ARCH}" = "hppa" ] && append-flags -fPIC
-
-cat > config.over <<EOF
-installprefix=${D}/usr
-installarchlib=\`echo \$installarchlib | sed "s!\$prefix!\$installprefix!"\`
-installbin=\`echo \$installbin | sed "s!\$prefix!\$installprefix!"\`
-installman1dir=\`echo \$installman1dir | sed "s!\$prefix!\$installprefix!"\`
-installman3dir=\`echo \$installman3dir | sed "s!\$prefix!\$installprefix!"\`
-installman1dir=\`echo \$installman1dir | sed "s!/share/share/!/share/!"\`
-installman3dir=\`echo \$installman3dir | sed "s!/share/share/!/share/!"\`
-installman1dir=\`echo \$installman1dir | sed "s!/usr/man/!/usr/share/man/!"\`
-installman3dir=\`echo \$installman3dir | sed "s!/usr/man/!/usr/share/man/!"\`
-man1ext=1
-man3ext=3pm
-installprivlib=\`echo \$installprivlib | sed "s!\$prefix!\$installprefix!"\`
-installscript=\`echo \$installscript | sed "s!\$prefix!\$installprefix!"\`
-installsitelib=\`echo \$installsitelib | sed "s!\$prefix!\$installprefix!"\`
-installsitearch=\`echo \$installsitearch | sed "s!\$prefix!\$installprefix!"\`
-EOF
-	sleep 10
-	sh Configure -des \
-		-Darchname="${myarch}" \
-		-Dcc="${CC:-gcc}" \
-		-Dprefix='/usr' \
-		-Dvendorprefix='/usr' \
-		-Dsiteprefix='/usr' \
-		-Dlocincpth=' ' \
-		-Doptimize="${CFLAGS}" \
-		-Duselargefiles \
-		-Dd_dosuid \
-		-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 \
-		--man1dir="${D}/usr/share/man/man1" --man1ext='1' \
-		--man3dir="${D}/usr/share/man/man3" --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 [ -n "`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 -r -l .
-	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.1_rc2.ebuild b/dev-lang/perl/perl-5.8.1_rc2.ebuild
deleted file mode 100644
index 7ae8081ed3fc..000000000000
--- a/dev-lang/perl/perl-5.8.1_rc2.ebuild
+++ /dev/null
@@ -1,334 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.1_rc2.ebuild,v 1.5 2003/09/06 22:27:51 msterret Exp $
-
-inherit eutils flag-o-matic
-
-# Perl has problems compiling with -Os in your flags
-replace-flags "-Os" "-O2"
-# This flag makes compiling crash in interesting ways
-filter-flags -malign-double
-
-# The slot of this binary compat version of libperl.so
-PERLSLOT="1"
-
-SHORT_PV="`echo ${PV} | cut -d. -f1,2`"
-DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
-SAFE_VERSION="2.09"
-MY_P="perl-`echo $PV | sed 's/_rc/-RC/'`"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="http://www.cpan.org/authors/id/J/JH/JHI/${MY_P}.tar.gz"
-#ftp://ftp.perl.org/pub/CPAN/src/${MY_P}.tar.gz
-#ftp://ftp.perl.org/pub/CPAN/modules/by-module/DB_File/DB_File-${DB_FILE_VERSION}.tar.gz
-#ftp://ftp.perl.org/pub/CPAN/modules/by-module/Safe/Safe-${SAFE_VERSION}.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"
-IUSE="berkdb doc gdbm threads"
-
-DEPEND="sys-apps/groff
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	>=sys-apps/portage-2.0.48-r4
-	=sys-devel/libperl-${SHORT_PV}*
-	!<dev-perl/ExtUtils-MakeMaker-6.05-r6
-	!<dev-perl/File-Spec-0.84-r1
-	!<dev-perl/Test-Simple-0.47-r1"
-RDEPEND="berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
-
-pkg_setup() {
-	# I think this should rather be displayed if you *have* 'threads'
-	# in USE if it could break things ...
-	if [ -n "`use threads`" ]
-	then
-		ewarn ""
-		ewarn "PLEASE NOTE: You are compiling perl-5.8 with"
-		ewarn "threading enabled."
-		ewarn "Threading is not supported by all applications "
-		ewarn "that compile against perl. You use threading at "
-		ewarn "your own discretion. "
-		ewarn ""
-		sleep 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=threads 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 /usr/lib/${LIBPERL} ]
-	then
-		# Make sure we have libperl installed ...
-		eerror "Cannot find /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}
-
-	# Fix the definition of 'int sockatmark(int);' in perl.h to have __THROW.
-	# This fixes bug #12605.
-	# <azarah@gentoo.org> (28 Dec 2002).
-	cd ${S}; epatch ${FILESDIR}/${P}-sockatmark-should-__THROW.patch
-
-	# 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)
-
-	# Disabled because 5.8.1_rc1 does not segfault with the test in
-	# bug #14380, even though /usr/bin/perl is not linked with
-	# -lpthread.  May need further investigation.
-	# <rac@gentoo.org> (10 Jul 2003)
-
-	#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)
-
-	# we are using the vendor directory now, so it should not be
-	# empty.  this patch doesn't come close to applying, so leaving
-	# off for now.
-	# <rac@gentoo.org> (10 Jul 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
-}
-
-src_compile() {
-
-	export LC_ALL="C"
-	local myconf=""
-
-	if [ "`use threads`" ]
-	then
-		einfo "using threads"
-		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 -Di_ndbm"
-	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 sparc`" ]
-	then
-		myconf="${myconf} -Ud_longdbl"
-	fi
-	if [ "`use sparc64`" ]
-	then
-		myconf="${myconf} -Ud_longdbl"
-	fi
-
-	if [ "`use alpha`" -a "${CC}" == "ccc" ]
-	then
-		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
-		myconf="${myconf} -Ui_db -Ui_ndbm"
-	fi
-
-	[ "${ARCH}" = "hppa" ] && append-flags -fPIC
-
-
-cat > config.over <<EOF
-installprefix=${D}/usr
-installarchlib=\`echo \$installarchlib | sed "s!\$prefix!\$installprefix!"\`
-installbin=\`echo \$installbin | sed "s!\$prefix!\$installprefix!"\`
-installman1dir=\`echo \$installman1dir | sed "s!\$prefix!\$installprefix!"\`
-installman3dir=\`echo \$installman3dir | sed "s!\$prefix!\$installprefix!"\`
-installman1dir=\`echo \$installman1dir | sed "s!/share/share/!/share/!"\`
-installman3dir=\`echo \$installman3dir | sed "s!/share/share/!/share/!"\`
-installman1dir=\`echo \$installman1dir | sed "s!/usr/man/!/usr/share/man/!"\`
-installman3dir=\`echo \$installman3dir | sed "s!/usr/man/!/usr/share/man/!"\`
-man1ext=1
-man3ext=3pm
-installprivlib=\`echo \$installprivlib | sed "s!\$prefix!\$installprefix!"\`
-installscript=\`echo \$installscript | sed "s!\$prefix!\$installprefix!"\`
-installsitelib=\`echo \$installsitelib | sed "s!\$prefix!\$installprefix!"\`
-installsitearch=\`echo \$installsitearch | sed "s!\$prefix!\$installprefix!"\`
-EOF
-	sleep 10
-	sh Configure -des \
-		-Darchname="${myarch}" \
-		-Dcc="${CC:-gcc}" \
-		-Dprefix='/usr' \
-		-Dvendorprefix='/usr' \
-		-Dsiteprefix='/usr' \
-		-Dlocincpth=' ' \
-		-Doptimize="${CFLAGS}" \
-		-Duselargefiles \
-		-Dd_dosuid \
-		-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 \
-		--man1dir="${D}/usr/share/man/man1" --man1ext='1' \
-		--man3dir="${D}/usr/share/man/man3" --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 [ -n "`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 -r -l .
-	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.1_rc3.ebuild b/dev-lang/perl/perl-5.8.1_rc3.ebuild
deleted file mode 100644
index 39cc8d4f28eb..000000000000
--- a/dev-lang/perl/perl-5.8.1_rc3.ebuild
+++ /dev/null
@@ -1,334 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.1_rc3.ebuild,v 1.4 2003/09/06 22:27:51 msterret Exp $
-
-inherit eutils flag-o-matic
-
-# Perl has problems compiling with -Os in your flags
-replace-flags "-Os" "-O2"
-# This flag makes compiling crash in interesting ways
-filter-flags -malign-double
-
-# The slot of this binary compat version of libperl.so
-PERLSLOT="1"
-
-SHORT_PV="`echo ${PV} | cut -d. -f1,2`"
-DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
-SAFE_VERSION="2.09"
-MY_P="perl-`echo $PV | sed 's/_rc/-RC/'`"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="http://www.cpan.org/authors/id/J/JH/JHI/${MY_P}.tar.gz"
-#ftp://ftp.perl.org/pub/CPAN/src/${MY_P}.tar.gz
-#ftp://ftp.perl.org/pub/CPAN/modules/by-module/DB_File/DB_File-${DB_FILE_VERSION}.tar.gz
-#ftp://ftp.perl.org/pub/CPAN/modules/by-module/Safe/Safe-${SAFE_VERSION}.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"
-IUSE="berkdb doc gdbm threads"
-
-DEPEND="sys-apps/groff
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	>=sys-apps/portage-2.0.48-r4
-	=sys-devel/libperl-${SHORT_PV}*
-	!<dev-perl/ExtUtils-MakeMaker-6.05-r6
-	!<dev-perl/File-Spec-0.84-r1
-	!<dev-perl/Test-Simple-0.47-r1"
-RDEPEND="berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
-
-pkg_setup() {
-	# I think this should rather be displayed if you *have* 'threads'
-	# in USE if it could break things ...
-	if [ -n "`use threads`" ]
-	then
-		ewarn ""
-		ewarn "PLEASE NOTE: You are compiling perl-5.8 with"
-		ewarn "threading enabled."
-		ewarn "Threading is not supported by all applications "
-		ewarn "that compile against perl. You use threading at "
-		ewarn "your own discretion. "
-		ewarn ""
-		sleep 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=threads 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 /usr/lib/${LIBPERL} ]
-	then
-		# Make sure we have libperl installed ...
-		eerror "Cannot find /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}
-
-	# Fix the definition of 'int sockatmark(int);' in perl.h to have __THROW.
-	# This fixes bug #12605.
-	# <azarah@gentoo.org> (28 Dec 2002).
-	cd ${S}; epatch ${FILESDIR}/${P}-sockatmark-should-__THROW.patch
-
-	# 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)
-
-	# Disabled because 5.8.1_rc1 does not segfault with the test in
-	# bug #14380, even though /usr/bin/perl is not linked with
-	# -lpthread.  May need further investigation.
-	# <rac@gentoo.org> (10 Jul 2003)
-
-	#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)
-
-	# we are using the vendor directory now, so it should not be
-	# empty.  this patch doesn't come close to applying, so leaving
-	# off for now.
-	# <rac@gentoo.org> (10 Jul 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
-}
-
-src_compile() {
-
-	export LC_ALL="C"
-	local myconf=""
-
-	if [ "`use threads`" ]
-	then
-		einfo "using threads"
-		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 -Di_ndbm"
-	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 sparc`" ]
-	then
-		myconf="${myconf} -Ud_longdbl"
-	fi
-	if [ "`use sparc64`" ]
-	then
-		myconf="${myconf} -Ud_longdbl"
-	fi
-
-	if [ "`use alpha`" -a "${CC}" == "ccc" ]
-	then
-		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
-		myconf="${myconf} -Ui_db -Ui_ndbm"
-	fi
-
-	[ "${ARCH}" = "hppa" ] && append-flags -fPIC
-
-
-cat > config.over <<EOF
-installprefix=${D}/usr
-installarchlib=\`echo \$installarchlib | sed "s!\$prefix!\$installprefix!"\`
-installbin=\`echo \$installbin | sed "s!\$prefix!\$installprefix!"\`
-installman1dir=\`echo \$installman1dir | sed "s!\$prefix!\$installprefix!"\`
-installman3dir=\`echo \$installman3dir | sed "s!\$prefix!\$installprefix!"\`
-installman1dir=\`echo \$installman1dir | sed "s!/share/share/!/share/!"\`
-installman3dir=\`echo \$installman3dir | sed "s!/share/share/!/share/!"\`
-installman1dir=\`echo \$installman1dir | sed "s!/usr/man/!/usr/share/man/!"\`
-installman3dir=\`echo \$installman3dir | sed "s!/usr/man/!/usr/share/man/!"\`
-man1ext=1
-man3ext=3pm
-installprivlib=\`echo \$installprivlib | sed "s!\$prefix!\$installprefix!"\`
-installscript=\`echo \$installscript | sed "s!\$prefix!\$installprefix!"\`
-installsitelib=\`echo \$installsitelib | sed "s!\$prefix!\$installprefix!"\`
-installsitearch=\`echo \$installsitearch | sed "s!\$prefix!\$installprefix!"\`
-EOF
-	sleep 10
-	sh Configure -des \
-		-Darchname="${myarch}" \
-		-Dcc="${CC:-gcc}" \
-		-Dprefix='/usr' \
-		-Dvendorprefix='/usr' \
-		-Dsiteprefix='/usr' \
-		-Dlocincpth=' ' \
-		-Doptimize="${CFLAGS}" \
-		-Duselargefiles \
-		-Dd_dosuid \
-		-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 \
-		--man1dir="${D}/usr/share/man/man1" --man1ext='1' \
-		--man3dir="${D}/usr/share/man/man3" --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 [ -n "`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 -r -l .
-	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.1_rc4.ebuild b/dev-lang/perl/perl-5.8.1_rc4.ebuild
deleted file mode 100644
index 457b8ca3bfb1..000000000000
--- a/dev-lang/perl/perl-5.8.1_rc4.ebuild
+++ /dev/null
@@ -1,334 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.1_rc4.ebuild,v 1.3 2003/09/06 22:27:51 msterret Exp $
-
-inherit eutils flag-o-matic
-
-# Perl has problems compiling with -Os in your flags
-replace-flags "-Os" "-O2"
-# This flag makes compiling crash in interesting ways
-filter-flags -malign-double
-
-# The slot of this binary compat version of libperl.so
-PERLSLOT="1"
-
-SHORT_PV="`echo ${PV} | cut -d. -f1,2`"
-DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
-SAFE_VERSION="2.09"
-MY_P="perl-`echo $PV | sed 's/_rc/-RC/'`"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="http://www.cpan.org/authors/id/J/JH/JHI/${MY_P}.tar.gz"
-#ftp://ftp.perl.org/pub/CPAN/src/${MY_P}.tar.gz
-#ftp://ftp.perl.org/pub/CPAN/modules/by-module/DB_File/DB_File-${DB_FILE_VERSION}.tar.gz
-#ftp://ftp.perl.org/pub/CPAN/modules/by-module/Safe/Safe-${SAFE_VERSION}.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"
-IUSE="berkdb doc gdbm threads"
-
-DEPEND="sys-apps/groff
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	>=sys-apps/portage-2.0.48-r4
-	=sys-devel/libperl-${SHORT_PV}*
-	!<dev-perl/ExtUtils-MakeMaker-6.05-r6
-	!<dev-perl/File-Spec-0.84-r1
-	!<dev-perl/Test-Simple-0.47-r1"
-RDEPEND="berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
-
-pkg_setup() {
-	# I think this should rather be displayed if you *have* 'threads'
-	# in USE if it could break things ...
-	if [ -n "`use threads`" ]
-	then
-		ewarn ""
-		ewarn "PLEASE NOTE: You are compiling perl-5.8 with"
-		ewarn "threading enabled."
-		ewarn "Threading is not supported by all applications "
-		ewarn "that compile against perl. You use threading at "
-		ewarn "your own discretion. "
-		ewarn ""
-		sleep 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=threads 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 /usr/lib/${LIBPERL} ]
-	then
-		# Make sure we have libperl installed ...
-		eerror "Cannot find /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}
-
-	# Fix the definition of 'int sockatmark(int);' in perl.h to have __THROW.
-	# This fixes bug #12605.
-	# <azarah@gentoo.org> (28 Dec 2002).
-	cd ${S}; epatch ${FILESDIR}/${P}-sockatmark-should-__THROW.patch
-
-	# 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)
-
-	# Disabled because 5.8.1_rc1 does not segfault with the test in
-	# bug #14380, even though /usr/bin/perl is not linked with
-	# -lpthread.  May need further investigation.
-	# <rac@gentoo.org> (10 Jul 2003)
-
-	#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)
-
-	# we are using the vendor directory now, so it should not be
-	# empty.  this patch doesn't come close to applying, so leaving
-	# off for now.
-	# <rac@gentoo.org> (10 Jul 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
-}
-
-src_compile() {
-
-	export LC_ALL="C"
-	local myconf=""
-
-	if [ "`use threads`" ]
-	then
-		einfo "using threads"
-		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 -Di_ndbm"
-	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 sparc`" ]
-	then
-		myconf="${myconf} -Ud_longdbl"
-	fi
-	if [ "`use sparc64`" ]
-	then
-		myconf="${myconf} -Ud_longdbl"
-	fi
-
-	if [ "`use alpha`" -a "${CC}" == "ccc" ]
-	then
-		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
-		myconf="${myconf} -Ui_db -Ui_ndbm"
-	fi
-
-	[ "${ARCH}" = "hppa" ] && append-flags -fPIC
-
-
-cat > config.over <<EOF
-installprefix=${D}/usr
-installarchlib=\`echo \$installarchlib | sed "s!\$prefix!\$installprefix!"\`
-installbin=\`echo \$installbin | sed "s!\$prefix!\$installprefix!"\`
-installman1dir=\`echo \$installman1dir | sed "s!\$prefix!\$installprefix!"\`
-installman3dir=\`echo \$installman3dir | sed "s!\$prefix!\$installprefix!"\`
-installman1dir=\`echo \$installman1dir | sed "s!/share/share/!/share/!"\`
-installman3dir=\`echo \$installman3dir | sed "s!/share/share/!/share/!"\`
-installman1dir=\`echo \$installman1dir | sed "s!/usr/man/!/usr/share/man/!"\`
-installman3dir=\`echo \$installman3dir | sed "s!/usr/man/!/usr/share/man/!"\`
-man1ext=1
-man3ext=3pm
-installprivlib=\`echo \$installprivlib | sed "s!\$prefix!\$installprefix!"\`
-installscript=\`echo \$installscript | sed "s!\$prefix!\$installprefix!"\`
-installsitelib=\`echo \$installsitelib | sed "s!\$prefix!\$installprefix!"\`
-installsitearch=\`echo \$installsitearch | sed "s!\$prefix!\$installprefix!"\`
-EOF
-	sleep 10
-	sh Configure -des \
-		-Darchname="${myarch}" \
-		-Dcc="${CC:-gcc}" \
-		-Dprefix='/usr' \
-		-Dvendorprefix='/usr' \
-		-Dsiteprefix='/usr' \
-		-Dlocincpth=' ' \
-		-Doptimize="${CFLAGS}" \
-		-Duselargefiles \
-		-Dd_dosuid \
-		-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 \
-		--man1dir="${D}/usr/share/man/man1" --man1ext='1' \
-		--man3dir="${D}/usr/share/man/man3" --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 [ -n "`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 -r -l .
-	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 ""
-}
-
-