moved perl from sys-devel to dev-lang

39 files changed, 2489 insertions, 45 deletions

diff --git a/dev-lang/R/R-1.4.1-r1.ebuild b/dev-lang/R/R-1.4.1-r1.ebuild
index dc899696dfdf..759f11bb0d05 100644
--- a/dev-lang/R/R-1.4.1-r1.ebuild
+++ b/dev-lang/R/R-1.4.1-r1.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/R/R-1.4.1-r1.ebuild,v 1.9 2003/02/13 10:24:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-1.4.1-r1.ebuild,v 1.10 2003/03/11 21:11:45 seemant Exp $
 
 IUSE="atlas X tcltk gnome"
 
@@ -16,7 +16,7 @@ SRC_URI="http://cran.r-project.org/src/base/${P}.tgz"
 HOMEPAGE="http://www.r-project.org/"
 
 DEPEND="virtual/glibc
-		>=sys-devel/perl-5.6.1-r3
+		>=dev-lang/perl-5.6.1-r3
 		>=sys-libs/readline-4.1-r3
 		>=sys-libs/zlib-1.1.3-r2
 		>=media-libs/jpeg-6b-r2
diff --git a/dev-lang/R/R-1.4.1.ebuild b/dev-lang/R/R-1.4.1.ebuild
index f5ec535b89dc..4b543e6f35b3 100644
--- a/dev-lang/R/R-1.4.1.ebuild
+++ b/dev-lang/R/R-1.4.1.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/R/R-1.4.1.ebuild,v 1.9 2003/02/13 10:24:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-1.4.1.ebuild,v 1.10 2003/03/11 21:11:45 seemant Exp $
 
 IUSE="atlas X tcltk gnome"
 
@@ -16,7 +16,7 @@ SRC_URI="http://cran.r-project.org/src/base/${P}.tgz"
 HOMEPAGE="http://www.r-project.org/"
 
 DEPEND="virtual/glibc
-		>=sys-devel/perl-5.6.1-r3
+		>=dev-lang/perl-5.6.1-r3
 		>=sys-libs/readline-4.1-r3
 		>=sys-libs/zlib-1.1.3-r2
 		>=media-libs/jpeg-6b-r2
diff --git a/dev-lang/R/R-1.5.1.ebuild b/dev-lang/R/R-1.5.1.ebuild
index 90afb803acdd..082d30884bea 100644
--- a/dev-lang/R/R-1.5.1.ebuild
+++ b/dev-lang/R/R-1.5.1.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/R/R-1.5.1.ebuild,v 1.8 2003/02/13 10:24:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-1.5.1.ebuild,v 1.9 2003/03/11 21:11:45 seemant Exp $
 
 IUSE="atlas X tcltk gnome"
 
@@ -16,7 +16,7 @@ SRC_URI="http://cran.r-project.org/src/base/${P}.tgz"
 HOMEPAGE="http://www.r-project.org/"
 
 DEPEND="virtual/glibc
-		>=sys-devel/perl-5.6.1-r3
+		>=dev-lang/perl-5.6.1-r3
 		>=sys-libs/readline-4.1-r3
 		>=sys-libs/zlib-1.1.3-r2
 		>=media-libs/jpeg-6b-r2
diff --git a/dev-lang/R/R-1.6.1.ebuild b/dev-lang/R/R-1.6.1.ebuild
index a345780e3bbb..435a01bd0e97 100644
--- a/dev-lang/R/R-1.6.1.ebuild
+++ b/dev-lang/R/R-1.6.1.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/R/R-1.6.1.ebuild,v 1.3 2003/02/13 10:24:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-1.6.1.ebuild,v 1.4 2003/03/11 21:11:45 seemant Exp $
 
 IUSE="atlas X tcltk gnome"
 
@@ -16,7 +16,7 @@ SRC_URI="http://cran.r-project.org/src/base/${P}.tgz"
 HOMEPAGE="http://www.r-project.org/"
 
 DEPEND="virtual/glibc
-		>=sys-devel/perl-5.6.1-r3
+		>=dev-lang/perl-5.6.1-r3
 		>=sys-libs/readline-4.1-r3
 		>=sys-libs/zlib-1.1.3-r2
 		>=media-libs/jpeg-6b-r2
diff --git a/dev-lang/entity/entity-0.7.2-r1.ebuild b/dev-lang/entity/entity-0.7.2-r1.ebuild
index 5b42e05cfa10..5dd6f75fd193 100644
--- a/dev-lang/entity/entity-0.7.2-r1.ebuild
+++ b/dev-lang/entity/entity-0.7.2-r1.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/entity/entity-0.7.2-r1.ebuild,v 1.11 2003/02/13 10:24:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/entity/entity-0.7.2-r1.ebuild,v 1.12 2003/03/11 21:11:45 seemant Exp $
 
 IUSE="sdl gnome ssl opengl python tcltk perl"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.entity.cx"
 DEPEND=">=media-libs/imlib-1.9.10-r1
 	>=dev-libs/libpcre-3.2
 	tcltk? ( >=dev-lang/tk-8.1.1 )
-	perl? ( >=sys-devel/perl-5.6 )
+	perl? ( >=dev-lang/perl-5.6 )
 	python? ( >=dev-lang/python-2.0-r4 )
 	sdl? ( >=media-libs/libsdl-1.1.7 )
 	ssl? ( >=dev-libs/openssl-0.9.6 )
diff --git a/dev-lang/entity/entity-0.7.2.ebuild b/dev-lang/entity/entity-0.7.2.ebuild
index bf46465f33bd..d75b7fbd09aa 100644
--- a/dev-lang/entity/entity-0.7.2.ebuild
+++ b/dev-lang/entity/entity-0.7.2.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/entity/entity-0.7.2.ebuild,v 1.22 2003/02/13 10:24:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/entity/entity-0.7.2.ebuild,v 1.23 2003/03/11 21:11:45 seemant Exp $
 
 IUSE="sdl gnome ssl opengl python tcltk perl"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.entity.cx"
 DEPEND=">=media-libs/imlib-1.9.10-r1
 	>=dev-libs/libpcre-3.2
 	tcltk? ( >=dev-lang/tk-8.1.1 )
-	perl? ( >=sys-devel/perl-5.6 )
+	perl? ( >=dev-lang/perl-5.6 )
 	python? ( >=dev-lang/python-2.0-r4 )
 	sdl? ( >=media-libs/libsdl-1.1.7 )
 	ssl? ( >=dev-libs/openssl-0.9.6 )
diff --git a/dev-lang/erlang/erlang-8b.ebuild b/dev-lang/erlang/erlang-8b.ebuild
index ecebbd38665d..5bbb9c79778d 100644
--- a/dev-lang/erlang/erlang-8b.ebuild
+++ b/dev-lang/erlang/erlang-8b.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/erlang/erlang-8b.ebuild,v 1.4 2003/02/13 10:24:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-8b.ebuild,v 1.5 2003/03/11 21:11:45 seemant Exp $
 
 IUSE="X ssl"
 
@@ -13,7 +13,7 @@ LICENSE="EPL"
 SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc "
 
-DEPEND=">=sys-devel/perl-5.6.1
+DEPEND=">=dev-lang/perl-5.6.1
 	X?	( >=x11-base/xfree-4.2.0-r12 )
 	ssl?	( >=dev-libs/openssl-0.9.6d )"
 
diff --git a/dev-lang/erlang/erlang-9b.ebuild b/dev-lang/erlang/erlang-9b.ebuild
index c10d5c1ba319..9f7478609ce8 100644
--- a/dev-lang/erlang/erlang-9b.ebuild
+++ b/dev-lang/erlang/erlang-9b.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/erlang/erlang-9b.ebuild,v 1.2 2003/02/13 10:24:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-9b.ebuild,v 1.3 2003/03/11 21:11:45 seemant Exp $
 
 IUSE="X ssl"
 
@@ -13,7 +13,7 @@ LICENSE="EPL"
 SLOT="0"
 KEYWORDS="~x86"
 
-DEPEND=">=sys-devel/perl-5.6.1
+DEPEND=">=dev-lang/perl-5.6.1
 	X?	( >=x11-base/xfree-4.2.0-r12 )
 	ssl?	( >=dev-libs/openssl-0.9.6d )"
 
diff --git a/dev-lang/ghc-bin/ghc-bin-5.04.2.ebuild b/dev-lang/ghc-bin/ghc-bin-5.04.2.ebuild
index 101b8a363e41..92b60d300ef0 100644
--- a/dev-lang/ghc-bin/ghc-bin-5.04.2.ebuild
+++ b/dev-lang/ghc-bin/ghc-bin-5.04.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ghc-bin-5.04.2.ebuild,v 1.3 2003/02/13 10:25:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc-bin/ghc-bin-5.04.2.ebuild,v 1.4 2003/03/11 21:11:45 seemant Exp $
 
 IUSE="opengl"
 
@@ -15,7 +15,7 @@ KEYWORDS="~x86 -ppc ~sparc -alpha"
 SLOT="0"
 
 DEPEND="virtual/glibc"
-RDEPEND=">=sys-devel/perl-5.6.1
+RDEPEND=">=dev-lang/perl-5.6.1
 	>=sys-devel/gcc-2.95.3
 	>=dev-libs/gmp-4.1
 	opengl? ( virtual/opengl
diff --git a/dev-lang/ghc/ghc-5.02.3.ebuild b/dev-lang/ghc/ghc-5.02.3.ebuild
index 126de8a5560b..256fad10bc0f 100644
--- a/dev-lang/ghc/ghc-5.02.3.ebuild
+++ b/dev-lang/ghc/ghc-5.02.3.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/ghc/ghc-5.02.3.ebuild,v 1.13 2003/02/13 10:25:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-5.02.3.ebuild,v 1.14 2003/03/11 21:11:45 seemant Exp $
 
 IUSE="doc tetex opengl"
 
@@ -43,7 +43,7 @@ KEYWORDS="x86 sparc "
 
 # FIXME: Add USE support for parallel haskell (requires PVM)
 #	Get PVM from ftp://ftp.netlib.org/pvm3/
-DEPEND=">=sys-devel/perl-5.6.1
+DEPEND=">=dev-lang/perl-5.6.1
 	>=sys-devel/gcc-2.95.3
 	>=sys-devel/make-3.79.1
 	>=sys-apps/sed-3.02.80
@@ -59,7 +59,7 @@ DEPEND=">=sys-devel/perl-5.6.1
 		virtual/glut )"
 
 RDEPEND=">=sys-devel/gcc-2.95.3
-	>=sys-devel/perl-5.6.1
+	>=dev-lang/perl-5.6.1
 	opengl? ( virtual/opengl virtual/glu virtual/glut )"
 
 
diff --git a/dev-lang/ghc/ghc-5.04.2.ebuild b/dev-lang/ghc/ghc-5.04.2.ebuild
index 96addab98014..7d2cd24dd2b0 100644
--- a/dev-lang/ghc/ghc-5.04.2.ebuild
+++ b/dev-lang/ghc/ghc-5.04.2.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/ghc/ghc-5.04.2.ebuild,v 1.3 2003/03/08 23:21:18 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-5.04.2.ebuild,v 1.4 2003/03/11 21:11:45 seemant Exp $
 
 #Some explanation of bootstrap logic:
 #
@@ -40,7 +40,7 @@ KEYWORDS="~x86 ~sparc"
 # FIXME: Add USE support for parallel haskell (requires PVM)
 #        Get PVM from ftp://ftp.netlib.org/pvm3/
 DEPEND=">=dev-lang/ghc-bin-5.04
-	>=sys-devel/perl-5.6.1
+	>=dev-lang/perl-5.6.1
 	>=sys-devel/gcc-2.95.3
 	>=sys-devel/make-3.79.1
 	>=sys-apps/sed-3.02.80
@@ -52,7 +52,7 @@ DEPEND=">=dev-lang/ghc-bin-5.04
 
 RDEPEND="virtual/glibc
 	>=sys-devel/gcc-2.95.3
-	>=sys-devel/perl-5.6.1
+	>=dev-lang/perl-5.6.1
 	opengl? ( virtual/opengl virtual/glu virtual/glut )"
 
 
diff --git a/dev-lang/ghc/ghc-5.04.ebuild b/dev-lang/ghc/ghc-5.04.ebuild
index d3e10fb2af8c..2c97e837c519 100644
--- a/dev-lang/ghc/ghc-5.04.ebuild
+++ b/dev-lang/ghc/ghc-5.04.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/ghc/ghc-5.04.ebuild,v 1.7 2003/02/13 10:25:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-5.04.ebuild,v 1.8 2003/03/11 21:11:45 seemant Exp $
 
 IUSE="opengl"
 
