Apache herd package refresh

19 files changed, 434 insertions, 109 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index 837ded7c02df..25bcd5aa901f 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,12 @@
 # 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.310 2004/12/29 21:06:30 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.311 2005/01/08 23:37:10 hollow Exp $
+
+*apache-1.3.33-r1 (09 Jan 2005)
+
+  09 Jan 2005; Benedikt Boehm <hollow@gentoo.org> metadata.xml,
+  +apache-1.3.33-r1.ebuild:
+  Apache herd package refresh
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index e4eaf05aba89..8451e0f5e9ec 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,90 +1,102 @@
-MD5 1bcfd89028a8f1e39f99a370f39e5ff2 apache-1.3.31-r1.ebuild 6739
-MD5 46e83b90a91a8997eefb54c4f3d3e0f3 apache-2.0.52.ebuild 12831
-MD5 f71001bc9b282e7eb336570621b54328 apache-1.3.31-r3.ebuild 6872
-MD5 13ce89cd7df9a316ef8c19d1eb58ce69 apache-2.0.52-r2.ebuild 12294
-MD5 e4dc4b093f2d9b8edd137e09ecbb2adf apache-1.3.29-r2.ebuild 7177
-MD5 c096bf4f3779f9138b631ae00aaa387d apache-2.0.51.ebuild 12827
-MD5 e04b2e008169968fe7b6c0775d5fab89 apache-2.0.51-r1.ebuild 12836
-MD5 ef086acc01df8eea7ad7c30f50dea493 ChangeLog 52940
-MD5 c46f4b015504b2b22e0b8a7917ec84bf apache-1.3.31-r2.ebuild 6864
-MD5 e43f33652a067484c02d60d53a7c79a8 apache-2.0.52-r1.ebuild 12889
-MD5 904e5b6782f1ddc241ce468dfd5cbd55 apache-2.0.50.ebuild 12902
-MD5 e425d1325ddfb8f4a6284596b817a58c apache-1.3.32-r1.ebuild 6607
-MD5 657794e948312992380cac34757cb86c apache-1.3.33.ebuild 6851
-MD5 5b6dd438f81019e56fa641841c0c13fe metadata.xml 501
-MD5 08b63251db95f14ddbdc4b0368d48702 apache-1.3.31.ebuild 6693
-MD5 c4728dbf14f69ec79e3dc9d3636e3f0b apache-1.3.32.ebuild 6616
-MD5 189cfb35b6320ae3ab57a32dbadd18f2 files/digest-apache-1.3.33 212
-MD5 8cc0834ac7a8afa694ddb3f9f9be2cc8 files/digest-apache-1.3.31-r3 139
-MD5 da8dfe2134d7e30dc95e77e0c5f472e1 files/digest-apache-1.3.32 212
-MD5 69d40992fa9301ce3198a0115fa1f31c files/digest-apache-2.0.51 137
-MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
-MD5 8de91cfef98483656aa4ab47f2c2ce8e files/apache2 331
-MD5 8cb4313e58d7bd5dc369eb92f75daa2b files/httpd-2.0.49-ipv6.patch 788
-MD5 baf37cd1bc61f76ac73edd301f52decb files/digest-apache-2.0.52 201
-MD5 8b5e7c3c7da4ebb58471f917a693e047 files/apachesplitlogfile 5068
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 59bdaa7c904bcbf423067faa3b919874 ChangeLog 53095
+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
+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 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 90cc07a86abe58c1b0f4b6bfa7439706 apache-2.0.52.ebuild 12830
+MD5 a419841198cd6a94b9dcf2e07f3c15b7 metadata.xml 617
+MD5 18073cc171bd2a0e3b91076c14f9fb1e apache-1.3.33-r1.ebuild 8258
 MD5 8b12871dd74fcd3f4fdf451c9d8c259e files/00_apache_manual.conf 781
-MD5 bb36b429c433a5cbf2712605a76ce8fb files/digest-apache-1.3.31 139
-MD5 ba87ae612a52d75f0109a2aba6cd605b files/apachedelmod 3187
 MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328
