-r4 gets -arch masking -r5 isnew

4 files changed, 247 insertions, 3 deletions

diff --git a/sys-devel/perl/ChangeLog b/sys-devel/perl/ChangeLog
index 57204feead98..a49c6e333675 100644
--- a/sys-devel/perl/ChangeLog
+++ b/sys-devel/perl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-devel/perl
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/perl/ChangeLog,v 1.26 2002/12/15 18:30:34 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/perl/ChangeLog,v 1.27 2002/12/17 07:34:27 lostlogic Exp $
+
+* perl-5.8.0-r5 (17 Dec 2002)
+
+  17 Dec 2002; Brandon Low <lostlogic@gentoo.org> perl-5.8.0-r5.ebuild:
+
+  Fix threading use flag thingus, it doesn't put things in ${D}/${D} later 
+  now.  Fix messages to only display if needed.  You will need to remerge
+  all your perl modules after you install this with threads.
 
 * perl-5.8.0-r4 (15 Dec 2002)
 
diff --git a/sys-devel/perl/files/digest-perl-5.8.0-r5 b/sys-devel/perl/files/digest-perl-5.8.0-r5
new file mode 100644
index 000000000000..517f2bed79ae
--- /dev/null
+++ b/sys-devel/perl/files/digest-perl-5.8.0-r5
@@ -0,0 +1 @@
+MD5 d9bdb180620306023fd35901a2878b62 perl-5.8.0.tar.gz 11023084
diff --git a/sys-devel/perl/perl-5.8.0-r4.ebuild b/sys-devel/perl/perl-5.8.0-r4.ebuild
index cd90d2aa7c61..307d761f9cc4 100644
--- a/sys-devel/perl/perl-5.8.0-r4.ebuild
+++ b/sys-devel/perl/perl-5.8.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/perl/perl-5.8.0-r4.ebuild,v 1.2 2002/12/15 18:31:50 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/perl/perl-5.8.0-r4.ebuild,v 1.3 2002/12/17 07:34:27 lostlogic Exp $
 
 IUSE="berkdb gdbm"
 
@@ -12,7 +12,7 @@ LICENSE="Artistic GPL-2"
 SLOT="0"
 # devs, please email if this tests ok on your platform rather than
 # unmasking it - mcummings@gentoo.org
-KEYWORDS="~x86 ~sparc ~ppc ~alpha"
+KEYWORDS="-x86 -sparc -ppc -alpha"
 
 DEPEND="sys-apps/groff 
 	berkdb? ( >=sys-libs/db-3.2.3h-r3 =sys-libs/db-1.85-r1 ) 
