Bug 113930, case statement for non-linux. Also cleaned out 5.8.5 versions since we don't have perl ebuilds for them either.

Package-Manager: portage-2.0.53_rc6

9 files changed, 42 insertions, 740 deletions

diff --git a/sys-devel/libperl/ChangeLog b/sys-devel/libperl/ChangeLog
index d4d166870c1f..a1ce37d2e6a3 100644
--- a/sys-devel/libperl/ChangeLog
+++ b/sys-devel/libperl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/libperl
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/ChangeLog,v 1.89 2005/12/01 18:51:40 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/ChangeLog,v 1.90 2005/12/05 16:08:50 mcummings Exp $
+
+  05 Dec 2005; <mcumming@gentoo.org> -libperl-5.8.5-r1.ebuild,
+  -libperl-5.8.5.ebuild, libperl-5.8.6-r1.ebuild, libperl-5.8.6.ebuild,
+  libperl-5.8.7.ebuild:
+  Bug 113930, case statement for non-linux. Also cleaned out 5.8.5 versions
+  since we don't have perl ebuilds for them either.
 
   01 Dec 2005; <dang@gentoo.org> libperl-5.8.7.ebuild:
   Marked stable on amd64
diff --git a/sys-devel/libperl/Manifest b/sys-devel/libperl/Manifest
index d68fe1d01fe5..88c89c348d5d 100644
--- a/sys-devel/libperl/Manifest
+++ b/sys-devel/libperl/Manifest
@@ -1,9 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 8a18d7c186a77bb6c02b14e094a2715a ChangeLog 13184
-MD5 c354e2fbf8141a769c20032e94f45fd3 files/digest-libperl-5.8.5 64
-MD5 c354e2fbf8141a769c20032e94f45fd3 files/digest-libperl-5.8.5-r1 64
+MD5 bf3e6c39519827ce0d0389a88ca43a68 ChangeLog 13477
 MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-libperl-5.8.6 64
 MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-libperl-5.8.6-r1 64
 MD5 c10e44e47d7f702efe7d4009064a97ca files/digest-libperl-5.8.7 64
@@ -12,16 +10,14 @@ MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-create-libperl-soname.patch 4
 MD5 076dcbef37263d6dd7af719b55cfc2de files/libperl-noksh.patch 611
 MD5 f7324a62f22aabde3387b7e8a8b2106e files/libperl-reorder-INC.patch 1141
 MD5 ce442db939c59218a16be167f793b817 files/libperl-uclibc.patch 573