-MD5 0eb9067bb4f2c2495069deaa9d7fce1b files/digest-apache-2.0.51-r1 140
-MD5 647bdf060613bdf1fdb840ed5ae51b72 files/apachelogserverstatus 4765
-MD5 7d4cec8690cb2c6406b84990d8365587 files/digest-apache-1.3.31-r2 139
-MD5 c560ade7dafffbfdd05ec6deb125280b files/digest-apache-1.3.32-r1 215
+MD5 37d2c4ea8e1a6725deaca42b6aa22c69 files/apache-1.3.27_db4_gentoo.patch 1006
+MD5 c2866f70c91c7c7f718b89d92530d5f2 files/apache-1.3.29-usertrack_bug.patch 2588
 MD5 d4b8a4908870107e15cc1edbd0ec6ebb files/apache-1.3.29_mod_auth_db.patch 729
-MD5 a76e0df0ecc6920d9f4f139e31288155 files/apache-builtin-mods 2467
-MD5 7d4cec8690cb2c6406b84990d8365587 files/digest-apache-1.3.31-r1 139
+MD5 2c7dedfa1c3b2b815d733e90acfa06fc files/apache-2.0.48-export.diff 706
 MD5 43283cd264b5b1a6b3e5a4adba5ee2c1 files/apache-2.0.48-gentoo.diff 5905
-MD5 c2866f70c91c7c7f718b89d92530d5f2 files/apache-1.3.29-usertrack_bug.patch 2588
+MD5 b7c4fabdcb3845c4218b770acb792f73 files/apache-2.0.49-gentoo.diff 6316
+MD5 a76e0df0ecc6920d9f4f139e31288155 files/apache-builtin-mods 2467
+MD5 1ca7ef45f474a29f599364f2022b4e0f files/apache.confd 994
 MD5 2b4457530debe71160f56ae68ea4c9c8 files/apache.rc6 1078
-MD5 d52999376f67a872ee48cbae72db0160 files/httpd-2.0.49-cgi.patch 10319
-MD5 37d2c4ea8e1a6725deaca42b6aa22c69 files/apache-1.3.27_db4_gentoo.patch 1006
-MD5 59a6ba7dcde461f5350af41e6aff92b1 files/robots.txt 342
-MD5 710e7291039a6cba132568e32daede8a files/digest-apache-2.0.52-r2 213
+MD5 8de91cfef98483656aa4ab47f2c2ce8e files/apache2 331
+MD5 042973893566b6b09b4dd9755d8f0881 files/apacheaddmod 5979
+MD5 ba87ae612a52d75f0109a2aba6cd605b files/apachedelmod 3187
+MD5 647bdf060613bdf1fdb840ed5ae51b72 files/apachelogserverstatus 4765
+MD5 8b5e7c3c7da4ebb58471f917a693e047 files/apachesplitlogfile 5068
 MD5 589e8773eb94f785be510f74b2e39ad0 files/digest-apache-1.3.29-r2 211
+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 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 cb82ab66045d6f309af686c0206fc3c0 files/digest-apache-2.0.50 201
-MD5 1ca7ef45f474a29f599364f2022b4e0f files/apache.confd 994
-MD5 b7c4fabdcb3845c4218b770acb792f73 files/apache-2.0.49-gentoo.diff 6316
-MD5 2c7dedfa1c3b2b815d733e90acfa06fc files/apache-2.0.48-export.diff 706
-MD5 042973893566b6b09b4dd9755d8f0881 files/apacheaddmod 5979
+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 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 44fc8ddc9a05a056d8a08e6d843c997c files/digest-apache-2.0.52-r1 204
-MD5 139f5b0d5e2bf3525464a336ed2e1f83 files/conf/Vhosts.conf 1910
-MD5 9c606730ea7cc37417109915b2fbe522 files/conf/VirtualHomePages.conf 909
-MD5 c70dc2c9a5e56660f3f120fcb822fadc files/conf/commonapache.conf 22216
-MD5 a7f15bdba3786353deb7bfaf8de0efb9 files/conf/apache.conf 8115
-MD5 162afe15726e298774bc36b586ae070a files/conf/DynamicVhosts.conf 965
-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 20f6868829149f669a7afd1e03245692 files/2.0.49/apache2.initd 2494
-MD5 1c4d9999353237c8b3835b7d73ba7a15 files/2.0.49/apache2-builtin-mods 2215
-MD5 50b76a8df795c79378c02f1edea750a4 files/2.0.49/46_mod_ldap.conf 902
-MD5 8a234c8eb9cc840fe2d3cfbcdfedc315 files/2.0.49/gentestcrt.sh 8807
-MD5 b610d37fd521de1f8fc782069e165969 files/2.0.49/apache2logserverstatus 4652
-MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.49/41_mod_ssl.default-vhost.conf 8053
-MD5 8570b1055b64f29120e21be94bbdd73d files/2.0.49/apache2splitlogfile 4875
+MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
+MD5 16075ee28b99f7bcf0a3403b4cf08aeb files/digest-apache-1.3.33-r1 277
 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
