Perl 5.8.6 unmasking; perl 5.8.7 being added

(Portage version: 2.0.51.22-r1)

25 files changed, 142 insertions, 1398 deletions

diff --git a/sys-devel/libperl/ChangeLog b/sys-devel/libperl/ChangeLog
index 89951ed42c42..c30fb561f562 100644
--- a/sys-devel/libperl/ChangeLog
+++ b/sys-devel/libperl/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for sys-devel/libperl
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/ChangeLog,v 1.62 2005/06/17 09:54:37 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/ChangeLog,v 1.63 2005/06/29 22:13:08 mcummings Exp $
+
+*libperl-5.8.7 (29 Jun 2005)
+
+  29 Jun 2005; Michael Cummings <mcummings@gentoo.org>
+  -files/libperl-5.8.2-create-libperl-soname.patch,
+  -files/libperl-5.8.4-create-libperl-soname.patch,
+  -files/libperl-5.8.4-noksh.patch, -files/libperl-5.8.4-uclibc.patch,
+  -files/libperl-5.8.5-create-libperl-soname.patch,
+  -files/libperl-5.8.5-noksh.patch, -files/libperl-5.8.5-reorder-INC.patch,
+  -files/libperl-5.8.5-uclibc.patch,
+  -files/libperl-5.8.6-create-libperl-soname.patch,
+  -files/libperl-5.8.6-noksh.patch, -files/libperl-5.8.6-uclibc.patch,
+  +files/libperl-create-libperl-soname.patch, +files/libperl-noksh.patch,
+  +files/libperl-reorder-INC.patch, +files/libperl-uclibc.patch,
+  -libperl-5.8.2.ebuild, -libperl-5.8.2-r1.ebuild, -libperl-5.8.4.ebuild,
+  -libperl-5.8.4-r1.ebuild, libperl-5.8.5.ebuild, libperl-5.8.5-r1.ebuild,
+  libperl-5.8.6.ebuild, +libperl-5.8.7.ebuild:
+  Perl 5.8.6 unmasking; perl 5.8.7 being added
 
   17 Jun 2005; Danny van Dyk <kugelfang@gentoo.org> libperl-5.8.5.ebuild,
   libperl-5.8.6.ebuild:
diff --git a/sys-devel/libperl/Manifest b/sys-devel/libperl/Manifest
index 7b41f73b4ef5..d208dc57cd51 100644
--- a/sys-devel/libperl/Manifest
+++ b/sys-devel/libperl/Manifest
@@ -1,38 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 edb469d93e251ba3a4a2ae82b494bb9b libperl-5.8.6.ebuild 10163
-MD5 969297184cc4b1bdf4bb07c7ad576b71 libperl-5.8.4-r1.ebuild 11064
-MD5 e4d1d210093c77a29f08096094a494f7 libperl-5.8.5.ebuild 9920
-MD5 3632130eb5a91b30a01d0d27a47113ef libperl-5.8.2.ebuild 10665
-MD5 37c347875115fa9765bad5825121f2a5 libperl-5.8.2-r1.ebuild 10782
+MD5 67a94a563a0a456d550d9b40c101afe1 libperl-5.8.7.ebuild 10408
 MD5 a73a7b9ee3220094721ea4576f870144 ChangeLog 9051
+MD5 23e3f63321e9c9070960e49c32c62fa0 libperl-5.8.6.ebuild 10506
+MD5 fb48f73429f9f2eb1a8b6ae1e3fdedfd libperl-5.8.5-r1.ebuild 10031
+MD5 dcb164deeb5039bcc78db5dfdf113949 libperl-5.8.5.ebuild 9923
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 cadef9ad8466cf4c6d11ac1e1301f972 libperl-5.8.4.ebuild 10941
-MD5 845c57c3bea32adfd92299dccf6dbb06 libperl-5.8.5-r1.ebuild 10027
-MD5 ce442db939c59218a16be167f793b817 files/libperl-5.8.5-uclibc.patch 573
-MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-5.8.6-create-libperl-soname.patch 417
-MD5 076dcbef37263d6dd7af719b55cfc2de files/libperl-5.8.6-noksh.patch 611
-MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-5.8.2-create-libperl-soname.patch 417
-MD5 ce442db939c59218a16be167f793b817 files/libperl-5.8.4-uclibc.patch 573
-MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-5.8.5-create-libperl-soname.patch 417
-MD5 d9412dab085f22309997c8f08ea1ac85 files/libperl-5.8.5-reorder-INC.patch 2211
-MD5 8381e239056a7895edf8f3c6c05c835c files/digest-libperl-5.8.2 64
-MD5 93155b02a7e9d3cdc6d6934ce78d9f11 files/digest-libperl-5.8.4 64
+MD5 c354e2fbf8141a769c20032e94f45fd3 files/digest-libperl-5.8.5-r1 64
 MD5 c354e2fbf8141a769c20032e94f45fd3 files/digest-libperl-5.8.5 64
+MD5 d9412dab085f22309997c8f08ea1ac85 files/libperl-reorder-INC.patch 2211
 MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-libperl-5.8.6 64
-MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-5.8.4-create-libperl-soname.patch 417
-MD5 076dcbef37263d6dd7af719b55cfc2de files/libperl-5.8.4-noksh.patch 611
-MD5 ce442db939c59218a16be167f793b817 files/libperl-5.8.6-uclibc.patch 573
-MD5 8381e239056a7895edf8f3c6c05c835c files/digest-libperl-5.8.2-r1 64
-MD5 93155b02a7e9d3cdc6d6934ce78d9f11 files/digest-libperl-5.8.4-r1 64
-MD5 c354e2fbf8141a769c20032e94f45fd3 files/digest-libperl-5.8.5-r1 64
-MD5 ce442db939c59218a16be167f793b817 files/libperl-5.8.2-uclibc.patch 573
-MD5 076dcbef37263d6dd7af719b55cfc2de files/libperl-5.8.5-noksh.patch 611
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCug4wBXaUFmZvwyMRAgMdAKC5jcAKyLmkQZkbNeeGeqK7dVq/kgCeKKRj
-n9pur9aT5ZWkBYiueH9KQyE=
-=H/Gt
------END PGP SIGNATURE-----
+MD5 c10e44e47d7f702efe7d4009064a97ca files/digest-libperl-5.8.7 64
+MD5 ce442db939c59218a16be167f793b817 files/libperl-uclibc.patch 573
+MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-create-libperl-soname.patch 417
+MD5 076dcbef37263d6dd7af719b55cfc2de files/libperl-noksh.patch 611
diff --git a/sys-devel/libperl/files/digest-libperl-5.8.2 b/sys-devel/libperl/files/digest-libperl-5.8.2
deleted file mode 100644
index 03c9dcc55731..000000000000
--- a/sys-devel/libperl/files/digest-libperl-5.8.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fa356b74f99166b63a68a322c3c68f91 perl-5.8.2.tar.gz 11896287
diff --git a/sys-devel/libperl/files/digest-libperl-5.8.2-r1 b/sys-devel/libperl/files/digest-libperl-5.8.2-r1
deleted file mode 100644
index 03c9dcc55731..000000000000
--- a/sys-devel/libperl/files/digest-libperl-5.8.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fa356b74f99166b63a68a322c3c68f91 perl-5.8.2.tar.gz 11896287
diff --git a/sys-devel/libperl/files/digest-libperl-5.8.4 b/sys-devel/libperl/files/digest-libperl-5.8.4
deleted file mode 100644
index a13f719f8c75..000000000000
--- a/sys-devel/libperl/files/digest-libperl-5.8.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 912050a9cb6b0f415b76ba56052fb4cf perl-5.8.4.tar.gz 12094233
diff --git a/sys-devel/libperl/files/digest-libperl-5.8.4-r1 b/sys-devel/libperl/files/digest-libperl-5.8.4-r1
deleted file mode 100644
index a13f719f8c75..000000000000
--- a/sys-devel/libperl/files/digest-libperl-5.8.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 912050a9cb6b0f415b76ba56052fb4cf perl-5.8.4.tar.gz 12094233
diff --git a/sys-devel/libperl/files/digest-libperl-5.8.7 b/sys-devel/libperl/files/digest-libperl-5.8.7
new file mode 100644
index 000000000000..7407844a5a36
--- /dev/null
+++ b/sys-devel/libperl/files/digest-libperl-5.8.7
@@ -0,0 +1 @@
+MD5 9a175d6ccbb5d9b41ffac5073ff9cc3c perl-5.8.7.tar.bz2 9839086
diff --git a/sys-devel/libperl/files/libperl-5.8.4-create-libperl-soname.patch b/sys-devel/libperl/files/libperl-5.8.4-create-libperl-soname.patch
deleted file mode 100644
index 4aa8f36b1506..000000000000
--- a/sys-devel/libperl/files/libperl-5.8.4-create-libperl-soname.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.SH.orig	2003-07-10 14:59:04.000000000 -0700
-+++ Makefile.SH	2003-07-10 15:14:08.000000000 -0700
-@@ -494,7 +494,7 @@
- 	case "$useshrplib" in
- 	true)
- 		$spitshell >>Makefile <<'!NO!SUBS!'
--	$(LD) -o $@ $(SHRPLDFLAGS) perl$(OBJ_EXT) $(obj) $(libs)
-+	$(LD) -o $@ $(SHRPLDFLAGS) perl$(OBJ_EXT) $(obj) $(libs) -Wl,-soname -Wl,libperl.so.`echo $(LIBPERL) | cut -d. -f3`
- !NO!SUBS!
- 		case "$osname" in
- 		aix)
diff --git a/sys-devel/libperl/files/libperl-5.8.5-create-libperl-soname.patch b/sys-devel/libperl/files/libperl-5.8.5-create-libperl-soname.patch
deleted file mode 100644
index 4aa8f36b1506..000000000000
--- a/sys-devel/libperl/files/libperl-5.8.5-create-libperl-soname.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.SH.orig	2003-07-10 14:59:04.000000000 -0700
-+++ Makefile.SH	2003-07-10 15:14:08.000000000 -0700
-@@ -494,7 +494,7 @@
- 	case "$useshrplib" in
- 	true)
- 		$spitshell >>Makefile <<'!NO!SUBS!'
--	$(LD) -o $@ $(SHRPLDFLAGS) perl$(OBJ_EXT) $(obj) $(libs)
-+	$(LD) -o $@ $(SHRPLDFLAGS) perl$(OBJ_EXT) $(obj) $(libs) -Wl,-soname -Wl,libperl.so.`echo $(LIBPERL) | cut -d. -f3`
- !NO!SUBS!
- 		case "$osname" in
- 		aix)
diff --git a/sys-devel/libperl/files/libperl-5.8.5-noksh.patch b/sys-devel/libperl/files/libperl-5.8.5-noksh.patch
deleted file mode 100644
index 4c33b3e71b33..000000000000
--- a/sys-devel/libperl/files/libperl-5.8.5-noksh.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -burN perl-5.8.4.orig/Configure perl-5.8.4/Configure
---- perl-5.8.4.orig/Configure	2004-04-01 05:48:18.000000000 -0800
-+++ perl-5.8.4/Configure	2004-06-09 12:02:54.694172368 -0700
-@@ -164,6 +164,12 @@
- 	;;
- esac
- 
-+# 2004.06.09 rac
-+# having $newsh persist as ksh here is bad news if ksh doesn't really
-+# exist. this causes us to toss away a perfectly good working test in
-+# bash in favour of more exotic external options. see bug 42665.
-+test -x "${newsh}" || unset newsh
-+
- : if needed set CDPATH to a harmless value that is not chatty
- : avoid bash 2.02 problems with empty CDPATH.
- case "$CDPATH" in
diff --git a/sys-devel/libperl/files/libperl-5.8.5-uclibc.patch b/sys-devel/libperl/files/libperl-5.8.5-uclibc.patch
deleted file mode 100644
index 1e086d73879a..000000000000
--- a/sys-devel/libperl/files/libperl-5.8.5-uclibc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- perl-5.8.2/perlio.c-dist	2003-12-03 14:30:24.000000000 -0700
-+++ perl-5.8.2/perlio.c	2003-12-03 14:32:10.000000000 -0700
-@@ -2824,7 +2824,11 @@
-     /* XXX this could use PerlIO_canset_fileno() and
-      * PerlIO_set_fileno() support from Configure
-      */
--#  if defined(__GLIBC__)
-+#  if defined(__UCLIBC__)
-+    /* uClibc must come before glibc because it defines __GLIBC__ as well. */
-+    f->__filedes = -1;
-+    return 1;
-+#  elif defined(__GLIBC__)
-     /* There may be a better way for GLIBC:
-     	- libio.h defines a flag to not close() on cleanup
-      */	
diff --git a/sys-devel/libperl/files/libperl-5.8.6-create-libperl-soname.patch b/sys-devel/libperl/files/libperl-5.8.6-create-libperl-soname.patch
deleted file mode 100644
index 4aa8f36b1506..000000000000
--- a/sys-devel/libperl/files/libperl-5.8.6-create-libperl-soname.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.SH.orig	2003-07-10 14:59:04.000000000 -0700
-+++ Makefile.SH	2003-07-10 15:14:08.000000000 -0700
-@@ -494,7 +494,7 @@
- 	case "$useshrplib" in
- 	true)
- 		$spitshell >>Makefile <<'!NO!SUBS!'
--	$(LD) -o $@ $(SHRPLDFLAGS) perl$(OBJ_EXT) $(obj) $(libs)
-+	$(LD) -o $@ $(SHRPLDFLAGS) perl$(OBJ_EXT) $(obj) $(libs) -Wl,-soname -Wl,libperl.so.`echo $(LIBPERL) | cut -d. -f3`
- !NO!SUBS!
- 		case "$osname" in
- 		aix)
diff --git a/sys-devel/libperl/files/libperl-5.8.6-noksh.patch b/sys-devel/libperl/files/libperl-5.8.6-noksh.patch
deleted file mode 100644
index 4c33b3e71b33..000000000000
--- a/sys-devel/libperl/files/libperl-5.8.6-noksh.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -burN perl-5.8.4.orig/Configure perl-5.8.4/Configure
---- perl-5.8.4.orig/Configure	2004-04-01 05:48:18.000000000 -0800
-+++ perl-5.8.4/Configure	2004-06-09 12:02:54.694172368 -0700
-@@ -164,6 +164,12 @@
- 	;;
- esac
- 
-+# 2004.06.09 rac
-+# having $newsh persist as ksh here is bad news if ksh doesn't really
-+# exist. this causes us to toss away a perfectly good working test in
-+# bash in favour of more exotic external options. see bug 42665.
-+test -x "${newsh}" || unset newsh
-+
- : if needed set CDPATH to a harmless value that is not chatty
- : avoid bash 2.02 problems with empty CDPATH.
- case "$CDPATH" in
diff --git a/sys-devel/libperl/files/libperl-5.8.6-uclibc.patch b/sys-devel/libperl/files/libperl-5.8.6-uclibc.patch
deleted file mode 100644
index 1e086d73879a..000000000000
--- a/sys-devel/libperl/files/libperl-5.8.6-uclibc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- perl-5.8.2/perlio.c-dist	2003-12-03 14:30:24.000000000 -0700
-+++ perl-5.8.2/perlio.c	2003-12-03 14:32:10.000000000 -0700
-@@ -2824,7 +2824,11 @@
-     /* XXX this could use PerlIO_canset_fileno() and
-      * PerlIO_set_fileno() support from Configure
-      */
--#  if defined(__GLIBC__)
-+#  if defined(__UCLIBC__)
-+    /* uClibc must come before glibc because it defines __GLIBC__ as well. */
-+    f->__filedes = -1;
-+    return 1;
-+#  elif defined(__GLIBC__)
-     /* There may be a better way for GLIBC:
-     	- libio.h defines a flag to not close() on cleanup
-      */	
diff --git a/sys-devel/libperl/files/libperl-5.8.2-create-libperl-soname.patch b/sys-devel/libperl/files/libperl-create-libperl-soname.patch
index 4aa8f36b1506..4aa8f36b1506 100644
--- a/sys-devel/libperl/files/libperl-5.8.2-create-libperl-soname.patch
+++ b/sys-devel/libperl/files/libperl-create-libperl-soname.patch
diff --git a/sys-devel/libperl/files/libperl-5.8.4-noksh.patch b/sys-devel/libperl/files/libperl-noksh.patch
index 4c33b3e71b33..4c33b3e71b33 100644
--- a/sys-devel/libperl/files/libperl-5.8.4-noksh.patch
+++ b/sys-devel/libperl/files/libperl-noksh.patch
diff --git a/sys-devel/libperl/files/libperl-5.8.5-reorder-INC.patch b/sys-devel/libperl/files/libperl-reorder-INC.patch
index c934b4135a13..c934b4135a13 100644
--- a/sys-devel/libperl/files/libperl-5.8.5-reorder-INC.patch
+++ b/sys-devel/libperl/files/libperl-reorder-INC.patch
diff --git a/sys-devel/libperl/files/libperl-5.8.4-uclibc.patch b/sys-devel/libperl/files/libperl-uclibc.patch
index 1e086d73879a..1e086d73879a 100644
--- a/sys-devel/libperl/files/libperl-5.8.4-uclibc.patch
+++ b/sys-devel/libperl/files/libperl-uclibc.patch
diff --git a/sys-devel/libperl/libperl-5.8.2-r1.ebuild b/sys-devel/libperl/libperl-5.8.2-r1.ebuild
deleted file mode 100644
index d2b134cace4e..000000000000
--- a/sys-devel/libperl/libperl-5.8.2-r1.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/sys-devel/libperl/libperl-5.8.2-r1.ebuild,v 1.12 2005/06/23 01:19:34 agriffis Exp $
-
-# The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
-#
-# We split the perl ebuild into libperl and perl.  The layout is as follows:
-#
-# libperl:
-#
-#  This is a slotted (SLOT=[0-9]*) ebuild, meaning we should be able to have a
-#  few versions that are not binary compadible installed.
-#
-#  How we get libperl.so multi-versioned, is by adding to the link command:
-#
-#    -Wl,-soname -Wl,libperl.so.`echo $(LIBPERL) | cut -d. -f3`
-#
-#  This gives us:
-#
-#    $(LIBPERL): $& perl$(OBJ_EXT) $(obj) $(LIBPERLEXPORT)
-#        $(LD) -o $@ $(SHRPLDFLAGS) perl$(OBJ_EXT) $(obj) \
-#              -Wl,-soname -Wl,libperl.so.`echo $(LIBPERL) | cut -d. -f3`
-#
-#  We then configure perl with LIBPERL set to:
-#
-#    LIBPERL="libperl.so.${SLOT}.`echo ${PV} | cut -d. -f1,2`"
-#
-#  Or with the variables defined in this ebuild:
-#
-#    LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
-#
-#  The result is that our 'soname' is 'libperl.so.${PERLSLOT}' (at the time of
-#  writing this for perl-5.8.0, 'libperl.so.1'), causing all apps that is linked
-#  to libperl to link to 'libperl.so.${PERLSLOT}'.
-#
-#  If a new perl version, perl-z.y.z comes out that have a libperl not binary
-#  compatible with the previous version, we just keep the previous libperl
-#  installed, and all apps linked to it will still be able to use:
-#
-#    libperl.so.${PERLSLOT}'
-#
-#  while the new ones will link to:
-#
-#    libperl.so.$((PERLSLOT+1))'
-#
-# perl:
-#
-#  Not much to this one.  It compiles with a static libperl.a, and are unslotted
-#  (meaning SLOT=0).  We thus always have the latest *stable* perl version
-#  installed, with corrisponding version of libperl.  The perl ebuild will of
-#  course DEPEND on libperl.
-#
-# Martin Schlemmer <azarah@gentoo.org> (28 Dec 2002).
-
-IUSE="berkdb debug gdbm ithreads"
-
-inherit eutils flag-o-matic
-
-# Perl has problems compiling with -Os in your flags
-use elibc_uclibc || 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="${PV%.*}"
-MY_P="perl-${PV/_rc/-RC}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
-SRC_URI="ftp://ftp.cpan.org/pub/CPAN/src/${MY_P}.tar.gz"
-HOMEPAGE="http://www.perl.org"
-RESTRICT="test"
-
-if [ "${PN}" = "libperl" ]
-then
-	SLOT="${PERLSLOT}"
-else
-	SLOT="0"
-fi
-
-LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
-
-LICENSE="Artistic GPL-2"
-KEYWORDS="~amd64 ~x86 ~sparc ~ppc ~alpha ~mips ~hppa ~ia64 ~ppc64"
-
-DEPEND="!elibc_uclibc? ( sys-apps/groff )
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
-
-RDEPEND="
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
-
-PDEPEND=">=dev-lang/perl-${PV}"
-
-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 ""
-		epause 10
-	fi
-}
-
-src_unpack() {
-
-	unpack ${A}
-
-	# Fix the build scripts to create libperl with a soname of ${SLOT}.
-	# We basically add:
-	#
-	#   -Wl,-soname -Wl,libperl.so.`echo $(LIBPERL) | cut -d. -f3`
-	#
-	# to the line that links libperl.so, and then set LIBPERL to:
-	#
-	#   LIBPERL=libperl.so.${SLOT}.`echo ${PV} | cut -d. -f1,2`
-	#
-	cd ${S}; epatch ${FILESDIR}/${P}-create-libperl-soname.patch
-
-	# uclibc support
-	cd ${S}; epatch ${FILESDIR}/${P}-uclibc.patch
-}
-
-src_compile() {
-
-	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 -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 debug
-	then
-		CFLAGS="${CFLAGS} -g"
-	fi
-
-	if use sparc
-	then
-		myconf="${myconf} -Ud_longdbl"
-	fi
-
-	if [ "${PN}" = "libperl" ]
-	then
-		rm -f config.sh Policy.sh
-
-		sh Configure -des \
-			-Darchname="${myarch}" \
-			-Dcccdlflags='-fPIC' \
-			-Dccdlflags='-rdynamic' \
-			-Dcc="${CC:-gcc}" \
-			-Dprefix='/usr' \
-			-Dvendorprefix='/usr' \
-			-Dsiteprefix='/usr' \
-			-Dlocincpth=' ' \
-			-Doptimize="${CFLAGS}" \
-			-Duselargefiles \
-			-Duseshrplib \
-			-Dman3ext='3pm' \
-			-Dlibperl="${LIBPERL}" \
-			-Dd_dosuid \
-			-Dd_semctl_semun \
-			-Dcf_by='Gentoo' \
-			-Ud_csh \
-			${myconf} || die
-
-		emake -f Makefile depend || die "Couldn't make libperl.so depends"
-		emake -f Makefile ${LIBPERL} || die "Unable to make libperl.so"
-		mv ${LIBPERL} ${WORKDIR}
-	else
-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=
-	fi
-}
-
-src_install() {
-
-	export LC_ALL="C"
-
-	if [ "${PN}" = "libperl" ]
-	then
-		dolib.so ${WORKDIR}/${LIBPERL}
-		preplib
-	else
-		# 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
-
-		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
-	fi
-
-	dodoc Changes* Artistic Copying README Todo* AUTHORS
-
-	if [ "${PN}" = "perl" ]
-	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
-
-	# Next bit is to try and setup the /usr/lib/libperl.so symlink
-	# properly ...
-	local libnumber="`ls -1 ${ROOT}usr/lib/libperl.so.?.* | grep -v '\.old' | wc -l`"
-	if [ "${libnumber}" -eq 1 ]
-	then
-		# Only this version of libperl is installed, so just link libperl.so
-		# to the *soname* version of it ...
-		ln -snf libperl.so.${PERLSLOT} ${ROOT}usr/lib/libperl.so
-	else
-		if [ -x "${ROOT}/usr/bin/perl" ]
-		then
-			# OK, we have more than one version .. first try to figure out
-			# if there are already a perl installed, if so, link libperl.so
-			# to that *soname* version of libperl.so ...
-			local perlversion="`${ROOT}/usr/bin/perl -V:version | cut -d\' -f2 | cut -d. -f1,2`"
-
-			cd ${ROOT}usr/lib
-			# Link libperl.so to the *soname* versioned lib ...
-			ln -snf `echo libperl.so.?.${perlversion} | cut -d. -f1,2,3` libperl.so
-		else
-			local x latest
-
-			# Nope, we are not so lucky ... try to figure out what version
-			# is the latest, and keep fingers crossed ...
-			for x in `ls -1 ${ROOT}usr/lib/libperl.so.?.*`
-			do
-				latest="${x}"
-			done
-
-			cd ${ROOT}usr/lib
-			# Link libperl.so to the *soname* versioned lib ...
-			ln -snf `echo ${latest##*/} | cut -d. -f1,2,3` libperl.so
-		fi
-	fi
-}
-
diff --git a/sys-devel/libperl/libperl-5.8.4-r1.ebuild b/sys-devel/libperl/libperl-5.8.4-r1.ebuild
deleted file mode 100644
index 426edf2e5cc0..000000000000
--- a/sys-devel/libperl/libperl-5.8.4-r1.ebuild
+++ /dev/null
@@ -1,387 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.4-r1.ebuild,v 1.20 2005/06/23 01:19:34 agriffis Exp $
-
-# The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
-#
-# We split the perl ebuild into libperl and perl.  The layout is as follows:
-#
-# libperl:
-#
-#  This is a slotted (SLOT=[0-9]*) ebuild, meaning we should be able to have a
-#  few versions that are not binary compadible installed.
-#
-#  How we get libperl.so multi-versioned, is by adding to the link command:
-#
-#    -Wl,-soname -Wl,libperl.so.`echo $(LIBPERL) | cut -d. -f3`
-#
-#  This gives us:
-#
-#    $(LIBPERL): $& perl$(OBJ_EXT) $(obj) $(LIBPERLEXPORT)
-#        $(LD) -o $@ $(SHRPLDFLAGS) perl$(OBJ_EXT) $(obj) \
-#              -Wl,-soname -Wl,libperl.so.`echo $(LIBPERL) | cut -d. -f3`
-#
-#  We then configure perl with LIBPERL set to:
-#
-#    LIBPERL="libperl.so.${SLOT}.`echo ${PV} | cut -d. -f1,2`"
-#
-#  Or with the variables defined in this ebuild:
-#
-#    LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
-#
-#  The result is that our 'soname' is 'libperl.so.${PERLSLOT}' (at the time of
-#  writing this for perl-5.8.0, 'libperl.so.1'), causing all apps that is linked
-#  to libperl to link to 'libperl.so.${PERLSLOT}'.
-#
-#  If a new perl version, perl-z.y.z comes out that have a libperl not binary
-#  compatible with the previous version, we just keep the previous libperl
-#  installed, and all apps linked to it will still be able to use:
-#
-#    libperl.so.${PERLSLOT}'
-#
-#  while the new ones will link to:
-#
-#    libperl.so.$((PERLSLOT+1))'
-#
-# perl:
-#
-#  Not much to this one.  It compiles with a static libperl.a, and are unslotted
-#  (meaning SLOT=0).  We thus always have the latest *stable* perl version
-#  installed, with corrisponding version of libperl.  The perl ebuild will of
-#  course DEPEND on libperl.
-#
-# Martin Schlemmer <azarah@gentoo.org> (28 Dec 2002).
-
-IUSE="berkdb debug gdbm ithreads"
-
-inherit eutils flag-o-matic
-
-# Perl has problems compiling with -Os in your flags
-use elibc_uclibc || 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="${PV%.*}"
-MY_P="perl-${PV/_rc/-RC}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
-SRC_URI="ftp://ftp.cpan.org/pub/CPAN/src/${MY_P}.tar.gz"
-HOMEPAGE="http://www.perl.org"
-RESTRICT="test"
-
-if [ "${PN}" = "libperl" ]
-then
-	SLOT="${PERLSLOT}"
-else
-	SLOT="0"
-fi
-
-LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
-
-LICENSE="Artistic GPL-2"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ~ppc64 s390 sh"
-
-DEPEND="!elibc_uclibc? ( sys-apps/groff )
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
-
-RDEPEND="
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
-
-PDEPEND=">=dev-lang/perl-${PV}"
-
-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 ""
-		epause 10
-	fi
-}
-
-src_unpack() {
-
-	unpack ${A}
-
-	# Fix the build scripts to create libperl with a soname of ${SLOT}.
-	# We basically add:
-	#
-	#   -Wl,-soname -Wl,libperl.so.`echo $(LIBPERL) | cut -d. -f3`
-	#
-	# to the line that links libperl.so, and then set LIBPERL to:
-	#
-	#   LIBPERL=libperl.so.${SLOT}.`echo ${PV} | cut -d. -f1,2`
-	#
-	cd ${S}; epatch ${FILESDIR}/${P}-create-libperl-soname.patch
-
-	# uclibc support - dragonheart 2004.06.16
-	cd ${S}; epatch ${FILESDIR}/${P}-uclibc.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
-
-}
-
-src_compile() {
-
-	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 -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 debug
-	then
-		CFLAGS="${CFLAGS} -g"
-	fi
-
-	if use sparc
-	then
-		myconf="${myconf} -Ud_longdbl"
-	fi
-
-	if [ "${PN}" = "libperl" ]
-	then
-		rm -f config.sh Policy.sh
-
-		sh Configure -des \
-			-Darchname="${myarch}" \
-			-Dcccdlflags='-fPIC' \
-			-Dccdlflags='-rdynamic' \
-			-Dcc="${CC:-gcc}" \
-			-Dprefix='/usr' \
-			-Dvendorprefix='/usr' \
-			-Dsiteprefix='/usr' \
-			-Dlocincpth=' ' \
-			-Doptimize="${CFLAGS}" \
-			-Duselargefiles \
-			-Duseshrplib \
-			-Dman3ext='3pm' \
-			-Dlibperl="${LIBPERL}" \
-			-Dd_dosuid \
-			-Dd_semctl_semun \
-			-Dcf_by='Gentoo' \
-			-Ud_csh \
-			${myconf} || die
-
-		emake -f Makefile depend || die "Couldn't make libperl.so depends"
-		emake -f Makefile ${LIBPERL} || die "Unable to make libperl.so"
-		mv ${LIBPERL} ${WORKDIR}
-	else
-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=
-	fi
-}
-
-src_install() {
-
-	export LC_ALL="C"
-
-	if [ "${PN}" = "libperl" ]
-	then
-		dolib.so ${WORKDIR}/${LIBPERL}
-		preplib
-	else
-		# 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
-
-		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
-	fi
-
-	dodoc Changes* Artistic Copying README Todo* AUTHORS
-
-	if [ "${PN}" = "perl" ]
-	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
-
-	# Next bit is to try and setup the /usr/lib/libperl.so symlink
-	# properly ...
-	local libnumber="`ls -1 ${ROOT}usr/lib/libperl.so.?.* | grep -v '\.old' | wc -l`"
-	if [ "${libnumber}" -eq 1 ]
-	then
-		# Only this version of libperl is installed, so just link libperl.so
-		# to the *soname* version of it ...
-		ln -snf libperl.so.${PERLSLOT} ${ROOT}usr/lib/libperl.so
-	else
-		if [ -x "${ROOT}/usr/bin/perl" ]
-		then
-			# OK, we have more than one version .. first try to figure out
-			# if there are already a perl installed, if so, link libperl.so
-			# to that *soname* version of libperl.so ...
-			local perlversion="`${ROOT}/usr/bin/perl -V:version | cut -d\' -f2 | cut -d. -f1,2`"
-
-			cd ${ROOT}usr/lib
-			# Link libperl.so to the *soname* versioned lib ...
-			ln -snf `echo libperl.so.?.${perlversion} | cut -d. -f1,2,3` libperl.so
-		else
-			local x latest
-
-			# Nope, we are not so lucky ... try to figure out what version
-			# is the latest, and keep fingers crossed ...
-			for x in `ls -1 ${ROOT}usr/lib/libperl.so.?.*`
-			do
-				latest="${x}"
-			done
-
-			cd ${ROOT}usr/lib
-			# Link libperl.so to the *soname* versioned lib ...
-			ln -snf `echo ${latest##*/} | cut -d. -f1,2,3` libperl.so
-		fi
-	fi
-}
-
diff --git a/sys-devel/libperl/libperl-5.8.4.ebuild b/sys-devel/libperl/libperl-5.8.4.ebuild
deleted file mode 100644
index 8fe354f61f54..000000000000
--- a/sys-devel/libperl/libperl-5.8.4.ebuild
+++ /dev/null
@@ -1,382 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.4.ebuild,v 1.20 2005/06/23 01:19:34 agriffis Exp $
-
-# The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
-#
-# We split the perl ebuild into libperl and perl.  The layout is as follows:
-#
-# libperl:
-#
-#  This is a slotted (SLOT=[0-9]*) ebuild, meaning we should be able to have a
-#  few versions that are not binary compadible installed.
-#
-#  How we get libperl.so multi-versioned, is by adding to the link command:
-#
-#    -Wl,-soname -Wl,libperl.so.`echo $(LIBPERL) | cut -d. -f3`
-#
-#  This gives us:
-#
-#    $(LIBPERL): $& perl$(OBJ_EXT) $(obj) $(LIBPERLEXPORT)
-#        $(LD) -o $@ $(SHRPLDFLAGS) perl$(OBJ_EXT) $(obj) \
-#              -Wl,-soname -Wl,libperl.so.`echo $(LIBPERL) | cut -d. -f3`
-#
-#  We then configure perl with LIBPERL set to:
-#
-#    LIBPERL="libperl.so.${SLOT}.`echo ${PV} | cut -d. -f1,2`"
-#
-#  Or with the variables defined in this ebuild:
-#
-#    LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
-#
-#  The result is that our 'soname' is 'libperl.so.${PERLSLOT}' (at the time of
-#  writing this for perl-5.8.0, 'libperl.so.1'), causing all apps that is linked
-#  to libperl to link to 'libperl.so.${PERLSLOT}'.
-#
-#  If a new perl version, perl-z.y.z comes out that have a libperl not binary
-#  compatible with the previous version, we just keep the previous libperl
-#  installed, and all apps linked to it will still be able to use:
-#
-#    libperl.so.${PERLSLOT}'
-#
-#  while the new ones will link to:
-#
-#    libperl.so.$((PERLSLOT+1))'
-#
-# perl:
-#
-#  Not much to this one.  It compiles with a static libperl.a, and are unslotted
-#  (meaning SLOT=0).  We thus always have the latest *stable* perl version
-#  installed, with corrisponding version of libperl.  The perl ebuild will of
-#  course DEPEND on libperl.
-#
-# Martin Schlemmer <azarah@gentoo.org> (28 Dec 2002).
-# fix manifest
-
-IUSE="berkdb debug gdbm ithreads"
-
-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="${PV%.*}"
-MY_P="perl-${PV/_rc/-RC}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
-SRC_URI="ftp://ftp.cpan.org/pub/CPAN/src/${MY_P}.tar.gz"
-HOMEPAGE="http://www.perl.org"
-RESTRICT="test"
-
-if [ "${PN}" = "libperl" ]
-then
-	SLOT="${PERLSLOT}"
-else
-	SLOT="0"
-fi
-
-LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
-
-LICENSE="Artistic GPL-2"
-KEYWORDS="x86 ~ppc sparc ~mips alpha arm hppa amd64 ia64 ~ppc64 s390"
-
-DEPEND="sys-apps/groff
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
-
-RDEPEND="
-	berkdb? ( sys-libs/db )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
-
-PDEPEND=">=dev-lang/perl-${PV}"
-
-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 "intepreter-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 ""
-		epause 10
-	fi
-}
-
-src_unpack() {
-
-	unpack ${A}
-
-	# Fix the build scripts to create libperl with a soname of ${SLOT}.
-	# We basically add:
-	#
-	#   -Wl,-soname -Wl,libperl.so.`echo $(LIBPERL) | cut -d. -f3`
-	#
-	# to the line that links libperl.so, and then set LIBPERL to:
-	#
-	#   LIBPERL=libperl.so.${SLOT}.`echo ${PV} | cut -d. -f1,2`
-	#
-	cd ${S}; epatch ${FILESDIR}/${P}-create-libperl-soname.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
-}
-
-src_compile() {
-
-	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 -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 debug
-	then
-		CFLAGS="${CFLAGS} -g"
-	fi
-
-	if use sparc
-	then
-		myconf="${myconf} -Ud_longdbl"
-	fi
-
-	if [ "${PN}" = "libperl" ]
-	then
-		rm -f config.sh Policy.sh
-
-		sh Configure -des \
-			-Darchname="${myarch}" \
-			-Dcccdlflags='-fPIC' \
-			-Dccdlflags='-rdynamic' \
-			-Dcc="${CC:-gcc}" \
-			-Dprefix='/usr' \
-			-Dvendorprefix='/usr' \
-			-Dsiteprefix='/usr' \
-			-Dlocincpth=' ' \
-			-Doptimize="${CFLAGS}" \
-			-Duselargefiles \
-			-Duseshrplib \
-			-Dman3ext='3pm' \
-			-Dlibperl="${LIBPERL}" \
-			-Dd_dosuid \
-			-Dd_semctl_semun \
-			-Dcf_by='Gentoo' \
-			-Ud_csh \
-			${myconf} || die
-
-		emake -f Makefile depend || die "Couldn't make libperl.so depends"
-		emake -f Makefile ${LIBPERL} || die "Unable to make libperl.so"
-		mv ${LIBPERL} ${WORKDIR}
-	else
-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=
-	fi
-}
-
-src_install() {
-
-	export LC_ALL="C"
-
-	if [ "${PN}" = "libperl" ]
-	then
-		dolib.so ${WORKDIR}/${LIBPERL}
-		preplib
-	else
-		# 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
-
-		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
-	fi
-
-	dodoc Changes* Artistic Copying README Todo* AUTHORS
-
-	if [ "${PN}" = "perl" ]
-	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
-
-	# Next bit is to try and setup the /usr/lib/libperl.so symlink
-	# properly ...
-	local libnumber="`ls -1 ${ROOT}usr/lib/libperl.so.?.* | grep -v '\.old' | wc -l`"
-	if [ "${libnumber}" -eq 1 ]
-	then
-		# Only this version of libperl is installed, so just link libperl.so
-		# to the *soname* version of it ...
-		ln -snf libperl.so.${PERLSLOT} ${ROOT}usr/lib/libperl.so
-	else
-		if [ -x "${ROOT}/usr/bin/perl" ]
-		then
-			# OK, we have more than one version .. first try to figure out
-			# if there are already a perl installed, if so, link libperl.so
-			# to that *soname* version of libperl.so ...
-			local perlversion="`${ROOT}/usr/bin/perl -V:version | cut -d\' -f2 | cut -d. -f1,2`"
-
-			cd ${ROOT}usr/lib
-			# Link libperl.so to the *soname* versioned lib ...
-			ln -snf `echo libperl.so.?.${perlversion} | cut -d. -f1,2,3` libperl.so
-		else
-			local x latest
-
-			# Nope, we are not so lucky ... try to figure out what version
-			# is the latest, and keep fingers crossed ...
-			for x in `ls -1 ${ROOT}usr/lib/libperl.so.?.*`
-			do
-				latest="${x}"
-			done
-
-			cd ${ROOT}usr/lib
-			# Link libperl.so to the *soname* versioned lib ...
-			ln -snf `echo ${latest##*/} | cut -d. -f1,2,3` libperl.so
-		fi
-	fi
-}
diff --git a/sys-devel/libperl/libperl-5.8.5-r1.ebuild b/sys-devel/libperl/libperl-5.8.5-r1.ebuild
index cbf5fad30fa0..4ffcfe4f3d84 100644
--- a/sys-devel/libperl/libperl-5.8.5-r1.ebuild
+++ b/sys-devel/libperl/libperl-5.8.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.5-r1.ebuild,v 1.9 2005/06/23 01:19:34 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.5-r1.ebuild,v 1.10 2005/06/29 22:13:08 mcummings Exp $
 
 # The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
 #
