USE rename, @INC reorder

5 files changed, 443 insertions, 6 deletions

diff --git a/sys-devel/libperl/ChangeLog b/sys-devel/libperl/ChangeLog
index 718640985f48..e1f2223d0e79 100644
--- a/sys-devel/libperl/ChangeLog
+++ b/sys-devel/libperl/ChangeLog
@@ -1,6 +1,12 @@
 # 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.46 2004/09/09 18:42:54 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/ChangeLog,v 1.47 2004/09/22 17:40:02 rac Exp $
+
+*libperl-5.8.5-r1 (22 Sep 2004)
+
+  22 Sep 2004; Robert Coie <rac@gentoo.org>
+  +files/libperl-5.8.5-reorder-INC.patch, +libperl-5.8.5-r1.ebuild:
+  Change USE from threads to ithreads, reorder @INC
 
   09 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> libperl-5.8.4-r1.ebuild:
   Stable on sparc to finally solve #36478
diff --git a/sys-devel/libperl/Manifest b/sys-devel/libperl/Manifest
index dfe4cf9f7f0d..fed79ac96c65 100644
--- a/sys-devel/libperl/Manifest
+++ b/sys-devel/libperl/Manifest
@@ -1,23 +1,26 @@
-MD5 74f1612a9c7845b6b4303557853759f7 ChangeLog 6422
 MD5 3a72b3be065ca5f64fa75b5e2a437d8a libperl-5.8.2.ebuild 10618
+MD5 ef48d79a177dc77b725fca15bc0b823c ChangeLog 6615
+MD5 24c5049e6c5191c9fc80979207fb576b libperl-5.8.5.ebuild 9773
 MD5 ecdaea28a74b152884636b0327174540 libperl-5.8.3.ebuild 10636
 MD5 f6e82642ac19cb2f30283c0bfbab0b9b libperl-5.8.4.ebuild 10898
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 MD5 48eb9678d93e409f19651bea36b4e69d libperl-5.8.2-r1.ebuild 10729
 MD5 2ceafe3b18f5095d26d48a04f206edc3 libperl-5.8.4-r1.ebuild 11012
-MD5 24c5049e6c5191c9fc80979207fb576b libperl-5.8.5.ebuild 9773
+MD5 3b5937fe7b630fece8ca5835735964bf libperl-5.8.5-r1.ebuild 9908
+MD5 076dcbef37263d6dd7af719b55cfc2de files/libperl-5.8.4-noksh.patch 611
 MD5 8381e239056a7895edf8f3c6c05c835c files/digest-libperl-5.8.2 64
 MD5 35eb3b7645102bbcc4088d900dc28984 files/digest-libperl-5.8.3 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 076dcbef37263d6dd7af719b55cfc2de files/libperl-5.8.4-noksh.patch 611
-MD5 8381e239056a7895edf8f3c6c05c835c files/digest-libperl-5.8.2-r1 64
 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 c354e2fbf8141a769c20032e94f45fd3 files/digest-libperl-5.8.5 64
 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 64
