EU::MM bump

Package-Manager: portage-2.1_pre3-r1

5 files changed, 168 insertions, 3 deletions

diff --git a/perl-core/ExtUtils-MakeMaker/ChangeLog b/perl-core/ExtUtils-MakeMaker/ChangeLog
index d523f8da1485..b26738be77ff 100644
--- a/perl-core/ExtUtils-MakeMaker/ChangeLog
+++ b/perl-core/ExtUtils-MakeMaker/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for perl-core/ExtUtils-MakeMaker
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-MakeMaker/ChangeLog,v 1.8 2005/12/25 02:10:00 kumba Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-MakeMaker/ChangeLog,v 1.9 2006/01/24 17:08:51 mcummings Exp $
+
+*ExtUtils-MakeMaker-6.30.01 (24 Jan 2006)
+
+  24 Jan 2006; Michael Cummings <mcummings@gentoo.org>
+  +files/ExtUtils-MakeMaker-RUNPATH.patch,
+  +ExtUtils-MakeMaker-6.30.01.ebuild:
+  EU::MM bump
 
   25 Dec 2005; Joshua Kinard <kumba@gentoo.org>
   ExtUtils-MakeMaker-6.21-r1.ebuild:
diff --git a/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.30.01.ebuild b/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.30.01.ebuild
new file mode 100644
index 000000000000..411872262539
--- /dev/null
+++ b/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.30.01.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.30.01.ebuild,v 1.1 2006/01/24 17:08:51 mcummings Exp $
+
+inherit eutils
+
+MY_PV="${PV/30.01/30_01}"
+MY_P="${PN}-${MY_PV}"
+S="$WORKDIR/$MY_P"
+DESCRIPTION="MakeMaker Perl Module"
+SRC_URI="mirror://cpan/authors/id/M/MS/MSCHWERN/${MY_P}.tar.gz"
+HOMEPAGE="http://search.cpan.org/~mschwern/${P}"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/perl-5.8.0-r12
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-RUNPATH.patch
+}
+
+src_compile() {
+	perl Makefile.PL INSTALLDIRS=vendor INSTALLMAN3DIR='none' DESTDIR="${D}" ${myconf} || die
+	make test || die "self-test failed"
+}
+
+src_install () {
+	perlinfo
+	dodir ${POD_DIR}
+
+	test -z ${mytargets} && mytargets="install"
+	make \
+		${myinst} \
+		${mytargets} || die
+
+	if [ -f ${D}${ARCH_LIB}/perllocal.pod ];
+	then
+		touch ${D}/${POD_DIR}/${P}.pod
+		sed -e "s:${D}::g" ${D}${ARCH_LIB}/perllocal.pod \
+			>> ${D}/${POD_DIR}/${P}.pod
+		touch ${D}/${POD_DIR}/${P}.pod.arch
+		cat ${D}/${POD_DIR}/${P}.pod >>${D}/${POD_DIR}/${P}.pod.arch
+		rm -f ${D}/${ARCH_LIB}/perllocal.pod
+	fi
+	if [ -f ${D}${SITE_LIB}/perllocal.pod ];
+	then
+		touch ${D}/${POD_DIR}/${P}.pod
+		sed -e "s:${D}::g" ${D}${SITE_LIB}/perllocal.pod \
+			>> ${D}/${POD_DIR}/${P}.pod
+		touch ${D}/${POD_DIR}/${P}.pod.site
+		cat ${D}/${POD_DIR}/${P}.pod >>${D}/${POD_DIR}/${P}.pod.site
+		rm -f ${D}/${SITE_LIB}/perllocal.pod
+	fi
+
+	for FILE in `find ${D} -type f -name "*.html" -o -name ".packlist"`; do
+		sed -ie "s:${D}:/:g" ${FILE}
+	done
+
+	dodoc Change* MANIFEST* README* ${mydoc}
+}
+
+pkg_setup() {
+
+	perlinfo
+}
+
+
+pkg_preinst() {
+
+	perlinfo
+}
+
+pkg_postinst() {
+
+	updatepod
+}
+
+pkg_prerm() {
+
+	updatepod
+}
+
+pkg_postrm() {
+
+	updatepod
+}
+
+perlinfo() {
+
+	if [ -f /usr/bin/perl ]
+	then
+		eval `perl '-V:installarchlib'`
+		eval `perl '-V:installsitearch'`
+		eval `perl '-V:installvendorarch'`
+		eval `perl '-V:installvendorlib'`
+		ARCH_LIB=${installarchlib}
+		SITE_LIB=${installsitearch}
+		VENDOR_ARCH=${installvendorarch}
+		VENDOR_LIB=${installvendorlib}
+
+		eval `perl '-V:version'`
+		POD_DIR="/usr/share/perl/gentoo-pods/${version}"
+	fi
+
+}
+
+updatepod() {
+	perlinfo
+
+	if [ -d "${POD_DIR}" ]
+	then
+		for FILE in `find ${POD_DIR} -type f -name "*.pod.arch"`; do
+		   cat ${FILE} >> ${ARCH_LIB}/perllocal.pod
+		   rm -f ${FILE}
+		done
+		for FILE in `find ${POD_DIR} -type f -name "*.pod.site"`; do
+		   cat ${FILE} >> ${SITE_LIB}/perllocal.pod
+		   rm -f ${FILE}
+		done
+
+		#cat ${POD_DIR}/*.pod.arch >> ${ARCH_LIB}/perllocal.pod
+		#cat ${POD_DIR}/*.pod.site >> ${SITE_LIB}/perllocal.pod
+		#rm -f ${POD_DIR}/*.pod.site
+		#rm -f ${POD_DIR}/*.pod.site
+	fi
+}
diff --git a/perl-core/ExtUtils-MakeMaker/Manifest b/perl-core/ExtUtils-MakeMaker/Manifest
index de4725b89f25..1b582031689f 100644
--- a/perl-core/ExtUtils-MakeMaker/Manifest
+++ b/perl-core/ExtUtils-MakeMaker/Manifest
@@ -1,9 +1,12 @@
-MD5 f7c385e22c838715ba1d32160152963a ChangeLog 8404
+MD5 9606fcc97ecdcc4a2acdbc710097a8a3 ChangeLog 8602
 MD5 fedcef688e5456ed4036de5011e512d2 ExtUtils-MakeMaker-6.20-r1.ebuild 2712
 MD5 1ce72acd73d336915c21b3653483b46d ExtUtils-MakeMaker-6.21-r1.ebuild 2762
 MD5 7cfeaaf63fc838e84440f50fdcca7dd0 ExtUtils-MakeMaker-6.30-r1.ebuild 2787
