Marked stable on x86 - #55441

3 files changed, 76 insertions, 73 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index 22962c663d4c..b3b00e8924bf 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.216 2004/06/29 11:17:01 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.217 2004/06/29 14:54:29 port001 Exp $
+
+  29 Jun 2004; Ian Leitch <port001@gentoo.org> apache-2.0.49-r4.ebuild:
+  Marked stable on x86 - #55441
 
   29 Jun 2004; Ciaran McCreesh <ciaranm@gentoo.org> apache-2.0.49-r4.ebuild:
   Stable on mips, bug #55441
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index a281faafa006..53d57241c144 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,103 +1,103 @@
+MD5 602fe301372e4c7664cdd6b2cc8946f4 apache-2.0.49-r4.ebuild 13203
+MD5 3ba8e2e64f2dee1396729b5de985a70d apache-1.3.29-r2.ebuild 7140
 MD5 6fb2420645fe7cd13366395eaf0bd49e apache-1.3.31.ebuild 6700
-MD5 3769e671f30e2a0e9db3042f7204c527 apache-2.0.49-r4.ebuild 13204
-MD5 92eaa7a2bab08d4b27145f76297025ba ChangeLog 39297
-MD5 49d4a0eec048c26bc43c8e238db04673 apache-1.3.31-r1.ebuild 6706
-MD5 8a813acc63b22cd82fab1a2beb76a3ea apache-2.0.49-r3.ebuild 13143
 MD5 eccf2b4d6a170c2f7fb5842b8631c27b apache-1.3.31-r2.ebuild 6831
+MD5 8a813acc63b22cd82fab1a2beb76a3ea apache-2.0.49-r3.ebuild 13143
+MD5 49d4a0eec048c26bc43c8e238db04673 apache-1.3.31-r1.ebuild 6706
+MD5 9b6824fa24d85566fdefc764ecae1f8f ChangeLog 39402
 MD5 5b6dd438f81019e56fa641841c0c13fe metadata.xml 501
-MD5 3ba8e2e64f2dee1396729b5de985a70d apache-1.3.29-r2.ebuild 7140
-MD5 c2866f70c91c7c7f718b89d92530d5f2 files/apache-1.3.29-usertrack_bug.patch 2588
-MD5 3cdca22cf2008b615f80090f309da93d files/digest-apache-2.0.49-r4 142
-MD5 8d790bf68c47c08951c761815cd66a1c files/apachelogserverstatus 4763
-MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
-MD5 02db12f0d91e1f89e0b173fea6c5151d files/apacheaddmod 5977
 MD5 d4b8a4908870107e15cc1edbd0ec6ebb files/apache-1.3.29_mod_auth_db.patch 729
-MD5 17aee0f7a9de0f390fa046bc82436309 files/apache.confd 998
-MD5 b7aa6e39d33d167baf460dd30a14c977 files/digest-apache-2.0.49-r3 142
-MD5 f344d93e24620988b561d71974989e8e files/00_apache_manual.conf 770
+MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
+MD5 97c7a2efed7a3fd05614167426c495d9 files/apache-builtin-mods 2465
 MD5 589e8773eb94f785be510f74b2e39ad0 files/digest-apache-1.3.29-r2 211
-MD5 b9ff3534313dae1b8ac96df0e3e01373 files/httpd-2.0.48-ipv6.patch 865
-MD5 bb36b429c433a5cbf2712605a76ce8fb files/digest-apache-1.3.31 139
-MD5 8cb4313e58d7bd5dc369eb92f75daa2b files/httpd-2.0.49-ipv6.patch 788
-MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59
-MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328
+MD5 7d4cec8690cb2c6406b84990d8365587 files/digest-apache-1.3.31-r1 139
 MD5 7d4cec8690cb2c6406b84990d8365587 files/digest-apache-1.3.31-r2 139
-MD5 97c7a2efed7a3fd05614167426c495d9 files/apache-builtin-mods 2465
-MD5 c4738c2f22a613ee5701ccdf61d9f7ce files/apache2 324
-MD5 64670c349a80e98fc61da8e32b44a913 files/httpd-2.0.49-ssl_engine_kernel.patch 66330
+MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59
+MD5 b7aa6e39d33d167baf460dd30a14c977 files/digest-apache-2.0.49-r3 142
+MD5 3cdca22cf2008b615f80090f309da93d files/digest-apache-2.0.49-r4 142
 MD5 37d2c4ea8e1a6725deaca42b6aa22c69 files/apache-1.3.27_db4_gentoo.patch 1006