+MD5 50b76a8df795c79378c02f1edea750a4 files/2.0.49/46_mod_ldap.conf 902
+MD5 1c4d9999353237c8b3835b7d73ba7a15 files/2.0.49/apache2-builtin-mods 2215
 MD5 228b5a816ea5534287be3c5e1d6ec7cd files/2.0.49/apache2.confd 1944
-MD5 5d45e2b46965e7c6866b259df4efe4b2 files/patches/2.0.50-r1/Readme.PATCHES 357
-MD5 161245c7aa1eb785db53b34d6a10be43 files/patches/1.3.31-r1/00_gentoo_suexec_pam.patch 2149
+MD5 20f6868829149f669a7afd1e03245692 files/2.0.49/apache2.initd 2494
+MD5 b610d37fd521de1f8fc782069e165969 files/2.0.49/apache2logserverstatus 4652
+MD5 8570b1055b64f29120e21be94bbdd73d files/2.0.49/apache2splitlogfile 4875
+MD5 8a234c8eb9cc840fe2d3cfbcdfedc315 files/2.0.49/gentestcrt.sh 8807
+MD5 54c0546fa2b1985686cf22c9efa2c7dc files/common/apr-config.layout 434
+MD5 fe80b29c20bb6794eb7f4a0875588306 files/common/apr-util-config.layout 437
+MD5 5a7b58d54689d6e9d8f8214b5150d18f files/common/config.layout 741
+MD5 162afe15726e298774bc36b586ae070a files/conf/DynamicVhosts.conf 965
+MD5 139f5b0d5e2bf3525464a336ed2e1f83 files/conf/Vhosts.conf 1910
+MD5 9c606730ea7cc37417109915b2fbe522 files/conf/VirtualHomePages.conf 909
+MD5 a7f15bdba3786353deb7bfaf8de0efb9 files/conf/apache.conf 8115
+MD5 c70dc2c9a5e56660f3f120fcb822fadc files/conf/commonapache.conf 22216
+MD5 61df284cb67dfde3085aec5543eeb03c files/patches/1.3.31/00_gentoo_apachectl.patch 32836
+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 161245c7aa1eb785db53b34d6a10be43 files/patches/1.3.31/00_gentoo_suexec_pam.patch 2149
+MD5 28272b16a4f701f29eb73d932fd81101 files/patches/1.3.31/Readme.PATCHES 747
+MD5 61df284cb67dfde3085aec5543eeb03c files/patches/1.3.31-r1/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 61df284cb67dfde3085aec5543eeb03c files/patches/1.3.31-r1/00_gentoo_apachectl.patch 32836
-MD5 d52999376f67a872ee48cbae72db0160 files/patches/2.0.49-r2/01_gentoo_cgi.patch 10319
-MD5 30add456de1ed8fab4bc473a4afda161 files/patches/2.0.49-r1/04_ssl_makefile.patch 619
-MD5 59deb12158a55cc2259cd79c245eb00d files/patches/2.0.49-r1/00_ssl_verify_client.patch 6671
-MD5 21a6ee55341125140e40c0f48144277d files/patches/2.0.49-r1/Readme.PATCHES 507
-MD5 b30d264a0cfb08b2ce2300132abbe654 files/patches/2.0.49-r1/01_apache_ldap_fixes.patch 18048
-MD5 161245c7aa1eb785db53b34d6a10be43 files/patches/1.3.31-r2/00_gentoo_suexec_pam.patch 2149
-MD5 3c0dfc9f2dc93ae46eb6382cf9533f18 files/patches/1.3.31-r2/00_gentoo_base.patch 27799
+MD5 161245c7aa1eb785db53b34d6a10be43 files/patches/1.3.31-r1/00_gentoo_suexec_pam.patch 2149
 MD5 c42fc79a9d08f38a8d8938883451f6b6 files/patches/1.3.31-r2/00_apache_proxy_security_fix.patch 790
