Fixing the DEPEND/RDEPEND for the move of net-www/apache to www-servers/apache (#78622).

Package-Manager: portage-2.1.3_rc9

9 files changed, 81 insertions, 75 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index 92ad9e083621..32e12884e935 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/apache
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.539 2007/07/12 10:39:07 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.540 2007/07/29 17:16:12 phreak Exp $
+
+  29 Jul 2007; Christian Heim <phreak@gentoo.org> apache-2.0.58-r2.ebuild,
+  apache-2.0.59-r2.ebuild, apache-2.2.4-r6.ebuild, apache-2.2.4-r7.ebuild,
+  apache-2.2.4-r8.ebuild, apache-2.2.4-r9.ebuild, apache-2.2.4-r10.ebuild:
+  Fixing the DEPEND/RDEPEND for the move of net-www/apache to
+  www-servers/apache (#78622).
 
 *apache-2.2.4-r10 (12 Jul 2007)
 
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index f7c42e6654bb..28e1bf997c79 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -10,38 +10,38 @@ DIST gentoo-apache-2.2.4-r9-20070710.tar.bz2 57164 RMD160 d23cb1c572a0ebfaf17fe2
 DIST httpd-2.0.58.tar.bz2 4704318 RMD160 2ff44b2254552db908f1defd09e3142527f9bf83 SHA1 697e1674f8efbbe05b9f6c1ba00cd28a37293229 SHA256 4f746715c408f4cac48099ea72560c50ef190568dfcfa8e0762bae66c0398029
 DIST httpd-2.0.59.tar.bz2 4743549 RMD160 78b802354e338798a6978ece8b3568be97542174 SHA1 908209cd6e52f700d2a841a25de36e44d469c376 SHA256 bbac543ca9f80826f71eb16945610f8f90a36b346efc658be3b466ec0c990c0d
 DIST httpd-2.2.4.tar.bz2 4930375 RMD160 bb6e8a7447fa8e8f629010f30b548068de518523 SHA1 64ceae373434a986dc99b8ed953afa0d4fad85ce SHA256 08ab82eae6418e265d361730e7eadc7d6966dffdb66ee07bd4d9af3f2b28dfc8
-EBUILD apache-2.0.58-r2.ebuild 13829 RMD160 106a944429a872928f55d568b997e5edd8392ab7 SHA1 febf4b84e1db05c5a8e300b04b181d804a4907df SHA256 b9becb3ea02aa0ee553cba3e16b199bc31ddeef06602caa580f12f4470821ab0
-MD5 a5fda0553cb3bbd7e3e2cf88457b7558 apache-2.0.58-r2.ebuild 13829
-RMD160 106a944429a872928f55d568b997e5edd8392ab7 apache-2.0.58-r2.ebuild 13829
-SHA256 b9becb3ea02aa0ee553cba3e16b199bc31ddeef06602caa580f12f4470821ab0 apache-2.0.58-r2.ebuild 13829
-EBUILD apache-2.0.59-r2.ebuild 14080 RMD160 78c348c9b238da5f88e17d09dab39eea9777bd9f SHA1 0fa6de5894342af03f57fa8e87b89e68f1e7d15a SHA256 e5c6c9c05de19b5bb9051f134d651a6aed4387789d1a1f43fe9218cca4930ff7
-MD5 7ca572c45d5a3a17fd5560d83b9d5b8d apache-2.0.59-r2.ebuild 14080
-RMD160 78c348c9b238da5f88e17d09dab39eea9777bd9f apache-2.0.59-r2.ebuild 14080
-SHA256 e5c6c9c05de19b5bb9051f134d651a6aed4387789d1a1f43fe9218cca4930ff7 apache-2.0.59-r2.ebuild 14080
-EBUILD apache-2.2.4-r10.ebuild 15355 RMD160 e97b7db7fcb57dba05e368bd5e051828de25fe9e SHA1 ac3460eb548d94ab37de0dcd9604a50940bd8cfd SHA256 9843c4f39c17e2a8d5853de8dcb045ef9107b580c0833bf6ca6a8c04eaeff0f2
-MD5 0fc04b0e0dcb6127849332b229bbb0c1 apache-2.2.4-r10.ebuild 15355
-RMD160 e97b7db7fcb57dba05e368bd5e051828de25fe9e apache-2.2.4-r10.ebuild 15355
-SHA256 9843c4f39c17e2a8d5853de8dcb045ef9107b580c0833bf6ca6a8c04eaeff0f2 apache-2.2.4-r10.ebuild 15355
-EBUILD apache-2.2.4-r6.ebuild 14880 RMD160 7535feeb56fb05cd5cb14a6846579df1cf16601c SHA1 d4c45fece7c3ecd5947e905fffe5caa9fd10bd17 SHA256 05f00d1444a8ed6c88461f105e259e35cd2b2ae75e51b5ed0d8a43f696148eb5
-MD5 431a3eda10f5616618b2a7ddac2d2ba7 apache-2.2.4-r6.ebuild 14880
-RMD160 7535feeb56fb05cd5cb14a6846579df1cf16601c apache-2.2.4-r6.ebuild 14880
-SHA256 05f00d1444a8ed6c88461f105e259e35cd2b2ae75e51b5ed0d8a43f696148eb5 apache-2.2.4-r6.ebuild 14880
-EBUILD apache-2.2.4-r7.ebuild 15230 RMD160 f55d70cb2dc318a19908d4780d10bd5bba167c7e SHA1 01630ff4aa70b7de1147d6f29c8e044a674e9e0a SHA256 9717d7bd1a6c68ba7f0bea5dfe8336094d514c8becd25cae5524a09fa624ac98
-MD5 067f363f9db9ff7d3005aa3d7ac96a46 apache-2.2.4-r7.ebuild 15230
-RMD160 f55d70cb2dc318a19908d4780d10bd5bba167c7e apache-2.2.4-r7.ebuild 15230
-SHA256 9717d7bd1a6c68ba7f0bea5dfe8336094d514c8becd25cae5524a09fa624ac98 apache-2.2.4-r7.ebuild 15230
-EBUILD apache-2.2.4-r8.ebuild 15341 RMD160 9f25cba7d1633e2f0cd1e93b213da6198d4ef9d5 SHA1 ff6fede16b6ea1e4b4811a2cc0df9d931410735f SHA256 3d7e0dbed6e260ca2a0785b9cb955756374d36ea9fb62bbe8c833f344b477e45
-MD5 881a196037159638d524e95d88e9eb07 apache-2.2.4-r8.ebuild 15341
-RMD160 9f25cba7d1633e2f0cd1e93b213da6198d4ef9d5 apache-2.2.4-r8.ebuild 15341
-SHA256 3d7e0dbed6e260ca2a0785b9cb955756374d36ea9fb62bbe8c833f344b477e45 apache-2.2.4-r8.ebuild 15341
-EBUILD apache-2.2.4-r9.ebuild 15505 RMD160 2d99835f99f94b0257645c720557491cdc7c4a77 SHA1 2a2e340d697e972ff692f82c3f987f896e3ddb8e SHA256 c631de98145e398dc9ea05606684e0bf8a0a46bc41174529a4cb8335db05f6f9
-MD5 17fa4a47e0edf8750f320fc3051049f5 apache-2.2.4-r9.ebuild 15505
-RMD160 2d99835f99f94b0257645c720557491cdc7c4a77 apache-2.2.4-r9.ebuild 15505
-SHA256 c631de98145e398dc9ea05606684e0bf8a0a46bc41174529a4cb8335db05f6f9 apache-2.2.4-r9.ebuild 15505
-MISC ChangeLog 93162 RMD160 9c0042a95b79daaa213c695ace9b8db202930b19 SHA1 8ce1d9d92d74206f771113ce032e52c20b82318b SHA256 ada6ece98661d6fba1404edf615bf11f8ecb055754845ced55c5ebfb1678b637
-MD5 28825bb017c14bbeb02376a9666b9b25 ChangeLog 93162
-RMD160 9c0042a95b79daaa213c695ace9b8db202930b19 ChangeLog 93162
-SHA256 ada6ece98661d6fba1404edf615bf11f8ecb055754845ced55c5ebfb1678b637 ChangeLog 93162
+EBUILD apache-2.0.58-r2.ebuild 13835 RMD160 40838966629f37d8c99c69b22941d73e96eb9420 SHA1 22ca21edd40ed71e9239245b20df16a29a8d1c9d SHA256 cf72659135b85e99d11faf4bb214774148414e8d3d551897f20702f34ad5a08e
+MD5 0a16880dd55536221ebe9c19a5405e4a apache-2.0.58-r2.ebuild 13835
+RMD160 40838966629f37d8c99c69b22941d73e96eb9420 apache-2.0.58-r2.ebuild 13835
+SHA256 cf72659135b85e99d11faf4bb214774148414e8d3d551897f20702f34ad5a08e apache-2.0.58-r2.ebuild 13835
+EBUILD apache-2.0.59-r2.ebuild 14085 RMD160 c20ad7a1085f64a65693adac47de4c0e5f6503b9 SHA1 b3d991380ef154c5df1b9ac288ad9e136874a22a SHA256 25f4b2cd778b8163b90249c1325e15c4866c2fe6e95587dc5acab3041f54104f
+MD5 06d0aae4a38e274426de2b53c97ae7d9 apache-2.0.59-r2.ebuild 14085
+RMD160 c20ad7a1085f64a65693adac47de4c0e5f6503b9 apache-2.0.59-r2.ebuild 14085
+SHA256 25f4b2cd778b8163b90249c1325e15c4866c2fe6e95587dc5acab3041f54104f apache-2.0.59-r2.ebuild 14085
+EBUILD apache-2.2.4-r10.ebuild 15375 RMD160 8d1894469e09211fd475ff4f8c87a1885bc277b4 SHA1 3d4f5018a47b27fca9bd1200c6141d7064ae57db SHA256 0f48ab75d214682fe56aba92933a394cb99b496791329c32e4f357e469af6ef1
+MD5 a80371068b8ded506bbc6c0cb5e92619 apache-2.2.4-r10.ebuild 15375
+RMD160 8d1894469e09211fd475ff4f8c87a1885bc277b4 apache-2.2.4-r10.ebuild 15375
+SHA256 0f48ab75d214682fe56aba92933a394cb99b496791329c32e4f357e469af6ef1 apache-2.2.4-r10.ebuild 15375
+EBUILD apache-2.2.4-r6.ebuild 14901 RMD160 b5d768cdbfc8d5b5ae2daab8222df493e3f9f0bb SHA1 55fddeeac0b664502e3411c53099aa32478bf95f SHA256 ab8d0b3febc1484476faff1ce3d006969c1d444bf54e125cb1bb342a98521ee6
+MD5 27bbd90506f922761b6860e3b5160a6f apache-2.2.4-r6.ebuild 14901
+RMD160 b5d768cdbfc8d5b5ae2daab8222df493e3f9f0bb apache-2.2.4-r6.ebuild 14901
+SHA256 ab8d0b3febc1484476faff1ce3d006969c1d444bf54e125cb1bb342a98521ee6 apache-2.2.4-r6.ebuild 14901
+EBUILD apache-2.2.4-r7.ebuild 15254 RMD160 20048607713e5fc52c5b789c3cc1fc278d005ed3 SHA1 570f1b2a73f8cbc22ebcd8313032de9d76036fab SHA256 8764ce2a5cb6b5971fbb7e74f7bf1a247aa8b36fd38c2ccfc1d3fe2e5877473f
+MD5 84d87d672e203446a93ae04b362bef9e apache-2.2.4-r7.ebuild 15254
+RMD160 20048607713e5fc52c5b789c3cc1fc278d005ed3 apache-2.2.4-r7.ebuild 15254
+SHA256 8764ce2a5cb6b5971fbb7e74f7bf1a247aa8b36fd38c2ccfc1d3fe2e5877473f apache-2.2.4-r7.ebuild 15254
+EBUILD apache-2.2.4-r8.ebuild 15365 RMD160 890ee27c5b239a6dfec7308e6f99e90d14d4ba68 SHA1 8dfb9bdc8cf703913105ad549c53e3efd1d86f57 SHA256 3a21686e1f898361734fdc7413960ae151910da10cf821dab00ef2e302a2bfb2
+MD5 44d725afff287305945259997469e02c apache-2.2.4-r8.ebuild 15365
+RMD160 890ee27c5b239a6dfec7308e6f99e90d14d4ba68 apache-2.2.4-r8.ebuild 15365
+SHA256 3a21686e1f898361734fdc7413960ae151910da10cf821dab00ef2e302a2bfb2 apache-2.2.4-r8.ebuild 15365
+EBUILD apache-2.2.4-r9.ebuild 15529 RMD160 3b7212c8b3429e3a17c8587280d19b2bf85be452 SHA1 d3f0fb31b5ccf936b22c7b72f6de7aad94b2668e SHA256 caccde71f3b1b35bdaa92cbf20575e76c3034230b9425e9b9f8e9777895d5eaf
+MD5 f55ecf4559d311f0b4c13b836ba014bc apache-2.2.4-r9.ebuild 15529
+RMD160 3b7212c8b3429e3a17c8587280d19b2bf85be452 apache-2.2.4-r9.ebuild 15529
+SHA256 caccde71f3b1b35bdaa92cbf20575e76c3034230b9425e9b9f8e9777895d5eaf apache-2.2.4-r9.ebuild 15529
+MISC ChangeLog 93481 RMD160 6cbde0a81f311f5ae000685c64f2a6bf978e2c4a SHA1 a264cb24124ef7bb42096feadda928b053e7aee8 SHA256 536739287ba0304267a83c4b7e9f0ae9f05361a4484099810fc3066e408b0c54
+MD5 bd23d2c4a9b13de192e5b51888af46fd ChangeLog 93481
+RMD160 6cbde0a81f311f5ae000685c64f2a6bf978e2c4a ChangeLog 93481
+SHA256 536739287ba0304267a83c4b7e9f0ae9f05361a4484099810fc3066e408b0c54 ChangeLog 93481
 MISC metadata.xml 551 RMD160 1b31261c043e57cabc9bd8582f9b34c09d92d108 SHA1 68bb286a67452c3dae7525195c60b8637cca9b81 SHA256 646729a42ddffcbde3426dd6aa9a77fab923bc348c5b34c9d24083d86fbb15eb
 MD5 0f28752ee3545b3fd8e28ee656e62f4b metadata.xml 551
 RMD160 1b31261c043e57cabc9bd8582f9b34c09d92d108 metadata.xml 551
@@ -70,7 +70,7 @@ SHA256 4837f60e7b96c75190dcc06fc9643c944a8a59827e777f8c2711924f3f089882 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGlgTSyuNVb5qfaOYRAudqAKCJtUIgQBG4UOIA2Zs37Q8ms7jF2wCgqJ67
-yVIO8FCDXUi2a7J1XJj90NI=
-=LItM
+iD8DBQFGrMtqyuNVb5qfaOYRApDNAJ9FvaxssyDaffkJjjJ+arGz6a9YYwCg0DZp
+ut6cTSlIIdJHfmIG8WsF3Kk=
+=hJAs
 -----END PGP SIGNATURE-----
diff --git a/net-www/apache/apache-2.0.58-r2.ebuild b/net-www/apache/apache-2.0.58-r2.ebuild
index e9713db0ead1..fcb436d911fb 100644
--- a/net-www/apache/apache-2.0.58-r2.ebuild
+++ b/net-www/apache/apache-2.0.58-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.58-r2.ebuild,v 1.9 2007/06/26 02:38:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.58-r2.ebuild,v 1.10 2007/07/29 17:16:12 phreak Exp $
 
 inherit eutils flag-o-matic gnuconfig multilib
 
@@ -344,7 +344,7 @@ pkg_postinst() {
 	fi
 
 	# Check for dual/upgrade install
-	if has_version '=net-www/apache-1*' || ! use apache2 ; then
+	if has_version '=www-servers/apache-1*' || ! use apache2 ; then
 		ewarn
 		ewarn "Please add the 'apache2' flag to your USE variable and (re)install"
 		ewarn "any additional DSO modules you may wish to use with Apache-2.x."
@@ -360,7 +360,7 @@ pkg_postinst() {
 	done
 	[ -n "${list}" ] && einfo "You should delete these old symlinks: ${list}"
 
-	if has_version '<net-www/apache-2.0.54-r30' && has_version '>=net-www/apache-2.0.0' ; then
+	if has_version '<www-servers/apache-2.0.54-r30' && has_version '>=net-www/apache-2.0.0' ; then
 		einfo "Configuration locations have changed, you will need to migrate"
 		einfo "your configuration from /etc/apache2/conf/apache2.conf and"
 		einfo "/etc/apache2/conf/commonapache2.conf to /etc/apache2/httpd.conf."
diff --git a/net-www/apache/apache-2.0.59-r2.ebuild b/net-www/apache/apache-2.0.59-r2.ebuild
index 64645da61ff3..8e98db26cf88 100644
--- a/net-www/apache/apache-2.0.59-r2.ebuild
+++ b/net-www/apache/apache-2.0.59-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.59-r2.ebuild,v 1.5 2007/06/26 02:38:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.59-r2.ebuild,v 1.6 2007/07/29 17:16:12 phreak Exp $
 
 inherit eutils flag-o-matic gnuconfig multilib
 
@@ -351,7 +351,7 @@ pkg_postinst() {
 	fi
 
 	# Check for dual/upgrade install
-	if has_version '=net-www/apache-1*' || ! use apache2 ; then
+	if has_version '=www-servers/apache-1*' || ! use apache2 ; then
 		ewarn
 		ewarn "Please add the 'apache2' flag to your USE variable and (re)install"
 		ewarn "any additional DSO modules you may wish to use with Apache-2.x."
@@ -367,7 +367,7 @@ pkg_postinst() {
 	done
 	[ -n "${list}" ] && einfo "You should delete these old symlinks: ${list}"
 
-	if has_version '<net-www/apache-2.0.54-r30' && has_version '>=net-www/apache-2.0.0' ; then
+	if has_version '<www-servers/apache-2.0.54-r30' && has_version '>=net-www/apache-2.0.0' ; then
 		einfo "Configuration locations have changed, you will need to migrate"
 		einfo "your configuration from /etc/apache2/conf/apache2.conf and"
 		einfo "/etc/apache2/conf/commonapache2.conf to /etc/apache2/httpd.conf."
diff --git a/net-www/apache/apache-2.2.4-r10.ebuild b/net-www/apache/apache-2.2.4-r10.ebuild
index d35a63a6e3a9..e60299f1eace 100644
--- a/net-www/apache/apache-2.2.4-r10.ebuild
+++ b/net-www/apache/apache-2.2.4-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.2.4-r10.ebuild,v 1.1 2007/07/12 10:39:07 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.2.4-r10.ebuild,v 1.2 2007/07/29 17:16:12 phreak Exp $
 
 inherit eutils flag-o-matic gnuconfig multilib autotools
 
@@ -31,7 +31,7 @@ DEPEND="dev-lang/perl
 	ldap? ( =net-nds/openldap-2* )
 	selinux? ( sec-policy/selinux-apache )
 	ssl? ( dev-libs/openssl )
-	!=net-www/apache-1*
+	!=www-servers/apache-1*
 	!=app-admin/apache-tools-2.2.4-r2"
 
 RDEPEND="${DEPEND}
@@ -345,7 +345,7 @@ pkg_postinst() {
 
 	# Previous installations of apache-2.2 installed the upstream configuration
 	# files, which shouldn't even have been installed!
-	if has_version '>=net-www/apache-2.2.4' ; then
+	if has_version '>=www-servers/apache-2.2.4' ; then
 		[ -f "${ROOT}"/etc/apache2/apache2.conf ] && \
 			rm -f "${ROOT}"/etc/apache2/apache2.conf >/dev/null 2>&1
 
@@ -356,7 +356,7 @@ pkg_postinst() {
 	fi
 
 	# Note the changes regarding DEFAULT_VHOST and SSL_DEFAULT_VHOST
-	if has_version '<net-www/apache-2.2.4-r7' ; then
+	if has_version '<www-servers/apache-2.2.4-r7' ; then
 		elog
 		elog "Listen directives have been moved into the default virtual host"
 		elog "configuation. At least DEFAULT_VHOST has been enabled for you"
@@ -368,7 +368,7 @@ pkg_postinst() {
 	fi
 
 	# Note the user of the config changes
-	if has_version '<net-www/apache-2.2.4-r5' ; then
+	if has_version '<www-servers/apache-2.2.4-r5' ; then
 		elog
 		elog "Please make sure that you update your /etc directory."
 		elog "Between the versions, we had to changes some config files"
@@ -381,7 +381,7 @@ pkg_postinst() {
 	fi
 
 	# Check for dual/upgrade install
-	if has_version '<net-www/apache-2.2.0' ; then
+	if has_version '<www-servers/apache-2.2.0' ; then
 		elog
 		elog "When upgrading from versions below 2.2.0 to this version, you"
 		elog "need to rebuild all your modules. Please do so for your modules"
diff --git a/net-www/apache/apache-2.2.4-r6.ebuild b/net-www/apache/apache-2.2.4-r6.ebuild
index 234e5c26c2e7..0dc49db87da5 100644
--- a/net-www/apache/apache-2.2.4-r6.ebuild
+++ b/net-www/apache/apache-2.2.4-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.2.4-r6.ebuild,v 1.1 2007/06/05 23:34:59 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.2.4-r6.ebuild,v 1.2 2007/07/29 17:16:12 phreak Exp $
 
 inherit eutils flag-o-matic gnuconfig multilib autotools
 
@@ -31,7 +31,7 @@ DEPEND="dev-lang/perl
 	ldap? ( =net-nds/openldap-2* )
 	selinux? ( sec-policy/selinux-apache )
 	ssl? ( dev-libs/openssl )
-	!=net-www/apache-1*
+	!=www-servers/apache-1*
 	!=app-admin/apache-tools-2.2.4-r2"
 
 RDEPEND="${DEPEND}
@@ -344,7 +344,7 @@ pkg_postinst() {
 
 	# Previous installations of apache-2.2 installed the upstream configuration
 	# files, which shouldn't even have been installed!
-	if has_version '>=net-www/apache-2.2.4' ; then
+	if has_version '>=www-servers/apache-2.2.4' ; then
 		[ -f "${ROOT}"/etc/apache2/apache2.conf ] && \
 			rm -f "${ROOT}"/etc/apache2/apache2.conf >/dev/null 2>&1
 
@@ -355,7 +355,7 @@ pkg_postinst() {
 	fi
 
 	# Note the user of the config changes
-	if has_version '<net-www/apache-2.2.4-r5' ; then
+	if has_version '<www-servers/apache-2.2.4-r5' ; then
 		elog
 		elog "Please make sure that you update your /etc directory."
 		elog "Between the versions, we had to changes some config files"
@@ -368,7 +368,7 @@ pkg_postinst() {
 	fi
 
 	# Check for dual/upgrade install
-	if has_version '<net-www/apache-2.2.0' ; then
+	if has_version '<www-servers/apache-2.2.0' ; then
 		elog
 		elog "When upgrading from versions below 2.2.0 to this version, you"
 		elog "need to rebuild all your modules. Please do so for your modules"
@@ -392,7 +392,7 @@ pkg_postinst() {
 		elog "To keep from accidentally downgrading to Apache 2.0, you should"
 		elog "add the following to ${ROOT}/etc/portage/package.mask:"
 		elog
-		elog "    <net-www/apache-2.2.0"
+		elog "    <www-servers/apache-2.2.0"
 		elog
 	fi
 }
diff --git a/net-www/apache/apache-2.2.4-r7.ebuild b/net-www/apache/apache-2.2.4-r7.ebuild
index 9dabb31944cc..459910501385 100644
--- a/net-www/apache/apache-2.2.4-r7.ebuild
+++ b/net-www/apache/apache-2.2.4-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.2.4-r7.ebuild,v 1.1 2007/06/15 19:05:48 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.2.4-r7.ebuild,v 1.2 2007/07/29 17:16:12 phreak Exp $
 
 inherit eutils flag-o-matic gnuconfig multilib autotools
 
@@ -31,7 +31,7 @@ DEPEND="dev-lang/perl
 	ldap? ( =net-nds/openldap-2* )
 	selinux? ( sec-policy/selinux-apache )
 	ssl? ( dev-libs/openssl )
-	!=net-www/apache-1*
+	!=www-servers/apache-1*
 	!=app-admin/apache-tools-2.2.4-r2"
 
 RDEPEND="${DEPEND}
@@ -344,7 +344,7 @@ pkg_postinst() {
 
 	# Previous installations of apache-2.2 installed the upstream configuration
 	# files, which shouldn't even have been installed!
-	if has_version '>=net-www/apache-2.2.4' ; then
+	if has_version '>=www-servers/apache-2.2.4' ; then
 		[ -f "${ROOT}"/etc/apache2/apache2.conf ] && \
 			rm -f "${ROOT}"/etc/apache2/apache2.conf >/dev/null 2>&1
 
@@ -355,7 +355,7 @@ pkg_postinst() {
 	fi
 
 	# Note for new location of Listen
-	if has_version '<net-www/apache-2.2.4-r7' ; then
+	if has_version '<www-servers/apache-2.2.4-r7' ; then
 		elog
 		elog "Listen directives have been moved into the default virtual host"
 		elog "configuation. Therefore you have to enabled at least one of"
@@ -365,7 +365,7 @@ pkg_postinst() {
 	fi
 
 	# Note the user of the config changes
-	if has_version '<net-www/apache-2.2.4-r5' ; then
+	if has_version '<www-servers/apache-2.2.4-r5' ; then
 		elog
 		elog "Please make sure that you update your /etc directory."
 		elog "Between the versions, we had to changes some config files"
@@ -378,7 +378,7 @@ pkg_postinst() {
 	fi
 
 	# Check for dual/upgrade install
-	if has_version '<net-www/apache-2.2.0' ; then
+	if has_version '<www-servers/apache-2.2.0' ; then
 		elog
 		elog "When upgrading from versions below 2.2.0 to this version, you"
 		elog "need to rebuild all your modules. Please do so for your modules"
@@ -402,7 +402,7 @@ pkg_postinst() {
 		elog "To keep from accidentally downgrading to Apache 2.0, you should"
 		elog "add the following to ${ROOT}/etc/portage/package.mask:"
 		elog
-		elog "    <net-www/apache-2.2.0"
+		elog "    <www-servers/apache-2.2.0"
 		elog
 	fi
 }
diff --git a/net-www/apache/apache-2.2.4-r8.ebuild b/net-www/apache/apache-2.2.4-r8.ebuild
index 446726bc7420..b925e2ccc3ab 100644
--- a/net-www/apache/apache-2.2.4-r8.ebuild
+++ b/net-www/apache/apache-2.2.4-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.2.4-r8.ebuild,v 1.1 2007/07/08 20:31:18 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.2.4-r8.ebuild,v 1.2 2007/07/29 17:16:12 phreak Exp $
 
 inherit eutils flag-o-matic gnuconfig multilib autotools
 
@@ -31,7 +31,7 @@ DEPEND="dev-lang/perl
 	ldap? ( =net-nds/openldap-2* )
 	selinux? ( sec-policy/selinux-apache )
 	ssl? ( dev-libs/openssl )
-	!=net-www/apache-1*
+	!=www-servers/apache-1*
 	!=app-admin/apache-tools-2.2.4-r2"
 
 RDEPEND="${DEPEND}
@@ -345,7 +345,7 @@ pkg_postinst() {
 
 	# Previous installations of apache-2.2 installed the upstream configuration
 	# files, which shouldn't even have been installed!
-	if has_version '>=net-www/apache-2.2.4' ; then
+	if has_version '>=www-servers/apache-2.2.4' ; then
 		[ -f "${ROOT}"/etc/apache2/apache2.conf ] && \
 			rm -f "${ROOT}"/etc/apache2/apache2.conf >/dev/null 2>&1
 
@@ -356,7 +356,7 @@ pkg_postinst() {
 	fi
 
 	# Note for new location of Listen
-	if has_version '<net-www/apache-2.2.4-r7' ; then
+	if has_version '<www-servers/apache-2.2.4-r7' ; then
 		elog
 		elog "Listen directives have been moved into the default virtual host"
 		elog "configuation. Therefore you have to enabled at least one of"
@@ -366,7 +366,7 @@ pkg_postinst() {
 	fi
 
 	# Note the user of the config changes
-	if has_version '<net-www/apache-2.2.4-r5' ; then
+	if has_version '<www-servers/apache-2.2.4-r5' ; then
 		elog
 		elog "Please make sure that you update your /etc directory."
 		elog "Between the versions, we had to changes some config files"
@@ -379,7 +379,7 @@ pkg_postinst() {
 	fi
 
 	# Check for dual/upgrade install
-	if has_version '<net-www/apache-2.2.0' ; then
+	if has_version '<www-servers/apache-2.2.0' ; then
 		elog
 		elog "When upgrading from versions below 2.2.0 to this version, you"
 		elog "need to rebuild all your modules. Please do so for your modules"
@@ -403,7 +403,7 @@ pkg_postinst() {
 		elog "To keep from accidentally downgrading to Apache 2.0, you should"
 		elog "add the following to ${ROOT}/etc/portage/package.mask:"
 		elog
-		elog "    <net-www/apache-2.2.0"
+		elog "    <www-servers/apache-2.2.0"
 		elog
 	fi
 }
diff --git a/net-www/apache/apache-2.2.4-r9.ebuild b/net-www/apache/apache-2.2.4-r9.ebuild
index 1c2f20e95d1f..a259ecae782f 100644
--- a/net-www/apache/apache-2.2.4-r9.ebuild
+++ b/net-www/apache/apache-2.2.4-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.2.4-r9.ebuild,v 1.1 2007/07/10 18:54:27 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.2.4-r9.ebuild,v 1.2 2007/07/29 17:16:12 phreak Exp $
 
 inherit eutils flag-o-matic gnuconfig multilib autotools
 
@@ -31,7 +31,7 @@ DEPEND="dev-lang/perl
 	ldap? ( =net-nds/openldap-2* )
 	selinux? ( sec-policy/selinux-apache )
 	ssl? ( dev-libs/openssl )
-	!=net-www/apache-1*
+	!=www-servers/apache-1*
 	!=app-admin/apache-tools-2.2.4-r2"
 
 RDEPEND="${DEPEND}
@@ -345,7 +345,7 @@ pkg_postinst() {
 
 	# Previous installations of apache-2.2 installed the upstream configuration
 	# files, which shouldn't even have been installed!
-	if has_version '>=net-www/apache-2.2.4' ; then
+	if has_version '>=www-servers/apache-2.2.4' ; then
 		[ -f "${ROOT}"/etc/apache2/apache2.conf ] && \
 			rm -f "${ROOT}"/etc/apache2/apache2.conf >/dev/null 2>&1
 
@@ -356,7 +356,7 @@ pkg_postinst() {
 	fi
 
 	# Note for new location of Listen
-	if has_version '<net-www/apache-2.2.4-r7' ; then
+	if has_version '<www-servers/apache-2.2.4-r7' ; then
 		elog
 		elog "Listen directives have been moved into the default virtual host"
 		elog "configuation. Therefore you have to enabled at least one of"
@@ -366,7 +366,7 @@ pkg_postinst() {
 	fi
 
 	# Note the user of the config changes
-	if has_version '<net-www/apache-2.2.4-r5' ; then
+	if has_version '<www-servers/apache-2.2.4-r5' ; then
 		elog
 		elog "Please make sure that you update your /etc directory."
 		elog "Between the versions, we had to changes some config files"
@@ -379,7 +379,7 @@ pkg_postinst() {
 	fi
 
 	# Check for dual/upgrade install
-	if has_version '<net-www/apache-2.2.0' ; then
+	if has_version '<www-servers/apache-2.2.0' ; then
 		elog
 		elog "When upgrading from versions below 2.2.0 to this version, you"
 		elog "need to rebuild all your modules. Please do so for your modules"
@@ -403,7 +403,7 @@ pkg_postinst() {
 		elog "To keep from accidentally downgrading to Apache 2.0, you should"
 		elog "add the following to ${ROOT}/etc/portage/package.mask:"
 		elog
-		elog "    <net-www/apache-2.2.0"
+		elog "    <www-servers/apache-2.2.0"
 		elog
 	fi