@@ -42,7 +42,7 @@ KEYWORDS="x86 sparc "
 # FIXME: Add USE support for parallel haskell (requires PVM)
 #        Get PVM from ftp://ftp.netlib.org/pvm3/
 DEPEND="virtual/glibc
-		>=sys-devel/perl-5.6.1
+		>=dev-lang/perl-5.6.1
 		>=sys-devel/gcc-2.95.3
 		>=sys-devel/make-3.79.1
 		>=sys-apps/sed-3.02.80
@@ -54,7 +54,7 @@ DEPEND="virtual/glibc
 
 RDEPEND="virtual/glibc
 		>=sys-devel/gcc-2.95.3
-		>=sys-devel/perl-5.6.1
+		>=dev-lang/perl-5.6.1
 		opengl? ( virtual/opengl virtual/glu virtual/glut )"
 
 
diff --git a/dev-lang/nasm/nasm-0.98.31-r1.ebuild b/dev-lang/nasm/nasm-0.98.31-r1.ebuild
index a3f70958209e..2b0835a7662c 100644
--- a/dev-lang/nasm/nasm-0.98.31-r1.ebuild
+++ b/dev-lang/nasm/nasm-0.98.31-r1.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/nasm/nasm-0.98.31-r1.ebuild,v 1.11 2003/02/13 10:27:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-0.98.31-r1.ebuild,v 1.12 2003/03/11 21:11:45 seemant Exp $
 
 IUSE="doc build"
 
@@ -9,7 +9,7 @@ DESCRIPTION="groovy little assembler"
 SRC_URI="mirror://sourceforge/nasm/${P}.tar.bz2"
 HOMEPAGE="http://nasm.sourceforge.net/"
 
-DEPEND="build? ( sys-devel/perl )
+DEPEND="build? ( dev-lang/perl )
 	doc? ( app-text/ghostscript sys-apps/texinfo )
 	sys-devel/gcc"
 
diff --git a/dev-lang/nasm/nasm-0.98.31.ebuild b/dev-lang/nasm/nasm-0.98.31.ebuild
index 0d28030073b9..54321bc61dbe 100644
--- a/dev-lang/nasm/nasm-0.98.31.ebuild
+++ b/dev-lang/nasm/nasm-0.98.31.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/nasm/nasm-0.98.31.ebuild,v 1.10 2003/02/13 10:27:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-0.98.31.ebuild,v 1.11 2003/03/11 21:11:45 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="groovy little assembler"
@@ -10,7 +10,7 @@ HOMEPAGE="http://nasm.sourceforge.net/"
 DEPEND="virtual/glibc sys-apps/texinfo"
 
 if [ -z "`use build`" ]; then
-	DEPEND="${DEPEND} sys-devel/perl"
+	DEPEND="${DEPEND} dev-lang/perl"
 fi
 
 SLOT="0"
diff --git a/dev-lang/nasm/nasm-0.98.34.ebuild b/dev-lang/nasm/nasm-0.98.34.ebuild
index fc30aff956bd..0192ce6db7c4 100644
--- a/dev-lang/nasm/nasm-0.98.34.ebuild
+++ b/dev-lang/nasm/nasm-0.98.34.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/nasm/nasm-0.98.34.ebuild,v 1.6 2003/02/13 10:27:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-0.98.34.ebuild,v 1.7 2003/03/11 21:11:45 seemant Exp $
 
 IUSE="doc build"
 
@@ -9,7 +9,7 @@ DESCRIPTION="groovy little assembler"
 SRC_URI="mirror://sourceforge/nasm/${P}.tar.bz2"
 HOMEPAGE="http://nasm.sourceforge.net/"
 
-DEPEND="build? ( sys-devel/perl )
+DEPEND="build? ( dev-lang/perl )
 	doc? ( app-text/ghostscript sys-apps/texinfo )
 	sys-devel/gcc"
 
diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
new file mode 100644
index 000000000000..1bc0a2d5aff6
--- /dev/null
+++ b/dev-lang/perl/ChangeLog
@@ -0,0 +1,360 @@
+# ChangeLog for sys-devel/perl
+# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.1 2003/03/11 21:11:45 seemant Exp $
+
+*perl-5.8.0-r10 (11 Mar 2003)
+
+  11 Mar 2003; Seemant Kulleen <seemant@gentoo.org> perl-5.6.1-r10.ebuild,
+  perl-5.6.1-r11.ebuild, perl-5.8.0-r10.ebuild, perl-5.8.0-r9.ebuild,
+  files/5.6.1-builtin-fixup.diff, files/5.6.1-op-test-fix.diff,
+  files/libperl-5.8.0-create-libperl-soname.patch, files/libperl_rebuilder,
+  files/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch,
+  files/perl-5.8.0-perldoc-emptydirs.patch,
+  files/perl-5.8.0-prelink-lpthread.patch,
+  files/perl-5.8.0-sockatmark-should-__THROW.patch, files/stat.t:
+  moved to dev-lang from sys-devel
+
+*perl-5.8.0-r10 (28 Feb 2003)
+
+  01 Mar 2003; Brandon Low <lostlogic@gentoo.org> perl-5.8.0-r10.ebuild,
+  perl-5.8.0-r9.ebuild:
+  Make use emake instead of make, but still use 1 process build where needed
+
+  28 Feb 2003; <rac@gentoo.org> perl-5.8.0-r10.ebuild:
+  Ensure that libpthread is linked against by perl, so that runtime
+  signal handling works correctly (bug #14380).
+  
+  Patch perldoc to not abort when it attempts to search nonexistent
+  directories (bug #16589).
+
+*perl-5.6.1-r11 (14 Feb 2003)
+
+  14 Feb 2003; Mark Guertin <gerk@gentoo.org> perl-5.6.1-r11.ebuild :
+  Set to ppc stable
+
+  14 Feb 2003; Mark Guertin <gerk@gentoo.org> perl-5.6.1-r11.ebuild files/5.6.1-builtin-fixup.diff files/5.6.1-op-test-fix.diff files/digest-perl-5.6.1-r11 :
+  built-in sed fixups, placed in makefile.SH instead of randomly thru the build.  Thanks to rac for all his help and an lfs patch
+
+  11 Feb 2003; Guy Martin <gmsoft@gentoo.org> perl-5.8.0-r9.ebuild :
+  Added hppa to keywords.
+
+*perl-5.8.0-r9 (15 Jan 2003)
+
+  23 Feb 2003; Guy Martin <gmsoft@gentoo.org> perl-5.8.0-r9.ebuild :
+  Added -fPIC to CFLAGS on hppa. It's needed by apps linking to some perl libs.
+
+  18 Feb 2003; Zach Welch <zwelch@gentoo.org> perl-5.8.0-r9.ebuild :
+  Added arm to keywords.
+
+  10 Feb 2003; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
+
+  removed old and crusty ebuilds, there were just way too many in here.
+  Also, changed sed statements to use : instead of /
+
+  05 Feb 2003; J Robert Ray <jrray@gentoo.org> perl-5.8.0-r9.ebuild; Changed to strip
+  "-malign-double" from CFLAGS, fixing bug 14608.
+
+  17 Jan 2003;Michael Cummings <mcummings@gentoo.org> perl-5.8.0-r9;
+
+  Another blundered typo. The flag-o-matic include had a "0" instead of a "O"
+
+  16 Jan 2003; Michael Cummings <mcummings@gentoo.org> perl-5.8.0-r9;
+
+  Typo fix, this one in an einfo.
+  Incorporate flag-o-matic per bug 13952 - the -Os flag doesn't work with perl
+
+  15 Jan 2003; Michael Cummings <mcummings@gentoo.org> perl-5.8.0-r9;
+
+  Major typo corrections that affected the placement of scripts and the man
+  pages. There was a typo introduced into the 5.8 ebuilds early on that was
+  not caught until now that left the location of the man pages blank and that 
+  misset the /usr call for scripts placement from perl modules. This was caught
+  in bugs 13886 and 13920
+
+  15 Jan 2003; J Robert Ray <jrray@gentoo.org> libperl_rebuilder : Fixed
+  unfortunate typo.
+
+* perl-5.8.0-r8 (06 Jan 2003)
+
+  12 Jan 2003; Michael Cummings <mcummings@gentoo.org> perl-5.8.0-r8,
+  libperl_rebuilder:
+  
+  ebuild - Put a sleep where we had one in the else block so that there is a
+  pause before emerging (notice regarding threads). Added a sleep at the tail
+  end of the ebuild so that there is a pause for folks doing an emerge -u world
+  so that they at leat have an opportunity to see the notice.
+  libperl_rebuilder - Removed the unmerge section, that's really overkill for
+  our needs and only complicates things. Added new syntax to check for files
+  installed into /usr/lib/perl* that weren't picked up previously. Changed the
+  name of the log file to perl-update.log (makes more sense ;) ) Added mask
+  check earlier in the sanity phase.
+
+  08 Jan 2003; Seemant Kulleen <seemant@gentoo.org> perl-5.8.0-r8.ebuild :
+
+  Unmasked for sparc.
+
+  08 Jan 2003; Brandon Low <lostlogic@gentoo.org> perl-5.8.0-r8:
+  Later that day:  dosed smells funny, switch some of it
+  to use just sed and a for loop, this smells better
+  to me, and fixed the problems I was having with
+  ${D} staying in the files.
+
+  08 Jan 2003; Martin Schlemmer <azarah@gentoo.org> perl-5.8.0-r8:
+  Remove  a wild 'test' from comments =)
+
+  08 Jan 2003; Michael Cummings <mcummings@gentoo.org> perl-5.8.0-r8:
+  Unmasking for x86.
+
+  08 Jan 2003; Brandon Low <lostlogic@gentoo.org> perl-5.8.0-r8:
+  Updated ewarn at the top so that it makes sense (was telling a user
+  they could use threads when they already were)
+
+  06 Jan 2003; Michael Cummings <mcummings@gentoo.org> perl-5.8.0-r8:
+  Updated einfo, added libperl ebuild. I've placed the libperl rebuilder
+  in the filesdir and added a note about it to the pkg_postinstall. Thanks
+  go to Azarah for the new set of ebuilds.
+
+  03 Jan 2002; Michael Cummings <mcummings@gentoo.org> perl-5.6.1-r10:
+  small fix to regex of x2p/makefile - cp'ied the process further down the
+  ebuild since this is rebuilt at each stage. This is for gcc-3.2 users 
+  in particular and should take care of bug 12853
+  
+  27 Dec 2002;  Michael Cummings <mcummings@gentoo.org>
+  perl-5.8.0-r7.ebuild:
+   
+  Added depend for automake
+
+  27 Dec 2002;  Michael Cummings <mcummings@gentoo.org>
+  perl-5.6.1-r10:
+
+  Added depend for automake
+   
+  27 Dec 2002;  Michael Cummings <mcummings@gentoo.org>
+  perl-5.8.0-r7.ebuild:
+
+  Note for remerging perl modules added. Unmasked for x86.
+    
+* perl-5.8.0-r7 (22 Dec 2002)
+
+  22 Dec 2002; Michael Cummings <mcummings@gentoo.org>
+  perl-5.8.0-r7.ebuild:
+
+  PLEASE READ. There was a problem introduced for non threaded perl
+  5.8's - a correction introduced earlier for threaded perls was adding
+  -thread to the name of your arch. THIS CAUSES PROBLEMS FOR SOME
+  MODULES. For instance, the DBI module checks to see what the name of
+  your Config.pm has listed for $Config{archname} - if it had thread in
+  it *anywhere*, it assumed you had threading enabled, but since your
+  perl was failing to use threads, would fail. This will version of the
+  ebuild will correct that. You will need to re-emerge modules installed
+  with perl 5.8. A tool for this is forthcoming.
+    
+  
+  20 Dec 2002; Michael Cummings <mcummings@gentoo.org>
+  perl-5.8.0-r6.ebuild:
+  
+  Finished what Lostlogic started - finished path corrections for
+  threading vs unthreaded perl 5.8
+  
+  20 Dec 2002; Michael Cummings <mcummings@gentoo.org>
+  perl-5.6.1-r10.ebuild:
+
+  new ebuild confirmed by arch devs - Gerk did ppc, Alron did sparc
+
+* perl-5.6.1-r10 (19 Dec 2002)
+
+  07 Feb 2003; Guy Martin <gmsoft@gentoo.org> perl-5.6.1-r9.ebuild perl-5.6.1-r10.ebuild :
+  Added hppa to keywords.
+
+  19 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
+  Unmasking for mips 
+
+  19 Dec 2002; Michael Cummings <mcummings@gentoo.org>
+  perl-5.6.1-r10.ebuild:
+
+  Contains patch for safe.pm - security bug, see bug 12190.
+
+  19 Dec 2002; Michael Cummings <mcummings@gentoo.org>
+  perl-5.8.0-r6.ebuild:
+
+  Same name, different ebuild. This is for the safe.pm fix.
+
+* perl-5.8.0-r6 (17 Dec 2002)
+
+  17 Dec 2002; Brandon Low <lostlogic@gentoo.org> perl-5.8.0-r6.ebuild :
+  -arch this bad boy, it reb0rk what I unb0rk last night, stick with -r5
+  will probably skip -r6 for the moment and go to -r7 with some more 
+  fixage when we know what to refix more :)
+
+  17 Dec 2002; Michael Cummings <mcummings@gentoo.org>
+  perl-5.8.0-r6.ebuild:
+
+  Further fixes to path writing. If the user asks for threading, the
+  dirs are $[arch]-linux-thread-multi. If not, the paths are
+  $[arch]-linux - this is correct behaviour!! Installation with
+  threading is *not* supported by all apps that dep perl.
+
+* perl-5.8.0-r5 (17 Dec 2002)
+
+  17 Dec 2002; Brandon Low <lostlogic@gentoo.org> perl-5.8.0-r5.ebuild:
+
+  Fix threading use flag thingus, it doesn't put things in ${D}/${D} later 
+  now.  Fix messages to only display if needed.  You will need to remerge
+  all your perl modules after you install this with threads.
+
+* perl-5.8.0-r4 (15 Dec 2002)
+
+  15 Dec 2002; Michael Cummings <mcummings@gentoo.org>
+  perl-5.8.0-r4.ebuild:
+
+  Made threading an internal use flag. This is to be used with caution.
+  Added eerror messages to warn users of potential probs.
+
+  13 Dec 2002; Martin Schlemmer <azarah@gentoo.org> perl-5.6.1-r9.ebuild :
+
+  Fix screwup in DEPEND, RDEPEND and PDEPEND.
+
+  12 Dec 2002; Michael Cummings <mcummings@gentoo.org>
+  perl-5.6.1-r9.ebuild:
+
+  PDEPEND is in portage now, can unmask this. This -r installs the
+  makemaker fix after installing perl - finally fixed. Thanks carpaski!
+
+  11 Dec 2002; Michael Cummings <mcummings@gentoo.org>
+  perl-5.8.0-r3.ebuild:
+
+  Busy day =:) Added LC_ALL=C into 5.8 (a fix made for 5.6.1, but lost)
+
+  11 Dec 2002; Michael Cummings <mcummings@gentoo.org>
+  perl-5.8.0-r3.ebuild:
+
+  Changed emake back to make. bcowan pointed out that the parallel
+  make fails for him, which is legit
+  
+  11 Dec 2002; Michael Cummings <mcummings@gentoo.org> 
+  perl-5.6.1-r9.ebuild:
+
+  Pulled until PDEPEND is in. This worked only for those not behind
+  firewalls, and unfortunately perl needs to work across the board.
+
+*perl-5.6.1-r9 (10 Dec 2002)
+
+  10 Dec 2002; Michael Cummings <mcummings@gentoo.org>
+  perl-5.6.1-r9.ebuild:
+
+  Major fixes, including the inclusion of the ExtUtils-MakeMaker fix
+  directly into perl's ebuild (thanks seemant!).
+  
+* Autoupdate keywords (12-6-02)
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  26 Nov 2002; Michael Cummings <mcummings@gentoo.org>:
+
+  Corrected deps in perl-5.6.1-r8 per bugs 4116 and 9314
+
+*perl-5.6.1-r8 (13 Oct 2002)
+
+  22 Nov 2002; <mcummings@gentoo.org>
+
+  Added einfo note (finally) to instruct users to install MakeMaker
+  patch. Also added catch for cases where -gdbm and -berkdb are in 
+  the use flags - perl requires at least one of them to be available
+
+  Second incantation of -r8. This time, it is for LC_ALL=C being added to 
+  the ebuild itself. Perl won't compile correctly otherwise and handles
+  internationaliztion post install.
+
+  13 Oct 2002; Seemant Kulleen <seemant@gentoo.org> perl-5.6.1-r8.ebuild
+  files/digest-perl-5.6.1-r8 :
+
+  The fixes from -r7 didn't seem to make it into portage. So this version
+  has those, plus the updated MakeMaker.  should close bug #8998 by
+  rac@intrigue.com (Robert Coie)
+
+*perl-5.6.1-r7 (02 Oct 2002)
+
+  02 Oct 2002; mcummings <mcummings@gentoo.org> : Thanks entirely to seemant, 
+  this release incorporates the MakeMaker fix directly into perl ebuild process.
+  
+*perl-5.8.0-r3 (13 Sep 2002)
+
+  13 Sep 2002; <mcummings@gentoo.org> : r3 is a cleaner ebuild that should have   added support for other platforms.
+
+*perl-5.8.0-r2 (16 Aug 2002)
+
+  16 Aug 2002; Michael Cummings <mcummings@gentoo.org> : added
+  fix for gcc compile flags that corrects problems with apps 
+  compiling against perl. 
+
+*perl-5.8.0-r1 (10 Aug 2002)
+
+  05 Aug 2002; Michael Cummings <mcummings@gentoo.org> : added 
+  threading, fixed hard coded architecture prefix, cleaned up
+  ebuild
+
+*perl-5.8.0 (28 Jul 2002)
+
+  05 Aug 2002; pvdabeel <pvdabeel@gentoo.org> : fix header
+
+  28 Jul 2002; Maik Schreiber <blizzy@gentoo.org> : version bump
+
+*perl-5.6.1-r6 (04 Aug 2002)
+
+  27 Aug 2002; mcummings <mcummings@gentoo.org> : Added stat.t fix,
+  fixes compile problems on boxes with no suid's in the */bin's
+  bug 7120, affects fresh installs only
+
+  05 Aug 2002; pvdabeel <pvdabee@gentoo.org> : Added ppc keyword
+  
+  05 Aug 2002; pvdabeel <pvdabee@gentoo.org> : changelog entry
+
+*perl-5.6.1-r5 (25 Jul 2002)
+
+  05 Aug 2002; pvdabeel <pvdabeel@gentoo.org> :
+  fix header
+
+  26 Jul 2002; Spider <spider@gentoo.org> :
+  fix SRC_URI to become pub/CPAN instead of pub/perl/CPAN
+  
+  25 Jul 2002; Spider <spider@gentoo.org> perl-5.6.1-r5.ebuild
+  minor patch to make it build on my gcc 3.1-r8 system
+  
+*perl-5.6.1-r4 (20 May 2002)
+
+  05 Aug 2002; pvdabeel <pvdabeel@gentoo.org> : 
+  fix header
+
+  26 Jul 2002; Spider <spider@gentoo.org> :
+  fix SRC_URI to become pub/CPAN instead of pub/perl/CPAN
+    
+  20 May 2002; Preston A. Elder <prez@gentoo.org> perl-5.6.1-r4.ebuild
+  files/digest-perl-5.6.1-r4 :
+
+  Added ebuild that works with gcc 3.1.
+
+*perl-5.6.1-r3 (5 May 2002)
+
+  5 May 2002; Seemant Kulleen <seemant@gentoo.org> perl-5.6.1-r4.ebuild
+  files/digest-perl-5.6.1-r4 :
+
+  Added an eclass called perl-post.eclass, which this ebuild now inherits,
+  so that the .pod file in ${libarchdir} gets updated cleanly with
+  emerging and unmerging.
+
+*perl-5.6.1-r3 (21 Mar 2002)
+
+  21 Mar 2002; Seemant Kulleen <seemant@gentoo.org> perl-5.6.1-r3.ebuild :
+
+  HTML documentation no longer gets gzipped, but a revision upgrade wasn't
+  absolutely necessary, I don't think.  Thanks to stefan@mdy.univie.ac.at
+  for pointing it out.
+
+*perl-5.6.1-r3 (1 Feb 2002)
+
+  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  
+  Added initial ChangeLog which should be updated whenever the package is
+  updated in any way. This changelog is targetted to users. This means that the
+  comments should well explained and written in clean English. The details about
+  writing correct changelogs are explained in the skel.ChangeLog file which you
+  can find in the root directory of the portage repository.
diff --git a/dev-lang/perl/files/5.6.1-builtin-fixup.diff b/dev-lang/perl/files/5.6.1-builtin-fixup.diff
new file mode 100644
index 000000000000..a1f0735dda2a
--- /dev/null
+++ b/dev-lang/perl/files/5.6.1-builtin-fixup.diff
@@ -0,0 +1,22 @@
+diff -Naur perl-5.6.1.orig/makedepend.SH perl-5.6.1/makedepend.SH
+--- perl-5.6.1.orig/makedepend.SH	2001-03-19 07:33:17.000000000 +0000
++++ perl-5.6.1/makedepend.SH	2002-05-27 02:27:08.000000000 +0000
+@@ -141,6 +141,8 @@
+         $cppstdin $finc -I. $cppflags $cppminus <UU/$file.c |
+         $sed \
+     	    -e '/^#.*<stdin>/d' \
++            -e '/^#.*<built-in>/d' \
++            -e '/^#.*<command line>/d' \
+ 	    -e '/^#.*"-"/d' \
+ 	    -e 's#\.[0-9][0-9]*\.c#'"$file.c#" \
+ 	    -e 's/^[	 ]*#[	 ]*line/#/' \
+@@ -155,6 +157,8 @@
+         $sed \
+ 	    -e '1d' \
+ 	    -e '/^#.*<stdin>/d' \
++            -e '/^#.*<built-in>/d' \
++            -e '/^#.*<command line>/d' \
+ 	    -e '/^#.*"-"/d' \
+ 	    -e 's#\.[0-9][0-9]*\.c#'"$file.c#" \
+ 	    -e 's/^[	 ]*#[	 ]*line/#/' \
+
diff --git a/dev-lang/perl/files/5.6.1-op-test-fix.diff b/dev-lang/perl/files/5.6.1-op-test-fix.diff
new file mode 100644
index 000000000000..ab22b07b65b4
--- /dev/null
+++ b/dev-lang/perl/files/5.6.1-op-test-fix.diff
@@ -0,0 +1,11 @@
+--- t/op/stat.t.orig	2003-02-14 18:38:23.000000000 +0000
++++ t/op/stat.t	2003-02-14 18:39:34.000000000 +0000
+@@ -180,7 +180,7 @@
+ die "Can't run op/stat.t test 35 without pwd working" unless $cwd;
+ my @bin = grep {-d} ($^O eq 'machten' ?
+ 		     qw(/usr/bin /bin) :
+-		     qw(/sbin /usr/sbin /bin /usr/bin));
++		     qw(/sbin /usr/sbin /bin /usr/bin /usr/lib/misc));
+ unless (@bin) { print ("not ok 35\n"), goto tty_test; }
+ for my $bin (@bin) {
+     opendir BIN, $bin or die "Can't opendir $bin: $!";
diff --git a/dev-lang/perl/files/digest-perl-5.6.1-r10 b/dev-lang/perl/files/digest-perl-5.6.1-r10
new file mode 100644
index 000000000000..a1b30f92f979
--- /dev/null
+++ b/dev-lang/perl/files/digest-perl-5.6.1-r10
@@ -0,0 +1 @@
+MD5 ec1ff15464809b562aecfaa2e65edba6 perl-5.6.1.tar.gz 5983695
diff --git a/dev-lang/perl/files/digest-perl-5.6.1-r11 b/dev-lang/perl/files/digest-perl-5.6.1-r11
new file mode 100644
index 000000000000..a1b30f92f979
--- /dev/null
+++ b/dev-lang/perl/files/digest-perl-5.6.1-r11
@@ -0,0 +1 @@
+MD5 ec1ff15464809b562aecfaa2e65edba6 perl-5.6.1.tar.gz 5983695
diff --git a/dev-lang/perl/files/digest-perl-5.8.0-r10 b/dev-lang/perl/files/digest-perl-5.8.0-r10
new file mode 100644
index 000000000000..517f2bed79ae
--- /dev/null
+++ b/dev-lang/perl/files/digest-perl-5.8.0-r10
@@ -0,0 +1 @@
+MD5 d9bdb180620306023fd35901a2878b62 perl-5.8.0.tar.gz 11023084
diff --git a/dev-lang/perl/files/digest-perl-5.8.0-r9 b/dev-lang/perl/files/digest-perl-5.8.0-r9
new file mode 100644
index 000000000000..517f2bed79ae
--- /dev/null
+++ b/dev-lang/perl/files/digest-perl-5.8.0-r9
@@ -0,0 +1 @@
+MD5 d9bdb180620306023fd35901a2878b62 perl-5.8.0.tar.gz 11023084
diff --git a/dev-lang/perl/files/libperl-5.8.0-create-libperl-soname.patch b/dev-lang/perl/files/libperl-5.8.0-create-libperl-soname.patch
new file mode 100644
index 000000000000..f68fb8cc9ce8
--- /dev/null
+++ b/dev-lang/perl/files/libperl-5.8.0-create-libperl-soname.patch
@@ -0,0 +1,12 @@
+--- perl-5.8.0/Makefile.SH.orig	2002-12-28 07:46:27.000000000 +0200
++++ perl-5.8.0/Makefile.SH	2002-06-09 19:04:06.000000000 +0200
+@@ -480,7 +480,7 @@
+ 	case "$useshrplib" in
+ 	true)
+ 		$spitshell >>Makefile <<'!NO!SUBS!'
+-	$(LD) -o $@ $(SHRPLDFLAGS) perl$(OBJ_EXT) $(obj)
++	$(LD) -o $@ $(SHRPLDFLAGS) perl$(OBJ_EXT) $(obj) -Wl,-soname -Wl,libperl.so.`echo $(LIBPERL) | cut -d. -f3`
+ !NO!SUBS!
+ 		case "$osname" in
+ 		aix)
+
diff --git a/dev-lang/perl/files/libperl_rebuilder b/dev-lang/perl/files/libperl_rebuilder
new file mode 100644
index 000000000000..6705a5784bbe
--- /dev/null
+++ b/dev-lang/perl/files/libperl_rebuilder
@@ -0,0 +1,336 @@
+#!/bin/bash
+
+LOG=/tmp/perl-update.log
+
+echo "The script will attempt to re-emerge your perl modules, any packages"
+echo "that compiled against libperl.so previously, as well as any packages"
+echo "that placed files in /usr/lib/perl*. A log of its attempts, work, and"
+echo "even failures is kept in ${LOG} - please refer to this log should you"
+echo "experience any difficulties."
+
+
+echo "--------------------------------------------------------------" >> $LOG
+echo "--------------------------------------------------------------" >> $LOG
+echo "--------------------------------------------------------------" >> $LOG
+
+
+echo 'Finding what perl modules you have installed...'
+echo 'Finding what perl modules you have installed...' >> $LOG
+
+
+cd /var/db/pkg/dev-perl
+PRE_MODULE_LIST=`
+	for i in $(ls -1| sort | uniq)
+	do
+	   echo "dev-perl/${i}"
+	done | sed 's/-[0-9].*//g' | sort -u `
+
+
+
+echo "Preliminary Module List: $PRE_MODULE_LIST"
+echo "Preliminary Module List: $PRE_MODULE_LIST" >> $LOG
+
+#First, we clean up the perl module list - this is to avoid ambiguities later
+echo "Cleaning Module List..."
+echo "Cleaning Module List..." >> $LOG
+
+
+for MODULE in $PRE_MODULE_LIST;
+do
+	env-update
+	echo "Cleaning $MODULE"
+	echo "Cleaning $MODULE" >> $LOG
+	emerge -cp ${MODULE} 2>&1 | tee -a $LOG
+	emerge -c ${MODULE}
+done
+
+echo 'Rechecking what perl modules you have installed...'
+echo 'Rechecking what perl modules you have installed...' >> $LOG
+
+
+SECOND_MODULE_LIST=`
+	for i in $(ls -1| sort -u)
+	do
+	   echo "dev-perl/${i}"
+	done | sed 's/-[0-9].*//g' | sort -u`
+
+
+
+x=0
+while [ $x -lt 3 ] ; do
+let "x++"
+for MODULE in $SECOND_MODULE_LIST;
+  do
+	env-update
+	echo "Rebuilding: $MODULE, pass ${x}"
+	echo "Rebuilding: $MODULE, pass ${x}" >> $LOG
+	if ! emerge "$MODULE"; then
+		echo "emerge $MODULE FAILED while in rebuild, pass ${x}."
+		echo "emerge $MODULE FAILED while in rebuild, pass ${x}." >> $LOG
+	
+	else
+		echo "Done with $MODULE, pass ${x}"
+		echo "Done with $MODULE, pass ${x}" >> $LOG
+		
+
+	fi
+  done
+
+done
+
+echo 'Preliminary Module Rebuild Complete. Now for rebuilding the rest...'
+echo 'Preliminary Module Rebuild Complete. Now for rebuilding the rest...' >> $LOG
+
+#This time around, we want the explicit package name, since in the group remerge, we use
+# a --oneshot =package syntax
+MODULE_LIST=`
+	for i in $(ls -1| sort -u)
+	do
+	   echo "dev-perl/${i}"
+	done | sort -u`
+
+
+echo 'Finding broken packages...'
+echo 'Finding broken packages...' >> $LOG
+unset USE
+REBUILD_FAKED=""
+
+env-update
+
+# Note: `` == $()
+# REBUILD EXACTLY AS ON DISK. emerge =cat/package-version-rev
+LDD_LIST=`
+for i in $(find $(egrep -v ^# /etc/ld.so.conf) -type f -name '*.so*') \
+		$(find $(echo $PATH | sed 's/:/ /g') -type f -perm +0111);
+do
+  ldd ${i} 2>&1 | grep "libperl" - >/dev/null && qpkg -f -nc  -v $i;
+done | sort -u`
+ORIGINAL_LIST="$LDD_LIST"
+
+if [ ! -z "$LDD_LIST" ]; then
+	REBUILD_PRELIST=`
+			echo $LDD_LIST | sed 's:\([^ ]\+\):=\1:g' | xargs emerge -p |
+			grep ebuild | sed 's:.*\] \([^ ]*\) .*:\1:'`
+fi
+
+# The following is to grab any packages that have placed files in
+# /usr/lib/perl* - this may include packages that are not explicityly
+# perl modules in dev-perl, or that did not compile against our old 
+# libperl - this is a sanity check among other things
+
+cd /var/db/pkg
+LIBS_LIST=`grep -ls "usr\/lib\/perl" */*/CONTENTS | sed 's|/CONTENTS||g'  | grep -v "sys-devel/perl" | grep -v "dev-perl"`
+
+REBUILD_LIST=`echo ${LIBS_LIST} ${REBUILD_PRELIST} | sort -u`
+
+if echo $REBUILD_LIST | egrep -q "no.*ebuilds to satisfy"; then
+  echo "Packages are installed that no longer exist in Gentoo."
+  echo "Determine what you need to do to fix this and try again."
+	echo "The package may have been moved to a different category."
+	echo
+	echo "Easiest course of action: unmerge these by explicit versions"
+	echo "and re-emerge them if they still exist."
+	echo 'emerge -C \=package-version'
+	echo "Notice: $REBUILD_LIST"
+  exit 1
+fi
+
+if echo $REBUILD_LIST | grep -q "have been masked"; then
+  echo "Masked packages are installed and need to be rebuilt..."
+  echo "Either unmask them, or emerge -C them all."
+	echo
+	echo "Easiest course of action: unmerge these by explicit versions"
+	echo 'emerge -C \=package-version'
+	echo "Notice: $REBUILD_LIST"
+  exit 1
+fi
+
+echo "Preliminary List: $REBUILD_LIST"
+echo "Preliminary List: $REBUILD_LIST" >> $LOG
+
+sleep 10s
+
+if ! emerge -p $(echo "$REBUILD_LIST" | sed 's:\([^ ]\+\):=\1:g') &>/dev/null;   #'
+then
+	# System isn't up to date, or nothing here to do...
+	if [ ! -z "$LDD_LIST" ]; then
+		REBUILD_LIST=`
+			echo $LDD_LIST | sed 's:\([^ ]\+\):>=\1:g' | xargs emerge -p |
+			grep ebuild | sed 's:.*\] \([^ ]\+\) .*:\1:'`
+	fi
+fi
+
+
+
+
+echo -e "Rebuild list:\n$REBUILD_LIST"
+echo -e "Rebuild list:\n$REBUILD_LIST" >> $LOG
+
+sleep 20s
+
+if echo $REBUILD_LIST | egrep -q "no.*ebuilds to satisfy"; then
+  echo "Packages are installed that no longer exist in Gentoo."
+  echo "Determine what you need to do to fix this and try again."
+	echo "The package may have been moved to a different category."
+	echo
+	echo "Easiest course of action: unmerge these by explicit versions"
+	echo "and re-emerge them if they still exist."
+	echo 'emerge -C \=package-version'
+	echo "Notice: $REBUILD_LIST"
+  exit 1
+fi
+
+if echo $REBUILD_LIST | grep -q "have been masked"; then
+  echo "Masked packages are installed and need to be rebuilt..."
+  echo "Either unmask them, or emerge -C them all."
+	echo
+	echo "Easiest course of action: check your ACCEPT_KEYWORDS in make.conf"
+	echo 'emerge -C \=package-version'
+	echo "Notice: $REBUILD_LIST"
+  exit 1
+fi
+
+# I'm commenting out the next block. I don't think that this is necessary for the
+# perl upgrade the same way it was for the gcc upgrade - MPC
+#echo "Backing up the world file."
+#cp /var/cache/edb/world /var/cache/edb/world.update_system_backup
+#
+#
+#echo "Unmerging broken packages..."
+#emerge -Cp $ORIGINAL_LIST | tee -a $LOG
+#if ! emerge -C $ORIGINAL_LIST; then
+#	echo
+#	echo "There was a problem unmerging the broken packages."
+#	echo "Please pass on your log file to a Gentoo Dev via bugzilla."
+#	echo "Log file: $LOG"
+#	echo
+#	exit 1
+#fi
+#
+#env-update
+#
+#echo "Restoring world file..."
+#mv /var/cache/edb/world.update_system_backup /var/cache/edb/world
+
+REBUILD_LIST=`
+	echo $LDD_LIST | sed 's:\([^ ]\+\):\\>\\=\1:g' | xargs emerge -np $(cat /var/cache/edb/world) |
+	grep ebuild | sed 's:.*\] \([^ ]\+\) .*:\1:'`
+
+if echo $REBUILD_LIST | egrep -q "no.*ebuilds to satisfy"; then
+  echo "Packages are installed that no longer exist in Gentoo."
+  echo "Determine what you need to do to fix this and try again."
+	echo "The package may have been moved to a different category."
+	echo
+	echo "Easiest course of action: unmerge these by explicit versions"
+	echo "and re-emerge them if they still exist."
+	echo 'emerge -C \=package-version'
+	echo "Notice: $REBUILD_LIST"
+  exit 1
+fi
+
+if echo $REBUILD_LIST | grep -q "have been masked"; then
+  echo "Masked packages are installed and need to be rebuilt..."
+  echo "Either unmask them, or emerge -C them all."
+	echo
+	echo "Easiest course of action: check your ACCEPT_KEYWORDS in make.conf"
+	echo 'emerge -C \=package-version'
+	echo "Notice: $REBUILD_LIST"
+  exit 1
+fi
+
+#Join the perl module list and the binary list, sorting out dups
+FULL_LIST=`echo ${REBUILD_LIST} ${MODULE_LIST} | sort -u`
+
+echo -e "Complete rebuild list:\n$FULL_LIST"
+echo -e "Complete rebuild list:\n$FULL_LIST" >> $LOG
+
+
+CLEAN_FAILED=""
+MERGE_FAILED=""
+MERGE_DONE=""
+
+for PACKAGE in $FULL_LIST;
+do
+	env-update
+	echo "Rebuilding: $PACKAGE"
+	echo "Rebuilding: $PACKAGE" >> $LOG
+	if ! emerge --oneshot "=$PACKAGE"; then
+		echo "emerge $PACKAGE FAILED while in rebuild."
+		echo "emerge $PACKAGE FAILED while in rebuild." >> $LOG
+		MERGE_FAILED="$MERGE_FAILED \n$PACKAGE"
+	else
+		echo "Cleaning after $PACKAGE"
+		echo "Cleaning after $PACKAGE" >> $LOG
+		emerge -cp 2>&1 | tee -a $LOG
+		if ! emerge -c; then
+			echo "FAILED cleaning after $PACKAGE while in rebuild"
+			echo "FAILED cleaning after $PACKAGE while in rebuild" >> $LOG
+			CLEAN_FAILED="$CLEAN_FAILED \n$PACKAGE"
+		else
+			echo "Done with $PACKAGE"
+			echo "Done with $PACKAGE" >> $LOG
+			MERGE_DONE="$MERGE_DONE \n$PACKAGE"
+		fi
+	fi
+done
+
+# One last pass of the modules - this is to catch those modules that dep'd a binary from above
+
+for MODULE in $MODULE_LIST; 
+  do 
+        env-update 
+        echo "Rebuilding: $MODULE" 
+        echo "Rebuilding: $MODULE" >> $LOG 
+        if ! emerge --oneshot "=$MODULE"; then 
+                echo "emerge $MODULE FAILED while in final rebuild." 
+                echo "emerge $MODULE FAILED while in final rebuild." >> $LOG 
+         
+        else 
+                echo "Done with $MODULE" 
+                echo "Done with $MODULE" >> $LOG 
+                 
+ 
+        fi 
+  done 
+ 
+
+
+
+echo
+echo "Ok... We're done (really)..."
+echo -e "The following packages merged successfully:$MERGE_DONE" 
+echo -e "The following packages merged successfully:$MERGE_DONE" >> $LOG
+echo "-------------------------------------------"
+echo
+
+if [ ! -z "$MERGE_FAILED" ]; then
+	echo -e "Merging failed on the following packages: $MERGE_FAILED"
+	echo -e "Merging failed on the following packages: $MERGE_FAILED" >> $LOG
+	echo "-----------------------------------------"
+else
+	echo "All packages merged successfully."
+	echo "All packages merged successfully." >> $LOG
+fi
+
+if [ ! -z "$CLEAN_FAILED" ]; then
+	echo -e "Weird: the following packages failed to clean:$CLEAN_FAILED"
+	echo -e "Weird: the following packages failed to clean:$CLEAN_FAILED" >> $LOG
+	echo "----------------------------------------------------------"
+else
+	echo "All packages cleaned successfully."
+	echo "All packages cleaned successfully." >> $LOG
+fi
+
+if [ -z "$MERGE_FAILED" ] && [ -z "$CLEAN_FAILED" ]; then
+	echo -e "\n\nEverything Completed Successfully."
+	echo -e "Have a nice day and thank you for flying with Gentoo."
+	echo -e "\n\nEverything Completed Successfully." >> $LOG
+	echo -e "Have a nice day and thank you for flying with Gentoo. :)" >> $LOG
+else
+	echo -e "\n\nThere were some issues... Check the log for details. :("
+	echo "Some or all of the failed packages may have been cause by a"
+	echo "dependancy failing earlier. Don't assume EVERYTHING is broken."
+	echo "Start with the first one to fail."
+	echo "Log is: $LOG"
+fi
+
diff --git a/dev-lang/perl/files/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch b/dev-lang/perl/files/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch
new file mode 100644
index 000000000000..c7f0d7246f03
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch
@@ -0,0 +1,11 @@
+--- perl-5.8.0-RC2/utils/h2ph_patched.pix	2002-06-24 12:52:31.000000000 +0200
++++ perl-5.8.0-RC2/utils/h2ph_patched	2002-06-24 12:54:32.000000000 +0200
+@@ -39,6 +39,8 @@
+ my ($t, $tab, %curargs, $new, $eval_index, $dir, $name, $args, $outfile);
+ my ($incl, $next);
+ while (defined (my $file = next_file())) {
++    next if $file eq 'machine/ansi.h';
++
+     if (-l $file and -d $file) {
+         link_if_possible($file) if ($opt_l);
+         next;
diff --git a/dev-lang/perl/files/perl-5.8.0-perldoc-emptydirs.patch b/dev-lang/perl/files/perl-5.8.0-perldoc-emptydirs.patch
new file mode 100644
index 000000000000..93d8e00ca5b0
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.0-perldoc-emptydirs.patch
@@ -0,0 +1,10 @@
+--- utils/perldoc.PL.orig	2003-02-28 15:57:31.000000000 -0800
++++ utils/perldoc.PL	2003-02-28 15:57:58.000000000 -0800
+@@ -340,6 +340,7 @@
+     $global_target = (splitdir $s)[-1];   # XXX: why not use File::Basename?
+     for ($i=0; $i<@dirs; $i++) {
+ 	$dir = $dirs[$i];
++  next unless -d $dir;
+ 	($dir = VMS::Filespec::unixpath($dir)) =~ s!/\z!! if $Is_VMS;
+ 	if (       (! $opt_m && ( $ret = check_file $dir,"$s.pod"))
+ 		or ( $ret = check_file $dir,"$s.pm")
diff --git a/dev-lang/perl/files/perl-5.8.0-prelink-lpthread.patch b/dev-lang/perl/files/perl-5.8.0-prelink-lpthread.patch
new file mode 100644
index 000000000000..d38497e0aebe
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.0-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/files/perl-5.8.0-sockatmark-should-__THROW.patch b/dev-lang/perl/files/perl-5.8.0-sockatmark-should-__THROW.patch
new file mode 100644
index 000000000000..c3ca0484ace2
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.0-sockatmark-should-__THROW.patch
@@ -0,0 +1,12 @@
+--- perl-5.8.0/perl.h.orig	2002-12-28 13:23:06.000000000 +0200
++++ perl-5.8.0/perl.h	2002-12-28 13:23:47.000000000 +0200
+@@ -717,7 +717,7 @@
+ /* sockatmark() is so new (2001) that many places might have it hidden
+  * behind some -D_BLAH_BLAH_SOURCE guard. */
+ #if defined(HAS_SOCKATMARK) && !defined(HAS_SOCKATMARK_PROTO)
+-int sockatmark(int);
++int sockatmark(int) __THROW;
+ #endif
+ 
+ #ifdef SETERRNO
+
diff --git a/dev-lang/perl/files/stat.t b/dev-lang/perl/files/stat.t
new file mode 100644
index 000000000000..e2ef3289218e
--- /dev/null
+++ b/dev-lang/perl/files/stat.t
@@ -0,0 +1,289 @@
+#!./perl
+
+# $RCSfile: stat.t,v $$Revision: 1.1 $$Date: 2003/03/11 21:11:45 $
+
+BEGIN {
+    chdir 't' if -d 't';
+    @INC = '../lib';
+}
+
+use Config;
+
+print "1..58\n";
+
+$Is_MSWin32 = $^O eq 'MSWin32';
+$Is_Dos = $^O eq 'dos';
+$Is_Dosish = $Is_Dos || $^O eq 'os2' || $Is_MSWin32;
+$Is_Cygwin = $^O eq 'cygwin';
+chop($cwd = ($Is_MSWin32 ? `cd` : `pwd`));
+
+$DEV = `ls -l /dev` unless $Is_Dosish or $Is_Cygwin;
+
+unlink "Op.stat.tmp";
+if (open(FOO, ">Op.stat.tmp")) {
+  # hack to make Apollo update link count:
+  $junk = `ls Op.stat.tmp` unless ($Is_MSWin32 || $Is_Dos);
+
+  ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,
+   $blksize,$blocks) = stat(FOO);
+  if ($nlink == 1) {
+    print "ok 1\n";
+  }
+  else {
+    print "# res=$res, nlink=$nlink.\nnot ok 1\n";
+  }
+  if ($Is_MSWin32 or $Is_Cygwin or $Is_Dos || ($mtime && $mtime == $ctime)) {
+    print "ok 2\n";
+  }
+  else {
+    print "# |$mtime| vs |$ctime|\nnot ok 2\n";
+  }
+
+  my $funky_FAT_timestamps = $Is_Cygwin;
+
+  sleep 3 if $funky_FAT_timestamps;
+
+  print FOO "Now is the time for all good men to come to.\n";
+  close(FOO);
+
+  sleep 2 unless $funky_FAT_timestamps;
+
+} else {
+  print "# open failed: $!\nnot ok 1\nnot ok 2\n";
+}
+
+if ($Is_Dosish) { unlink "Op.stat.tmp2"}
+else {
+    `rm -f Op.stat.tmp2;ln Op.stat.tmp Op.stat.tmp2; chmod 644 Op.stat.tmp`;
+}
+
+($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,
+    $blksize,$blocks) = stat('Op.stat.tmp');
+
+if ($Is_Dosish || $Config{dont_use_nlink})
+    {print "ok 3 # skipped: no link count\n";} 
+elsif ($nlink == 2)
+    {print "ok 3\n";} 
+else {print "# \$nlink is |$nlink|\nnot ok 3\n";}
+
+if (   $Is_Dosish
+        # Solaris tmpfs bug
+	|| ($cwd =~ m#^/tmp# and $mtime && $mtime==$ctime && $^O eq 'solaris')
+	|| $cwd =~ m#/afs/#
+	|| $^O eq 'amigaos') {
+    print "ok 4 # skipped: different semantic of mtime/ctime\n";
+}
+elsif (   ($mtime && $mtime != $ctime)  ) {
+    print "ok 4\n";
+}
+else {
+    print "not ok 4\n";
+    print "#4 If test op/stat.t fails test 4, check if you are on a tmpfs\n";
+    print "#4 of some sort.  Building in /tmp sometimes has this problem.\n";
+    print "#4 Also building on the ClearCase VOBS filesystem may cause this failure.\n";
+}
+print "#4	:$mtime: should != :$ctime:\n";
+
+unlink "Op.stat.tmp" or print "# unlink failed: $!\n";
+if ($Is_MSWin32) {  open F, '>Op.stat.tmp' and close F }
+else             { `touch Op.stat.tmp` }
+
+if (-z 'Op.stat.tmp') {print "ok 5\n";} else {print "not ok 5\n";}
+if (! -s 'Op.stat.tmp') {print "ok 6\n";} else {print "not ok 6\n";}
+
+$Is_MSWin32 ? `cmd /c echo hi > Op.stat.tmp` : `echo hi >Op.stat.tmp`;
+if (! -z 'Op.stat.tmp') {print "ok 7\n";} else {print "not ok 7\n";}
+if (-s 'Op.stat.tmp') {print "ok 8\n";} else {print "not ok 8\n";}
+
+unlink 'Op.stat.tmp' or print "# unlink failed: $!\n";
+$olduid = $>;		# can't test -r if uid == 0
+$Is_MSWin32 ? `cmd /c echo hi > Op.stat.tmp` : `echo hi >Op.stat.tmp`;
+chmod 0,'Op.stat.tmp';
+eval '$> = 1;';		# so switch uid (may not be implemented)
+if (!$> || $Is_Dos || ! -r 'Op.stat.tmp') {print "ok 9\n";} else {print "not ok 9\n";}
+if (!$> || ! -w 'Op.stat.tmp') {print "ok 10\n";} else {print "not ok 10\n";}
+eval '$> = $olduid;';		# switch uid back (may not be implemented)
+print "# olduid=$olduid, newuid=$>\n" unless ($> == $olduid);
+
+if (! -x 'Op.stat.tmp') {print "ok 11\n";}
+else                    {print "not ok 11\n";}
+
+foreach ((12,13,14,15,16,17)) {
+    print "ok $_\n";		#deleted tests
+}
+
+# in ms windows, Op.stat.tmp inherits owner uid from directory
+# not sure about os/2, but chown is harmless anyway
+eval { chown $>,'Op.stat.tmp'; 1 } or print "# $@" ;
+chmod 0700,'Op.stat.tmp';
+if (-r 'Op.stat.tmp') {print "ok 18\n";} else {print "not ok 18\n";}
+if (-w 'Op.stat.tmp') {print "ok 19\n";} else {print "not ok 19\n";}
+if ($Is_Dosish) {print "ok 20 # skipped: -x by extension\n";} 
+elsif (-x 'Op.stat.tmp') {print "ok 20\n";} 
+else {print "not ok 20\n";}
+
+if (-f 'Op.stat.tmp') {print "ok 21\n";} else {print "not ok 21\n";}
+if (! -d 'Op.stat.tmp') {print "ok 22\n";} else {print "not ok 22\n";}
+
+if (-d '.') {print "ok 23\n";} else {print "not ok 23\n";}
+if (! -f '.') {print "ok 24\n";} else {print "not ok 24\n";}
+
+if (!$Is_Dosish and `ls -l perl` =~ /^l.*->/) {
+    if (-l 'perl') {print "ok 25\n";} else {print "not ok 25\n";}
+}
+else {
+    print "ok 25\n";
+}
+
+if (-o 'Op.stat.tmp') {print "ok 26\n";} else {print "not ok 26\n";}
+
+if (-e 'Op.stat.tmp') {print "ok 27\n";} else {print "not ok 27\n";}
+unlink 'Op.stat.tmp2';
+if (! -e 'Op.stat.tmp2') {print "ok 28\n";} else {print "not ok 28\n";}
+
+if ($Is_MSWin32 || $Is_Dos)
+    {print "ok 29\n";}
+elsif ($DEV !~ /\nc.* (\S+)\n/)
+    {print "ok 29\n";}
+elsif (-c "/dev/$1")
+    {print "ok 29\n";}
+else
+    {print "not ok 29\n";}
+if (! -c '.') {print "ok 30\n";} else {print "not ok 30\n";}
+
+if ($Is_MSWin32 || $Is_Dos)
+    {print "ok 31\n";}
+elsif ($DEV !~ /\ns.* (\S+)\n/)
+    {print "ok 31\n";}
+elsif (-S "/dev/$1")
+    {print "ok 31\n";}
+else
+    {print "not ok 31\n";}
+if (! -S '.') {print "ok 32\n";} else {print "not ok 32\n";}
+
+if ($Is_MSWin32 || $Is_Dos)
+    {print "ok 33\n";}
+elsif ($DEV !~ /\nb.* (\S+)\n/)
+    {print "ok 33\n";}
+elsif (-b "/dev/$1")
+    {print "ok 33\n";}
+else
+    {print "not ok 33\n";}
+if (! -b '.') {print "ok 34\n";} else {print "not ok 34\n";}
+
+if ($^O eq 'mpeix' or $^O eq 'amigaos' or $Is_Dosish or $Is_Cygwin) {
+  print "ok 35 # skipped: no -u\n"; goto tty_test;
+}
+
+$cnt = $uid = 0;
+
+die "Can't run op/stat.t test 35 without pwd working" unless $cwd;
+my @bin = grep {-d} ($^O eq 'machten' ?
+		     qw(/usr/bin /bin) :
+		     qw(/sbin /usr/sbin /bin /usr/bin));
+unless (@bin) { print ("not ok 35\n"), goto tty_test; }
+for my $bin (@bin) {
+    opendir BIN, $bin or die "Can't opendir $bin: $!";
+    while (defined($_ = readdir BIN)) {
+        $_ = "$bin/$_";
+        $cnt++;
+        $uid++ if -u;
+        last if $uid && $uid < $cnt;
+    }
+}
+closedir BIN;
+
+# I suppose this is going to fail somewhere...
+if ($uid > 0 && $uid < $cnt)
+    {print "ok 35\n";}
+elsif ($uid == 0)
+    {print ("not ok 35\n"), goto tty_test; }
+else
+    {print "not ok 35 \n# ($uid $cnt)\n";}
+
+tty_test:
+
+# To assist in automated testing when a controlling terminal (/dev/tty)
+# may not be available (at, cron  rsh etc), the PERL_SKIP_TTY_TEST env var
+# can be set to skip the tests that need a tty.
+unless($ENV{PERL_SKIP_TTY_TEST}) {
+    if ($Is_MSWin32) {
+	print "ok 36\n";
+	print "ok 37\n";
+    }
+    else {
+	my $TTY = "/dev/tty";
+
+	$TTY = "/dev/ttyp0" if $^O eq 'rhapsody';
+
+	if (defined $TTY) {
+	    unless (open(TTY, $TTY)) {
+		print STDERR "Can't open $TTY--run t/TEST outside of make.\n";
+	    }
+	    if (-t TTY) {print "ok 36\n";} else {print "not ok 36\n";}
+	    if (-c TTY) {print "ok 37\n";} else {print "not ok 37\n";}
+	    close(TTY);
+	} else { # if some platform completely undefines $TTY
+	    print "ok 36 # skipped\n";
+	    print "ok 37 # skipped\n";
+	}
+    }
+    if (! -t TTY) {print "ok 38\n";} else {print "not ok 38\n";}
+    if (-t)       {print "ok 39\n";} else {print "not ok 39\n";}
+}
+else {
+    print "ok 36\n";
+    print "ok 37\n";
+    print "ok 38\n";
+    print "ok 39\n";
+}
+open(null,"/dev/null");
+if (! -t null || -e '/xenix' || $^O eq 'machten' || $Is_MSWin32)
+	{print "ok 40\n";} else {print "not ok 40\n";}
+close(null);
+
+# These aren't strictly "stat" calls, but so what?
+
+if (-T 'op/stat.t') {print "ok 41\n";} else {print "not ok 41\n";}
+if (! -B 'op/stat.t') {print "ok 42\n";} else {print "not ok 42\n";}
+
+if (-B './perl' || -B './perl.exe') {print "ok 43\n";} else {print "not ok 43\n";}
+if (! -T './perl' && ! -T './perl.exe') {print "ok 44\n";} else {print "not ok 44\n";}
+
+open(FOO,'op/stat.t');
+eval { -T FOO; };
+if ($@ =~ /not implemented/) {
+    print "# $@";
+    for (45 .. 54) {
+	print "ok $_\n";
+    }
+}
+else {
+    if (-T FOO) {print "ok 45\n";} else {print "not ok 45\n";}
+    if (! -B FOO) {print "ok 46\n";} else {print "not ok 46\n";}
+    $_ = <FOO>;
+    if (/perl/) {print "ok 47\n";} else {print "not ok 47\n";}
+    if (-T FOO) {print "ok 48\n";} else {print "not ok 48\n";}
+    if (! -B FOO) {print "ok 49\n";} else {print "not ok 49\n";}
+    close(FOO);
+
+    open(FOO,'op/stat.t');
+    $_ = <FOO>;
+    if (/perl/) {print "ok 50\n";} else {print "not ok 50\n";}
+    if (-T FOO) {print "ok 51\n";} else {print "not ok 51\n";}
+    if (! -B FOO) {print "ok 52\n";} else {print "not ok 52\n";}
+    seek(FOO,0,0);
+    if (-T FOO) {print "ok 53\n";} else {print "not ok 53\n";}
+    if (! -B FOO) {print "ok 54\n";} else {print "not ok 54\n";}
+}
+close(FOO);
+
+if (-T '/dev/null') {print "ok 55\n";} else {print "not ok 55\n";}
+if (-B '/dev/null') {print "ok 56\n";} else {print "not ok 56\n";}
+
+# and now, a few parsing tests:
+$_ = 'Op.stat.tmp';
+if (-f) {print "ok 57\n";} else {print "not ok 57\n";}
+if (-f()) {print "ok 58\n";} else {print "not ok 58\n";}
+
+unlink 'Op.stat.tmp' or print "# unlink failed: $!\n";
diff --git a/dev-lang/perl/perl-5.6.1-r10.ebuild b/dev-lang/perl/perl-5.6.1-r10.ebuild
new file mode 100644
index 000000000000..e95b87377db4
--- /dev/null
+++ b/dev-lang/perl/perl-5.6.1-r10.ebuild
@@ -0,0 +1,231 @@
+# 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.6.1-r10.ebuild,v 1.1 2003/03/11 21:11:45 seemant Exp $
+
+IUSE="berkdb gdbm"
+
+S="${WORKDIR}/${P}"
+DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
+SRC_URI="$ftp://ftp.perl.org/pub/CPAN/src/${P}.tar.gz"
+HOMEPAGE="http://www.perl.org"
+
+LICENSE="Artistic GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc alpha mips hppa"
+
+RDEPEND="gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	>=sys-libs/db-3.2.3h-r3
+	=sys-libs/db-1.85-r1"
+
+DEPEND="sys-apps/groff
+	>=sys-apps/portage-2.0.45-r4
+	${RDEPEND}"
+		
+
+PDEPEND=">=dev-perl/ExtUtils-MakeMaker-6.05-r4
+	>=dev-perl/Safe-2.09"
+
+src_compile() {
+	use gdbm || use berkdb || die "You must have either gdbm or berkdb installed and in your use flags."
+
+    #The following is to handle international users. Perl does nls post-install
+    export LC_ALL=C
+
+    if [ "${ARCH}" = "alpha" ]; then
+        CFLAGS="${CFLAGS} -fPIC"
+        CXXFLAGS="${CXXFLAGS} -fPIC"
+    fi  
+
+    local myconf
+    if [ "`use gdbm`" ]
+    then
+		myconf="-Di_gdbm"
+    fi
+
+    # It seems that perl config use the hostname instead of the osname on hppa
+    if [ "`use hppa`" ]
+    then
+        myconf="${myconf} -Dosname=linux"
+    fi
+
+    if [ "`use berkdb`" ]
+    then
+		myconf="${myconf} -Di_db -Di_ndbm"
+    else
+		myconf="${myconf} -Ui_db -Ui_ndbm"
+    fi
+
+	# configure for libperl.so
+    sh Configure -des \
+		-Darchname=${CHOST%%-*}-linux \
+		-Dcccdlflags='-fPIC' \
+		-Dcc=gcc \
+		-Dccdlflags='-rdynamic' \
+		-Dprefix='/usr' \
+		-Dvendorprefix='/usr' \
+		-Dsiteprefixx='/usr' \
+		-Dlocincpth=' ' \
+		-Doptimize="${CFLAGS}" \
+		-Duselargefiles \
+		-Duseshrplib \
+		-Dman3ext=3pm \
+		-Dlibperl=libperl.so \
+		-Dd_dosuid \
+		-Dd_semctl_semun \
+		-Dcf_by=Gentoo \
+		-Ud_csh \
+		${myconf} || die
+	# add optimization flags
+    cp config.sh config.sh.orig
+    sed -e "s:optimize='-O2':optimize=\'${CFLAGS}\':" config.sh.orig > config.sh
+	# create libperl.so and move it out of the way
+	mv -f Makefile Makefile_orig
+	sed -e 's#^CCDLFLAGS = -rdynamic -Wl,-rpath,/usr/lib/perl5/.*#CCDLFLAGS = -rdynamic#' \
+	    -e 's#^all: $(FIRSTMAKEFILE) #all: README #' \
+		Makefile_orig > Makefile
+    export PARCH=`grep myarchname config.sh | cut -f2 -d"'"`
+	# fixes a bug in the make/testing on new systems
+	mv makefile makefile_orig
+	mv x2p/makefile x2p/makefile_orig
+		  egrep -v "(<built-in>|<command line>)" makefile_orig >makefile
+		  egrep -v "(<built-in>|<command line>)" x2p/makefile_orig >x2p/makefile
+	make -f Makefile depend || die
+	make -f Makefile libperl.so || die
+	mv libperl.so ${WORKDIR}
+
+	# starting from scratch again
+	cd ${WORKDIR}
+	rm -rf ${S}
+	unpack ${A}
+	cd ${S}
+	
+	# configure for libperl.a
+# this is gross -- from Christian Gafton, Red Hat
+	cat > config.over <<EOF
+installprefix=${D}/usr
+#test -d \$installprefix || mkdir \$installprefix
+#test -d \$installprefix/bin || mkdir \$installprefix/bin
+installarchlib=\`echo \$installarchlib | sed "s!\$prefix!\$installprefix!"\`
+installbin=\`echo \$installbin | sed "s!\$prefix!\$installprefix!"\`
+#installman1dir=\$installprefix/share/man/man1
+#installman3dir=\$installprefix/share/man/man3
+installman1dir=\`echo \$installman1dir | sed "s!\$prefix!\$installprefix!"\`
+installman3dir=\`echo \$installman3dir | sed "s!\$prefix!\$installprefix!"\`
+installman1dir=\`echo \$installman1dir | sed "s!/man/!/share/man/!"\`
+installman3dir=\`echo \$installman3dir | sed "s!/man/!/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
+
+    sh Configure -des \
+		-Dcc=gcc \
+		-Dprefix='/usr' \
+		-Dvendorprefix='/usr' \
+		-Dsiteprefixx='/usr' \
+		-Darchname=${CHOST%%-*}-linux \
+		-Doptimize="${CFLAGS}" \
+		-Duselargefiles \
+		-Dd_dosuid \
+		-Dlocincpth=' ' \
+		-Dd_semctl_semun \
+		-Dman3ext=3pm \
+		-Dcf_by=Gentoo \
+		-Ud_csh \
+		${myconf} || die
+
+    #Optimize ;)
+    cp config.sh config.sh.orig
+    sed -e "s:optimize='-O2':optimize=\'${CFLAGS}\':" config.sh.orig > config.sh
+    #THIS IS USED LATER:
+    export PARCH=`grep myarchname config.sh | cut -f2 -d"'"`
+
+# Umm, for some reason this doesn't want to work, so we'll just remove
+#  the makefiles and let make rebuild them itself. (It seems to do it
+#  right the second time... -- pete
+#    cp makefile makefile.orig
+#    sed -e "s:^0::" makefile.orig > makefile
+
+	mv Makefile Makefile_orig
+	sed -e 's#^all: $(FIRSTMAKEFILE) #all: README #' \
+		Makefile_orig > Makefile
+    
+    #for some reason, this rm -f doesn't seem to actually do anything. So we explicitly use "Makefile"
+    #(rather than the default "makefile") in all make commands below.
+    #rm -f makefile x2p/makefile
+	mv makefile makefile_orig
+	mv x2p/makefile x2p/makefile_orig
+		egrep -v "(<built-in>|<command line>)" makefile_orig >makefile
+		egrep -v "(<built-in>|<command line>)" x2p/makefile_orig >x2p/makefile
+    #make -f Makefile depend || die
+    #make -f Makefile || die
+    make || die
+	cp ${O}/files/stat.t ./t/op/
+    # Parallel make fails
+	# dont use the || die since some tests fail on bootstrap
+	if [ `expr "$PARCH" ":" "sparc"` -gt 4 ]; then
+		echo "Skipping tests on this platform"
+	else
+	    egrep -v "(<built-in>|<command line>)" x2p/makefile_orig >x2p/makefile
+    	make -f Makefile test 
+	fi
+}
+
+src_install() {
+#The following is to handle international users. Perl does nls post-install 
+    export LC_ALL=C 
+
+    export PARCH=`grep myarchname config.sh | cut -f2 -d"'"`
+
+	insinto /usr/lib/perl5/${PV}/${PARCH}/CORE/
+	doins ${WORKDIR}/libperl.so
+	dosym /usr/lib/perl5/${PV}/${PARCH}/CORE/libperl.so /usr/lib/libperl.so
+	
+
+#    make -f Makefile \
+#		INSTALLMAN1DIR=${D}/usr/share/man/man1 \
+#		INSTALLMAN3DIR=${D}/usr/share/man/man3 \
+#		install || die
+
+	make \
+		DESTDIR=${D} \
+		INSTALLMAN1DIR=${D}/usr/share/man/man1 \
+		INSTALLMAN3DIR=${D}/usr/share/man/man3 \
+		install || die "Unable to make install"
+    install -m 755 utils/pl2pm ${D}/usr/bin/pl2pm
+
+	#man pages
+
+#	./perl installman \
+#		--man1dir=${D}/usr/share/man/man1 \
+#		--man1ext=1 \
+#		--man3dir=${D}/usr/share/man/man3 \
+#		--man3ext=3
+
+
+	# This removes ${D} from Config.pm
+
+	dosed /usr/lib/perl5/${PV}/${CHOST%%-*}-linux/Config.pm
+	dosed /usr/lib/perl5/${PV}/${CHOST%%-*}-linux/.packlist
+
+	# DOCUMENTATION
+
+    dodoc Changes* Artistic Copying README Todo* AUTHORS
+    prepalldocs
+
+    
+	# HTML Documentation
+	dodir /usr/share/doc/${PF}/html
+	${D}/usr/bin/perl installhtml --recurse --htmldir=${D}/usr/share/doc/${PF}/html
+
+}
+
+
+pkg_postinst() {
+	# generates the ph files for perl
+	cd /usr/include; h2ph *.h sys/*.h
+
+}
diff --git a/dev-lang/perl/perl-5.6.1-r11.ebuild b/dev-lang/perl/perl-5.6.1-r11.ebuild
new file mode 100644
index 000000000000..d81fcb3c530a
--- /dev/null
+++ b/dev-lang/perl/perl-5.6.1-r11.ebuild
@@ -0,0 +1,225 @@
+# 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.6.1-r11.ebuild,v 1.1 2003/03/11 21:11:45 seemant Exp $
+
+IUSE="berkdb gdbm"
+
+S="${WORKDIR}/${P}"
+DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
+SRC_URI="$ftp://ftp.perl.org/pub/CPAN/src/${P}.tar.gz"
+HOMEPAGE="http://www.perl.org"
+
+LICENSE="Artistic GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ppc ~sparc ~alpha ~mips ~hppa"
+
+RDEPEND="gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	>=sys-libs/db-3.2.3h-r3
+	=sys-libs/db-1.85-r1"
+
+DEPEND="sys-apps/groff
+	>=sys-apps/portage-2.0.45-r4
+	${RDEPEND}"
+		
+
+PDEPEND=">=dev-perl/ExtUtils-MakeMaker-6.05-r4
+	>=dev-perl/Safe-2.09"
+
+src_compile() {
+	use gdbm || use berkdb || die "You must have either gdbm or berkdb installed and in your use flags."
+
+    #The following is to handle international users. Perl does nls post-install
+    export LC_ALL=C
+
+    if [ "${ARCH}" = "alpha" ]; then
+        CFLAGS="${CFLAGS} -fPIC"
+        CXXFLAGS="${CXXFLAGS} -fPIC"
+    fi  
+
+    local myconf
+    if [ "`use gdbm`" ]
+    then
+		myconf="-Di_gdbm"
+    fi
+
+    # It seems that perl config use the hostname instead of the osname on hppa
+    if [ "`use hppa`" ]
+    then
+        myconf="${myconf} -Dosname=linux"
+    fi
+
+    if [ "`use berkdb`" ]
+    then
+		myconf="${myconf} -Di_db -Di_ndbm"
+    else
+		myconf="${myconf} -Ui_db -Ui_ndbm"
+    fi
+
+	# put in built-in removal patch
+	patch -p1 < ${FILESDIR}/${PV}-builtin-fixup.diff || die 
+	patch -p0 < ${FILESDIR}/${PV}-op-test-fix.diff || die
+
+	# configure for libperl.so
+    sh Configure -des \
+		-Darchname=${CHOST%%-*}-linux \
+		-Dcccdlflags='-fPIC' \
+		-Dcc=gcc \
+		-Dccdlflags='-rdynamic' \
+		-Dprefix='/usr' \
+		-Dvendorprefix='/usr' \
+		-Dsiteprefixx='/usr' \
+		-Dlocincpth=' ' \
+		-Doptimize="${CFLAGS}" \
+		-Duselargefiles \
+		-Duseshrplib \
+		-Dman3ext=3pm \
+		-Dlibperl=libperl.so \
+		-Dd_dosuid \
+		-Dd_semctl_semun \
+		-Dcf_by=Gentoo \
+		-Ud_csh \
+		${myconf} || die
+	# add optimization flags
+    cp config.sh config.sh.orig
+    sed -e "s:optimize='-O2':optimize=\'${CFLAGS}\':" config.sh.orig > config.sh
+	# create libperl.so and move it out of the way
+	mv -f Makefile Makefile_orig
+	sed -e 's#^CCDLFLAGS = -rdynamic -Wl,-rpath,/usr/lib/perl5/.*#CCDLFLAGS = -rdynamic#' \
+	    -e 's#^all: $(FIRSTMAKEFILE) #all: README #' \
+		Makefile_orig > Makefile
+    export PARCH=`grep myarchname config.sh | cut -f2 -d"'"`
+
+	make -f Makefile depend || die
+	make -f Makefile libperl.so || die
+	mv libperl.so ${WORKDIR}
+
+	# starting from scratch again
+	cd ${WORKDIR}
+	rm -rf ${S}
+	unpack ${A}
+	cd ${S}
+
+	# put in built-in removal patch
+	patch -p1 < ${FILESDIR}/${PV}-builtin-fixup.diff || die 
+	patch -p0 < ${FILESDIR}/${PV}-op-test-fix.diff || die
+	
+	# configure for libperl.a
+# this is gross -- from Christian Gafton, Red Hat
+	cat > config.over <<EOF
+installprefix=${D}/usr
+#test -d \$installprefix || mkdir \$installprefix
+#test -d \$installprefix/bin || mkdir \$installprefix/bin
+installarchlib=\`echo \$installarchlib | sed "s!\$prefix!\$installprefix!"\`
+installbin=\`echo \$installbin | sed "s!\$prefix!\$installprefix!"\`
+#installman1dir=\$installprefix/share/man/man1
+#installman3dir=\$installprefix/share/man/man3
+installman1dir=\`echo \$installman1dir | sed "s!\$prefix!\$installprefix!"\`
+installman3dir=\`echo \$installman3dir | sed "s!\$prefix!\$installprefix!"\`
+installman1dir=\`echo \$installman1dir | sed "s!/man/!/share/man/!"\`
+installman3dir=\`echo \$installman3dir | sed "s!/man/!/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
+
+    sh Configure -des \
+		-Dcc=gcc \
+		-Dprefix='/usr' \
+		-Dvendorprefix='/usr' \
+		-Dsiteprefixx='/usr' \
+		-Darchname=${CHOST%%-*}-linux \
+		-Doptimize="${CFLAGS}" \
+		-Duselargefiles \
+		-Dd_dosuid \
+		-Dlocincpth=' ' \
+		-Dd_semctl_semun \
+		-Dman3ext=3pm \
+		-Dcf_by=Gentoo \
+		-Ud_csh \
+		${myconf} || die
+
+    #Optimize ;)
+    cp config.sh config.sh.orig
+    sed -e "s:optimize='-O2':optimize=\'${CFLAGS}\':" config.sh.orig > config.sh
+    #THIS IS USED LATER:
+    export PARCH=`grep myarchname config.sh | cut -f2 -d"'"`
+
+# Umm, for some reason this doesn't want to work, so we'll just remove
+#  the makefiles and let make rebuild them itself. (It seems to do it
+#  right the second time... -- pete
+#    cp makefile makefile.orig
+#    sed -e "s:^0::" makefile.orig > makefile
+
+	mv Makefile Makefile_orig
+	sed -e 's#^all: $(FIRSTMAKEFILE) #all: README #' \
+		Makefile_orig > Makefile
+    
+    make || die
+
+    # Parallel make fails
+	# dont use the || die since some tests fail on bootstrap
+	if [ `expr "$PARCH" ":" "sparc"` -gt 4 ]; then
+		echo "Skipping tests on this platform"
+	else
+	    make test 
+	fi
+}
+
+src_install() {
+#The following is to handle international users. Perl does nls post-install 
+    export LC_ALL=C 
+
+    export PARCH=`grep myarchname config.sh | cut -f2 -d"'"`
+
+	insinto /usr/lib/perl5/${PV}/${PARCH}/CORE/
+	doins ${WORKDIR}/libperl.so
+	dosym /usr/lib/perl5/${PV}/${PARCH}/CORE/libperl.so /usr/lib/libperl.so
+	
+
+#    make -f Makefile \
+#		INSTALLMAN1DIR=${D}/usr/share/man/man1 \
+#		INSTALLMAN3DIR=${D}/usr/share/man/man3 \
+#		install || die
+
+	make \
+		DESTDIR=${D} \
+		INSTALLMAN1DIR=${D}/usr/share/man/man1 \
+		INSTALLMAN3DIR=${D}/usr/share/man/man3 \
+		install || die "Unable to make install"
+    install -m 755 utils/pl2pm ${D}/usr/bin/pl2pm
+
+	#man pages
+
+#	./perl installman \
+#		--man1dir=${D}/usr/share/man/man1 \
+#		--man1ext=1 \
+#		--man3dir=${D}/usr/share/man/man3 \
+#		--man3ext=3
+
+
+	# This removes ${D} from Config.pm
+
+	dosed /usr/lib/perl5/${PV}/${CHOST%%-*}-linux/Config.pm
+	dosed /usr/lib/perl5/${PV}/${CHOST%%-*}-linux/.packlist
+
+	# DOCUMENTATION
+
+    dodoc Changes* Artistic Copying README Todo* AUTHORS
+    prepalldocs
+
+    
+	# HTML Documentation
+	dodir /usr/share/doc/${PF}/html
+	${D}/usr/bin/perl installhtml --recurse --htmldir=${D}/usr/share/doc/${PF}/html
+
+}
+
+
+pkg_postinst() {
+	# generates the ph files for perl
+	cd /usr/include; h2ph *.h sys/*.h
+
+}
diff --git a/dev-lang/perl/perl-5.8.0-r10.ebuild b/dev-lang/perl/perl-5.8.0-r10.ebuild
new file mode 100644
index 000000000000..d60cd448a87b
--- /dev/null
+++ b/dev-lang/perl/perl-5.8.0-r10.ebuild
@@ -0,0 +1,460 @@
+# 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.0-r10.ebuild,v 1.1 2003/03/11 21:11:45 seemant 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 gdbm"
+
+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`"
+MY_P="${P/lib}"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
+SRC_URI="ftp://ftp.perl.org/pub/CPAN/src/${MY_P}.tar.gz"
+HOMEPAGE="http://www.perl.org" 
+
+if [ "${PN}" = "libperl" ]
+then
+	SLOT="${PERLSLOT}"
+else
+	SLOT="0"
+fi
+
+LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
+
+LICENSE="Artistic GPL-2"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha ~mips ~hppa"
+
+DEPEND="sys-apps/groff
+	berkdb? ( >=sys-libs/db-3.2.3h-r3 =sys-libs/db-1.85-r1 )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	>=sys-apps/portage-2.0.45-r4"
+if [ "${PN}" = "perl" ]
+then
+	DEPEND="${DEPEND}
+		=sys-devel/libperl-${PV}*"
+fi
+
+RDEPEND="berkdb? ( >=sys-libs/db-3.2.3h-r3 =sys-libs/db-1.85-r1 ) 
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
+
+if [ "${PN}" = "libperl" ]
+then
+	# If we are installing a new version of libperl, we *have* to update perl as
+	# well, else all things linking to libperl.so will break at *build* time ..
+	PDEPEND=">=dev-lang/perl-${PV}"
+else
+	PDEPEND=">=dev-perl/Safe-2.09"
+fi
+
+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 ""
+		sleep 10
+	fi
+
+	if [ "${PN}" = "perl" -a ! -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}
+
+	if [ "${PN}" = "libperl" ]
+	then
+		# 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
+	else
+		# 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)
+		cd ${S}; epatch ${FILESDIR}/${P}-prelink-lpthread.patch
+
+		# Patch perldoc to not abort when it attempts to search
+		# nonexistent directories; fixes bug #16589.
+		# <rac@gentoo.org> (28 Feb 2003)
+		cd ${S}; epatch ${FILESDIR}/${P}-perldoc-emptydirs.patch
+
+	fi
+}
+
+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 sparc`" ]
+	then
+		myconf="${myconf} -Ud_longdbl"
+	fi
+	if [ "`use sparc64`" ]
+	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='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='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
+		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
+	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
+
+	if [ "${PN}" = "libperl" ]
+	then
+		# 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
+	else
+		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 *.h sys/*.h
+		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 ""
+		sleep 5
+		eerror ""
+		
+	fi
+}
+
+
diff --git a/dev-lang/perl/perl-5.8.0-r9.ebuild b/dev-lang/perl/perl-5.8.0-r9.ebuild
new file mode 100644
index 000000000000..42947ab89f94
--- /dev/null
+++ b/dev-lang/perl/perl-5.8.0-r9.ebuild
@@ -0,0 +1,450 @@
+# 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.0-r9.ebuild,v 1.1 2003/03/11 21:11:45 seemant 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 gdbm"
+
+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`"
+MY_P="${P/lib}"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
+SRC_URI="ftp://ftp.perl.org/pub/CPAN/src/${MY_P}.tar.gz"
+HOMEPAGE="http://www.perl.org" 
+
+if [ "${PN}" = "libperl" ]
+then
+	SLOT="${PERLSLOT}"
+else
+	SLOT="0"
+fi
+
+LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
+
+LICENSE="Artistic GPL-2"
+KEYWORDS="x86 sparc ~ppc alpha ~mips hppa arm"
+
+DEPEND="sys-apps/groff
+	berkdb? ( >=sys-libs/db-3.2.3h-r3 =sys-libs/db-1.85-r1 )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	>=sys-apps/portage-2.0.45-r4"
+if [ "${PN}" = "perl" ]
+then
+	DEPEND="${DEPEND}
+		=sys-devel/libperl-${PV}*"
+fi
+
+RDEPEND="berkdb? ( >=sys-libs/db-3.2.3h-r3 =sys-libs/db-1.85-r1 ) 
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
+
+if [ "${PN}" = "libperl" ]
+then
+	# If we are installing a new version of libperl, we *have* to update perl as
+	# well, else all things linking to libperl.so will break at *build* time ..
+	PDEPEND=">=dev-lang/perl-${PV}"
+else
+	PDEPEND=">=dev-perl/Safe-2.09"
+fi
+
+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 ""
+		sleep 10
+	fi
+
+	if [ "${PN}" = "perl" -a ! -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}
+
+	if [ "${PN}" = "libperl" ]
+	then
+		# 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
+	else
+		# 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
+	fi
+}
+
+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 sparc`" ]
+	then
+		myconf="${myconf} -Ud_longdbl"
+	fi
+	if [ "`use sparc64`" ]
+	then
+		myconf="${myconf} -Ud_longdbl"
+	fi
+
+	[ "${ARCH}" = "hppa" ] && append-flags -fPIC
+	
+	if [ "${PN}" = "libperl" ]
+	then
+		rm -f config.sh Policy.sh
+
+		sh Configure -des \
+			-Darchname="${myarch}" \
+			-Dcccdlflags='-fPIC' \
+			-Dccdlflags='-rdynamic' \
+			-Dcc='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='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
+		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
+	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
+
+	if [ "${PN}" = "libperl" ]
+	then
+		# 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
+	else
+		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 *.h sys/*.h
+		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 ""
+		sleep 5
+		eerror ""
+		
+	fi
+}
+
+
diff --git a/dev-lang/swig/swig-1.3.10-r1.ebuild b/dev-lang/swig/swig-1.3.10-r1.ebuild
index 068d97c13abd..e4133dd6c5d4 100644
--- a/dev-lang/swig/swig-1.3.10-r1.ebuild
+++ b/dev-lang/swig/swig-1.3.10-r1.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/swig/swig-1.3.10-r1.ebuild,v 1.11 2003/02/13 10:30:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swig/swig-1.3.10-r1.ebuild,v 1.12 2003/03/11 21:11:45 seemant Exp $
 
 IUSE="java guile python tcltk ruby perl"
 
@@ -16,7 +16,7 @@ DEPEND="virtual/glibc
 	ruby? ( >=dev-lang/ruby-1.6.1 )
 	guile? ( >=dev-util/guile-1.4 )
 	tcltk? ( >=dev-lang/tk-8.3 )
-	perl? ( >=sys-devel/perl-5.6.1 )"
+	perl? ( >=dev-lang/perl-5.6.1 )"
 	
 
 SLOT="0"
diff --git a/dev-lang/swig/swig-1.3.10-r2.ebuild b/dev-lang/swig/swig-1.3.10-r2.ebuild
index 0dfe50bd9613..4f940d712b0d 100644
--- a/dev-lang/swig/swig-1.3.10-r2.ebuild
+++ b/dev-lang/swig/swig-1.3.10-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/swig/swig-1.3.10-r2.ebuild,v 1.12 2003/02/13 10:30:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swig/swig-1.3.10-r2.ebuild,v 1.13 2003/03/11 21:11:45 seemant Exp $
 
 IUSE="java guile python tcltk ruby perl"
 
@@ -16,7 +16,7 @@ DEPEND="virtual/glibc
 	ruby? ( >=dev-lang/ruby-1.6.1 )
 	guile? ( >=dev-util/guile-1.4 )
 	tcltk? ( >=dev-lang/tk-8.3 )
-	perl? ( >=sys-devel/perl-5.6.1 )"
+	perl? ( >=dev-lang/perl-5.6.1 )"
 	
 
 SLOT="0"
diff --git a/dev-lang/swig/swig-1.3.15.ebuild b/dev-lang/swig/swig-1.3.15.ebuild
index c87e7bb32831..8817e8c92b2a 100644
--- a/dev-lang/swig/swig-1.3.15.ebuild
+++ b/dev-lang/swig/swig-1.3.15.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/swig/swig-1.3.15.ebuild,v 1.5 2003/02/13 10:30:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swig/swig-1.3.15.ebuild,v 1.6 2003/03/11 21:11:45 seemant Exp $
 
 IUSE="java guile python tcltk ruby perl"
 
@@ -15,7 +15,7 @@ DEPEND="virtual/glibc
 	ruby? ( >=dev-lang/ruby-1.6.1 )
 	guile? ( >=dev-util/guile-1.4 )
 	tcltk? ( >=dev-lang/tk-8.3 )
-	perl? ( >=sys-devel/perl-5.6.1 )"
+	perl? ( >=dev-lang/perl-5.6.1 )"
 SLOT="0"
 LICENSE="as-is"
 KEYWORDS="~x86 ~ppc ~sparc "
diff --git a/dev-lang/swig/swig-1.3.16.ebuild b/dev-lang/swig/swig-1.3.16.ebuild
index 35936f260114..9f99c632bfa7 100644
--- a/dev-lang/swig/swig-1.3.16.ebuild
+++ b/dev-lang/swig/swig-1.3.16.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/swig/swig-1.3.16.ebuild,v 1.4 2003/02/13 10:30:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swig/swig-1.3.16.ebuild,v 1.5 2003/03/11 21:11:45 seemant Exp $
 
 IUSE="java guile python tcltk ruby perl"
 
@@ -15,7 +15,7 @@ DEPEND="virtual/glibc
 	ruby? ( >=dev-lang/ruby-1.6.1 )
 	guile? ( >=dev-util/guile-1.4 )
 	tcltk? ( >=dev-lang/tk-8.3 )
-	perl? ( >=sys-devel/perl-5.6.1 )"
+	perl? ( >=dev-lang/perl-5.6.1 )"
 SLOT="0"
 LICENSE="as-is"
 KEYWORDS="~x86 ~ppc ~sparc "
diff --git a/dev-lang/wml/wml-2.0.8.ebuild b/dev-lang/wml/wml-2.0.8.ebuild
index c163391f338a..b47b4a0f0c59 100644
--- a/dev-lang/wml/wml-2.0.8.ebuild
+++ b/dev-lang/wml/wml-2.0.8.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/wml/wml-2.0.8.ebuild,v 1.7 2003/02/13 10:31:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/wml/wml-2.0.8.ebuild,v 1.8 2003/03/11 21:11:45 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Website META Language"
 SRC_URI="http://www.engelschall.com/sw/wml/distrib/${P}.tar.gz"
 HOMEPAGE="http://www.engelschall.com/sw/wml/"
 
-DEPEND=">=sys-devel/perl-5.6.1-r3"
+DEPEND=">=dev-lang/perl-5.6.1-r3"
 
 LICENSE="GPL-2"
 KEYWORDS="x86 sparc "
diff --git a/dev-lang/wml/wml-2.0.9.ebuild b/dev-lang/wml/wml-2.0.9.ebuild
index a5a002e08832..1998b90a6445 100644
--- a/dev-lang/wml/wml-2.0.9.ebuild
+++ b/dev-lang/wml/wml-2.0.9.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/wml/wml-2.0.9.ebuild,v 1.4 2003/02/13 10:32:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/wml/wml-2.0.9.ebuild,v 1.5 2003/03/11 21:11:45 seemant Exp $
 
 IUSE=""
 
@@ -8,7 +8,7 @@ S=${WORKDIR}/${P}
 DESCRIPTION="Website META Language"
 SRC_URI="http://www.engelschall.com/sw/wml/distrib/${P}.tar.gz"
 HOMEPAGE="http://www.engelschall.com/sw/wml/"
-DEPEND=">=sys-devel/perl-5.6.1-r3"
+DEPEND=">=dev-lang/perl-5.6.1-r3"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~sparc "
 SLOT="0"