5.8.6

8 files changed, 105 insertions, 94 deletions

diff --git a/sys-devel/libperl/ChangeLog b/sys-devel/libperl/ChangeLog
index d1b803216e21..ddbff607db1d 100644
--- a/sys-devel/libperl/ChangeLog
+++ b/sys-devel/libperl/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-devel/libperl
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/ChangeLog,v 1.49 2004/09/27 11:33:08 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/ChangeLog,v 1.50 2004/11/30 21:01:58 rac Exp $
+
+*libperl-5.8.6 (30 Nov 2004)
+
+  30 Nov 2004; Robert Coie <rac@gentoo.org>
+  -files/libperl-5.8.3-create-libperl-soname.patch,
+  +files/libperl-5.8.6-create-libperl-soname.patch,
+  +files/libperl-5.8.6-noksh.patch, +files/libperl-5.8.6-uclibc.patch,
+  -libperl-5.8.3.ebuild, +libperl-5.8.6.ebuild:
+  New upstream
 
   27 Sep 2004; Michael Cummings <mcummings@gentoo.org>
   libperl-5.8.2-r1.ebuild, libperl-5.8.2.ebuild, libperl-5.8.3.ebuild,
diff --git a/sys-devel/libperl/Manifest b/sys-devel/libperl/Manifest
index cdeb4fe800ba..37be1ab5b107 100644
--- a/sys-devel/libperl/Manifest
+++ b/sys-devel/libperl/Manifest
@@ -1,26 +1,29 @@
+MD5 171c5bd2df821f6db9ce1314e3a1f30c libperl-5.8.2.ebuild 10700
 MD5 2bbc7f4723b243237d5839c3ca5bab7f ChangeLog 7109
-MD5 db9902a20bbca826f569079f24e02407 libperl-5.8.4.ebuild 10973
 MD5 aef6877728f8c0325b339fa7171e4c46 libperl-5.8.5.ebuild 9855
-MD5 56de542560e66a05f47182a080e4d80a libperl-5.8.3.ebuild 10718
-MD5 171c5bd2df821f6db9ce1314e3a1f30c libperl-5.8.2.ebuild 10700
+MD5 33c4d1cccce9618cc6aa890cea33e0fb libperl-5.8.6.ebuild 9859
+MD5 db9902a20bbca826f569079f24e02407 libperl-5.8.4.ebuild 10973
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 MD5 fb72072205d13c03cc89b8bde10fe83a libperl-5.8.2-r1.ebuild 10811
 MD5 30cddec80833a10cc715b33ed43a6dfa libperl-5.8.4-r1.ebuild 11091
 MD5 9483ac7a7fbc1526da4636b2226f048e libperl-5.8.5-r1.ebuild 9971
-MD5 93155b02a7e9d3cdc6d6934ce78d9f11 files/digest-libperl-5.8.4 64
-MD5 c354e2fbf8141a769c20032e94f45fd3 files/digest-libperl-5.8.5 64
-MD5 35eb3b7645102bbcc4088d900dc28984 files/digest-libperl-5.8.3 64
 MD5 076dcbef37263d6dd7af719b55cfc2de files/libperl-5.8.4-noksh.patch 611
 MD5 8381e239056a7895edf8f3c6c05c835c files/digest-libperl-5.8.2 64
-MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-5.8.4-create-libperl-soname.patch 417
+MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-libperl-5.8.6 64
+MD5 93155b02a7e9d3cdc6d6934ce78d9f11 files/digest-libperl-5.8.4 64
 MD5 8381e239056a7895edf8f3c6c05c835c files/digest-libperl-5.8.2-r1 64
+MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-5.8.2-create-libperl-soname.patch 417
+MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-5.8.3-create-libperl-soname.patch 417
+MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-5.8.4-create-libperl-soname.patch 417
 MD5 93155b02a7e9d3cdc6d6934ce78d9f11 files/digest-libperl-5.8.4-r1 64
 MD5 ce442db939c59218a16be167f793b817 files/libperl-5.8.2-uclibc.patch 573
 MD5 ce442db939c59218a16be167f793b817 files/libperl-5.8.4-uclibc.patch 573
-MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-5.8.2-create-libperl-soname.patch 417
-MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-5.8.3-create-libperl-soname.patch 417
 MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-5.8.5-create-libperl-soname.patch 417
 MD5 076dcbef37263d6dd7af719b55cfc2de files/libperl-5.8.5-noksh.patch 611
 MD5 ce442db939c59218a16be167f793b817 files/libperl-5.8.5-uclibc.patch 573
-MD5 c354e2fbf8141a769c20032e94f45fd3 files/digest-libperl-5.8.5-r1 64
+MD5 c354e2fbf8141a769c20032e94f45fd3 files/digest-libperl-5.8.5 64
 MD5 d9412dab085f22309997c8f08ea1ac85 files/libperl-5.8.5-reorder-INC.patch 2211
+MD5 c354e2fbf8141a769c20032e94f45fd3 files/digest-libperl-5.8.5-r1 64
+MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-5.8.6-create-libperl-soname.patch 417
+MD5 076dcbef37263d6dd7af719b55cfc2de files/libperl-5.8.6-noksh.patch 611
+MD5 ce442db939c59218a16be167f793b817 files/libperl-5.8.6-uclibc.patch 573
diff --git a/sys-devel/libperl/files/digest-libperl-5.8.3 b/sys-devel/libperl/files/digest-libperl-5.8.3
deleted file mode 100644
index 7c8f3b31b5b0..000000000000
--- a/sys-devel/libperl/files/digest-libperl-5.8.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6d2b389f8c6424b7af303f417947714f perl-5.8.3.tar.gz 12002329
diff --git a/sys-devel/libperl/files/digest-libperl-5.8.6 b/sys-devel/libperl/files/digest-libperl-5.8.6
new file mode 100644
index 000000000000..666169141e1e
--- /dev/null
+++ b/sys-devel/libperl/files/digest-libperl-5.8.6
@@ -0,0 +1 @@
+MD5 3d030b6ff2a433840edb1a407d18dc0a perl-5.8.6.tar.bz2 9693085
diff --git a/sys-devel/libperl/files/libperl-5.8.3-create-libperl-soname.patch b/sys-devel/libperl/files/libperl-5.8.6-create-libperl-soname.patch
index 4aa8f36b1506..4aa8f36b1506 100644
--- a/sys-devel/libperl/files/libperl-5.8.3-create-libperl-soname.patch
+++ b/sys-devel/libperl/files/libperl-5.8.6-create-libperl-soname.patch
diff --git a/sys-devel/libperl/files/libperl-5.8.6-noksh.patch b/sys-devel/libperl/files/libperl-5.8.6-noksh.patch
new file mode 100644
index 000000000000..4c33b3e71b33
--- /dev/null
+++ b/sys-devel/libperl/files/libperl-5.8.6-noksh.patch
@@ -0,0 +1,16 @@
+diff -burN perl-5.8.4.orig/Configure perl-5.8.4/Configure
+--- perl-5.8.4.orig/Configure	2004-04-01 05:48:18.000000000 -0800
++++ perl-5.8.4/Configure	2004-06-09 12:02:54.694172368 -0700
+@@ -164,6 +164,12 @@
+ 	;;
+ esac
+ 
++# 2004.06.09 rac
++# having $newsh persist as ksh here is bad news if ksh doesn't really
++# exist. this causes us to toss away a perfectly good working test in
++# bash in favour of more exotic external options. see bug 42665.
++test -x "${newsh}" || unset newsh
++
+ : if needed set CDPATH to a harmless value that is not chatty
+ : avoid bash 2.02 problems with empty CDPATH.
+ case "$CDPATH" in
diff --git a/sys-devel/libperl/files/libperl-5.8.6-uclibc.patch b/sys-devel/libperl/files/libperl-5.8.6-uclibc.patch
new file mode 100644
index 000000000000..1e086d73879a
--- /dev/null
+++ b/sys-devel/libperl/files/libperl-5.8.6-uclibc.patch
@@ -0,0 +1,15 @@
+--- perl-5.8.2/perlio.c-dist	2003-12-03 14:30:24.000000000 -0700
++++ perl-5.8.2/perlio.c	2003-12-03 14:32:10.000000000 -0700
+@@ -2824,7 +2824,11 @@
+     /* XXX this could use PerlIO_canset_fileno() and
+      * PerlIO_set_fileno() support from Configure
+      */
+-#  if defined(__GLIBC__)
++#  if defined(__UCLIBC__)
++    /* uClibc must come before glibc because it defines __GLIBC__ as well. */
++    f->__filedes = -1;
++    return 1;
++#  elif defined(__GLIBC__)
+     /* There may be a better way for GLIBC:
+     	- libio.h defines a flag to not close() on cleanup
+      */	
diff --git a/sys-devel/libperl/libperl-5.8.3.ebuild b/sys-devel/libperl/libperl-5.8.6.ebuild
index 162d9182a5f2..b490fb81ca16 100644
--- a/sys-devel/libperl/libperl-5.8.3.ebuild
+++ b/sys-devel/libperl/libperl-5.8.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.3.ebuild,v 1.13 2004/09/27 11:33:08 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.6.ebuild,v 1.1 2004/11/30 21:01:58 rac Exp $
 
 # The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
 #
