LC_ALL bug/problem should be resolved now

4 files changed, 210 insertions, 2 deletions

diff --git a/sys-devel/perl/ChangeLog b/sys-devel/perl/ChangeLog
index b427e376c6bc..40c039cc687d 100644
--- a/sys-devel/perl/ChangeLog
+++ b/sys-devel/perl/ChangeLog
@@ -1,9 +1,15 @@
 # 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.14 2002/10/13 11:57:04 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/perl/ChangeLog,v 1.15 2002/11/22 19:03:38 mcummings Exp $
 
 *perl-5.6.1-r8 (13 Oct 2002)
 
+  22 Nov 2002; <mcummings@gentoo.org>
+
+  Second incantation of -r8. This time, it is for LC_ALL=C being added to 
+  the ebuild itself. Perl won't compile correctly otherwise and handles
+  internationaliztion post install.
+
   13 Oct 2002; Seemant Kulleen <seemant@gentoo.org> perl-5.6.1-r8.ebuild
   files/digest-perl-5.6.1-r8 :
 
diff --git a/sys-devel/perl/files/digest-perl-5.6.1-r8 b/sys-devel/perl/files/digest-perl-5.6.1-r8
new file mode 100644
index 000000000000..a1b30f92f979
--- /dev/null
+++ b/sys-devel/perl/files/digest-perl-5.6.1-r8
@@ -0,0 +1 @@
+MD5 ec1ff15464809b562aecfaa2e65edba6 perl-5.6.1.tar.gz 5983695
diff --git a/sys-devel/perl/perl-5.6.1-r7.ebuild b/sys-devel/perl/perl-5.6.1-r7.ebuild
index 0f00fff8917c..0818f37cabb9 100644
--- a/sys-devel/perl/perl-5.6.1-r7.ebuild
+++ b/sys-devel/perl/perl-5.6.1-r7.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.6.1-r7.ebuild,v 1.5 2002/10/17 16:34:48 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/perl/perl-5.6.1-r7.ebuild,v 1.6 2002/11/22 19:03:38 mcummings Exp $
 
 IUSE="berkdb gdbm"
 
@@ -21,6 +21,9 @@ DEPEND="sys-apps/groff
 
 src_compile() {
 
+    #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"
@@ -143,6 +146,8 @@ EOF
 }
 
 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"'"`
 
diff --git a/sys-devel/perl/perl-5.6.1-r8.ebuild b/sys-devel/perl/perl-5.6.1-r8.ebuild
new file mode 100644
index 000000000000..e2925561b3bc
--- /dev/null
+++ b/sys-devel/perl/perl-5.6.1-r8.ebuild
@@ -0,0 +1,196 @@
+# 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.6.1-r8.ebuild,v 1.4 2002/11/22 19:03:38 mcummings 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"
+KEYWORDS="~x86 ~ppc ~sparc ~sparc64 ~alpha"
+
+RDEPEND="gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	berkdb? ( >=sys-libs/db-3.2.3h-r3
+		=sys-libs/db-1.85-r1 )"
+
+DEPEND="sys-apps/groff
+	${RDEPEND}"
+
+src_compile() {
+
+    #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
+    if [ "`use berkdb`" ]
+    then
+		myconf="${myconf} -Di_db -Di_ndbm"
+    else
+		myconf="${myconf} -Ui_db -Ui_ndbm"
+    fi
+
+	# configure for libperl.so
+    sh Configure -des \
+		-Darchname=${CHOST%%-*}-linux \
+		-Dcccdlflags='-fPIC' \
+		-Dccdlflags='-rdynamic' \
+		-Dprefix=/usr \
+		-Dlocincpth=' ' \
+		-Doptimize="${CFLAGS}" \
+		-Duselargefiles \
+		-Duseshrplib \
+		-Dlibperl=libperl.so \
+		-Dd_dosuid \
+		-Dd_semctl_semun \
+		${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"'"`
+	# fixes a bug in the make/testing on new systems
+	make -f Makefile depend || die
+	mv makefile makefile_orig
+	mv x2p/makefile x2p/makefile_orig
+		  egrep -v "(<built-in>|<command line>)" makefile_orig >makefile
+		  egrep -v "(<built-in>|<command line>)" x2p/makefile_orig >x2p/makefile
+	make -f Makefile libperl.so || die
+	mv libperl.so ${WORKDIR}
+
+	# starting from scratch again
+	cd ${WORKDIR}
+	rm -rf ${S}
+	unpack ${A}
+	cd ${S}
+	
+	# 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 \
+		-Dprefix=/usr \
+		-Darchname=${CHOST%%-*}-linux \
+		-Duselargefiles \
+		-Dd_dosuid \
+		-Dlocincpth=' ' \
+		-Dd_semctl_semun \
+		${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
+    
+    #for some reason, this rm -f doesn't seem to actually do anything. So we explicitly use "Makefile"
+    #(rather than the default "makefile") in all make commands below.
+    rm -f makefile x2p/makefile
+    make -f Makefile depend || die
+    mv makefile makefile_orig
+    mv x2p/makefile x2p/makefile_orig
+    egrep -v "(<built-in>|<command line>)" makefile_orig >makefile
+    egrep -v "(<built-in>|<command line>)" x2p/makefile_orig >x2p/makefile
+    make -f Makefile || die
+	cp ${O}/files/stat.t ./t/op/
+    # 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 -f Makefile 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
+    ./perl installhtml --recurse --htmldir=${D}/usr/share/doc/${PF}/html
+
+}