stable, bug #70138

3 files changed, 17 insertions, 14 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index 0fe4c08cf79e..1da295045815 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-www/apache
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.302 2004/11/09 14:02:57 urilith Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.303 2004/11/09 17:32:06 blubb Exp $
+
+  09 Nov 2004; Simon Stelling <blubb@gentoo.org> apache-2.0.52-r1.ebuild:
+  stable on amd64. bug #70138
 
   09 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> apache-1.3.33.ebuild:
   Stable on sparc wrt Stuart ;)
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index cf04984997e3..407bf837ae64 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,18 +1,18 @@
-MD5 f9299901e320fa6a5687e23223260e99 ChangeLog 51949
+MD5 0a68cd94ff94b95686fc060ccc989267 ChangeLog 52052
 MD5 e4dc4b093f2d9b8edd137e09ecbb2adf apache-1.3.29-r2.ebuild 7177
-MD5 13462fb57bec7feb92212d34a75e66e3 apache-1.3.32-r1.ebuild 6608
-MD5 c4728dbf14f69ec79e3dc9d3636e3f0b apache-1.3.32.ebuild 6616
+MD5 1bcfd89028a8f1e39f99a370f39e5ff2 apache-1.3.31-r1.ebuild 6739
+MD5 c46f4b015504b2b22e0b8a7917ec84bf apache-1.3.31-r2.ebuild 6864
+MD5 f71001bc9b282e7eb336570621b54328 apache-1.3.31-r3.ebuild 6872
+MD5 08b63251db95f14ddbdc4b0368d48702 apache-1.3.31.ebuild 6693
 MD5 904e5b6782f1ddc241ce468dfd5cbd55 apache-2.0.50.ebuild 12902
 MD5 e04b2e008169968fe7b6c0775d5fab89 apache-2.0.51-r1.ebuild 12836
 MD5 c096bf4f3779f9138b631ae00aaa387d apache-2.0.51.ebuild 12827
 MD5 46e83b90a91a8997eefb54c4f3d3e0f3 apache-2.0.52.ebuild 12831
 MD5 5b6dd438f81019e56fa641841c0c13fe metadata.xml 501
-MD5 51fdac8cf7872d2b9bad6c2929e3dcfd apache-2.0.52-r1.ebuild 12905
+MD5 13462fb57bec7feb92212d34a75e66e3 apache-1.3.32-r1.ebuild 6608
+MD5 c4728dbf14f69ec79e3dc9d3636e3f0b apache-1.3.32.ebuild 6616
 MD5 16549f378f4d57cae1d8d2b6ec87bc94 apache-1.3.33.ebuild 6863
-MD5 1bcfd89028a8f1e39f99a370f39e5ff2 apache-1.3.31-r1.ebuild 6739
-MD5 c46f4b015504b2b22e0b8a7917ec84bf apache-1.3.31-r2.ebuild 6864
-MD5 f71001bc9b282e7eb336570621b54328 apache-1.3.31-r3.ebuild 6872
-MD5 08b63251db95f14ddbdc4b0368d48702 apache-1.3.31.ebuild 6693
+MD5 ef316c4278d476bd8937dd7f050cf111 apache-2.0.52-r1.ebuild 12902
 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
@@ -34,9 +34,6 @@ MD5 bb36b429c433a5cbf2712605a76ce8fb files/digest-apache-1.3.31 139
 MD5 7d4cec8690cb2c6406b84990d8365587 files/digest-apache-1.3.31-r1 139
 MD5 7d4cec8690cb2c6406b84990d8365587 files/digest-apache-1.3.31-r2 139
 MD5 e50d882b9cc4547c6951c1638f904c3d files/digest-apache-1.3.31-r3 215
-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 0551c76a9171a3af1d0ad6aa2ef4572c files/digest-apache-2.0.50 137
 MD5 69d40992fa9301ce3198a0115fa1f31c files/digest-apache-2.0.51 137
 MD5 0eb9067bb4f2c2495069deaa9d7fce1b files/digest-apache-2.0.51-r1 140
@@ -47,6 +44,9 @@ 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 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 44fc8ddc9a05a056d8a08e6d843c997c files/digest-apache-2.0.52-r1 204
 MD5 3d94c56af17136b6c408f076c32e0362 files/2.0.49/40_mod_ssl.conf 3213
 MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.49/41_mod_ssl.default-vhost.conf 8053
diff --git a/net-www/apache/apache-2.0.52-r1.ebuild b/net-www/apache/apache-2.0.52-r1.ebuild
index a01b69fea3b5..4f2881917912 100644
--- a/net-www/apache/apache-2.0.52-r1.ebuild
+++ b/net-www/apache/apache-2.0.52-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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-r1.ebuild,v 1.8 2004/11/09 14:02:57 urilith Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.52-r1.ebuild,v 1.9 2004/11/09 17:32:06 blubb Exp $
 
 inherit flag-o-matic eutils fixheadtails gnuconfig
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.apache.org/dist/httpd/httpd-${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 mips ppc ppc64 ~s390 sparc x86"
 IUSE="berkdb gdbm ldap threads ipv6 doc static ssl"
 
 #Standard location for Gentoo Linux