apache now DEPENDs on new net-www/gentoo-webroot-default

Package-Manager: portage-2.0.51-r14

4 files changed, 19 insertions, 20 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index beaa0d892889..db0a25b3b1ea 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-www/apache
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.314 2005/01/11 02:11:34 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.315 2005/01/22 05:25:15 trapni Exp $
+
+  22 Jan 2005; Christian Parpart <trapni@gentoo.org> :
+  apache now DEPENDs on new net-www/gentoo-webroot-default
 
   10 Jan 2005; Michael Stewart <vericgar@gentoo.org> apache-2.0.52-r3.ebuild:
   Updating keywords on 2.0.52-r3 to match -r2, not sure how I missed this before
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index acacc540b43a..edd6cd367406 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,4 +1,4 @@
-MD5 cc4f07eb2f45b11b662cfa254cfd1ddf ChangeLog 53544
+MD5 691cfd17ace3b7ce801e5d48145b9f07 ChangeLog 53657
 MD5 784b3e3150529826ac47e99ec3514f90 apache-1.3.29-r2.ebuild 7178
 MD5 f35b6a00cbfa7ddd39face3420cd4fc6 apache-1.3.31-r1.ebuild 6739
 MD5 9a5242011f95057c3afabf1cc3973f11 apache-1.3.31-r2.ebuild 6864
@@ -6,16 +6,16 @@ MD5 85c356965e12f6c785c887ddf6844714 apache-1.3.31-r3.ebuild 6872
 MD5 d039a8316ffde50c2331f0d446623147 apache-1.3.31.ebuild 6693
 MD5 eb0434ac86c30471d86c92872015e42d apache-1.3.32-r1.ebuild 6607
 MD5 cd6aff6c1515610209f5e62e56ea47f8 apache-1.3.32.ebuild 6616
+MD5 d7b8bbd17b6cf6693bf89168e9442828 apache-1.3.33-r1.ebuild 8249
 MD5 a6568a1f276ed27458ab61fb5897bca2 apache-1.3.33.ebuild 6851
 MD5 1807ed31028e004bd0dca8a4b112bd57 apache-2.0.50.ebuild 12901
 MD5 f6c69f64c4455bdfd42c177cce47509a apache-2.0.51-r1.ebuild 12836
 MD5 8784173d9199e4b7072f6415cbe20384 apache-2.0.51.ebuild 12827
 MD5 4cd8e7608218df213a3e4eb7bee15bfe apache-2.0.52-r1.ebuild 12889
+MD5 246a3cf82cbc55d427afebc98507ecac apache-2.0.52-r2.ebuild 12294
+MD5 309bd7ea26aa16ec9237a9990ddf6136 apache-2.0.52-r3.ebuild 11407
 MD5 90cc07a86abe58c1b0f4b6bfa7439706 apache-2.0.52.ebuild 12830
 MD5 a419841198cd6a94b9dcf2e07f3c15b7 metadata.xml 617
-MD5 246a3cf82cbc55d427afebc98507ecac apache-2.0.52-r2.ebuild 12294
-MD5 4fbcdf60705c8a78a43cbb1727271388 apache-1.3.33-r1.ebuild 8268
-MD5 3df3866b042abd7ddcf0d5c59b8cec3f apache-2.0.52-r3.ebuild 11469
 MD5 8b12871dd74fcd3f4fdf451c9d8c259e files/00_apache_manual.conf 781
 MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328
 MD5 37d2c4ea8e1a6725deaca42b6aa22c69 files/apache-1.3.27_db4_gentoo.patch 1006
@@ -40,20 +40,20 @@ MD5 8cc0834ac7a8afa694ddb3f9f9be2cc8 files/digest-apache-1.3.31-r3 139
 MD5 da8dfe2134d7e30dc95e77e0c5f472e1 files/digest-apache-1.3.32 212
 MD5 c560ade7dafffbfdd05ec6deb125280b files/digest-apache-1.3.32-r1 215
 MD5 189cfb35b6320ae3ab57a32dbadd18f2 files/digest-apache-1.3.33 212
+MD5 16075ee28b99f7bcf0a3403b4cf08aeb files/digest-apache-1.3.33-r1 277
 MD5 cb82ab66045d6f309af686c0206fc3c0 files/digest-apache-2.0.50 201
 MD5 69d40992fa9301ce3198a0115fa1f31c files/digest-apache-2.0.51 137
 MD5 0eb9067bb4f2c2495069deaa9d7fce1b files/digest-apache-2.0.51-r1 140
 MD5 baf37cd1bc61f76ac73edd301f52decb files/digest-apache-2.0.52 201
 MD5 44fc8ddc9a05a056d8a08e6d843c997c files/digest-apache-2.0.52-r1 204