@@ -52,12 +52,12 @@
 #
 # Martin Schlemmer <azarah@gentoo.org> (28 Dec 2002).
 
-IUSE="berkdb debug gdbm ithreads"
+IUSE="berkdb debug gdbm ithreads uclibc"
 
 inherit eutils flag-o-matic
 
 # Perl has problems compiling with -Os in your flags
-replace-flags "-Os" "-O2"
+use uclibc || replace-flags "-Os" "-O2"
 # This flag makes compiling crash in interesting ways
 filter-flags "-malign-double"
 
@@ -68,23 +68,24 @@ SHORT_PV="${PV%.*}"
 MY_P="perl-${PV/_rc/-RC}"
 S="${WORKDIR}/${MY_P}"
 DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
-SRC_URI="ftp://ftp.cpan.org/pub/CPAN/src/${MY_P}.tar.gz"
+SRC_URI="ftp://ftp.cpan.org/pub/CPAN/src/${MY_P}.tar.bz2"
 HOMEPAGE="http://www.perl.org"
-RESTRICT="maketest"
+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"
 
-if [ "${PN}" = "libperl" ]
-then
-	SLOT="${PERLSLOT}"
-else
-	SLOT="0"
-fi
+# rac 2004.08.06
 
-LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
+# i am not kidding here. you will forkbomb yourself out of existence
+# because make check -n wants to make miniperl, which runs itself at
+# the very end to make sure it's working right. this behaves very
+# badly when you -n it, because it won't exist and will therefore try
+# to build itself again ad infinitum.
 
-LICENSE="Artistic GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha arm ~hppa ~amd64 ~ia64 ~ppc64 s390"
+RESTRICT="maketest"
 
-DEPEND="sys-apps/groff
+DEPEND="!uclibc? ( sys-apps/groff )
 	berkdb? ( sys-libs/db )
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )
 	>=sys-apps/portage-2.0.45-r4"
