use depend.apache eclass wrt #208033

(Portage version: 2.1.4)

6 files changed, 35 insertions, 25 deletions

diff --git a/dev-perl/HTML-Mason/ChangeLog b/dev-perl/HTML-Mason/ChangeLog
index 6b7543c3f679..9c1611d91aee 100644
--- a/dev-perl/HTML-Mason/ChangeLog
+++ b/dev-perl/HTML-Mason/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-perl/HTML-Mason
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Mason/ChangeLog,v 1.77 2008/01/13 21:31:22 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Mason/ChangeLog,v 1.78 2008/02/03 14:15:40 hollow Exp $
+
+  03 Feb 2008; Benedikt Böhm <hollow@gentoo.org> HTML-Mason-1.32.ebuild,
+  HTML-Mason-1.33.ebuild, HTML-Mason-1.35.ebuild, HTML-Mason-1.36.ebuild,
+  HTML-Mason-1.37.ebuild:
+  use depend.apache eclass wrt #208033
 
   13 Jan 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   HTML-Mason-1.37.ebuild:
diff --git a/dev-perl/HTML-Mason/HTML-Mason-1.32.ebuild b/dev-perl/HTML-Mason/HTML-Mason-1.32.ebuild
index a564b2df9bdb..46d6c7968ff0 100644
--- a/dev-perl/HTML-Mason/HTML-Mason-1.32.ebuild
+++ b/dev-perl/HTML-Mason/HTML-Mason-1.32.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Mason/HTML-Mason-1.32.ebuild,v 1.16 2007/08/19 11:42:59 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Mason/HTML-Mason-1.32.ebuild,v 1.17 2008/02/03 14:15:40 hollow Exp $
 
-inherit perl-module
+inherit depend.apache perl-module
 
 DESCRIPTION="A HTML development and delivery Perl Module"
 SRC_URI="mirror://cpan/authors/id/D/DR/DROLSKY/${P}.tar.gz"
@@ -16,7 +16,6 @@ SRC_TEST="do"
 
 DEPEND="!modperl? ( virtual/perl-CGI )
 	modperl? (
-		>=www-servers/apache-2
 		www-apache/libapreq2
 		>=www-apache/mod_perl-2
 	)
@@ -29,6 +28,8 @@ DEPEND="!modperl? ( virtual/perl-CGI )
 	>=dev-perl/Cache-Cache-1.01
 	dev-lang/perl"
 
+want_apache2 modperl
+
 mydoc="CREDITS UPGRADE"
 myconf="--noprompts"
 
