h2ph fix for recursion - bug 14461 should be fixed now as well

14 files changed, 375 insertions, 33 deletions

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index 73fb6359c547..af439d29b73a 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/perl
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.34 2003/07/31 00:34:07 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.35 2003/08/22 12:25:34 mcummings Exp $
+
+  22 Aug 2003; Michael Cummings <mcummings@gentoo.org> perl-5.6.1-r10.ebuild,
+  perl-5.6.1-r11.ebuild, perl-5.6.1-r12.ebuild, perl-5.8.0-r10.ebuild,
+  perl-5.8.0-r11.ebuild, perl-5.8.0-r12.ebuild, perl-5.8.0-r9.ebuild,
+  perl-5.8.1_rc1.ebuild, perl-5.8.1_rc2.ebuild, perl-5.8.1_rc3.ebuild:
+  Corrected h2ph behaviour to now run -r -l -- recursively :)
+  Also fixes bug 14461
 
 *perl-5.8.1_rc3 (30 Jul 2003)
 
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index fbde5f500e4f..d647c5bb0509 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,15 +1,15 @@
-MD5 aa6d6284da8346c79d84940031e93ee7 ChangeLog 18794
-MD5 23447b1ba550c65f73c28081c37f2284 perl-5.8.0-r10.ebuild 14037
-MD5 50c49f0d92dcf20b65d535bcd5d3483b perl-5.8.0-r9.ebuild 13564
-MD5 2ed23d37e9ca570afb879ca18e6eb496 perl-5.6.1-r10.ebuild 6813
-MD5 60aee1ed92c25932887b4fecbfcdbfb5 perl-5.6.1-r11.ebuild 6270
-MD5 f53c72baa71657a6c12aadfe66825c6c perl-5.6.1-r12.ebuild 7221
-MD5 fef31f79af5bd9c546754bd5283e3df5 perl-5.8.0-r11.ebuild 9902
-MD5 b736b7c4d47bdfea3aac0876831ab50c perl-5.8.0-r12.ebuild 10325
-MD5 8d1c7cb154e54a4132d92043a004c186 perl-5.8.1_rc1.ebuild 10463
-MD5 b48febd46566fa1affe75980f9a76bdf perl-5.8.1_rc2.ebuild 10468
-MD5 118b49038df3d6a692776edc2339d098 perl-5.8.1_rc3.ebuild 10474
-MD5 118b49038df3d6a692776edc2339d098 perl-5.8.1_rc4.ebuild 10474
+MD5 0ed23c2a48eada01ba41cd208c188ae5 ChangeLog 18794
+MD5 ab35859f311e1055f984566e73cd1178 perl-5.8.0-r10.ebuild 14040
+MD5 a6a99624cee60620781a83ed3ba99d4c perl-5.8.0-r9.ebuild 13565
+MD5 869433f2f2d056cbf74508352e56c5e2 perl-5.6.1-r10.ebuild 6816
+MD5 2161e0704c126530488a91f8bd6d4623 perl-5.6.1-r11.ebuild 6273
+MD5 8e18cde8e33dcc15fee0ea0331adddbb perl-5.6.1-r12.ebuild 7224
+MD5 05b7f8ea113a21db759b66ad9397ffd9 perl-5.8.0-r11.ebuild 9905
+MD5 a6813120df513bedf3e706de4684c629 perl-5.8.0-r12.ebuild 10328
+MD5 d64ee60af6aa81fe70b6304c107d9268 perl-5.8.1_rc1.ebuild 10469
+MD5 dfdece1db7a863094438d41615dfb456 perl-5.8.1_rc2.ebuild 10474
+MD5 43a100b81de0227b0f949d9234314f43 perl-5.8.1_rc3.ebuild 10474
+MD5 f4d4205e9890dfcb433471d04202ed78 perl-5.8.1_rc4.ebuild 10474
 MD5 8605f033c451df987f4631bbf9d7b481 files/digest-perl-5.8.0-r10 64
 MD5 cc61dca6d96347b5d93cfdde1514feb4 files/digest-perl-5.8.0-r9 860
 MD5 d2af75f06a64c5934db314ff38939cdd files/libperl-5.8.0-create-libperl-soname.patch 424
