Cleanup for #29843

6 files changed, 41 insertions, 12 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index b7ac57cc23d1..ed068b47fcd5 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/apache
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.68 2003/09/27 04:47:17 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.69 2003/09/29 13:31:40 woodchip Exp $
+
+  29 Sep 2003; Donny Davies <woodchip@gentoo.org> apache-1.3.27-r4.ebuild,
+  apache-1.3.28.ebuild, apache-2.0.46.ebuild, apache-2.0.47.ebuild:
+  Cleanup for #29843.
 
 *apache-1.3.28-r1 (27 Sep 2003)
 
@@ -11,7 +15,7 @@
   files/conf/commonapache.conf:
   Move --datadir to /var/www/localhost; prepare for the upcoming vhost-config
   and webapp-config tools.  Added patches to fix #26632 and #29124.  Hopefully
-  fix #28552 and #28619 also.  Fix #29606.  Fix #29329.  Whew!
+  fix #28552 and #28619.  Fix #29606 and #29329.
 
 *apache-2.0.47-r1 (24 Sep 2003)
 
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index cbe3f50c1765..653fc26b68c2 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,11 +1,11 @@
 MD5 246f3d374581e892615e2e5c8cb59e2a apache-1.3.27-r3.ebuild 7884
-MD5 016d59b4fcdb7ff06c19cd0b496011b5 apache-2.0.47.ebuild 11107
-MD5 d8d2f98a07eff7a25b7e6aa2196b43fd ChangeLog 13985
+MD5 92e6b6685c2875cdab6ada6a7324d92b apache-2.0.47.ebuild 11437
+MD5 4373ab7124653745703dd638ca91c1af ChangeLog 14137
 MD5 61f4bc626b916e84ea7a1adee665ba4c apache-1.3.28-r1.ebuild 7902
 MD5 235d2261cabdf2fbf72bee4b0ddd519f apache-2.0.47-r1.ebuild 10711
-MD5 d059ab302d0e6b1b96070adc4458ae08 apache-1.3.27-r4.ebuild 8653
-MD5 13eef3200abf41ea1ae8bb18ab40e481 apache-2.0.46.ebuild 10682
-MD5 a9d070561f89df4b231e17ce84564e92 apache-1.3.28.ebuild 8873
+MD5 d4bfc120696457a6084e949b99d045ac apache-1.3.27-r4.ebuild 8913
+MD5 2785b7e11adc2c240c5fca3d2d4cfb67 apache-2.0.46.ebuild 11012
+MD5 764725db4e1d6234bed64f4be5c4acd3 apache-1.3.28.ebuild 9135
 MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
 MD5 399e3c15e2afa45a732faed0df6b1a30 files/apache-1.3.28-zombie-cgi.patch 940
 MD5 86dc760b13645d25565a874a6d3b890e files/apache-2.0.47-gentoo.diff 3609
diff --git a/net-www/apache/apache-1.3.27-r4.ebuild b/net-www/apache/apache-1.3.27-r4.ebuild
index 4c6c06b9b695..196380b7985e 100644
--- a/net-www/apache/apache-1.3.27-r4.ebuild
+++ b/net-www/apache/apache-1.3.27-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.27-r4.ebuild,v 1.11 2003/09/06 01:54:08 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.27-r4.ebuild,v 1.12 2003/09/29 13:31:40 woodchip Exp $
 
 IUSE="ipv6 pam"
 
