1.27-r4 with coreutils fixes

4 files changed, 104 insertions, 10 deletions

diff --git a/dev-perl/mod_perl/ChangeLog b/dev-perl/mod_perl/ChangeLog
index 97942456812e..693455b14818 100644
--- a/dev-perl/mod_perl/ChangeLog
+++ b/dev-perl/mod_perl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-perl/mod_perl
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mod_perl/ChangeLog,v 1.24 2003/07/12 10:49:57 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mod_perl/ChangeLog,v 1.25 2003/10/15 06:22:23 rac Exp $
+
+*mod_perl-1.27-r4 (14 Oct 2003)
+
+  14 Oct 2003; <rac@gentoo.org> mod_perl-1.27-r4.ebuild:
+  sed-fu to fix deprecated use of tail -1 in a couple of places, solves build
+  problems on machines with new coreutils, including the amd64 port
 
 *mod_perl-1.27-r1 (24 Jun 2003)
  
diff --git a/dev-perl/mod_perl/Manifest b/dev-perl/mod_perl/Manifest
index 50266a028e18..754aeeec91fb 100644
--- a/dev-perl/mod_perl/Manifest
+++ b/dev-perl/mod_perl/Manifest
@@ -1,17 +1,19 @@
-MD5 1cf1a2cb8b0ff346a78c3c8e405ca20b ChangeLog 3468
-MD5 58ceed38b57307fa4190170a23408524 mod_perl-1.27-r1.ebuild 1421
-MD5 0bf9316fb68b93b9bd9b72555e81b41b mod_perl-1.27-r2.ebuild 1821
+MD5 9eb488a8d217058474db6e04e22c62fa mod_perl-1.99.09.ebuild 3613
 MD5 b04e594ce1aa3379787924322454aba5 mod_perl-1.27.ebuild 1416
+MD5 0bf9316fb68b93b9bd9b72555e81b41b mod_perl-1.27-r2.ebuild 1821
+MD5 ca7b02d02b05f693bb730fd5eb8e6627 mod_perl-1.27-r4.ebuild 2196
 MD5 026fbb84b447f735b4c86b46860f2afb mod_perl-1.99.08.ebuild 1244
-MD5 9eb488a8d217058474db6e04e22c62fa mod_perl-1.99.09.ebuild 3613
-MD5 b8bea8f6d6e415b81c96ea0ff36478eb mod_perl-1.27-r3.ebuild 2031
+MD5 58ceed38b57307fa4190170a23408524 mod_perl-1.27-r1.ebuild 1421
+MD5 249d51b33f2a08cfa0a518b6fbe07a31 ChangeLog 3704
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 2415e6be73ba155382b34b5e2fad4951 files/75_mod_perl.conf 247
-MD5 39a4d91d1d90d32f90dea3c00a1680d7 files/apache2-mod_perl-startup.pl 483
-MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27 65
+MD5 b8bea8f6d6e415b81c96ea0ff36478eb mod_perl-1.27-r3.ebuild 2031
 MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27-r1 65
 MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27-r2 65
+MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27-r3 65
+MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27-r4 65
 MD5 4869c6ea8e02d871a03455d28b6f6cfb files/digest-mod_perl-1.99.08 68
 MD5 5fb9123a821e261a210c5fca0ff94976 files/digest-mod_perl-1.99.09 68
+MD5 39a4d91d1d90d32f90dea3c00a1680d7 files/apache2-mod_perl-startup.pl 483
+MD5 2415e6be73ba155382b34b5e2fad4951 files/75_mod_perl.conf 247
+MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27 65
 MD5 1e0341f9b7bd3c3f74c25e60eb3188c8 files/mod_perl-1.27-ipv6.patch 1207
-MD5 05455750ba5b64e18dbcfd113193e7cd files/digest-mod_perl-1.27-r3 65
diff --git a/dev-perl/mod_perl/files/digest-mod_perl-1.27-r4 b/dev-perl/mod_perl/files/digest-mod_perl-1.27-r4
new file mode 100644
index 000000000000..100b74cf1c13
--- /dev/null
+++ b/dev-perl/mod_perl/files/digest-mod_perl-1.27-r4
@@ -0,0 +1 @@
+MD5 bd07f4f1065eb0d0a8d8004219357d8c mod_perl-1.27.tar.gz 372525
diff --git a/dev-perl/mod_perl/mod_perl-1.27-r4.ebuild b/dev-perl/mod_perl/mod_perl-1.27-r4.ebuild
new file mode 100644
index 000000000000..b1d308ca7687
--- /dev/null
+++ b/dev-perl/mod_perl/mod_perl-1.27-r4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mod_perl/mod_perl-1.27-r4.ebuild,v 1.1 2003/10/15 06:22:23 rac Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="A Perl Module for Apache"
+SRC_URI="http://perl.apache.org/dist/${P}.tar.gz"
+HOMEPAGE="http://perl.apache.org"
+
+SLOT="0"
+LICENSE="Apache-1.1 as-is"
+KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha"
+
+DEPEND="dev-lang/perl dev-perl/libwww-perl =net-www/apache-1* >=sys-apps/sed-4"
+
+IUSE="ipv6"
+
+inherit eutils
+
+src_unpack() {
+	unpack ${A}
+
+	if has_version '>=apache-1.3.27-r4' && use ipv6; then
+		# This patch originally came from
+		# http://pasky.ji.cz/~pasky/dev/apache/mod_perl-1.27+ipv6.patch.
+		# It allows mod_perl to correctly build with an IPv6-enabled
+		# Apache (bug #6986).
+		# Robert Coie <rac@gentoo.org> 2002.02.19
+
+		cd ${S}; epatch ${FILESDIR}/${P}-ipv6.patch
+	fi
+
+	cd ${S}
+	for f in "apaci/mod_perl.config.sh" "apaci/libperl.module"
+	do
+		echo "tail -1 fix in ${f}"
+		sed -i -e "s/tail -1/tail -n1/" ${f}
+	done
+}
+
+src_compile() {
+	perl Makefile.PL USE_APXS=1 \
+		INSTALLDIRS=vendor \
+		WITH_APXS=/usr/sbin/apxs EVERYTHING=1
+
+	cp Makefile Makefile.orig
+	sed -e "s:apxs_install doc_install:doc_install:" Makefile.orig > Makefile
+	emake || die
+}
+
+src_install () {
+	eval `perl '-V:installvendorarch'`
+	eval `perl '-V:installvendorlib'`
+
+	make \
+		PREFIX=${D}/usr	\
+		INSTALLVENDORARCH=${D}/${installvendorarch}	\
+		INSTALLVENDORLIB=${D}/${installvendorlib}	\
+		INSTALLVENDORMAN1DIR=${D}/usr/share/man/man1	\
+		INSTALLVENDORMAN3DIR=${D}/usr/share/man/man3	\
+		pure_vendor_install || die
+
+	dodoc Changes CREDITS MANIFEST README SUPPORT ToDo
+	dohtml -r ./
+
+	cd apaci
+	exeinto /usr/lib/apache-extramodules
+	doexe libperl.so
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Execute \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\""
+	einfo "to have your apache.conf auto-updated for use with this module."
+	einfo "You should then edit your /etc/conf.d/apache file to suit."
+	einfo
+}
+
+pkg_config() {
+	${ROOT}/usr/sbin/apacheaddmod \
+		${ROOT}/etc/apache/conf/apache.conf \
+		extramodules/libperl.so mod_perl.c perl_module \
+		define=PERL
+	:;
+}