Patch 27203 in blead - fixes c++ problems in XS code :)

Package-Manager: portage-2.1_pre6-r6

5 files changed, 477 insertions, 6 deletions

diff --git a/sys-devel/libperl/ChangeLog b/sys-devel/libperl/ChangeLog
index 657b50771a1d..e6b90aa7044b 100644
--- a/sys-devel/libperl/ChangeLog
+++ b/sys-devel/libperl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/libperl
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/ChangeLog,v 1.102 2006/02/21 00:16:53 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/ChangeLog,v 1.103 2006/03/29 14:18:08 mcummings Exp $
+
+*libperl-5.8.8-r1 (29 Mar 2006)
+
+  29 Mar 2006; <mcumming@gentoo.org> +files/libperl-5.8.8-cplusplus.patch,
+  +libperl-5.8.8-r1.ebuild:
+  Patch 27203 in blead - fixes c++ problems in XS code :)
 
   21 Feb 2006; Michael Cummings <mcummings@gentoo.org>
   +files/libperl-5.8.8-dragonfly-clean.patch,
diff --git a/sys-devel/libperl/Manifest b/sys-devel/libperl/Manifest
index bbcad1b36930..0d1087224e55 100644
--- a/sys-devel/libperl/Manifest
+++ b/sys-devel/libperl/Manifest
@@ -1,29 +1,76 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b84ebb2125944042e767d4f395bb8b80 ChangeLog 15242
+MD5 b3c2999bb851dafe61f2f34d2cff7c88 ChangeLog 15437
+RMD160 6a074018943271df519630287768d30023ca99db ChangeLog 15437
+SHA256 5a5b44559f714e7e38854e6640883d5eb53e38c6ddd27b213ba81b129dbadabe ChangeLog 15437
 MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-libperl-5.8.6 64
+RMD160 65b25cf2b098d17ae8354e087ff03f8c4a79a081 files/digest-libperl-5.8.6 64
+SHA256 0f4931ee9ace7fa9c9aedf2213b09a91789c1887d78d17c829c4b479aec9e4f3 files/digest-libperl-5.8.6 64
 MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-libperl-5.8.6-r1 64
+RMD160 65b25cf2b098d17ae8354e087ff03f8c4a79a081 files/digest-libperl-5.8.6-r1 64
+SHA256 0f4931ee9ace7fa9c9aedf2213b09a91789c1887d78d17c829c4b479aec9e4f3 files/digest-libperl-5.8.6-r1 64
 MD5 c10e44e47d7f702efe7d4009064a97ca files/digest-libperl-5.8.7 64
+RMD160 21381de31d6da67594744081be0a94da3fd067ff files/digest-libperl-5.8.7 64
+SHA256 681fd892979121a8ff1ead060881146194c9fd448b77f94d6f88cdb5b3cce34c files/digest-libperl-5.8.7 64
 MD5 f408b45cbe8f14c380ae6ffce87c01c4 files/digest-libperl-5.8.8 65
+RMD160 25b183ec478f7aba6ba98471e97a9fd9f96a6478 files/digest-libperl-5.8.8 65
+SHA256 d083e2a403dd2011be23b6a000310da291fb19d2b9be606b324a2c7088187902 files/digest-libperl-5.8.8 65
+MD5 750a1b4341f04665c5ce30e14a302f96 files/digest-libperl-5.8.8-r1 241
+RMD160 a339ac2a520b2fd2f458daf89cd89eb36a8c98b2 files/digest-libperl-5.8.8-r1 241
+SHA256 1067b25eabccaa2d61cfc9db27e31c6b18d075e440713e44dcde000c71bbf178 files/digest-libperl-5.8.8-r1 241
 MD5 ce442db939c59218a16be167f793b817 files/libperl-5.8.2-uclibc.patch 573
+RMD160 d8a1b40e86094a63f60783f550afd1087bb5a5f0 files/libperl-5.8.2-uclibc.patch 573
+SHA256 a054e63156fb2f1c167c2806f4d8c1a97a85dc0eecf2bd737bb63c92f079e98d files/libperl-5.8.2-uclibc.patch 573
+MD5 c3eeecbfcccfc4787f5157ad8b29ac7e files/libperl-5.8.8-cplusplus.patch 854
+RMD160 1fbfc7ec9940622beb644ce0fa98a6f52131c9db files/libperl-5.8.8-cplusplus.patch 854
+SHA256 ea1368e609b0d992b6cd5f92c327768d8c61ca2096826f26af2576263efb8a89 files/libperl-5.8.8-cplusplus.patch 854
 MD5 476fc96783fc1fd13c86aa1e66b98778 files/libperl-5.8.8-dragonfly-clean.patch 5211