@@ -135,6 +136,15 @@ src_unpack() {
 	#   LIBPERL=libperl.so.${SLOT}.`echo ${PV} | cut -d. -f1,2`
 	#
 	cd ${S}; epatch ${FILESDIR}/${P}-create-libperl-soname.patch
+
+	# uclibc support - dragonheart 2004.06.16
+	cd ${S}; epatch ${FILESDIR}/${P}-uclibc.patch
+
+	# Configure makes an unwarranted assumption that /bin/ksh is a
+	# good shell. This patch makes it revert to using /bin/sh unless
+	# /bin/ksh really is executable. Should fix bug 42665.
+	# rac 2004.06.09
+	cd ${S}; epatch ${FILESDIR}/${P}-noksh.patch
 }
 
 src_compile() {
@@ -180,73 +190,31 @@ src_compile() {
 		myconf="${myconf} -Ud_longdbl"
 	fi
 
-	if [ "${PN}" = "libperl" ]
-	then
-		rm -f config.sh Policy.sh
-
-		sh Configure -des \
-			-Darchname="${myarch}" \
-			-Dcccdlflags='-fPIC' \
-			-Dccdlflags='-rdynamic' \
-			-Dcc="${CC:-gcc}" \
-			-Dprefix='/usr' \
-			-Dvendorprefix='/usr' \
-			-Dsiteprefix='/usr' \
-			-Dlocincpth=' ' \
-			-Doptimize="${CFLAGS}" \
-			-Duselargefiles \
-			-Duseshrplib \
-			-Dman3ext='3pm' \
-			-Dlibperl="${LIBPERL}" \
-			-Dd_dosuid \
-			-Dd_semctl_semun \
-			-Dcf_by='Gentoo' \
-			-Ud_csh \
-			${myconf} || die
-
-		emake -f Makefile depend || die "Couldn't make libperl.so depends"
-		emake -f Makefile ${LIBPERL} || die "Unable to make libperl.so"
-		mv ${LIBPERL} ${WORKDIR}
-	else
-cat > config.over <<EOF
-installprefix=${D}/usr
-installarchlib=\`echo \$installarchlib | sed "s!\$prefix!\$installprefix!"\`
-installbin=\`echo \$installbin | sed "s!\$prefix!\$installprefix!"\`
-installman1dir=\`echo \$installman1dir | sed "s!\$prefix!\$installprefix!"\`
-installman3dir=\`echo \$installman3dir | sed "s!\$prefix!\$installprefix!"\`
-installman1dir=\`echo \$installman1dir | sed "s!/share/share/!/share/!"\`
-installman3dir=\`echo \$installman3dir | sed "s!/share/share/!/share/!"\`
-installman1dir=\`echo \$installman1dir | sed "s!/usr/man/!/usr/share/man/!"\`
-installman3dir=\`echo \$installman3dir | sed "s!/usr/man/!/usr/share/man/!"\`
-man1ext=1
-man3ext=3pm
-installprivlib=\`echo \$installprivlib | sed "s!\$prefix!\$installprefix!"\`
-installscript=\`echo \$installscript | sed "s!\$prefix!\$installprefix!"\`
-installsitelib=\`echo \$installsitelib | sed "s!\$prefix!\$installprefix!"\`
-installsitearch=\`echo \$installsitearch | sed "s!\$prefix!\$installprefix!"\`
-EOF
-sleep 10
-		sh Configure -des \
-			-Darchname="${myarch}" \
-			-Dcc="${CC:-gcc}" \
-			-Dprefix='/usr' \
-			-Dvendorprefix='/usr' \
-			-Dsiteprefix='/usr' \
-			-Dlocincpth=' ' \
-			-Doptimize="${CFLAGS}" \
-			-Duselargefiles \
-			-Dd_dosuid \
-			-Dd_semctl_semun \
-			-Dscriptdir=/usr/bin \
-			-Dman3ext='3pm' \
-			-Dcf_by='Gentoo' \
-			-Ud_csh \
-			${myconf} || die "Unable to configure"
-
-		MAKEOPTS="${MAKEOPTS} -j1" emake || die "Unable to make"
-
-		emake -i test CCDLFLAGS=
-	fi
+	rm -f config.sh Policy.sh
+
+	sh Configure -des \
+		-Darchname="${myarch}" \
+		-Dcccdlflags='-fPIC' \
+		-Dccdlflags='-rdynamic' \
+		-Dcc="${CC:-gcc}" \
+		-Dprefix='/usr' \
+		-Dvendorprefix='/usr' \
+		-Dsiteprefix='/usr' \
+		-Dlocincpth=' ' \
+		-Doptimize="${CFLAGS}" \
+		-Duselargefiles \
+		-Duseshrplib \
+		-Dman3ext='3pm' \
+		-Dlibperl="${LIBPERL}" \
+		-Dd_dosuid \
+		-Dd_semctl_semun \
+		-Dcf_by='Gentoo' \
+		-Ud_csh \
+		${myconf} || die
+
+	emake -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() {