+MD5 e3070cfed42391fb93245626e6d91c4c ExtUtils-MakeMaker-6.30.01.ebuild 2863
 MD5 044b90a8895f8a03bef8e4cf5759eecc files/ExtUtils-MakeMaker-6.30-RUNPATH.patch 859
+MD5 044b90a8895f8a03bef8e4cf5759eecc files/ExtUtils-MakeMaker-RUNPATH.patch 859
 MD5 9076228369ef3b268a01f2f48a45524a files/digest-ExtUtils-MakeMaker-6.20-r1 75
 MD5 a144b0676694d7282d1ffba23685c004 files/digest-ExtUtils-MakeMaker-6.21-r1 75
 MD5 876dd5d697686a46d47953d9efe05fa9 files/digest-ExtUtils-MakeMaker-6.30-r1 75
+MD5 210f7aac5416150ab309c842a07f750b files/digest-ExtUtils-MakeMaker-6.30.01 78
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
diff --git a/perl-core/ExtUtils-MakeMaker/files/ExtUtils-MakeMaker-RUNPATH.patch b/perl-core/ExtUtils-MakeMaker/files/ExtUtils-MakeMaker-RUNPATH.patch
new file mode 100644
index 000000000000..c442defa5d68
--- /dev/null
+++ b/perl-core/ExtUtils-MakeMaker/files/ExtUtils-MakeMaker-RUNPATH.patch
@@ -0,0 +1,21 @@
+Bug #105054.
+
+We do not want the build root in the linked perl module's RUNPATH, so strip
+paths containing PORTAGE_TMPDIR if its set.
+
+--- perl-5.8.7/lib/ExtUtils/MM_Unix.pm	2005-09-10 14:06:59.000000000 +0200
++++ perl-5.8.7.az/lib/ExtUtils/MM_Unix.pm	2005-09-10 15:25:52.000000000 +0200
+@@ -1915,6 +1915,13 @@
+ 	    # LD_RUN_PATH now computed by ExtUtils::Liblist
+ 	    ($self->{EXTRALIBS},  $self->{BSLOADLIBS}, 
+              $self->{LDLOADLIBS}, $self->{LD_RUN_PATH}) = @libs;
++	    # We do not want the build root in RPATH
++	    if (exists $ENV{PORTAGE_TMPDIR}) {
++	      # If we have PORTAGE_TMPDIR set, strip that, as just testing for
++	      # /usr and /opt might not be sufficient
++	      $self->{LD_RUN_PATH} = join ':', grep !/^\Q$ENV{PORTAGE_TMPDIR}/,
++	                             split /:/, $self->{LD_RUN_PATH};
++	    }
+ 	    last;
+ 	}
+     }
diff --git a/perl-core/ExtUtils-MakeMaker/files/digest-ExtUtils-MakeMaker-6.30.01 b/perl-core/ExtUtils-MakeMaker/files/digest-ExtUtils-MakeMaker-6.30.01
new file mode 100644
index 000000000000..ae6e5f94fe54
--- /dev/null
+++ b/perl-core/ExtUtils-MakeMaker/files/digest-ExtUtils-MakeMaker-6.30.01
@@ -0,0 +1 @@
+MD5 db21a9b7db0d2b62cf06a3ede4df3d76 ExtUtils-MakeMaker-6.30_01.tar.gz 222104