+RMD160 d2411913185276cd9c9aa55a614ae2ed13d22fe9 files/libperl-5.8.8-dragonfly-clean.patch 5211
+SHA256 08b22fe26695f6f7f7d21ca2628954eded91205b64450e24d0b295eb75952b6c files/libperl-5.8.8-dragonfly-clean.patch 5211
 MD5 6a2521ba615f5a59d06b6c4e4f2ac253 files/libperl-5.8.8-fbsdhints.patch 1190
+RMD160 c55ec6943e7a3957939d3a1f348d01496eefe0e8 files/libperl-5.8.8-fbsdhints.patch 1190
+SHA256 339a73f860025b53ef12a394138abb71ec22c027c5a338fb6f29085e127c321b files/libperl-5.8.8-fbsdhints.patch 1190
 MD5 b67f84d9f78688c8d1d06503241d0f6d files/libperl-5.8.8-lib64.patch 3393
+RMD160 406206c33b10b4af8cb2d1aba2fa6aadf5d9eea6 files/libperl-5.8.8-lib64.patch 3393
+SHA256 3efe8048934093a1a66bc37b22fbb56a6e10df2940bb85b57802c9129c9bd1bd files/libperl-5.8.8-lib64.patch 3393
 MD5 f6c5dc893c771f72cc183c946628d35e files/libperl-5.8.8-reorder-INC.patch 3046
+RMD160 73bc824bebee8889073656a7b547dc63b35696dc files/libperl-5.8.8-reorder-INC.patch 3046
+SHA256 136ca6c6cfaa3467f6a164f26b34ff06cc55823ca5723118764589cc15d37aed files/libperl-5.8.8-reorder-INC.patch 3046
 MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-create-libperl-soname.patch 417
+RMD160 ea221c4f1a284ad28b30e9354222859ac1c6392e files/libperl-create-libperl-soname.patch 417
+SHA256 cf417526a71b7c8a5015171fdefb6d7a52dbd6914762bb628d2662f6c28c7f61 files/libperl-create-libperl-soname.patch 417
 MD5 076dcbef37263d6dd7af719b55cfc2de files/libperl-noksh.patch 611
+RMD160 6ddb9e7140c60e05042c3c488c97399a86f965fc files/libperl-noksh.patch 611
+SHA256 0861f7f54c184e99a0ffeebeab9420d969d2002f921bc3fb14841a1e24be1f5e files/libperl-noksh.patch 611
 MD5 f7324a62f22aabde3387b7e8a8b2106e files/libperl-reorder-INC.patch 1141
+RMD160 4a889fa029fb77e7454ed0c6f7870359340df672 files/libperl-reorder-INC.patch 1141
+SHA256 4e075cb6b6b418ab3b2a6f6b9af633ac51cc7d7749330d3981fa69d0f2d16564 files/libperl-reorder-INC.patch 1141
 MD5 ce442db939c59218a16be167f793b817 files/libperl-uclibc.patch 573
+RMD160 d8a1b40e86094a63f60783f550afd1087bb5a5f0 files/libperl-uclibc.patch 573
+SHA256 a054e63156fb2f1c167c2806f4d8c1a97a85dc0eecf2bd737bb63c92f079e98d files/libperl-uclibc.patch 573
 MD5 9fe69fdbfc5ff4096e83a0aea7ac96c8 libperl-5.8.6-r1.ebuild 10587
+RMD160 3e90e297dd0da471431f69a298bdc13e5c7294d6 libperl-5.8.6-r1.ebuild 10587
+SHA256 30719e97a85da4241d1fc942713de8dcdfb878da691d578ed5b7ee9b54929e59 libperl-5.8.6-r1.ebuild 10587
 MD5 8138254c857a5c439bfc0c39c9a9dc9b libperl-5.8.6.ebuild 10591
