attempt to solve the MakeMaker PDEPEND in such a way that 5.6.1-r12 can stand on its own, hopefully clearing the way for eliminating the dependency in perl-module.eclass on MakeMaker

4 files changed, 265 insertions, 10 deletions

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index 98b23cc6afaf..c84733a46883 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/perl
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.14 2003/05/31 11:19:02 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.15 2003/06/02 07:33:46 rac Exp $
+
+*perl-5.6.1-r12 (02 Jun 2003)
+
+  02 Jun 2003; <rac@gentoo.org> perl-5.6.1-r12.ebuild:
+  Replace PDEPEND strategy for ExtUtils::MakeMaker and Safe.pm with the approach
+  of injecting newer versions directly into the core
 
 *perl-5.6.1-r11 (31 May 2003)
 
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 9103c78a0f91..baed52fe93bd 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,18 +1,20 @@
-MD5 2019ba37520c65d9d5975747931772fa ChangeLog 15287
+MD5 4d2f1d1d20f2c6b2562caa1e2264b056 perl-5.6.1-r12.ebuild 7177
 MD5 227961c744001cba740b19e6cf3977fb perl-5.8.0-r10.ebuild 13793
 MD5 a3f762c7ce784283e55c6e6727aa99dd perl-5.8.0-r9.ebuild 13571
-MD5 f5dbb33ce4fa58feff7201667ee245a8 perl-5.6.1-r10.ebuild 6844
 MD5 36e6b9097f119057a2e82e6d4bf10a32 perl-5.6.1-r11.ebuild 6301
-MD5 803b7c028f59008ea1e6d577e5c0bab0 files/stat.t 8884
-MD5 9810be5a789a6d0bde088fef8fb261a4 files/digest-perl-5.8.0-r10 861
-MD5 cc61dca6d96347b5d93cfdde1514feb4 files/digest-perl-5.8.0-r9 860
+MD5 61c50979a2b042d9133d65107b9623e5 ChangeLog 15504
+MD5 f5dbb33ce4fa58feff7201667ee245a8 perl-5.6.1-r10.ebuild 6844
+MD5 060e9f10466fdc1268c75a7cf4dcbc7c files/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch 446
+MD5 4e49da394d326bcb744c7990bd27d6ac files/perl-5.8.0-perldoc-emptydirs.patch 461
 MD5 6b85fd38953aa08ceab8d0fa92cdd2ac files/digest-perl-5.6.1-r10 859
 MD5 5dee2b8a9e5e840e7379f11ae07eb68c files/digest-perl-5.6.1-r11 859
-MD5 ea9bf02b28e73e19dc85eb07f2347460 files/5.6.1-builtin-fixup.diff 777
+MD5 9f290d90a6928f0b9662b20c1426c48a files/digest-perl-5.6.1-r12 198
 MD5 28fe3868fd4e47ca609f7af6156c94ea files/5.6.1-op-test-fix.diff 503
-MD5 d2af75f06a64c5934db314ff38939cdd files/libperl-5.8.0-create-libperl-soname.patch 424
 MD5 b8480b2ccbf7d5a7fe543b9e6f8dbc14 files/libperl_rebuilder 10260
-MD5 060e9f10466fdc1268c75a7cf4dcbc7c files/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch 446
-MD5 4e49da394d326bcb744c7990bd27d6ac files/perl-5.8.0-perldoc-emptydirs.patch 461
+MD5 ea9bf02b28e73e19dc85eb07f2347460 files/5.6.1-builtin-fixup.diff 777
+MD5 9810be5a789a6d0bde088fef8fb261a4 files/digest-perl-5.8.0-r10 861
 MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.0-prelink-lpthread.patch 476
+MD5 803b7c028f59008ea1e6d577e5c0bab0 files/stat.t 8884
+MD5 cc61dca6d96347b5d93cfdde1514feb4 files/digest-perl-5.8.0-r9 860
 MD5 393b3dff879c892d461901183d3b0055 files/perl-5.8.0-sockatmark-should-__THROW.patch 402
