fix DESTDIR handling

7 files changed, 169 insertions, 13 deletions

diff --git a/dev-perl/ExtUtils-MakeMaker/ChangeLog b/dev-perl/ExtUtils-MakeMaker/ChangeLog
index 72e6d00e8a00..6f6f669914a9 100644
--- a/dev-perl/ExtUtils-MakeMaker/ChangeLog
+++ b/dev-perl/ExtUtils-MakeMaker/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-perl/ExtUtils-MakeMaker
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/ExtUtils-MakeMaker/ChangeLog,v 1.29 2003/08/04 10:45:50 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/ExtUtils-MakeMaker/ChangeLog,v 1.30 2003/09/25 00:38:34 rac Exp $
+
+*ExtUtils-MakeMaker-6.16 (24 Sep 2003)
+
+  24 Sep 2003; <rac@gentoo.org> ExtUtils-MakeMaker-6.11.ebuild,
+  ExtUtils-MakeMaker-6.13.ebuild, ExtUtils-MakeMaker-6.15.ebuild,
+  ExtUtils-MakeMaker-6.16.ebuild:
+  Change how DESTDIR and PERLPREFIX are handled, to adapt to new MakeMaker
+  semantics. Great thanks to Wayne Davison <gentoo@blorf.net> in bug 29447.
 
 *ExtUtils-MakeMaker-6.15 (04 Aug 2003)
 
diff --git a/dev-perl/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.11.ebuild b/dev-perl/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.11.ebuild
index 4ecdffb0788c..5afc7549700e 100644
--- a/dev-perl/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.11.ebuild
+++ b/dev-perl/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.11.ebuild,v 1.4 2003/09/10 22:23:03 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.11.ebuild,v 1.5 2003/09/25 00:38:34 rac Exp $
 
 DESCRIPTION="MakeMaker Perl Module"
 SRC_URI="http://cpan.valueclick.com/modules/by-module/ExtUtils/${P}.tar.gz"