+MD5 f344d93e24620988b561d71974989e8e files/00_apache_manual.conf 770
 MD5 2c7dedfa1c3b2b815d733e90acfa06fc files/apache-2.0.48-export.diff 706
 MD5 43283cd264b5b1a6b3e5a4adba5ee2c1 files/apache-2.0.48-gentoo.diff 5905
-MD5 bae4b9d941cd38a32943533e958aa1b3 files/apachedelmod 3185
-MD5 b7c4fabdcb3845c4218b770acb792f73 files/apache-2.0.49-gentoo.diff 6316
-MD5 7d4cec8690cb2c6406b84990d8365587 files/digest-apache-1.3.31-r1 139
+MD5 7d55db018577d9c8f779d29dad70f22d files/apache.rc6 1082
+MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328
+MD5 64670c349a80e98fc61da8e32b44a913 files/httpd-2.0.49-ssl_engine_kernel.patch 66330
+MD5 8d790bf68c47c08951c761815cd66a1c files/apachelogserverstatus 4763
 MD5 df54361aa8754197cf3bafe99d32c7ec files/robots.txt 340
+MD5 02db12f0d91e1f89e0b173fea6c5151d files/apacheaddmod 5977
+MD5 b7c4fabdcb3845c4218b770acb792f73 files/apache-2.0.49-gentoo.diff 6316
+MD5 bae4b9d941cd38a32943533e958aa1b3 files/apachedelmod 3185
+MD5 c4738c2f22a613ee5701ccdf61d9f7ce files/apache2 324
+MD5 bb36b429c433a5cbf2712605a76ce8fb files/digest-apache-1.3.31 139
 MD5 8b5e7c3c7da4ebb58471f917a693e047 files/apachesplitlogfile 5068
+MD5 b9ff3534313dae1b8ac96df0e3e01373 files/httpd-2.0.48-ipv6.patch 865
+MD5 17aee0f7a9de0f390fa046bc82436309 files/apache.confd 998
 MD5 d52999376f67a872ee48cbae72db0160 files/httpd-2.0.49-cgi.patch 10319
-MD5 7d55db018577d9c8f779d29dad70f22d files/apache.rc6 1082
-MD5 abb7eca89bc2ad072c61418195a98cd6 files/2.0.48-r1/apache2.initd 2418
-MD5 e8f5a440ea77613b7908872b6ef7cf88 files/2.0.48-r1/apache2.conf 7659
+MD5 c2866f70c91c7c7f718b89d92530d5f2 files/apache-1.3.29-usertrack_bug.patch 2588
+MD5 8cb4313e58d7bd5dc369eb92f75daa2b files/httpd-2.0.49-ipv6.patch 788
+MD5 a7f15bdba3786353deb7bfaf8de0efb9 files/conf/apache.conf 8115
+MD5 c70dc2c9a5e56660f3f120fcb822fadc files/conf/commonapache.conf 22216
+MD5 c774e0c7ddc6d55bddc164a9b5af0cb6 files/conf/VirtualHomePages.conf 907
+MD5 bb04f10b8e54f2ee95a8149fc50bb35b files/conf/Vhosts.conf 1903
+MD5 fd9b211c5078739d4aadbe6b3e53aead files/conf/DynamicVhosts.conf 963
 MD5 6c5fea3288b0ca4769495060d345055d files/2.0.48-r1/commonapache2.conf 31776
 MD5 63b10f728d11f10fb24241f8322542df files/2.0.48-r1/apache2.confd 1955
-MD5 a14d8565fd5ca2b5753799477a85b1af files/2.0.40/apache2splitlogfile 4844
-MD5 d9e0ecfbc1591486a698494a388b091c files/2.0.40/vhosts.conf 1695
+MD5 abb7eca89bc2ad072c61418195a98cd6 files/2.0.48-r1/apache2.initd 2418
+MD5 e8f5a440ea77613b7908872b6ef7cf88 files/2.0.48-r1/apache2.conf 7659
+MD5 5a7b58d54689d6e9d8f8214b5150d18f files/common/config.layout 741
+MD5 fe80b29c20bb6794eb7f4a0875588306 files/common/apr-util-config.layout 437
+MD5 54c0546fa2b1985686cf22c9efa2c7dc files/common/apr-config.layout 434
 MD5 869ec17a0417518aa1d9d9566a958fb5 files/2.0.40/40_mod_ssl.conf 3185
