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

(Portage version: 2.1.3_rc9)

4 files changed, 15 insertions, 10 deletions

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index 69aa030a88d6..a4e659fd5ea8 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/subversion
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.271 2007/07/15 18:09:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.272 2007/07/29 16:56:48 phreak Exp $
+
+  29 Jul 2007; Christian Heim <phreak@gentoo.org> subversion-1.1.3.ebuild,
+  subversion-1.3.2-r4.ebuild, subversion-1.4.4-r3.ebuild:
+  Fixing the DEPEND/RDEPEND for the move of net-www/apache to
+  www-servers/apache (#78622).
 
 *subversion-1.4.4-r3 (15 Jul 2007)
 
diff --git a/dev-util/subversion/subversion-1.1.3.ebuild b/dev-util/subversion/subversion-1.1.3.ebuild
index 0e48c1a37550..dc6f5e54366e 100644
--- a/dev-util/subversion/subversion-1.1.3.ebuild
+++ b/dev-util/subversion/subversion-1.1.3.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/dev-util/subversion/subversion-1.1.3.ebuild,v 1.28 2007/07/12 01:05:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.1.3.ebuild,v 1.29 2007/07/29 16:56:48 phreak Exp $
 
 inherit elisp-common libtool python eutils bash-completion
 
@@ -14,8 +14,8 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="ssl apache2 berkdb python emacs perl java nls"
 
 # Presently subversion doesn't build with swig-1.3.22, bug 65424
-RDEPEND="apache2? ( >=net-www/apache-2.0.48 !>=net-www/apache-2.0.54-r30 )
-	!apache2? ( !>=net-www/apache-2 )
+RDEPEND="apache2? ( >=www-servers/apache-2.0.48 !>=net-www/apache-2.0.54-r30 )
+	!apache2? ( !>=www-servers/apache-2 )
 	!dev-libs/apr
 	python? ( =dev-lang/swig-1.3.21 >=dev-lang/python-2.0 )
 	perl? ( =dev-lang/swig-1.3.21
@@ -163,7 +163,7 @@ src_install () {
 
 	make DESTDIR=${D} install || die "Installation of subversion failed"
 	if [[ -e ${D}/usr/lib/apache2 ]]; then
-		if has_version '>=net-www/apache-2.0.48-r2'; then
+		if has_version '>=www-servers/apache-2.0.48-r2'; then
 			mv ${D}/usr/lib/apache2/modules ${D}/usr/lib/apache2-extramodules
 			rmdir ${D}/usr/lib/apache2
 		else
@@ -171,7 +171,7 @@ src_install () {
 		fi
 	fi
 
-	if has_version '>=net-www/apache-2.0.48-r2'; then
+	if has_version '>=www-servers/apache-2.0.48-r2'; then
 		chown -R root:root ${D}/usr/include/apr-0/
 	fi
 
diff --git a/dev-util/subversion/subversion-1.3.2-r4.ebuild b/dev-util/subversion/subversion-1.3.2-r4.ebuild
index f457f1643fe3..f1d6022f79be 100644
--- a/dev-util/subversion/subversion-1.3.2-r4.ebuild
+++ b/dev-util/subversion/subversion-1.3.2-r4.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/dev-util/subversion/subversion-1.3.2-r4.ebuild,v 1.10 2007/06/27 20:04:21 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.3.2-r4.ebuild,v 1.11 2007/07/29 16:56:48 phreak Exp $
 
 inherit elisp-common libtool python eutils multilib bash-completion flag-o-matic depend.apache perl-module java-pkg-opt-2
 
@@ -41,7 +41,7 @@ S=${WORKDIR}/${P/_rc/-rc}
 
 discover_apr_suffix() {
 	if use apache2 ; then
-		if has_version '=net-www/apache-2.0*' \
+		if has_version '=www-servers/apache-2.0*' \
 		&& has_version '=dev-libs/apr-util-0.9*' ; then
 			aprsuffix=""
 		else
diff --git a/dev-util/subversion/subversion-1.4.4-r3.ebuild b/dev-util/subversion/subversion-1.4.4-r3.ebuild
index b4568e8ec8d9..7e0a98b8d5d2 100644
--- a/dev-util/subversion/subversion-1.4.4-r3.ebuild
+++ b/dev-util/subversion/subversion-1.4.4-r3.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/dev-util/subversion/subversion-1.4.4-r3.ebuild,v 1.1 2007/07/15 18:09:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.4-r3.ebuild,v 1.2 2007/07/29 16:56:48 phreak Exp $
 
 inherit elisp-common libtool python eutils multilib bash-completion flag-o-matic depend.apache perl-module java-pkg-opt-2
 
@@ -40,7 +40,7 @@ S=${WORKDIR}/${P/_rc/-rc}
 
 discover_apr_suffix() {
 	if use apache2 ; then
-		if has_version '=net-www/apache-2.0*' \
+		if has_version '=www-servers/apache-2.0*' \
 		&& has_version '=dev-libs/apr-util-0.9*' ; then
 			aprsuffix=""
 		else