@@ -190,6 +190,12 @@ src_install() {
 	doins ${FILESDIR}/conf/commonapache.conf
 	doins ${FILESDIR}/conf/apache.conf
 
+	#this ebuild doesnt use /var/www/localhost but the config templates
+	#in CVS now do, so just roll those changes back here; #29843
+	perl -pi -e 's|var/www/localhost|home/httpd|;' \
+		${D}/etc/apache/conf/apache.conf \
+		${D}/etc/apache/conf/commonapache.conf
+
 	# Added by Jason Wever <weeve@gentoo.org>
 	# A little sedfu to fix bug #7172 for sparc64s
 	if [ ${ARCH} = "sparc" ]
diff --git a/net-www/apache/apache-1.3.28.ebuild b/net-www/apache/apache-1.3.28.ebuild
index 67482036e56e..adc0176353d8 100644
--- a/net-www/apache/apache-1.3.28.ebuild
+++ b/net-www/apache/apache-1.3.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.28.ebuild,v 1.5 2003/09/06 01:54:08 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.28.ebuild,v 1.6 2003/09/29 13:31:40 woodchip Exp $
 
 #IUSE="ipv6 pam"
 IUSE="pam"
@@ -197,6 +197,12 @@ src_install() {
 	doins ${FILESDIR}/conf/commonapache.conf
 	doins ${FILESDIR}/conf/apache.conf
 
+	#this ebuild doesnt use /var/www/localhost but the config templates
+	#in CVS now do, so just roll those changes back here; #29843
+	perl -pi -e 's|var/www/localhost|home/httpd|;' \
+		${D}/etc/apache/conf/apache.conf \   
+		${D}/etc/apache/conf/commonapache.conf
+
 	# Added by Jason Wever <weeve@gentoo.org>
 	# A little sedfu to fix bug #7172 for sparc64s
 	if [ ${ARCH} = "sparc" ]
@@ -205,7 +211,6 @@ src_install() {
 		${D}/etc/apache/conf/apache.conf
 	fi
 
-
 	insinto /etc/apache/conf/vhosts
 	doins ${FILESDIR}/conf/VirtualHomePages.conf
 	doins ${FILESDIR}/conf/DynamicVhosts.conf
diff --git a/net-www/apache/apache-2.0.46.ebuild b/net-www/apache/apache-2.0.46.ebuild
index bec5f597f9fb..41ce0414dae0 100644
--- a/net-www/apache/apache-2.0.46.ebuild
+++ b/net-www/apache/apache-2.0.46.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.46.ebuild,v 1.6 2003/09/06 01:54:08 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.46.ebuild,v 1.7 2003/09/29 13:31:40 woodchip Exp $
 
 inherit eutils
 
@@ -281,6 +281,13 @@ src_install () {
 	doins ${FILESDIR}/2.0.40/dynamic-vhosts.conf
 	doins ${FILESDIR}/2.0.40/vhosts.conf
 
+	#this ebuild doesnt use /var/www/localhost but the config templates
+	#in CVS now do, so just roll those changes back here; #29843
+	perl -pi -e 's|var/www/localhost|home/httpd|;' \
+		${D}/etc/apache2/conf/apache2.conf \
+		${D}/etc/apache2/conf/commonapache2.conf \
+		${D}/etc/apache2/conf/modules.d/41_mod_ssl.default-vhost.conf
+
 	# Added by Jason Wever <weeve@gentoo.org>
 	# A little sedfu to fix bug #7172 for sparc64s
 	if [ ${ARCH} = "sparc" ]
diff --git a/net-www/apache/apache-2.0.47.ebuild b/net-www/apache/apache-2.0.47.ebuild
index fe86297dcd55..1be6044949e1 100644
--- a/net-www/apache/apache-2.0.47.ebuild
+++ b/net-www/apache/apache-2.0.47.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.47.ebuild,v 1.8 2003/09/06 01:54:08 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.47.ebuild,v 1.9 2003/09/29 13:31:40 woodchip Exp $
 
 inherit flag-o-matic
 has_version =sys-libs/glibc-2.2* && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
@@ -282,6 +282,13 @@ src_install () {
 	doins ${FILESDIR}/2.0.40/dynamic-vhosts.conf
 	doins ${FILESDIR}/2.0.40/vhosts.conf
 
+	#this ebuild doesnt use /var/www/localhost but the config templates
+	#in CVS now do, so just roll those changes back here; #29843
+	perl -pi -e 's|var/www/localhost|home/httpd|;' \
+		${D}/etc/apache2/conf/apache2.conf \
+		${D}/etc/apache2/conf/commonapache2.conf \
+		${D}/etc/apache2/conf/modules.d/41_mod_ssl.default-vhost.conf
+
 	# Added by Jason Wever <weeve@gentoo.org>
 	# A little sedfu to fix bug #7172 for sparc64s
 	if [ ${ARCH} = "sparc" ]