5.8.3, housecleaning

11 files changed, 37 insertions, 400 deletions

diff --git a/sys-devel/libperl/ChangeLog b/sys-devel/libperl/ChangeLog
index bdf06b6272df..aeaad7c62d85 100644
--- a/sys-devel/libperl/ChangeLog
+++ b/sys-devel/libperl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/libperl
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/ChangeLog,v 1.17 2003/11/27 04:06:27 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/ChangeLog,v 1.18 2004/01/18 06:46:05 rac Exp $
+
+*libperl-5.8.3 (17 Jan 2004)
+
+  17 Jan 2004; <rac@gentoo.org> libperl-5.8.3.ebuild,
+  files/libperl-5.8.3-create-libperl-soname.patch:
+  New upstream, housecleaning
 
   26 Nov 2003; Brad House <brad_mssw@gentoo.org> libperl-5.8.2.ebuild:
   mark stable on amd64
diff --git a/sys-devel/libperl/Manifest b/sys-devel/libperl/Manifest
index 9a0458a62a60..26c1924577ff 100644
--- a/sys-devel/libperl/Manifest
+++ b/sys-devel/libperl/Manifest
@@ -1,5 +1,10 @@
-MD5 ac9dfab35984723656c734b7312bf403 files/digest-libperl-5.8.1_rc1 65
-MD5 4f40eefa1f841e15d6aad9b6e005b4f5 files/digest-libperl-5.8.1_rc2 68
+MD5 b57056d4ffbc434e06edd5213cd4dbe3 libperl-5.8.1.ebuild 10846
+MD5 b5c65d2ede0e4d8138cb4ccd64e4f716 libperl-5.8.3.ebuild 10853
+MD5 317e246fd501005814eb816c82e1be25 libperl-5.8.0.ebuild 13597
+MD5 dd88f05edacdb9abd81433deabec37d3 libperl-5.8.2.ebuild 10851
+MD5 ec27edd4ef8bd30b8e0187c8a429c72d ChangeLog 2729
+MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-5.8.3-create-libperl-soname.patch 417
 MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-5.8.1_rc2-create-libperl-soname.patch 417
 MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-5.8.2-create-libperl-soname.patch 417
 MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-5.8.1_rc1-create-libperl-soname.patch 417
@@ -7,11 +12,5 @@ MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-5.8.1-create-libperl-soname.p
 MD5 8605f033c451df987f4631bbf9d7b481 files/digest-libperl-5.8.0 64
 MD5 3ec3358c13c85372c9a668f361d1f244 files/digest-libperl-5.8.1 64
 MD5 8381e239056a7895edf8f3c6c05c835c files/digest-libperl-5.8.2 64
+MD5 35eb3b7645102bbcc4088d900dc28984 files/digest-libperl-5.8.3 64
 MD5 d2af75f06a64c5934db314ff38939cdd files/libperl-5.8.0-create-libperl-soname.patch 424
-MD5 7da35f9e0ecd46d55121129890f3b3c1 libperl-5.8.1.ebuild 10846
-MD5 0c6d18a9b91723fbe5e4a45e0a37fa70 libperl-5.8.1_rc1.ebuild 10854
-MD5 ab78fa79cfa9a1feca07df70618d2ea8 libperl-5.8.0.ebuild 13599
-MD5 6baa04f73f8d8857ba755c67cc5ac560 libperl-5.8.2.ebuild 10857
-MD5 f2ad7d92162164ab6c2464dab3ae11e5 libperl-5.8.1_rc2.ebuild 10857
-MD5 5a846535a93955ff5fbb80023aa6569e ChangeLog 2569
-MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
diff --git a/sys-devel/libperl/files/digest-libperl-5.8.1_rc1 b/sys-devel/libperl/files/digest-libperl-5.8.1_rc1
deleted file mode 100644
index 42ba63bbdfcf..000000000000
--- a/sys-devel/libperl/files/digest-libperl-5.8.1_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7bab1b831161575f134a67b7789d213e perl-5.8.1-RC1.tgz 11664242
diff --git a/sys-devel/libperl/files/digest-libperl-5.8.1_rc2 b/sys-devel/libperl/files/digest-libperl-5.8.1_rc2
deleted file mode 100644
index 6ecd3eeb13bd..000000000000
--- a/sys-devel/libperl/files/digest-libperl-5.8.1_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 990f43a087111a8a244d5ed9d39538fc perl-5.8.1-RC2.tar.gz 11668523
diff --git a/sys-devel/libperl/files/digest-libperl-5.8.3 b/sys-devel/libperl/files/digest-libperl-5.8.3
new file mode 100644
index 000000000000..7c8f3b31b5b0
--- /dev/null
+++ b/sys-devel/libperl/files/digest-libperl-5.8.3
@@ -0,0 +1 @@
+MD5 6d2b389f8c6424b7af303f417947714f perl-5.8.3.tar.gz 12002329
diff --git a/sys-devel/libperl/files/libperl-5.8.3-create-libperl-soname.patch b/sys-devel/libperl/files/libperl-5.8.3-create-libperl-soname.patch
new file mode 100644
index 000000000000..4aa8f36b1506
--- /dev/null
+++ b/sys-devel/libperl/files/libperl-5.8.3-create-libperl-soname.patch
@@ -0,0 +1,11 @@
+--- Makefile.SH.orig	2003-07-10 14:59:04.000000000 -0700
++++ Makefile.SH	2003-07-10 15:14:08.000000000 -0700
+@@ -494,7 +494,7 @@
+ 	case "$useshrplib" in
+ 	true)
+ 		$spitshell >>Makefile <<'!NO!SUBS!'
+-	$(LD) -o $@ $(SHRPLDFLAGS) perl$(OBJ_EXT) $(obj) $(libs)
++	$(LD) -o $@ $(SHRPLDFLAGS) perl$(OBJ_EXT) $(obj) $(libs) -Wl,-soname -Wl,libperl.so.`echo $(LIBPERL) | cut -d. -f3`
+ !NO!SUBS!
+ 		case "$osname" in
+ 		aix)
diff --git a/sys-devel/libperl/libperl-5.8.0.ebuild b/sys-devel/libperl/libperl-5.8.0.ebuild
index b1c5a4442737..1bccc343febe 100644
--- a/sys-devel/libperl/libperl-5.8.0.ebuild
+++ b/sys-devel/libperl/libperl-5.8.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.0.ebuild,v 1.16 2003/09/17 21:08:48 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.0.ebuild,v 1.17 2004/01/18 06:46:05 rac Exp $
 
 # The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
 #
