fix depend.apache usage wrt #208033

Package-Manager: portage-2.1.4

5 files changed, 21 insertions, 14 deletions

diff --git a/www-apache/mod_perl/ChangeLog b/www-apache/mod_perl/ChangeLog
index ac44eee99990..159ffe8305e2 100644
--- a/www-apache/mod_perl/ChangeLog
+++ b/www-apache/mod_perl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apache/mod_perl
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.54 2008/01/27 20:11:46 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/ChangeLog,v 1.55 2008/01/29 17:59:31 hollow Exp $
+
+  29 Jan 2008; Benedikt Böhm <hollow@gentoo.org> mod_perl-2.0.3-r2.ebuild:
+  fix depend.apache usage wrt #208033
 
   27 Jan 2008; Benedikt Böhm <hollow@gentoo.org>
   files/2.0.3/75_mod_perl.conf, mod_perl-2.0.3-r2.ebuild:
diff --git a/www-apache/mod_perl/mod_perl-2.0.3-r2.ebuild b/www-apache/mod_perl/mod_perl-2.0.3-r2.ebuild
index 94a005720ad1..b944a345da28 100644
--- a/www-apache/mod_perl/mod_perl-2.0.3-r2.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-2.0.3-r2.ebuild,v 1.2 2008/01/27 20:11:46 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_perl/mod_perl-2.0.3-r2.ebuild,v 1.3 2008/01/29 17:59:31 hollow Exp $
 
 inherit apache-module perl-module eutils multilib
 
@@ -86,7 +86,7 @@ src_compile() {
 		MP_TRACE=1 \
 		MP_DEBUG=1 \
 		MP_USE_DSO=1 \
-		MP_APXS=${APXS2}  \
+		MP_APXS=${APXS}  \
 		INSTALLDIRS=vendor </dev/null || die
 
 	# reported that parallel make is broken in bug 30257
@@ -112,9 +112,9 @@ src_test() {
 src_install() {
 	apache-module_src_install
 
-	dodir "${APACHE2_MODULESDIR}"
+	dodir "${APACHE_MODULESDIR}"
 	make install \
-		MODPERL_AP_LIBEXECDIR="${D}${APACHE2_MODULESDIR}" \
+		MODPERL_AP_LIBEXECDIR="${D}${APACHE_MODULESDIR}" \
 		MODPERL_AP_INCLUDEDIR="${D}/usr/include/apache2" \
 		MP_INST_APACHE2=1 \
 		INSTALLDIRS=vendor || die
@@ -123,7 +123,7 @@ src_install() {
 	# it seems to me that this has been getting installed for ages
 	fixlocalpod
 
-	insinto "${APACHE2_MODULES_CONFDIR}"
+	insinto "${APACHE_MODULES_CONFDIR}"
 	doins "${FILESDIR}"/${PV}/apache2-mod_perl-startup.pl
 	cp -pPR docs "${D}"/usr/share/doc/${PF}
 	cp -pPR todo "${D}"/usr/share/doc/${PF}
diff --git a/www-apache/mod_security/ChangeLog b/www-apache/mod_security/ChangeLog
index a665d938373d..6e9da9aff655 100644
--- a/www-apache/mod_security/ChangeLog
+++ b/www-apache/mod_security/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/mod_security
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.9 2007/11/25 13:36:06 hollow Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/ChangeLog,v 1.10 2008/01/29 18:01:39 hollow Exp $
+
+  29 Jan 2008; Benedikt Böhm <hollow@gentoo.org> mod_security-2.1.2.ebuild,
+  mod_security-2.1.4_rc1.ebuild:
+  fix depend.apache usage wrt #208033
 
   25 Nov 2007; Benedikt Böhm <hollow@gentoo.org> mod_security-2.1.2.ebuild:
   fix apache-module eclass usage
diff --git a/www-apache/mod_security/mod_security-2.1.2.ebuild b/www-apache/mod_security/mod_security-2.1.2.ebuild
index 56f2e71ac876..1de2644891ce 100644
--- a/www-apache/mod_security/mod_security-2.1.2.ebuild
+++ b/www-apache/mod_security/mod_security-2.1.2.ebuild
@@ -1,6 +1,6 @@
-# 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/www-apache/mod_security/mod_security-2.1.2.ebuild,v 1.6 2007/11/25 13:36:06 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/mod_security-2.1.2.ebuild,v 1.7 2008/01/29 18:01:39 hollow Exp $
 
 inherit apache-module
 
@@ -44,6 +44,6 @@ src_install() {
 	done
 
 	# Install core ruleset
-	insinto ${APACHE2_MODULES_CONFDIR}/mod_security/
+	insinto ${APACHE_MODULES_CONFDIR}/mod_security/
 	doins "${S}"/rules/*.conf
 }
diff --git a/www-apache/mod_security/mod_security-2.1.4_rc1.ebuild b/www-apache/mod_security/mod_security-2.1.4_rc1.ebuild
index 703c8052cfa7..c062e688e90d 100644
--- a/www-apache/mod_security/mod_security-2.1.4_rc1.ebuild
+++ b/www-apache/mod_security/mod_security-2.1.4_rc1.ebuild
@@ -1,6 +1,6 @@
-# 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/www-apache/mod_security/mod_security-2.1.4_rc1.ebuild,v 1.1 2007/10/21 12:35:14 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/mod_security-2.1.4_rc1.ebuild,v 1.2 2008/01/29 18:01:39 hollow Exp $
 
 inherit apache-module
 
@@ -45,6 +45,6 @@ src_install() {
 	done
 
 	# Install core ruleset
-	insinto ${APACHE2_MODULES_CONFDIR}/mod_security/
+	insinto ${APACHE_MODULES_CONFDIR}/mod_security/
 	doins "${S}"/rules/*.conf
 }