diff --git a/sys-devel/perl/perl-5.8.0-r5.ebuild b/sys-devel/perl/perl-5.8.0-r5.ebuild
new file mode 100644
index 000000000000..461e68fbcfe0
--- /dev/null
+++ b/sys-devel/perl/perl-5.8.0-r5.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/perl/perl-5.8.0-r5.ebuild,v 1.1 2002/12/17 07:34:27 lostlogic Exp $
+
+IUSE="berkdb gdbm"
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
+SRC_URI="ftp://ftp.perl.org/pub/CPAN/src/${P}.tar.gz"
+HOMEPAGE="http://www.perl.org" 
+LICENSE="Artistic GPL-2"
+SLOT="0"
+# devs, please email if this tests ok on your platform rather than
+# unmasking it - mcummings@gentoo.org
+KEYWORDS="~x86 ~sparc ~ppc ~alpha"
+
+DEPEND="sys-apps/groff 
+	berkdb? ( >=sys-libs/db-3.2.3h-r3 =sys-libs/db-1.85-r1 ) 
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
+
+RDEPEND="berkdb? ( >=sys-libs/db-3.2.3h-r3 =sys-libs/db-1.85-r1 ) 
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
+    
+pkg_setup() {
+	if [ -z "`use threads`" ]
+	then
+		ewarn ""
+		ewarn "PLEASE NOTE: If you wish 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 15
+	fi
+}
+src_compile() {
+	export LC_ALL=C
+    local myconf
+	if [ "`use threads`" ]
+	then
+		einfo "using threads"
+		mythreading="-multi"
+		myconf="-Dusethreads ${myconf}"
+	fi
+	myarch="${CHOST%%-*}-linux-thread"
+
+	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 sparc`" ]
+	then
+	 myconf="${myconf} -Ud_longdbl"
+	fi
+	if [ "`use sparc64`" ]
+	then
+	 myconf="${myconf} -Ud_longdbl"
+	fi
+	
+	cd ${S}
+
+	rm -f config.sh Policy.sh
+
+	sh Configure -des \
+		-Darchname=${myarch} \
+		-Dcccdlflags='-fPIC' \
+		-Dccdlflags='-rdynamic' \
+		-Dcc=gcc \
+		-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
+
+	make -f Makefile depend || die "Couldn't make libperl.so depends"
+	make -f Makefile libperl.so || die "Unable to make libperl.so" 
+	mv libperl.so ${WORKDIR}
+
+
+	cd ${WORKDIR}
+	rm -rf ${S}
+	unpack ${A}
+	cd ${S}
+				
+
+	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
+
+	sh Configure -des \
+		-Darchname=${myarch} \
+		-Dcc=gcc \
+		-Dprefix='/usr' \
+		-Dvendorprefix='/usr' \
+		-Dsiteprefixx='/usr' \
+		-Dlocincpth=' ' \
+		-Doptimize="${CFLAGS}" \
+		-Duselargefiles \
+		-Dd_dosuid \
+		-Dd_semctl_semun \
+		-Dman3ext=3pm \
+		-Dcf_by=Gentoo \
+		-Ud_csh \
+		${myconf} || die "Unable to configure"
+#	emake || die "Unable toe make"
+	make || die "Unable to make"
+	
+	make -i test CCDLFLAGS=
+							
+
+}
+
+src_install () {
+	
+	export LC_ALL=C
+	cd ${S}
+	
+	insinto /usr/lib/perl5/${PV}/${myarch}/CORE/
+	doins ${WORKDIR}/libperl.so
+	dosym /usr/lib/perl5/${PV}/${myarch}/CORE/libperl.so /usr/lib/libperl.so
+	#Fix for "stupid" modules and programs
+	dodir /usr/lib/perl5/site_perl/${PV}/${myarch}
+
+
+	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
+	patch -p1 < ${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} <<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
+	
+
+	cp ${D}/usr/lib/perl5/${PV}/${myarch}/Config.pm ${D}/usr/lib/perl5/${PV}/${myarch}/Config.pm.bak
+	sed -e "s:ccflags=':ccflags='-DPERL5 :" ${D}/usr/lib/perl5/${PV}/${myarch}/Config.pm.bak >	${D}/usr/lib/perl5/${PV}/${myarch}/Config.pm
+	cp ${D}/usr/lib/perl5/${PV}/${myarch}/Config.pm	${D}/usr/lib/perl5/${PV}/${myarch}/Config.pm.bak
+	sed -e "s:cppflags=':cppflags='-DPERL5 :" ${D}/usr/lib/perl5/${PV}/${myarch}/Config.pm.bak > ${D}/usr/lib/perl5/${PV}/${myarch}/Config.pm
+
+	rm -f ${D}/usr/lib/perl5/${PV}/${myarch}/Config.pm.bak
+	rm -f ${D}/usr/lib/perl5/${PV}/Config.pm.4install
+
+
+# A poor fix for the miniperl issues
+	sed -e 's:./miniperl:/usr/bin/perl:' ${D}/usr/lib/perl5/${PV}/ExtUtils/xsubpp > ${D}/usr/lib/perl5/${PV}/ExtUtils/xsubpp.bak
+	mv ${D}/usr/lib/perl5/${PV}/ExtUtils/xsubpp.bak ${D}/usr/lib/perl5/${PV}/ExtUtils/xsubpp
+	chmod 444 ${D}/usr/lib/perl5/${PV}/ExtUtils/xsubpp
+	sed -e 's:./miniperl:/usr/bin/perl:' ${D}/usr/bin/xsubpp > ${D}/usr/bin/xsubpp.bak
+	mv ${D}/usr/bin/xsubpp.bak ${D}/usr/bin/xsubpp
+	chmod 755 ${D}/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
+
+	dosed /usr/lib/perl5/${PV}/${myarch}${mythreading}/Config.pm
+	dosed /usr/lib/perl5/${PV}/${myarch}${mythreading}/.packlist
+
+	 
+
+	dodoc Changes* Artistic Copying README Todo* AUTHORS
+	prepalldocs
+
+# 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
+
+}
+
+pkg_postinst() {
+
+	cd /usr/include; h2ph *.h sys/*.h
+
+	eerror ""
+	eerror "If this is an upgrade to a perl 5.6.1 system,"
+	eerror "you may need to recompile applications that"
+	eerror "were emerged against the old libperl.so"
+	eerror ""
+	eerror "Please re-emerge any packages that depended "
+	eerror "on perl. If after upgrading a package gives "
+	eerror "you trouble, and re-emerging it fails to correct"
+	eerror "the problem, please check http://bugs.gentoo.org/"
+	eerror "for more information or to report a bug."
+	eerror""
+
+}