fix because of perl-post/perl-module roll together

3 files changed, 87 insertions, 5 deletions

diff --git a/dev-perl/ExtUtils-MakeMaker/ChangeLog b/dev-perl/ExtUtils-MakeMaker/ChangeLog
index 22fb7d8f33eb..23285b8d8548 100644
--- a/dev-perl/ExtUtils-MakeMaker/ChangeLog
+++ b/dev-perl/ExtUtils-MakeMaker/ChangeLog
@@ -1,6 +1,12 @@
 # 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.18 2003/05/30 13:41:34 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/ExtUtils-MakeMaker/ChangeLog,v 1.19 2003/06/01 11:47:54 mcummings Exp $
+
+  01 Jun 2003; Michael Cummings <mcummings@gentoo.org>
+  ExtUtils-MakeMaker-6.05-r4.ebuild:
+  Because perl-post and perl-module have been rolled into one, needed to add
+  those portions that were pertinent and remove the perl-module dep. This caused
+  a loop condition during install since MakeMaker was a dep of perl-module.
 
 *ExtUtils-MakeMaker-6.05-r3 (30 May 2003)
 
diff --git a/dev-perl/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.05-r4.ebuild b/dev-perl/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.05-r4.ebuild
index fa6c4cd2fc15..6aed1b3a16a8 100644
--- a/dev-perl/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.05-r4.ebuild
+++ b/dev-perl/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.05-r4.ebuild
@@ -1,8 +1,7 @@
 # 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.05-r4.ebuild,v 1.8 2003/05/30 13:41:34 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.05-r4.ebuild,v 1.9 2003/06/01 11:47:54 mcummings Exp $
 
-inherit perl-module
 
 S=${WORKDIR}/${P}
 DESCRIPTION="MakeMaker Perl Module"
@@ -34,6 +33,16 @@ src_install () {
 		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 \
 		${myinst} \
 		${mytargets} || die
 
@@ -55,5 +64,72 @@ src_install () {
 		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'`
+		ARCH_LIB=${installarchlib}
+		SITE_LIB=${installsitearch}
+
+		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 edffbd71d945..ae4755807c83 100644
--- a/dev-perl/ExtUtils-MakeMaker/Manifest
+++ b/dev-perl/ExtUtils-MakeMaker/Manifest
@@ -1,3 +1,3 @@
-MD5 bfb7a7289e3d7ba0f84542e55c10b4b8 ChangeLog 2525
-MD5 89ab329ee24944112400dfe25ea6018c ExtUtils-MakeMaker-6.05-r4.ebuild 1852
+MD5 319d1374f2c1d7ce4bfa3b744b59ce6a ChangeLog 2854
+MD5 afdae3e63f30e2cc35cd213bec16ff62 ExtUtils-MakeMaker-6.05-r4.ebuild 3327
 MD5 2cc7445bb2472696df202d4f1eccae98 files/digest-ExtUtils-MakeMaker-6.05-r4 75