-MD5 2fb571ee80c894f660e610ef4c717082 libperl-5.8.5-r1.ebuild 10032
-MD5 642d6d7d6f6cdd65347342bcb7970733 libperl-5.8.5.ebuild 9923
-MD5 b84aca47b4bf72b939c2058d36f9a4f5 libperl-5.8.6-r1.ebuild 10525
-MD5 95d8eb043ad2bad59f1c56d50c39afca libperl-5.8.6.ebuild 10529
-MD5 2b8720f5c827485c13d78f5a0a8c8172 libperl-5.8.7.ebuild 11125
+MD5 2851a1ba23d4be16ff6c9735aa289c16 libperl-5.8.6-r1.ebuild 10536
+MD5 238d6f9ba63a47e6de31b510cc542337 libperl-5.8.6.ebuild 10540
+MD5 4b7aefaac8c3dbfad06fde3ef31d980f libperl-5.8.7.ebuild 11081
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDj0YvomPajV0RnrERAsVsAJ9aY/NPAeCnvEy6u9cpkhC1nwRMuwCdH7hE
-3vbqst75TOF63VDqeJh728s=
-=z48o
+iD8DBQFDlGYatG5z4I8BtQoRApNZAJ9bQL8JEyh8Q+ITbdHvdwa5b3SsBQCfZGqg
+e/tUX75X1JnEpet1f/vAkzw=
+=bnnB
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/libperl/files/digest-libperl-5.8.5 b/sys-devel/libperl/files/digest-libperl-5.8.5
deleted file mode 100644
index a774272cdab6..000000000000
--- a/sys-devel/libperl/files/digest-libperl-5.8.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 49baa8d7d29b4a9713c06edeb81e6b1b perl-5.8.5.tar.gz 11930764
diff --git a/sys-devel/libperl/files/digest-libperl-5.8.5-r1 b/sys-devel/libperl/files/digest-libperl-5.8.5-r1
deleted file mode 100644
index a774272cdab6..000000000000
--- a/sys-devel/libperl/files/digest-libperl-5.8.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 49baa8d7d29b4a9713c06edeb81e6b1b perl-5.8.5.tar.gz 11930764
diff --git a/sys-devel/libperl/libperl-5.8.5-r1.ebuild b/sys-devel/libperl/libperl-5.8.5-r1.ebuild
deleted file mode 100644
index 423588f3de80..000000000000
--- a/sys-devel/libperl/libperl-5.8.5-r1.ebuild
+++ /dev/null
@@ -1,351 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.5-r1.ebuild,v 1.13 2005/11/05 14:54:47 solar 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
-
-# Perl has problems compiling with -Os in your flags
-
-# This flag makes compiling crash in interesting ways
-filter-flags "-malign-double"
-
-# The slot of this binary compat version of libperl.so
-PERLSLOT="1"
-
-SHORT_PV="${PV%.*}"
-MY_P="perl-${PV/_rc/-RC}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
-SRC_URI="ftp://ftp.cpan.org/pub/CPAN/src/${MY_P}.tar.gz"
-HOMEPAGE="http://www.perl.org"
-SLOT="${PERLSLOT}"
-LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
-LICENSE="Artistic GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390 ~sh"
-
-# 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
-	else
-		ewarn ""
-		ewarn "PLEASE NOTE: If you want to compile perl-5.8 with"
-		ewarn "threading enabled , you must restart this emerge"
-		ewarn "with USE=ithreads emerge...."
-		ewarn "Threading is not supported by all applications "
-		ewarn "that compile against perl. You use threading at "
-		ewarn "your own discretion. "
-		ewarn ""
-		epause 10
-	fi
-}
-
-src_unpack() {
-
-	unpack ${A}
-
-	# Fix the build scripts to create libperl with a soname of ${SLOT}.
-	# We basically add:
-	#
-	#   -Wl,-soname -Wl,libperl.so.`echo $(LIBPERL) | cut -d. -f3`
-	#
-	# to the line that links libperl.so, and then set LIBPERL to:
-	#
-	#   LIBPERL=libperl.so.${SLOT}.`echo ${PV} | cut -d. -f1,2`
-	#
-	cd ${S}; epatch ${FILESDIR}/${PN}-create-libperl-soname.patch
-
-	# uclibc support - dragonheart 2004.06.16
-	cd ${S}; epatch ${FILESDIR}/${PN}-uclibc.patch
-
-	# Configure makes an unwarranted assumption that /bin/ksh is a
-	# good shell. This patch makes it revert to using /bin/sh unless
-	# /bin/ksh really is executable. Should fix bug 42665.
-	# rac 2004.06.09
-	cd ${S}; epatch ${FILESDIR}/${PN}-noksh.patch
-
-	# we need the same @INC-inversion magic here we do in perl
-	cd ${S}; epatch ${FILESDIR}/${PN}-reorder-INC.patch
-}
-
-src_compile() {
-
-	export LC_ALL="C"
-	local myconf=""
-
-	use elibc_uclibc || replace-flags "-Os" "-O2"
-
-	if use ithreads
-	then
-		einfo "using ithreads"
-		mythreading="-multi"
-		myconf="-Dusethreads ${myconf}"
-		myarch="${CHOST%%-*}-linux-thread"
-	else
-		myarch="${CHOST%%-*}-linux"
-	fi
-
-	if use gdbm
-	then
-		myconf="${myconf} -Di_gdbm"
-	fi
-	if use berkdb
-	then
-		myconf="${myconf} -Di_db -Di_ndbm"
-	else
-		myconf="${myconf} -Ui_db -Ui_ndbm"
-	fi
-	if use mips
-	then
-		# this is needed because gcc 3.3-compiled kernels will hang
-		# the machine trying to run this test - check with `Kumba
-		# <rac@gentoo.org> 2003.06.26
-		myconf="${myconf} -Dd_u32align"
-	fi
-
-	if use debug
-	then
-		CFLAGS="${CFLAGS} -g"
-	fi
-
-	if use sparc
-	then
-		myconf="${myconf} -Ud_longdbl"
-	fi
-
-	rm -f config.sh Policy.sh
-
-	[ -n "${ABI}" ] && myconf="${myconf} -Dusrinc=$(get_ml_incdir)"
-
-	sh Configure -des \
-		-Darchname="${myarch}" \
-		-Dcccdlflags='-fPIC' \
-		-Dccdlflags='-rdynamic' \
-		-Dcc="$(tc-getCC)" \
-		-Dprefix='/usr' \
-		-Dvendorprefix='/usr' \
-		-Dsiteprefix='/usr' \
-		-Dlocincpth=' ' \
-		-Doptimize="${CFLAGS}" \
-		-Duselargefiles \
-		-Duseshrplib \
-		-Dman3ext='3pm' \
-		-Dlibperl="${LIBPERL}" \
-		-Dd_dosuid \
-		-Dd_semctl_semun \
-		-Dcf_by='Gentoo' \
-		-Ud_csh \
-		${myconf} || die
-
-	emake -j1 -f Makefile depend || die "Couldn't make libperl.so depends"
-	emake -j1 -f Makefile ${LIBPERL} || die "Unable to make libperl.so"
-	mv ${LIBPERL} ${WORKDIR}
-}
-
-src_install() {
-
-	export LC_ALL="C"
-
-	if [ "${PN}" = "libperl" ]
-	then
-		dolib.so ${WORKDIR}/${LIBPERL}
-		preplib
-	else
-		# Need to do this, else apps do not link to dynamic version of
-		# the library ...
-		local coredir="/usr/lib/perl5/${PV}/${myarch}${mythreading}/CORE"
-		dodir ${coredir}
-		dosym ../../../../${LIBPERL} ${coredir}/${LIBPERL}
-		dosym ../../../../${LIBPERL} ${coredir}/libperl.so.${PERLSLOT}
-		dosym ../../../../${LIBPERL} ${coredir}/libperl.so
-
-		# Fix for "stupid" modules and programs
-		dodir /usr/lib/perl5/site_perl/${PV}/${myarch}${mythreading}
-
-		make DESTDIR="${D}" \
-			INSTALLMAN1DIR="${D}/usr/share/man/man1" \
-			INSTALLMAN3DIR="${D}/usr/share/man/man3" \
-			install || die "Unable to make install"
-
-		cp -f utils/h2ph utils/h2ph_patched
-
-		LD_LIBRARY_PATH=. ./perl -Ilib utils/h2ph_patched \
-			-a -d ${D}/usr/lib/perl5/${PV}/${myarch}${mythreading} <<EOF
-asm/termios.h
-syscall.h
-syslimits.h
-syslog.h
-sys/ioctl.h
-sys/socket.h
-sys/time.h
-wait.h
-EOF
-
-		# This is to fix a missing c flag for backwards compat
-		for i in `find ${D}/usr/lib/perl5 -iname "Config.pm"`;do
-			sed -e "s:ccflags=':ccflags='-DPERL5 :" \
-			    -e "s:cppflags=':cppflags='-DPERL5 :" \
-				${i} > ${i}.new &&\
-				mv ${i}.new ${i} || die "Sed failed"
-		done
-
-		# A poor fix for the miniperl issues
-		dosed 's:./miniperl:/usr/bin/perl:' /usr/lib/perl5/${PV}/ExtUtils/xsubpp
-		fperms 0444 /usr/lib/perl5/${PV}/ExtUtils/xsubpp
-		dosed 's:./miniperl:/usr/bin/perl:' /usr/bin/xsubpp
-		fperms 0755 /usr/bin/xsubpp
-
-		./perl installman \
-			--man1dir="${D}/usr/share/man/man1" --man1ext='1' \
-			--man3dir="${D}/usr/share/man/man3" --man3ext='3'
-
-		# This removes ${D} from Config.pm and .packlist
-		for i in `find ${D} -iname "Config.pm"` `find ${D} -iname ".packlist"`;do
-			einfo "Removing ${D} from ${i}..."
-			sed -e "s:${D}::" ${i} > ${i}.new &&\
-				mv ${i}.new ${i} || die "Sed failed"
-		done
-	fi
-
-	dodoc Changes* Artistic Copying README Todo* AUTHORS
-
-	if [ "${PN}" = "perl" ]
-	then
-		# HTML Documentation
-		# We expect errors, warnings, and such with the following.
-
-		dodir /usr/share/doc/${PF}/html
-		./perl installhtml \
-			--podroot='.' \
-			--podpath='lib:ext:pod:vms' \
-			--recurse \
-			--htmldir="${D}/usr/share/doc/${PF}/html" \
-			--libpods='perlfunc:perlguts:perlvar:perlrun:perlop'
-	fi
-}
-
-pkg_postinst() {
-
-	# Make sure we do not have stale/invalid libperl.so 's ...
-	if [ -f "${ROOT}usr/lib/libperl.so" -a ! -L "${ROOT}usr/lib/libperl.so" ]
-	then
-		mv -f ${ROOT}usr/lib/libperl.so ${ROOT}usr/lib/libperl.so.old
-	fi
-
-	# Next bit is to try and setup the /usr/lib/libperl.so symlink
-	# properly ...
-	local libnumber="`ls -1 ${ROOT}usr/lib/libperl.so.?.* | grep -v '\.old' | wc -l`"
-	if [ "${libnumber}" -eq 1 ]
-	then
-		# Only this version of libperl is installed, so just link libperl.so
-		# to the *soname* version of it ...
-		ln -snf libperl.so.${PERLSLOT} ${ROOT}usr/lib/libperl.so
-	else
-		if [ -x "${ROOT}/usr/bin/perl" ]
-		then
-			# OK, we have more than one version .. first try to figure out
-			# if there are already a perl installed, if so, link libperl.so
-			# to that *soname* version of libperl.so ...
-			local perlversion="`${ROOT}/usr/bin/perl -V:version | cut -d\' -f2 | cut -d. -f1,2`"
-
-			cd ${ROOT}usr/lib
-			# Link libperl.so to the *soname* versioned lib ...
-			ln -snf `echo libperl.so.?.${perlversion} | cut -d. -f1,2,3` libperl.so
-		else
-			local x latest
-
-			# Nope, we are not so lucky ... try to figure out what version
-			# is the latest, and keep fingers crossed ...
-			for x in `ls -1 ${ROOT}usr/lib/libperl.so.?.*`
-			do
-				latest="${x}"
-			done
-
-			cd ${ROOT}usr/lib
-			# Link libperl.so to the *soname* versioned lib ...
-			ln -snf `echo ${latest##*/} | cut -d. -f1,2,3` libperl.so
-		fi
-	fi
-}
-
diff --git a/sys-devel/libperl/libperl-5.8.5.ebuild b/sys-devel/libperl/libperl-5.8.5.ebuild
deleted file mode 100644
index 7d25ff31610e..000000000000
--- a/sys-devel/libperl/libperl-5.8.5.ebuild
+++ /dev/null
@@ -1,348 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.5.ebuild,v 1.22 2005/11/05 14:54:47 solar 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
-
-# This flag makes compiling crash in interesting ways
-filter-flags "-malign-double"
-
-# The slot of this binary compat version of libperl.so
-PERLSLOT="1"
-
-SHORT_PV="${PV%.*}"
-MY_P="perl-${PV/_rc/-RC}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
-SRC_URI="ftp://ftp.cpan.org/pub/CPAN/src/${MY_P}.tar.gz"
-HOMEPAGE="http://www.perl.org"
-SLOT="${PERLSLOT}"
-LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
-LICENSE="Artistic GPL-2"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390 sh"
-
-# 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
-	else
-		ewarn ""
-		ewarn "PLEASE NOTE: If you want to compile perl-5.8 with"
-		ewarn "threading enabled , you must restart this emerge"
-		ewarn "with USE=ithreads emerge...."
-		ewarn "Threading is not supported by all applications "
-		ewarn "that compile against perl. You use threading at "
-		ewarn "your own discretion. "
-		ewarn ""
-		epause 10
-	fi
-}
-
-src_unpack() {
-
-	unpack ${A}
-
-	# Fix the build scripts to create libperl with a soname of ${SLOT}.
-	# We basically add:
-	#
-	#   -Wl,-soname -Wl,libperl.so.`echo $(LIBPERL) | cut -d. -f3`
-	#
-	# to the line that links libperl.so, and then set LIBPERL to:
-	#
-	#   LIBPERL=libperl.so.${SLOT}.`echo ${PV} | cut -d. -f1,2`
-	#
-	cd ${S}; epatch ${FILESDIR}/${PN}-create-libperl-soname.patch
-
-	# uclibc support - dragonheart 2004.06.16
-	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
-
-}
-
-src_compile() {
-
-	export LC_ALL="C"
-	local myconf=""
-
-	# Perl has problems compiling with -Os in your flags
-	use elibc_uclibc || replace-flags "-Os" "-O2"
-
-	if use ithreads
-	then
-		einfo "using ithreads"
-		mythreading="-multi"
-		myconf="-Dusethreads ${myconf}"
-		myarch="${CHOST%%-*}-linux-thread"
-	else
-		myarch="${CHOST%%-*}-linux"
-	fi
-
-	if use gdbm
-	then
-		myconf="${myconf} -Di_gdbm"
-	fi
-	if use berkdb
-	then
-		myconf="${myconf} -Di_db -Di_ndbm"
-	else
-		myconf="${myconf} -Ui_db -Ui_ndbm"
-	fi
-	if use mips
-	then
-		# this is needed because gcc 3.3-compiled kernels will hang
-		# the machine trying to run this test - check with `Kumba
-		# <rac@gentoo.org> 2003.06.26
-		myconf="${myconf} -Dd_u32align"
-	fi
-
-	if use debug
-	then
-		CFLAGS="${CFLAGS} -g"
-	fi
-
-	if use sparc
-	then
-		myconf="${myconf} -Ud_longdbl"
-	fi
-
-	rm -f config.sh Policy.sh
-
-	[ -n "${ABI}" ] && myconf="${myconf} -Dusrinc=$(get_ml_incdir)"
-
-	sh Configure -des \
-		-Darchname="${myarch}" \
-		-Dcccdlflags='-fPIC' \
-		-Dccdlflags='-rdynamic' \
-		-Dcc="$(tc-getCC)" \
-		-Dprefix='/usr' \
-		-Dvendorprefix='/usr' \
-		-Dsiteprefix='/usr' \
-		-Dlocincpth=' ' \
-		-Doptimize="${CFLAGS}" \
-		-Duselargefiles \
-		-Duseshrplib \
-		-Dman3ext='3pm' \
-		-Dlibperl="${LIBPERL}" \
-		-Dd_dosuid \
-		-Dd_semctl_semun \
-		-Dcf_by='Gentoo' \
-		-Ud_csh \
-		${myconf} || die
-
-	emake -j1 -f Makefile depend || die "Couldn't make libperl.so depends"
-	emake -j1 -f Makefile LIBPERL=${LIBPERL} ${LIBPERL} || die "Unable to make libperl.so"
-	mv ${LIBPERL} ${WORKDIR}
-}
-
-src_install() {
-
-	export LC_ALL="C"
-
-	if [ "${PN}" = "libperl" ]
-	then
-		dolib.so ${WORKDIR}/${LIBPERL}
-		preplib
-	else
-		# Need to do this, else apps do not link to dynamic version of
-		# the library ...
-		local coredir="/usr/lib/perl5/${PV}/${myarch}${mythreading}/CORE"
-		dodir ${coredir}
-		dosym ../../../../${LIBPERL} ${coredir}/${LIBPERL}
-		dosym ../../../../${LIBPERL} ${coredir}/libperl.so.${PERLSLOT}
-		dosym ../../../../${LIBPERL} ${coredir}/libperl.so
-
-		# Fix for "stupid" modules and programs
-		dodir /usr/lib/perl5/site_perl/${PV}/${myarch}${mythreading}
-
-		make DESTDIR="${D}" \
-			INSTALLMAN1DIR="${D}/usr/share/man/man1" \
-			INSTALLMAN3DIR="${D}/usr/share/man/man3" \
-			install || die "Unable to make install"
-
-		cp -f utils/h2ph utils/h2ph_patched
-
-		LD_LIBRARY_PATH=. ./perl -Ilib utils/h2ph_patched \
-			-a -d ${D}/usr/lib/perl5/${PV}/${myarch}${mythreading} <<EOF
-asm/termios.h
-syscall.h
-syslimits.h
-syslog.h
-sys/ioctl.h
-sys/socket.h
-sys/time.h
-wait.h
-EOF
-
-		# This is to fix a missing c flag for backwards compat
-		for i in `find ${D}/usr/lib/perl5 -iname "Config.pm"`;do
-			sed -e "s:ccflags=':ccflags='-DPERL5 :" \
-			    -e "s:cppflags=':cppflags='-DPERL5 :" \
-				${i} > ${i}.new &&\
-				mv ${i}.new ${i} || die "Sed failed"
-		done
-
-		# A poor fix for the miniperl issues
-		dosed 's:./miniperl:/usr/bin/perl:' /usr/lib/perl5/${PV}/ExtUtils/xsubpp
-		fperms 0444 /usr/lib/perl5/${PV}/ExtUtils/xsubpp
-		dosed 's:./miniperl:/usr/bin/perl:' /usr/bin/xsubpp
-		fperms 0755 /usr/bin/xsubpp
-
-		./perl installman \
-			--man1dir="${D}/usr/share/man/man1" --man1ext='1' \
-			--man3dir="${D}/usr/share/man/man3" --man3ext='3'
-
-		# This removes ${D} from Config.pm and .packlist
-		for i in `find ${D} -iname "Config.pm"` `find ${D} -iname ".packlist"`;do
-			einfo "Removing ${D} from ${i}..."
-			sed -e "s:${D}::" ${i} > ${i}.new &&\
-				mv ${i}.new ${i} || die "Sed failed"
-		done
-	fi
-
-	dodoc Changes* Artistic Copying README Todo* AUTHORS
-
-	if [ "${PN}" = "perl" ]
-	then
-		# HTML Documentation
-		# We expect errors, warnings, and such with the following.
-
-		dodir /usr/share/doc/${PF}/html
-		./perl installhtml \
-			--podroot='.' \
-			--podpath='lib:ext:pod:vms' \
-			--recurse \
-			--htmldir="${D}/usr/share/doc/${PF}/html" \
-			--libpods='perlfunc:perlguts:perlvar:perlrun:perlop'
-	fi
-}
-
-pkg_postinst() {
-
-	# Make sure we do not have stale/invalid libperl.so 's ...
-	if [ -f "${ROOT}usr/lib/libperl.so" -a ! -L "${ROOT}usr/lib/libperl.so" ]
-	then
-		mv -f ${ROOT}usr/lib/libperl.so ${ROOT}usr/lib/libperl.so.old
-	fi
-
-	# Next bit is to try and setup the /usr/lib/libperl.so symlink
-	# properly ...
-	local libnumber="`ls -1 ${ROOT}usr/lib/libperl.so.?.* | grep -v '\.old' | wc -l`"
-	if [ "${libnumber}" -eq 1 ]
-	then
-		# Only this version of libperl is installed, so just link libperl.so
-		# to the *soname* version of it ...
-		ln -snf libperl.so.${PERLSLOT} ${ROOT}usr/lib/libperl.so
-	else
-		if [ -x "${ROOT}/usr/bin/perl" ]
-		then
-			# OK, we have more than one version .. first try to figure out
-			# if there are already a perl installed, if so, link libperl.so
-			# to that *soname* version of libperl.so ...
-			local perlversion="`${ROOT}/usr/bin/perl -V:version | cut -d\' -f2 | cut -d. -f1,2`"
-
-			cd ${ROOT}usr/lib
-			# Link libperl.so to the *soname* versioned lib ...
-			ln -snf `echo libperl.so.?.${perlversion} | cut -d. -f1,2,3` libperl.so
-		else
-			local x latest
-
-			# Nope, we are not so lucky ... try to figure out what version
-			# is the latest, and keep fingers crossed ...
-			for x in `ls -1 ${ROOT}usr/lib/libperl.so.?.*`
-			do
-				latest="${x}"
-			done
-
-			cd ${ROOT}usr/lib
-			# Link libperl.so to the *soname* versioned lib ...
-			ln -snf `echo ${latest##*/} | cut -d. -f1,2,3` libperl.so
-		fi
-	fi
-}
-
diff --git a/sys-devel/libperl/libperl-5.8.6-r1.ebuild b/sys-devel/libperl/libperl-5.8.6-r1.ebuild
index 011c717d550f..0d03e531d04e 100644
--- a/sys-devel/libperl/libperl-5.8.6-r1.ebuild
+++ b/sys-devel/libperl/libperl-5.8.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.6-r1.ebuild,v 1.13 2005/11/14 21:42:02 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.6-r1.ebuild,v 1.14 2005/12/05 16:08:50 mcummings Exp $
 
 # The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
 #
