touchups

5 files changed, 39 insertions, 30 deletions

diff --git a/dev-perl/mod_perl/mod_perl-1.27-r1.ebuild b/dev-perl/mod_perl/mod_perl-1.27-r1.ebuild
index b11f4433b603..e82141b970b1 100644
--- a/dev-perl/mod_perl/mod_perl-1.27-r1.ebuild
+++ b/dev-perl/mod_perl/mod_perl-1.27-r1.ebuild
@@ -1,17 +1,18 @@
 # 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-r1.ebuild,v 1.7 2003/06/21 21:36:44 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mod_perl/mod_perl-1.27-r1.ebuild,v 1.8 2003/06/24 20:26:08 vapier 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"
+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*"
+DEPEND="dev-lang/perl
+	dev-perl/libwww-perl
+	=net-www/apache-1*"
 
 src_compile() {
 	perl Makefile.PL USE_APXS=1 \
@@ -23,7 +24,7 @@ src_compile() {
 	emake || die
 }
 
-src_install () {
+src_install() {
 	make \
 		PREFIX=${D}/usr	\
 		INSTALLMAN1DIR=${D}/usr/share/man/man1	\
diff --git a/dev-perl/mod_perl/mod_perl-1.27-r2.ebuild b/dev-perl/mod_perl/mod_perl-1.27-r2.ebuild
index f5db91817168..ca235fc293fc 100644
--- a/dev-perl/mod_perl/mod_perl-1.27-r2.ebuild
+++ b/dev-perl/mod_perl/mod_perl-1.27-r2.ebuild
@@ -1,21 +1,21 @@
 # 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-r2.ebuild,v 1.4 2003/06/21 21:36:44 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mod_perl/mod_perl-1.27-r2.ebuild,v 1.5 2003/06/24 20:26:08 vapier Exp $
+
+inherit eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="A Perl Module for Apache"
 SRC_URI="http://perl.apache.org/dist/${P}.tar.gz"
-HOMEPAGE="http://perl.apache.org"
+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*"
-
 IUSE="ipv6"
 
-inherit eutils
+DEPEND="dev-lang/perl
+	dev-perl/libwww-perl
+	=net-www/apache-1*"
 
 src_unpack() {
 	unpack ${A}
@@ -42,7 +42,7 @@ src_compile() {
 	emake || die
 }
 
-src_install () {
+src_install() {
 	make \
 		PREFIX=${D}/usr	\
 		INSTALLMAN1DIR=${D}/usr/share/man/man1	\
diff --git a/dev-perl/mod_perl/mod_perl-1.27.ebuild b/dev-perl/mod_perl/mod_perl-1.27.ebuild
index 9f5ea65d5eb2..b8243d38a984 100644
--- a/dev-perl/mod_perl/mod_perl-1.27.ebuild
+++ b/dev-perl/mod_perl/mod_perl-1.27.ebuild
@@ -1,16 +1,18 @@
 # 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.ebuild,v 1.16 2003/06/21 21:36:44 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mod_perl/mod_perl-1.27.ebuild,v 1.17 2003/06/24 20:26:08 vapier 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"
+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*"
+
+DEPEND="dev-lang/perl
+	dev-perl/libwww-perl
+	=net-www/apache-1*"
 
 src_compile() {
 	perl Makefile.PL USE_APXS=1 \
@@ -22,7 +24,7 @@ src_compile() {
 	emake || die
 }
 
-src_install () {
+src_install() {
 	make \
 		PREFIX=${D}/usr	\
 		INSTALLMAN1DIR=${D}/usr/share/man/man1	\
diff --git a/dev-perl/mod_perl/mod_perl-1.99.08.ebuild b/dev-perl/mod_perl/mod_perl-1.99.08.ebuild
index 4ea0d82183c1..2003ac137f6a 100644
--- a/dev-perl/mod_perl/mod_perl-1.99.08.ebuild
+++ b/dev-perl/mod_perl/mod_perl-1.99.08.ebuild
@@ -1,19 +1,21 @@
 # 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.99.08.ebuild,v 1.5 2003/06/22 17:44:00 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mod_perl/mod_perl-1.99.08.ebuild,v 1.6 2003/06/24 20:26:08 vapier Exp $
 
+MY_P=${PN}-1.99_08
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="An embedded Perl interpreter for Apache2"
 HOMEPAGE="http://perl.apache.org/"
+SRC_URI="http://perl.apache.org/dist/${MY_P}.tar.gz"
 
-NEWP="${PN}-1.99_08"
-S=${WORKDIR}/${NEWP}
-SRC_URI="http://perl.apache.org/dist/${NEWP}.tar.gz"
-DEPEND="dev-lang/perl =net-www/apache-2*"
 LICENSE="GPL-2"
 KEYWORDS="~x86 amd64"
 IUSE=""
 SLOT="1"
 
+DEPEND="dev-lang/perl
+	=net-www/apache-2*"
+
 src_compile() {
 	perl Makefile.PL \
 		PREFIX=${D}/usr \
diff --git a/dev-perl/mod_perl/mod_perl-1.99.09.ebuild b/dev-perl/mod_perl/mod_perl-1.99.09.ebuild
index 9920f1574eb6..c74fcf6d9828 100644
--- a/dev-perl/mod_perl/mod_perl-1.99.09.ebuild
+++ b/dev-perl/mod_perl/mod_perl-1.99.09.ebuild
@@ -1,21 +1,25 @@
 # 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.99.09.ebuild,v 1.5 2003/06/22 17:44:00 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mod_perl/mod_perl-1.99.09.ebuild,v 1.6 2003/06/24 20:26:08 vapier Exp $
 
+inherit eutils
+
+MY_PV=$(echo $PV | perl -pe 's/\.([^.]+)$/_\1/')
+MY_P=${PN}-${MY_PV}
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="An embedded Perl interpreter for Apache2"
+SRC_URI="http://perl.apache.org/dist/${MY_P}.tar.gz"
 HOMEPAGE="http://perl.apache.org/"
 
-NEWPV=$(echo $PV | perl -pe 's/\.([^.]+)$/_\1/')
-NEWP="${PN}-${NEWPV}"
-S=${WORKDIR}/${NEWP}
-SRC_URI="http://perl.apache.org/dist/${NEWP}.tar.gz"
-DEPEND="dev-lang/perl =net-www/apache-2* >=dev-perl/CGI-2.93 >=sys-apps/sed-4"
 LICENSE="GPL-2"
 KEYWORDS="~x86 amd64"
 IUSE=""
 SLOT="1"
 
-inherit eutils
+DEPEND="dev-lang/perl
+	=net-www/apache-2*
+	>=dev-perl/CGI-2.93
+	>=sys-apps/sed-4"
 
 src_unpack() {
 	unpack ${A}