diff --git a/dev-lang/perl/files/digest-perl-5.8.1_rc4 b/dev-lang/perl/files/digest-perl-5.8.1_rc4
new file mode 100644
index 000000000000..d2f80ac0f02c
--- /dev/null
+++ b/dev-lang/perl/files/digest-perl-5.8.1_rc4
@@ -0,0 +1 @@
+MD5 265f852e57eb8fd98fdb678ef0d7d3f6 perl-5.8.1-RC4.tar.gz 11716254
diff --git a/dev-lang/perl/perl-5.6.1-r10.ebuild b/dev-lang/perl/perl-5.6.1-r10.ebuild
index 96fbfa12e097..77465ba1204e 100644
--- a/dev-lang/perl/perl-5.6.1-r10.ebuild
+++ b/dev-lang/perl/perl-5.6.1-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.6.1-r10.ebuild,v 1.6 2003/06/18 20:28:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.6.1-r10.ebuild,v 1.7 2003/08/22 12:25:34 mcummings Exp $
 
 DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
 SRC_URI="ftp://ftp.perl.org/pub/CPAN/src/${P}.tar.gz"
@@ -222,6 +222,6 @@ src_install() {
 
 pkg_postinst() {
 	# generates the ph files for perl
-	cd /usr/include; h2ph *.h sys/*.h
+	cd /usr/include; h2ph -r -l
 
 }
diff --git a/dev-lang/perl/perl-5.6.1-r11.ebuild b/dev-lang/perl/perl-5.6.1-r11.ebuild
index c70075c20ca6..58675ac1c5f2 100644
--- a/dev-lang/perl/perl-5.6.1-r11.ebuild
+++ b/dev-lang/perl/perl-5.6.1-r11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.6.1-r11.ebuild,v 1.7 2003/06/18 20:28:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.6.1-r11.ebuild,v 1.8 2003/08/22 12:25:34 mcummings Exp $
 
 DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
 SRC_URI="ftp://ftp.perl.org/pub/CPAN/src/${P}.tar.gz"
@@ -216,6 +216,6 @@ src_install() {
 
 pkg_postinst() {
 	# generates the ph files for perl
-	cd /usr/include; h2ph *.h sys/*.h
+	cd /usr/include; h2ph -r -l
 
 }
diff --git a/dev-lang/perl/perl-5.6.1-r12.ebuild b/dev-lang/perl/perl-5.6.1-r12.ebuild
index 33ce4598ccd0..54b60022919f 100644
--- a/dev-lang/perl/perl-5.6.1-r12.ebuild
+++ b/dev-lang/perl/perl-5.6.1-r12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.6.1-r12.ebuild,v 1.4 2003/06/18 20:28:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.6.1-r12.ebuild,v 1.5 2003/08/22 12:25:34 mcummings Exp $
 
 DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
 MM_VERSION="6.05"
@@ -238,6 +238,6 @@ src_install() {
 
 pkg_postinst() {
 	# generates the ph files for perl
-	cd /usr/include; h2ph *.h sys/*.h
+	cd /usr/include; h2ph -r -l
 
 }
diff --git a/dev-lang/perl/perl-5.8.0-r10.ebuild b/dev-lang/perl/perl-5.8.0-r10.ebuild
index 38f676685332..a4a96a28af67 100644
--- a/dev-lang/perl/perl-5.8.0-r10.ebuild
+++ b/dev-lang/perl/perl-5.8.0-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.0-r10.ebuild,v 1.15 2003/07/18 20:08:20 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.0-r10.ebuild,v 1.16 2003/08/22 12:25:34 mcummings Exp $
 
 # The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
 #
@@ -432,7 +432,7 @@ pkg_postinst() {
 		if [ "${ROOT}" = "/" ]
 		then
 			ebegin "Converting C header files to the corresponding Perl format"
-			cd /usr/include; h2ph *.h sys/*.h
+			cd /usr/include; h2ph -r -l
 		fi
 
 		eerror ""
diff --git a/dev-lang/perl/perl-5.8.0-r11.ebuild b/dev-lang/perl/perl-5.8.0-r11.ebuild
index 220dd180b6b4..ae13fe9ae73d 100644
--- a/dev-lang/perl/perl-5.8.0-r11.ebuild
+++ b/dev-lang/perl/perl-5.8.0-r11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.0-r11.ebuild,v 1.6 2003/07/18 20:08:20 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.0-r11.ebuild,v 1.7 2003/08/22 12:25:34 mcummings Exp $
 
 inherit eutils flag-o-matic 
 
@@ -287,7 +287,7 @@ pkg_postinst() {
 	if [ "${ROOT}" = "/" ]
 	then
 		ebegin "Converting C header files to the corresponding Perl format"
-		cd /usr/include; h2ph *.h sys/*.h
+		cd /usr/include; h2ph -r -l
 	fi
 
 	eerror ""
diff --git a/dev-lang/perl/perl-5.8.0-r12.ebuild b/dev-lang/perl/perl-5.8.0-r12.ebuild
index 126d25bcdb91..630d38f67e79 100644
--- a/dev-lang/perl/perl-5.8.0-r12.ebuild
+++ b/dev-lang/perl/perl-5.8.0-r12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.0-r12.ebuild,v 1.10 2003/07/25 21:10:46 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.0-r12.ebuild,v 1.11 2003/08/22 12:25:34 mcummings Exp $
 
 inherit eutils flag-o-matic 
 
@@ -298,7 +298,7 @@ pkg_postinst() {
 	if [ "${ROOT}" = "/" ]
 	then
 		ebegin "Converting C header files to the corresponding Perl format"
-		cd /usr/include; h2ph *.h sys/*.h
+		cd /usr/include; h2ph  -r -l
 	fi
 
 	eerror ""
diff --git a/dev-lang/perl/perl-5.8.0-r9.ebuild b/dev-lang/perl/perl-5.8.0-r9.ebuild
index 634c2cd14288..ebaae97ddd82 100644
--- a/dev-lang/perl/perl-5.8.0-r9.ebuild
+++ b/dev-lang/perl/perl-5.8.0-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.0-r9.ebuild,v 1.6 2003/07/16 13:30:19 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.0-r9.ebuild,v 1.7 2003/08/22 12:25:34 mcummings Exp $
 
 # The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
 #
@@ -420,7 +420,7 @@ pkg_postinst() {
 		if [ "${ROOT}" = "/" ]
 		then
 			ebegin "Converting C header files to the corresponding Perl format"
-			cd /usr/include; h2ph *.h sys/*.h
+			cd /usr/include; h2ph -r -l
 		fi
 
 		eerror ""
diff --git a/dev-lang/perl/perl-5.8.1_rc1.ebuild b/dev-lang/perl/perl-5.8.1_rc1.ebuild
index c2a979eb0b71..9cc0e6871df7 100644
--- a/dev-lang/perl/perl-5.8.1_rc1.ebuild
+++ b/dev-lang/perl/perl-5.8.1_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.1_rc1.ebuild,v 1.7 2003/07/25 21:02:24 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.1_rc1.ebuild,v 1.8 2003/08/22 12:25:34 mcummings Exp $
 
 inherit eutils flag-o-matic 
 
@@ -304,7 +304,7 @@ pkg_postinst() {
 	if [ "${ROOT}" = "/" ]
 	then
 		ebegin "Converting C header files to the corresponding Perl format"
-		cd /usr/include; h2ph *.h sys/*.h
+		cd /usr/include; h2ph -r -l
 	fi
 
 	eerror ""
diff --git a/dev-lang/perl/perl-5.8.1_rc2.ebuild b/dev-lang/perl/perl-5.8.1_rc2.ebuild
index 149983ed1c6d..0e586873631d 100644
--- a/dev-lang/perl/perl-5.8.1_rc2.ebuild
+++ b/dev-lang/perl/perl-5.8.1_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.1_rc2.ebuild,v 1.2 2003/07/25 21:02:24 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.1_rc2.ebuild,v 1.3 2003/08/22 12:25:34 mcummings Exp $
 
 inherit eutils flag-o-matic 
 
@@ -305,7 +305,7 @@ pkg_postinst() {
 	if [ "${ROOT}" = "/" ]
 	then
 		ebegin "Converting C header files to the corresponding Perl format"
-		cd /usr/include; h2ph *.h sys/*.h
+		cd /usr/include; h2ph -r -l
 	fi
 
 	eerror ""
diff --git a/dev-lang/perl/perl-5.8.1_rc3.ebuild b/dev-lang/perl/perl-5.8.1_rc3.ebuild
index a63273a01a87..3da819370a28 100644
--- a/dev-lang/perl/perl-5.8.1_rc3.ebuild
+++ b/dev-lang/perl/perl-5.8.1_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.1_rc3.ebuild,v 1.1 2003/07/31 00:34:07 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.1_rc3.ebuild,v 1.2 2003/08/22 12:25:34 mcummings Exp $
 
 inherit eutils flag-o-matic 
 
@@ -305,7 +305,7 @@ pkg_postinst() {
 	if [ "${ROOT}" = "/" ]
 	then
 		ebegin "Converting C header files to the corresponding Perl format"
-		cd /usr/include; h2ph *.h sys/*.h
+		cd /usr/include; h2ph -r -l
 	fi
 
 	eerror ""
diff --git a/dev-lang/perl/perl-5.8.1_rc4.ebuild b/dev-lang/perl/perl-5.8.1_rc4.ebuild
new file mode 100644
index 000000000000..81e37057d687
--- /dev/null
+++ b/dev-lang/perl/perl-5.8.1_rc4.ebuild
@@ -0,0 +1,334 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.1_rc4.ebuild,v 1.1 2003/08/22 12:25:34 mcummings Exp $
+
+inherit eutils flag-o-matic 
+
+# Perl has problems compiling with -Os in your flags
+replace-flags "-Os" "-O2"
+# This flag makes compiling crash in interesting ways
+filter-flags -malign-double
+
+# The slot of this binary compat version of libperl.so
+PERLSLOT="1"
+
+SHORT_PV="`echo ${PV} | cut -d. -f1,2`"
+DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
+SAFE_VERSION="2.09"
+MY_P="perl-`echo $PV | sed 's/_rc/-RC/'`"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="http://www.cpan.org/authors/id/J/JH/JHI/${MY_P}.tar.gz"
+#ftp://ftp.perl.org/pub/CPAN/src/${MY_P}.tar.gz
+#ftp://ftp.perl.org/pub/CPAN/modules/by-module/DB_File/DB_File-${DB_FILE_VERSION}.tar.gz
+#ftp://ftp.perl.org/pub/CPAN/modules/by-module/Safe/Safe-${SAFE_VERSION}.tar.gz"
+HOMEPAGE="http://www.perl.org/"
+SLOT="0"
+LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
+LICENSE="Artistic GPL-2"
+KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~alpha ~mips ~hppa"
+IUSE="berkdb doc gdbm threads"
+
+DEPEND="sys-apps/groff
+	berkdb? ( sys-libs/db )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	>=sys-apps/portage-2.0.48-r4
+	=sys-devel/libperl-${SHORT_PV}*
+	!<dev-perl/ExtUtils-MakeMaker-6.05-r6
+	!<dev-perl/File-Spec-0.84-r1
+	!<dev-perl/Test-Simple-0.47-r1"
+RDEPEND="berkdb? ( sys-libs/db )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
+
+pkg_setup() {
+	# I think this should rather be displayed if you *have* 'threads'
+	# in USE if it could break things ...
+	if [ -n "`use threads`" ]
+	then
+		ewarn ""
+		ewarn "PLEASE NOTE: You are compiling perl-5.8 with"
+		ewarn "threading enabled."
+		ewarn "Threading is not supported by all applications "
+		ewarn "that compile against perl. You use threading at "
+		ewarn "your own discretion. "
+		ewarn ""
+		sleep 10
+	else
+		ewarn ""
+		ewarn "PLEASE NOTE: If you want to compile perl-5.8 with"
+		ewarn "threading enabled , you must restart this emerge"
+		ewarn "with USE=threads emerge...."
+		ewarn "Threading is not supported by all applications "
+		ewarn "that compile against perl. You use threading at "
+		ewarn "your own discretion. "
+		ewarn ""
+	fi
+
+	if [ ! -f /usr/lib/${LIBPERL} ]
+	then
+		# Make sure we have libperl installed ...
+		eerror "Cannot find /usr/lib/${LIBPERL}!  Make sure that you"
+		eerror "have sys-libs/libperl installed properly ..."
+		die "Cannot find /usr/lib/${LIBPERL}!"
+	fi
+}
+
+src_unpack() {
+
+	unpack ${A}
+
+	# Fix the definition of 'int sockatmark(int);' in perl.h to have __THROW.
+	# This fixes bug #12605.
+	# <azarah@gentoo.org> (28 Dec 2002).
+	cd ${S}; epatch ${FILESDIR}/${P}-sockatmark-should-__THROW.patch
+
+	# Get -lpthread linked before -lc.  This is needed
+	# when using glibc >= 2.3, or else runtime signal
+	# handling breaks.  Fixes bug #14380.
+	# <rac@gentoo.org> (14 Feb 2003)
+
+	# Disabled because 5.8.1_rc1 does not segfault with the test in
+	# bug #14380, even though /usr/bin/perl is not linked with
+	# -lpthread.  May need further investigation.
+	# <rac@gentoo.org> (10 Jul 2003)
+
+	#cd ${S}; epatch ${FILESDIR}/${P}-prelink-lpthread.patch
+
+	# Patch perldoc to not abort when it attempts to search
+	# nonexistent directories; fixes bug #16589.
+	# <rac@gentoo.org> (28 Feb 2003)
+
+	# we are using the vendor directory now, so it should not be
+	# empty.  this patch doesn't come close to applying, so leaving
+	# off for now.
+	# <rac@gentoo.org> (10 Jul 2003)
+
+	#cd ${S}; epatch ${FILESDIR}/${P}-perldoc-emptydirs.patch
+
+	# this lays the groundwork for solving the issue of what happens
+	# when people (or ebuilds) install different versiosn of modules
+	# that are in the core, by rearranging the @INC directory to look
+	# site -> vendor -> core.
+	cd ${S}; epatch ${FILESDIR}/${P}-reorder-INC.patch
+}
+
+src_compile() {
+
+	export LC_ALL="C"
+	local myconf=""
+	
+	if [ "`use threads`" ]
+	then
+		einfo "using threads"
+		mythreading="-multi"
+		myconf="-Dusethreads ${myconf}"
+		myarch="${CHOST%%-*}-linux-thread"
+	else
+		myarch="${CHOST%%-*}-linux"
+	fi
+
+	if [ "`use gdbm`" ]
+	then
+		myconf="${myconf} -Di_gdbm"
+	fi
+	if [ "`use berkdb`" ]
+	then
+		myconf="${myconf} -Di_db -Di_ndbm"
+	else
+		myconf="${myconf} -Ui_db -Ui_ndbm"
+	fi
+	if [ "`use mips`" ]
+	then
+		# this is needed because gcc 3.3-compiled kernels will hang
+		# the machine trying to run this test - check with `Kumba
+		# <rac@gentoo.org> 2003.06.26
+		myconf="${myconf} -Dd_u32align"
+	fi
+	if [ "`use sparc`" ]
+	then
+		myconf="${myconf} -Ud_longdbl"
+	fi
+	if [ "`use sparc64`" ]
+	then
+		myconf="${myconf} -Ud_longdbl"
+	fi
+
+	if [ "`use alpha`" -a "${CC}" == "ccc" ]
+	then
+		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
+		myconf="${myconf} -Ui_db -Ui_ndbm"
+	fi
+
+	[ "${ARCH}" = "hppa" ] && append-flags -fPIC
+	
+	
+cat > config.over <<EOF
+installprefix=${D}/usr
+installarchlib=\`echo \$installarchlib | sed "s!\$prefix!\$installprefix!"\`
+installbin=\`echo \$installbin | sed "s!\$prefix!\$installprefix!"\`
+installman1dir=\`echo \$installman1dir | sed "s!\$prefix!\$installprefix!"\`
+installman3dir=\`echo \$installman3dir | sed "s!\$prefix!\$installprefix!"\`
+installman1dir=\`echo \$installman1dir | sed "s!/share/share/!/share/!"\`
+installman3dir=\`echo \$installman3dir | sed "s!/share/share/!/share/!"\`
+installman1dir=\`echo \$installman1dir | sed "s!/usr/man/!/usr/share/man/!"\`
+installman3dir=\`echo \$installman3dir | sed "s!/usr/man/!/usr/share/man/!"\`
+man1ext=1
+man3ext=3pm
+installprivlib=\`echo \$installprivlib | sed "s!\$prefix!\$installprefix!"\`
+installscript=\`echo \$installscript | sed "s!\$prefix!\$installprefix!"\`
+installsitelib=\`echo \$installsitelib | sed "s!\$prefix!\$installprefix!"\`
+installsitearch=\`echo \$installsitearch | sed "s!\$prefix!\$installprefix!"\`
+EOF
+	sleep 10
+	sh Configure -des \
+		-Darchname="${myarch}" \
+		-Dcc="${CC:-gcc}" \
+		-Dprefix='/usr' \
+		-Dvendorprefix='/usr' \
+		-Dsiteprefix='/usr' \
+		-Dlocincpth=' ' \
+		-Doptimize="${CFLAGS}" \
+		-Duselargefiles \
+		-Dd_dosuid \
+		-Dd_semctl_semun \
+		-Dscriptdir=/usr/bin \
+		-Dman3ext='3pm' \
+		-Dcf_by='Gentoo' \
+		-Ud_csh \
+		${myconf} || die "Unable to configure"
+			
+	MAKEOPTS="${MAKEOPTS} -j1" emake || die "Unable to make"
+	
+	emake -i test CCDLFLAGS=
+}
+
+src_install() {
+	
+	export LC_ALL="C"
+	
+	# Need to do this, else apps do not link to dynamic version of
+	# the library ...
+	local coredir="/usr/lib/perl5/${PV}/${myarch}${mythreading}/CORE"
+	dodir ${coredir}
+	dosym ../../../../${LIBPERL} ${coredir}/${LIBPERL}
+	dosym ../../../../${LIBPERL} ${coredir}/libperl.so.${PERLSLOT}
+	dosym ../../../../${LIBPERL} ${coredir}/libperl.so
+		
+	# Fix for "stupid" modules and programs
+	dodir /usr/lib/perl5/site_perl/${PV}/${myarch}${mythreading}
+
+	make DESTDIR="${D}" \
+		INSTALLMAN1DIR="${D}/usr/share/man/man1" \
+		INSTALLMAN3DIR="${D}/usr/share/man/man3" \
+		install || die "Unable to make install"
+
+	cp -f utils/h2ph utils/h2ph_patched
+	epatch ${FILESDIR}/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch
+
+	LD_LIBRARY_PATH=. ./perl -Ilib utils/h2ph_patched \
+		-a -d ${D}/usr/lib/perl5/${PV}/${myarch}${mythreading} <<EOF
+asm/termios.h
+syscall.h
+syslimits.h
+syslog.h
+sys/ioctl.h
+sys/socket.h
+sys/time.h
+wait.h
+EOF
+
+	# This is to fix a missing c flag for backwards compat
+	for i in `find ${D}/usr/lib/perl5 -iname "Config.pm"`;do
+		sed -e "s:ccflags=':ccflags='-DPERL5 :" \
+		    -e "s:cppflags=':cppflags='-DPERL5 :" \
+			${i} > ${i}.new &&\
+			mv ${i}.new ${i} || die "Sed failed"
+	done
+
+	# A poor fix for the miniperl issues
+	dosed 's:./miniperl:/usr/bin/perl:' /usr/lib/perl5/${PV}/ExtUtils/xsubpp
+	fperms 0444 /usr/lib/perl5/${PV}/ExtUtils/xsubpp
+	dosed 's:./miniperl:/usr/bin/perl:' /usr/bin/xsubpp
+	fperms 0755 /usr/bin/xsubpp
+
+	./perl installman \
+		--man1dir="${D}/usr/share/man/man1" --man1ext='1' \
+		--man3dir="${D}/usr/share/man/man3" --man3ext='3'
+
+	# This removes ${D} from Config.pm and .packlist
+	for i in `find ${D} -iname "Config.pm"` `find ${D} -iname ".packlist"`;do 
+		einfo "Removing ${D} from ${i}..."
+		sed -e "s:${D}::" ${i} > ${i}.new &&\
+			mv ${i}.new ${i} || die "Sed failed"
+	done
+	
+	dodoc Changes* Artistic Copying README Todo* AUTHORS
+
+	if [ -n "`use doc`" ]
+	then
+		# HTML Documentation
+		# We expect errors, warnings, and such with the following. 
+
+		dodir /usr/share/doc/${PF}/html
+		./perl installhtml \
+			--podroot='.' \
+			--podpath='lib:ext:pod:vms' \
+			--recurse \
+			--htmldir="${D}/usr/share/doc/${PF}/html" \
+			--libpods='perlfunc:perlguts:perlvar:perlrun:perlop'
+	fi
+}
+
+pkg_postinst() {
+
+	# Make sure we do not have stale/invalid libperl.so 's ...
+	if [ -f "${ROOT}usr/lib/libperl.so" -a ! -L "${ROOT}usr/lib/libperl.so" ]
+	then
+		mv -f ${ROOT}usr/lib/libperl.so ${ROOT}usr/lib/libperl.so.old
+	fi
+
+	local perllib="`readlink -f ${ROOT}usr/lib/libperl.so | sed -e 's:^.*/::'`"
+
+	# If we are installing perl, we need the /usr/lib/libperl.so symlink to
+	# point to the version of perl we are running, else builing something
+	# against libperl.so will break ...
+	if [ "${perllib}" != "${LIBPERL}" ]
+	then
+		# Delete stale symlinks
+		rm -f ${ROOT}usr/lib/libperl.so
+		rm -f ${ROOT}usr/lib/libperl.so.${PERLSLOT}
+		# Regenerate libperl.so.${PERLSLOT}
+		ln -snf ${LIBPERL} ${ROOT}usr/lib/libperl.so.${PERLSLOT}
+		# Create libperl.so (we use the *soname* versioned lib here ..)
+		ln -snf libperl.so.${PERLSLOT} ${ROOT}usr/lib/libperl.so
+	fi
+		
+	if [ "${ROOT}" = "/" ]
+	then
+		ebegin "Converting C header files to the corresponding Perl format"
+		cd /usr/include; h2ph -r -l
+	fi
+
+	eerror ""
+	eerror "If this is an upgrade to a perl 5.6.1 system,"
+	eerror "~OR~ an upgrade to a previous Gentoo release"
+	eerror "of perl 5.8.0, prior to -r8 "
+	eerror "you may need to recompile applications that"
+	eerror "were emerged against the old libperl.so"
+	eerror ""
+	eerror "${FILESDIR}/libperl_rebuilder "
+	eerror "is provided to assist with this. "
+	eerror "PLEASE DO NOT INTERRUPT THE RUNNING OF THIS SCRIPT."
+	eerror "Part of the rebuilding of applications compiled against "
+	eerror "your old libperl involves temporarily unmerging"
+	eerror "them - interruptions could leave you with unmerged"
+	eerror "packages before they can be remerged."
+	eerror ""
+	eerror "If you have run the rebuilder and a package still gives"
+	eerror "you trouble, and re-emerging it fails to correct"
+	eerror "the problem, please check http://bugs.gentoo.org/"
+	eerror "for more information or to report a bug."
+	eerror ""
+	eerror ""
+}
+
+