@@ -13,7 +13,7 @@ KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~alpha ~mips ~hppa ~arm"
 DEPEND=">=dev-lang/perl-5.8.0-r12 >=sys-apps/sed-4"
 
 src_compile() {
-	perl Makefile.PL INSTALLDIRS=vendor ${myconf} DESTDIR=${D}/ || die
+	perl Makefile.PL INSTALLDIRS=vendor ${myconf} || die
 }
 
 src_install () {
@@ -23,6 +23,7 @@ src_install () {
 	test -z ${mytargets} && mytargets="install"
 	make \
 		PREFIX=${D}/usr \
+		PERLPREFIX=${D}/usr \
 		VENDORPREFIX=${D}/usr \
 		INSTALLMAN1DIR=${D}/usr/share/man/man1 \
 		INSTALLMAN2DIR=${D}/usr/share/man/man2 \
diff --git a/dev-perl/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.13.ebuild b/dev-perl/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.13.ebuild
index 9d5455f46dc3..0e30b8fab567 100644
--- a/dev-perl/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.13.ebuild
+++ b/dev-perl/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.13.ebuild,v 1.3 2003/09/10 22:23:03 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.13.ebuild,v 1.4 2003/09/25 00:38:34 rac Exp $
 
 DESCRIPTION="MakeMaker Perl Module"
 SRC_URI="http://cpan.valueclick.com/modules/by-module/ExtUtils/${P}.tar.gz"
@@ -13,7 +13,7 @@ KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~alpha ~mips ~hppa ~arm"
 DEPEND=">=dev-lang/perl-5.8.0-r12 >=sys-apps/sed-4"
 
 src_compile() {
-	perl Makefile.PL INSTALLDIRS=vendor ${myconf} DESTDIR=${D}/ || die
+	perl Makefile.PL INSTALLDIRS=vendor ${myconf} || die
 }
 
 src_install () {
@@ -24,6 +24,7 @@ src_install () {
 	make \
 		PREFIX=${D}/usr \
 		VENDORPREFIX=${D}/usr \
+		PERLPREFIX=${D}/usr \
 		INSTALLMAN1DIR=${D}/usr/share/man/man1 \
 		INSTALLMAN2DIR=${D}/usr/share/man/man2 \
 		INSTALLMAN3DIR=${D}/usr/share/man/man3 \
diff --git a/dev-perl/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.15.ebuild b/dev-perl/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.15.ebuild
index c8b6a6a40dc2..3e23d17dbca2 100644
--- a/dev-perl/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.15.ebuild
+++ b/dev-perl/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.15.ebuild,v 1.3 2003/09/10 22:23:03 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.15.ebuild,v 1.4 2003/09/25 00:38:34 rac Exp $
 
 DESCRIPTION="MakeMaker Perl Module"
 SRC_URI="http://cpan.valueclick.com/modules/by-module/ExtUtils/${P}.tar.gz"
@@ -13,7 +13,7 @@ KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~alpha ~mips ~hppa ~arm"
 DEPEND=">=dev-lang/perl-5.8.0-r12 >=sys-apps/sed-4"
 
 src_compile() {
-	perl Makefile.PL INSTALLDIRS=vendor ${myconf} DESTDIR=${D}/ || die
+	perl Makefile.PL INSTALLDIRS=vendor ${myconf} || die
 }
 
 src_install () {
@@ -23,6 +23,7 @@ src_install () {
 	test -z ${mytargets} && mytargets="install"
 	make \
 		PREFIX=${D}/usr \
+		PERLPREFIX=${D}/usr \
 		VENDORPREFIX=${D}/usr \
 		INSTALLMAN1DIR=${D}/usr/share/man/man1 \
 		INSTALLMAN2DIR=${D}/usr/share/man/man2 \
diff --git a/dev-perl/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.16.ebuild b/dev-perl/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.16.ebuild
new file mode 100644
index 000000000000..289fe72c7ed6
--- /dev/null
+++ b/dev-perl/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.16.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.16.ebuild,v 1.1 2003/09/25 00:38:34 rac Exp $
+
+DESCRIPTION="MakeMaker Perl Module"
+SRC_URI="http://cpan.valueclick.com/modules/by-module/ExtUtils/${P}.tar.gz"
+HOMEPAGE="http://cpan.valueclick.com/modules/by-module/ExtUtils/${P}.readme"
+IUSE=""
+SLOT="0"
+LICENSE="Artistic | GPL-2"
+KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~alpha ~mips ~hppa ~arm"
+
+DEPEND=">=dev-lang/perl-5.8.0-r12 >=sys-apps/sed-4"
+
+src_compile() {
+	perl Makefile.PL INSTALLDIRS=vendor ${myconf} || die
+}
+
+src_install () {
+	perlinfo
+	dodir ${POD_DIR}
+
+	test -z ${mytargets} && mytargets="install"
+	make \
+		PREFIX=${D}/usr \
+		PERLPREFIX=${D}/usr \
+		VENDORPREFIX=${D}/usr \
+		INSTALLMAN1DIR=${D}/usr/share/man/man1 \
+		INSTALLMAN2DIR=${D}/usr/share/man/man2 \
+		INSTALLMAN3DIR=${D}/usr/share/man/man3 \
+		INSTALLMAN4DIR=${D}/usr/share/man/man4 \
+		INSTALLMAN5DIR=${D}/usr/share/man/man5 \
+		INSTALLMAN6DIR=${D}/usr/share/man/man6 \
+		INSTALLMAN7DIR=${D}/usr/share/man/man7 \
+		INSTALLMAN8DIR=${D}/usr/share/man/man8 \
+		INSTALLSITEMAN1DIR=${D}/usr/share/man/man1 \
+		INSTALLSITEMAN2DIR=${D}/usr/share/man/man2 \
+		INSTALLSITEMAN3DIR=${D}/usr/share/man/man3 \
+		INSTALLSITEMAN4DIR=${D}/usr/share/man/man4 \
+		INSTALLSITEMAN5DIR=${D}/usr/share/man/man5 \
+		INSTALLSITEMAN6DIR=${D}/usr/share/man/man6 \
+		INSTALLSITEMAN7DIR=${D}/usr/share/man/man7 \
+		INSTALLSITEMAN8DIR=${D}/usr/share/man/man8 \
+		INSTALLSITEARCH=${D}/${SITE_ARCH} \
+		INSTALLSCRIPT=${D}/usr/bin \
+		INSTALLVENDORARCH=${D}/${VENDOR_ARCH} \
+		INSTALLVENDORLIB=${D}/${VENDOR_LIB} \
+		INSTALLVENDORMAN3DIR=${D}/usr/share/man/man3 \
+		${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/dev-perl/ExtUtils-MakeMaker/Manifest b/dev-perl/ExtUtils-MakeMaker/Manifest
index 262432c0dd8e..13de9485aaf5 100644
--- a/dev-perl/ExtUtils-MakeMaker/Manifest
+++ b/dev-perl/ExtUtils-MakeMaker/Manifest
@@ -1,13 +1,15 @@
-MD5 89f8ea522a6a718d2a008ccaafc50b2b ChangeLog 4414
-MD5 b018d3ad768b8fd54d336d0f044c9c4f ExtUtils-MakeMaker-6.05-r5.ebuild 3305
+MD5 bea673604201055db8644ab4cc36aeba ExtUtils-MakeMaker-6.16.ebuild 3628
+MD5 bf0eb22194c13d0bb79c4a72d36604dc ExtUtils-MakeMaker-6.11.ebuild 3628
 MD5 cb5f6eef2a64f6fac21a88ca47e3fff6 ExtUtils-MakeMaker-6.05-r6.ebuild 3605
+MD5 7039eec26d4180b7fffe980454118c7d ExtUtils-MakeMaker-6.13.ebuild 3628
+MD5 d6b0d71c662c11eb5ab81df820f19201 ExtUtils-MakeMaker-6.15.ebuild 3628
+MD5 b018d3ad768b8fd54d336d0f044c9c4f ExtUtils-MakeMaker-6.05-r5.ebuild 3305
+MD5 edd21f0413d02b5562b7158eecf243f5 ChangeLog 4764
 MD5 cce76c65438e7d254027eae29f206b1f ExtUtils-MakeMaker-6.05-r4.ebuild 3304
-MD5 c27725705864f05c3db73cfecfe61ca2 ExtUtils-MakeMaker-6.11.ebuild 3623
-MD5 1640fbbceebb55a861d4a7bcba015bbd ExtUtils-MakeMaker-6.13.ebuild 3623
-MD5 bfff3ba7bb3ff927521d8b2786aed7cd ExtUtils-MakeMaker-6.15.ebuild 3623
+MD5 2cc7445bb2472696df202d4f1eccae98 files/digest-ExtUtils-MakeMaker-6.05-r4 75
 MD5 2cc7445bb2472696df202d4f1eccae98 files/digest-ExtUtils-MakeMaker-6.05-r5 75
 MD5 2cc7445bb2472696df202d4f1eccae98 files/digest-ExtUtils-MakeMaker-6.05-r6 75
-MD5 2cc7445bb2472696df202d4f1eccae98 files/digest-ExtUtils-MakeMaker-6.05-r4 75
 MD5 f2b065e85a885002c808076f0c2e92cf files/digest-ExtUtils-MakeMaker-6.11 75
 MD5 2be5ed6a2a38efaf647cc1cf0fd8e109 files/digest-ExtUtils-MakeMaker-6.13 75
 MD5 90c1fafd72d35d9bf2be628b8d115785 files/digest-ExtUtils-MakeMaker-6.15 75
+MD5 2cb6529fdfbd65db8aa08cf89e3b571a files/digest-ExtUtils-MakeMaker-6.16 75
diff --git a/dev-perl/ExtUtils-MakeMaker/files/digest-ExtUtils-MakeMaker-6.16 b/dev-perl/ExtUtils-MakeMaker/files/digest-ExtUtils-MakeMaker-6.16
new file mode 100644
index 000000000000..8a5eb7df846d
--- /dev/null
+++ b/dev-perl/ExtUtils-MakeMaker/files/digest-ExtUtils-MakeMaker-6.16
@@ -0,0 +1 @@
+MD5 af6eac05910d1c52bf27aa6d14d37789 ExtUtils-MakeMaker-6.16.tar.gz 215468