+MD5 d9412dab085f22309997c8f08ea1ac85 files/libperl-5.8.5-reorder-INC.patch 2211
+MD5 c354e2fbf8141a769c20032e94f45fd3 files/digest-libperl-5.8.5-r1 64
diff --git a/sys-devel/libperl/files/digest-libperl-5.8.5-r1 b/sys-devel/libperl/files/digest-libperl-5.8.5-r1
new file mode 100644
index 000000000000..a774272cdab6
--- /dev/null
+++ b/sys-devel/libperl/files/digest-libperl-5.8.5-r1
@@ -0,0 +1 @@
+MD5 49baa8d7d29b4a9713c06edeb81e6b1b perl-5.8.5.tar.gz 11930764
diff --git a/sys-devel/libperl/files/libperl-5.8.5-reorder-INC.patch b/sys-devel/libperl/files/libperl-5.8.5-reorder-INC.patch
new file mode 100644
index 000000000000..c934b4135a13
--- /dev/null
+++ b/sys-devel/libperl/files/libperl-5.8.5-reorder-INC.patch
@@ -0,0 +1,85 @@
+--- perl.c.orig	2003-07-10 22:09:00.000000000 -0700
++++ perl.c	2003-07-10 22:30:21.000000000 -0700
+@@ -3932,9 +3932,9 @@
+     incpush(APPLLIB_EXP, TRUE, TRUE, TRUE);
+ #endif
+ 
+-#ifdef ARCHLIB_EXP
+-    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
+-#endif
++    /* for configuration where /usr is mounted ro (CPAN::Config, Net::Config) */
++    incpush("/etc/perl", FALSE, FALSE, TRUE);
++
+ #ifdef MACOS_TRADITIONAL
+     {
+ 	Stat_t tmpstatbuf;
+@@ -3961,8 +3961,6 @@
+ #endif
+ #if defined(WIN32)
+     incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
+-#else
+-    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
+ #endif
+ 
+ #ifdef SITEARCH_EXP
+@@ -4006,6 +4004,60 @@
+     incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE);
+ #endif
+ 
++    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
++    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
++
++    /* Non-versioned site directory for local modules and for
++       compatability with the previous packages' site dirs */
++
++    incpush("/usr/local/lib/site_perl", TRUE, FALSE, TRUE);
++
++#ifdef PERL_INC_VERSION_LIST
++{
++  struct stat s;
++
++  /* add small buffer in case old versions are longer than the current version */
++  char sitearch[sizeof(SITEARCH_EXP)+16] = SITEARCH_EXP;
++  char sitelib[sizeof(SITELIB_EXP)+16] = SITELIB_EXP;
++  char const *vers[] = { PERL_INC_VERSION_LIST };
++  char const **p;
++
++  char *arch_vers = strrchr(sitearch, '/');
++  char *lib_vers = strrchr(sitelib, '/');
++
++  if (arch_vers && isdigit(*++arch_vers))
++    *arch_vers = 0;
++  else
++    arch_vers = 0;
++
++  if (lib_vers && isdigit(*++lib_vers))
++    *lib_vers = 0;
++  else
++    lib_vers = 0;
++
++  /* there is some duplication here as incpush does something similar
++     internally, but required as sitearch is not a subdirectory of
++     sitelib */
++
++  for (p = vers; *p; p++)
++    {
++      if (arch_vers)
++	{
++	  strcpy(arch_vers, *p);
++	  if (PerlLIO_stat(sitearch, &s) >= 0 && S_ISDIR(s.st_mode))
++	    incpush(sitearch, FALSE, FALSE, TRUE);
++	}
++
++      if (lib_vers)
++	{
++	  strcpy(lib_vers, *p);
++	  if (PerlLIO_stat(sitelib, &s) >= 0 && S_ISDIR(s.st_mode))
++	    incpush(sitelib, FALSE, FALSE, TRUE);
++	}
++    }
++}
++#endif
++
+ #ifdef PERL_OTHERLIBDIRS
+     incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE);
+ #endif
diff --git a/sys-devel/libperl/libperl-5.8.5-r1.ebuild b/sys-devel/libperl/libperl-5.8.5-r1.ebuild
new file mode 100644
index 000000000000..0c17bb135a38
--- /dev/null
+++ b/sys-devel/libperl/libperl-5.8.5-r1.ebuild
@@ -0,0 +1,342 @@
+# 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.5-r1.ebuild,v 1.1 2004/09/22 17:40:02 rac 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 ithreads uclibc"
+
+inherit eutils flag-o-matic
+
+# Perl has problems compiling with -Os in your flags
+use uclibc || 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="${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"
+
+# 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="maketest"
+
+DEPEND="!uclibc? ( sys-apps/groff )
+	berkdb? ( sys-libs/db )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	>=sys-apps/portage-2.0.45-r4"
+
+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}/${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
+
+	# we need the same @INC-inversion magic here we do in perl
+	cd ${S}; epatch ${FILESDIR}/${P}-reorder-INC.patch
+}
+
+src_compile() {
+
+	export LC_ALL="C"
+	local myconf=""
+
+	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 sparc
+	then
+		myconf="${myconf} -Ud_longdbl"
+	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() {
+
+	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
+}
+