-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/00_gentoo_suexec_pam.patch 2149
-MD5 3c0dfc9f2dc93ae46eb6382cf9533f18 files/patches/1.3.31/00_gentoo_base.patch 27799
-MD5 28272b16a4f701f29eb73d932fd81101 files/patches/1.3.31/Readme.PATCHES 747
-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 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 161245c7aa1eb785db53b34d6a10be43 files/patches/1.3.31-r2/00_gentoo_suexec_pam.patch 2149
+MD5 59deb12158a55cc2259cd79c245eb00d files/patches/2.0.49-r1/00_ssl_verify_client.patch 6671
+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 21a6ee55341125140e40c0f48144277d files/patches/2.0.49-r1/Readme.PATCHES 507
+MD5 d52999376f67a872ee48cbae72db0160 files/patches/2.0.49-r2/01_gentoo_cgi.patch 10319
+MD5 5d45e2b46965e7c6866b259df4efe4b2 files/patches/2.0.50-r1/Readme.PATCHES 357
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB4G6fmPFBzbX68WERAoZ1AKCMwT+uqFCPjyA4wPekRYrXIQSOCwCgjVBV
+5fzpN+Ue1P5+4EWrwvyFJg4=
+=PWf/
+-----END PGP SIGNATURE-----
diff --git a/net-www/apache/apache-1.3.29-r2.ebuild b/net-www/apache/apache-1.3.29-r2.ebuild
index aacd53ae9d68..3c406371f283 100644
--- a/net-www/apache/apache-1.3.29-r2.ebuild
+++ b/net-www/apache/apache-1.3.29-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.29-r2.ebuild,v 1.6 2004/08/30 19:37:02 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.29-r2.ebuild,v 1.7 2005/01/08 23:37:10 hollow Exp $
 
 inherit eutils fixheadtails
 
diff --git a/net-www/apache/apache-1.3.31-r1.ebuild b/net-www/apache/apache-1.3.31-r1.ebuild
index fe3a3bfdf9a5..f638c4d66cad 100644
--- a/net-www/apache/apache-1.3.31-r1.ebuild
+++ b/net-www/apache/apache-1.3.31-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.31-r1.ebuild,v 1.13 2004/09/28 02:57:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.31-r1.ebuild,v 1.14 2005/01/08 23:37:10 hollow Exp $
 
 inherit eutils fixheadtails
 
diff --git a/net-www/apache/apache-1.3.31-r2.ebuild b/net-www/apache/apache-1.3.31-r2.ebuild
index 314ebb091e8d..5a179a108ef6 100644
--- a/net-www/apache/apache-1.3.31-r2.ebuild
+++ b/net-www/apache/apache-1.3.31-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.31-r2.ebuild,v 1.13 2004/09/28 02:57:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.31-r2.ebuild,v 1.14 2005/01/08 23:37:10 hollow Exp $
 
 inherit eutils fixheadtails
 
diff --git a/net-www/apache/apache-1.3.31-r3.ebuild b/net-www/apache/apache-1.3.31-r3.ebuild
index 2ac885f4e589..87068cf1cdec 100644
--- a/net-www/apache/apache-1.3.31-r3.ebuild
+++ b/net-www/apache/apache-1.3.31-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.31-r3.ebuild,v 1.11 2004/09/28 02:57:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.31-r3.ebuild,v 1.12 2005/01/08 23:37:10 hollow Exp $
 
 inherit eutils fixheadtails
 
diff --git a/net-www/apache/apache-1.3.31.ebuild b/net-www/apache/apache-1.3.31.ebuild
index ccfa77913048..52f1aa8e3436 100644
--- a/net-www/apache/apache-1.3.31.ebuild
+++ b/net-www/apache/apache-1.3.31.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.31.ebuild,v 1.15 2004/09/28 02:57:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.31.ebuild,v 1.16 2005/01/08 23:37:10 hollow Exp $
 
 inherit eutils fixheadtails
 
diff --git a/net-www/apache/apache-1.3.32-r1.ebuild b/net-www/apache/apache-1.3.32-r1.ebuild
index 2f39496753a1..0795f7ad6575 100644
--- a/net-www/apache/apache-1.3.32-r1.ebuild
+++ b/net-www/apache/apache-1.3.32-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.32-r1.ebuild,v 1.8 2004/11/10 06:07:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.32-r1.ebuild,v 1.9 2005/01/08 23:37:10 hollow Exp $
 
 inherit eutils fixheadtails
 