+MD5 710e7291039a6cba132568e32daede8a files/digest-apache-2.0.52-r2 213
+MD5 51321d0fff3b47607cde3a4cd84a6db0 files/digest-apache-2.0.52-r3 141
 MD5 b9ff3534313dae1b8ac96df0e3e01373 files/httpd-2.0.48-ipv6.patch 865
 MD5 d52999376f67a872ee48cbae72db0160 files/httpd-2.0.49-cgi.patch 10319
 MD5 8cb4313e58d7bd5dc369eb92f75daa2b files/httpd-2.0.49-ipv6.patch 788
 MD5 59a6ba7dcde461f5350af41e6aff92b1 files/robots.txt 342
 MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59
 MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
-MD5 710e7291039a6cba132568e32daede8a files/digest-apache-2.0.52-r2 213
-MD5 16075ee28b99f7bcf0a3403b4cf08aeb files/digest-apache-1.3.33-r1 277
-MD5 51321d0fff3b47607cde3a4cd84a6db0 files/digest-apache-2.0.52-r3 141
 MD5 3d94c56af17136b6c408f076c32e0362 files/2.0.49/40_mod_ssl.conf 3213
 MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.49/41_mod_ssl.default-vhost.conf 8053
 MD5 819ee444395cf42ccc8009529a94af37 files/2.0.49/45_mod_dav.conf 583
diff --git a/net-www/apache/apache-1.3.33-r1.ebuild b/net-www/apache/apache-1.3.33-r1.ebuild
index 124fcbd692be..9aa647e53aa0 100644
--- a/net-www/apache/apache-1.3.33-r1.ebuild
+++ b/net-www/apache/apache-1.3.33-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.33-r1.ebuild,v 1.3 2005/01/09 14:32:25 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.33-r1.ebuild,v 1.4 2005/01/22 05:25:16 trapni Exp $
 
 inherit eutils fixheadtails
 
@@ -31,6 +31,7 @@ DEPEND="dev-lang/perl
 		>=sys-libs/gdbm-1.8
 		>=dev-libs/expat-1.95.2
 		>=sys-apps/sed-4
+		net-www/gentoo-webroot-default
 		app-misc/mime-types
 		selinux? ( sec-policy/selinux-apache )
 		lingerd? ( =net-www/lingerd-${lingerd_ver} )"
@@ -179,11 +180,9 @@ src_install() {
 	rm -f etc/apache/*.default
 	rm -f etc/apache/*.conf
 	rm -f etc/apache/mime.types
-	rm -rf var/www/localhost/htdocs/*
 
-	keepdir /var/www/localhost/htdocs
-	insinto /var/www/localhost/htdocs
-	doins ${GENTOO_PATCHDIR}/docs/index.html
+	# we DEPEND on net-www/gentoo-webroot-default for sharing this by now
+	rm -rf var/www/localhost
 
 	# config files
 	insinto /etc/conf.d
diff --git a/net-www/apache/apache-2.0.52-r3.ebuild b/net-www/apache/apache-2.0.52-r3.ebuild
index 4aa65509d97f..e309a634debd 100644
--- a/net-www/apache/apache-2.0.52-r3.ebuild
+++ b/net-www/apache/apache-2.0.52-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.52-r3.ebuild,v 1.2 2005/01/11 02:11:35 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.52-r3.ebuild,v 1.3 2005/01/22 05:25:16 trapni Exp $
 
 inherit eutils gnuconfig
 
@@ -21,6 +21,7 @@ IUSE="doc ldap mpm-leader mpm-metux mpm-peruser mpm-prefork mpm-threadpool mpm-w
 DEPEND="dev-lang/perl
 		=dev-libs/apr-0.9.5
 		=dev-libs/apr-util-0.9.5
+		net-www/gentoo-webroot-default
 		app-misc/mime-types
 		sys-libs/zlib
 		>=sys-apps/sed-4
@@ -228,13 +229,9 @@ src_install () {
 	dodoc etc/apache2/*-std.conf
 	rm -f etc/apache2/*.conf
 	rm -rf var/run var/log
-	rm -rf var/www/localhost/htdocs/*
-
-	keepdir /var/www/localhost/htdocs
-	insinto /var/www/localhost/htdocs
-	doins ${GENTOO_PATCHDIR}/docs/index.html
-	doins ${GENTOO_PATCHDIR}/docs/gentoo.jpg
 
+	# we DEPEND on net-www/gentoo-webroot-default for sharing this by now
+	rm -rf var/www/localhost
 
 	# config files
 	insinto /etc/conf.d