diff --git a/sys-devel/libperl/libperl-5.8.1.ebuild b/sys-devel/libperl/libperl-5.8.1.ebuild
index 0f2abcd3a57e..b7c018277565 100644
--- a/sys-devel/libperl/libperl-5.8.1.ebuild
+++ b/sys-devel/libperl/libperl-5.8.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.1.ebuild,v 1.1 2003/09/27 23:15:16 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.1.ebuild,v 1.2 2004/01/18 06:46:05 rac Exp $
 
 # The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
 #
diff --git a/sys-devel/libperl/libperl-5.8.1_rc2.ebuild b/sys-devel/libperl/libperl-5.8.1_rc2.ebuild
deleted file mode 100644
index d39799c2c1b2..000000000000
--- a/sys-devel/libperl/libperl-5.8.1_rc2.ebuild
+++ /dev/null
@@ -1,378 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.1_rc2.ebuild,v 1.2 2003/09/05 02:02:21 msterret 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"
-
-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`"
-MY_P="perl-`echo $PV | sed 's/_rc/-RC/'`"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
-SRC_URI="http://www.cpan.org/authors/id/J/JH/JHI/${MY_P}.tar.gz"
-HOMEPAGE="http://www.perl.org"
-
-if [ "${PN}" = "libperl" ]
-then
-	SLOT="${PERLSLOT}"
-else
-	SLOT="0"
-fi
-
-LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
-
-LICENSE="Artistic GPL-2"
-KEYWORDS="~amd64 ~x86 ~sparc ~ppc ~alpha ~mips ~hppa ~arm"
-
-DEPEND="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* '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 ""
-		sleep 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
-}
-
-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 [ "${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
-}
-
-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
-		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
-	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.2.ebuild b/sys-devel/libperl/libperl-5.8.2.ebuild
index 186cfb6f3986..943df97073cd 100644
--- a/sys-devel/libperl/libperl-5.8.2.ebuild
+++ b/sys-devel/libperl/libperl-5.8.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.2.ebuild,v 1.3 2003/12/17 05:03:29 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.2.ebuild,v 1.4 2004/01/18 06:46:05 rac Exp $
 
 # The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
 #
diff --git a/sys-devel/libperl/libperl-5.8.1_rc1.ebuild b/sys-devel/libperl/libperl-5.8.3.ebuild
index 5784bdb62deb..97d132b7f611 100644
--- a/sys-devel/libperl/libperl-5.8.1_rc1.ebuild
+++ b/sys-devel/libperl/libperl-5.8.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.1_rc1.ebuild,v 1.3 2003/09/05 02:02:21 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.3.ebuild,v 1.1 2004/01/18 06:46:05 rac Exp $
 
 # The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
 #
@@ -69,7 +69,7 @@ SHORT_PV="`echo ${PV} | cut -d. -f1,2`"
 MY_P="perl-`echo $PV | sed 's/_rc/-RC/'`"
 S="${WORKDIR}/${MY_P}"
 DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
-SRC_URI="http://www.cpan.org/authors/id/J/JH/JHI/${MY_P}.tgz"
+SRC_URI="ftp://ftp.cpan.org/pub/CPAN/src/${MY_P}.tar.gz"
 HOMEPAGE="http://www.perl.org"
 
 if [ "${PN}" = "libperl" ]
@@ -82,7 +82,7 @@ fi
 LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
 
 LICENSE="Artistic GPL-2"
-KEYWORDS="~amd64 ~x86 ~sparc ~ppc ~alpha ~mips ~hppa ~arm"
+KEYWORDS="~amd64 ~x86 ~sparc ~ppc ~alpha ~mips ~hppa ~arm ~ia64 ~ppc64"
 
 DEPEND="sys-apps/groff
 	berkdb? ( sys-libs/db )