diff --git a/net-www/apache/apache-1.3.32.ebuild b/net-www/apache/apache-1.3.32.ebuild
index f53aa46d549c..5adcb68b3d6f 100644
--- a/net-www/apache/apache-1.3.32.ebuild
+++ b/net-www/apache/apache-1.3.32.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.32.ebuild,v 1.1 2004/10/23 21:16:02 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.32.ebuild,v 1.2 2005/01/08 23:37:10 hollow Exp $
 
 inherit eutils fixheadtails
 
diff --git a/net-www/apache/apache-1.3.33-r1.ebuild b/net-www/apache/apache-1.3.33-r1.ebuild
new file mode 100644
index 000000000000..877a47091ccf
--- /dev/null
+++ b/net-www/apache/apache-1.3.33-r1.ebuild
@@ -0,0 +1,296 @@
+# 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.1 2005/01/08 23:37:10 hollow Exp $
+
+inherit eutils fixheadtails
+
+# latest gentoo apache files
+GENTOO_PATCHNAME="gentoo-apache-${PVR}"
+GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
+
+# The mod_ssl archive is only for providing the EAPI patch in here.
+# You should install the net-www/mod_ssl package for the actual DSO.
+mod_ssl_ver=2.8.22
+lingerd_ver=0.94
+
+DESCRIPTION="The Apache Web Server"
+HOMEPAGE="http://httpd.apache.org"
+SRC_URI="mirror://apache/httpd/apache_${PV}.tar.gz
+		ssl? ftp://ftp.modssl.org/source/mod_ssl-${mod_ssl_ver}-${PV}.tar.gz
+		lingerd? http://images.iagora.com/media/software/lingerd/lingerd-${lingerd_ver}.tar.gz
+		mirror://gentoo/${GENTOO_PATCHNAME}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips"
+IUSE="doc ssl pam lingerd no-suexec static-modules"
+
+DEPEND="dev-lang/perl
+		>=sys-libs/db-1.85-r1
+		>=dev-libs/mm-1.1.3
+		>=sys-libs/gdbm-1.8
+		>=dev-libs/expat-1.95.2
+		>=sys-apps/sed-4
+		app-misc/mime-types
+		selinux? ( sec-policy/selinux-apache )
+		lingerd? ( =net-www/lingerd-${lingerd_ver} )"
+
+# so leave it out until it's available
+PDEPEND="ssl? ( =net-www/mod_ssl-${mod_ssl_ver} )"
+
+S=${WORKDIR}/${PN}_${PV}
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S} || die
+
+	EPATCH_SUFFIX="patch"
+	epatch ${GENTOO_PATCHDIR}/patches/[0-2]*
+
+	# setup the filesystem layout config
+	cat ${GENTOO_PATCHDIR}/patches/config.layout >> config.layout
+	sed -i -e 's:version:${PF}:g' config.layout
+
+	if useq pam; then
+		epatch ${GENTOO_PATCHDIR}/patches/31_all_gentoo_suexec_pam.patch || die "pam patch failed"
+	fi
+
+	# fix obsolete 'head -1' and 'tail -1' calls
+	ht_fix_file src/Configure src/helpers/getuid.sh src/helpers/buildinfo.sh src/helpers/fmn.sh
+
+	# setup mod_ssl eapi
+	if useq ssl; then
+		local myssl
+		myssl=${WORKDIR}/mod_ssl-${mod_ssl_ver}-${PV}
+		cp ${myssl}/pkg.eapi/*.h src/include
+		cp ${myssl}/pkg.eapi/*.c src/ap
+		epatch ${myssl}/pkg.eapi/eapi.patch || die "failed to setup mod_ssl eapi"
+	fi
+
+	# set a reasonable MM_CORE_PATH location..
+	sed -i -e 's:logs/mm:/var/cache/apache-mm/mm:' src/include/httpd.h
+
+	if useq lingerd; then
+		local mylingerd=${WORKDIR}/lingerd-${lingerd_ver}
+		cp ${mylingerd}/apache-1.3/ap_lingerd.c ${mylingerd}/li_config.h src/main
+		cd src
+		if useq ssl; then
+			epatch ${mylingerd}/apache-1.3/aplinger-ssl.diff
+		else
+			epatch ${mylingerd}/apache-1.3/aplinger.diff
+		fi
+		cd ..
+	fi
+}
+
+src_compile() {
+	local myconf
+
+	setup_apache_vars
+
+	select_modules_config || die "determining modules"
+
+	if ! useq no-suexec; then
+		myconf="${myconf}
+				--enable-suexec
+				--suexec-uidmin=1000 \
+				--suexec-gidmin=100 \
+				--suexec-caller=apache \
+				--suexec-userdir=public_html \
+				--suexec-docroot=/var/www \
+				--suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
+				--suexec-logfile=/var/log/apache/suexec_log"
+	fi
+
+	if useq ssl; then
+		myconf="${myconf} --enable-rule=EAPI"
+	fi
+
+	OPTIM="${MY_CFLAGS} -DHARD_SERVER_LIMIT=${HARD_SERVER_LIMIT:=512} \
+		-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" \
+	LIBS="-ldb -lgdbm -lgdbm_compat -lpthread" \
+	EAPI_MM=SYSTEM \
+	./configure \
+		--with-layout=Gentoo \
+		--target=apache \
+		--server-uid=apache \
+		--server-gid=apache \
+		--with-perl=/usr/bin/perl \
+		--enable-rule=SHARED_CHAIN \
+		${MY_BUILTINS} ${myconf} || die "bad ./configure please submit bug report to bugs.gentoo.org. Include your config.layout and config.log"
+
+	emake || die "problem compiling apache"
+
+	# build ssl version of apache bench (ab-ssl)
+	if useq ssl; then
+		cd src/support
+		rm -f ab ab.o
+		make ab CFLAGS="${CFLAGS} -DUSE_SSL -lcrypto -lssl -I/usr/include/openssl -L/usr/lib" || die
+		mv ab ab-ssl
+		rm -f ab.o
+		make ab || die
+	fi
+}
+
+src_install() {
+	make install-quiet root=${D} || die
+	dodoc ABOUT_APACHE Announcement INSTALL LICENSE README* ${GENTOO_PATCHDIR}/docs/robots.txt
+
+	# protect the suexec binary
+	if ! useq no-suexec; then
+		local gid=`id -g apache`
+		fowners root:${gid:-81} /usr/sbin/suexec
+		fperms 4710 /usr/sbin/suexec
+	fi
+
+	# apxs needs this to pickup the right lib for install
+	dosym /usr/lib /usr/lib/apache/lib
+	dosym /var/log/apache /usr/lib/apache/logs
+	dosym /etc/apache /usr/lib/apache/conf
+
+	# nice support scripts
+	exeinto /usr/sbin
+	for i in apachelogserverstatus apachesplitlogfile; do
+		doexe ${GENTOO_PATCHDIR}/scripts/${i}
+	done
+
+	# some more scripts
+	for i in split-logfile logresolve.pl log_server_status; do
+		doexe ${S}/src/support/${i}
+	done
+
+	# the ssl version of apache bench
+	if useq ssl; then
+		doexe src/support/ab-ssl
+	fi
+
+	# drop in a convenient link to the manual
+	if useq doc; then
+		insinto /etc/apache/modules.d
+		doins ${GENTOO_PATCHDIR}/conf/modules.d/00_apache_manual.conf
+		sed -i -e "s:1.3.32:${PVR}:" ${D}/etc/apache/modules.d/00_apache_manual.conf
+	else
+		rm -rf ${D}/usr/share/doc/${PF}/manual
+	fi
+
+	# tidy up
+	cd ${D}
+	dodoc etc/apache/*.default
+	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
+
+	# config files
+	insinto /etc/conf.d
+	newins ${GENTOO_PATCHDIR}/init/apache.confd apache
+
+	exeinto /etc/init.d
+	newexe ${GENTOO_PATCHDIR}/init/apache.initd apache
+
+	insinto /etc/apache
+	doins ${GENTOO_PATCHDIR}/conf/apache-builtin-mods
+	doins ${GENTOO_PATCHDIR}/conf/httpd.conf
+
+	keepdir /etc/apache/vhosts.d
+	keepdir /etc/apache/modules.d
+
+	# Added by Jason Wever <weeve@gentoo.org>
+	# A little sedfu to fix bug #7172 for sparc64s
+	if [ ${ARCH} = "sparc" ]; then
+		sed -i -e '15a\AcceptMutex fcntl' ${D}/etc/apache/httpd.conf
+	fi
+
+	if useq lingerd; then
+		sed -i 's:\(need net.*\):\1 lingerd:g' ${D}/etc/init.d/apache
+	fi
+
+	if useq pam; then
+		insinto /etc/pam.d
+		newins ${GENTOO_PATCHDIR}/patches/suexec.pam suexec
+	fi
+
+	# empty dirs
+	for i in /var/log/apache /var/cache/apache /var/cache/apache-mm; do
+		keepdir ${i}
+		fowners apache:apache ${i}
+		fperms 755 ${i}
+	done
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Please remember to update your config files in /etc/apache"
+	einfo "as --datadir has been changed to ${DATADIR}, and ServerRoot"
+	einfo "has changed to /usr/lib/apache!"
+	einfo
+
+	# Check for obsolete symlinks
+	local list=""
+	for i in lib logs modules extramodules; do
+		local d="/etc/apache/${i}"
+		[ -s "${d}" ] && list="${list} ${d}"
+	done
+	[ -n "${list}" ] && einfo "You should delete these old symlinks: ${list}"
+
+	if has_version '<net-www/apache-1.3.33-r1' ; then
+		einfo "Configuration locations have changed, you will need to migrate"
+		einfo "your configuration from /etc/apache/conf/apache.conf and"
+		einfo "/etc/apache/conf/commonapache.conf to /etc/apache/httpd.conf."
+		einfo
+		einfo "Apache now checks for the old configuration and refuses to start"
+		einfo "if it exists. You must remove the old configuration first"
+		einfo
+		einfo "For more information, see"
+		einfo "        http://dev.gentoo.org/~vericgar/package-refresh.txt"
+	fi
+
+
+}
+
+setup_apache_vars() {
+	MY_CFLAGS="${CFLAGS}"
+	unset CFLAGS
+	unset CXXFLAGS
+
+	# standard location for Gentoo Linux
+	DATADIR="${DATADIR:-/var/www/localhost}"
+	einfo "DATADIR is set to: ${DATADIR}"
+}
+
+parse_modules_config() {
+	local name=""
+	local disable=""
+	[ -f ${1} ] || return 1
+
+	for i in `cat $1 | sed "s/^#.*//"` ; do
+		if [ $i == "-" ]; then
+			disable="true"
+		elif [ -z "$name" ] && [ ! -z "`echo $i | grep "mod_"`" ]; then
+			name=`echo $i | sed "s/mod_//"`
+		elif [ "$disable" ] && ( [ $i == "static" ] || [ $i == "shared" ] ); then
+			MY_BUILTINS="${MY_BUILTINS} --disable-module=$name"
+			name="" ; disable=""
+		elif [ $i == "static" ] || useq static-modules; then
+			MY_BUILTINS="${MY_BUILTINS} --enable-module=$name --disable-shared=$name"
+			name="" ; disable=""
+		elif [ $i == "shared" ]; then
+			MY_BUILTINS="${MY_BUILTINS} --enable-module=$name --enable-shared=$name"
+			name="" ; disable=""
+		fi
+	done
+
+	einfo "${1} options:\n${MY_BUILTINS}"
+}
+
+select_modules_config() {
+	parse_modules_config /etc/apache/apache-builtin-mods || \
+	parse_modules_config ${GENTOO_PATCHDIR}/conf/apache-builtin-mods || \
+	return 1
+}
+
+# vim:ts=4
diff --git a/net-www/apache/apache-1.3.33.ebuild b/net-www/apache/apache-1.3.33.ebuild
index 6c1f3edef01a..66cb2f57c162 100644
--- a/net-www/apache/apache-1.3.33.ebuild
+++ b/net-www/apache/apache-1.3.33.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.ebuild,v 1.10 2004/12/14 20:52:43 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.33.ebuild,v 1.11 2005/01/08 23:37:10 hollow Exp $
 
 # Gentoo ARCH teams
 #
