use depend.apache eclass wrt #208033

Package-Manager: portage-2.1.4

6 files changed, 36 insertions, 24 deletions

diff --git a/dev-perl/Apache-Test/Apache-Test-1.29.ebuild b/dev-perl/Apache-Test/Apache-Test-1.29.ebuild
index 2ea42089e118..cb85a4cc5a3b 100644
--- a/dev-perl/Apache-Test/Apache-Test-1.29.ebuild
+++ b/dev-perl/Apache-Test/Apache-Test-1.29.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/Apache-Test/Apache-Test-1.29.ebuild,v 1.8 2007/07/29 16:52:14 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Apache-Test/Apache-Test-1.29.ebuild,v 1.9 2008/02/02 15:17:01 hollow Exp $
 
-inherit perl-module
+inherit depend.apache perl-module
 
 DESCRIPTION="Test.pm wrapper with helpers for testing Apache"
 SRC_URI="mirror://cpan/authors/id/P/PG/PGOLLUCCI/${P}.tar.gz"
@@ -13,15 +13,16 @@ LICENSE="Artistic"
 KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
 SRC_TEST="skip"
 
-DEPEND="www-servers/apache
-	dev-lang/perl"
+DEPEND="dev-lang/perl"
+
+need_apache
 
 src_install() {
 	# This is to avoid conflicts with a deprecated Apache::Test stepping
 	# in and causing problems/install errors
-	if [ -f  ${S}/.mypacklist ];
+	if [ -f  "${S}"/.mypacklist ];
 	then
-		rm -f ${S}/.mypacklist
+		rm -f "${S}"/.mypacklist
 	fi
 	perl-module_src_install
 }
diff --git a/dev-perl/Apache-Test/ChangeLog b/dev-perl/Apache-Test/ChangeLog
index 9f4d25a18862..b73c8c503ade 100644
--- a/dev-perl/Apache-Test/ChangeLog
+++ b/dev-perl/Apache-Test/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-perl/Apache-Test
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Apache-Test/ChangeLog,v 1.58 2007/07/29 16:52:14 phreak Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Apache-Test/ChangeLog,v 1.59 2008/02/02 15:17:01 hollow Exp $
+
+  02 Feb 2008; Benedikt Böhm <hollow@gentoo.org> Apache-Test-1.29.ebuild:
+  use depend.apache eclass wrt #208033
 
   29 Jul 2007; Christian Heim <phreak@gentoo.org> Apache-Test-1.29.ebuild:
   Fixing the DEPEND/RDEPEND for the move of net-www/apache to
diff --git a/dev-perl/CUFlow/CUFlow-1.5.ebuild b/dev-perl/CUFlow/CUFlow-1.5.ebuild
index 1f428dbb8c8a..2d58f3bc4883 100644
--- a/dev-perl/CUFlow/CUFlow-1.5.ebuild
+++ b/dev-perl/CUFlow/CUFlow-1.5.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/CUFlow/CUFlow-1.5.ebuild,v 1.6 2007/07/29 16:53:13 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/CUFlow/CUFlow-1.5.ebuild,v 1.7 2008/02/02 15:18:40 hollow Exp $
 
-inherit eutils
+inherit depend.apache eutils
 
 DESCRIPTION="Provides an API for reading and analysing raw flow files"
 HOMEPAGE="http://www.columbia.edu/acis/networks/advanced/CUFlow/CUFlow.html"
@@ -14,10 +14,11 @@ KEYWORDS="x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl
-		net-analyzer/FlowScan
-		www-servers/apache"
+		net-analyzer/FlowScan"
 DEPEND=""
 
+need_apache
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -27,7 +28,7 @@ src_unpack() {
 
 src_install() {
 	insinto /var/lib/flows/bin
-	doins ${FILESDIR}/CUFlow.cf
+	doins "${FILESDIR}"/CUFlow.cf
 	exeinto /var/lib/flows/bin
 	doexe CUFlow.pm
 	exeinto /var/www/localhost/cgi-bin
diff --git a/dev-perl/CUFlow/ChangeLog b/dev-perl/CUFlow/ChangeLog
index e0278f55409d..0277163c743e 100644
--- a/dev-perl/CUFlow/ChangeLog
+++ b/dev-perl/CUFlow/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-perl/CUFlow
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/CUFlow/ChangeLog,v 1.6 2007/07/29 16:53:13 phreak Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/CUFlow/ChangeLog,v 1.7 2008/02/02 15:18:40 hollow Exp $
+
+  02 Feb 2008; Benedikt Böhm <hollow@gentoo.org> CUFlow-1.5.ebuild:
+  use depend.apache eclass wrt #208033
 
   29 Jul 2007; Christian Heim <phreak@gentoo.org> CUFlow-1.5.ebuild:
   Fixing the DEPEND/RDEPEND for the move of net-www/apache to
diff --git a/dev-perl/JKFlow/ChangeLog b/dev-perl/JKFlow/ChangeLog
index 19ba4c5d609e..7de85f7ed085 100644
--- a/dev-perl/JKFlow/ChangeLog
+++ b/dev-perl/JKFlow/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-perl/JKFlow
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/JKFlow/ChangeLog,v 1.6 2007/07/29 16:50:03 phreak Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/JKFlow/ChangeLog,v 1.7 2008/02/02 15:22:29 hollow Exp $
+
+  02 Feb 2008; Benedikt Böhm <hollow@gentoo.org> JKFlow-3.4.2.ebuild:
+  use depend.apache eclass wrt #208033
 
   29 Jul 2007; Christian Heim <phreak@gentoo.org> JKFlow-3.4.2.ebuild:
   Fixing the DEPEND/RDEPEND for the move of net-www/apache to
diff --git a/dev-perl/JKFlow/JKFlow-3.4.2.ebuild b/dev-perl/JKFlow/JKFlow-3.4.2.ebuild
index 773ed0dbdc6d..158ce4079ca5 100644
--- a/dev-perl/JKFlow/JKFlow-3.4.2.ebuild
+++ b/dev-perl/JKFlow/JKFlow-3.4.2.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/JKFlow/JKFlow-3.4.2.ebuild,v 1.4 2007/07/29 16:50:03 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/JKFlow/JKFlow-3.4.2.ebuild,v 1.5 2008/02/02 15:22:29 hollow Exp $
 
-inherit eutils
+inherit depend.apache eutils
 
 MY_PN="${PN/JKF/jkf}"
 MY_P="${MY_PN}-v${PV}"
@@ -19,10 +19,11 @@ IUSE=""
 RDEPEND="dev-lang/perl
 		net-analyzer/FlowScan
 		dev-perl/XML-Simple
-		dev-perl/Net-Patricia
-		www-servers/apache"
+		dev-perl/Net-Patricia"
 DEPEND=""
 
+need_apache
+
 S="${WORKDIR}/${PN}-v${PV}"
 
 src_unpack() {