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

(Portage version: 2.1.3_rc9)

8 files changed, 46 insertions, 40 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/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