+MD5 d2af75f06a64c5934db314ff38939cdd files/libperl-5.8.0-create-libperl-soname.patch 424
diff --git a/dev-lang/perl/files/digest-perl-5.6.1-r12 b/dev-lang/perl/files/digest-perl-5.6.1-r12
new file mode 100644
index 000000000000..1a57dd133425
--- /dev/null
+++ b/dev-lang/perl/files/digest-perl-5.6.1-r12
@@ -0,0 +1,3 @@
+MD5 ec1ff15464809b562aecfaa2e65edba6 perl-5.6.1.tar.gz 5983695
+MD5 559896f9f222a750812c58b937a660f3 ExtUtils-MakeMaker-6.05.tar.gz 187528
+MD5 1dbc4728cea6c662d03ea4a0863859a5 Safe-2.09.tar.gz 11465
diff --git a/dev-lang/perl/perl-5.6.1-r12.ebuild b/dev-lang/perl/perl-5.6.1-r12.ebuild
new file mode 100644
index 000000000000..de9db2d79016
--- /dev/null
+++ b/dev-lang/perl/perl-5.6.1-r12.ebuild
@@ -0,0 +1,244 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.6.1-r12.ebuild,v 1.1 2003/06/02 07:33:46 rac Exp $
+
+IUSE="berkdb gdbm"
+
+DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
+MM_VERSION="6.05"
+SAFE_VERSION="2.09"
+SRC_URI="ftp://ftp.perl.org/pub/CPAN/src/${P}.tar.gz
+	ftp://ftp.perl.org/pub/CPAN/modules/by-module/ExtUtils/ExtUtils-MakeMaker-${MM_VERSION}.tar.gz
+	ftp://ftp.perl.org/pub/CPAN/modules/by-module/Safe/Safe-${SAFE_VERSION}.tar.gz"
+HOMEPAGE="http://www.perl.org"
+
+LICENSE="Artistic GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa"
+
+RDEPEND="gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	>=sys-libs/db-3.2.3h-r3
+	=sys-libs/db-1.85-r1"
+
+DEPEND="sys-apps/groff
+	>=sys-apps/portage-2.0.45-r5
+	${RDEPEND}"
+		
+src_unpack() {
+	unpack ${A}
+
+	# replace some modules with newer ones from CPAN.
+
+	einfo "Replacing core ExtUtils::MakeMaker with newer version ${MM_VERSION}"
+	chmod +w ${S}/lib/ExtUtils/*
+	cp -R ${WORKDIR}/ExtUtils-MakeMaker-${MM_VERSION}/lib/ExtUtils/* ${S}/lib/ExtUtils/
+	einfo "Replacing core Safe.pm with newer version ${SAFE_VERSION}"
+	chmod +w ${S}/ext/Opcode/Safe.pm
+	cp ${WORKDIR}/Safe-${SAFE_VERSION}/Safe.pm ${S}/ext/Opcode/
+
+	# when using a newish MakeMaker, we must make sure PERL_CORE is
+	# set to 1 when building extensions in the core.  failure to
+	# do so will result in things like DynaLoader.a languishing in
+	# blib directories, and not being useful.
+
+	sed -ie "s/INSTALLDIRS=perl/INSTALLDIRS=perl PERL_CORE=1/" ${S}/ext/util/make_ext
+}
+
+src_compile() {
+	use gdbm || use berkdb || die "You must have either gdbm or berkdb installed and in your use flags."
+
+    #The following is to handle international users. Perl does nls post-install
+    export LC_ALL=C
+
+    if [ "${ARCH}" = "alpha" ]; then
+        CFLAGS="${CFLAGS} -fPIC"
+        CXXFLAGS="${CXXFLAGS} -fPIC"
+    fi  
+
+    local myconf
+    if [ "`use gdbm`" ]
+    then
+		myconf="-Di_gdbm"
+    fi
+
+    # It seems that perl config use the hostname instead of the osname on hppa
+    if [ "`use hppa`" ]
+    then
+        myconf="${myconf} -Dosname=linux"
+    fi
+
+    if [ "`use berkdb`" ]
+    then
+		myconf="${myconf} -Di_db -Di_ndbm"
+    else
+		myconf="${myconf} -Ui_db -Ui_ndbm"
+    fi
+
+	# put in built-in removal patch
+	patch -p1 < ${FILESDIR}/${PV}-builtin-fixup.diff || die 
+	patch -p0 < ${FILESDIR}/${PV}-op-test-fix.diff || die
+
+	# configure for libperl.so
+    sh Configure -des \
+		-Darchname=${CHOST%%-*}-linux \
+		-Dcccdlflags='-fPIC' \
+		-Dcc=gcc \
+		-Dccdlflags='-rdynamic' \
+		-Dprefix='/usr' \
+		-Dvendorprefix='/usr' \
+		-Dsiteprefixx='/usr' \
+		-Dlocincpth=' ' \
+		-Doptimize="${CFLAGS}" \
+		-Duselargefiles \
+		-Duseshrplib \
+		-Dman3ext=3pm \
+		-Dlibperl=libperl.so \
+		-Dd_dosuid \
+		-Dd_semctl_semun \
+		-Dcf_by=Gentoo \
+		-Ud_csh \
+		${myconf} || die
+	# add optimization flags
+    cp config.sh config.sh.orig
+    sed -e "s:optimize='-O2':optimize=\'${CFLAGS}\':" config.sh.orig > config.sh
+	# create libperl.so and move it out of the way
+	mv -f Makefile Makefile_orig
+	sed -e 's#^CCDLFLAGS = -rdynamic -Wl,-rpath,/usr/lib/perl5/.*#CCDLFLAGS = -rdynamic#' \
+	    -e 's#^all: $(FIRSTMAKEFILE) #all: README #' \
+		Makefile_orig > Makefile
+    export PARCH=`grep myarchname config.sh | cut -f2 -d"'"`
+
+	make -f Makefile depend || die
+	make -f Makefile libperl.so || die
+	mv libperl.so ${WORKDIR}
+
+	# starting from scratch again
+	cd ${WORKDIR}
+	rm -rf ${S}
+	src_unpack
+	cd ${S}
+
+	# put in built-in removal patch
+	patch -p1 < ${FILESDIR}/${PV}-builtin-fixup.diff || die 
+	patch -p0 < ${FILESDIR}/${PV}-op-test-fix.diff || die
+	
+	# configure for libperl.a
+# this is gross -- from Christian Gafton, Red Hat
+	cat > config.over <<EOF
+installprefix=${D}/usr
+#test -d \$installprefix || mkdir \$installprefix
+#test -d \$installprefix/bin || mkdir \$installprefix/bin
+installarchlib=\`echo \$installarchlib | sed "s!\$prefix!\$installprefix!"\`
+installbin=\`echo \$installbin | sed "s!\$prefix!\$installprefix!"\`
+#installman1dir=\$installprefix/share/man/man1
+#installman3dir=\$installprefix/share/man/man3
+installman1dir=\`echo \$installman1dir | sed "s!\$prefix!\$installprefix!"\`
+installman3dir=\`echo \$installman3dir | sed "s!\$prefix!\$installprefix!"\`
+installman1dir=\`echo \$installman1dir | sed "s!/man/!/share/man/!"\`
+installman3dir=\`echo \$installman3dir | sed "s!/man/!/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
+
+    sh Configure -des \
+		-Dcc=gcc \
+		-Dprefix='/usr' \
+		-Dvendorprefix='/usr' \
+		-Dsiteprefixx='/usr' \
+		-Darchname=${CHOST%%-*}-linux \
+		-Doptimize="${CFLAGS}" \
+		-Duselargefiles \
+		-Dd_dosuid \
+		-Dlocincpth=' ' \
+		-Dd_semctl_semun \
+		-Dman3ext=3pm \
+		-Dcf_by=Gentoo \
+		-Ud_csh \
+		${myconf} || die
+
+    #Optimize ;)
+    cp config.sh config.sh.orig
+    sed -e "s:optimize='-O2':optimize=\'${CFLAGS}\':" config.sh.orig > config.sh
+    #THIS IS USED LATER:
+    export PARCH=`grep myarchname config.sh | cut -f2 -d"'"`
+
+# Umm, for some reason this doesn't want to work, so we'll just remove
+#  the makefiles and let make rebuild them itself. (It seems to do it
+#  right the second time... -- pete
+#    cp makefile makefile.orig
+#    sed -e "s:^0::" makefile.orig > makefile
+
+	mv Makefile Makefile_orig
+	sed -e 's#^all: $(FIRSTMAKEFILE) #all: README #' \
+		Makefile_orig > Makefile
+    
+    make || die
+
+    # Parallel make fails
+	# dont use the || die since some tests fail on bootstrap
+	if [ `expr "$PARCH" ":" "sparc"` -gt 4 ]; then
+		echo "Skipping tests on this platform"
+	else
+	    make test 
+	fi
+}
+
+src_install() {
+#The following is to handle international users. Perl does nls post-install 
+    export LC_ALL=C 
+
+    export PARCH=`grep myarchname config.sh | cut -f2 -d"'"`
+
+	insinto /usr/lib/perl5/${PV}/${PARCH}/CORE/
+	doins ${WORKDIR}/libperl.so
+	dosym /usr/lib/perl5/${PV}/${PARCH}/CORE/libperl.so /usr/lib/libperl.so
+	
+
+#    make -f Makefile \
+#		INSTALLMAN1DIR=${D}/usr/share/man/man1 \
+#		INSTALLMAN3DIR=${D}/usr/share/man/man3 \
+#		install || die
+
+	make \
+		DESTDIR=${D} \
+		INSTALLMAN1DIR=${D}/usr/share/man/man1 \
+		INSTALLMAN3DIR=${D}/usr/share/man/man3 \
+		install || die "Unable to make install"
+    install -m 755 utils/pl2pm ${D}/usr/bin/pl2pm
+
+	#man pages
+
+#	./perl installman \
+#		--man1dir=${D}/usr/share/man/man1 \
+#		--man1ext=1 \
+#		--man3dir=${D}/usr/share/man/man3 \
+#		--man3ext=3
+
+
+	# This removes ${D} from Config.pm
+
+	dosed /usr/lib/perl5/${PV}/${CHOST%%-*}-linux/Config.pm
+	dosed /usr/lib/perl5/${PV}/${CHOST%%-*}-linux/.packlist
+
+	# DOCUMENTATION
+
+    dodoc Changes* Artistic Copying README Todo* AUTHORS
+    prepalldocs
+
+    
+	# HTML Documentation
+	dodir /usr/share/doc/${PF}/html
+	${D}/usr/bin/perl installhtml --recurse --htmldir=${D}/usr/share/doc/${PF}/html
+
+}
+
+
+pkg_postinst() {
+	# generates the ph files for perl
+	cd /usr/include; h2ph *.h sys/*.h
+
+}