@@ -153,13 +153,14 @@ src_compile() {
 	export LC_ALL="C"
 	local myconf=""
 
-	if [[ ${KERNEL} == "FreeBSD" && "${ELIBC}" = "FreeBsd" ]]; then
-		osname="freebsd"
-	elif [[ ${KERNEL} == "NetBSD" ]]; then
-		osname="netbsd"
-	else
-		osname="linux"
-	fi
+	case ${CHOST} in
+		*-freebsd*) osname="freebsd" ;;
+		*-netbsd*) osname="netbsd" ;;
+		*-openbsd*) osname="openbsd" ;;
+		*-darwin*) osname="darwin" ;;
+
+		*) osname="linux" ;;
+	esac
 
 	if use ithreads
 	then
diff --git a/sys-devel/libperl/libperl-5.8.6.ebuild b/sys-devel/libperl/libperl-5.8.6.ebuild
index 59456b4378e2..dbb7b5ce8b70 100644
--- a/sys-devel/libperl/libperl-5.8.6.ebuild
+++ b/sys-devel/libperl/libperl-5.8.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.6.ebuild,v 1.18 2005/11/14 21:42:02 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.6.ebuild,v 1.19 2005/12/05 16:08:50 mcummings Exp $
 
 # The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
 #
@@ -153,13 +153,14 @@ src_compile() {
 	export LC_ALL="C"
 	local myconf=""
 
-	if [[ ${KERNEL} == "FreeBSD" && "${ELIBC}" = "FreeBsd" ]]; then
-		osname="freebsd"
-	elif [[ ${KERNEL} == "NetBSD" ]]; then
-		osname="netbsd"
-	else
-		osname="linux"
-	fi
+	case ${CHOST} in
+		*-freebsd*) osname="freebsd" ;;
+		*-netbsd*) osname="netbsd" ;;
+		*-openbsd*) osname="openbsd" ;;
+		*-darwin*) osname="darwin" ;;
+
+		*) osname="linux" ;;
+	esac
 
 	if use ithreads
 	then