@@ -134,19 +134,19 @@ src_unpack() {
 	#
 	#   LIBPERL=libperl.so.${SLOT}.`echo ${PV} | cut -d. -f1,2`
 	#
-	cd ${S}; epatch ${FILESDIR}/${P}-create-libperl-soname.patch
+	cd ${S}; epatch ${FILESDIR}/${PN}-create-libperl-soname.patch
 
 	# uclibc support - dragonheart 2004.06.16
-	cd ${S}; epatch ${FILESDIR}/${P}-uclibc.patch
+	cd ${S}; epatch ${FILESDIR}/${PN}-uclibc.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
+	cd ${S}; epatch ${FILESDIR}/${PN}-noksh.patch
 
 	# we need the same @INC-inversion magic here we do in perl
-	cd ${S}; epatch ${FILESDIR}/${P}-reorder-INC.patch
+	cd ${S}; epatch ${FILESDIR}/${PN}-reorder-INC.patch
 }
 
 src_compile() {
diff --git a/sys-devel/libperl/libperl-5.8.5.ebuild b/sys-devel/libperl/libperl-5.8.5.ebuild
index b0ddd4b5b7a8..93c29b48c5e2 100644
--- a/sys-devel/libperl/libperl-5.8.5.ebuild
+++ b/sys-devel/libperl/libperl-5.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.5.ebuild,v 1.18 2005/06/23 01:19:34 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.5.ebuild,v 1.19 2005/06/29 22:13:08 mcummings Exp $
 
 # The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
 #
@@ -134,16 +134,16 @@ src_unpack() {
 	#
 	#   LIBPERL=libperl.so.${SLOT}.`echo ${PV} | cut -d. -f1,2`
 	#
-	cd ${S}; epatch ${FILESDIR}/${P}-create-libperl-soname.patch
+	cd ${S}; epatch ${FILESDIR}/${PN}-create-libperl-soname.patch
 
 	# uclibc support - dragonheart 2004.06.16
-	cd ${S}; epatch ${FILESDIR}/${P}-uclibc.patch
+	cd ${S}; epatch ${FILESDIR}/${PN}-uclibc.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
+	cd ${S}; epatch ${FILESDIR}/${PN}-noksh.patch
 
 }
 
diff --git a/sys-devel/libperl/libperl-5.8.6.ebuild b/sys-devel/libperl/libperl-5.8.6.ebuild
index 8253ba910e23..b0a0ee608c0c 100644
--- a/sys-devel/libperl/libperl-5.8.6.ebuild
+++ b/sys-devel/libperl/libperl-5.8.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.6.ebuild,v 1.12 2005/06/23 01:19:34 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.6.ebuild,v 1.13 2005/06/29 22:13:08 mcummings Exp $
 
 # The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
 #
@@ -68,7 +68,7 @@ HOMEPAGE="http://www.perl.org"
 SLOT="${PERLSLOT}"
 LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
 LICENSE="Artistic GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
 
 # rac 2004.08.06
 
@@ -129,16 +129,19 @@ src_unpack() {
 	#
 	#   LIBPERL=libperl.so.${SLOT}.`echo ${PV} | cut -d. -f1,2`
 	#
-	cd ${S}; epatch ${FILESDIR}/${P}-create-libperl-soname.patch
+	cd ${S}; epatch ${FILESDIR}/${PN}-create-libperl-soname.patch
 
 	# uclibc support - dragonheart 2004.06.16
-	cd ${S}; epatch ${FILESDIR}/${P}-uclibc.patch
+	cd ${S}; epatch ${FILESDIR}/${PN}-uclibc.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
+	cd ${S}; epatch ${FILESDIR}/${PN}-noksh.patch
+
+	# we need the same @INC-inversion magic here we do in perl
+	cd ${S}; epatch ${FILESDIR}/${PN}-reorder-INC.patch
 }
 
 src_compile() {
@@ -150,16 +153,22 @@ src_compile() {
 	export LC_ALL="C"
 	local myconf=""
 
+	if [[ ${KERNEL} == "Linux" ]]; then
+		osname="linux"
+	elif [[ ${KERNEL} == "FreeBSD" && "${ELIBC}" = "FreeBsd" ]]; then
+		osname="freebsd"
+	fi
+
 	if use ithreads
 	then
 		einfo "using ithreads"
 		mythreading="-multi"
 		myconf="-Dusethreads ${myconf}"
 		myarch=$(get_abi_CHOST)
-		myarch="${myarch%%-*}-linux-thread"
+		myarch="${myarch%%-*}-${osname}-thread"
 	else
 		myarch=$(get_abi_CHOST)
-		myarch="${myarch%%-*}-linux"
+		myarch="${myarch%%-*}-${osname}"
 	fi
 
 	ewarn "myarch: ${myarch}"
@@ -196,6 +205,8 @@ src_compile() {
 
 	[ -n "${ABI}" ] && myconf="${myconf} -Dusrinc=$(get_ml_incdir)"
 
+	[[ ${ELIBC} == "FreeBSD" ]] && myconf="${myconf} -Dlibc=/usr/lib/libc.a"
+
 	sh Configure -des \
 		-Darchname="${myarch}" \
 		-Dcccdlflags='-fPIC' \
diff --git a/sys-devel/libperl/libperl-5.8.2.ebuild b/sys-devel/libperl/libperl-5.8.7.ebuild
index 75a4ed7a9455..75fcbd493de2 100644
--- a/sys-devel/libperl/libperl-5.8.2.ebuild
+++ b/sys-devel/libperl/libperl-5.8.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.2.ebuild,v 1.22 2005/06/23 01:19:34 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.7.ebuild,v 1.1 2005/06/29 22:13:08 mcummings Exp $
 
 # The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
 #
@@ -52,14 +52,9 @@
 #
 # Martin Schlemmer <azarah@gentoo.org> (28 Dec 2002).
 
-IUSE="berkdb debug gdbm ithreads"
+IUSE="berkdb debug gdbm ithreads nocxx"
 
-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"
+inherit eutils flag-o-matic toolchain-funcs
 
 # The slot of this binary compat version of libperl.so
 PERLSLOT="1"
@@ -68,23 +63,24 @@ SHORT_PV="${PV%.*}"
 MY_P="perl-${PV/_rc/-RC}"
 S="${WORKDIR}/${MY_P}"
 DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
-SRC_URI="ftp://ftp.cpan.org/pub/CPAN/src/${MY_P}.tar.gz"
+SRC_URI="ftp://ftp.cpan.org/pub/CPAN/src/${MY_P}.tar.bz2"
 HOMEPAGE="http://www.perl.org"
-RESTRICT="test"
+SLOT="${PERLSLOT}"
+LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
+LICENSE="Artistic GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
-if [ "${PN}" = "libperl" ]
-then
-	SLOT="${PERLSLOT}"
-else
-	SLOT="0"
-fi
+# rac 2004.08.06
 
-LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
+# i am not kidding here. you will forkbomb yourself out of existence
+# because make check -n wants to make miniperl, which runs itself at
+# the very end to make sure it's working right. this behaves very
+# badly when you -n it, because it won't exist and will therefore try
+# to build itself again ad infinitum.
 
-LICENSE="Artistic GPL-2"
-KEYWORDS="amd64 x86 sparc ppc alpha mips hppa ia64 ppc64"
+RESTRICT="test"
 
-DEPEND="sys-apps/groff
+DEPEND="!nocxx? ( sys-apps/groff )
 	berkdb? ( sys-libs/db )
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
 
@@ -133,24 +129,51 @@ src_unpack() {
 	#
 	#   LIBPERL=libperl.so.${SLOT}.`echo ${PV} | cut -d. -f1,2`
 	#
-	cd ${S}; epatch ${FILESDIR}/${P}-create-libperl-soname.patch
+	cd ${S}; epatch ${FILESDIR}/${PN}-create-libperl-soname.patch
+
+	# uclibc support - dragonheart 2004.06.16
+	# Now upstreamed - MPC 2005.06.28
+	#cd ${S}; epatch ${FILESDIR}/${PN}-uclibc.patch
+
+	# Configure makes an unwarranted assumption that /bin/ksh is a
+	# good shell. This patch makes it revert to using /bin/sh unless
+	# /bin/ksh really is executable. Should fix bug 42665.
+	# rac 2004.06.09
+	cd ${S}; epatch ${FILESDIR}/${PN}-noksh.patch
+
+	# we need the same @INC-inversion magic here we do in perl
+	cd ${S}; epatch ${FILESDIR}/${PN}-reorder-INC.patch
 }
 
 src_compile() {
+	# Perl has problems compiling with -Os in your flags
+	use elibc_uclibc || replace-flags "-Os" "-O2"
+	# This flag makes compiling crash in interesting ways
+	filter-flags "-malign-double"
 
 	export LC_ALL="C"
 	local myconf=""
 
+	if [[ ${KERNEL} == "FreeBSD" && "${ELIBC}" = "FreeBsd" ]]; then
+		osname="freebsd"
+	else
+		osname="linux"
+	fi
+
 	if use ithreads
 	then
 		einfo "using ithreads"
 		mythreading="-multi"
 		myconf="-Dusethreads ${myconf}"
-		myarch="${CHOST%%-*}-linux-thread"
+		myarch=$(get_abi_CHOST)
+		myarch="${myarch%%-*}-${osname}-thread"
 	else
-		myarch="${CHOST%%-*}-linux"
+		myarch=$(get_abi_CHOST)
+		myarch="${myarch%%-*}-${osname}"
 	fi
 
+	ewarn "myarch: ${myarch}"
+
 	if use gdbm
 	then
 		myconf="${myconf} -Di_gdbm"
@@ -179,73 +202,35 @@ src_compile() {
 		myconf="${myconf} -Ud_longdbl"
 	fi
 
-	if [ "${PN}" = "libperl" ]
-	then
-		rm -f config.sh Policy.sh
-
-		sh Configure -des \
-			-Darchname="${myarch}" \
-			-Dcccdlflags='-fPIC' \
-			-Dccdlflags='-rdynamic' \
-			-Dcc="${CC:-gcc}" \
-			-Dprefix='/usr' \
-			-Dvendorprefix='/usr' \
-			-Dsiteprefix='/usr' \
-			-Dlocincpth=' ' \
-			-Doptimize="${CFLAGS}" \
-			-Duselargefiles \
-			-Duseshrplib \
-			-Dman3ext='3pm' \
-			-Dlibperl="${LIBPERL}" \
-			-Dd_dosuid \
-			-Dd_semctl_semun \
-			-Dcf_by='Gentoo' \
-			-Ud_csh \
-			${myconf} || die
-
-		emake -f Makefile depend || die "Couldn't make libperl.so depends"
-		emake -f Makefile ${LIBPERL} || die "Unable to make libperl.so"
-		mv ${LIBPERL} ${WORKDIR}
-	else
-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=
-	fi
+	rm -f config.sh Policy.sh
+
+	[ -n "${ABI}" ] && myconf="${myconf} -Dusrinc=$(get_ml_incdir)"
+
+	[[ ${ELIBC} == "FreeBSD" ]] && myconf="${myconf} -Dlibc=/usr/lib/libc.a"
+
+	sh Configure -des \
+		-Darchname="${myarch}" \
+		-Dcccdlflags='-fPIC' \
+		-Dccdlflags='-rdynamic' \
+		-Dcc="$(tc-getCC)" \
+		-Dprefix='/usr' \
+		-Dvendorprefix='/usr' \
+		-Dsiteprefix='/usr' \
+		-Dlocincpth=' ' \
+		-Doptimize="${CFLAGS}" \
+		-Duselargefiles \
+		-Duseshrplib \
+		-Dman3ext='3pm' \
+		-Dlibperl="${LIBPERL}" \
+		-Dd_dosuid \
+		-Dd_semctl_semun \
+		-Dcf_by='Gentoo' \
+		-Ud_csh \
+		${myconf} || die
+
+	emake -j1 -f Makefile depend || die "Couldn't make libperl.so depends"
+	emake -j1 -f Makefile LIBPERL=${LIBPERL} ${LIBPERL} || die "Unable to make libperl.so"
+	mv ${LIBPERL} ${WORKDIR}
 }
 
 src_install() {
@@ -261,9 +246,9 @@ src_install() {
 		# 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
+		dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/${LIBPERL}
+		dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl.so.${PERLSLOT}
+		dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl.so
 
 		# Fix for "stupid" modules and programs
 		dodir /usr/lib/perl5/site_perl/${PV}/${myarch}${mythreading}
@@ -333,19 +318,19 @@ EOF
 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" ]
+	if [ -f "${ROOT}usr/$(get_libdir)/libperl.so" -a ! -L "${ROOT}usr/$(get_libdir)/libperl.so" ]
 	then
-		mv -f ${ROOT}usr/lib/libperl.so ${ROOT}usr/lib/libperl.so.old
+		mv -f ${ROOT}usr/$(get_libdir)/libperl.so ${ROOT}usr/$(get_libdir)/libperl.so.old
 	fi
 
 	# Next bit is to try and setup the /usr/lib/libperl.so symlink
 	# properly ...
-	local libnumber="`ls -1 ${ROOT}usr/lib/libperl.so.?.* | grep -v '\.old' | wc -l`"
+	local libnumber="`ls -1 ${ROOT}usr/$(get_libdir)/libperl.so.?.* | grep -v '\.old' | wc -l`"
 	if [ "${libnumber}" -eq 1 ]
 	then
 		# Only this version of libperl is installed, so just link libperl.so
 		# to the *soname* version of it ...
-		ln -snf libperl.so.${PERLSLOT} ${ROOT}usr/lib/libperl.so
+		ln -snf libperl.so.${PERLSLOT} ${ROOT}usr/$(get_libdir)/libperl.so
 	else
 		if [ -x "${ROOT}/usr/bin/perl" ]
 		then
@@ -354,7 +339,7 @@ pkg_postinst() {
 			# to that *soname* version of libperl.so ...
 			local perlversion="`${ROOT}/usr/bin/perl -V:version | cut -d\' -f2 | cut -d. -f1,2`"
 
-			cd ${ROOT}usr/lib
+			cd ${ROOT}usr/$(get_libdir)
 			# Link libperl.so to the *soname* versioned lib ...
 			ln -snf `echo libperl.so.?.${perlversion} | cut -d. -f1,2,3` libperl.so
 		else
@@ -362,12 +347,12 @@ pkg_postinst() {
 
 			# Nope, we are not so lucky ... try to figure out what version
 			# is the latest, and keep fingers crossed ...
-			for x in `ls -1 ${ROOT}usr/lib/libperl.so.?.*`
+			for x in `ls -1 ${ROOT}usr/$(get_libdir)/libperl.so.?.*`
 			do
 				latest="${x}"
 			done
 
-			cd ${ROOT}usr/lib
+			cd ${ROOT}usr/$(get_libdir)
 			# Link libperl.so to the *soname* versioned lib ...
 			ln -snf `echo ${latest##*/} | cut -d. -f1,2,3` libperl.so
 		fi