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

Package-Manager: portage-2.1.3_rc9

7 files changed, 19 insertions, 13 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 9b3b0abb8a71..3f9d223038b9 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/git
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.207 2007/07/27 01:29:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.208 2007/07/29 16:56:54 phreak Exp $
+
+  29 Jul 2007; Christian Heim <phreak@gentoo.org> git-1.5.0.7.ebuild,
+  git-1.5.1.6.ebuild, git-1.5.2.ebuild, git-1.5.2.1.ebuild,
+  git-1.5.2.2.ebuild, git-1.5.2.4.ebuild:
+  Fixing the DEPEND/RDEPEND for the move of net-www/apache to
+  www-servers/apache (#78622).
 
 *git-1.5.2.4 (27 Jul 2007)
 
diff --git a/dev-util/git/git-1.5.0.7.ebuild b/dev-util/git/git-1.5.0.7.ebuild
index bf71e37a6dcc..447291165a2c 100644
--- a/dev-util/git/git-1.5.0.7.ebuild
+++ b/dev-util/git/git-1.5.0.7.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/git/git-1.5.0.7.ebuild,v 1.12 2007/07/27 01:29:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.0.7.ebuild,v 1.13 2007/07/29 16:56:54 phreak Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
@@ -147,7 +147,7 @@ pkg_postinst() {
 	showpkgdeps git-svn "dev-util/subversion(USE=perl)" "dev-perl/libwww-perl"
 	showpkgdeps git-quiltimport "dev-util/quilt"
 	showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite"
-	showpkgdeps git-instaweb "|| ( www-servers/lighttpd net-www/apache(SLOT=2) )"
+	showpkgdeps git-instaweb "|| ( www-servers/lighttpd www-servers/apache(SLOT=2) )"
 	showpkgdeps git-send-email "USE=perl"
 	showpkgdeps git-remote "USE=perl"
 	echo
diff --git a/dev-util/git/git-1.5.1.6.ebuild b/dev-util/git/git-1.5.1.6.ebuild
index 23eb74880634..df1ed3d283cf 100644
--- a/dev-util/git/git-1.5.1.6.ebuild
+++ b/dev-util/git/git-1.5.1.6.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/git/git-1.5.1.6.ebuild,v 1.13 2007/07/27 01:29:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.1.6.ebuild,v 1.14 2007/07/29 16:56:54 phreak Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
@@ -147,7 +147,7 @@ pkg_postinst() {
 	showpkgdeps git-svn "dev-util/subversion(USE=perl)" "dev-perl/libwww-perl"
 	showpkgdeps git-quiltimport "dev-util/quilt"
 	showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite"
-	showpkgdeps git-instaweb "|| ( www-servers/lighttpd net-www/apache(SLOT=2) )"
+	showpkgdeps git-instaweb "|| ( www-servers/lighttpd www-servers/apache(SLOT=2) )"
 	showpkgdeps git-send-email "USE=perl"
 	showpkgdeps git-remote "USE=perl"
 	echo
diff --git a/dev-util/git/git-1.5.2.1.ebuild b/dev-util/git/git-1.5.2.1.ebuild
index 139c143cb208..2009b229af01 100644
--- a/dev-util/git/git-1.5.2.1.ebuild
+++ b/dev-util/git/git-1.5.2.1.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/git/git-1.5.2.1.ebuild,v 1.2 2007/07/27 01:29:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.2.1.ebuild,v 1.3 2007/07/29 16:56:54 phreak Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
@@ -150,7 +150,7 @@ pkg_postinst() {
 		"dev-perl/TermReadKey"
 	showpkgdeps git-quiltimport "dev-util/quilt"
 	showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite"
-	showpkgdeps git-instaweb "|| ( www-servers/lighttpd net-www/apache(SLOT=2) )"
+	showpkgdeps git-instaweb "|| ( www-servers/lighttpd www-servers/apache(SLOT=2) )"
 	showpkgdeps git-send-email "USE=perl"
 	showpkgdeps git-remote "USE=perl"
 	echo
diff --git a/dev-util/git/git-1.5.2.2.ebuild b/dev-util/git/git-1.5.2.2.ebuild
index 48517d2077e1..01ebb512d74c 100644
--- a/dev-util/git/git-1.5.2.2.ebuild
+++ b/dev-util/git/git-1.5.2.2.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/git/git-1.5.2.2.ebuild,v 1.2 2007/07/27 01:29:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.2.2.ebuild,v 1.3 2007/07/29 16:56:54 phreak Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
@@ -152,7 +152,7 @@ pkg_postinst() {
 		"dev-perl/TermReadKey"
 	showpkgdeps git-quiltimport "dev-util/quilt"
 	showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite"
-	showpkgdeps git-instaweb "|| ( www-servers/lighttpd net-www/apache(SLOT=2) )"
+	showpkgdeps git-instaweb "|| ( www-servers/lighttpd www-servers/apache(SLOT=2) )"
 	showpkgdeps git-send-email "USE=perl"
 	showpkgdeps git-remote "USE=perl"
 	echo
diff --git a/dev-util/git/git-1.5.2.4.ebuild b/dev-util/git/git-1.5.2.4.ebuild
index d2fa05dac1b9..5bf2b9fbfa89 100644
--- a/dev-util/git/git-1.5.2.4.ebuild
+++ b/dev-util/git/git-1.5.2.4.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/git/git-1.5.2.4.ebuild,v 1.1 2007/07/27 01:29:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.2.4.ebuild,v 1.2 2007/07/29 16:56:54 phreak Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
@@ -152,7 +152,7 @@ pkg_postinst() {
 		"dev-perl/TermReadKey"
 	showpkgdeps git-quiltimport "dev-util/quilt"
 	showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite"
-	showpkgdeps git-instaweb "|| ( www-servers/lighttpd net-www/apache(SLOT=2) )"
+	showpkgdeps git-instaweb "|| ( www-servers/lighttpd www-servers/apache(SLOT=2) )"
 	showpkgdeps git-send-email "USE=perl"
 	showpkgdeps git-remote "USE=perl"
 	echo
diff --git a/dev-util/git/git-1.5.2.ebuild b/dev-util/git/git-1.5.2.ebuild
index 29f5faa3f214..2e0f2be8e5a6 100644
--- a/dev-util/git/git-1.5.2.ebuild
+++ b/dev-util/git/git-1.5.2.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/git/git-1.5.2.ebuild,v 1.3 2007/07/27 01:29:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.2.ebuild,v 1.4 2007/07/29 16:56:54 phreak Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
@@ -151,7 +151,7 @@ pkg_postinst() {
 		"dev-perl/TermReadKey"
 	showpkgdeps git-quiltimport "dev-util/quilt"
 	showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite"
-	showpkgdeps git-instaweb "|| ( www-servers/lighttpd net-www/apache(SLOT=2) )"
+	showpkgdeps git-instaweb "|| ( www-servers/lighttpd www-servers/apache(SLOT=2) )"
 	showpkgdeps git-send-email "USE=perl"
 	showpkgdeps git-remote "USE=perl"
 	echo