+MD5 819ee444395cf42ccc8009529a94af37 files/2.0.40/45_mod_dav.conf 583
+MD5 50b76a8df795c79378c02f1edea750a4 files/2.0.40/46_mod_ldap.conf 902
+MD5 b610d37fd521de1f8fc782069e165969 files/2.0.40/apache2logserverstatus 4652
+MD5 a14d8565fd5ca2b5753799477a85b1af files/2.0.40/apache2splitlogfile 4844
 MD5 3dfd53805dfe77a12507c3af371dbeae files/2.0.40/apache2-builtin-mods 2213
+MD5 b335411e582a8fd58aacf2f35e75291f files/2.0.40/gentestcrt.sh 8805
+MD5 9375735d739344987fe4b2a3990de273 files/2.0.40/highperformance.conf 1959
+MD5 5c47dec8c730edf1cb755b581327bd49 files/2.0.40/httpd.conf 35481
+MD5 0055923f696c9ba3be7eeb5518603d40 files/2.0.40/ssl.conf 11082
 MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.40/41_mod_ssl.default-vhost.conf 8053
+MD5 9a54f9faa53622b7db4b7e119016c549 files/2.0.40/commonapache2.conf 31777
+MD5 7648aa0e65d9bfd6ee5dc7109bc94fbc files/2.0.40/apache2.confd 784
 MD5 cf5600eadc7f31990840d631ef518d6c files/2.0.40/apache2.initd 1160
-MD5 9375735d739344987fe4b2a3990de273 files/2.0.40/highperformance.conf 1959
-MD5 819ee444395cf42ccc8009529a94af37 files/2.0.40/45_mod_dav.conf 583
-MD5 50b76a8df795c79378c02f1edea750a4 files/2.0.40/46_mod_ldap.conf 902
 MD5 66bf65c4f0a2072d612b781599515807 files/2.0.40/apache2.conf 7649
-MD5 23416b00cbdc46b67e672f272e49ba40 files/2.0.40/dynamic-vhosts.conf 840
-MD5 9a54f9faa53622b7db4b7e119016c549 files/2.0.40/commonapache2.conf 31777
-MD5 b335411e582a8fd58aacf2f35e75291f files/2.0.40/gentestcrt.sh 8805
+MD5 d9e0ecfbc1591486a698494a388b091c files/2.0.40/vhosts.conf 1695
 MD5 b69bf7c3126e471a2abff013e716367f files/2.0.40/virtual-homepages.conf 780
-MD5 7648aa0e65d9bfd6ee5dc7109bc94fbc files/2.0.40/apache2.confd 784
-MD5 0055923f696c9ba3be7eeb5518603d40 files/2.0.40/ssl.conf 11082
-MD5 b610d37fd521de1f8fc782069e165969 files/2.0.40/apache2logserverstatus 4652
-MD5 5c47dec8c730edf1cb755b581327bd49 files/2.0.40/httpd.conf 35481
-MD5 8570b1055b64f29120e21be94bbdd73d files/2.0.49/apache2splitlogfile 4875
-MD5 d9e0ecfbc1591486a698494a388b091c files/2.0.49/vhosts.conf 1695
+MD5 23416b00cbdc46b67e672f272e49ba40 files/2.0.40/dynamic-vhosts.conf 840
 MD5 869ec17a0417518aa1d9d9566a958fb5 files/2.0.49/40_mod_ssl.conf 3185
+MD5 819ee444395cf42ccc8009529a94af37 files/2.0.49/45_mod_dav.conf 583
+MD5 50b76a8df795c79378c02f1edea750a4 files/2.0.49/46_mod_ldap.conf 902
+MD5 b610d37fd521de1f8fc782069e165969 files/2.0.49/apache2logserverstatus 4652
+MD5 8570b1055b64f29120e21be94bbdd73d files/2.0.49/apache2splitlogfile 4875
 MD5 0fac1724d97d449d1cfb746275f7b32b files/2.0.49/apache2-builtin-mods 2211