diff --git a/net-www/apache/apache-2.0.50.ebuild b/net-www/apache/apache-2.0.50.ebuild
index 03385f271e90..f2cf50b99454 100644
--- a/net-www/apache/apache-2.0.50.ebuild
+++ b/net-www/apache/apache-2.0.50.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.50.ebuild,v 1.16 2004/11/05 05:38:31 urilith Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.50.ebuild,v 1.17 2005/01/08 23:37:10 hollow Exp $
 
 inherit flag-o-matic eutils fixheadtails gnuconfig
 
diff --git a/net-www/apache/apache-2.0.51-r1.ebuild b/net-www/apache/apache-2.0.51-r1.ebuild
index f6c7fb2ee2c5..1ebf2696744f 100644
--- a/net-www/apache/apache-2.0.51-r1.ebuild
+++ b/net-www/apache/apache-2.0.51-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.51-r1.ebuild,v 1.11 2004/11/01 01:29:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.51-r1.ebuild,v 1.12 2005/01/08 23:37:10 hollow Exp $
 
 inherit flag-o-matic eutils fixheadtails gnuconfig
 
diff --git a/net-www/apache/apache-2.0.51.ebuild b/net-www/apache/apache-2.0.51.ebuild
index 9cebcb694332..b07279549e51 100644
--- a/net-www/apache/apache-2.0.51.ebuild
+++ b/net-www/apache/apache-2.0.51.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.51.ebuild,v 1.13 2004/11/01 01:29:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.51.ebuild,v 1.14 2005/01/08 23:37:10 hollow Exp $
 
 inherit flag-o-matic eutils fixheadtails gnuconfig
 