@@ -40,7 +41,7 @@ perl-module_src_prep() {
 		sleep 5
 	fi
 	# rendhalver - needed to set an env var for the build script so it finds our apache.
-	APACHE="/usr/sbin/apache2" perl ${S}/Build.PL installdirs=vendor destdir=${D} ${myconf}
+	APACHE="${APACHE_BIN}" perl ${S}/Build.PL installdirs=vendor destdir=${D} ${myconf}
 }
 
 src_install () {
diff --git a/dev-perl/HTML-Mason/HTML-Mason-1.33.ebuild b/dev-perl/HTML-Mason/HTML-Mason-1.33.ebuild
index b052d2a145dd..382c64df6ca8 100644
--- a/dev-perl/HTML-Mason/HTML-Mason-1.33.ebuild
+++ b/dev-perl/HTML-Mason/HTML-Mason-1.33.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Mason/HTML-Mason-1.33.ebuild,v 1.12 2007/08/19 11:42:59 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Mason/HTML-Mason-1.33.ebuild,v 1.13 2008/02/03 14:15:40 hollow Exp $
 
-inherit perl-module
+inherit depend.apache perl-module
 
 DESCRIPTION="A HTML development and delivery Perl Module"
 SRC_URI="mirror://cpan/authors/id/D/DR/DROLSKY/${P}.tar.gz"
@@ -16,7 +16,6 @@ SRC_TEST="do"
 
 DEPEND="!modperl? ( virtual/perl-CGI )
 	modperl? (
-		>=www-servers/apache-2
 		www-apache/libapreq2
 		>=www-apache/mod_perl-2
 	)
@@ -29,6 +28,8 @@ DEPEND="!modperl? ( virtual/perl-CGI )
 	>=dev-perl/Cache-Cache-1.01
 	dev-lang/perl"
 
+want_apache2 modperl
+
 mydoc="CREDITS UPGRADE"
 myconf="--noprompts"
 
@@ -40,7 +41,7 @@ perl-module_src_prep() {
 		sleep 5
 	fi
 	# rendhalver - needed to set an env var for the build script so it finds our apache.
-	APACHE="/usr/sbin/apache2" perl ${S}/Build.PL installdirs=vendor destdir=${D} ${myconf}
+	APACHE="${APACHE_BIN}" perl ${S}/Build.PL installdirs=vendor destdir=${D} ${myconf}
 }
 
 src_install () {
diff --git a/dev-perl/HTML-Mason/HTML-Mason-1.35.ebuild b/dev-perl/HTML-Mason/HTML-Mason-1.35.ebuild
index bf8bf53a24f3..9c0f3906b987 100644
--- a/dev-perl/HTML-Mason/HTML-Mason-1.35.ebuild
+++ b/dev-perl/HTML-Mason/HTML-Mason-1.35.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Mason/HTML-Mason-1.35.ebuild,v 1.11 2007/08/19 11:42:59 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Mason/HTML-Mason-1.35.ebuild,v 1.12 2008/02/03 14:15:40 hollow Exp $
 
-inherit perl-module
+inherit depend.apache perl-module
 
 DESCRIPTION="A HTML development and delivery Perl Module"
 SRC_URI="mirror://cpan/authors/id/D/DR/DROLSKY/${P}.tar.gz"
@@ -16,7 +16,6 @@ SRC_TEST="do"
 
 DEPEND="!modperl? ( virtual/perl-CGI )
 	modperl? (
-		>=www-servers/apache-2
 		www-apache/libapreq2
 		>=www-apache/mod_perl-2
 	)
@@ -29,6 +28,8 @@ DEPEND="!modperl? ( virtual/perl-CGI )
 	>=dev-perl/Cache-Cache-1.01
 	dev-lang/perl"
 
+want_apache2 modperl
+
 mydoc="CREDITS UPGRADE"
 myconf="--noprompts"
 
@@ -40,7 +41,7 @@ perl-module_src_prep() {
 		sleep 5
 	fi
 	# rendhalver - needed to set an env var for the build script so it finds our apache.
-	APACHE="/usr/sbin/apache2" perl ${S}/Build.PL installdirs=vendor destdir=${D} ${myconf}
+	APACHE="${APACHE_BIN}" perl ${S}/Build.PL installdirs=vendor destdir=${D} ${myconf}
 }
 
 src_install () {
diff --git a/dev-perl/HTML-Mason/HTML-Mason-1.36.ebuild b/dev-perl/HTML-Mason/HTML-Mason-1.36.ebuild
index 48ad5bb35861..1c0420723b46 100644
--- a/dev-perl/HTML-Mason/HTML-Mason-1.36.ebuild
+++ b/dev-perl/HTML-Mason/HTML-Mason-1.36.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Mason/HTML-Mason-1.36.ebuild,v 1.8 2007/11/10 13:27:47 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Mason/HTML-Mason-1.36.ebuild,v 1.9 2008/02/03 14:15:40 hollow Exp $
 
-inherit perl-module
+inherit depend.apache perl-module
 
 DESCRIPTION="A HTML development and delivery Perl Module"
 SRC_URI="mirror://cpan/authors/id/D/DR/DROLSKY/${P}.tar.gz"
@@ -16,7 +16,6 @@ SRC_TEST="do"
 
 RDEPEND="!modperl? ( virtual/perl-CGI )
 	modperl? (
-		>=www-servers/apache-2
 		www-apache/libapreq2
 		>=www-apache/mod_perl-2
 	)
@@ -33,6 +32,8 @@ RDEPEND="!modperl? ( virtual/perl-CGI )
 DEPEND="${RDEPEND}
 	dev-perl/module-build"
 
+want_apache2 modperl
+
 mydoc="CREDITS UPGRADE"
 myconf="--noprompts"
 
@@ -44,7 +45,7 @@ perl-module_src_prep() {
 		sleep 5
 	fi
 	# rendhalver - needed to set an env var for the build script so it finds our apache.
-	APACHE="/usr/sbin/apache2" perl ${S}/Build.PL installdirs=vendor destdir=${D} ${myconf}
+	APACHE="${APACHE_BIN}" perl ${S}/Build.PL installdirs=vendor destdir=${D} ${myconf}
 }
 
 src_install () {
diff --git a/dev-perl/HTML-Mason/HTML-Mason-1.37.ebuild b/dev-perl/HTML-Mason/HTML-Mason-1.37.ebuild
index 903c499c01bb..b882b28794ba 100644
--- a/dev-perl/HTML-Mason/HTML-Mason-1.37.ebuild
+++ b/dev-perl/HTML-Mason/HTML-Mason-1.37.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Mason/HTML-Mason-1.37.ebuild,v 1.4 2008/01/13 21:31:22 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Mason/HTML-Mason-1.37.ebuild,v 1.5 2008/02/03 14:15:40 hollow Exp $
 
-inherit perl-module
+inherit depend.apache perl-module
 
 DESCRIPTION="A HTML development and delivery Perl Module"
 SRC_URI="mirror://cpan/authors/id/D/DR/DROLSKY/${P}.tar.gz"
@@ -16,7 +16,6 @@ SRC_TEST="do"
 
 RDEPEND="!modperl? ( virtual/perl-CGI )
 	modperl? (
-		>=www-servers/apache-2
 		www-apache/libapreq2
 		>=www-apache/mod_perl-2
 	)
@@ -33,6 +32,8 @@ RDEPEND="!modperl? ( virtual/perl-CGI )
 DEPEND="${RDEPEND}
 	dev-perl/module-build"
 
+want_apache2 modperl
+
 mydoc="CREDITS UPGRADE"
 myconf="--noprompts"
 
@@ -44,7 +45,7 @@ perl-module_src_prep() {
 		sleep 5
 	fi
 	# rendhalver - needed to set an env var for the build script so it finds our apache.
-	APACHE="/usr/sbin/apache2" perl ${S}/Build.PL installdirs=vendor destdir=${D} ${myconf}
+	APACHE="${APACHE_BIN}" perl ${S}/Build.PL installdirs=vendor destdir=${D} ${myconf}
 }
 
 src_install () {