6 files changed, 22 insertions, 16 deletions
diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog
index 4163235b5b25..c56a64b872e2 100644
--- a/sys-power/apcupsd/ChangeLog
+++ b/sys-power/apcupsd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-power/apcupsd
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.29 2007/05/03 16:10:17 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.30 2007/07/29 17:11:41 phreak Exp $
+
+  29 Jul 2007; Christian Heim <phreak@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:
+  Fixing the DEPEND/RDEPEND for the move of net-www/apache to
+  www-servers/apache (#78622).
 
   03 May 2007; Jeff Gardner <je_fro@gentoo.org> apcupsd-3.14.0.ebuild:
   Fix path to initscript.
diff --git a/sys-power/apcupsd/apcupsd-3.10.17-r1.ebuild b/sys-power/apcupsd/apcupsd-3.10.17-r1.ebuild
index 4de7d2e50c06..c97792fd9c98 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-2006 Gentoo Foundation
+# Copyright 1999-2007 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.3 2006/10/22 19:49:01 tantive Exp $
+# $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 $
 
 inherit eutils depend.apache
 
@@ -17,7 +17,7 @@ IUSE="doc snmp usb apache2 cgi threads ncurses nls"
 
 DEPEND="snmp? ( net-analyzer/net-snmp )
 	cgi? ( >=media-libs/gd-1.8.4
-		net-www/apache )
+		www-servers/apache )
 	ncurses? ( sys-libs/ncurses )
 	nls? ( sys-devel/gettext )"
 RDEPEND="${DEPEND}
diff --git a/sys-power/apcupsd/apcupsd-3.10.18-r1.ebuild b/sys-power/apcupsd/apcupsd-3.10.18-r1.ebuild
index 9bd848735eae..ade367151001 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-2006 Gentoo Foundation
+# Copyright 1999-2007 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.6 2006/10/22 19:49:01 tantive Exp $
+# $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 $
 
 inherit eutils depend.apache
 
@@ -17,7 +17,7 @@ IUSE="doc snmp usb apache2 cgi threads ncurses nls"
 
 DEPEND="snmp? ( net-analyzer/net-snmp )
 	cgi? ( >=media-libs/gd-1.8.4
-		net-www/apache )
+		www-servers/apache )
 	ncurses? ( sys-libs/ncurses )
 	nls? ( sys-devel/gettext )"
 RDEPEND="${DEPEND}
diff --git a/sys-power/apcupsd/apcupsd-3.10.18-r2.ebuild b/sys-power/apcupsd/apcupsd-3.10.18-r2.ebuild
index 57a9f8e395d3..16c31a96d7d2 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-2006 Gentoo Foundation
+# Copyright 1999-2007 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.3 2006/10/22 19:49:01 tantive Exp $
+# $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 $
 
 inherit eutils depend.apache
 
@@ -15,7 +15,7 @@ IUSE="doc snmp usb apache2 cgi threads ncurses nls lighttpd"
 
 DEPEND="snmp? ( net-analyzer/net-snmp )
 	cgi? ( >=media-libs/gd-1.8.4
-		apache2? ( >=net-www/apache-2.0.54-r30 )
+		apache2? ( >=www-servers/apache-2.0.54-r30 )
 		lighttpd? ( www-servers/lighttpd )
 		)
 	ncurses? ( sys-libs/ncurses )
diff --git a/sys-power/apcupsd/apcupsd-3.12.2-r1.ebuild b/sys-power/apcupsd/apcupsd-3.12.2-r1.ebuild
index b3f5cfac5224..9e695e16420b 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-2006 Gentoo Foundation
+# Copyright 1999-2007 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.3 2006/10/22 19:49:01 tantive Exp $
+# $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 $
 
 inherit eutils depend.apache
 
@@ -15,7 +15,7 @@ IUSE="doc snmp usb apache2 cgi threads ncurses nls lighttpd"
 
 DEPEND="snmp? ( net-analyzer/net-snmp )
 	cgi? ( >=media-libs/gd-1.8.4
-		apache2? ( >=net-www/apache-2.0.54-r30 )
+		apache2? ( >=www-servers/apache-2.0.54-r30 )
 		lighttpd? ( www-servers/lighttpd )
 		)
 	ncurses? ( sys-libs/ncurses )
diff --git a/sys-power/apcupsd/apcupsd-3.12.2.ebuild b/sys-power/apcupsd/apcupsd-3.12.2.ebuild
index 4890b96b3d0f..34d6d8001592 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-2006 Gentoo Foundation
+# Copyright 1999-2007 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.2 2006/10/22 19:49:01 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.12.2.ebuild,v 1.3 2007/07/29 17:11:41 phreak Exp $
 
 inherit eutils depend.apache
 
@@ -15,7 +15,7 @@ IUSE="doc snmp usb apache2 cgi threads ncurses nls lighttpd"
 
 DEPEND="snmp? ( net-analyzer/net-snmp )
 	cgi? ( >=media-libs/gd-1.8.4
-		apache2? ( >=net-www/apache-2.0.54-r30 )
+		apache2? ( >=www-servers/apache-2.0.54-r30 )
 		lighttpd? ( www-servers/lighttpd )
 		)
 	ncurses? ( sys-libs/ncurses )