diff --git a/net-www/apache/apache-2.0.52-r1.ebuild b/net-www/apache/apache-2.0.52-r1.ebuild
index 005408da565f..49688432542b 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
+# 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-r1.ebuild,v 1.11 2004/12/14 20:47:40 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.52-r1.ebuild,v 1.12 2005/01/08 23:37:10 hollow Exp $
 
 inherit flag-o-matic eutils fixheadtails gnuconfig
 
diff --git a/net-www/apache/apache-2.0.52-r2.ebuild b/net-www/apache/apache-2.0.52-r2.ebuild
index 30f07410c476..b230b7fbefe9 100644
--- a/net-www/apache/apache-2.0.52-r2.ebuild
+++ b/net-www/apache/apache-2.0.52-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-r2.ebuild,v 1.2 2004/12/23 11:16:02 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.52-r2.ebuild,v 1.3 2005/01/08 23:37:10 hollow Exp $
 
 inherit flag-o-matic eutils fixheadtails gnuconfig
 
diff --git a/net-www/apache/apache-2.0.52.ebuild b/net-www/apache/apache-2.0.52.ebuild
index fb6727da861e..3781ae93b49d 100644
--- a/net-www/apache/apache-2.0.52.ebuild
+++ b/net-www/apache/apache-2.0.52.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.ebuild,v 1.11 2004/11/05 05:38:31 urilith Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.52.ebuild,v 1.12 2005/01/08 23:37:10 hollow Exp $
 
 inherit flag-o-matic eutils fixheadtails gnuconfig
 
