fix depend.apache usage wrt #208033

(Portage version: 2.1.4)

6 files changed, 21 insertions, 16 deletions

diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog
index 0ea5ae1e3439..28c2ccbaa684 100644
--- a/sys-power/apcupsd/ChangeLog
+++ b/sys-power/apcupsd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-power/apcupsd
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.33 2008/01/13 12:20:38 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.34 2008/01/31 20:32:56 hollow Exp $
+
+  31 Jan 2008; Benedikt Böhm <hollow@gentoo.org> apcupsd-3.10.17-r1.ebuild,
+  apcupsd-3.10.18-r1.ebuild, apcupsd-3.10.18-r2.ebuild,
+  apcupsd-3.12.2.ebuild, apcupsd-3.12.2-r1.ebuild:
+  fix depend.apache usage wrt #208033
 
   13 Jan 2008; Michael Imhof <tantive@gentoo.org> apcupsd-3.12.4.ebuild:
   Stable. Closes #179998.
diff --git a/sys-power/apcupsd/apcupsd-3.10.17-r1.ebuild b/sys-power/apcupsd/apcupsd-3.10.17-r1.ebuild
index c97792fd9c98..dcb1a27e6445 100644
--- a/sys-power/apcupsd/apcupsd-3.10.17-r1.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.10.17-r1.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/sys-power/apcupsd/apcupsd-3.10.17-r1.ebuild,v 1.4 2007/07/29 17:11:41 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.10.17-r1.ebuild,v 1.5 2008/01/31 20:32:56 hollow Exp $
 
 inherit eutils depend.apache
 
@@ -70,7 +70,7 @@ src_install() {
 	rm -f "${D}"/etc/init.d/halt
 
 	if use cgi; then
-		insinto ${APACHE2_MODULES_CONFDIR}
+		insinto ${APACHE_MODULES_CONFDIR}
 		newins ${FILESDIR}/${PV}/apache.conf 60_apcupsd.conf
 	fi
 
diff --git a/sys-power/apcupsd/apcupsd-3.10.18-r1.ebuild b/sys-power/apcupsd/apcupsd-3.10.18-r1.ebuild
index ade367151001..52823d15c6f7 100644
--- a/sys-power/apcupsd/apcupsd-3.10.18-r1.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.10.18-r1.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/sys-power/apcupsd/apcupsd-3.10.18-r1.ebuild,v 1.7 2007/07/29 17:11:41 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.10.18-r1.ebuild,v 1.8 2008/01/31 20:32:56 hollow Exp $
 
 inherit eutils depend.apache
 
@@ -70,7 +70,7 @@ src_install() {
 	rm -f "${D}"/etc/init.d/halt
 
 	if use cgi; then
-		insinto ${APACHE2_MODULES_CONFDIR}
+		insinto ${APACHE_MODULES_CONFDIR}
 		newins ${FILESDIR}/${PV}/apache.conf 60_apcupsd.conf
 	fi
 
diff --git a/sys-power/apcupsd/apcupsd-3.10.18-r2.ebuild b/sys-power/apcupsd/apcupsd-3.10.18-r2.ebuild
index 16c31a96d7d2..4cae177e52b1 100644
--- a/sys-power/apcupsd/apcupsd-3.10.18-r2.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.10.18-r2.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/sys-power/apcupsd/apcupsd-3.10.18-r2.ebuild,v 1.4 2007/07/29 17:11:41 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.10.18-r2.ebuild,v 1.5 2008/01/31 20:32:56 hollow Exp $
 
 inherit eutils depend.apache
 
@@ -75,7 +75,7 @@ src_install() {
 
 	if use cgi; then
 		if use apache2; then
-			insinto ${APACHE2_MODULES_CONFDIR}
+			insinto ${APACHE_MODULES_CONFDIR}
 			newins ${FILESDIR}/${PV}/apache.conf 60_apcupsd.conf
 		fi
 
diff --git a/sys-power/apcupsd/apcupsd-3.12.2-r1.ebuild b/sys-power/apcupsd/apcupsd-3.12.2-r1.ebuild
index 9e695e16420b..114df4c2a3a3 100644
--- a/sys-power/apcupsd/apcupsd-3.12.2-r1.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.12.2-r1.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/sys-power/apcupsd/apcupsd-3.12.2-r1.ebuild,v 1.4 2007/07/29 17:11:41 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.12.2-r1.ebuild,v 1.5 2008/01/31 20:32:56 hollow Exp $
 
 inherit eutils depend.apache
 
@@ -78,7 +78,7 @@ src_install() {
 
 	if use cgi; then
 		if use apache2; then
-			insinto ${APACHE2_MODULES_CONFDIR}
+			insinto ${APACHE_MODULES_CONFDIR}
 			newins ${FILESDIR}/${PV}/apache.conf 60_apcupsd.conf
 		fi
 
diff --git a/sys-power/apcupsd/apcupsd-3.12.2.ebuild b/sys-power/apcupsd/apcupsd-3.12.2.ebuild
index 34d6d8001592..15091c8acdd6 100644
--- a/sys-power/apcupsd/apcupsd-3.12.2.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.12.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/sys-power/apcupsd/apcupsd-3.12.2.ebuild,v 1.3 2007/07/29 17:11:41 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.12.2.ebuild,v 1.4 2008/01/31 20:32:56 hollow Exp $
 
 inherit eutils depend.apache
 
@@ -78,7 +78,7 @@ src_install() {
 
 	if use cgi; then
 		if use apache2; then
-			insinto ${APACHE2_MODULES_CONFDIR}
+			insinto ${APACHE_MODULES_CONFDIR}
 			newins ${FILESDIR}/${PV}/apache.conf 60_apcupsd.conf
 		fi