+RMD160 672aefcff30ffa5cbe158edf24e890daed90a476 libperl-5.8.6.ebuild 10591
+SHA256 c09672b88f4fe48814ff426715aaeea46cb13d9b304d7d6396ab4cafb4a360ed libperl-5.8.6.ebuild 10591
 MD5 4bc541a781cafd9a9e54efd62d45b1e7 libperl-5.8.7.ebuild 10987
+RMD160 807450f51a594759dc7b8522e0223a9fa21a6ce5 libperl-5.8.7.ebuild 10987
+SHA256 a78bfd1ed6a1ac81673a6467b4fcc7787003f1dda3a67f21448611a6dd4bf3e7 libperl-5.8.7.ebuild 10987
+MD5 e76f6c4cd1272b7a41ae06e49d9b6410 libperl-5.8.8-r1.ebuild 11672
+RMD160 7799fb8ec9c57f7fa82e38e79a6b978912f28996 libperl-5.8.8-r1.ebuild 11672
+SHA256 2b42a42249b6237ef6083a5b8cf24fb9b451cd7aa35299a8543a8eca0e02995a libperl-5.8.8-r1.ebuild 11672
 MD5 a42aceb81e6e70312ffd6140404bc4ea libperl-5.8.8.ebuild 11619
+RMD160 71e9721469ad18f0f6d7904c88e43b039ccec386 libperl-5.8.8.ebuild 11619
+SHA256 2d7d8f9230f75c8a8d090f686c7194deddaad44fa14884606632b4410c541f4b libperl-5.8.8.ebuild 11619
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+RMD160 647980838c590f54441a053916ea629e53e551c0 metadata.xml 305
+SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca metadata.xml 305
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFD+lwEtG5z4I8BtQoRAlMlAJ9FzGGZxQa+qHzpgiXRxO6GC0vMxwCbBMeZ
-FugCnx5sRxYCLod/ovj/1Cg=
-=YdMZ
+iD8DBQFEKpcptG5z4I8BtQoRAhwkAJ0Uj7MxSAS4sEqjZR1oZyQaY8+7XwCdHFqZ
+CzWo57FRUrQgBi+rXOOGmxM=
+=PRX0
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/libperl/files/digest-libperl-5.8.8-r1 b/sys-devel/libperl/files/digest-libperl-5.8.8-r1
new file mode 100644
index 000000000000..0f545078831e
--- /dev/null
+++ b/sys-devel/libperl/files/digest-libperl-5.8.8-r1
@@ -0,0 +1,3 @@
+MD5 a377c0c67ab43fd96eeec29ce19e8382 perl-5.8.8.tar.bz2 10123359
+RMD160 e78f26d9b96e6db35f946ad4ff55e3a69385c71b perl-5.8.8.tar.bz2 10123359
+SHA256 818a140d9c04ea8dab3a05104b34ced7f7d9d0a91bfed91baf89a84d0dfb1bc9 perl-5.8.8.tar.bz2 10123359
diff --git a/sys-devel/libperl/files/libperl-5.8.8-cplusplus.patch b/sys-devel/libperl/files/libperl-5.8.8-cplusplus.patch
new file mode 100644
index 000000000000..064bda422dd9
--- /dev/null
+++ b/sys-devel/libperl/files/libperl-5.8.8-cplusplus.patch
@@ -0,0 +1,22 @@
+--- perl.h.orig	2006-03-29 08:53:46.000000000 -0500
++++ perl.h	2006-03-29 08:54:19.000000000 -0500
+@@ -159,7 +159,7 @@ struct perl_thread;
+ #endif
+ 
+ #ifndef PERL_UNUSED_DECL
+-#  ifdef HASATTRIBUTE_UNUSED
++#  if defined(HASATTRIBUTE_UNUSED) && !defined(__cplusplus)
+ #    define PERL_UNUSED_DECL __attribute__unused__
+ #  else
+ #    define PERL_UNUSED_DECL
+--- XSUB.h.orig	2006-03-29 08:54:24.000000000 -0500
++++ XSUB.h	2006-03-29 08:54:48.000000000 -0500
+@@ -91,7 +91,7 @@ handled automatically by C<xsubpp>.
+ #if defined(__CYGWIN__) && defined(USE_DYNAMIC_LOADING)
+ #  define XS(name) __declspec(dllexport) void name(pTHX_ CV* cv)
+ #else
+-#  ifdef HASATTRIBUTE_UNUSED
++#  if defined(HASATTRIBUTE_UNUSED) && !defined(__cplusplus)
+ #    define XS(name) void name(pTHX_ CV* cv __attribute__unused__)
+ #  else
+ #    define XS(name) void name(pTHX_ CV* cv)
diff --git a/sys-devel/libperl/libperl-5.8.8-r1.ebuild b/sys-devel/libperl/libperl-5.8.8-r1.ebuild
new file mode 100644
index 000000000000..6842d6c7803b
--- /dev/null
+++ b/sys-devel/libperl/libperl-5.8.8-r1.ebuild
@@ -0,0 +1,393 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.8-r1.ebuild,v 1.1 2006/03/29 14:18:08 mcummings Exp $
+
+# The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
+#
+# We split the perl ebuild into libperl and perl.  The layout is as follows:
+#
+# libperl:
+#
+#  This is a slotted (SLOT=[0-9]*) ebuild, meaning we should be able to have a
+#  few versions that are not binary compadible installed.
+#
+#  How we get libperl.so multi-versioned, is by adding to the link command:
+#
+#    -Wl,-soname -Wl,libperl.so.`echo $(LIBPERL) | cut -d. -f3`
+#
+#  This gives us:
+#
+#    $(LIBPERL): $& perl$(OBJ_EXT) $(obj) $(LIBPERLEXPORT)
+#        $(LD) -o $@ $(SHRPLDFLAGS) perl$(OBJ_EXT) $(obj) \
+#              -Wl,-soname -Wl,libperl.so.`echo $(LIBPERL) | cut -d. -f3`
+#
+#  We then configure perl with LIBPERL set to:
+#
+#    LIBPERL="libperl.so.${SLOT}.`echo ${PV} | cut -d. -f1,2`"
+#
+#  Or with the variables defined in this ebuild:
+#
+#    LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
+#
+#  The result is that our 'soname' is 'libperl.so.${PERLSLOT}' (at the time of
+#  writing this for perl-5.8.0, 'libperl.so.1'), causing all apps that is linked
+#  to libperl to link to 'libperl.so.${PERLSLOT}'.
+#
+#  If a new perl version, perl-z.y.z comes out that have a libperl not binary
+#  compatible with the previous version, we just keep the previous libperl
+#  installed, and all apps linked to it will still be able to use:
+#
+#    libperl.so.${PERLSLOT}'
+#
+#  while the new ones will link to:
+#
+#    libperl.so.$((PERLSLOT+1))'
+#
+# perl:
+#
+#  Not much to this one.  It compiles with a static libperl.a, and are unslotted
+#  (meaning SLOT=0).  We thus always have the latest *stable* perl version
+#  installed, with corrisponding version of libperl.  The perl ebuild will of
+#  course DEPEND on libperl.
+#
+# Martin Schlemmer <azarah@gentoo.org> (28 Dec 2002).
+
+IUSE="berkdb debug gdbm ithreads"
+
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+# The slot of this binary compat version of libperl.so
+PERLSLOT="1"
+
+SHORT_PV="${PV%.*}"
+MY_P="perl-${PV/_rc/-RC}"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
+SRC_URI="mirror://cpan/src/${MY_P}.tar.bz2"
+HOMEPAGE="http://www.perl.org"
+SLOT="${PERLSLOT}"
+LIBPERL="libperl$(get_libname ${PERLSLOT}.${SHORT_PV})"
+LICENSE="Artistic GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+# rac 2004.08.06
+
+# i am not kidding here. you will forkbomb yourself out of existence
+# because make check -n wants to make miniperl, which runs itself at
+# the very end to make sure it's working right. this behaves very
+# badly when you -n it, because it won't exist and will therefore try
+# to build itself again ad infinitum.
+
+RESTRICT="test"
+
+DEPEND="!elibc_uclibc? ( sys-apps/groff )
+	berkdb? ( sys-libs/db )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
+
+RDEPEND="
+	berkdb? ( sys-libs/db )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
+
+PDEPEND="~dev-lang/perl-${PV}"
+
+pkg_setup() {
+	# I think this should rather be displayed if you *have* 'ithreads'
+	# in USE if it could break things ...
+	if use ithreads
+	then
+		ewarn ""
+		ewarn "PLEASE NOTE: You are compiling perl-5.8 with"
+		ewarn "interpreter-level threading enabled."
+		ewarn "Threading is not supported by all applications "
+		ewarn "that compile against perl. You use threading at "
+		ewarn "your own discretion. "
+		ewarn ""
+		epause 10
+	fi
+}
+
+src_unpack() {
+
+	unpack ${A}
+
+	# Fix the build scripts to create libperl with a soname of ${SLOT}.
+	# We basically add:
+	#
+	#   -Wl,-soname -Wl,libperl.so.`echo $(LIBPERL) | cut -d. -f3`
+	#
+	# to the line that links libperl.so, and then set LIBPERL to:
+	#
+	#   LIBPERL=libperl.so.${SLOT}.`echo ${PV} | cut -d. -f1,2`
+	#
+	cd ${S};
+	use userland_Darwin || epatch ${FILESDIR}/${PN}-create-libperl-soname.patch
+
+	# uclibc support - dragonheart 2004.06.16
+	# Now upstreamed - MPC 2005.06.28
+	#cd ${S}; epatch ${FILESDIR}/${PN}-uclibc.patch
+
+	# Configure makes an unwarranted assumption that /bin/ksh is a
+	# good shell. This patch makes it revert to using /bin/sh unless
+	# /bin/ksh really is executable. Should fix bug 42665.
+	# rac 2004.06.09
+	cd ${S}; epatch ${FILESDIR}/${PN}-noksh.patch
+
+	# we need the same @INC-inversion magic here we do in perl
+	cd ${S}; epatch ${FILESDIR}/${P}-reorder-INC.patch
+
+	use amd64 && cd ${S} && epatch ${FILESDIR}/${P}-lib64.patch
+	[[ ${CHOST} == *-dragonfly* ]] && cd ${S} && epatch ${FILESDIR}/${P}-dragonfly-clean.patch
+	[[ ${CHOST} == *-freebsd* ]] && cd ${S} && epatch ${FILESDIR}/${P}-fbsdhints.patch
+	cd ${S}; epatch ${FILESDIR}/${P}-cplusplus.patch
+}
+
+myconf() {
+	myconf=( "${myconf[@]}" "$@" )
+}
+
+src_compile() {
+	declare -a myconf
+
+	# Perl has problems compiling with -Os in your flags
+	# some arches and -O do not mix :)
+	use arm && replace-flags -O? -O1
+	use ppc && replace-flags -O? -O1
+	use ia64 && replace-flags -O? -O1
+	# Perl has problems compiling with -Os in your flags with glibc
+	use elibc_uclibc || replace-flags "-Os" "-O2"
+	# This flag makes compiling crash in interesting ways
+	filter-flags "-malign-double"
+	# Fixes bug #97645
+	use ppc && filter-flags -mpowerpc-gpopt
+
+	export LC_ALL="C"
+
+	case ${CHOST} in
+		*-freebsd*) osname="freebsd" ;;
+		*-dragonfly*) osname="dragonfly" ;;
+		*-netbsd*) osname="netbsd" ;;
+		*-openbsd*) osname="openbsd" ;;
+		*-darwin*) osname="darwin" ;;
+
+		*) osname="linux" ;;
+	esac
+
+	if use ithreads
+	then
+		einfo "using ithreads"
+		mythreading="-multi"
+		myconf -Dusethreads
+		myarch=${CHOST}
+		myarch="${myarch%%-*}-${osname}-thread"
+	else
+		myarch=${CHOST}
+		myarch="${myarch%%-*}-${osname}"
+	fi
+
+	local inclist=$(for v in $PERL_OLDVERSEN; do echo -n "$v $v/$myarch$mythreading "; done)
+
+	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
+
+	myndbm='U'
+	mygdbm='U'
+	mydb='U'
+
+	if use gdbm
+	then
+		mygdbm='D'
+		myndbm='D'
+	fi
+	if use berkdb
+	then
+		mydb='D'
+		has_version '=sys-libs/db-1*' && myndbm='D'
+	fi
+
+	myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
+
+	if use mips
+	then
+		# this is needed because gcc 3.3-compiled kernels will hang
+		# the machine trying to run this test - check with `Kumba
+		# <rac@gentoo.org> 2003.06.26
+		myconf -Dd_u32align
+	fi
+
+	if use debug
+	then
+		CFLAGS="${CFLAGS} -g"
+		myconf -DDEBUGGING
+	fi
+
+	if use sparc
+	then
+		myconf -Ud_longdbl
+	fi
+
+	if use alpha && "$(tc-getCC)" == "ccc"
+	then
+		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
+		myconf -Ui_db -Ui_ndbm
+	fi
+
+	rm -f config.sh Policy.sh
+
+	[[ -n "${ABI}" ]] && myconf "-Dusrinc=$(get_ml_incdir)"
+
+	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
+
+	if [[ $(get_libdir) != "lib" ]] ; then
+		myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
+	fi
+
+	sh Configure -des \
+		-Darchname="${myarch}" \
+		-Dcccdlflags="-fPIC" \
+		-Dccdlflags="-rdynamic" \
+		-Dcc="$(tc-getCC)" \
+		-Dprefix="/usr" \
+		-Dvendorprefix="/usr" \
+		-Dsiteprefix="/usr" \
+		-Dlocincpth=" " \
+		-Doptimize="${CFLAGS}" \
+		-Duselargefiles \
+		-Duseshrplib \
+		-Dman3ext="3pm" \
+		-Dlibperl="${LIBPERL}" \
+		-Dd_dosuid \
+		-Dd_semctl_semun \
+		-Dcf_by="Gentoo" \
+		-Ud_csh \
+		"${myconf[@]}" || die "Unable to configure"
+
+	emake -j1 -f Makefile depend || die "Couldn't make libperl$(get_libname) depends"
+	emake -j1 -f Makefile LIBPERL=${LIBPERL} ${LIBPERL} || die "Unable to make libperl$(get_libname)"
+	mv ${LIBPERL} ${WORKDIR}
+}
+
+src_install() {
+
+	export LC_ALL="C"
+
+	if [ "${PN}" = "libperl" ]
+	then
+		dolib.so ${WORKDIR}/${LIBPERL}
+		dosym ${LIBPERL} /usr/$(get_libdir)/libperl$(get_libname ${PERLSLOT})
+	else
+		# Need to do this, else apps do not link to dynamic version of
+		# the library ...
+		local coredir="/usr/$(get_libdir)/perl5/${PV}/${myarch}${mythreading}/CORE"
+		dodir ${coredir}
+		dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/${LIBPERL}
+		dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname ${PERLSLOT})
+		dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname)
+
+		# Fix for "stupid" modules and programs
+		dodir /usr/$(get_libdir)/perl5/site_perl/${PV}/${myarch}${mythreading}
+
+		make DESTDIR="${D}" \
+			INSTALLMAN1DIR="${D}/usr/share/man/man1" \
+			INSTALLMAN3DIR="${D}/usr/share/man/man3" \
+			install || die "Unable to make install"
+
+		cp -f utils/h2ph utils/h2ph_patched
+
+		LD_LIBRARY_PATH=. ./perl -Ilib utils/h2ph_patched \
+			-a -d ${D}/usr/$(get_libdir)/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/$(get_libdir)/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/$(get_libdir)/perl5/${PV}/ExtUtils/xsubpp
+		fperms 0444 /usr/$(get_libdir)/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/$(get_libdir)/libperl$(get_libname)" -a ! -L "${ROOT}usr/$(get_libdir)/libperl$(get_libname)" ]
+	then
+		mv -f ${ROOT}usr/$(get_libdir)/libperl$(get_libname) ${ROOT}usr/$(get_libdir)/libperl$(get_libname).old
+	fi
+
+	# Next bit is to try and setup the /usr/lib/libperl.so symlink
+	# properly ...
+	local libnumber="`ls -1 ${ROOT}usr/$(get_libdir)/libperl$(get_libname ?.*) | 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$(get_libname ${PERLSLOT}) ${ROOT}usr/$(get_libdir)/libperl$(get_libname)
+	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/$(get_libdir)
+			# Link libperl.so to the *soname* versioned lib ...
+			ln -snf `echo libperl$(get_libname ?.${perlversion}) | cut -d.  -f1,2,3` libperl$(get_libname)
+		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/$(get_libdir)/libperl$(get_libname ?.*)`
+			do
+				latest="${x}"
+			done
+
+			cd ${ROOT}usr/$(get_libdir)
+			# Link libperl.so to the *soname* versioned lib ...
+			ln -snf `echo ${latest##*/} | cut -d. -f1,2,3` libperl$(get_libname)
+		fi
+	fi
+}
+