diff --git a/net-www/apache/files/digest-apache-1.3.33-r1 b/net-www/apache/files/digest-apache-1.3.33-r1
new file mode 100644
index 000000000000..268f5ce35f0f
--- /dev/null
+++ b/net-www/apache/files/digest-apache-1.3.33-r1
@@ -0,0 +1,4 @@
+MD5 3dfd2c3778f37a2dfc22b97417a61407 apache_1.3.33.tar.gz 2468567
+MD5 cdfdf1f576f77768c90825b43b462405 mod_ssl-2.8.22-1.3.33.tar.gz 754606
+MD5 6401015bafad4f44fdf8a9a1795d9258 lingerd-0.94.tar.gz 33938
+MD5 08c0ea7a50d69054cd9631ec89a7efd8 gentoo-apache-1.3.33-r1.tar.bz2 27194
diff --git a/net-www/apache/metadata.xml b/net-www/apache/metadata.xml
index bcaabdbbd0d3..88839ab2599c 100644
--- a/net-www/apache/metadata.xml
+++ b/net-www/apache/metadata.xml
@@ -1,8 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>apache</herd>
-<longdescription>
-The Apache HTTP Server Project is an effort to develop and maintain an open-source HTTP server for modern operating systems including UNIX and Windows NT. The goal of this project is to provide a secure, efficient and extensible server that provides HTTP services in sync with the current HTTP standards.
-</longdescription>
+  <herd>apache</herd>
+  <maintainer restrict="&lt;apache-2">
+    <email>hollow@gentoo.org</email>
+    <name>Benedikt Boehm</name>
+  </maintainer>
+  <longdescription>
+    The Apache HTTP Server Project is an effort to develop and maintain an
+    open-source HTTP server for modern operating systems. The goal of this
+    project is to provide a secure, efficient and extensible server that
+    provides HTTP services in sync with the current HTTP standards.
+  </longdescription>
 </pkgmetadata>