+MD5 0e8867687279c44ddbf51375c537cd02 files/2.0.49/gentestcrt.sh 8800
 MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.49/41_mod_ssl.default-vhost.conf 8053
+MD5 51551378f38d8bf3b8389d70e51ccdea files/2.0.49/commonapache2.conf 32231
+MD5 bf4f5fef094c57eeef892940ea689da9 files/2.0.49/apache2.confd 1951
 MD5 6d56b77cb2230dd123b6a22ce71ef1f4 files/2.0.49/apache2.initd 2498
-MD5 819ee444395cf42ccc8009529a94af37 files/2.0.49/45_mod_dav.conf 583
-MD5 50b76a8df795c79378c02f1edea750a4 files/2.0.49/46_mod_ldap.conf 902
 MD5 77785d5ff6e5a7a21425dc69a6162779 files/2.0.49/apache2.conf 7652
-MD5 23416b00cbdc46b67e672f272e49ba40 files/2.0.49/dynamic-vhosts.conf 840
-MD5 51551378f38d8bf3b8389d70e51ccdea files/2.0.49/commonapache2.conf 32231
-MD5 0e8867687279c44ddbf51375c537cd02 files/2.0.49/gentestcrt.sh 8800
+MD5 d9e0ecfbc1591486a698494a388b091c files/2.0.49/vhosts.conf 1695
 MD5 b69bf7c3126e471a2abff013e716367f files/2.0.49/virtual-homepages.conf 780
-MD5 bf4f5fef094c57eeef892940ea689da9 files/2.0.49/apache2.confd 1951
-MD5 b610d37fd521de1f8fc782069e165969 files/2.0.49/apache2logserverstatus 4652
-MD5 5a7b58d54689d6e9d8f8214b5150d18f files/common/config.layout 741
-MD5 54c0546fa2b1985686cf22c9efa2c7dc files/common/apr-config.layout 434
-MD5 fe80b29c20bb6794eb7f4a0875588306 files/common/apr-util-config.layout 437
-MD5 fd9b211c5078739d4aadbe6b3e53aead files/conf/DynamicVhosts.conf 963
-MD5 bb04f10b8e54f2ee95a8149fc50bb35b files/conf/Vhosts.conf 1903
-MD5 a7f15bdba3786353deb7bfaf8de0efb9 files/conf/apache.conf 8115
-MD5 c70dc2c9a5e56660f3f120fcb822fadc files/conf/commonapache.conf 22216
-MD5 c774e0c7ddc6d55bddc164a9b5af0cb6 files/conf/VirtualHomePages.conf 907
-MD5 a63b9472904d3500cf72b370a9ee3200 files/patches/1.3.31/00_gentoo_db4_detect.patch 1304
-MD5 61df284cb67dfde3085aec5543eeb03c files/patches/1.3.31/00_gentoo_apachectl.patch 32836
-MD5 161245c7aa1eb785db53b34d6a10be43 files/patches/1.3.31/00_gentoo_suexec_pam.patch 2149
-MD5 28272b16a4f701f29eb73d932fd81101 files/patches/1.3.31/Readme.PATCHES 747
-MD5 3c0dfc9f2dc93ae46eb6382cf9533f18 files/patches/1.3.31/00_gentoo_base.patch 27799
-MD5 64670c349a80e98fc61da8e32b44a913 files/patches/2.0.49-r1/01_ssl_engine_kernel.patch 66330
-MD5 59deb12158a55cc2259cd79c245eb00d files/patches/2.0.49-r1/00_ssl_verify_client.patch 6671
+MD5 23416b00cbdc46b67e672f272e49ba40 files/2.0.49/dynamic-vhosts.conf 840
 MD5 b30d264a0cfb08b2ce2300132abbe654 files/patches/2.0.49-r1/01_apache_ldap_fixes.patch 18048
-MD5 30add456de1ed8fab4bc473a4afda161 files/patches/2.0.49-r1/04_ssl_makefile.patch 619
 MD5 fc31be76ad482038fa9019ea59067473 files/patches/2.0.49-r1/00_ssl_engine.patch 1364
 MD5 21a6ee55341125140e40c0f48144277d files/patches/2.0.49-r1/Readme.PATCHES 507