diff --git a/sys-devel/libperl/libperl-5.8.7.ebuild b/sys-devel/libperl/libperl-5.8.7.ebuild
index 59a167ebfd0f..5b7bdfed7603 100644
--- a/sys-devel/libperl/libperl-5.8.7.ebuild
+++ b/sys-devel/libperl/libperl-5.8.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.7.ebuild,v 1.18 2005/12/01 18:51:40 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.7.ebuild,v 1.19 2005/12/05 16:08:50 mcummings Exp $
 
 # The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
 #
@@ -155,15 +155,14 @@ src_compile() {
 	export LC_ALL="C"
 	local myconf=""
 
-	if [[ ${KERNEL} == "FreeBSD" && "${ELIBC}" = "FreeBSD" ]]; then
-		osname="freebsd"
-	elif [[ ${KERNEL} == "NetBSD" ]]; then
-		osname="netbsd"
-	elif [[ ${USERLAND} == "Darwin" ]]; then
-		osname="darwin"
-	else
-		osname="linux"
-	fi
+	case ${CHOST} in
+		*-freebsd*) osname="freebsd" ;;
+		*-netbsd*) osname="netbsd" ;;
+		*-openbsd*) osname="openbsd" ;;
+		*-darwin*) osname="darwin" ;;
+
+		*) osname="linux" ;;
+	esac
 
 	if use ithreads
 	then