+MD5 64670c349a80e98fc61da8e32b44a913 files/patches/2.0.49-r1/01_ssl_engine_kernel.patch 66330
+MD5 59deb12158a55cc2259cd79c245eb00d files/patches/2.0.49-r1/00_ssl_verify_client.patch 6671
+MD5 30add456de1ed8fab4bc473a4afda161 files/patches/2.0.49-r1/04_ssl_makefile.patch 619
 MD5 d52999376f67a872ee48cbae72db0160 files/patches/2.0.49-r2/01_gentoo_cgi.patch 10319
+MD5 3c0dfc9f2dc93ae46eb6382cf9533f18 files/patches/1.3.31/00_gentoo_base.patch 27799
+MD5 a63b9472904d3500cf72b370a9ee3200 files/patches/1.3.31/00_gentoo_db4_detect.patch 1304
+MD5 28272b16a4f701f29eb73d932fd81101 files/patches/1.3.31/Readme.PATCHES 747
+MD5 161245c7aa1eb785db53b34d6a10be43 files/patches/1.3.31/00_gentoo_suexec_pam.patch 2149
+MD5 61df284cb67dfde3085aec5543eeb03c files/patches/1.3.31/00_gentoo_apachectl.patch 32836
+MD5 3c0dfc9f2dc93ae46eb6382cf9533f18 files/patches/1.3.31-r1/00_gentoo_base.patch 27799
+MD5 a63b9472904d3500cf72b370a9ee3200 files/patches/1.3.31-r1/00_gentoo_db4_detect.patch 1304
+MD5 161245c7aa1eb785db53b34d6a10be43 files/patches/1.3.31-r1/00_gentoo_suexec_pam.patch 2149
+MD5 61df284cb67dfde3085aec5543eeb03c files/patches/1.3.31-r1/00_gentoo_apachectl.patch 32836
+MD5 3c0dfc9f2dc93ae46eb6382cf9533f18 files/patches/1.3.31-r2/00_gentoo_base.patch 27799
 MD5 a63b9472904d3500cf72b370a9ee3200 files/patches/1.3.31-r2/00_gentoo_db4_detect.patch 1304
-MD5 61df284cb67dfde3085aec5543eeb03c files/patches/1.3.31-r2/00_gentoo_apachectl.patch 32836
 MD5 161245c7aa1eb785db53b34d6a10be43 files/patches/1.3.31-r2/00_gentoo_suexec_pam.patch 2149
 MD5 c42fc79a9d08f38a8d8938883451f6b6 files/patches/1.3.31-r2/00_apache_proxy_security_fix.patch 790
-MD5 3c0dfc9f2dc93ae46eb6382cf9533f18 files/patches/1.3.31-r2/00_gentoo_base.patch 27799
-MD5 a63b9472904d3500cf72b370a9ee3200 files/patches/1.3.31-r1/00_gentoo_db4_detect.patch 1304
-MD5 61df284cb67dfde3085aec5543eeb03c files/patches/1.3.31-r1/00_gentoo_apachectl.patch 32836
-MD5 161245c7aa1eb785db53b34d6a10be43 files/patches/1.3.31-r1/00_gentoo_suexec_pam.patch 2149
-MD5 3c0dfc9f2dc93ae46eb6382cf9533f18 files/patches/1.3.31-r1/00_gentoo_base.patch 27799
+MD5 61df284cb67dfde3085aec5543eeb03c files/patches/1.3.31-r2/00_gentoo_apachectl.patch 32836
diff --git a/net-www/apache/apache-2.0.49-r4.ebuild b/net-www/apache/apache-2.0.49-r4.ebuild
index 367d4be64682..2934b5117a15 100644
--- a/net-www/apache/apache-2.0.49-r4.ebuild
+++ b/net-www/apache/apache-2.0.49-r4.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.49-r4.ebuild,v 1.4 2004/06/29 11:17:01 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.49-r4.ebuild,v 1.5 2004/06/29 14:54:29 port001 Exp $
 
 inherit flag-o-matic eutils fixheadtails gnuconfig
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.apache.org/dist/httpd/httpd-${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~x86 ~ppc sparc mips ~alpha ~arm ~hppa amd64 ~ia64 ~s390 ~ppc64"
+KEYWORDS="x86 ~ppc sparc mips ~alpha ~arm ~hppa amd64 ~ia64 ~s390 ~ppc64"
 IUSE="berkdb gdbm ldap threads ipv6 doc static ssl"
 
 #Standard location for Gentoo Linux