Remove old-style ebuilds and clean out files directory

Package-Manager: portage-2.1_rc4-r1

64 files changed, 28 insertions, 9105 deletions

diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index 90fc685e6ec3..8251bff0fc0d 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,295 +1,58 @@
-AUX 00_apache_manual.conf 781 RMD160 d2e6224ca1621f7cf29c163c3c04e06aca7b7bde SHA1 5f1c57444f0d531f5fd4f3a7f3c09fc83de107e4 SHA256 068450680c6fec43b963360e0291f1e47cc1a1c0296efb46a0a4eb75eb891f4b size 781
-MD5 8b12871dd74fcd3f4fdf451c9d8c259e files/00_apache_manual.conf 781
-RMD160 d2e6224ca1621f7cf29c163c3c04e06aca7b7bde files/00_apache_manual.conf 781
-SHA256 068450680c6fec43b963360e0291f1e47cc1a1c0296efb46a0a4eb75eb891f4b files/00_apache_manual.conf 781
-AUX 2.0.49/40_mod_ssl.conf 3213 RMD160 f523b051a375b8690431d68eba580829f2aefab6 SHA1 9de0ffebdcbdd4fd0f9ce131a07f67aedd97ef99 SHA256 0472863a33a729ac32cfde96ba7203fa9a8ecd8a221c9526824575a9f1bcae41 size 3213
-MD5 3d94c56af17136b6c408f076c32e0362 files/2.0.49/40_mod_ssl.conf 3213
-RMD160 f523b051a375b8690431d68eba580829f2aefab6 files/2.0.49/40_mod_ssl.conf 3213
-SHA256 0472863a33a729ac32cfde96ba7203fa9a8ecd8a221c9526824575a9f1bcae41 files/2.0.49/40_mod_ssl.conf 3213
-AUX 2.0.49/41_mod_ssl.default-vhost.conf 8053 RMD160 4b0e8cbd9fcbb3ef6e7f44b694f9dab8cb5c011c SHA1 93a0c73c0faa356f328cbd4c40061d53184c5bb4 SHA256 ddbbf6566b49bc07d6d7c9f552f93a3cda683779d85574ef0d9fa54cc52631a6 size 8053
-MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.49/41_mod_ssl.default-vhost.conf 8053
-RMD160 4b0e8cbd9fcbb3ef6e7f44b694f9dab8cb5c011c files/2.0.49/41_mod_ssl.default-vhost.conf 8053
-SHA256 ddbbf6566b49bc07d6d7c9f552f93a3cda683779d85574ef0d9fa54cc52631a6 files/2.0.49/41_mod_ssl.default-vhost.conf 8053
-AUX 2.0.49/45_mod_dav.conf 583 RMD160 914b31676336f47c50cc0e53df7239adf3aacb84 SHA1 69176de698b37125cc66880d59f44d2503025409 SHA256 8a3d913b67d3e417475a5add014f8c7e30df0cc804bde9efa7d2251f9e6ef714 size 583
-MD5 819ee444395cf42ccc8009529a94af37 files/2.0.49/45_mod_dav.conf 583
-RMD160 914b31676336f47c50cc0e53df7239adf3aacb84 files/2.0.49/45_mod_dav.conf 583
-SHA256 8a3d913b67d3e417475a5add014f8c7e30df0cc804bde9efa7d2251f9e6ef714 files/2.0.49/45_mod_dav.conf 583
-AUX 2.0.49/46_mod_ldap.conf 902 RMD160 5109eb1fcd2def65089802c11d9f555bb1b2eb58 SHA1 ab7b1733b60b6accf3f28607ec9f15cb38aa893f SHA256 1383629d9c9b931878abe5b5ce3fbd1c5e935941cc31963f7607783008857765 size 902
-MD5 50b76a8df795c79378c02f1edea750a4 files/2.0.49/46_mod_ldap.conf 902
-RMD160 5109eb1fcd2def65089802c11d9f555bb1b2eb58 files/2.0.49/46_mod_ldap.conf 902
-SHA256 1383629d9c9b931878abe5b5ce3fbd1c5e935941cc31963f7607783008857765 files/2.0.49/46_mod_ldap.conf 902
-AUX 2.0.49/apache2-builtin-mods 2215 RMD160 8caa10fe99459fdde9631bf13a7c665edb096c67 SHA1 c1c6a6088379f1385a214a1d62831b84951e8b16 SHA256 c9d05ef4035781233997958ceb148ee4e7cf00bdf0d621a2539aa589f3d8b4d3 size 2215
-MD5 1c4d9999353237c8b3835b7d73ba7a15 files/2.0.49/apache2-builtin-mods 2215
-RMD160 8caa10fe99459fdde9631bf13a7c665edb096c67 files/2.0.49/apache2-builtin-mods 2215
-SHA256 c9d05ef4035781233997958ceb148ee4e7cf00bdf0d621a2539aa589f3d8b4d3 files/2.0.49/apache2-builtin-mods 2215
-AUX 2.0.49/apache2.confd 1739 RMD160 9f314075eb16ab0b919b7e7600cf541bc1d6cbdd SHA1 09d7d11979896dfc60b5f2f0fdb80518bfa9d2a3 SHA256 39df5e367f91705f75c98b1cddf1a22da6bbc49c59dd106d16eb132bfe619799 size 1739
-MD5 b4ad5009680a25a5fe68acb6a657bf38 files/2.0.49/apache2.confd 1739
-RMD160 9f314075eb16ab0b919b7e7600cf541bc1d6cbdd files/2.0.49/apache2.confd 1739
-SHA256 39df5e367f91705f75c98b1cddf1a22da6bbc49c59dd106d16eb132bfe619799 files/2.0.49/apache2.confd 1739
-AUX 2.0.49/apache2.initd 2494 RMD160 c6d16f46c2a8453d5c87aac72d85e075f3dc65a5 SHA1 afe1528c2ef4d2b5ee4a051b61dadbeb0c3f483c SHA256 ef09e0929a9cce499115bada0d5311a1c92b4f5befa7e31a223d049f03c052c0 size 2494
-MD5 20f6868829149f669a7afd1e03245692 files/2.0.49/apache2.initd 2494
-RMD160 c6d16f46c2a8453d5c87aac72d85e075f3dc65a5 files/2.0.49/apache2.initd 2494
-SHA256 ef09e0929a9cce499115bada0d5311a1c92b4f5befa7e31a223d049f03c052c0 files/2.0.49/apache2.initd 2494
-AUX 2.0.49/apache2logserverstatus 4652 RMD160 90e5a41ab9c4e4a6294a2a77aff258849c5f0097 SHA1 6fd14ccb329bcf4ec55f5aae2281e20cf995090b SHA256 70624f113722c94a43fee5cb5edd476fcc6268dd24b5429ef7116b469b6cbb77 size 4652
-MD5 b610d37fd521de1f8fc782069e165969 files/2.0.49/apache2logserverstatus 4652
-RMD160 90e5a41ab9c4e4a6294a2a77aff258849c5f0097 files/2.0.49/apache2logserverstatus 4652
-SHA256 70624f113722c94a43fee5cb5edd476fcc6268dd24b5429ef7116b469b6cbb77 files/2.0.49/apache2logserverstatus 4652
-AUX 2.0.49/apache2splitlogfile 4875 RMD160 79610bf8eb401d4c79560e82a73dc995d2f08797 SHA1 50f4366af586e79b1dc052a3f602ed8e2c062e59 SHA256 a9065fba8eb264b9ffc41cc3cd9959a972686d95bc2ea73a0c44027882816b8c size 4875
-MD5 8570b1055b64f29120e21be94bbdd73d files/2.0.49/apache2splitlogfile 4875
-RMD160 79610bf8eb401d4c79560e82a73dc995d2f08797 files/2.0.49/apache2splitlogfile 4875
-SHA256 a9065fba8eb264b9ffc41cc3cd9959a972686d95bc2ea73a0c44027882816b8c files/2.0.49/apache2splitlogfile 4875
-AUX 2.0.49/gentestcrt.sh 8807 RMD160 b5d2b2e5207d1bd7a7f2fdb807ea547394e53394 SHA1 07948eaeacbb25a17e7b52515385da2f597f7088 SHA256 b402634a17c5caf9d92ff7131f08b144499625b3958f90645fffb41d176a5e40 size 8807
-MD5 8a234c8eb9cc840fe2d3cfbcdfedc315 files/2.0.49/gentestcrt.sh 8807
-RMD160 b5d2b2e5207d1bd7a7f2fdb807ea547394e53394 files/2.0.49/gentestcrt.sh 8807
-SHA256 b402634a17c5caf9d92ff7131f08b144499625b3958f90645fffb41d176a5e40 files/2.0.49/gentestcrt.sh 8807
-AUX apache-2.0.48-export.diff 706 RMD160 36cc44f38597ab3d9ab0681f1146e0d7938990f3 SHA1 c36b6d8bdb40af787877602b07908befee3fe7ec SHA256 59357f09d472285619900c8e60f491024297f8c09a28f65bd151bf773e45b1e6 size 706
-MD5 2c7dedfa1c3b2b815d733e90acfa06fc files/apache-2.0.48-export.diff 706
-RMD160 36cc44f38597ab3d9ab0681f1146e0d7938990f3 files/apache-2.0.48-export.diff 706
-SHA256 59357f09d472285619900c8e60f491024297f8c09a28f65bd151bf773e45b1e6 files/apache-2.0.48-export.diff 706
-AUX apache-2.0.48-gentoo.diff 5905 RMD160 e30f27531a2dfe6afd67c9a39838fcfd38e6b832 SHA1 cda1ae64b4effc8342de666c641c3ebc9d644bc0 SHA256 76ebe2783e912aa3a3f246c7ce93820502d30790a7da5e95a03dccbe9e7b34eb size 5905
-MD5 43283cd264b5b1a6b3e5a4adba5ee2c1 files/apache-2.0.48-gentoo.diff 5905
-RMD160 e30f27531a2dfe6afd67c9a39838fcfd38e6b832 files/apache-2.0.48-gentoo.diff 5905
-SHA256 76ebe2783e912aa3a3f246c7ce93820502d30790a7da5e95a03dccbe9e7b34eb files/apache-2.0.48-gentoo.diff 5905
-AUX apache-2.0.49-gentoo.diff 6316 RMD160 63f46ae65ce2f3b86b818ee46745e808f0e793b5 SHA1 6085b5f182c0b742753908f2cd7ce56e97950b25 SHA256 779d7e902e7ac2edc51ecb2c2b0521b4a6761d8c65248ca6f526c0b7902747b9 size 6316
-MD5 b7c4fabdcb3845c4218b770acb792f73 files/apache-2.0.49-gentoo.diff 6316
-RMD160 63f46ae65ce2f3b86b818ee46745e808f0e793b5 files/apache-2.0.49-gentoo.diff 6316
-SHA256 779d7e902e7ac2edc51ecb2c2b0521b4a6761d8c65248ca6f526c0b7902747b9 files/apache-2.0.49-gentoo.diff 6316
-AUX apache-builtin-mods 2467 RMD160 5bed76f987beee2fe4d9a7710689317c0a279b02 SHA1 403ae1cb04b762a2979033465a37a5053efc99ca SHA256 82ffc220a9775757f93c038d01a2d4047e6a659ca4bfe6f133db00e1a4b015b9 size 2467
-MD5 a76e0df0ecc6920d9f4f139e31288155 files/apache-builtin-mods 2467
-RMD160 5bed76f987beee2fe4d9a7710689317c0a279b02 files/apache-builtin-mods 2467
-SHA256 82ffc220a9775757f93c038d01a2d4047e6a659ca4bfe6f133db00e1a4b015b9 files/apache-builtin-mods 2467
-AUX apache.confd 798 RMD160 0f5d9b5fa0acd0e061a3b8fc2c258dc203a50221 SHA1 299e14193f66152a554c9a954d8b7c7c4f4bf62a SHA256 e1163c4bf2daf70ec31facd017e3a6974b5df7791aee4375445c8dbc3698418f size 798
-MD5 7cb8706ad248283bac9c01f39b82c1ed files/apache.confd 798
-RMD160 0f5d9b5fa0acd0e061a3b8fc2c258dc203a50221 files/apache.confd 798
-SHA256 e1163c4bf2daf70ec31facd017e3a6974b5df7791aee4375445c8dbc3698418f files/apache.confd 798
-AUX apache.rc6 1078 RMD160 7119f2b7301cbd1f413ad90be6a7d0cfc8a67aba SHA1 b294c04ffb5c7adc90a5c9ea6d7d8afeb18dc7ba SHA256 d724061344fe59e9efb31ea45c7d2cb3c90cc8f4c0602d4f7a338ecd2c60e19f size 1078
-MD5 2b4457530debe71160f56ae68ea4c9c8 files/apache.rc6 1078
-RMD160 7119f2b7301cbd1f413ad90be6a7d0cfc8a67aba files/apache.rc6 1078
-SHA256 d724061344fe59e9efb31ea45c7d2cb3c90cc8f4c0602d4f7a338ecd2c60e19f files/apache.rc6 1078
-AUX apache2 331 RMD160 3363d75289f38cc4b90f7965e088298bc54bf964 SHA1 078b35301712f7c4842038fe1378ddeaf599d341 SHA256 3aa139ed4f21342c3c799671343c71747a345c29905dd9ec8698322730a9159c size 331
-MD5 8de91cfef98483656aa4ab47f2c2ce8e files/apache2 331
-RMD160 3363d75289f38cc4b90f7965e088298bc54bf964 files/apache2 331
-SHA256 3aa139ed4f21342c3c799671343c71747a345c29905dd9ec8698322730a9159c files/apache2 331
-AUX apacheaddmod 5979 RMD160 15f1aa1f00627b737e4e0f983c573c0445c2043f SHA1 ae29fbe76f20c407b30a3604861ee166ec0a9d1d SHA256 0af0edf3690d91604f23542ed0534b58365dcde19cedcd4ca4d381a64669c4be size 5979
-MD5 042973893566b6b09b4dd9755d8f0881 files/apacheaddmod 5979
-RMD160 15f1aa1f00627b737e4e0f983c573c0445c2043f files/apacheaddmod 5979
-SHA256 0af0edf3690d91604f23542ed0534b58365dcde19cedcd4ca4d381a64669c4be files/apacheaddmod 5979
-AUX apachedelmod 3187 RMD160 62e5c34a6232ea964f5808ca9194617602e12d38 SHA1 a35e7f8a275c1e01171ba6f0635ccaf3fb9a7026 SHA256 94932dec1f2d865909b0c047ebd9229433aec6f5b6e666d1731973e1d529aac6 size 3187
-MD5 ba87ae612a52d75f0109a2aba6cd605b files/apachedelmod 3187
-RMD160 62e5c34a6232ea964f5808ca9194617602e12d38 files/apachedelmod 3187
-SHA256 94932dec1f2d865909b0c047ebd9229433aec6f5b6e666d1731973e1d529aac6 files/apachedelmod 3187
-AUX apachelogserverstatus 4765 RMD160 959a79463dee9d920a1aab95f215a3533317912b SHA1 d4779ea5f04e01b4c805a95b441a2de24d2f13b2 SHA256 6bf7beb97f35acdb47a7fc46c65310cb36eb03c09f851c02c518ca4077e343e6 size 4765
-MD5 647bdf060613bdf1fdb840ed5ae51b72 files/apachelogserverstatus 4765
-RMD160 959a79463dee9d920a1aab95f215a3533317912b files/apachelogserverstatus 4765
-SHA256 6bf7beb97f35acdb47a7fc46c65310cb36eb03c09f851c02c518ca4077e343e6 files/apachelogserverstatus 4765
-AUX apachesplitlogfile 5068 RMD160 88c201729bd8b0d2c6d7b22cf7b13415d2db0893 SHA1 3bef6c80a9c1f4e72080884d983d694b0d04e8d5 SHA256 2761448943358d5a962f7f3e94974118d04146fc7d9d1b576b578819142dd016 size 5068
-MD5 8b5e7c3c7da4ebb58471f917a693e047 files/apachesplitlogfile 5068
-RMD160 88c201729bd8b0d2c6d7b22cf7b13415d2db0893 files/apachesplitlogfile 5068
-SHA256 2761448943358d5a962f7f3e94974118d04146fc7d9d1b576b578819142dd016 files/apachesplitlogfile 5068
-AUX common/apr-config.layout 434 RMD160 385751c8277551d73400d25ffca07d31efa73faa SHA1 bdd99b2d83f4098c9a99e06d7a9de1dc405b6ae3 SHA256 0829f1bc7279b43a4db68583c1cd545fcec23767342bae46564ce8523cb41d90 size 434
-MD5 54c0546fa2b1985686cf22c9efa2c7dc files/common/apr-config.layout 434
-RMD160 385751c8277551d73400d25ffca07d31efa73faa files/common/apr-config.layout 434
-SHA256 0829f1bc7279b43a4db68583c1cd545fcec23767342bae46564ce8523cb41d90 files/common/apr-config.layout 434
-AUX common/apr-util-config.layout 437 RMD160 3082d1005bb848028e2750ee633f09d134b483fd SHA1 24156e519ecfa333cca080f6d40458f2f132d879 SHA256 764669574b71d2793c182b06e5332490bf7e31ee0f9043483e4c77aed66abd1a size 437
-MD5 fe80b29c20bb6794eb7f4a0875588306 files/common/apr-util-config.layout 437
-RMD160 3082d1005bb848028e2750ee633f09d134b483fd files/common/apr-util-config.layout 437
-SHA256 764669574b71d2793c182b06e5332490bf7e31ee0f9043483e4c77aed66abd1a files/common/apr-util-config.layout 437
-AUX common/config.layout 741 RMD160 b00e5897bae6ebe4f8045dbe77646516af72e1e8 SHA1 f37c8f0e3111a8693c14f8742c4b5ad3c66e1f96 SHA256 7fb1ac9c2cc51625ee86c97909d6af940188dd25f99274ef9309b1d5969333b2 size 741
-MD5 5a7b58d54689d6e9d8f8214b5150d18f files/common/config.layout 741
-RMD160 b00e5897bae6ebe4f8045dbe77646516af72e1e8 files/common/config.layout 741
-SHA256 7fb1ac9c2cc51625ee86c97909d6af940188dd25f99274ef9309b1d5969333b2 files/common/config.layout 741
-AUX conf/DynamicVhosts.conf 965 RMD160 552c81595f4cab589ead57a56e85831b4a550a14 SHA1 aa4bf4877e55edd271423ec8470c4f17a11cf1d2 SHA256 6cc0ec625849b342540be1e9a64c3f6cb226aebf4b303ca07700e83d98ad0052 size 965
-MD5 162afe15726e298774bc36b586ae070a files/conf/DynamicVhosts.conf 965
-RMD160 552c81595f4cab589ead57a56e85831b4a550a14 files/conf/DynamicVhosts.conf 965
-SHA256 6cc0ec625849b342540be1e9a64c3f6cb226aebf4b303ca07700e83d98ad0052 files/conf/DynamicVhosts.conf 965
-AUX conf/Vhosts.conf 1910 RMD160 b82e2399230b950daa8052a01edf7131e3ebbf09 SHA1 97806e2e381f84ef61824345ff5316be03ba16f2 SHA256 f9f89e8fea6ff38345ab82e03aef4600168c0546e5c4880877e2fecea9d7b1a1 size 1910
-MD5 139f5b0d5e2bf3525464a336ed2e1f83 files/conf/Vhosts.conf 1910
-RMD160 b82e2399230b950daa8052a01edf7131e3ebbf09 files/conf/Vhosts.conf 1910
-SHA256 f9f89e8fea6ff38345ab82e03aef4600168c0546e5c4880877e2fecea9d7b1a1 files/conf/Vhosts.conf 1910
-AUX conf/VirtualHomePages.conf 909 RMD160 1b5b43ba1697294f929e2d36cf705abf8b684be7 SHA1 7194d0cddc47c9f7e6af50b8f84214b300aca226 SHA256 e2a295fda6147311652987a3ab0a7d74efd3d0b6e6af30f29ef0705857bd84f7 size 909
-MD5 9c606730ea7cc37417109915b2fbe522 files/conf/VirtualHomePages.conf 909
-RMD160 1b5b43ba1697294f929e2d36cf705abf8b684be7 files/conf/VirtualHomePages.conf 909
-SHA256 e2a295fda6147311652987a3ab0a7d74efd3d0b6e6af30f29ef0705857bd84f7 files/conf/VirtualHomePages.conf 909
-AUX conf/apache.conf 8115 RMD160 fdcb78e04cd5fdb02e98c4d3abc4506d44cf4778 SHA1 31ff65f35c65f5aa020547a86aa81046715cecbf SHA256 390c2f7689ee598b7b66e2955328d0586a7d0d4799b455d774f553fdd16599d4 size 8115
-MD5 a7f15bdba3786353deb7bfaf8de0efb9 files/conf/apache.conf 8115
-RMD160 fdcb78e04cd5fdb02e98c4d3abc4506d44cf4778 files/conf/apache.conf 8115
-SHA256 390c2f7689ee598b7b66e2955328d0586a7d0d4799b455d774f553fdd16599d4 files/conf/apache.conf 8115
-AUX conf/commonapache.conf 22216 RMD160 abb82a86fa4bdef199edd09bedd94a2286fb22f6 SHA1 26f3cdfe8fac1fc669b402930b2d21d58c48c04d SHA256 1b51dcc085fb84a7c77e25e4546cf4cf5102baa0933b59c40218f03587f97a33 size 22216
-MD5 c70dc2c9a5e56660f3f120fcb822fadc files/conf/commonapache.conf 22216
-RMD160 abb82a86fa4bdef199edd09bedd94a2286fb22f6 files/conf/commonapache.conf 22216
-SHA256 1b51dcc085fb84a7c77e25e4546cf4cf5102baa0933b59c40218f03587f97a33 files/conf/commonapache.conf 22216
-AUX httpd-2.0.48-ipv6.patch 865 RMD160 0309ce8d85fe499997a879205e4909e604599051 SHA1 83ec7123157fd4df4bff18770fa5d9f6903e250f SHA256 aba5ff0caafc53ac3cc391f1776ad3c49d44ca878ba81330e81578ab9dcaad67 size 865
-MD5 b9ff3534313dae1b8ac96df0e3e01373 files/httpd-2.0.48-ipv6.patch 865
-RMD160 0309ce8d85fe499997a879205e4909e604599051 files/httpd-2.0.48-ipv6.patch 865
-SHA256 aba5ff0caafc53ac3cc391f1776ad3c49d44ca878ba81330e81578ab9dcaad67 files/httpd-2.0.48-ipv6.patch 865
-AUX httpd-2.0.49-cgi.patch 10319 RMD160 f157f6c63ee46a71f6f2fec4a3d813530d839489 SHA1 9cd410ee9101789cccd0eee737c053cc09a7313d SHA256 5e27a27d0f9f297498b6e69b724a0f34d9c9a151fbf1e1634adf7d9a8bfa2879 size 10319
-MD5 d52999376f67a872ee48cbae72db0160 files/httpd-2.0.49-cgi.patch 10319
-RMD160 f157f6c63ee46a71f6f2fec4a3d813530d839489 files/httpd-2.0.49-cgi.patch 10319
-SHA256 5e27a27d0f9f297498b6e69b724a0f34d9c9a151fbf1e1634adf7d9a8bfa2879 files/httpd-2.0.49-cgi.patch 10319
-AUX httpd-2.0.49-ipv6.patch 788 RMD160 daf60de982736170f6d5ea1ff297ff3ceda14c41 SHA1 3c2e38b84e2ed3967d14bca4ee90fe50a3820516 SHA256 606033033b4d6d8227cb9f1e1f0cae23f1bd30ced58bcd2797b72b09e28d0413 size 788
-MD5 8cb4313e58d7bd5dc369eb92f75daa2b files/httpd-2.0.49-ipv6.patch 788
-RMD160 daf60de982736170f6d5ea1ff297ff3ceda14c41 files/httpd-2.0.49-ipv6.patch 788
-SHA256 606033033b4d6d8227cb9f1e1f0cae23f1bd30ced58bcd2797b72b09e28d0413 files/httpd-2.0.49-ipv6.patch 788
-AUX patches/2.0.49-r1/00_ssl_verify_client.patch 6671 RMD160 e266b745db890b5b6e1009ac631346d220da33c4 SHA1 1b4110466441a5fd1430a44a82964605e38ef580 SHA256 24b172530a7b8a689e5d8ef0d0fc1e9c2204c7b4228b01b1f2785a35c9bc5d3e size 6671
-MD5 59deb12158a55cc2259cd79c245eb00d files/patches/2.0.49-r1/00_ssl_verify_client.patch 6671
-RMD160 e266b745db890b5b6e1009ac631346d220da33c4 files/patches/2.0.49-r1/00_ssl_verify_client.patch 6671
-SHA256 24b172530a7b8a689e5d8ef0d0fc1e9c2204c7b4228b01b1f2785a35c9bc5d3e files/patches/2.0.49-r1/00_ssl_verify_client.patch 6671
-AUX patches/2.0.49-r1/01_apache_ldap_fixes.patch 18048 RMD160 b064dcf02b90e5cb017f9c25cc0f659acdfa4983 SHA1 b32877b4e513b94ab5067a3b5f3981f78a7f445f SHA256 b0251805126dccc0a289d5d567978fff03060d983588d7995b889af1b559c9dc size 18048
-MD5 b30d264a0cfb08b2ce2300132abbe654 files/patches/2.0.49-r1/01_apache_ldap_fixes.patch 18048
-RMD160 b064dcf02b90e5cb017f9c25cc0f659acdfa4983 files/patches/2.0.49-r1/01_apache_ldap_fixes.patch 18048
-SHA256 b0251805126dccc0a289d5d567978fff03060d983588d7995b889af1b559c9dc files/patches/2.0.49-r1/01_apache_ldap_fixes.patch 18048
-AUX patches/2.0.49-r1/04_ssl_makefile.patch 619 RMD160 056acf62b2354be73b3e97dc13d11f655ac2526b SHA1 ad5249b97333af852f51bb0b1a8250367534d902 SHA256 55370d58a308c2b242c56be9aeaed85fbdb37fc4859e33cb00c07e01eb26421f size 619
-MD5 30add456de1ed8fab4bc473a4afda161 files/patches/2.0.49-r1/04_ssl_makefile.patch 619
-RMD160 056acf62b2354be73b3e97dc13d11f655ac2526b files/patches/2.0.49-r1/04_ssl_makefile.patch 619
-SHA256 55370d58a308c2b242c56be9aeaed85fbdb37fc4859e33cb00c07e01eb26421f files/patches/2.0.49-r1/04_ssl_makefile.patch 619
-AUX patches/2.0.49-r1/Readme.PATCHES 507 RMD160 27b7cb6ef0ecab8d8336e4f0b4fadcc9972550c3 SHA1 7b643a9a5b7f79efef946e522972152437673a29 SHA256 892df4db5d01e6e9f666c825eab075c5be4f4b23c1971efaf85ac3591716155e size 507
-MD5 21a6ee55341125140e40c0f48144277d files/patches/2.0.49-r1/Readme.PATCHES 507
-RMD160 27b7cb6ef0ecab8d8336e4f0b4fadcc9972550c3 files/patches/2.0.49-r1/Readme.PATCHES 507
-SHA256 892df4db5d01e6e9f666c825eab075c5be4f4b23c1971efaf85ac3591716155e files/patches/2.0.49-r1/Readme.PATCHES 507
-AUX patches/2.0.49-r2/01_gentoo_cgi.patch 10319 RMD160 f157f6c63ee46a71f6f2fec4a3d813530d839489 SHA1 9cd410ee9101789cccd0eee737c053cc09a7313d SHA256 5e27a27d0f9f297498b6e69b724a0f34d9c9a151fbf1e1634adf7d9a8bfa2879 size 10319
-MD5 d52999376f67a872ee48cbae72db0160 files/patches/2.0.49-r2/01_gentoo_cgi.patch 10319
-RMD160 f157f6c63ee46a71f6f2fec4a3d813530d839489 files/patches/2.0.49-r2/01_gentoo_cgi.patch 10319
-SHA256 5e27a27d0f9f297498b6e69b724a0f34d9c9a151fbf1e1634adf7d9a8bfa2879 files/patches/2.0.49-r2/01_gentoo_cgi.patch 10319
-AUX robots.txt 342 RMD160 c007845abf1663f317a94d1749ecc6d975acbc1c SHA1 3f5edf43d650c851d15028459b265727bceaffa7 SHA256 ffc42ca609582241958a5b560dc65e596116d3f9123208a3c1e29d56ba61c5f8 size 342
-MD5 59a6ba7dcde461f5350af41e6aff92b1 files/robots.txt 342
-RMD160 c007845abf1663f317a94d1749ecc6d975acbc1c files/robots.txt 342
-SHA256 ffc42ca609582241958a5b560dc65e596116d3f9123208a3c1e29d56ba61c5f8 files/robots.txt 342
-AUX suexec.pam 59 RMD160 f271f5be1683fb60ec9611615ecf43af44cb0ba8 SHA1 6f76c4e78863d9f9634cb2eb1966ddec509d045b SHA256 565ea6eff7004c4933f5afddb9b0170359707e1e59884947463613ba3e13319b size 59
-MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59
-RMD160 f271f5be1683fb60ec9611615ecf43af44cb0ba8 files/suexec.pam 59
-SHA256 565ea6eff7004c4933f5afddb9b0170359707e1e59884947463613ba3e13319b files/suexec.pam 59
-AUX suexec_pam_gentoo.patch 2149 RMD160 bc2da04439fde40ce90826aab721239e2cf05e23 SHA1 bad2e5251791f1b9571e2d21e977fb0496c00f48 SHA256 32618a274dd2433d5d3f6295c7047fc7caf16763ec4fa4a6234c92fe08d3b606 size 2149
-MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
-RMD160 bc2da04439fde40ce90826aab721239e2cf05e23 files/suexec_pam_gentoo.patch 2149
-SHA256 32618a274dd2433d5d3f6295c7047fc7caf16763ec4fa4a6234c92fe08d3b606 files/suexec_pam_gentoo.patch 2149
-DIST apache-conf-2.0.54-r15.tar.bz2 24832 RMD160 2db1ed0940033f2e747139e0abb1015bff835402 SHA256 0ca8fced4e01d9ee64e983e3a0f4f11f7ae1dfe63afbed72d3ec73f60c9361d1 size 24832
-DIST apache-conf-2.0.54-r16.tar.bz2 24850 RMD160 da7a70f0e2fa86756e2fcbb3b550367ffa129d3b SHA256 eddb875e048862682051992e7fb955631366e98a85ef192bd2e6940f21bffa30 size 24850
-DIST apache-conf-2.0.54-r9.tar.bz2 24869 RMD160 c20ebe4217cfa46047161738837c5a14b850c5c2 SHA256 3c1bb9b281e553d4a16b3019ba927ee3e0c19e938b04d378e7e2081a3b840c20 size 24869
-DIST apache-patches-1.3.32-r1.tar.bz2 15741 RMD160 928f1b1f881d38df138c61891fcf45d156816815 SHA256 4b044663778a5a1fce0e1ff38a56602ad885d36dc670bd2c7e1538cb56090449 size 15741
-DIST apache-patches-1.3.33-20050711.tar.bz2 14272 RMD160 59f7a6bfa3b5756bf61c1db0ba3df5545b27e298 SHA256 6cce6437c840c6400265b4905cdc18760e5b14c5ba2a0d2a92599007f8021c4a size 14272
-DIST apache-patches-1.3.34-20060131.tar.bz2 14655 RMD160 2c7b3abea9bac00b541e17e0e5e25a1362f9e806 SHA256 05f50b5412d681ebabcd03c30e9957fafe60e1f4f42846a6bc4044ee9993e17b size 14655
-DIST apache-patches-2.0.54-r15.tar.bz2 11475 RMD160 127189ffb8139c16c4362b89a3fc9e0f1a293eed SHA256 a273683930a94598400d873016b4604073aa570bc8dc02ec47544d67016ef49a size 11475
-DIST apache-patches-2.0.54-r16.tar.bz2 12016 RMD160 a265531af9152d276d4d73d4b2d5774210e312d6 SHA256 b8dc23dc0ca9ac1fb04d0800bd1f8acf80c346cd9412c16c05011ae6ab1ecfa2 size 12016
-DIST apache-patches-2.0.54-r9.tar.bz2 9507 RMD160 23de1c69bcfd5f22dfd344f303abdb6fe72b2331 SHA256 4038d291852c437510324a86d40388a61c2886e1993f1e6ff7f0d438f40df301 size 9507
-DIST apache_1.3.32.tar.gz 2472811 RMD160 f81e6f0a75b00183981519092262e5352d6d56e1 SHA256 16249933a42836fdcd1bcaad1f436a599b4163626bf35936e89f5049a681a8e5 size 2472811
-DIST apache_1.3.33.tar.gz 2468567 RMD160 80e9ea2c7c75f49454acfd83cead5506c5ffddea SHA256 c7327891a6dba926e97d701463f9877fa164757189d192aac8d52100bf2a2484 size 2468567
-DIST apache_1.3.34.tar.gz 2468056 RMD160 e39dfc57b7f9164aa76641de3fa74f0314c9ec9e SHA256 ceed243f4f98e4323b48e5f7f80e306d1abb00c592e18de5575983db42d6f8d4 size 2468056
-DIST gentoo-apache-1.3.33-r13-20051204.tar.bz2 28158 RMD160 7cbbd0b9f231723dba5762e7a3fec5d4c162ce79 SHA256 ae05455b53686b596c2250e2b67b7f9a9b5bf55c6017f369ef904654428268b3 size 28158
-DIST gentoo-apache-1.3.34-r10-20051213.tar.bz2 27570 RMD160 a45c59edcd7f5744f52ebced3ffb7f6b67e21a23 SHA256 111d9cdfac6782bc8720acc6b20d2a1de9c310f0d2f18228f29bf3824c74635f size 27570
-DIST gentoo-apache-1.3.34-r11-20060131.tar.bz2 27897 RMD160 bbb33be5ac758f71041fc6a1b0eb79f24a235ea3 SHA256 aad479c67c8ffe59312d107094f86d4cf76fe2e046cb98d297d8e526fc85f9a7 size 27897
-DIST gentoo-apache-1.3.34-r12-20060401.tar.bz2 27547 RMD160 c1a60cc89b387ac1c2ba926c0c369eeef5d5f2c0 SHA256 e1925eb955db1cc2bd2cd0fb0552ad3a4aebda0bc476eb904e87eb5dcfa6fb1d size 27547
-DIST gentoo-apache-2.0.54-r30-20050910.tar.bz2 54255 RMD160 ccae3665a245efbb02e541922b4459e66369081e SHA256 6610d28064957b96ac00c4951cd7c9848f48eb0c50f0d91d7361d6c360311759 size 54255
-DIST gentoo-apache-2.0.54-r31-20050918-02.tar.bz2 52990 RMD160 bc85ac9de56e017c035d798d9aa45cabab265006 SHA256 23f2431f6285a24959a99ab9d55d52cef349e828bcb0e7bea026bbae14695ce5 size 52990
-DIST gentoo-apache-2.0.55-20051023.tar.bz2 51148 RMD160 ceca9fdc0adc8b249a35b435286245dd64e221c5 SHA256 9fcd2a6dc2e46e040cc55a8a66b37d08e27b46178914816c073ef3ec70c6f02e size 51148
-DIST gentoo-apache-2.0.55-r1-20060115.tar.bz2 51735 RMD160 18902966bdce2cbe67ba15b6eb66e311657a8d6d SHA256 712fb5e292e87bdad0de984085837b5bb974ab57447e5e28356d0041cbb404e3 size 51735
-DIST gentoo-apache-2.0.55-r2-20060331.tar.bz2 51427 RMD160 b0e86eff63f8fa98edcea14fccb583eb44615f6d SHA256 be37642bd1425bde8ae47bb968b015bb310c131f7ec91379841faef969a717ea size 51427
-DIST gentoo-apache-2.0.58-20060515.tar.bz2 51174 RMD160 e029caa8107e37b66999935d6c1e9ed2e95351f0 SHA256 3d11702d3fd6b5c143b1c238e9b4a0d4bed2b3c4b9834efa6a3436cca492c0e5 size 51174
-DIST gentoo-apache-2.2.0-r1-20060227.tar.bz2 27114 RMD160 f51361add210ec0e3737c77c3b81e6b8657e3acb SHA256 89096d554838016e282b1374ea02719389f0b04a9b92bbded5cd2e5f5bcc816f size 27114
-DIST gentoo-apache-2.2.0-r2-20060306.tar.bz2 48730 RMD160 adee915809097479cd0ed03012194351b7218732 SHA256 c6e054757a04d6d81b16e32caa2e88f9e9a61a68c560aa83654624b7c2fce068 size 48730
-DIST httpd-2.0.54.tar.bz2 5566979 RMD160 c511cb2fa396ba04caf77bfc6ca03413df48ea08 SHA256 55a3d1c3fc4ff5ed5a4c4a20050ab68d98a10b2ab7d52f02a485da1a0fb060e3 size 5566979
-DIST httpd-2.0.55.tar.bz2 4745220 RMD160 04749dcf9ea369152eddf9422e49bc0a77a443eb SHA256 764d12f9f3ca1b01218077681a9c08b43bc8239079ec7c2ca99c8a7fa47d3652 size 4745220
-DIST httpd-2.0.58.tar.bz2 4704318 RMD160 2ff44b2254552db908f1defd09e3142527f9bf83 SHA256 4f746715c408f4cac48099ea72560c50ef190568dfcfa8e0762bae66c0398029 size 4704318
-DIST httpd-2.2.0.tar.bz2 4839151 RMD160 7ee7364d24881c68f2d4643089fb996888bba9c0 SHA256 bbf1a452889f9d502840e3b8dda4938b6bd633b94b888ab799ee9aa5845115f7 size 4839151
-DIST lingerd-0.94.tar.gz 33938 RMD160 2d7363b763a68c0c7acdadc23779929f4d02153f SHA256 632030f9c1b9e8f817ee19bad74988f3dce7f6ec617677ad5a522e8d491382a0 size 33938
-DIST mod_ssl-2.8.21-1.3.32.tar.gz 754629 RMD160 559124e89e51ebb362f2468103f4432439bf5a18 SHA256 1717eb96e9de60a24d73e9616fb7e6bcc9d47891c6e77cb26d4bf529c4382260 size 754629
-DIST mod_ssl-2.8.24-1.3.33.tar.gz 820292 RMD160 1651dcd85abd37d6955f241c730e101df482d545 SHA256 cb5907d74a1aef6100c0bd9a50aab33332249c85ae2f3e3431fafff5494c14fa size 820292
-DIST mod_ssl-2.8.25-1.3.34.tar.gz 820352 RMD160 90a3913d30c7f4d194907463125c90101005837a SHA256 832b240157666efdbdfc1a2fd593ee4eebbc9441ec48ece8276660092b974d07 size 820352
-EBUILD apache-1.3.32-r1.ebuild 6685 RMD160 bed06d46549aa916c55c4010abb6200250aab467 SHA1 b22261f02b9078c1183cdea304ea92f35ed09801 SHA256 960a79fc39624020599cb70dde4ed7c460ad924373755cfbffb0359f700f9c4d size 6685
-MD5 26a30fcfe2a6fbbf994b64756ed4f604 apache-1.3.32-r1.ebuild 6685
-RMD160 bed06d46549aa916c55c4010abb6200250aab467 apache-1.3.32-r1.ebuild 6685
-SHA256 960a79fc39624020599cb70dde4ed7c460ad924373755cfbffb0359f700f9c4d apache-1.3.32-r1.ebuild 6685
-EBUILD apache-1.3.33-r13.ebuild 8690 RMD160 924939b1549471c45d7e2cf6c49ae50ed241e9fa SHA1 849d53946c1ca916a6fed7ff804db7e7ddd69328 SHA256 ec92ffa7bf8fe7d915568c1303c29db927f3b507df7935dfd55ac5a544ee1e36 size 8690
-MD5 a4a6f1e1f045639c87e5d49a84c626da apache-1.3.33-r13.ebuild 8690
-RMD160 924939b1549471c45d7e2cf6c49ae50ed241e9fa apache-1.3.33-r13.ebuild 8690
-SHA256 ec92ffa7bf8fe7d915568c1303c29db927f3b507df7935dfd55ac5a544ee1e36 apache-1.3.33-r13.ebuild 8690
-EBUILD apache-1.3.33-r6.ebuild 7108 RMD160 9ec568d6e5ea7bd132cbbcdb47522340ed559c1a SHA1 de8c37c2601b7f2f6f946458855045f780d83943 SHA256 9ea37ad4884445ca6b40dd7f3a8d59dbb8637c1e5dc0c5289fa330ff3f4478ee size 7108
-MD5 17e12318b6dd1cd8bb25cb987490c7fd apache-1.3.33-r6.ebuild 7108
-RMD160 9ec568d6e5ea7bd132cbbcdb47522340ed559c1a apache-1.3.33-r6.ebuild 7108
-SHA256 9ea37ad4884445ca6b40dd7f3a8d59dbb8637c1e5dc0c5289fa330ff3f4478ee apache-1.3.33-r6.ebuild 7108
-EBUILD apache-1.3.34-r1.ebuild 7114 RMD160 244cc283b19e91009a44ac55d506dbb202a8c3e8 SHA1 4f4d7568c7f57cc76486c48ed1a05fc7e5ab3350 SHA256 d60af100e42506d43c935a6b5d3183ef445b98d83fe190a3d6bf0ba31d2c724a size 7114
-MD5 f98b6437e47b471cea336f1cbb6ac240 apache-1.3.34-r1.ebuild 7114
-RMD160 244cc283b19e91009a44ac55d506dbb202a8c3e8 apache-1.3.34-r1.ebuild 7114
-SHA256 d60af100e42506d43c935a6b5d3183ef445b98d83fe190a3d6bf0ba31d2c724a apache-1.3.34-r1.ebuild 7114
-EBUILD apache-1.3.34-r10.ebuild 8690 RMD160 28f379c344ab089cb5063f443d0463fd558b1774 SHA1 2a9f35b87ab43a90e6f13891c351935b17a46061 SHA256 65d70183f5e960ab316a265ff80c14d4ed0c2364dc30ee8337c89998222849d1 size 8690
+DIST apache_1.3.34.tar.gz 2468056 RMD160 e39dfc57b7f9164aa76641de3fa74f0314c9ec9e SHA1 df082b73f1220555dc416c0c5afa746e30a9e0de SHA256 ceed243f4f98e4323b48e5f7f80e306d1abb00c592e18de5575983db42d6f8d4
+DIST gentoo-apache-1.3.34-r10-20051213.tar.bz2 27570 RMD160 a45c59edcd7f5744f52ebced3ffb7f6b67e21a23 SHA1 9934fc84f3879e26347ed3f3fa7ff56dfd26f1c8 SHA256 111d9cdfac6782bc8720acc6b20d2a1de9c310f0d2f18228f29bf3824c74635f
+DIST gentoo-apache-1.3.34-r11-20060131.tar.bz2 27897 RMD160 bbb33be5ac758f71041fc6a1b0eb79f24a235ea3 SHA1 50c51fd4429df080c74b1c87faea6e3396cd01c1 SHA256 aad479c67c8ffe59312d107094f86d4cf76fe2e046cb98d297d8e526fc85f9a7
+DIST gentoo-apache-1.3.34-r12-20060401.tar.bz2 27547 RMD160 c1a60cc89b387ac1c2ba926c0c369eeef5d5f2c0 SHA1 c00816e114438fa6db8768ddcbe352b3bcf09550 SHA256 e1925eb955db1cc2bd2cd0fb0552ad3a4aebda0bc476eb904e87eb5dcfa6fb1d
+DIST gentoo-apache-2.0.54-r31-20050918-02.tar.bz2 52990 RMD160 bc85ac9de56e017c035d798d9aa45cabab265006 SHA1 7ec8eb508404f572ad581446b12cf189c9e1c38c SHA256 23f2431f6285a24959a99ab9d55d52cef349e828bcb0e7bea026bbae14695ce5
+DIST gentoo-apache-2.0.55-r1-20060115.tar.bz2 51735 RMD160 18902966bdce2cbe67ba15b6eb66e311657a8d6d SHA1 2d0a84e20b575177dde67e0c644b82de5db60f33 SHA256 712fb5e292e87bdad0de984085837b5bb974ab57447e5e28356d0041cbb404e3
+DIST gentoo-apache-2.0.58-20060515.tar.bz2 51174 RMD160 e029caa8107e37b66999935d6c1e9ed2e95351f0 SHA1 c88f42534f7419517905679f028be8b5754af962 SHA256 3d11702d3fd6b5c143b1c238e9b4a0d4bed2b3c4b9834efa6a3436cca492c0e5
+DIST gentoo-apache-2.2.0-r1-20060227.tar.bz2 27114 RMD160 f51361add210ec0e3737c77c3b81e6b8657e3acb SHA1 cdcf4e276030ee7922b2293d867b3c4b75be9634 SHA256 89096d554838016e282b1374ea02719389f0b04a9b92bbded5cd2e5f5bcc816f
+DIST gentoo-apache-2.2.0-r2-20060306.tar.bz2 48730 RMD160 adee915809097479cd0ed03012194351b7218732 SHA1 50ca64fba157a0490be537a1993ae9fe1077e10d SHA256 c6e054757a04d6d81b16e32caa2e88f9e9a61a68c560aa83654624b7c2fce068
+DIST httpd-2.0.54.tar.bz2 5566979 RMD160 c511cb2fa396ba04caf77bfc6ca03413df48ea08 SHA1 15b4fc3024cceea6562fb03383fd624e84e5e35a SHA256 55a3d1c3fc4ff5ed5a4c4a20050ab68d98a10b2ab7d52f02a485da1a0fb060e3
+DIST httpd-2.0.55.tar.bz2 4745220 RMD160 04749dcf9ea369152eddf9422e49bc0a77a443eb SHA1 ab016aace57f34cb3eae5c9d48f2bcc5759d6c84 SHA256 764d12f9f3ca1b01218077681a9c08b43bc8239079ec7c2ca99c8a7fa47d3652
+DIST httpd-2.0.58.tar.bz2 4704318 RMD160 2ff44b2254552db908f1defd09e3142527f9bf83 SHA1 697e1674f8efbbe05b9f6c1ba00cd28a37293229 SHA256 4f746715c408f4cac48099ea72560c50ef190568dfcfa8e0762bae66c0398029
+DIST httpd-2.2.0.tar.bz2 4839151 RMD160 7ee7364d24881c68f2d4643089fb996888bba9c0 SHA1 96136720434aa562b76e432b09b874ca6476dd4d SHA256 bbf1a452889f9d502840e3b8dda4938b6bd633b94b888ab799ee9aa5845115f7
+DIST lingerd-0.94.tar.gz 33938 RMD160 2d7363b763a68c0c7acdadc23779929f4d02153f SHA1 25d32aca3f03fbc9273fca6491444d1920818a1c SHA256 632030f9c1b9e8f817ee19bad74988f3dce7f6ec617677ad5a522e8d491382a0
+DIST mod_ssl-2.8.25-1.3.34.tar.gz 820352 RMD160 90a3913d30c7f4d194907463125c90101005837a SHA1 150f726539d74c0d2af02e482be78bbcdb811395 SHA256 832b240157666efdbdfc1a2fd593ee4eebbc9441ec48ece8276660092b974d07
+EBUILD apache-1.3.34-r10.ebuild 8690 RMD160 28f379c344ab089cb5063f443d0463fd558b1774 SHA1 2a9f35b87ab43a90e6f13891c351935b17a46061 SHA256 65d70183f5e960ab316a265ff80c14d4ed0c2364dc30ee8337c89998222849d1
 MD5 98c07bbbb85e46d6f95a54089d4fd0fd apache-1.3.34-r10.ebuild 8690
 RMD160 28f379c344ab089cb5063f443d0463fd558b1774 apache-1.3.34-r10.ebuild 8690
 SHA256 65d70183f5e960ab316a265ff80c14d4ed0c2364dc30ee8337c89998222849d1 apache-1.3.34-r10.ebuild 8690
-EBUILD apache-1.3.34-r11.ebuild 8836 RMD160 eb57a3e5b9a55d873b0609fe8db25e7e8ecd5d1c SHA1 8513da0a256df823e103a57971e9fe525376209a SHA256 f3bc1356d0c1ffcb1d8babc3cea4ef2e1727b2cb448f562ecf1dc7536e7097ec size 8836
+EBUILD apache-1.3.34-r11.ebuild 8836 RMD160 eb57a3e5b9a55d873b0609fe8db25e7e8ecd5d1c SHA1 8513da0a256df823e103a57971e9fe525376209a SHA256 f3bc1356d0c1ffcb1d8babc3cea4ef2e1727b2cb448f562ecf1dc7536e7097ec
 MD5 ae6ed6d4b9592bcb1c4d4b5fa87682f6 apache-1.3.34-r11.ebuild 8836
 RMD160 eb57a3e5b9a55d873b0609fe8db25e7e8ecd5d1c apache-1.3.34-r11.ebuild 8836
 SHA256 f3bc1356d0c1ffcb1d8babc3cea4ef2e1727b2cb448f562ecf1dc7536e7097ec apache-1.3.34-r11.ebuild 8836
-EBUILD apache-1.3.34-r12.ebuild 8844 RMD160 8b22296eec5d6811f3186154bbf26b859ada3d7d SHA1 af0711cca450afd0a6c1dd1b5a528ad55666cedd SHA256 c106f9475905b4ea0e2aa2eb200868abcc2ab7e14cd664fdbe1b20524faddfd8 size 8844
+EBUILD apache-1.3.34-r12.ebuild 8844 RMD160 8b22296eec5d6811f3186154bbf26b859ada3d7d SHA1 af0711cca450afd0a6c1dd1b5a528ad55666cedd SHA256 c106f9475905b4ea0e2aa2eb200868abcc2ab7e14cd664fdbe1b20524faddfd8
 MD5 b9c187613db1ea91370b7aa585866af7 apache-1.3.34-r12.ebuild 8844
 RMD160 8b22296eec5d6811f3186154bbf26b859ada3d7d apache-1.3.34-r12.ebuild 8844
 SHA256 c106f9475905b4ea0e2aa2eb200868abcc2ab7e14cd664fdbe1b20524faddfd8 apache-1.3.34-r12.ebuild 8844
-EBUILD apache-1.3.34-r2.ebuild 7155 RMD160 2a636034695d112f3e8ed40bef900cb95d39dfca SHA1 07ca33d812d1c3ce2e6eeeee1a6b581d5ad90f9b SHA256 12e1d0f7f77e909006edf616c52e4af9455fc924f17a53bfdae73f3f93f77c2f size 7155
-MD5 e38f273b00d0ffd7525584f7ba69dfb1 apache-1.3.34-r2.ebuild 7155
-RMD160 2a636034695d112f3e8ed40bef900cb95d39dfca apache-1.3.34-r2.ebuild 7155
-SHA256 12e1d0f7f77e909006edf616c52e4af9455fc924f17a53bfdae73f3f93f77c2f apache-1.3.34-r2.ebuild 7155
-EBUILD apache-2.0.54-r15.ebuild 12613 RMD160 ad3a88dcf63ce982b0c642abb94a3ee02987299c SHA1 a5d3064326c4c5c5487283c7153a7b97c093392e SHA256 2e54d5fa3bf6b3a2be5c2879f939104d9c93d1cb52d22901bc9ba765911e29df size 12613
-MD5 616c57972bd2445b0938d95b04134400 apache-2.0.54-r15.ebuild 12613
-RMD160 ad3a88dcf63ce982b0c642abb94a3ee02987299c apache-2.0.54-r15.ebuild 12613
-SHA256 2e54d5fa3bf6b3a2be5c2879f939104d9c93d1cb52d22901bc9ba765911e29df apache-2.0.54-r15.ebuild 12613
-EBUILD apache-2.0.54-r16.ebuild 13063 RMD160 f582a1e27acf6b5869a9aad450177eb1945114c2 SHA1 05d1094722d4f8ff7dedd3d843e0a1fb83121f04 SHA256 a1aab65d6ffdf6feb7df24ba09a0cc297a66e4edc625201dee144583aec8643e size 13063
-MD5 01e8e474c84e3da3e483c2740ccee211 apache-2.0.54-r16.ebuild 13063
-RMD160 f582a1e27acf6b5869a9aad450177eb1945114c2 apache-2.0.54-r16.ebuild 13063
-SHA256 a1aab65d6ffdf6feb7df24ba09a0cc297a66e4edc625201dee144583aec8643e apache-2.0.54-r16.ebuild 13063
-EBUILD apache-2.0.54-r30.ebuild 13047 RMD160 b13838b8822017cc903975eaff065fd105d43a2d SHA1 e01e72cde3c71ec0d6cbe27400300c6d2ce49464 SHA256 0023fa508b02c9d10e204c891fe4c76edab4f665fd651085527057c08bda150a size 13047
-MD5 220f420605bbb89d077f6843592e1c34 apache-2.0.54-r30.ebuild 13047
-RMD160 b13838b8822017cc903975eaff065fd105d43a2d apache-2.0.54-r30.ebuild 13047
-SHA256 0023fa508b02c9d10e204c891fe4c76edab4f665fd651085527057c08bda150a apache-2.0.54-r30.ebuild 13047
-EBUILD apache-2.0.54-r31.ebuild 13494 RMD160 3eb61fe5172c443dd8b93cae361093538b5456f8 SHA1 78c2ca7d2869a4aaf5552d7c4ed3cb44905f2666 SHA256 d62d8649fe123d6d1482f38afa3d209375a4308ab6786af8ca09e2524a57f2ab size 13494
+EBUILD apache-2.0.54-r31.ebuild 13494 RMD160 3eb61fe5172c443dd8b93cae361093538b5456f8 SHA1 78c2ca7d2869a4aaf5552d7c4ed3cb44905f2666 SHA256 d62d8649fe123d6d1482f38afa3d209375a4308ab6786af8ca09e2524a57f2ab
 MD5 492e69c553ca035e8290c3bad08f4b0c apache-2.0.54-r31.ebuild 13494
 RMD160 3eb61fe5172c443dd8b93cae361093538b5456f8 apache-2.0.54-r31.ebuild 13494
 SHA256 d62d8649fe123d6d1482f38afa3d209375a4308ab6786af8ca09e2524a57f2ab apache-2.0.54-r31.ebuild 13494
-EBUILD apache-2.0.54-r9.ebuild 12611 RMD160 7e8d9b111b7ef84645c6bf0a4b970b7595316337 SHA1 557f90f5df177affb7597c8f5dd586c0a9ea3826 SHA256 45cbbc0dc8ebd2a423312578c14dc208e7675ee81a54124bd1a16b0b23204059 size 12611
-MD5 ffb80fefef3d0c3eac85785872ee70f5 apache-2.0.54-r9.ebuild 12611
-RMD160 7e8d9b111b7ef84645c6bf0a4b970b7595316337 apache-2.0.54-r9.ebuild 12611
-SHA256 45cbbc0dc8ebd2a423312578c14dc208e7675ee81a54124bd1a16b0b23204059 apache-2.0.54-r9.ebuild 12611
-EBUILD apache-2.0.55-r1.ebuild 13452 RMD160 2fa50978daa576cc8addfd2b60b1afdba8797c9f SHA1 c5e9d73aa37661a9654c5ce71d64bb7ba2b69872 SHA256 fd56390d3246d98cabafd9e4453f3917abdc3aa989b5f78ce5824d676d23bc4e size 13452
+EBUILD apache-2.0.55-r1.ebuild 13452 RMD160 2fa50978daa576cc8addfd2b60b1afdba8797c9f SHA1 c5e9d73aa37661a9654c5ce71d64bb7ba2b69872 SHA256 fd56390d3246d98cabafd9e4453f3917abdc3aa989b5f78ce5824d676d23bc4e
 MD5 3c5d2b5cf8f50612a9681b4a056e871e apache-2.0.55-r1.ebuild 13452
 RMD160 2fa50978daa576cc8addfd2b60b1afdba8797c9f apache-2.0.55-r1.ebuild 13452
 SHA256 fd56390d3246d98cabafd9e4453f3917abdc3aa989b5f78ce5824d676d23bc4e apache-2.0.55-r1.ebuild 13452
-EBUILD apache-2.0.55-r2.ebuild 13475 RMD160 975635fc1fb5096288b08c4ec0f2ca5c33f8d92e SHA1 080fdef489f91cfd28eb7ac9eb59b5e07efc090a SHA256 18b6e50e852f10b4f0f201fd385fcbaebf742236e8a1e239045799249d5d5edc size 13475
-MD5 2f0c1e2e067d75fb3d654b02c2c62834 apache-2.0.55-r2.ebuild 13475
-RMD160 975635fc1fb5096288b08c4ec0f2ca5c33f8d92e apache-2.0.55-r2.ebuild 13475
-SHA256 18b6e50e852f10b4f0f201fd385fcbaebf742236e8a1e239045799249d5d5edc apache-2.0.55-r2.ebuild 13475
-EBUILD apache-2.0.55.ebuild 13449 RMD160 7704dd990a9d4edf05af1654fbb9b8ef429f76da SHA1 5f949a0ad9c24f97fcd2b1f55eded70176dbcb1f SHA256 9c43b4130e87cb597b8ecb59c82832d3f8e02e22a815fd69158e303b9458ebec size 13449
-MD5 7207a0ceb0c4bc61e8498bf82c7c52ae apache-2.0.55.ebuild 13449
-RMD160 7704dd990a9d4edf05af1654fbb9b8ef429f76da apache-2.0.55.ebuild 13449
-SHA256 9c43b4130e87cb597b8ecb59c82832d3f8e02e22a815fd69158e303b9458ebec apache-2.0.55.ebuild 13449
-EBUILD apache-2.0.58.ebuild 13758 RMD160 d07868aaf19540f7b7734eb98b4d6d9eab49682c SHA1 88c89c0573d5292aaaafefe39934db3558f6d5ee SHA256 82ea6e899281836159f064bec7842cbe625f072590b1632a107ccc08c8082fce size 13758
+EBUILD apache-2.0.58.ebuild 13758 RMD160 d07868aaf19540f7b7734eb98b4d6d9eab49682c SHA1 88c89c0573d5292aaaafefe39934db3558f6d5ee SHA256 82ea6e899281836159f064bec7842cbe625f072590b1632a107ccc08c8082fce
 MD5 c9ada66d158f0cc17d12e0e75fef7892 apache-2.0.58.ebuild 13758
 RMD160 d07868aaf19540f7b7734eb98b4d6d9eab49682c apache-2.0.58.ebuild 13758
 SHA256 82ea6e899281836159f064bec7842cbe625f072590b1632a107ccc08c8082fce apache-2.0.58.ebuild 13758
-EBUILD apache-2.2.0-r1.ebuild 14091 RMD160 6eb4df70a19b8e9ec6d1d310cdacb802c202b935 SHA1 6e9ad59422fa8a96211dc5aed5d448ab7ecee40e SHA256 3d2e0c7caf27ad381daa7facb9a75a4e2a921f38ce89f00565be1992aad33469 size 14091
+EBUILD apache-2.2.0-r1.ebuild 14091 RMD160 6eb4df70a19b8e9ec6d1d310cdacb802c202b935 SHA1 6e9ad59422fa8a96211dc5aed5d448ab7ecee40e SHA256 3d2e0c7caf27ad381daa7facb9a75a4e2a921f38ce89f00565be1992aad33469
 MD5 82e969f2c714a9142160268a90934609 apache-2.2.0-r1.ebuild 14091
 RMD160 6eb4df70a19b8e9ec6d1d310cdacb802c202b935 apache-2.2.0-r1.ebuild 14091
 SHA256 3d2e0c7caf27ad381daa7facb9a75a4e2a921f38ce89f00565be1992aad33469 apache-2.2.0-r1.ebuild 14091
-EBUILD apache-2.2.0-r2.ebuild 14337 RMD160 2723b8d0c2b34f2b24a3c5a00aa05ec16cc57b29 SHA1 46463f38ba5b4d51cdfae470f8ac92a51f732f45 SHA256 a311d5651a5dca414476f4f3777e0c09ead77ec7c6428246aaa60e1e9b77427f size 14337
+EBUILD apache-2.2.0-r2.ebuild 14337 RMD160 2723b8d0c2b34f2b24a3c5a00aa05ec16cc57b29 SHA1 46463f38ba5b4d51cdfae470f8ac92a51f732f45 SHA256 a311d5651a5dca414476f4f3777e0c09ead77ec7c6428246aaa60e1e9b77427f
 MD5 88a88fc6a2281b1e46a14b6e3654a62c apache-2.2.0-r2.ebuild 14337
 RMD160 2723b8d0c2b34f2b24a3c5a00aa05ec16cc57b29 apache-2.2.0-r2.ebuild 14337
 SHA256 a311d5651a5dca414476f4f3777e0c09ead77ec7c6428246aaa60e1e9b77427f apache-2.2.0-r2.ebuild 14337
-MISC ChangeLog 79658 RMD160 18b526c75e39204df71c124db4975916294149a1 SHA1 e874dafc43ddb8ef52bb20dd499a1cf640f04f29 SHA256 55388e1c2e59fdd2c53630bdde840744e6c623c0fb24d6c82c79fb238ec98faf size 79658
-MD5 38fa4af0ac23f6d8f042a8c0660a5f0a ChangeLog 79658
-RMD160 18b526c75e39204df71c124db4975916294149a1 ChangeLog 79658
-SHA256 55388e1c2e59fdd2c53630bdde840744e6c623c0fb24d6c82c79fb238ec98faf ChangeLog 79658
-MISC metadata.xml 566 RMD160 8aad2cbb313fa91b77c6f4891f8d3483d1460adc SHA1 cfaab8d65125c65cb5c66c37dd200f7b3586baf9 SHA256 9826f38d29b803e954faa6fafffc4d6f197bfcb0e14cc76af891c41081d948e2 size 566
+MISC ChangeLog 81418 RMD160 e8564f0c010db6a9a97cbd9dc2ba298609d46f90 SHA1 12535e4e5f84e181df262f3b02e35773f96388c8 SHA256 b55c279d1c6ea5c6989abb6a3fdcf8bbe010cb6a3ccd038c0b99d09d46909c11
+MD5 601201e20a3a10f8c3b8492a12886e2e ChangeLog 81418
+RMD160 e8564f0c010db6a9a97cbd9dc2ba298609d46f90 ChangeLog 81418
+SHA256 b55c279d1c6ea5c6989abb6a3fdcf8bbe010cb6a3ccd038c0b99d09d46909c11 ChangeLog 81418
+MISC metadata.xml 566 RMD160 8aad2cbb313fa91b77c6f4891f8d3483d1460adc SHA1 cfaab8d65125c65cb5c66c37dd200f7b3586baf9 SHA256 9826f38d29b803e954faa6fafffc4d6f197bfcb0e14cc76af891c41081d948e2
 MD5 27c9cb37c510e08bb69df277229a03ea metadata.xml 566
 RMD160 8aad2cbb313fa91b77c6f4891f8d3483d1460adc metadata.xml 566
 SHA256 9826f38d29b803e954faa6fafffc4d6f197bfcb0e14cc76af891c41081d948e2 metadata.xml 566
-MD5 dfb6b629b5e0cb9c91bedb588f953933 files/digest-apache-1.3.32-r1 783
-RMD160 2ac6af1d49456d701963f075d2814c7e81f32d93 files/digest-apache-1.3.32-r1 783
-SHA256 5723223de61666652c6cb7fb6d241d9e57b96fef3537674a7a817d5c1f62ce26 files/digest-apache-1.3.32-r1 783
-MD5 60756d8b631a6bc79bee0ca2dc9b0a59 files/digest-apache-1.3.33-r13 1045
-RMD160 4236981f04fc7d83413d6e910d2dd3e8702d5c76 files/digest-apache-1.3.33-r13 1045
-SHA256 f7f0602a3568bb2cf1b1ee6c2cbb1374417f7ee5d06bafd91588aedc6c9697e5 files/digest-apache-1.3.33-r13 1045
-MD5 41dcc9647d992b55728f36219f613416 files/digest-apache-1.3.33-r6 801
-RMD160 7fbdb40047b0eca9aa02041d11f55300e5e36a0a files/digest-apache-1.3.33-r6 801
-SHA256 4a76d1f560cd78018a8422349cf736151a245c664801d67faca7245e0f495cc8 files/digest-apache-1.3.33-r6 801
-MD5 94f8fc743b561d278d88e1f367ef75a0 files/digest-apache-1.3.34-r1 801
-RMD160 d554a99b23925c42a4d3cfcd359e71f32faa19b1 files/digest-apache-1.3.34-r1 801
-SHA256 861863e1c00939f40390e3ed37bac0c4cac339672874fd96344d2d2a2d679e3c files/digest-apache-1.3.34-r1 801
 MD5 d4b47f122dbbce4e1076cfe8d8c2bdd9 files/digest-apache-1.3.34-r10 1045
 RMD160 4db749f66a7f17a0d0131e96474a73ddb1e4462b files/digest-apache-1.3.34-r10 1045
 SHA256 cd12a5ccc1d73f882ec966e6493eb48c953f9d6c30cd3f74fd75b3b77daefed0 files/digest-apache-1.3.34-r10 1045
@@ -299,33 +62,12 @@ SHA256 f572c9c3b245a86f11d6bb98b88a7280bdcfd168b372195fccbd3aa697712b5a files/di
 MD5 177b1596bf43e80c0779680035bd59c3 files/digest-apache-1.3.34-r12 1045
 RMD160 211e36e3a7297d683adc01eb14ead1738abb40af files/digest-apache-1.3.34-r12 1045
 SHA256 ca3a32f4201931f08ee7b828a4591fa23c33c1f2aca16f7d906c173923494a02 files/digest-apache-1.3.34-r12 1045
-MD5 7c1e50fb29722c9a4a33ae08ca6647c4 files/digest-apache-1.3.34-r2 801
-RMD160 f40358306caffff99efda1a8d432513bcf4fbac3 files/digest-apache-1.3.34-r2 801
-SHA256 187063455d10b24f7b18c80364ae43637e5c0ef30a99d14b5b797f16d10a2f05 files/digest-apache-1.3.34-r2 801
-MD5 34121a94406fabc2efb8102b151a9a8c files/digest-apache-2.0.54-r15 789
-RMD160 5b591cbf8ae9d2cf97596af28ad79e6e348b9bc5 files/digest-apache-2.0.54-r15 789
-SHA256 ca9bd7bdc040974e7bee8f55aa301e027c1e1657ffcf703cfe48268577a76686 files/digest-apache-2.0.54-r15 789
-MD5 97203364c367078f70d3fb73b6924b6b files/digest-apache-2.0.54-r16 789
-RMD160 936681a8279b37a142ecc0cce39f63aee695de51 files/digest-apache-2.0.54-r16 789
-SHA256 c32e7d42a9624e54e8904ca6f64df5321ef8d5cacb27c76e8cb251eb76d02b31 files/digest-apache-2.0.54-r16 789
-MD5 39c1a963fa28bf13ed2a6f42354535e3 files/digest-apache-2.0.54-r30 545
-RMD160 ed15a6f1ceb44716a6d87d031555fce6adf85de5 files/digest-apache-2.0.54-r30 545
-SHA256 d0a8c944cc12562000951a274adb52ec1591f1b515ed3b752f275659e0ac85dd files/digest-apache-2.0.54-r30 545
 MD5 bb39b04d1adab58fa4d554e919191659 files/digest-apache-2.0.54-r31 554
 RMD160 80612af5fbe4358cb4ee84c58adf8ccfd3264d71 files/digest-apache-2.0.54-r31 554
 SHA256 234f37bb3950cd615502c2a230a2bcdebe631c6a44c4e6b9ad5cd20ab82b1997 files/digest-apache-2.0.54-r31 554
-MD5 e2633dfe937198a402626073cbd2c093 files/digest-apache-2.0.54-r9 780
-RMD160 acbb1c8ac9bc5f8f4c8f361642984ee7864de37f files/digest-apache-2.0.54-r9 780
-SHA256 e80fc3fb88275f4b1ace818c53e71d7c08e09bbf22a60949d7fd63f22a25d30b files/digest-apache-2.0.54-r9 780
-MD5 9305483c40ae2b1043b16078b9fd9832 files/digest-apache-2.0.55 533
-RMD160 d39ff50b3c4918124f5d66da3b93d8fa8ee00605 files/digest-apache-2.0.55 533
-SHA256 12b6f3c1924c2f13b28509dcddeddf5d7392d8691420b2f8e553c89d57cf80a1 files/digest-apache-2.0.55 533
 MD5 30b1f0a7a2f05451f4db6438ae2addef files/digest-apache-2.0.55-r1 542
 RMD160 21dc5b8cf22e24428009f30e75dec69ecf17f696 files/digest-apache-2.0.55-r1 542
 SHA256 3223af521a47cf5070058b5de2786c9728b3e73edcf66788063d9939c8611c5a files/digest-apache-2.0.55-r1 542
-MD5 76538254a65a61e8654166ce2bb73226 files/digest-apache-2.0.55-r2 542
-RMD160 aee5764730ed626930c1b3194ff1360a78339e2e files/digest-apache-2.0.55-r2 542
-SHA256 51ab077ab1e2adca8a62417c09f3c8870e1cd52946db2e8279396ea75813e1d1 files/digest-apache-2.0.55-r2 542
 MD5 94120ca6b923f693aef55ff4e4447af3 files/digest-apache-2.0.58 533
 RMD160 f6edd42fab09e51d82ed4c7b3c774e0d5ededece files/digest-apache-2.0.58 533
 SHA256 8c8a5e62f68298c10276419f3a8f791a600110fa2f0645495aa47eaa609a84a8 files/digest-apache-2.0.58 533
diff --git a/net-www/apache/apache-1.3.32-r1.ebuild b/net-www/apache/apache-1.3.32-r1.ebuild
deleted file mode 100644
index 1b37bb7b8a04..000000000000
--- a/net-www/apache/apache-1.3.32-r1.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# 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.12 2005/07/05 22:59:08 swegener Exp $
-
-inherit eutils fixheadtails
-
-IUSE="pam selinux"
-
-mod_ssl_ver=2.8.21
-
-S=${WORKDIR}/${PN}_${PV}
-DESCRIPTION="The Apache Web Server"
-HOMEPAGE="http://www.apache.org http://www.modssl.org"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 mips"
-SRC_URI="http://www.apache.org/dist/httpd/apache_${PV}.tar.gz
-	ftp://ftp.modssl.org/source/mod_ssl-${mod_ssl_ver}-${PV}.tar.gz
-	http://dev.gentoo.org/~tigger/apache-patches-1.3.32-r1.tar.bz2"
-
-# 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.
-
-DEPEND="dev-lang/perl
-	<=sys-libs/db-4.1
-	>=dev-libs/mm-1.1.3
-	>=sys-libs/gdbm-1.8
-	>=dev-libs/expat-1.95.2
-	=sys-libs/db-1*
-	selinux? ( sec-policy/selinux-apache )
-	!dev-libs/apr
-	!dev-libs/apr-util"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-
-#Standard location for Gentoo Linux
-DATADIR="/var/www/localhost"
-
-src_unpack() {
-	local myssl
-	unpack ${A} || die
-	cd ${S} || die
-
-	EPATCH_SUFFIX="patch"
-	epatch ${WORKDIR}/apache-patches-${PVR} || die
-
-	#Obsolete 'head -1' and 'tail -1' calls.
-	ht_fix_file src/Configure src/helpers/getuid.sh \
-		src/helpers/fmn.sh src/helpers/buildinfo.sh
-
-	# setup eapi...
-	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 "eapi"
-
-	# set a reasonable MM_CORE_PATH location..
-	sed -i -e 's:logs/mm:/var/cache/apache-mm/mm:' \
-		src/include/httpd.h
-}
-
-src_compile() {
-	local myconf mycflags
-	mycflags="${CFLAGS}"
-	unset CFLAGS ; unset CXXFLAGS
-
-	select_modules_config || die "determining modules"
-
-	#-DBUFFERED_LOGS
-	OPTIM="${mycflags} -DHARD_SERVER_LIMIT=${HARD_SERVER_LIMIT:=512} \
-		-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" \
-	LIBS="-lgdbm -lpthread" \
-	EAPI_MM=SYSTEM \
-	./configure \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libexecdir=/usr/lib/apache \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/apache/conf \
-		--datadir=${DATADIR} \
-		--cgidir=${DATADIR}/cgi-bin \
-		--iconsdir=${DATADIR}/icons \
-		--htdocsdir=${DATADIR}/htdocs \
-		--manualdir=/usr/share/doc/${PF}/manual \
-		--includedir=/usr/include/apache \
-		--localstatedir=/var \
-		--runtimedir=/var/run \
-		--logfiledir=/var/log/apache \
-		--proxycachedir=/var/cache/apache \
-		--serverroot=/etc/apache \
-		--target=apache \
-		--server-uid=apache \
-		--server-gid=apache \
-		--with-perl=/usr/bin/perl \
-		--enable-rule=EAPI \
-		--enable-rule=SHARED_CHAIN \
-		${MY_BUILTINS} \
-		--enable-suexec \
-		--suexec-uidmin=1000 \
-		--suexec-gidmin=100 \
-		--suexec-caller=apache \
-		--suexec-userdir=public_html \
-		--suexec-docroot=/var/www \
-		--suexec-safepath="/bin:/usr/bin" \
-		--suexec-logfile=/var/log/apache/suexec_log \
-		\
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	local myfile
-
-	GID=`id -g apache`
-	if [ -z "${GID}" ]; then
-		einfo "Using default GID of 81 for Apache"
-		GID=81
-	fi
-
-	make install-quiet root=${D} || die
-	dodoc ABOUT_APACHE Announcement INSTALL* LICENSE* README* WARNING* \
-		${FILESDIR}/robots.txt
-
-	#protect the suexec binary
-	fowners root:${GID} /usr/sbin/suexec
-	fperms 4710 /usr/sbin/suexec
-
-	# nice support scripts..
-	for myfile in apacheaddmod apachedelmod \
-		apachelogserverstatus apachesplitlogfile
-	do
-		exeinto /usr/sbin
-		doexe ${FILESDIR}/$myfile
-	done
-
-	# setup links in /etc/apache..
-	cd ${D}/etc/apache
-	ln -sf ../../usr/lib/apache modules
-	# apxs needs this to pickup the right lib for install..
-	ln -sf ../../usr/lib lib
-	ln -sf ../../var/log/apache logs
-	ln -sf ../../usr/lib/apache-extramodules extramodules
-
-	# drop in a convenient link to the manual
-	dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual
-
-	# deprecated config files, empty dirs..
-	rm -f ${D}/etc/apache/conf/apache.conf.default
-	rm -f ${D}/etc/apache/conf/access.conf*
-	rm -f ${D}/etc/apache/conf/srm.conf*
-
-	# now the config files..
-	insinto /etc/apache/conf
-	doins ${FILESDIR}/conf/commonapache.conf
-	doins ${FILESDIR}/conf/apache.conf
-
-	# 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/conf/apache.conf
-	fi
-
-	insinto /etc/apache/conf/vhosts
-	doins ${FILESDIR}/conf/VirtualHomePages.conf
-	doins ${FILESDIR}/conf/DynamicVhosts.conf
-	doins ${FILESDIR}/conf/Vhosts.conf
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/apache.rc6 apache
-	insinto /etc/conf.d ; newins ${FILESDIR}/apache.confd apache
-	insinto /etc/apache ; doins ${FILESDIR}/apache-builtin-mods
-
-	if use pam; then
-		insinto /etc/pam.d ; newins ${FILESDIR}/suexec.pam suexec
-	fi
-
-	#empty dirs
-	keepdir /var/cache/apache /var/cache/apache-mm /usr/lib/apache-extramodules /etc/apache/conf/addon-modules /var/log/apache
-}
-
-pkg_postinst() {
-	# these are in baselayout now; it will not hurt to leave them here though
-	# moved to pkg_postinst by jnelson, moved to pkg_preinst by lostlogic
-	getent group apache >/dev/null 2>&1
-	if [ $? -ne 0 ]; then
-		groupadd -g 81 apache || die "problem adding group apache"
-	fi
-
-	# usermod returns 2 on user-exists-but-no-flags-given
-	#usermod apache &>/dev/null
-	#if [ $? != 2 ]; then
-	getent passwd apache >/dev/null 2>&1
-	if [ $? -ne 0 ]; then
-		useradd -u 81 -g apache -s /bin/false -d /var/www/localhost -c "apache" apache
-		assert "problem adding user apache"
-	fi
-
-	einfo
-	einfo "Please remember to update your config files in /etc/apache"
-	einfo "as --datadir has been changed to ${DATADIR}!"
-	einfo
-}
-
-parse_modules_config() {
-	local filename=$1
-	local name=""
-	local dso=""
-	local disable=""
-	[ -f ${filename} ] || return 1
-	einfo "Using ${filename} for builtins."
-	for i in `cat $filename | 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" ] ; 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
-}
-
-select_modules_config() {
-	parse_modules_config /etc/apache/apache-builtin-mods || \
-	parse_modules_config ${FILESDIR}/apache-builtin-mods || \
-	return 1
-}
diff --git a/net-www/apache/apache-1.3.33-r13.ebuild b/net-www/apache/apache-1.3.33-r13.ebuild
deleted file mode 100644
index 2ddc8f4e800d..000000000000
--- a/net-www/apache/apache-1.3.33-r13.ebuild
+++ /dev/null
@@ -1,304 +0,0 @@
-# Copyright 1999-2006 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-r13.ebuild,v 1.2 2006/04/19 17:24:59 chtekk Exp $
-
-inherit eutils fixheadtails multilib
-
-# latest gentoo apache files
-GENTOO_PATCHNAME="gentoo-apache-${PVR}"
-GENTOO_PATCHSTAMP="20051204"
-GENTOO_DEVSPACE="vericgar"
-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.24
-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 )
-		http://dev.gentoo.org/~${GENTOO_DEVSPACE}/dist/apache/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc ssl pam lingerd no-suexec static-modules selinux"
-
-DEPEND="dev-lang/perl
-		|| ( sys-libs/gdbm ~sys-libs/db-1.85 )
-		sys-libs/db
-		>=dev-libs/mm-1.1.3
-		>=dev-libs/expat-1.95.2
-		net-www/gentoo-webroot-default
-		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}-r1 )"
-
-S=${WORKDIR}/${PN}_${PV}
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-
-	# Use correct multilib libdir in gentoo patches
-	sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" \
-		${GENTOO_PATCHDIR}/{conf/httpd.conf,init/*,patches/config.layout} \
-		|| die "sed failed"
-
-	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/$(get_libdir)" || die
-		mv ab ab-ssl
-		rm -f ab.o
-		make ab || die
-	fi
-}
-
-pkg_preinst() {
-	# setup apache user and group
-	enewgroup apache 81
-	enewuser apache 81 -1 /var/www apache
-}
-
-src_install() {
-	# general 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
-		fowners root:apache /usr/sbin/suexec
-		fperms 4710 /usr/sbin/suexec
-	fi
-
-	# apxs needs this to pickup the right lib for install
-	dosym /usr/$(get_libdir) /usr/$(get_libdir)/apache/lib
-	dosym /var/log/apache /usr/$(get_libdir)/apache/logs
-	dosym /etc/apache /usr/$(get_libdir)/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
-
-	# we DEPEND on net-www/gentoo-webroot-default for sharing this by now
-	rm -rf var/www/localhost
-
-	# 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
-
-	insinto /etc/apache/vhosts.d
-	doins ${GENTOO_PATCHDIR}/conf/vhosts.d/00_default_vhost.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() {
-	# setup apache user and group
-	enewgroup apache 81
-	enewuser apache 81 -1 /var/www apache
-
-	if has_version '<net-www/apache-1.3.33-r10' ; 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://www.gentoo.org/doc/en/apache-upgrading.xml"
-		einfo
-	fi
-
-	einfo "If you want modules to be installed for this version of apache"
-	einfo "then please ensure that apache2 is not in your USE flags. To remove"
-	einfo "the USE-flag, add '-apache2' to USE in /etc/make.conf."
-
-}
-
-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-r6.ebuild b/net-www/apache/apache-1.3.33-r6.ebuild
deleted file mode 100644
index 14e70d0e6318..000000000000
--- a/net-www/apache/apache-1.3.33-r6.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# 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-r6.ebuild,v 1.8 2005/09/24 04:27:53 vapier Exp $
-
-# Gentoo ARCH teams
-#
-# Do NOT mark this ebuild as stable unless the corresponding mod_ssl package
-# can also be marked as stable on your arch.
-#
-# Thanks,
-# stuart@gentoo.org
-
-inherit eutils fixheadtails
-
-IUSE="pam ssl selinux"
-
-mod_ssl_dep=2.8.24
-mod_ssl_ver=2.8.24-1.3.33
-
-S=${WORKDIR}/${PN}_${PV}
-DESCRIPTION="The Apache Web Server"
-HOMEPAGE="http://www.apache.org http://www.modssl.org"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
-SRC_URI="mirror://apache/httpd/apache_${PV}.tar.gz
-	ftp://ftp.modssl.org/source/mod_ssl-${mod_ssl_ver}.tar.gz
-	http://dev.gentoo.org/~vericgar/dist/apache/old/apache-patches-1.3.33-20050711.tar.bz2"
-
-
-# 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.
-
-DEPEND="dev-lang/perl
-	<=sys-libs/db-4.1
-	>=dev-libs/mm-1.1.3
-	>=sys-libs/gdbm-1.8
-	>=dev-libs/expat-1.95.2
-	=sys-libs/db-1*
-	selinux? ( sec-policy/selinux-apache )
-	!dev-libs/apr
-	!dev-libs/apr-util"
-
-PDEPEND="ssl? ( =net-www/mod_ssl-${mod_ssl_dep} )"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-
-#Standard location for Gentoo Linux
-DATADIR="/var/www/localhost"
-
-src_unpack() {
-	local myssl
-	unpack ${A} || die
-	cd ${S} || die
-
-	EPATCH_SUFFIX="patch"
-	epatch ${WORKDIR}/apache-patches-1.3.33/[0-2]* || die
-
-	if useq pam; then
-		epatch ${WORKDIR}/apache-patches-1.3.33/31_all_gentoo_suexec_pam.patch || die "pam patch failed"
-	fi
-
-	#Obsolete 'head -1' and 'tail -1' calls.
-	ht_fix_file src/Configure src/helpers/getuid.sh \
-		src/helpers/fmn.sh src/helpers/buildinfo.sh
-
-	# setup eapi...
-	myssl=${WORKDIR}/mod_ssl-${mod_ssl_ver}
-	cp ${myssl}/pkg.eapi/*.h src/include
-	cp ${myssl}/pkg.eapi/*.c src/ap
-	epatch ${myssl}/pkg.eapi/eapi.patch || die "eapi"
-
-	# set a reasonable MM_CORE_PATH location..
-	sed -i -e 's:logs/mm:/var/cache/apache-mm/mm:' \
-		src/include/httpd.h
-}
-
-src_compile() {
-	local myconf mycflags
-	mycflags="${CFLAGS}"
-	unset CFLAGS ; unset CXXFLAGS
-
-	select_modules_config || die "determining modules"
-
-	#-DBUFFERED_LOGS
-	OPTIM="${mycflags} -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 \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libexecdir=/usr/lib/apache \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/apache/conf \
-		--datadir=${DATADIR} \
-		--cgidir=${DATADIR}/cgi-bin \
-		--iconsdir=${DATADIR}/icons \
-		--htdocsdir=${DATADIR}/htdocs \
-		--manualdir=/usr/share/doc/${PF}/manual \
-		--includedir=/usr/include/apache \
-		--localstatedir=/var \
-		--runtimedir=/var/run \
-		--logfiledir=/var/log/apache \
-		--proxycachedir=/var/cache/apache \
-		--serverroot=/etc/apache \
-		--target=apache \
-		--server-uid=apache \
-		--server-gid=apache \
-		--with-perl=/usr/bin/perl \
-		--enable-rule=EAPI \
-		--enable-rule=SHARED_CHAIN \
-		${MY_BUILTINS} \
-		--enable-suexec \
-		--suexec-uidmin=1000 \
-		--suexec-gidmin=100 \
-		--suexec-caller=apache \
-		--suexec-userdir=public_html \
-		--suexec-docroot=/var/www \
-		--suexec-safepath="/bin:/usr/bin" \
-		--suexec-logfile=/var/log/apache/suexec_log \
-		\
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	local myfile
-
-	GID=`id -g apache`
-	if [ -z "${GID}" ]; then
-		einfo "Using default GID of 81 for Apache"
-		GID=81
-	fi
-
-	make install-quiet root=${D} || die
-	dodoc ABOUT_APACHE Announcement INSTALL* LICENSE* README* WARNING* \
-		${FILESDIR}/robots.txt
-
-	#protect the suexec binary
-	fowners root:${GID} /usr/sbin/suexec
-	fperms 4710 /usr/sbin/suexec
-
-	# nice support scripts..
-	for myfile in apacheaddmod apachedelmod \
-		apachelogserverstatus apachesplitlogfile
-	do
-		exeinto /usr/sbin
-		doexe ${FILESDIR}/$myfile
-	done
-
-	# setup links in /etc/apache..
-	cd ${D}/etc/apache
-	ln -sf ../../usr/lib/apache modules
-	# apxs needs this to pickup the right lib for install..
-	ln -sf ../../usr/lib lib
-	ln -sf ../../var/log/apache logs
-	ln -sf ../../usr/lib/apache-extramodules extramodules
-
-	# drop in a convenient link to the manual
-	dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual
-
-	# deprecated config files, empty dirs..
-	rm -f ${D}/etc/apache/conf/apache.conf.default
-	rm -f ${D}/etc/apache/conf/access.conf*
-	rm -f ${D}/etc/apache/conf/srm.conf*
-
-	# now the config files..
-	insinto /etc/apache/conf
-	doins ${FILESDIR}/conf/commonapache.conf
-	doins ${FILESDIR}/conf/apache.conf
-
-	# 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/conf/apache.conf
-	fi
-
-	insinto /etc/apache/conf/vhosts
-	doins ${FILESDIR}/conf/VirtualHomePages.conf
-	doins ${FILESDIR}/conf/DynamicVhosts.conf
-	doins ${FILESDIR}/conf/Vhosts.conf
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/apache.rc6 apache
-	insinto /etc/conf.d ; newins ${FILESDIR}/apache.confd apache
-	insinto /etc/apache ; doins ${FILESDIR}/apache-builtin-mods
-
-	if use pam; then
-		insinto /etc/pam.d ; newins ${FILESDIR}/suexec.pam suexec
-	fi
-
-	#empty dirs
-	keepdir /var/cache/apache /var/cache/apache-mm /usr/lib/apache-extramodules /etc/apache/conf/addon-modules /var/log/apache
-}
-
-pkg_postinst() {
-	# these are in baselayout now; it will not hurt to leave them here though
-	# moved to pkg_postinst by jnelson, moved to pkg_preinst by lostlogic
-	getent group apache >/dev/null 2>&1
-	if [ $? -ne 0 ]; then
-		groupadd -g 81 apache || die "problem adding group apache"
-	fi
-
-	# usermod returns 2 on user-exists-but-no-flags-given
-	#usermod apache &>/dev/null
-	#if [ $? != 2 ]; then
-	getent passwd apache >/dev/null 2>&1
-	if [ $? -ne 0 ]; then
-		useradd -u 81 -g apache -s /bin/false -d /var/www/localhost -c "apache" apache
-		assert "problem adding user apache"
-	fi
-
-	einfo
-	einfo "Please remember to update your config files in /etc/apache"
-	einfo "as --datadir has been changed to ${DATADIR}!"
-	einfo
-}
-
-parse_modules_config() {
-	local filename=$1
-	local name=""
-	local dso=""
-	local disable=""
-	[ -f ${filename} ] || return 1
-	einfo "Using ${filename} for builtins."
-	for i in `cat $filename | 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" ] ; 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
-}
-
-select_modules_config() {
-	parse_modules_config /etc/apache/apache-builtin-mods || \
-	parse_modules_config ${FILESDIR}/apache-builtin-mods || \
-	return 1
-}
diff --git a/net-www/apache/apache-1.3.34-r1.ebuild b/net-www/apache/apache-1.3.34-r1.ebuild
deleted file mode 100644
index e84c951e07b5..000000000000
--- a/net-www/apache/apache-1.3.34-r1.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# 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.34-r1.ebuild,v 1.6 2005/12/21 18:03:32 corsair Exp $
-
-# Gentoo ARCH teams
-#
-# Do NOT mark this ebuild as stable unless the corresponding mod_ssl package
-# can also be marked as stable on your arch.
-#
-# Thanks,
-# stuart@gentoo.org
-
-inherit eutils fixheadtails
-
-IUSE="pam ssl selinux"
-
-mod_ssl_dep=2.8.25-r1
-mod_ssl_ver=2.8.25-1.3.34
-
-S=${WORKDIR}/${PN}_${PV}
-DESCRIPTION="The Apache Web Server"
-HOMEPAGE="http://www.apache.org http://www.modssl.org"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
-SRC_URI="mirror://apache/httpd/apache_${PV}.tar.gz
-	ftp://ftp.modssl.org/source/mod_ssl-${mod_ssl_ver}.tar.gz
-	http://dev.gentoo.org/~vericgar/dist/apache/old/apache-patches-1.3.33-20050711.tar.bz2"
-
-
-# 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.
-
-DEPEND="dev-lang/perl
-	<=sys-libs/db-4.1
-	>=dev-libs/mm-1.1.3
-	>=sys-libs/gdbm-1.8
-	>=dev-libs/expat-1.95.2
-	=sys-libs/db-1*
-	selinux? ( sec-policy/selinux-apache )
-	!dev-libs/apr
-	!dev-libs/apr-util"
-
-PDEPEND="ssl? ( =net-www/mod_ssl-${mod_ssl_dep} )"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-
-#Standard location for Gentoo Linux
-DATADIR="/var/www/localhost"
-
-src_unpack() {
-	local myssl
-	unpack ${A} || die
-	cd ${S} || die
-
-	EPATCH_SUFFIX="patch"
-	epatch ${WORKDIR}/apache-patches-1.3.33/[0-2]* || die
-
-	if useq pam; then
-		epatch ${WORKDIR}/apache-patches-1.3.33/31_all_gentoo_suexec_pam.patch || die "pam patch failed"
-	fi
-
-	#Obsolete 'head -1' and 'tail -1' calls.
-	ht_fix_file src/Configure src/helpers/getuid.sh \
-		src/helpers/fmn.sh src/helpers/buildinfo.sh
-
-	# setup eapi...
-	myssl=${WORKDIR}/mod_ssl-${mod_ssl_ver}
-	cp ${myssl}/pkg.eapi/*.h src/include
-	cp ${myssl}/pkg.eapi/*.c src/ap
-	epatch ${myssl}/pkg.eapi/eapi.patch || die "eapi"
-
-	# set a reasonable MM_CORE_PATH location..
-	sed -i -e 's:logs/mm:/var/cache/apache-mm/mm:' \
-		src/include/httpd.h
-}
-
-src_compile() {
-	local myconf mycflags
-	mycflags="${CFLAGS}"
-	unset CFLAGS ; unset CXXFLAGS
-
-	select_modules_config || die "determining modules"
-
-	#-DBUFFERED_LOGS
-	OPTIM="${mycflags} -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 \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libexecdir=/usr/lib/apache \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/apache/conf \
-		--datadir=${DATADIR} \
-		--cgidir=${DATADIR}/cgi-bin \
-		--iconsdir=${DATADIR}/icons \
-		--htdocsdir=${DATADIR}/htdocs \
-		--manualdir=/usr/share/doc/${PF}/manual \
-		--includedir=/usr/include/apache \
-		--localstatedir=/var \
-		--runtimedir=/var/run \
-		--logfiledir=/var/log/apache \
-		--proxycachedir=/var/cache/apache \
-		--serverroot=/etc/apache \
-		--target=apache \
-		--server-uid=apache \
-		--server-gid=apache \
-		--with-perl=/usr/bin/perl \
-		--enable-rule=EAPI \
-		--enable-rule=SHARED_CHAIN \
-		${MY_BUILTINS} \
-		--enable-suexec \
-		--suexec-uidmin=1000 \
-		--suexec-gidmin=100 \
-		--suexec-caller=apache \
-		--suexec-userdir=public_html \
-		--suexec-docroot=/var/www \
-		--suexec-safepath="/bin:/usr/bin" \
-		--suexec-logfile=/var/log/apache/suexec_log \
-		\
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	local myfile
-
-	GID=`id -g apache`
-	if [ -z "${GID}" ]; then
-		einfo "Using default GID of 81 for Apache"
-		GID=81
-	fi
-
-	make install-quiet root=${D} || die
-	dodoc ABOUT_APACHE Announcement INSTALL* LICENSE* README* WARNING* \
-		${FILESDIR}/robots.txt
-
-	#protect the suexec binary
-	fowners root:${GID} /usr/sbin/suexec
-	fperms 4710 /usr/sbin/suexec
-
-	# nice support scripts..
-	for myfile in apacheaddmod apachedelmod \
-		apachelogserverstatus apachesplitlogfile
-	do
-		exeinto /usr/sbin
-		doexe ${FILESDIR}/$myfile
-	done
-
-	# setup links in /etc/apache..
-	cd ${D}/etc/apache
-	ln -sf ../../usr/lib/apache modules
-	# apxs needs this to pickup the right lib for install..
-	ln -sf ../../usr/lib lib
-	ln -sf ../../var/log/apache logs
-	ln -sf ../../usr/lib/apache-extramodules extramodules
-
-	# drop in a convenient link to the manual
-	dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual
-
-	# deprecated config files, empty dirs..
-	rm -f ${D}/etc/apache/conf/apache.conf.default
-	rm -f ${D}/etc/apache/conf/access.conf*
-	rm -f ${D}/etc/apache/conf/srm.conf*
-
-	# now the config files..
-	insinto /etc/apache/conf
-	doins ${FILESDIR}/conf/commonapache.conf
-	doins ${FILESDIR}/conf/apache.conf
-
-	# 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/conf/apache.conf
-	fi
-
-	insinto /etc/apache/conf/vhosts
-	doins ${FILESDIR}/conf/VirtualHomePages.conf
-	doins ${FILESDIR}/conf/DynamicVhosts.conf
-	doins ${FILESDIR}/conf/Vhosts.conf
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/apache.rc6 apache
-	insinto /etc/conf.d ; newins ${FILESDIR}/apache.confd apache
-	insinto /etc/apache ; doins ${FILESDIR}/apache-builtin-mods
-
-	if use pam; then
-		insinto /etc/pam.d ; newins ${FILESDIR}/suexec.pam suexec
-	fi
-
-	#empty dirs
-	keepdir /var/cache/apache /var/cache/apache-mm /usr/lib/apache-extramodules /etc/apache/conf/addon-modules /var/log/apache
-}
-
-pkg_postinst() {
-	# these are in baselayout now; it will not hurt to leave them here though
-	# moved to pkg_postinst by jnelson, moved to pkg_preinst by lostlogic
-	getent group apache >/dev/null 2>&1
-	if [ $? -ne 0 ]; then
-		groupadd -g 81 apache || die "problem adding group apache"
-	fi
-
-	# usermod returns 2 on user-exists-but-no-flags-given
-	#usermod apache &>/dev/null
-	#if [ $? != 2 ]; then
-	getent passwd apache >/dev/null 2>&1
-	if [ $? -ne 0 ]; then
-		useradd -u 81 -g apache -s /bin/false -d /var/www/localhost -c "apache" apache
-		assert "problem adding user apache"
-	fi
-
-	einfo
-	einfo "Please remember to update your config files in /etc/apache"
-	einfo "as --datadir has been changed to ${DATADIR}!"
-	einfo
-}
-
-parse_modules_config() {
-	local filename=$1
-	local name=""
-	local dso=""
-	local disable=""
-	[ -f ${filename} ] || return 1
-	einfo "Using ${filename} for builtins."
-	for i in `cat $filename | 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" ] ; 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
-}
-
-select_modules_config() {
-	parse_modules_config /etc/apache/apache-builtin-mods || \
-	parse_modules_config ${FILESDIR}/apache-builtin-mods || \
-	return 1
-}
diff --git a/net-www/apache/apache-1.3.34-r2.ebuild b/net-www/apache/apache-1.3.34-r2.ebuild
deleted file mode 100644
index f1cbe4760774..000000000000
--- a/net-www/apache/apache-1.3.34-r2.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.34-r2.ebuild,v 1.8 2006/02/06 00:16:13 blubb Exp $
-
-# Gentoo ARCH teams
-#
-# Do NOT mark this ebuild as stable unless the corresponding mod_ssl package
-# can also be marked as stable on your arch.
-#
-# Thanks,
-# stuart@gentoo.org
-
-inherit eutils fixheadtails
-
-IUSE="pam ssl selinux"
-
-mod_ssl_dep=2.8.25-r1
-mod_ssl_ver=2.8.25-1.3.34
-tarball_ver=1.3.34-20060131
-
-S=${WORKDIR}/${PN}_${PV}
-DESCRIPTION="The Apache Web Server"
-HOMEPAGE="http://www.apache.org http://www.modssl.org"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
-SRC_URI="mirror://apache/httpd/apache_${PV}.tar.gz
-	ftp://ftp.modssl.org/source/mod_ssl-${mod_ssl_ver}.tar.gz
-	http://dev.gentoo.org/~vericgar/dist/apache/old/apache-patches-${tarball_ver}.tar.bz2"
-
-
-# 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.
-
-DEPEND="dev-lang/perl
-	<=sys-libs/db-4.1
-	>=dev-libs/mm-1.1.3
-	>=sys-libs/gdbm-1.8
-	>=dev-libs/expat-1.95.2
-	=sys-libs/db-1*
-	selinux? ( sec-policy/selinux-apache )
-	!dev-libs/apr
-	!dev-libs/apr-util"
-
-PDEPEND="ssl? ( =net-www/mod_ssl-${mod_ssl_dep} )"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-
-#Standard location for Gentoo Linux
-DATADIR="/var/www/localhost"
-
-src_unpack() {
-	local myssl
-	unpack ${A} || die
-	cd ${S} || die
-
-	EPATCH_SUFFIX="patch"
-	epatch ${WORKDIR}/apache-patches-${tarball_ver}/[0-2]* || die
-
-	if useq pam; then
-		epatch ${WORKDIR}/apache-patches-${tarball_ver}/31_all_gentoo_suexec_pam.patch || die "pam patch failed"
-	fi
-
-	#Obsolete 'head -1' and 'tail -1' calls.
-	ht_fix_file src/Configure src/helpers/getuid.sh \
-		src/helpers/fmn.sh src/helpers/buildinfo.sh
-
-	# setup eapi...
-	myssl=${WORKDIR}/mod_ssl-${mod_ssl_ver}
-	cp ${myssl}/pkg.eapi/*.h src/include
-	cp ${myssl}/pkg.eapi/*.c src/ap
-	epatch ${myssl}/pkg.eapi/eapi.patch || die "eapi"
-
-	# set a reasonable MM_CORE_PATH location..
-	sed -i -e 's:logs/mm:/var/cache/apache-mm/mm:' \
-		src/include/httpd.h
-}
-
-src_compile() {
-	local myconf mycflags
-	mycflags="${CFLAGS}"
-	unset CFLAGS ; unset CXXFLAGS
-
-	select_modules_config || die "determining modules"
-
-	#-DBUFFERED_LOGS
-	OPTIM="${mycflags} -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 \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libexecdir=/usr/lib/apache \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc/apache/conf \
-		--datadir=${DATADIR} \
-		--cgidir=${DATADIR}/cgi-bin \
-		--iconsdir=${DATADIR}/icons \
-		--htdocsdir=${DATADIR}/htdocs \
-		--manualdir=/usr/share/doc/${PF}/manual \
-		--includedir=/usr/include/apache \
-		--localstatedir=/var \
-		--runtimedir=/var/run \
-		--logfiledir=/var/log/apache \
-		--proxycachedir=/var/cache/apache \
-		--serverroot=/etc/apache \
-		--target=apache \
-		--server-uid=apache \
-		--server-gid=apache \
-		--with-perl=/usr/bin/perl \
-		--enable-rule=EAPI \
-		--enable-rule=SHARED_CHAIN \
-		${MY_BUILTINS} \
-		--enable-suexec \
-		--suexec-uidmin=1000 \
-		--suexec-gidmin=100 \
-		--suexec-caller=apache \
-		--suexec-userdir=public_html \
-		--suexec-docroot=/var/www \
-		--suexec-safepath="/bin:/usr/bin" \
-		--suexec-logfile=/var/log/apache/suexec_log \
-		\
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	local myfile
-
-	GID=`id -g apache`
-	if [ -z "${GID}" ]; then
-		einfo "Using default GID of 81 for Apache"
-		GID=81
-	fi
-
-	make install-quiet root=${D} || die
-	dodoc ABOUT_APACHE Announcement INSTALL* LICENSE* README* WARNING* \
-		${FILESDIR}/robots.txt
-
-	#protect the suexec binary
-	fowners root:${GID} /usr/sbin/suexec
-	fperms 4710 /usr/sbin/suexec
-
-	# nice support scripts..
-	for myfile in apacheaddmod apachedelmod \
-		apachelogserverstatus apachesplitlogfile
-	do
-		exeinto /usr/sbin
-		doexe ${FILESDIR}/$myfile
-	done
-
-	# setup links in /etc/apache..
-	cd ${D}/etc/apache
-	ln -sf ../../usr/lib/apache modules
-	# apxs needs this to pickup the right lib for install..
-	ln -sf ../../usr/lib lib
-	ln -sf ../../var/log/apache logs
-	ln -sf ../../usr/lib/apache-extramodules extramodules
-
-	# drop in a convenient link to the manual
-	dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual
-
-	# deprecated config files, empty dirs..
-	rm -f ${D}/etc/apache/conf/apache.conf.default
-	rm -f ${D}/etc/apache/conf/access.conf*
-	rm -f ${D}/etc/apache/conf/srm.conf*
-
-	# now the config files..
-	insinto /etc/apache/conf
-	doins ${FILESDIR}/conf/commonapache.conf
-	doins ${FILESDIR}/conf/apache.conf
-
-	# 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/conf/apache.conf
-	fi
-
-	insinto /etc/apache/conf/vhosts
-	doins ${FILESDIR}/conf/VirtualHomePages.conf
-	doins ${FILESDIR}/conf/DynamicVhosts.conf
-	doins ${FILESDIR}/conf/Vhosts.conf
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/apache.rc6 apache
-	insinto /etc/conf.d ; newins ${FILESDIR}/apache.confd apache
-	insinto /etc/apache ; doins ${FILESDIR}/apache-builtin-mods
-
-	if use pam; then
-		insinto /etc/pam.d ; newins ${FILESDIR}/suexec.pam suexec
-	fi
-
-	#empty dirs
-	keepdir /var/cache/apache /var/cache/apache-mm /usr/lib/apache-extramodules /etc/apache/conf/addon-modules /var/log/apache
-}
-
-pkg_postinst() {
-	# these are in baselayout now; it will not hurt to leave them here though
-	# moved to pkg_postinst by jnelson, moved to pkg_preinst by lostlogic
-	getent group apache >/dev/null 2>&1
-	if [ $? -ne 0 ]; then
-		groupadd -g 81 apache || die "problem adding group apache"
-	fi
-
-	# usermod returns 2 on user-exists-but-no-flags-given
-	#usermod apache &>/dev/null
-	#if [ $? != 2 ]; then
-	getent passwd apache >/dev/null 2>&1
-	if [ $? -ne 0 ]; then
-		useradd -u 81 -g apache -s /bin/false -d /var/www/localhost -c "apache" apache
-		assert "problem adding user apache"
-	fi
-
-	einfo
-	einfo "Please remember to update your config files in /etc/apache"
-	einfo "as --datadir has been changed to ${DATADIR}!"
-	einfo
-}
-
-parse_modules_config() {
-	local filename=$1
-	local name=""
-	local dso=""
-	local disable=""
-	[ -f ${filename} ] || return 1
-	einfo "Using ${filename} for builtins."
-	for i in `cat $filename | 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" ] ; 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
-}
-
-select_modules_config() {
-	parse_modules_config /etc/apache/apache-builtin-mods || \
-	parse_modules_config ${FILESDIR}/apache-builtin-mods || \
-	return 1
-}
diff --git a/net-www/apache/apache-2.0.54-r15.ebuild b/net-www/apache/apache-2.0.54-r15.ebuild
deleted file mode 100644
index 076e490e0b13..000000000000
--- a/net-www/apache/apache-2.0.54-r15.ebuild
+++ /dev/null
@@ -1,409 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.54-r15.ebuild,v 1.10 2006/04/19 17:24:59 chtekk Exp $
-
-inherit flag-o-matic eutils fixheadtails gnuconfig
-
-PATCH_LEVEL="${PVR}"
-S="${WORKDIR}/httpd-${PV}"
-DESCRIPTION="Apache Web Server"
-HOMEPAGE="http://www.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
-	http://dev.gentoo.org/~vericgar/dist/apache/old/apache-patches-${PATCH_LEVEL}.tar.bz2
-	http://dev.gentoo.org/~vericgar/dist/apache/old/apache-conf-${PATCH_LEVEL}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="berkdb gdbm ldap threads ipv6 doc static ssl selinux"
-
-#Standard location for Gentoo Linux
-DATADIR="/var/www/localhost"
-
-# Location for the two additional tarballs
-APACHE_PATCHDIR=${WORKDIR}/apache-patches-${PATCH_LEVEL}
-APACHE_CONFDIR=${WORKDIR}/apache-conf-${PATCH_LEVEL}
-
-DEPEND="dev-util/yacc
-	dev-lang/perl
-	sys-libs/zlib
-	dev-libs/expat
-	dev-libs/openssl
-	>=sys-devel/autoconf-2.59-r4
-	berkdb? ( sys-libs/db )
-	gdbm? ( sys-libs/gdbm )
-	!mips? ( ldap? ( =net-nds/openldap-2* ) )
-	selinux? ( sec-policy/selinux-apache )
-	!dev-libs/apr
-	!dev-libs/apr-util"
-
-apache_setup_vars() {
-	# Sets the USERDIR to default.
-	USERDIR="public_html"
-	einfo "DATADIR is set to: ${DATADIR}"
-	einfo "USERDIR is set to: $USERDIR"
-}
-
-set_filter_flags() {
-	CFLAGS="${CFLAGS/  / }"
-	has_version =sys-libs/glibc-2.2* && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-}
-
-src_unpack() {
-	set_filter_flags
-
-	unpack ${A} || die
-	cd ${S} || die
-
-	# apply the patches from the patch tarball
-	EPATCH_SUFFIX="patch"
-	epatch ${APACHE_PATCHDIR} || die
-
-	if use berkdb; then
-		einfo "Enabling berkdb."
-		if has_version '=sys-libs/db-4*'; then
-			einfo "Enabling db4"
-			myconf="${myconf} --with-dbm=db4 --with-berkely-db=/usr"
-		elif has_version '=sys-libs/db-3*'; then
-			einfo "Enabling db3"
-			myconf="${myconf} --with-dbm=db3 --with-berkely-db=/usr"
-		elif has_version '=sys-libs/db-2'; then
-			einfo "Enabling db2"
-			myconf="${myconf} --with-dbm=db2 --with-berkely-db=/usr"
-		fi
-	else
-		echo "Disabling berkdb"
-	fi
-
-	#avoid utf-8 charset problems
-	export LC_CTYPE=C
-
-	ht_fix_file srclib/apr/build/buildcheck.sh
-
-	#give it the stamp
-	sed -i -e 's:(" PLATFORM "):(Gentoo/Linux):g' server/core.c
-
-	#fix perl with perl!
-	find . -type f | xargs perl -pi -e \
-		"s|/usr/local/bin/perl|/usr/bin/perl|g; \
-		s|/usr/local/bin/perl5|/usr/bin/perl|g; \
-		s|/path/to/bin/perl|/usr/bin/perl|g;"
-	#dont want this cruft in /usr/bin
-	sed -i -e 's:@exp_bindir@:@exp_installbuilddir:g' support/apachectl.in
-
-	#setup the filesystem layout config
-	cat ${FILESDIR}/common/config.layout >> config.layout
-	sed -i -e 's:version:${PF}:g' config.layout
-
-	cat ${FILESDIR}/common/apr-config.layout >> srclib/apr/config.layout
-	cat ${FILESDIR}/common/apr-util-config.layout >> srclib/apr-util/config.layout
-
-	sed -i -e "s:/var/www/localhost:${DATADIR}:g" srclib/apr/config.layout
-	sed -i -e "s:/var/www/localhost:${DATADIR}:g" srclib/apr-util/config.layout
-
-	WANT_AUTOCONF=2.5 ./buildconf || die "buildconf failed"
-}
-
-src_compile() {
-	set_filter_flags
-	apache_setup_vars
-
-	# Detect mips and uclibc systems properly
-	gnuconfig_update
-
-	local myconf
-	if use ldap; then
-		if use mips; then
-			eerror "Sorry, LDAP support isn't available yet for MIPS"
-			eerror "Test out OpenLDAP and report it via BugZilla!"
-			eerror "Continuing in 5 seconds"
-			sleep 5s
-		else
-			einfo "Enabling LDAP"
-			if use static; then
-			  myconf="--with-ldap --enable-auth-ldap=static --enable-ldap=static"
-			else
-			  myconf="--with-ldap --enable-auth-ldap=shared --enable-ldap=shared"
-			fi
-		fi
-	fi
-
-	if use ipv6; then
-		einfo "Enabling ipv6"
-		myconf="${myconf} --enable-vp4"
-	else
-		myconf="${myconf} --disable-ipv6"
-	fi
-
-	if use threads; then
-		einfo "Enabling threads support"
-		myconf="${myconf} --with-mpm=worker"
-	else
-		myconf="${myconf} --with-mpm=${MPM:=prefork}"
-	fi
-
-	select_modules_config || die "determining modules"
-
-	# Fix for bug #24215 - robbat2@gentoo.org, 30 Oct 2003
-	# We pre-load the cache with the correct answer!  This avoids
-	# it violating the sandbox.  This may have to be changed for
-	# non-Linux systems or if sem_open changes on Linux.  This
-	# hack is built around documentation in /usr/include/semaphore.h
-	# and the glibc (pthread) source
-	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache
-
-	# Workaround for bug #32444 - robbat2@gentoo.org, 28 Nov 2003
-	# Apache2 tries to build SCTP support even when all the parts of it aren't there
-	# So for the moment we tell it to ignore SCTP support
-	echo 'ac_cv_sctp=${ac_cv_sctp=no}' >> ${S}/config.cache
-	echo 'ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no}' >> ${S}/config.cache
-	echo 'ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no}' >> ${S}/config.cache
-
-	SSL_BASE="SYSTEM" \
-	WANT_AUTOCONF_2_5=1 WANT_AUTOCONF=2.5
-	./configure \
-		--with-suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
-		--with-suexec-logfile=/var/log/apache2/suexec_log \
-		--with-suexec-bin=/usr/sbin/suexec2 \
-		--with-suexec-userdir=${USERDIR} \
-		--with-suexec-caller=apache \
-		--with-suexec-docroot=/var/www \
-		--with-suexec-uidmin=1000 \
-		--with-suexec-gidmin=100 \
-		--with-suexec-umask=077 \
-		--enable-suexec=shared \
-		\
-		${MY_BUILTINS} \
-		\
-		--cache-file=${S}/config.cache \
-		--with-perl=/usr/bin/perl \
-		--with-expat=/usr \
-		--with-ssl=/usr \
-		--with-z=/usr \
-		--with-port=80 \
-		--enable-layout=Gentoo \
-		--with-program-name=apache2 \
-		--with-devrandom=/dev/urandom \
-		--host=${CHOST} ${myconf} || die "bad ./configure please submit bug report to bugs.gentoo.org. Include your config.layout."
-		#--with-mpm={worker|prefork|perchild|leader|threadpool}
-
-	# we don't want to try and recompile the ssl_expr_parse.c file, because
-	# the lex source is broken
-	touch modules/ssl/ssl_expr_scan.c
-
-	emake || die "problem compiling Apache2 :("
-
-	#build ssl version of apache bench (ab-ssl)
-	cd support; rm -f ab .libs/ab ab.lo ab.o
-	make ab CFLAGS="${CFLAGS} -DUSE_SSL -lcrypto -lssl \
-		-I/usr/include/openssl -L/usr/lib" || die
-	mv ab ab-ssl; mv .libs/ab .libs/ab-ssl; rm -f ab.lo ab.o
-	make ab || die
-}
-
-pkg_preinst() {
-	# setup apache user and group
-	enewgroup apache 81
-	enewuser apache 81 -1 /var/www apache
-}
-
-src_install () {
-	set_filter_flags
-
-	local i
-	make DESTDIR=${D} install || die
-	dodoc ABOUT_APACHE CHANGES INSTALL LAYOUT \
-		LICENSE README* ${FILESDIR}/robots.txt
-
-	#bogus values pointing at /var/tmp/portage
-	sed -i -e 's:APR_SOURCE_DIR=.*:APR_SOURCE_DIR=:g' ${D}/usr/bin/apr-config
-	sed -i -e 's:APU_SOURCE_DIR=.*:APU_SOURCE_DIR=:g' ${D}/usr/bin/apu-config
-	sed -i -e 's:APU_BUILD_DIR=.*:APU_BUILD_DIR=:g' ${D}/usr/bin/apu-config
-
-	#protect the suexec binary
-	local gid=`id -g apache`
-	[ -z "${gid}" ] && gid=81
-	fowners root:${gid} /usr/sbin/suexec
-	fperms 4710 /usr/sbin/suexec
-
-	#apxs needs this to pickup the right lib for install
-	dosym /usr/lib /usr/lib/apache2/lib
-	dosym /var/log/apache2 /usr/lib/apache2/logs
-	dosym /usr/lib/apache2-extramodules /usr/lib/apache2/extramodules
-	dosym /etc/apache2/conf /usr/lib/apache2/conf
-
-	cd ${S}
-	#Credits to advx.org people for these scripts. Heck, thanks for
-	#the nice layout and everything else ;-)
-	for i in apache2logserverstatus apache2splitlogfile
-	do
-		dosbin ${APACHE_CONFDIR}/usr/sbin/$i
-	done
-	exeinto /usr/lib/ssl/apache2-mod_ssl
-	doexe ${APACHE_CONFDIR}/usr/lib/ssl/apache2-mod_ssl/gentestcrt.sh
-
-	#some more scripts
-	for i in split-logfile list_hooks.pl logresolve.pl log_server_status
-	do
-		dosbin ${S}/support/$i
-	done
-	#the ssl version of apache bench
-	dosbin support/.libs/ab-ssl
-
-	#move some mods to extramodules
-	dodir /usr/lib/apache2-extramodules
-	for i in mod_ssl.so mod_ldap.so mod_auth_ldap.so
-	do
-		[ -x ${D}/usr/lib/apache2/modules/$i ] && \
-		mv ${D}/usr/lib/apache2/modules/$i ${D}/usr/lib/apache2-extramodules
-	done
-
-	#tidy up
-	mv ${D}/usr/sbin/envvars* ${D}/usr/lib/apache2/build
-	dodoc ${D}/etc/apache2/conf/*-std.conf
-	rm -f ${D}/etc/apache2/conf/*.conf
-	rm -rf ${D}/var/log ${D}/var/run
-
-	# install our default config files
-	cd ${D}
-	( cd ${APACHE_CONFDIR} && tar -cpvf - * ) | tar -xpvf -
-	find etc/apache2 -type f -exec chmod 644 {} \;
-	find etc/apache2 -type f -exec chown root: {} \;
-
-	#drop in a convenient link to the manual
-	if use doc; then
-		dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual
-	else
-		rm -rf ${D}/usr/share/doc/${PF}/manual
-	fi
-
-	#SLOT=2!!!
-	cd ${D}
-	mv -v usr/sbin/apachectl usr/sbin/apache2ctl
-	mv -v usr/sbin/htdigest usr/sbin/htdigest2
-	mv -v usr/sbin/htpasswd usr/sbin/htpasswd2
-	mv -v usr/sbin/logresolve usr/sbin/logresolve2
-	mv -v usr/sbin/apxs usr/sbin/apxs2
-	mv -v usr/sbin/ab usr/sbin/ab2
-	mv -v usr/sbin/ab-ssl usr/sbin/ab2-ssl
-	mv -v usr/sbin/suexec usr/sbin/suexec2
-	mv -v usr/sbin/rotatelogs usr/sbin/rotatelogs2
-	mv -v usr/sbin/dbmmanage usr/sbin/dbmmanage2
-	mv -v usr/sbin/checkgid usr/sbin/checkgid2
-	mv -v usr/sbin/split-logfile usr/sbin/split-logfile2
-	mv -v usr/sbin/list_hooks.pl usr/sbin/list_hooks2.pl
-	mv -v usr/sbin/logresolve.pl usr/sbin/logresolve2.pl
-
-	# do the man pages
-	mv -v usr/share/man/man1/htdigest.1 usr/share/man/man1/htdigest2.1
-	mv -v usr/share/man/man1/htpasswd.1 usr/share/man/man1/htpasswd2.1
-	mv -v usr/share/man/man1/dbmmanage.1 usr/share/man/man1/dbmmanage2.1
-	mv -v usr/share/man/man8/ab.8 usr/share/man/man8/ab2.8
-	mv -v usr/share/man/man8/apxs.8 usr/share/man/man8/apxs2.8
-	mv -v usr/share/man/man8/apachectl.8 usr/share/man/man8/apache2ctl.8
-	mv -v usr/share/man/man8/httpd.8 usr/share/man/man8/apache2.8
-	mv -v usr/share/man/man8/logresolve.8 usr/share/man/man8/logresolve2.8
-	mv -v usr/share/man/man8/rotatelogs.8 usr/share/man/man8/rotatelogs2.8
-	mv -v usr/share/man/man8/suexec.8 usr/share/man/man8/suexec2.8
-
-	# Fix for dav and SSL dirs
-	keepdir /var/lib/dav
-	fowners apache:apache /var/lib/dav
-	fperms 755 /var/lib/dav
-
-	keepdir /var/log/apache2
-	fowners apache:apache /var/log/apache2
-	fperms 755 /var/log/apache2
-
-	keepdir /var/cache/apache2
-	fowners apache:apache /var/cache/apache2
-	fperms 755 /var/cache/apache2
-
-	keepdir /etc/apache2/conf/ssl
-
-	# fix bug 92348
-	fperms 755 /usr/sbin/apache2logserverstatus
-	fperms 755 /usr/sbin/apache2splitlogfile
-
-	# Added by Jason Wever <weeve@gentoo.org>
-	# A little sedfu to fix bug #7172 for sparc64s
-	if [ ${ARCH} = "sparc" ]
-	then
-		sed -i -e '13a\AcceptMutex fcntl' \
-			${D}/etc/apache2/conf/apache2.conf
-	fi
-}
-
-parse_modules_config() {
-	set_filter_flags
-
-	local filename=$1
-	local name=""
-	local dso=""
-	local disable=""
-	[ -f ${filename} ] || return 1
-	for i in `cat $filename | 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-$name"
-			name="" ; disable=""
-		elif [ $i == "static" ] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=yes"
-			name="" ; disable=""
-		elif [ $i == "shared" ] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=shared"
-			name="" ; disable=""
-		fi
-	done
-	einfo "${filename} options:\n${MY_BUILTINS}"
-}
-
-select_modules_config() {
-	parse_modules_config /etc/apache2/apache2-builtin-mods || \
-	parse_modules_config ${FILESDIR}/2.0.49/apache2-builtin-mods || \
-	return 1
-}
-
-pkg_postinst() {
-	set_filter_flags
-
-	if use ssl; then
-		cd ${ROOT}/etc/apache2/conf/ssl
-		einfo
-		einfo "Generating self-signed test certificate in /etc/apache2/conf/ssl..."
-		yes "" 2>/dev/null | ${ROOT}/usr/lib/ssl/apache2-mod_ssl/gentestcrt.sh >/dev/null 2>&1
-		einfo
-	fi
-
-	if has_version '=net-www/apache-1*' ; then
-	ewarn
-	ewarn "Please add the 'apache2' flag to your USE variable and (re)install"
-	ewarn "any additional DSO modules you may wish to use with Apache-2.x."
-	ewarn "Addon modules are configured in /etc/apache2/conf/modules.d/"
-	ewarn
-	fi
-
-	if [ -d /home/httpd ];
-	then
-	einfo
-	einfo "Please remember to update your config files in /etc/apache2"
-	einfo "as --datadir has been changed to ${DATADIR}, and ServerRoot"
-	einfo "has changed to /usr/lib/apache2!"
-	einfo
-	fi
-
-	einfo "Fixing permissions problem introduced in previous revision"
-	find ${ROOT}/etc/apache2 -type f -user apache -exec chown root: {} \;
-
-	local list=""
-	for i in lib logs modules extramodules; do
-		local d="/etc/apache2/${i}"
-		[ -s "${d}" ] && list="${list} ${d}"
-	done
-	if [ -n "${list}" ]; then
-		einfo "You should delete these old symlinks: ${list}"
-	fi
-}
diff --git a/net-www/apache/apache-2.0.54-r16.ebuild b/net-www/apache/apache-2.0.54-r16.ebuild
deleted file mode 100644
index c55a799e533f..000000000000
--- a/net-www/apache/apache-2.0.54-r16.ebuild
+++ /dev/null
@@ -1,419 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.54-r16.ebuild,v 1.9 2006/04/19 17:24:59 chtekk Exp $
-
-inherit flag-o-matic eutils fixheadtails gnuconfig
-
-PATCH_LEVEL="${PVR}"
-S="${WORKDIR}/httpd-${PV}"
-DESCRIPTION="Apache Web Server"
-HOMEPAGE="http://www.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
-	http://dev.gentoo.org/~vericgar/dist/apache/old/apache-patches-${PATCH_LEVEL}.tar.bz2
-	http://dev.gentoo.org/~vericgar/dist/apache/old/apache-conf-${PATCH_LEVEL}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="berkdb gdbm ldap threads ipv6 doc static ssl selinux"
-
-#Standard location for Gentoo Linux
-DATADIR="/var/www/localhost"
-
-# Location for the two additional tarballs
-APACHE_PATCHDIR=${WORKDIR}/apache-patches-${PATCH_LEVEL}
-APACHE_CONFDIR=${WORKDIR}/apache-conf-${PATCH_LEVEL}
-
-DEPEND="dev-util/yacc
-	dev-lang/perl
-	sys-libs/zlib
-	dev-libs/expat
-	dev-libs/openssl
-	>=sys-devel/autoconf-2.59-r4
-	berkdb? ( sys-libs/db )
-	gdbm? ( sys-libs/gdbm )
-	!mips? ( ldap? ( =net-nds/openldap-2* ) )
-	selinux? ( sec-policy/selinux-apache )
-	!dev-libs/apr
-	!dev-libs/apr-util"
-
-apache_setup_vars() {
-	# Sets the USERDIR to default.
-	USERDIR="public_html"
-	einfo "DATADIR is set to: ${DATADIR}"
-	einfo "USERDIR is set to: $USERDIR"
-}
-
-set_filter_flags() {
-	CFLAGS="${CFLAGS/  / }"
-	has_version =sys-libs/glibc-2.2* && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-}
-
-src_unpack() {
-	set_filter_flags
-
-	unpack ${A} || die
-	cd ${S} || die
-
-	# apply the patches from the patch tarball
-	EPATCH_SUFFIX="patch"
-	epatch ${APACHE_PATCHDIR} || die
-
-	if use berkdb; then
-		einfo "Enabling berkdb."
-		if has_version '=sys-libs/db-4*'; then
-			einfo "Enabling db4"
-			myconf="${myconf} --with-dbm=db4 --with-berkely-db=/usr"
-		elif has_version '=sys-libs/db-3*'; then
-			einfo "Enabling db3"
-			myconf="${myconf} --with-dbm=db3 --with-berkely-db=/usr"
-		elif has_version '=sys-libs/db-2'; then
-			einfo "Enabling db2"
-			myconf="${myconf} --with-dbm=db2 --with-berkely-db=/usr"
-		fi
-	else
-		echo "Disabling berkdb"
-	fi
-
-	#avoid utf-8 charset problems
-	export LC_CTYPE=C
-
-	ht_fix_file srclib/apr/build/buildcheck.sh
-
-	#give it the stamp
-	sed -i -e 's:(" PLATFORM "):(Gentoo/Linux):g' server/core.c
-
-	#fix perl with perl!
-	find . -type f | xargs perl -pi -e \
-		"s|/usr/local/bin/perl|/usr/bin/perl|g; \
-		s|/usr/local/bin/perl5|/usr/bin/perl|g; \
-		s|/path/to/bin/perl|/usr/bin/perl|g;"
-	#dont want this cruft in /usr/bin
-	sed -i -e 's:@exp_bindir@:@exp_installbuilddir:g' support/apachectl.in
-
-	#setup the filesystem layout config
-	cat ${FILESDIR}/common/config.layout >> config.layout
-	sed -i -e 's:version:${PF}:g' config.layout
-
-	cat ${FILESDIR}/common/apr-config.layout >> srclib/apr/config.layout
-	cat ${FILESDIR}/common/apr-util-config.layout >> srclib/apr-util/config.layout
-
-	sed -i -e "s:/var/www/localhost:${DATADIR}:g" srclib/apr/config.layout
-	sed -i -e "s:/var/www/localhost:${DATADIR}:g" srclib/apr-util/config.layout
-
-	WANT_AUTOCONF=2.5 ./buildconf || die "buildconf failed"
-}
-
-src_compile() {
-	set_filter_flags
-	apache_setup_vars
-
-	# Detect mips and uclibc systems properly
-	gnuconfig_update
-
-	local myconf
-	if use ldap; then
-		if use mips; then
-			eerror "Sorry, LDAP support isn't available yet for MIPS"
-			eerror "Test out OpenLDAP and report it via BugZilla!"
-			eerror "Continuing in 5 seconds"
-			sleep 5s
-		else
-			einfo "Enabling LDAP"
-			if use static; then
-			  myconf="--with-ldap --enable-auth-ldap=static --enable-ldap=static"
-			else
-			  myconf="--with-ldap --enable-auth-ldap=shared --enable-ldap=shared"
-			fi
-		fi
-	fi
-
-	if use ipv6; then
-		einfo "Enabling ipv6"
-		myconf="${myconf} --enable-vp4"
-	else
-		myconf="${myconf} --disable-ipv6"
-	fi
-
-	if use threads; then
-		einfo "Enabling threads support"
-		myconf="${myconf} --with-mpm=worker"
-	else
-		myconf="${myconf} --with-mpm=${MPM:=prefork}"
-	fi
-
-	select_modules_config || die "determining modules"
-
-	# Fix for bug #24215 - robbat2@gentoo.org, 30 Oct 2003
-	# We pre-load the cache with the correct answer!  This avoids
-	# it violating the sandbox.  This may have to be changed for
-	# non-Linux systems or if sem_open changes on Linux.  This
-	# hack is built around documentation in /usr/include/semaphore.h
-	# and the glibc (pthread) source
-	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache
-
-	# Workaround for bug #32444 - robbat2@gentoo.org, 28 Nov 2003
-	# Apache2 tries to build SCTP support even when all the parts of it aren't there
-	# So for the moment we tell it to ignore SCTP support
-	echo 'ac_cv_sctp=${ac_cv_sctp=no}' >> ${S}/config.cache
-	echo 'ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no}' >> ${S}/config.cache
-	echo 'ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no}' >> ${S}/config.cache
-
-	SSL_BASE="SYSTEM" \
-	WANT_AUTOCONF_2_5=1 WANT_AUTOCONF=2.5
-	./configure \
-		--with-suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
-		--with-suexec-logfile=/var/log/apache2/suexec_log \
-		--with-suexec-bin=/usr/sbin/suexec2 \
-		--with-suexec-userdir=${USERDIR} \
-		--with-suexec-caller=apache \
-		--with-suexec-docroot=/var/www \
-		--with-suexec-uidmin=1000 \
-		--with-suexec-gidmin=100 \
-		--with-suexec-umask=077 \
-		--enable-suexec=shared \
-		\
-		${MY_BUILTINS} \
-		\
-		--cache-file=${S}/config.cache \
-		--with-perl=/usr/bin/perl \
-		--with-expat=/usr \
-		--with-ssl=/usr \
-		--with-z=/usr \
-		--with-port=80 \
-		--enable-layout=Gentoo \
-		--with-program-name=apache2 \
-		--with-devrandom=/dev/urandom \
-		--host=${CHOST} ${myconf} || die "bad ./configure please submit bug report to bugs.gentoo.org. Include your config.layout."
-		#--with-mpm={worker|prefork|perchild|leader|threadpool}
-
-	# we don't want to try and recompile the ssl_expr_parse.c file, because
-	# the lex source is broken
-	touch modules/ssl/ssl_expr_scan.c
-
-	emake || die "problem compiling Apache2 :("
-
-	#build ssl version of apache bench (ab-ssl)
-	cd support; rm -f ab .libs/ab ab.lo ab.o
-	make ab CFLAGS="${CFLAGS} -DUSE_SSL -lcrypto -lssl \
-		-I/usr/include/openssl -L/usr/lib" || die
-	mv ab ab-ssl; mv .libs/ab .libs/ab-ssl; rm -f ab.lo ab.o
-	make ab || die
-}
-
-pkg_preinst() {
-	# setup apache user and group
-	enewgroup apache 81
-	enewuser apache 81 -1 /var/www apache
-}
-
-src_install () {
-	set_filter_flags
-
-	local i
-	make DESTDIR=${D} install || die
-	dodoc ABOUT_APACHE CHANGES INSTALL LAYOUT \
-		LICENSE README* ${FILESDIR}/robots.txt
-
-	#bogus values pointing at /var/tmp/portage
-	sed -i -e 's:APR_SOURCE_DIR=.*:APR_SOURCE_DIR=:g' ${D}/usr/bin/apr-config
-	sed -i -e 's:APU_SOURCE_DIR=.*:APU_SOURCE_DIR=:g' ${D}/usr/bin/apu-config
-	sed -i -e 's:APU_BUILD_DIR=.*:APU_BUILD_DIR=:g' ${D}/usr/bin/apu-config
-
-	#protect the suexec binary
-	local gid=`id -g apache`
-	[ -z "${gid}" ] && gid=81
-	fowners root:${gid} /usr/sbin/suexec
-	fperms 4710 /usr/sbin/suexec
-
-	#apxs needs this to pickup the right lib for install
-	dosym /usr/lib /usr/lib/apache2/lib
-	dosym /var/log/apache2 /usr/lib/apache2/logs
-	dosym /usr/lib/apache2-extramodules /usr/lib/apache2/extramodules
-	dosym /etc/apache2/conf /usr/lib/apache2/conf
-
-	cd ${S}
-	#Credits to advx.org people for these scripts. Heck, thanks for
-	#the nice layout and everything else ;-)
-	for i in apache2logserverstatus apache2splitlogfile
-	do
-		dosbin ${APACHE_CONFDIR}/usr/sbin/$i
-	done
-	exeinto /usr/lib/ssl/apache2-mod_ssl
-	doexe ${APACHE_CONFDIR}/usr/lib/ssl/apache2-mod_ssl/gentestcrt.sh
-
-	#some more scripts
-	for i in split-logfile list_hooks.pl logresolve.pl log_server_status
-	do
-		dosbin ${S}/support/$i
-	done
-	#the ssl version of apache bench
-	dosbin support/.libs/ab-ssl
-
-	#move some mods to extramodules
-	dodir /usr/lib/apache2-extramodules
-	for i in mod_ssl.so mod_ldap.so mod_auth_ldap.so
-	do
-		[ -x ${D}/usr/lib/apache2/modules/$i ] && \
-		mv ${D}/usr/lib/apache2/modules/$i ${D}/usr/lib/apache2-extramodules
-	done
-
-	#tidy up
-	mv ${D}/usr/sbin/envvars* ${D}/usr/lib/apache2/build
-	dodoc ${D}/etc/apache2/conf/*-std.conf
-	rm -f ${D}/etc/apache2/conf/*.conf
-	rm -rf ${D}/var/log ${D}/var/run
-
-	# install our default config files
-	cd ${D}
-	( cd ${APACHE_CONFDIR} && tar -cpvf - * ) | tar -xpvf -
-	find etc/apache2 -type f -exec chmod 644 {} \;
-	find etc/apache2 -type f -exec chown root: {} \;
-
-	#drop in a convenient link to the manual
-	if use doc; then
-		dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual
-	else
-		rm -rf ${D}/usr/share/doc/${PF}/manual
-	fi
-
-	#SLOT=2!!!
-	cd ${D}
-	mv -v usr/sbin/apachectl usr/sbin/apache2ctl
-	mv -v usr/sbin/htdigest usr/sbin/htdigest2
-	mv -v usr/sbin/htpasswd usr/sbin/htpasswd2
-	mv -v usr/sbin/logresolve usr/sbin/logresolve2
-	mv -v usr/sbin/apxs usr/sbin/apxs2
-	mv -v usr/sbin/ab usr/sbin/ab2
-	mv -v usr/sbin/ab-ssl usr/sbin/ab2-ssl
-	mv -v usr/sbin/suexec usr/sbin/suexec2
-	mv -v usr/sbin/rotatelogs usr/sbin/rotatelogs2
-	mv -v usr/sbin/dbmmanage usr/sbin/dbmmanage2
-	mv -v usr/sbin/checkgid usr/sbin/checkgid2
-	mv -v usr/sbin/split-logfile usr/sbin/split-logfile2
-	mv -v usr/sbin/list_hooks.pl usr/sbin/list_hooks2.pl
-	mv -v usr/sbin/logresolve.pl usr/sbin/logresolve2.pl
-
-	# do the man pages
-	mv -v usr/share/man/man1/htdigest.1 usr/share/man/man1/htdigest2.1
-	mv -v usr/share/man/man1/htpasswd.1 usr/share/man/man1/htpasswd2.1
-	mv -v usr/share/man/man1/dbmmanage.1 usr/share/man/man1/dbmmanage2.1
-	mv -v usr/share/man/man8/ab.8 usr/share/man/man8/ab2.8
-	mv -v usr/share/man/man8/apxs.8 usr/share/man/man8/apxs2.8
-	mv -v usr/share/man/man8/apachectl.8 usr/share/man/man8/apache2ctl.8
-	mv -v usr/share/man/man8/httpd.8 usr/share/man/man8/apache2.8
-	mv -v usr/share/man/man8/logresolve.8 usr/share/man/man8/logresolve2.8
-	mv -v usr/share/man/man8/rotatelogs.8 usr/share/man/man8/rotatelogs2.8
-	mv -v usr/share/man/man8/suexec.8 usr/share/man/man8/suexec2.8
-
-	# Fix for dav and SSL dirs
-	keepdir /var/lib/dav
-	fowners apache:apache /var/lib/dav
-	fperms 755 /var/lib/dav
-
-	keepdir /var/log/apache2
-	fowners apache:apache /var/log/apache2
-	fperms 755 /var/log/apache2
-
-	keepdir /var/cache/apache2
-	fowners apache:apache /var/cache/apache2
-	fperms 755 /var/cache/apache2
-
-	keepdir /etc/apache2/conf/ssl
-
-	# fix bug 92348
-	fperms 755 /usr/sbin/apache2logserverstatus
-	fperms 755 /usr/sbin/apache2splitlogfile
-
-	# Added by Jason Wever <weeve@gentoo.org>
-	# A little sedfu to fix bug #7172 for sparc64s
-	if [ ${ARCH} = "sparc" ]
-	then
-		sed -i -e '13a\AcceptMutex fcntl' \
-			${D}/etc/apache2/conf/apache2.conf
-	fi
-}
-
-parse_modules_config() {
-	set_filter_flags
-
-	local filename=$1
-	local name=""
-	local dso=""
-	local disable=""
-	[ -f ${filename} ] || return 1
-	for i in `cat $filename | 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-$name"
-			name="" ; disable=""
-		elif [ $i == "static" ] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=yes"
-			name="" ; disable=""
-		elif [ $i == "shared" ] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=shared"
-			name="" ; disable=""
-		fi
-	done
-	einfo "${filename} options:\n${MY_BUILTINS}"
-}
-
-select_modules_config() {
-	parse_modules_config /etc/apache2/apache2-builtin-mods || \
-	parse_modules_config ${FILESDIR}/2.0.49/apache2-builtin-mods || \
-	return 1
-}
-
-pkg_postinst() {
-	set_filter_flags
-
-	if use ssl; then
-		cd ${ROOT}/etc/apache2/conf/ssl
-		einfo
-		einfo "Generating self-signed test certificate in /etc/apache2/conf/ssl..."
-		yes "" 2>/dev/null | ${ROOT}/usr/lib/ssl/apache2-mod_ssl/gentestcrt.sh >/dev/null 2>&1
-		einfo
-	fi
-
-	if has_version '=net-www/apache-1*' ; then
-	ewarn
-	ewarn "Please add the 'apache2' flag to your USE variable and (re)install"
-	ewarn "any additional DSO modules you may wish to use with Apache-2.x."
-	ewarn "Addon modules are configured in /etc/apache2/conf/modules.d/"
-	ewarn
-	fi
-
-	if [ -d /home/httpd ];
-	then
-	einfo
-	einfo "Please remember to update your config files in /etc/apache2"
-	einfo "as --datadir has been changed to ${DATADIR}, and ServerRoot"
-	einfo "has changed to /usr/lib/apache2!"
-	einfo
-	fi
-
-	einfo "Fixing permissions problem introduced in previous revision"
-	find ${ROOT}/etc/apache2 -type f -user apache -exec chown root: {} \;
-
-	local list=""
-	for i in lib logs modules extramodules; do
-		local d="/etc/apache2/${i}"
-		[ -s "${d}" ] && list="${list} ${d}"
-	done
-	if [ -n "${list}" ]; then
-		einfo "You should delete these old symlinks: ${list}"
-	fi
-
-	einfo
-	einfo "This ebuild uses the old-style configuration of apache, which has"
-	einfo "been deprecated and will no longer be supported as of March 1, 2006."
-	einfo "It is strongly suggested that you upgrade to the latest version of"
-	einfo "apache by following the Apache Upgrading Guide at"
-	einfo "http://www.gentoo.org/doc/en/apache-upgrading.xml. If you have"
-	einfo "questions, please join us on #gentoo-apache on irc.freenode.net"
-	einfo
-
-}
diff --git a/net-www/apache/apache-2.0.54-r30.ebuild b/net-www/apache/apache-2.0.54-r30.ebuild
deleted file mode 100644
index edbb8fe93ed4..000000000000
--- a/net-www/apache/apache-2.0.54-r30.ebuild
+++ /dev/null
@@ -1,436 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.54-r30.ebuild,v 1.6 2006/04/19 17:24:59 chtekk Exp $
-
-inherit eutils gnuconfig
-
-# latest gentoo apache files
-GENTOO_PATCHNAME="gentoo-apache-${PVR}"
-GENTOO_PATCHSTAMP="20050910"
-GENTOO_DEVSPACE="vericgar"
-GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
-
-DESCRIPTION="The Apache Web Server"
-HOMEPAGE="http://httpd.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
-	http://dev.gentoo.org/~${GENTOO_DEVSPACE}/dist/apache/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="apache2 debug doc ldap mpm-leader mpm-peruser mpm-prefork mpm-threadpool mpm-worker no-suexec ssl static-modules threads selinux"
-
-RDEPEND="dev-lang/perl
-	|| ( ~dev-libs/apr-0.9.12 ~dev-libs/apr-0.9.7 ~dev-libs/apr-0.9.6 )
-	|| ( ~dev-libs/apr-util-0.9.12 ~dev-libs/apr-util-0.9.7 ~dev-libs/apr-0.9.6 )
-	dev-libs/expat
-	net-www/gentoo-webroot-default
-	app-misc/mime-types
-	sys-libs/zlib
-	ssl? ( dev-libs/openssl )
-	selinux? ( sec-policy/selinux-apache )
-	!mips? ( ldap? ( =net-nds/openldap-2* ) )"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.59-r4"
-
-S="${WORKDIR}/httpd-${PV}"
-
-big_fat_warnings() {
-
-	if use ldap && ! built_with_use 'dev-libs/apr-util' ldap; then
-		eerror "dev-libs/apr-util is missing LDAP support. For apache to have"
-		eerror "ldap support, apr-util must be built with the ldap USE-flag"
-		eerror "enabled."
-		die "ldap USE-flag enabled while not supported in apr-util"
-	fi
-
-	if use mpm-peruser; then
-		ewarn " -BIG- -FAT- -WARNING-"
-		ewarn ""
-		ewarn "The peruser (USE=mpm-peruser) MPM is considered highly experimental"
-		ewarn "and are not (yet) supported, nor are they recommended for production"
-		ewarn "use.  You have been warned!"
-		ewarn
-		ewarn "Continuing in 5 seconds.."
-		sleep 5
-	fi
-
-	ewarn ""
-	ewarn "LFS support has been removed due to incompatibilites with other packages."
-	ewarn "You _will_ have to re-emerge any Apache modules you have installed, or"
-	ewarn "they will likely misbehave/segfault."
-	ewarn ""
-	ewarn ""
-	ewarn "Multiple MPM support has been disabled due to problems with external"
-	ewarn "modules.  If you have relied on this functionality you will need"
-	ewarn "to find another solution.  The Gentoo Apache team apologizes for"
-	ewarn "any inconvienence this may cause you."
-	ewarn ""
-}
-
-pkg_setup() {
-	big_fat_warnings
-	select_mpms
-}
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-
-	EPATCH_SUFFIX="patch"
-	epatch ${GENTOO_PATCHDIR}/patches/[0-2]* || die "internal ebuild error"
-
-	# avoid utf-8 charset problems
-	export LC_CTYPE=C
-
-	# setup the filesystem layout config
-	cat ${GENTOO_PATCHDIR}/patches/config.layout >> config.layout
-	sed -i -e 's:version:${PF}:g' config.layout
-
-	# peruser need to build conf
-	WANT_AUTOCONF=2.5 ./buildconf || die "buildconf failed"
-}
-
-src_compile() {
-	setup_apache_vars
-
-	# Detect mips and uclibc systems properly
-	gnuconfig_update
-
-	local modtype
-	if useq static-modules; then
-		modtype="static"
-	else
-		modtype="shared"
-	fi
-
-	select_modules_config || die "determining modules"
-
-	local myconf
-	useq ldap && myconf="${myconf} --enable-auth-ldap=${modtype} --enable-ldap=${modtype}"
-	useq ssl && myconf="${myconf} --with-ssl=/usr  --enable-ssl=${modtype}"
-
-	# Fix for bug #24215 - robbat2@gentoo.org, 30 Oct 2003
-	# We pre-load the cache with the correct answer!  This avoids
-	# it violating the sandbox.  This may have to be changed for
-	# non-Linux systems or if sem_open changes on Linux.  This
-	# hack is built around documentation in /usr/include/semaphore.h
-	# and the glibc (pthread) source
-	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache
-
-	if useq no-suexec; then
-		myconf="${myconf} --disable-suexec"
-	else
-		myconf="${myconf}
-				--with-suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
-				--with-suexec-logfile=/var/log/apache2/suexec_log \
-				--with-suexec-bin=/usr/sbin/suexec2 \
-				--with-suexec-userdir=${USERDIR} \
-				--with-suexec-caller=apache \
-				--with-suexec-docroot=/var/www \
-				--with-suexec-uidmin=1000 \
-				--with-suexec-gidmin=100 \
-				--with-suexec-umask=077 \
-				--enable-suexec=shared"
-	fi
-
-	# common confopts
-	myconf="${myconf} \
-			--with-apr=/usr \
-			--with-apr-util=/usr \
-			--cache-file=${S}/config.cache \
-			--with-perl=/usr/bin/perl \
-			--with-expat=/usr \
-			--with-z=/usr \
-			--with-port=80 \
-			--enable-layout=Gentoo \
-			--with-program-name=apache2 \
-			--with-devrandom=/dev/urandom \
-			--host=${CHOST} ${MY_BUILTINS}"
-
-	# debugging support
-	if useq debug ; then
-		myconf="${myconf} --enable-maintainer-mode"
-	fi
-
-	./configure --with-mpm=${mpm} ${myconf} || die "bad ./configure please submit bug report to bugs.gentoo.org. Include your config.layout and config.log"
-
-	# we don't want to try and recompile the ssl_expr_parse.c file, because
-	# the lex source is broken
-	touch modules/ssl/ssl_expr_scan.c
-
-	# as decided on IRC-AGENDA-10.2004, we use httpd.conf as standard config file name
-	sed -i -e 's:apache2\.conf:httpd.conf:' include/ap_config_auto.h
-
-	emake || die "problem compiling apache2"
-
-	# build ssl version of apache bench (ab-ssl)
-	if useq ssl; then
-		cd support
-		rm -f ab .libs/ab ab.lo 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.lo ab.o
-		make ab || die
-	fi
-}
-
-pkg_preinst() {
-	# setup apache user and group
-	enewgroup apache 81
-	enewuser apache 81 -1 /var/www apache
-}
-
-src_install () {
-	# general install
-	make DESTDIR=${D} install || die
-	dodoc ABOUT_APACHE CHANGES INSTALL LAYOUT LICENSE README* ${GENTOO_PATCHDIR}/docs/robots.txt
-
-	# protect the suexec binary
-	if ! useq no-suexec; then
-		fowners root:apache /usr/sbin/suexec
-		fperms 4710 /usr/sbin/suexec
-	fi
-
-	# apxs needs this to pickup the right lib for install
-	dosym /usr/lib /usr/lib/apache2/lib
-	dosym /var/log/apache2 /usr/lib/apache2/logs
-	dosym /etc/apache2 /usr/lib/apache2/conf
-
-	# Credits to advx.org people for these scripts. Heck, thanks for
-	# the nice layout and everything else ;-)
-	exeinto /usr/sbin
-	for i in apache2logserverstatus apache2splitlogfile; do
-		doexe ${GENTOO_PATCHDIR}/scripts/${i}
-	done
-	# gentestcrt.sh only if USE=ssl
-	useq ssl && doexe ${GENTOO_PATCHDIR}/scripts/gentestcrt.sh
-
-	# some more scripts
-	for i in split-logfile list_hooks.pl logresolve.pl log_server_status; do
-		doexe ${S}/support/${i}
-	done
-
-	# the ssl version of apache bench
-	useq ssl && doexe support/ab-ssl
-
-	# install mpm bins
-	doexe ${S}/apache2
-
-	# modules.d config file snippets
-	insinto /etc/apache2/modules.d
-	doins ${GENTOO_PATCHDIR}/conf/modules.d/45_mod_dav.conf
-	useq ldap && doins ${GENTOO_PATCHDIR}/conf/modules.d/46_mod_ldap.conf
-	if useq ssl; then
-		doins ${GENTOO_PATCHDIR}/conf/modules.d/40_mod_ssl.conf
-		doins ${GENTOO_PATCHDIR}/conf/modules.d/41_mod_ssl.default-vhost.conf
-	fi
-
-	# drop in a convenient link to the manual
-	if useq doc; then
-		insinto /etc/apache2/modules.d
-		doins ${GENTOO_PATCHDIR}/conf/modules.d/00_apache_manual.conf
-		sed -i -e "s:2.0.49:${PVR}:" ${D}/etc/apache2/modules.d/00_apache_manual.conf
-	else
-		rm -rf ${D}/usr/share/doc/${PF}/manual
-	fi
-
-	# SLOT=2
-	cd ${D}
-	for i in htdigest htpasswd logresolve apxs ab rotatelogs dbmmanage checkgid split-logfile; do
-		mv -v usr/sbin/${i} usr/sbin/${i}2
-	done
-	mv -v usr/sbin/apachectl usr/sbin/apache2ctl
-	mv -v usr/sbin/list_hooks.pl usr/sbin/list_hooks2.pl
-	mv -v usr/sbin/logresolve.pl usr/sbin/logresolve2.pl
-	useq ssl && mv -v usr/sbin/ab-ssl usr/sbin/ab2-ssl
-	useq no-suexec || mv -v usr/sbin/suexec usr/sbin/suexec2
-
-	# do the man pages
-	for i in htdigest.1 htpasswd.1 dbmmanage.1; do
-		mv -v usr/share/man/man1/${i} usr/share/man/man1/${i/./2.}
-	done
-	for i in ab.8 apxs.8 logresolve.8 rotatelogs.8; do
-		mv -v usr/share/man/man8/${i} usr/share/man/man8/${i/./2.}
-	done
-	useq no-suexec || mv -v usr/share/man/man8/suexec.8 usr/share/man/man8/suexec2.8
-	mv -v usr/share/man/man8/apachectl.8 usr/share/man/man8/apache2ctl.8
-	mv -v usr/share/man/man8/httpd.8 usr/share/man/man8/apache2.8
-
-	# tidy up
-	mv usr/sbin/envvars* usr/lib/apache2/build
-	dodoc etc/apache2/*-std.conf
-	rm -f etc/apache2/*.conf
-	rm -rf var/run var/log
-
-	# we DEPEND on net-www/gentoo-webroot-default for sharing this by now
-	rm -rf var/www/localhost
-
-	# config files
-	insinto /etc/conf.d
-	newins ${GENTOO_PATCHDIR}/init/apache2.confd apache2
-
-	exeinto /etc/init.d
-	newexe ${GENTOO_PATCHDIR}/init/apache2.initd apache2
-
-	insinto /etc/logrotate.d
-	newins ${GENTOO_PATCHDIR}/scripts/apache2-logrotate apache2
-
-	insinto /etc/apache2
-	doins ${GENTOO_PATCHDIR}/conf/apache2-builtin-mods
-	doins ${GENTOO_PATCHDIR}/conf/httpd.conf
-
-	insinto /etc/apache2/vhosts.d
-	doins ${GENTOO_PATCHDIR}/conf/vhosts.d/00_default_vhost.conf
-
-	keepdir /etc/apache2/vhosts.d
-	keepdir /etc/apache2/modules.d
-
-	# fix bug 92348
-	fperms 755 /usr/sbin/apache2logserverstatus
-	fperms 755 /usr/sbin/apache2splitlogfile
-
-	# empty dirs
-	for i in /var/lib/dav /var/log/apache2 /var/cache/apache2; do
-		keepdir ${i}
-		fowners apache:apache ${i}
-		fperms 755 ${i}
-	done
-
-	# We'll be needing /etc/apache2/ssl if USE=ssl
-	useq ssl && keepdir /etc/apache2/ssl
-
-}
-
-pkg_postinst() {
-
-	# Automatically generate test ceritificates if ssl USE flag is beeing set
-	if useq ssl; then
-		cd ${ROOT}/etc/apache2/ssl
-		einfo
-		einfo "Generating self-signed test certificate in /etc/apache2/ssl..."
-		yes "" 2>/dev/null | \
-			${ROOT}/usr/sbin/gentestcrt.sh >/dev/null 2>&1 || \
-			die "gentestcrt.sh failed"
-		einfo
-	fi
-
-	# Check for dual/upgrade install
-	if has_version '=net-www/apache-1*' || ! use apache2 ; then
-		ewarn
-		ewarn "Please add the 'apache2' flag to your USE variable and (re)install"
-		ewarn "any additional DSO modules you may wish to use with Apache-2.x."
-		ewarn "Addon modules are configured in /etc/apache2/modules.d/"
-		ewarn
-	fi
-
-	# Check for obsolete symlinks
-	local list=""
-	for i in lib logs modules extramodules; do
-		local d="/etc/apache2/${i}"
-		[ -s "${d}" ] && list="${list} ${d}"
-	done
-	[ -n "${list}" ] && einfo "You should delete these old symlinks: ${list}"
-
-	if has_version '<net-www/apache-2.0.54-r30' && has_version '>=net-www/apache-2.0.0' ; then
-		einfo "Configuration locations have changed, you will need to migrate"
-		einfo "your configuration from /etc/apache2/conf/apache2.conf and"
-		einfo "/etc/apache2/conf/commonapache2.conf to /etc/apache2/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 "You should also at this time rebuild all your modules"
-		einfo
-		einfo "For more information, see"
-		einfo "    http://www.gentoo.org/proj/en/apache/upgrading.xml"
-		einfo
-	fi
-
-	big_fat_warnings
-}
-
-setup_apache_vars() {
-	# actually we do not provide a very dynamic way of those vars
-	# however, you may predefine them in shell before emerging
-	# to override the official default locations
-
-	# standard location for Gentoo Linux
-	DATADIR="${DATADIR:-/var/www/localhost}"
-	USERDIR="${USERDIR:-public_html}"
-
-	einfo "DATADIR is set to: ${DATADIR}"
-	einfo "USERDIR is set to: ${USERDIR}"
-}
-
-mpm_die() {
-	eerror "You attempted to specify the MPM $1, but MPM $2 was already specified."
-	eerror "The apache ebuilds no longer support multiple MPM installations.  Please choose"
-	eerror "one MPM and reinstall."
-	die "More than one MPM was specified."
-}
-
-try_mpm() {
-	local nmpm=$1
-
-	if [ -z "${nmpm}" ]; then
-		die "mpm to try not specified!"
-	fi
-
-	if [ -n "${mpm}" ]; then
-		mpm_die ${nmpm} ${mpm}
-	fi
-
-	mpm="${nmpm}"
-}
-
-select_mpms() {
-	useq mpm-prefork && try_mpm prefork
-	useq mpm-worker && try_mpm worker
-	useq mpm-peruser && try_mpm peruser
-	useq mpm-threadpool && try_mpm threadpool
-	useq mpm-leader && try_mpm leader
-
-	if [ "x${mpm}" = "x" ]; then
-		if useq threads; then
-			einfo "Threads specified without a mpm-specification, using mpm-worker."
-			mpm="worker"
-		else
-			einfo "No MPM style was specified, defaulting to mpm-prefork."
-			mpm="prefork"
-		fi
-	fi
-}
-
-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-$name"
-			name="" ; disable=""
-		elif [ $i == "static" ] || useq static-modules; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=yes"
-			name="" ; disable=""
-		elif [ $i == "shared" ]; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=shared"
-			name="" ; disable=""
-		fi
-	done
-
-	einfo "${1} options:\n${MY_BUILTINS}"
-}
-
-select_modules_config() {
-	parse_modules_config /etc/apache2/apache2-builtin-mods || \
-	parse_modules_config ${GENTOO_PATCHDIR}/conf/apache2-builtin-mods || \
-	return 1
-}
-
-# vim:ts=4
diff --git a/net-www/apache/apache-2.0.54-r9.ebuild b/net-www/apache/apache-2.0.54-r9.ebuild
deleted file mode 100644
index 5cc3b060af89..000000000000
--- a/net-www/apache/apache-2.0.54-r9.ebuild
+++ /dev/null
@@ -1,409 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.54-r9.ebuild,v 1.12 2006/04/19 17:24:59 chtekk Exp $
-
-inherit flag-o-matic eutils fixheadtails gnuconfig
-
-PATCH_LEVEL="${PVR}"
-S="${WORKDIR}/httpd-${PV}"
-DESCRIPTION="Apache Web Server"
-HOMEPAGE="http://www.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
-	http://dev.gentoo.org/~vericgar/dist/apache/old/apache-patches-${PATCH_LEVEL}.tar.bz2
-	http://dev.gentoo.org/~vericgar/dist/apache/old/apache-conf-${PATCH_LEVEL}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
-IUSE="berkdb gdbm ldap threads ipv6 doc static ssl selinux"
-
-#Standard location for Gentoo Linux
-DATADIR="/var/www/localhost"
-
-# Location for the two additional tarballs
-APACHE_PATCHDIR=${WORKDIR}/apache-patches-${PATCH_LEVEL}
-APACHE_CONFDIR=${WORKDIR}/apache-conf-${PATCH_LEVEL}
-
-DEPEND="dev-util/yacc
-	dev-lang/perl
-	sys-libs/zlib
-	dev-libs/expat
-	dev-libs/openssl
-	>=sys-devel/autoconf-2.59-r4
-	berkdb? ( sys-libs/db )
-	gdbm? ( sys-libs/gdbm )
-	!mips? ( ldap? ( =net-nds/openldap-2* ) )
-	selinux? ( sec-policy/selinux-apache )
-	!dev-libs/apr
-	!dev-libs/apr-util"
-
-apache_setup_vars() {
-	# Sets the USERDIR to default.
-	USERDIR="public_html"
-	einfo "DATADIR is set to: ${DATADIR}"
-	einfo "USERDIR is set to: $USERDIR"
-}
-
-set_filter_flags() {
-	CFLAGS="${CFLAGS/  / }"
-	has_version =sys-libs/glibc-2.2* && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-}
-
-src_unpack() {
-	set_filter_flags
-
-	unpack ${A} || die
-	cd ${S} || die
-
-	# apply the patches from the patch tarball
-	EPATCH_SUFFIX="patch"
-	epatch ${APACHE_PATCHDIR} || die
-
-	if use berkdb; then
-		einfo "Enabling berkdb."
-		if has_version '=sys-libs/db-4*'; then
-			einfo "Enabling db4"
-			myconf="${myconf} --with-dbm=db4 --with-berkely-db=/usr"
-		elif has_version '=sys-libs/db-3*'; then
-			einfo "Enabling db3"
-			myconf="${myconf} --with-dbm=db3 --with-berkely-db=/usr"
-		elif has_version '=sys-libs/db-2'; then
-			einfo "Enabling db2"
-			myconf="${myconf} --with-dbm=db2 --with-berkely-db=/usr"
-		fi
-	else
-		echo "Disabling berkdb"
-	fi
-
-	#avoid utf-8 charset problems
-	export LC_CTYPE=C
-
-	ht_fix_file srclib/apr/build/buildcheck.sh
-
-	#give it the stamp
-	sed -i -e 's:(" PLATFORM "):(Gentoo/Linux):g' server/core.c
-
-	#fix perl with perl!
-	find . -type f | xargs perl -pi -e \
-		"s|/usr/local/bin/perl|/usr/bin/perl|g; \
-		s|/usr/local/bin/perl5|/usr/bin/perl|g; \
-		s|/path/to/bin/perl|/usr/bin/perl|g;"
-	#dont want this cruft in /usr/bin
-	sed -i -e 's:@exp_bindir@:@exp_installbuilddir:g' support/apachectl.in
-
-	#setup the filesystem layout config
-	cat ${FILESDIR}/common/config.layout >> config.layout
-	sed -i -e 's:version:${PF}:g' config.layout
-
-	cat ${FILESDIR}/common/apr-config.layout >> srclib/apr/config.layout
-	cat ${FILESDIR}/common/apr-util-config.layout >> srclib/apr-util/config.layout
-
-	sed -i -e "s:/var/www/localhost:${DATADIR}:g" srclib/apr/config.layout
-	sed -i -e "s:/var/www/localhost:${DATADIR}:g" srclib/apr-util/config.layout
-
-	WANT_AUTOCONF=2.5 ./buildconf || die "buildconf failed"
-}
-
-src_compile() {
-	set_filter_flags
-	apache_setup_vars
-
-	# Detect mips and uclibc systems properly
-	gnuconfig_update
-
-	local myconf
-	if use ldap; then
-		if use mips; then
-			eerror "Sorry, LDAP support isn't available yet for MIPS"
-			eerror "Test out OpenLDAP and report it via BugZilla!"
-			eerror "Continuing in 5 seconds"
-			sleep 5s
-		else
-			einfo "Enabling LDAP"
-			if use static; then
-			  myconf="--with-ldap --enable-auth-ldap=static --enable-ldap=static"
-			else
-			  myconf="--with-ldap --enable-auth-ldap=shared --enable-ldap=shared"
-			fi
-		fi
-	fi
-
-	if use ipv6; then
-		einfo "Enabling ipv6"
-		myconf="${myconf} --enable-vp4"
-	else
-		myconf="${myconf} --disable-ipv6"
-	fi
-
-	if use threads; then
-		einfo "Enabling threads support"
-		myconf="${myconf} --with-mpm=worker"
-	else
-		myconf="${myconf} --with-mpm=${MPM:=prefork}"
-	fi
-
-	select_modules_config || die "determining modules"
-
-	# Fix for bug #24215 - robbat2@gentoo.org, 30 Oct 2003
-	# We pre-load the cache with the correct answer!  This avoids
-	# it violating the sandbox.  This may have to be changed for
-	# non-Linux systems or if sem_open changes on Linux.  This
-	# hack is built around documentation in /usr/include/semaphore.h
-	# and the glibc (pthread) source
-	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache
-
-	# Workaround for bug #32444 - robbat2@gentoo.org, 28 Nov 2003
-	# Apache2 tries to build SCTP support even when all the parts of it aren't there
-	# So for the moment we tell it to ignore SCTP support
-	echo 'ac_cv_sctp=${ac_cv_sctp=no}' >> ${S}/config.cache
-	echo 'ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no}' >> ${S}/config.cache
-	echo 'ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no}' >> ${S}/config.cache
-
-	SSL_BASE="SYSTEM" \
-	WANT_AUTOCONF_2_5=1 WANT_AUTOCONF=2.5
-	./configure \
-		--with-suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
-		--with-suexec-logfile=/var/log/apache2/suexec_log \
-		--with-suexec-bin=/usr/sbin/suexec2 \
-		--with-suexec-userdir=${USERDIR} \
-		--with-suexec-caller=apache \
-		--with-suexec-docroot=/var/www \
-		--with-suexec-uidmin=1000 \
-		--with-suexec-gidmin=100 \
-		--with-suexec-umask=077 \
-		--enable-suexec=shared \
-		\
-		${MY_BUILTINS} \
-		\
-		--cache-file=${S}/config.cache \
-		--with-perl=/usr/bin/perl \
-		--with-expat=/usr \
-		--with-ssl=/usr \
-		--with-z=/usr \
-		--with-port=80 \
-		--enable-layout=Gentoo \
-		--with-program-name=apache2 \
-		--with-devrandom=/dev/urandom \
-		--host=${CHOST} ${myconf} || die "bad ./configure please submit bug report to bugs.gentoo.org. Include your config.layout."
-		#--with-mpm={worker|prefork|perchild|leader|threadpool}
-
-	# we don't want to try and recompile the ssl_expr_parse.c file, because
-	# the lex source is broken
-	touch modules/ssl/ssl_expr_scan.c
-
-	emake || die "problem compiling Apache2 :("
-
-	#build ssl version of apache bench (ab-ssl)
-	cd support; rm -f ab .libs/ab ab.lo ab.o
-	make ab CFLAGS="${CFLAGS} -DUSE_SSL -lcrypto -lssl \
-		-I/usr/include/openssl -L/usr/lib" || die
-	mv ab ab-ssl; mv .libs/ab .libs/ab-ssl; rm -f ab.lo ab.o
-	make ab || die
-}
-
-pkg_preinst() {
-	# setup apache user and group
-	enewgroup apache 81
-	enewuser apache 81 -1 /var/www apache
-}
-
-src_install () {
-	set_filter_flags
-
-	local i
-	make DESTDIR=${D} install || die
-	dodoc ABOUT_APACHE CHANGES INSTALL LAYOUT \
-		LICENSE README* ${FILESDIR}/robots.txt
-
-	#bogus values pointing at /var/tmp/portage
-	sed -i -e 's:APR_SOURCE_DIR=.*:APR_SOURCE_DIR=:g' ${D}/usr/bin/apr-config
-	sed -i -e 's:APU_SOURCE_DIR=.*:APU_SOURCE_DIR=:g' ${D}/usr/bin/apu-config
-	sed -i -e 's:APU_BUILD_DIR=.*:APU_BUILD_DIR=:g' ${D}/usr/bin/apu-config
-
-	#protect the suexec binary
-	local gid=`id -g apache`
-	[ -z "${gid}" ] && gid=81
-	fowners root:${gid} /usr/sbin/suexec
-	fperms 4710 /usr/sbin/suexec
-
-	#apxs needs this to pickup the right lib for install
-	dosym /usr/lib /usr/lib/apache2/lib
-	dosym /var/log/apache2 /usr/lib/apache2/logs
-	dosym /usr/lib/apache2-extramodules /usr/lib/apache2/extramodules
-	dosym /etc/apache2/conf /usr/lib/apache2/conf
-
-	cd ${S}
-	#Credits to advx.org people for these scripts. Heck, thanks for
-	#the nice layout and everything else ;-)
-	for i in apache2logserverstatus apache2splitlogfile
-	do
-		dosbin ${APACHE_CONFDIR}/usr/sbin/$i
-	done
-	exeinto /usr/lib/ssl/apache2-mod_ssl
-	doexe ${APACHE_CONFDIR}/usr/lib/ssl/apache2-mod_ssl/gentestcrt.sh
-
-	#some more scripts
-	for i in split-logfile list_hooks.pl logresolve.pl log_server_status
-	do
-		dosbin ${S}/support/$i
-	done
-	#the ssl version of apache bench
-	dosbin support/.libs/ab-ssl
-
-	#move some mods to extramodules
-	dodir /usr/lib/apache2-extramodules
-	for i in mod_ssl.so mod_ldap.so mod_auth_ldap.so
-	do
-		[ -x ${D}/usr/lib/apache2/modules/$i ] && \
-		mv ${D}/usr/lib/apache2/modules/$i ${D}/usr/lib/apache2-extramodules
-	done
-
-	#tidy up
-	mv ${D}/usr/sbin/envvars* ${D}/usr/lib/apache2/build
-	dodoc ${D}/etc/apache2/conf/*-std.conf
-	rm -f ${D}/etc/apache2/conf/*.conf
-	rm -rf ${D}/var/log ${D}/var/run
-
-	# install our default config files
-	cd ${D}
-	( cd ${APACHE_CONFDIR} && tar -cpvf - * ) | tar -xpvf -
-	find etc/apache2 -type f -exec chmod 644 {} \;
-	find etc/apache2 -type f -exec chown root: {} \;
-
-	#drop in a convenient link to the manual
-	if use doc; then
-		dosym /usr/share/doc/${PF}/manual ${DATADIR}/htdocs/manual
-	else
-		rm -rf ${D}/usr/share/doc/${PF}/manual
-	fi
-
-	#SLOT=2!!!
-	cd ${D}
-	mv -v usr/sbin/apachectl usr/sbin/apache2ctl
-	mv -v usr/sbin/htdigest usr/sbin/htdigest2
-	mv -v usr/sbin/htpasswd usr/sbin/htpasswd2
-	mv -v usr/sbin/logresolve usr/sbin/logresolve2
-	mv -v usr/sbin/apxs usr/sbin/apxs2
-	mv -v usr/sbin/ab usr/sbin/ab2
-	mv -v usr/sbin/ab-ssl usr/sbin/ab2-ssl
-	mv -v usr/sbin/suexec usr/sbin/suexec2
-	mv -v usr/sbin/rotatelogs usr/sbin/rotatelogs2
-	mv -v usr/sbin/dbmmanage usr/sbin/dbmmanage2
-	mv -v usr/sbin/checkgid usr/sbin/checkgid2
-	mv -v usr/sbin/split-logfile usr/sbin/split-logfile2
-	mv -v usr/sbin/list_hooks.pl usr/sbin/list_hooks2.pl
-	mv -v usr/sbin/logresolve.pl usr/sbin/logresolve2.pl
-
-	# do the man pages
-	mv -v usr/share/man/man1/htdigest.1 usr/share/man/man1/htdigest2.1
-	mv -v usr/share/man/man1/htpasswd.1 usr/share/man/man1/htpasswd2.1
-	mv -v usr/share/man/man1/dbmmanage.1 usr/share/man/man1/dbmmanage2.1
-	mv -v usr/share/man/man8/ab.8 usr/share/man/man8/ab2.8
-	mv -v usr/share/man/man8/apxs.8 usr/share/man/man8/apxs2.8
-	mv -v usr/share/man/man8/apachectl.8 usr/share/man/man8/apache2ctl.8
-	mv -v usr/share/man/man8/httpd.8 usr/share/man/man8/apache2.8
-	mv -v usr/share/man/man8/logresolve.8 usr/share/man/man8/logresolve2.8
-	mv -v usr/share/man/man8/rotatelogs.8 usr/share/man/man8/rotatelogs2.8
-	mv -v usr/share/man/man8/suexec.8 usr/share/man/man8/suexec2.8
-
-	# Fix for dav and SSL dirs
-	keepdir /var/lib/dav
-	fowners apache:apache /var/lib/dav
-	fperms 755 /var/lib/dav
-
-	keepdir /var/log/apache2
-	fowners apache:apache /var/log/apache2
-	fperms 755 /var/log/apache2
-
-	keepdir /var/cache/apache2
-	fowners apache:apache /var/cache/apache2
-	fperms 755 /var/cache/apache2
-
-	keepdir /etc/apache2/conf/ssl
-
-	# fix bug 92348
-	fperms 755 /usr/sbin/apache2logserverstatus
-	fperms 755 /usr/sbin/apache2splitlogfile
-
-	# Added by Jason Wever <weeve@gentoo.org>
-	# A little sedfu to fix bug #7172 for sparc64s
-	if [ ${ARCH} = "sparc" ]
-	then
-		sed -i -e '13a\AcceptMutex fcntl' \
-			${D}/etc/apache2/conf/apache2.conf
-	fi
-}
-
-parse_modules_config() {
-	set_filter_flags
-
-	local filename=$1
-	local name=""
-	local dso=""
-	local disable=""
-	[ -f ${filename} ] || return 1
-	for i in `cat $filename | 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-$name"
-			name="" ; disable=""
-		elif [ $i == "static" ] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=yes"
-			name="" ; disable=""
-		elif [ $i == "shared" ] ; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=shared"
-			name="" ; disable=""
-		fi
-	done
-	einfo "${filename} options:\n${MY_BUILTINS}"
-}
-
-select_modules_config() {
-	parse_modules_config /etc/apache2/apache2-builtin-mods || \
-	parse_modules_config ${FILESDIR}/2.0.49/apache2-builtin-mods || \
-	return 1
-}
-
-pkg_postinst() {
-	set_filter_flags
-
-	if use ssl; then
-		cd ${ROOT}/etc/apache2/conf/ssl
-		einfo
-		einfo "Generating self-signed test certificate in /etc/apache2/conf/ssl..."
-		yes "" 2>/dev/null | ${ROOT}/usr/lib/ssl/apache2-mod_ssl/gentestcrt.sh >/dev/null 2>&1
-		einfo
-	fi
-
-	if has_version '=net-www/apache-1*' ; then
-	ewarn
-	ewarn "Please add the 'apache2' flag to your USE variable and (re)install"
-	ewarn "any additional DSO modules you may wish to use with Apache-2.x."
-	ewarn "Addon modules are configured in /etc/apache2/conf/modules.d/"
-	ewarn
-	fi
-
-	if [ -d /home/httpd ];
-	then
-	einfo
-	einfo "Please remember to update your config files in /etc/apache2"
-	einfo "as --datadir has been changed to ${DATADIR}, and ServerRoot"
-	einfo "has changed to /usr/lib/apache2!"
-	einfo
-	fi
-
-	einfo "Fixing permissions problem introduced in previous revision"
-	find ${ROOT}/etc/apache2 -type f -user apache -exec chown root: {} \;
-
-	local list=""
-	for i in lib logs modules extramodules; do
-		local d="/etc/apache2/${i}"
-		[ -s "${d}" ] && list="${list} ${d}"
-	done
-	if [ -n "${list}" ]; then
-		einfo "You should delete these old symlinks: ${list}"
-	fi
-}
diff --git a/net-www/apache/apache-2.0.55-r2.ebuild b/net-www/apache/apache-2.0.55-r2.ebuild
deleted file mode 100644
index 196f699899d3..000000000000
--- a/net-www/apache/apache-2.0.55-r2.ebuild
+++ /dev/null
@@ -1,443 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.55-r2.ebuild,v 1.4 2006/04/22 21:36:35 flameeyes Exp $
-
-inherit eutils gnuconfig multilib
-
-# latest gentoo apache files
-GENTOO_PATCHNAME="gentoo-apache-${PVR}"
-GENTOO_PATCHSTAMP="20060331"
-GENTOO_DEVSPACE="vericgar"
-GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
-
-DESCRIPTION="The Apache Web Server"
-HOMEPAGE="http://httpd.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
-	http://dev.gentoo.org/~${GENTOO_DEVSPACE}/dist/apache/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="apache2 debug doc ldap mpm-leader mpm-peruser mpm-prefork mpm-threadpool mpm-worker no-suexec ssl static-modules threads selinux"
-
-RDEPEND="dev-lang/perl
-	|| ( ~dev-libs/apr-0.9.12 ~dev-libs/apr-0.9.7 )
-	|| ( ~dev-libs/apr-util-0.9.12 ~dev-libs/apr-util-0.9.7 )
-	dev-libs/expat
-	net-www/gentoo-webroot-default
-	app-misc/mime-types
-	sys-libs/zlib
-	ssl? ( dev-libs/openssl )
-	selinux? ( sec-policy/selinux-apache )
-	!mips? ( ldap? ( =net-nds/openldap-2* ) )"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.59-r4"
-
-S="${WORKDIR}/httpd-${PV}"
-
-big_fat_warnings() {
-
-	if use ldap && ! built_with_use 'dev-libs/apr-util' ldap; then
-		eerror "dev-libs/apr-util is missing LDAP support. For apache to have"
-		eerror "ldap support, apr-util must be built with the ldap USE-flag"
-		eerror "enabled."
-		die "ldap USE-flag enabled while not supported in apr-util"
-	fi
-
-	if use mpm-peruser; then
-		ewarn " -BIG- -FAT- -WARNING-"
-		ewarn ""
-		ewarn "The peruser (USE=mpm-peruser) MPM is considered highly experimental"
-		ewarn "and are not (yet) supported, nor are they recommended for production"
-		ewarn "use.  You have been warned!"
-		ewarn
-		ewarn "Continuing in 5 seconds.."
-		sleep 5
-	fi
-
-	ewarn ""
-	ewarn "LFS support has been removed due to incompatibilites with other packages."
-	ewarn "You _will_ have to re-emerge any Apache modules you have installed, or"
-	ewarn "they will likely misbehave/segfault."
-	ewarn ""
-	ewarn ""
-	ewarn "Multiple MPM support has been disabled due to problems with external"
-	ewarn "modules.  If you have relied on this functionality you will need"
-	ewarn "to find another solution.  The Gentoo Apache team apologizes for"
-	ewarn "any inconvienence this may cause you."
-	ewarn ""
-}
-
-pkg_setup() {
-	big_fat_warnings
-	select_mpms
-}
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-
-	# Use correct multilib libdir in gentoo patches
-	sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" \
-		${GENTOO_PATCHDIR}/{conf/httpd.conf,init/*,patches/config.layout} \
-		|| die "sed failed"
-
-	EPATCH_SUFFIX="patch"
-	epatch ${GENTOO_PATCHDIR}/patches/[0-9]* || die "internal ebuild error"
-
-	# avoid utf-8 charset problems
-	export LC_CTYPE=C
-
-	# setup the filesystem layout config
-	cat ${GENTOO_PATCHDIR}/patches/config.layout >> config.layout
-	sed -i -e 's:version:${PF}:g' config.layout
-
-	# peruser need to build conf
-	WANT_AUTOCONF=2.5 ./buildconf || die "buildconf failed"
-}
-
-src_compile() {
-	setup_apache_vars
-
-	# Detect mips and uclibc systems properly
-	gnuconfig_update
-
-	local modtype
-	if useq static-modules; then
-		modtype="static"
-	else
-		modtype="shared"
-	fi
-
-	select_modules_config || die "determining modules"
-
-	local myconf
-	useq ldap && myconf="${myconf} --enable-auth-ldap=${modtype} --enable-ldap=${modtype}"
-	useq ssl && myconf="${myconf} --with-ssl=/usr  --enable-ssl=${modtype}"
-
-	# Fix for bug #24215 - robbat2@gentoo.org, 30 Oct 2003
-	# We pre-load the cache with the correct answer!  This avoids
-	# it violating the sandbox.  This may have to be changed for
-	# non-Linux systems or if sem_open changes on Linux.  This
-	# hack is built around documentation in /usr/include/semaphore.h
-	# and the glibc (pthread) source
-	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache
-
-	if useq no-suexec; then
-		myconf="${myconf} --disable-suexec"
-	else
-		myconf="${myconf}
-				--with-suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
-				--with-suexec-logfile=/var/log/apache2/suexec_log \
-				--with-suexec-bin=/usr/sbin/suexec2 \
-				--with-suexec-userdir=${USERDIR} \
-				--with-suexec-caller=apache \
-				--with-suexec-docroot=/var/www \
-				--with-suexec-uidmin=1000 \
-				--with-suexec-gidmin=100 \
-				--with-suexec-umask=077 \
-				--enable-suexec=shared"
-	fi
-
-	# common confopts
-	myconf="${myconf} \
-			--with-apr=/usr \
-			--with-apr-util=/usr \
-			--cache-file=${S}/config.cache \
-			--with-perl=/usr/bin/perl \
-			--with-expat=/usr \
-			--with-z=/usr \
-			--with-port=80 \
-			--enable-layout=Gentoo \
-			--with-program-name=apache2 \
-			--with-devrandom=/dev/urandom \
-			--host=${CHOST} ${MY_BUILTINS}"
-
-	# debugging support
-	if useq debug ; then
-		myconf="${myconf} --enable-maintainer-mode"
-	fi
-
-	./configure --with-mpm=${mpm} ${myconf} || die "bad ./configure please submit bug report to bugs.gentoo.org. Include your config.layout and config.log"
-
-	# we don't want to try and recompile the ssl_expr_parse.c file, because
-	# the lex source is broken
-	touch modules/ssl/ssl_expr_scan.c
-
-	# as decided on IRC-AGENDA-10.2004, we use httpd.conf as standard config file name
-	sed -i -e 's:apache2\.conf:httpd.conf:' include/ap_config_auto.h
-
-	emake || die "problem compiling apache2"
-
-	# build ssl version of apache bench (ab-ssl)
-	if useq ssl; then
-		cd support
-		rm -f ab .libs/ab ab.lo ab.o
-		make ab CFLAGS="${CFLAGS} -DUSE_SSL -lcrypto -lssl -I/usr/include/openssl -L/usr/$(get_libdir)" || die
-		mv ab ab-ssl
-		rm -f ab.lo ab.o
-		make ab || die
-	fi
-}
-
-pkg_preinst() {
-	# setup apache user and group
-	enewgroup apache 81
-	enewuser apache 81 -1 /var/www apache
-}
-
-src_install () {
-	# general install
-	make DESTDIR=${D} install || die
-	dodoc ABOUT_APACHE CHANGES INSTALL LAYOUT LICENSE README* ${GENTOO_PATCHDIR}/docs/robots.txt
-
-	# protect the suexec binary
-	if ! useq no-suexec; then
-		fowners root:apache /usr/sbin/suexec
-		fperms 4710 /usr/sbin/suexec
-	fi
-
-	# apxs needs this to pickup the right lib for install
-	dosym /usr/$(get_libdir) /usr/$(get_libdir)/apache2/lib
-	dosym /var/log/apache2 /usr/$(get_libdir)/apache2/logs
-	dosym /etc/apache2 /usr/$(get_libdir)/apache2/conf
-
-	# Credits to advx.org people for these scripts. Heck, thanks for
-	# the nice layout and everything else ;-)
-	exeinto /usr/sbin
-	for i in apache2logserverstatus apache2splitlogfile; do
-		doexe ${GENTOO_PATCHDIR}/scripts/${i}
-	done
-	# gentestcrt.sh only if USE=ssl
-	useq ssl && doexe ${GENTOO_PATCHDIR}/scripts/gentestcrt.sh
-
-	# some more scripts
-	for i in split-logfile list_hooks.pl logresolve.pl log_server_status; do
-		doexe ${S}/support/${i}
-	done
-
-	# the ssl version of apache bench
-	useq ssl && doexe support/ab-ssl
-
-	# install mpm bins
-	doexe ${S}/apache2
-
-	# modules.d config file snippets
-	insinto /etc/apache2/modules.d
-	doins ${GENTOO_PATCHDIR}/conf/modules.d/45_mod_dav.conf
-	useq ldap && doins ${GENTOO_PATCHDIR}/conf/modules.d/46_mod_ldap.conf
-	if useq ssl; then
-		doins ${GENTOO_PATCHDIR}/conf/modules.d/40_mod_ssl.conf
-		doins ${GENTOO_PATCHDIR}/conf/modules.d/41_mod_ssl.default-vhost.conf
-	fi
-
-	# drop in a convenient link to the manual
-	if useq doc; then
-		insinto /etc/apache2/modules.d
-		doins ${GENTOO_PATCHDIR}/conf/modules.d/00_apache_manual.conf
-		sed -i -e "s:2.0.49:${PVR}:" ${D}/etc/apache2/modules.d/00_apache_manual.conf
-	else
-		rm -rf ${D}/usr/share/doc/${PF}/manual
-	fi
-
-	# SLOT=2
-	cd ${D}
-	for i in htdigest htpasswd logresolve apxs ab rotatelogs dbmmanage checkgid split-logfile; do
-		mv -v usr/sbin/${i} usr/sbin/${i}2
-	done
-	mv -v usr/sbin/apachectl usr/sbin/apache2ctl
-	mv -v usr/sbin/list_hooks.pl usr/sbin/list_hooks2.pl
-	mv -v usr/sbin/logresolve.pl usr/sbin/logresolve2.pl
-	useq ssl && mv -v usr/sbin/ab-ssl usr/sbin/ab2-ssl
-	useq no-suexec || mv -v usr/sbin/suexec usr/sbin/suexec2
-
-	# do the man pages
-	for i in htdigest.1 htpasswd.1 dbmmanage.1; do
-		mv -v usr/share/man/man1/${i} usr/share/man/man1/${i/./2.}
-	done
-	for i in ab.8 apxs.8 logresolve.8 rotatelogs.8; do
-		mv -v usr/share/man/man8/${i} usr/share/man/man8/${i/./2.}
-	done
-	useq no-suexec || mv -v usr/share/man/man8/suexec.8 usr/share/man/man8/suexec2.8
-	mv -v usr/share/man/man8/apachectl.8 usr/share/man/man8/apache2ctl.8
-	mv -v usr/share/man/man8/httpd.8 usr/share/man/man8/apache2.8
-
-	# tidy up
-	mv usr/sbin/envvars* usr/$(get_libdir)/apache2/build
-	dodoc etc/apache2/*-std.conf
-	rm -f etc/apache2/*.conf
-	rm -f etc/apache2/mime.types
-	rm -rf var/run var/log
-
-	# we DEPEND on net-www/gentoo-webroot-default for sharing this by now
-	rm -rf var/www/localhost
-
-	# config files
-	newconfd ${GENTOO_PATCHDIR}/init/apache2.confd apache2
-	newinitd ${GENTOO_PATCHDIR}/init/apache2.initd apache2
-
-	insinto /etc/logrotate.d
-	newins ${GENTOO_PATCHDIR}/scripts/apache2-logrotate apache2
-
-	insinto /etc/apache2
-	doins ${GENTOO_PATCHDIR}/conf/apache2-builtin-mods
-	doins ${GENTOO_PATCHDIR}/conf/httpd.conf
-
-	insinto /etc/apache2/vhosts.d
-	doins ${GENTOO_PATCHDIR}/conf/vhosts.d/00_default_vhost.conf
-
-	keepdir /etc/apache2/vhosts.d
-	keepdir /etc/apache2/modules.d
-
-	# fix bug 92348
-	fperms 755 /usr/sbin/apache2logserverstatus
-	fperms 755 /usr/sbin/apache2splitlogfile
-
-	# empty dirs
-	for i in /var/lib/dav /var/log/apache2 /var/cache/apache2; do
-		keepdir ${i}
-		fowners apache:apache ${i}
-		fperms 755 ${i}
-	done
-
-	# We'll be needing /etc/apache2/ssl if USE=ssl
-	useq ssl && keepdir /etc/apache2/ssl
-
-}
-
-pkg_postinst() {
-	# setup apache user and group
-	# we do this twice for binary packages
-	enewgroup apache 81
-	enewuser apache 81 -1 /var/www apache
-
-	# Automatically generate test ceritificates if ssl USE flag is being set
-	if useq ssl -a !-e ${ROOT}/etc/apache2/ssl/server.crt; then
-		cd ${ROOT}/etc/apache2/ssl
-		einfo
-		einfo "Generating self-signed test certificate in /etc/apache2/ssl..."
-		yes "" 2>/dev/null | \
-			${ROOT}/usr/sbin/gentestcrt.sh >/dev/null 2>&1 || \
-			die "gentestcrt.sh failed"
-		einfo
-	fi
-
-	# Check for dual/upgrade install
-	if has_version '=net-www/apache-1*' || ! use apache2 ; then
-		ewarn
-		ewarn "Please add the 'apache2' flag to your USE variable and (re)install"
-		ewarn "any additional DSO modules you may wish to use with Apache-2.x."
-		ewarn "Addon modules are configured in /etc/apache2/modules.d/"
-		ewarn
-	fi
-
-	# Check for obsolete symlinks
-	local list=""
-	for i in lib logs modules extramodules; do
-		local d="/etc/apache2/${i}"
-		[ -s "${d}" ] && list="${list} ${d}"
-	done
-	[ -n "${list}" ] && einfo "You should delete these old symlinks: ${list}"
-
-	if has_version '<net-www/apache-2.0.54-r30' && has_version '>=net-www/apache-2.0.0' ; then
-		einfo "Configuration locations have changed, you will need to migrate"
-		einfo "your configuration from /etc/apache2/conf/apache2.conf and"
-		einfo "/etc/apache2/conf/commonapache2.conf to /etc/apache2/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 "You should also at this time rebuild all your modules"
-		einfo
-		einfo "For more information, see"
-		einfo "    http://www.gentoo.org/doc/en/apache-upgrading.xml"
-		einfo
-	fi
-
-	big_fat_warnings
-}
-
-setup_apache_vars() {
-	# actually we do not provide a very dynamic way of those vars
-	# however, you may predefine them in shell before emerging
-	# to override the official default locations
-
-	# standard location for Gentoo Linux
-	DATADIR="${DATADIR:-/var/www/localhost}"
-	USERDIR="${USERDIR:-public_html}"
-
-	einfo "DATADIR is set to: ${DATADIR}"
-	einfo "USERDIR is set to: ${USERDIR}"
-}
-
-mpm_die() {
-	eerror "You attempted to specify the MPM $1, but MPM $2 was already specified."
-	eerror "The apache ebuilds no longer support multiple MPM installations.  Please choose"
-	eerror "one MPM and reinstall."
-	die "More than one MPM was specified."
-}
-
-try_mpm() {
-	local nmpm=$1
-
-	if [ -z "${nmpm}" ]; then
-		die "mpm to try not specified!"
-	fi
-
-	if [ "x${mpm}" != "x" -a "x${mpm}" != "x${nmpm}" ]; then
-		mpm_die ${nmpm} ${mpm}
-	fi
-
-	mpm="${nmpm}"
-}
-
-select_mpms() {
-	useq mpm-prefork && try_mpm prefork
-	useq mpm-worker && try_mpm worker
-	useq mpm-peruser && try_mpm peruser
-	useq mpm-threadpool && try_mpm threadpool
-	useq mpm-leader && try_mpm leader
-
-	if [ "x${mpm}" = "x" ]; then
-		if useq threads; then
-			einfo "Threads specified without a mpm-specification, using mpm-worker."
-			mpm="worker"
-		else
-			einfo "No MPM style was specified, defaulting to mpm-prefork."
-			mpm="prefork"
-		fi
-	fi
-}
-
-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-$name"
-			name="" ; disable=""
-		elif [ $i == "static" ] || useq static-modules; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=yes"
-			name="" ; disable=""
-		elif [ $i == "shared" ]; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=shared"
-			name="" ; disable=""
-		fi
-	done
-
-	einfo "${1} options:\n${MY_BUILTINS}"
-}
-
-select_modules_config() {
-	parse_modules_config /etc/apache2/apache2-builtin-mods || \
-	parse_modules_config ${GENTOO_PATCHDIR}/conf/apache2-builtin-mods || \
-	return 1
-}
-
-# vim:ts=4
diff --git a/net-www/apache/apache-2.0.55.ebuild b/net-www/apache/apache-2.0.55.ebuild
deleted file mode 100644
index abc0257df987..000000000000
--- a/net-www/apache/apache-2.0.55.ebuild
+++ /dev/null
@@ -1,443 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.55.ebuild,v 1.12 2006/04/19 17:24:59 chtekk Exp $
-
-inherit eutils gnuconfig multilib
-
-# latest gentoo apache files
-GENTOO_PATCHNAME="gentoo-apache-${PVR}"
-GENTOO_PATCHSTAMP="20051023"
-GENTOO_DEVSPACE="vericgar"
-GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
-
-DESCRIPTION="The Apache Web Server"
-HOMEPAGE="http://httpd.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
-	http://dev.gentoo.org/~${GENTOO_DEVSPACE}/dist/apache/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="apache2 debug doc ldap mpm-leader mpm-peruser mpm-prefork mpm-threadpool mpm-worker no-suexec ssl static-modules threads selinux"
-
-RDEPEND="dev-lang/perl
-	|| ( ~dev-libs/apr-0.9.12 ~dev-libs/apr-0.9.7 )
-	|| ( ~dev-libs/apr-util-0.9.12 ~dev-libs/apr-util-0.9.7 )
-	dev-libs/expat
-	net-www/gentoo-webroot-default
-	app-misc/mime-types
-	sys-libs/zlib
-	ssl? ( dev-libs/openssl )
-	selinux? ( sec-policy/selinux-apache )
-	!mips? ( ldap? ( =net-nds/openldap-2* ) )"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.59-r4"
-
-S="${WORKDIR}/httpd-${PV}"
-
-big_fat_warnings() {
-
-	if use ldap && ! built_with_use 'dev-libs/apr-util' ldap; then
-		eerror "dev-libs/apr-util is missing LDAP support. For apache to have"
-		eerror "ldap support, apr-util must be built with the ldap USE-flag"
-		eerror "enabled."
-		die "ldap USE-flag enabled while not supported in apr-util"
-	fi
-
-	if use mpm-peruser; then
-		ewarn " -BIG- -FAT- -WARNING-"
-		ewarn ""
-		ewarn "The peruser (USE=mpm-peruser) MPM is considered highly experimental"
-		ewarn "and are not (yet) supported, nor are they recommended for production"
-		ewarn "use.  You have been warned!"
-		ewarn
-		ewarn "Continuing in 5 seconds.."
-		sleep 5
-	fi
-
-	ewarn ""
-	ewarn "LFS support has been removed due to incompatibilites with other packages."
-	ewarn "You _will_ have to re-emerge any Apache modules you have installed, or"
-	ewarn "they will likely misbehave/segfault."
-	ewarn ""
-	ewarn ""
-	ewarn "Multiple MPM support has been disabled due to problems with external"
-	ewarn "modules.  If you have relied on this functionality you will need"
-	ewarn "to find another solution.  The Gentoo Apache team apologizes for"
-	ewarn "any inconvienence this may cause you."
-	ewarn ""
-}
-
-pkg_setup() {
-	big_fat_warnings
-	select_mpms
-}
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-
-	# Use correct multilib libdir in gentoo patches
-	sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" \
-		${GENTOO_PATCHDIR}/{conf/httpd.conf,init/*,patches/config.layout} \
-		|| die "sed failed"
-
-	EPATCH_SUFFIX="patch"
-	epatch ${GENTOO_PATCHDIR}/patches/[0-2]* || die "internal ebuild error"
-
-	# avoid utf-8 charset problems
-	export LC_CTYPE=C
-
-	# setup the filesystem layout config
-	cat ${GENTOO_PATCHDIR}/patches/config.layout >> config.layout
-	sed -i -e 's:version:${PF}:g' config.layout
-
-	# peruser need to build conf
-	WANT_AUTOCONF=2.5 ./buildconf || die "buildconf failed"
-}
-
-src_compile() {
-	setup_apache_vars
-
-	# Detect mips and uclibc systems properly
-	gnuconfig_update
-
-	local modtype
-	if useq static-modules; then
-		modtype="static"
-	else
-		modtype="shared"
-	fi
-
-	select_modules_config || die "determining modules"
-
-	local myconf
-	useq ldap && myconf="${myconf} --enable-auth-ldap=${modtype} --enable-ldap=${modtype}"
-	useq ssl && myconf="${myconf} --with-ssl=/usr  --enable-ssl=${modtype}"
-
-	# Fix for bug #24215 - robbat2@gentoo.org, 30 Oct 2003
-	# We pre-load the cache with the correct answer!  This avoids
-	# it violating the sandbox.  This may have to be changed for
-	# non-Linux systems or if sem_open changes on Linux.  This
-	# hack is built around documentation in /usr/include/semaphore.h
-	# and the glibc (pthread) source
-	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache
-
-	if useq no-suexec; then
-		myconf="${myconf} --disable-suexec"
-	else
-		myconf="${myconf}
-				--with-suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
-				--with-suexec-logfile=/var/log/apache2/suexec_log \
-				--with-suexec-bin=/usr/sbin/suexec2 \
-				--with-suexec-userdir=${USERDIR} \
-				--with-suexec-caller=apache \
-				--with-suexec-docroot=/var/www \
-				--with-suexec-uidmin=1000 \
-				--with-suexec-gidmin=100 \
-				--with-suexec-umask=077 \
-				--enable-suexec=shared"
-	fi
-
-	# common confopts
-	myconf="${myconf} \
-			--with-apr=/usr \
-			--with-apr-util=/usr \
-			--cache-file=${S}/config.cache \
-			--with-perl=/usr/bin/perl \
-			--with-expat=/usr \
-			--with-z=/usr \
-			--with-port=80 \
-			--enable-layout=Gentoo \
-			--with-program-name=apache2 \
-			--with-devrandom=/dev/urandom \
-			--host=${CHOST} ${MY_BUILTINS}"
-
-	# debugging support
-	if useq debug ; then
-		myconf="${myconf} --enable-maintainer-mode"
-	fi
-
-	./configure --with-mpm=${mpm} ${myconf} || die "bad ./configure please submit bug report to bugs.gentoo.org. Include your config.layout and config.log"
-
-	# we don't want to try and recompile the ssl_expr_parse.c file, because
-	# the lex source is broken
-	touch modules/ssl/ssl_expr_scan.c
-
-	# as decided on IRC-AGENDA-10.2004, we use httpd.conf as standard config file name
-	sed -i -e 's:apache2\.conf:httpd.conf:' include/ap_config_auto.h
-
-	emake || die "problem compiling apache2"
-
-	# build ssl version of apache bench (ab-ssl)
-	if useq ssl; then
-		cd support
-		rm -f ab .libs/ab ab.lo ab.o
-		make ab CFLAGS="${CFLAGS} -DUSE_SSL -lcrypto -lssl -I/usr/include/openssl -L/usr/$(get_libdir)" || die
-		mv ab ab-ssl
-		rm -f ab.lo ab.o
-		make ab || die
-	fi
-}
-
-pkg_preinst() {
-	# setup apache user and group
-	enewgroup apache 81
-	enewuser apache 81 -1 /var/www apache
-}
-
-src_install () {
-	# general install
-	make DESTDIR=${D} install || die
-	dodoc ABOUT_APACHE CHANGES INSTALL LAYOUT LICENSE README* ${GENTOO_PATCHDIR}/docs/robots.txt
-
-	# protect the suexec binary
-	if ! useq no-suexec; then
-		fowners root:apache /usr/sbin/suexec
-		fperms 4710 /usr/sbin/suexec
-	fi
-
-	# apxs needs this to pickup the right lib for install
-	dosym /usr/$(get_libdir) /usr/$(get_libdir)/apache2/lib
-	dosym /var/log/apache2 /usr/$(get_libdir)/apache2/logs
-	dosym /etc/apache2 /usr/$(get_libdir)/apache2/conf
-
-	# Credits to advx.org people for these scripts. Heck, thanks for
-	# the nice layout and everything else ;-)
-	exeinto /usr/sbin
-	for i in apache2logserverstatus apache2splitlogfile; do
-		doexe ${GENTOO_PATCHDIR}/scripts/${i}
-	done
-	# gentestcrt.sh only if USE=ssl
-	useq ssl && doexe ${GENTOO_PATCHDIR}/scripts/gentestcrt.sh
-
-	# some more scripts
-	for i in split-logfile list_hooks.pl logresolve.pl log_server_status; do
-		doexe ${S}/support/${i}
-	done
-
-	# the ssl version of apache bench
-	useq ssl && doexe support/ab-ssl
-
-	# install mpm bins
-	doexe ${S}/apache2
-
-	# modules.d config file snippets
-	insinto /etc/apache2/modules.d
-	doins ${GENTOO_PATCHDIR}/conf/modules.d/45_mod_dav.conf
-	useq ldap && doins ${GENTOO_PATCHDIR}/conf/modules.d/46_mod_ldap.conf
-	if useq ssl; then
-		doins ${GENTOO_PATCHDIR}/conf/modules.d/40_mod_ssl.conf
-		doins ${GENTOO_PATCHDIR}/conf/modules.d/41_mod_ssl.default-vhost.conf
-	fi
-
-	# drop in a convenient link to the manual
-	if useq doc; then
-		insinto /etc/apache2/modules.d
-		doins ${GENTOO_PATCHDIR}/conf/modules.d/00_apache_manual.conf
-		sed -i -e "s:2.0.49:${PVR}:" ${D}/etc/apache2/modules.d/00_apache_manual.conf
-	else
-		rm -rf ${D}/usr/share/doc/${PF}/manual
-	fi
-
-	# SLOT=2
-	cd ${D}
-	for i in htdigest htpasswd logresolve apxs ab rotatelogs dbmmanage checkgid split-logfile; do
-		mv -v usr/sbin/${i} usr/sbin/${i}2
-	done
-	mv -v usr/sbin/apachectl usr/sbin/apache2ctl
-	mv -v usr/sbin/list_hooks.pl usr/sbin/list_hooks2.pl
-	mv -v usr/sbin/logresolve.pl usr/sbin/logresolve2.pl
-	useq ssl && mv -v usr/sbin/ab-ssl usr/sbin/ab2-ssl
-	useq no-suexec || mv -v usr/sbin/suexec usr/sbin/suexec2
-
-	# do the man pages
-	for i in htdigest.1 htpasswd.1 dbmmanage.1; do
-		mv -v usr/share/man/man1/${i} usr/share/man/man1/${i/./2.}
-	done
-	for i in ab.8 apxs.8 logresolve.8 rotatelogs.8; do
-		mv -v usr/share/man/man8/${i} usr/share/man/man8/${i/./2.}
-	done
-	useq no-suexec || mv -v usr/share/man/man8/suexec.8 usr/share/man/man8/suexec2.8
-	mv -v usr/share/man/man8/apachectl.8 usr/share/man/man8/apache2ctl.8
-	mv -v usr/share/man/man8/httpd.8 usr/share/man/man8/apache2.8
-
-	# tidy up
-	mv usr/sbin/envvars* usr/$(get_libdir)/apache2/build
-	dodoc etc/apache2/*-std.conf
-	rm -f etc/apache2/*.conf
-	rm -f etc/apache2/mime.types
-	rm -rf var/run var/log
-
-	# we DEPEND on net-www/gentoo-webroot-default for sharing this by now
-	rm -rf var/www/localhost
-
-	# config files
-	newconfd ${GENTOO_PATCHDIR}/init/apache2.confd apache2
-	newinitd ${GENTOO_PATCHDIR}/init/apache2.initd apache2
-
-	insinto /etc/logrotate.d
-	newins ${GENTOO_PATCHDIR}/scripts/apache2-logrotate apache2
-
-	insinto /etc/apache2
-	doins ${GENTOO_PATCHDIR}/conf/apache2-builtin-mods
-	doins ${GENTOO_PATCHDIR}/conf/httpd.conf
-
-	insinto /etc/apache2/vhosts.d
-	doins ${GENTOO_PATCHDIR}/conf/vhosts.d/00_default_vhost.conf
-
-	keepdir /etc/apache2/vhosts.d
-	keepdir /etc/apache2/modules.d
-
-	# fix bug 92348
-	fperms 755 /usr/sbin/apache2logserverstatus
-	fperms 755 /usr/sbin/apache2splitlogfile
-
-	# empty dirs
-	for i in /var/lib/dav /var/log/apache2 /var/cache/apache2; do
-		keepdir ${i}
-		fowners apache:apache ${i}
-		fperms 755 ${i}
-	done
-
-	# We'll be needing /etc/apache2/ssl if USE=ssl
-	useq ssl && keepdir /etc/apache2/ssl
-
-}
-
-pkg_postinst() {
-	# setup apache user and group
-	# we do this twice for binary packages
-	enewgroup apache 81
-	enewuser apache 81 -1 /var/www apache
-
-	# Automatically generate test ceritificates if ssl USE flag is being set
-	if useq ssl -a !-e ${ROOT}/etc/apache2/ssl/server.crt; then
-		cd ${ROOT}/etc/apache2/ssl
-		einfo
-		einfo "Generating self-signed test certificate in /etc/apache2/ssl..."
-		yes "" 2>/dev/null | \
-			${ROOT}/usr/sbin/gentestcrt.sh >/dev/null 2>&1 || \
-			die "gentestcrt.sh failed"
-		einfo
-	fi
-
-	# Check for dual/upgrade install
-	if has_version '=net-www/apache-1*' || ! use apache2 ; then
-		ewarn
-		ewarn "Please add the 'apache2' flag to your USE variable and (re)install"
-		ewarn "any additional DSO modules you may wish to use with Apache-2.x."
-		ewarn "Addon modules are configured in /etc/apache2/modules.d/"
-		ewarn
-	fi
-
-	# Check for obsolete symlinks
-	local list=""
-	for i in lib logs modules extramodules; do
-		local d="/etc/apache2/${i}"
-		[ -s "${d}" ] && list="${list} ${d}"
-	done
-	[ -n "${list}" ] && einfo "You should delete these old symlinks: ${list}"
-
-	if has_version '<net-www/apache-2.0.54-r30' && has_version '>=net-www/apache-2.0.0' ; then
-		einfo "Configuration locations have changed, you will need to migrate"
-		einfo "your configuration from /etc/apache2/conf/apache2.conf and"
-		einfo "/etc/apache2/conf/commonapache2.conf to /etc/apache2/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 "You should also at this time rebuild all your modules"
-		einfo
-		einfo "For more information, see"
-		einfo "    http://www.gentoo.org/doc/en/apache-upgrading.xml"
-		einfo
-	fi
-
-	big_fat_warnings
-}
-
-setup_apache_vars() {
-	# actually we do not provide a very dynamic way of those vars
-	# however, you may predefine them in shell before emerging
-	# to override the official default locations
-
-	# standard location for Gentoo Linux
-	DATADIR="${DATADIR:-/var/www/localhost}"
-	USERDIR="${USERDIR:-public_html}"
-
-	einfo "DATADIR is set to: ${DATADIR}"
-	einfo "USERDIR is set to: ${USERDIR}"
-}
-
-mpm_die() {
-	eerror "You attempted to specify the MPM $1, but MPM $2 was already specified."
-	eerror "The apache ebuilds no longer support multiple MPM installations.  Please choose"
-	eerror "one MPM and reinstall."
-	die "More than one MPM was specified."
-}
-
-try_mpm() {
-	local nmpm=$1
-
-	if [ -z "${nmpm}" ]; then
-		die "mpm to try not specified!"
-	fi
-
-	if [ "x${mpm}" != "x" -a "x${mpm}" != "x${nmpm}" ]; then
-		mpm_die ${nmpm} ${mpm}
-	fi
-
-	mpm="${nmpm}"
-}
-
-select_mpms() {
-	useq mpm-prefork && try_mpm prefork
-	useq mpm-worker && try_mpm worker
-	useq mpm-peruser && try_mpm peruser
-	useq mpm-threadpool && try_mpm threadpool
-	useq mpm-leader && try_mpm leader
-
-	if [ "x${mpm}" = "x" ]; then
-		if useq threads; then
-			einfo "Threads specified without a mpm-specification, using mpm-worker."
-			mpm="worker"
-		else
-			einfo "No MPM style was specified, defaulting to mpm-prefork."
-			mpm="prefork"
-		fi
-	fi
-}
-
-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-$name"
-			name="" ; disable=""
-		elif [ $i == "static" ] || useq static-modules; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=yes"
-			name="" ; disable=""
-		elif [ $i == "shared" ]; then
-			MY_BUILTINS="${MY_BUILTINS} --enable-$name=shared"
-			name="" ; disable=""
-		fi
-	done
-
-	einfo "${1} options:\n${MY_BUILTINS}"
-}
-
-select_modules_config() {
-	parse_modules_config /etc/apache2/apache2-builtin-mods || \
-	parse_modules_config ${GENTOO_PATCHDIR}/conf/apache2-builtin-mods || \
-	return 1
-}
-
-# vim:ts=4
diff --git a/net-www/apache/files/00_apache_manual.conf b/net-www/apache/files/00_apache_manual.conf
deleted file mode 100644
index c4d22d693b12..000000000000
--- a/net-www/apache/files/00_apache_manual.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-Alias /manual "/usr/share/doc/apache-2.0.49/manual"
-
-<IfModule mod_alias.c>
-	AliasMatch ^/manual(?:/(?:de|en|fr|ja|ko|ru))?(/.*)?$ "/usr/share/doc/apache-2.0.49/manual/$1"
-</IfModule>
-
-
-
-<Directory "/usr/share/doc/apache-2.0.49/manual">
-	Options Indexes Multiviews
-	AllowOverride None
-	Order allow,deny
-	Allow from all
-
-	<Files *.html>
-		SetHandler type-map
-	</Files>
-	SetEnvIf Request_URI ^/manual/de/ prefer-language=de
-	SetEnvIf Request_URI ^/manual/en/ prefer-language=en
-	SetEnvIf Request_URI ^/manual/fr/ prefer-language=fr
-	SetEnvIf Request_URI ^/manual/ja/ prefer-language=ja
-	SetEnvIf Request_URI ^/manual/ko/ prefer-language=ko
-	SetEnvIf Request_URI ^/manual/ru/ prefer-language=ru
-	RedirectMatch 301 ^/manual(?:/(de|en|fr|ja|ko|ru)){2,}(/.*)?$ /manual/$1$2
-</Directory>
diff --git a/net-www/apache/files/2.0.49/40_mod_ssl.conf b/net-www/apache/files/2.0.49/40_mod_ssl.conf
deleted file mode 100644
index c2f3e3d2b1f8..000000000000
--- a/net-www/apache/files/2.0.49/40_mod_ssl.conf
+++ /dev/null
@@ -1,96 +0,0 @@
-<IfDefine SSL>
-  <IfModule !mod_ssl.c>
-    LoadModule ssl_module    extramodules/mod_ssl.so
-  </IfModule>
-</IfDefine>
-
-<IfModule mod_ssl.c>
-
-#
-# This is the Apache server configuration file providing SSL support.
-# It contains the configuration directives to instruct the server how to
-# serve pages over an https connection. For detailing information about these 
-# directives see <URL:http://httpd.apache.org/docs-2.0/mod/mod_ssl.html>
-#
-#   For the moment, see <URL:http://www.modssl.org/docs/> for this info. 
-#   The documents are still being prepared from material donated by the
-#   modssl project.
-# 
-# Do NOT simply read the instructions in here without understanding
-# what they do.  They're here only as hints or reminders.  If you are unsure
-# consult the online docs. You have been warned.  
-#
-
-#   Until documentation is completed, please check http://www.modssl.org/
-#   for additional config examples and module docmentation.  Directives
-#   and features of mod_ssl are largely unchanged from the mod_ssl project
-#   for Apache 1.3.
-
-#
-# When we also provide SSL we have to listen to the 
-# standard HTTP port (see above) and to the HTTPS port
-#
-
-Listen 443
-
-##
-##  SSL Global Context
-##
-##  All SSL configuration in this context applies both to
-##  the main server and all SSL-enabled virtual hosts.
-##
-
-#
-#   Some MIME-types for downloading Certificates and CRLs
-#
-
-<IfModule mod_mime.c>
-AddType application/x-x509-ca-cert .crt
-AddType application/x-pkcs7-crl    .crl
-</IfModule>
-
-#   Pass Phrase Dialog:
-#   Configure the pass phrase gathering process.
-#   The filtering dialog program (`builtin' is a internal
-#   terminal dialog) has to provide the pass phrase on stdout.
-
-SSLPassPhraseDialog  builtin
-
-#   Inter-Process Session Cache:
-#   Configure the SSL Session Cache: First the mechanism 
-#   to use and second the expiring timeout (in seconds).
-#SSLSessionCache        none
-#SSLSessionCache        shmht:logs/ssl_scache(512000)
-#SSLSessionCache        shmcb:logs/ssl_scache(512000)
-#SSLSessionCache        dbm:logs/ssl_scache
-SSLSessionCache         shm:/var/cache/apache2/ssl_scache(128000)
-
-SSLSessionCacheTimeout  300
-
-#   Semaphore:
-#   Configure the path to the mutual exclusion semaphore the
-#   SSL engine uses internally for inter-process synchronization. 
-
-SSLMutex  file:/var/cache/apache2/ssl_mutex
-
-#   Pseudo Random Number Generator (PRNG):
-#   Configure one or more sources to seed the PRNG of the 
-#   SSL library. The seed data should be of good random quality.
-#   WARNING! On some platforms /dev/random blocks if not enough entropy
-#   is available. This means you then cannot use the /dev/random device
-#   because it would lead to very long connection times (as long as
-#   it requires to make more entropy available). But usually those
-#   platforms additionally provide a /dev/urandom device which doesn't
-#   block. So, if available, use this one instead. Read the mod_ssl User
-#   Manual for more details.
-
-SSLRandomSeed startup builtin
-SSLRandomSeed connect builtin
-
-#SSLRandomSeed startup file:/dev/random  512
-#SSLRandomSeed startup file:/dev/urandom 512
-#SSLRandomSeed connect file:/dev/random  512
-#SSLRandomSeed connect file:/dev/urandom 512
-
-
-</IfModule>
diff --git a/net-www/apache/files/2.0.49/41_mod_ssl.default-vhost.conf b/net-www/apache/files/2.0.49/41_mod_ssl.default-vhost.conf
deleted file mode 100644
index 9a7563ee6008..000000000000
--- a/net-www/apache/files/2.0.49/41_mod_ssl.default-vhost.conf
+++ /dev/null
@@ -1,199 +0,0 @@
-<IfDefine SSL>
-  <IfModule !mod_ssl.c>
-    LoadModule ssl_module    extramodules/mod_ssl.so
-  </IfModule>
-</IfDefine>
-
-<IfModule mod_ssl.c>
-
-##
-## SSL Virtual Host Context
-##
-
-<VirtualHost _default_:443>
-
-#  General setup for the virtual host
-
-DocumentRoot "/var/www/localhost/htdocs"
-#ServerName localhost:443
-#ServerAdmin root@localhost
-ErrorLog logs/ssl_error_log
-<IfModule mod_log_config.c>
-TransferLog logs/ssl_access_log
-</IfModule>
-#   SSL Engine Switch:
-#   Enable/Disable SSL for this virtual host.
-
-SSLEngine on
-
-#   SSL Cipher Suite:
-#   List the ciphers that the client is permitted to negotiate.
-#   See the mod_ssl documentation for a complete list.
-
-SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
-
-#   Server Certificate:
-#   Point SSLCertificateFile at a PEM encoded certificate.  If
-#   the certificate is encrypted, then you will be prompted for a
-#   pass phrase.  Note that a kill -HUP will prompt again. A test
-#   certificate can be generated with `make certificate' under
-#   built time. Keep in mind that if you've both a RSA and a DSA
-#   certificate you can configure both in parallel (to also allow
-#   the use of DSA ciphers, etc.)
-
-SSLCertificateFile conf/ssl/server.crt
-
-#   Server Private Key:
-#   If the key is not combined with the certificate, use this
-#   directive to point at the key file.  Keep in mind that if
-#   you've both a RSA and a DSA private key you can configure
-#   both in parallel (to also allow the use of DSA ciphers, etc.)
-
-SSLCertificateKeyFile conf/ssl/server.key
-
-#   Server Certificate Chain:
-#   Point SSLCertificateChainFile at a file containing the
-#   concatenation of PEM encoded CA certificates which form the
-#   certificate chain for the server certificate. Alternatively
-#   the referenced file can be the same as SSLCertificateFile
-#   when the CA certificates are directly appended to the server
-#   certificate for convinience.
-#SSLCertificateChainFile conf/ssl/ca.crt
-
-#   Certificate Authority (CA):
-#   Set the CA certificate verification path where to find CA
-#   certificates for client authentication or alternatively one
-#   huge file containing all of them (file must be PEM encoded)
-#   Note: Inside SSLCACertificatePath you need hash symlinks
-#         to point to the certificate files. Use the provided
-#         Makefile to update the hash symlinks after changes.
-#SSLCACertificatePath conf/ssl/ssl.crt
-#SSLCACertificateFile conf/ssl/ca-bundle.crt
-
-#   Certificate Revocation Lists (CRL):
-#   Set the CA revocation path where to find CA CRLs for client
-#   authentication or alternatively one huge file containing all
-#   of them (file must be PEM encoded)
-#   Note: Inside SSLCARevocationPath you need hash symlinks
-#         to point to the certificate files. Use the provided
-#         Makefile to update the hash symlinks after changes.
-#SSLCARevocationPath conf/ssl/ssl.crl
-#SSLCARevocationFile conf/ssl/ca-bundle.crl
-
-#   Client Authentication (Type):
-#   Client certificate verification type and depth.  Types are
-#   none, optional, require and optional_no_ca.  Depth is a
-#   number which specifies how deeply to verify the certificate
-#   issuer chain before deciding the certificate is not valid.
-#SSLVerifyClient require
-#SSLVerifyDepth  10
-
-#   Access Control:
-#   With SSLRequire you can do per-directory access control based
-#   on arbitrary complex boolean expressions containing server
-#   variable checks and other lookup directives.  The syntax is a
-#   mixture between C and Perl.  See the mod_ssl documentation
-#   for more details.
-#<Location />
-#SSLRequire (    %{SSL_CIPHER} !~ m/^(EXP|NULL)/ \
-#            and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd." \
-#            and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"} \
-#            and %{TIME_WDAY} >= 1 and %{TIME_WDAY} <= 5 \
-#            and %{TIME_HOUR} >= 8 and %{TIME_HOUR} <= 20       ) \
-#           or %{REMOTE_ADDR} =~ m/^192\.76\.162\.[0-9]+$/
-#</Location>
-
-#   SSL Engine Options:
-#   Set various options for the SSL engine.
-#   o FakeBasicAuth:
-#     Translate the client X.509 into a Basic Authorisation.  This means that
-#     the standard Auth/DBMAuth methods can be used for access control.  The
-#     user name is the `one line' version of the client's X.509 certificate.
-#     Note that no password is obtained from the user. Every entry in the user
-#     file needs this password: `xxj31ZMTZzkVA'.
-#   o ExportCertData:
-#     This exports two additional environment variables: SSL_CLIENT_CERT and
-#     SSL_SERVER_CERT. These contain the PEM-encoded certificates of the
-#     server (always existing) and the client (only existing when client
-#     authentication is used). This can be used to import the certificates
-#     into CGI scripts.
-#   o StdEnvVars:
-#     This exports the standard SSL/TLS related `SSL_*' environment variables.
-#     Per default this exportation is switched off for performance reasons,
-#     because the extraction step is an expensive operation and is usually
-#     useless for serving static content. So one usually enables the
-#     exportation for CGI and SSI requests only.
-#   o CompatEnvVars:
-#     This exports obsolete environment variables for backward compatibility
-#     to Apache-SSL 1.x, mod_ssl 2.0.x, Sioux 1.0 and Stronghold 2.x. Use this
-#     to provide compatibility to existing CGI scripts.
-#   o StrictRequire:
-#     This denies access when "SSLRequireSSL" or "SSLRequire" applied even
-#     under a "Satisfy any" situation, i.e. when it applies access is denied
-#     and no other module can change it.
-#   o OptRenegotiate:
-#     This enables optimized SSL connection renegotiation handling when SSL
-#     directives are used in per-directory context. 
-#SSLOptions +FakeBasicAuth +ExportCertData +CompatEnvVars +StrictRequire
-
-<Files ~ "\.(cgi|shtml|phtml|php?)$">
-
-    SSLOptions +StdEnvVars
-
-</Files>
-
-<Directory "/var/www/localhost/cgi-bin">
-
-    SSLOptions +StdEnvVars
-
-</Directory>
-
-#   SSL Protocol Adjustments:
-#   The safe and default but still SSL/TLS standard compliant shutdown
-#   approach is that mod_ssl sends the close notify alert but doesn't wait for
-#   the close notify alert from client. When you need a different shutdown
-#   approach you can use one of the following variables:
-#   o ssl-unclean-shutdown:
-#     This forces an unclean shutdown when the connection is closed, i.e. no
-#     SSL close notify alert is send or allowed to received.  This violates
-#     the SSL/TLS standard but is needed for some brain-dead browsers. Use
-#     this when you receive I/O errors because of the standard approach where
-#     mod_ssl sends the close notify alert.
-#   o ssl-accurate-shutdown:
-#     This forces an accurate shutdown when the connection is closed, i.e. a
-#     SSL close notify alert is send and mod_ssl waits for the close notify
-#     alert of the client. This is 100% SSL/TLS standard compliant, but in
-#     practice often causes hanging connections with brain-dead browsers. Use
-#     this only for browsers where you know that their SSL implementation
-#     works correctly. 
-#   Notice: Most problems of broken clients are also related to the HTTP
-#   keep-alive facility, so you usually additionally want to disable
-#   keep-alive for those clients, too. Use variable "nokeepalive" for this.
-#   Similarly, one has to force some clients to use HTTP/1.0 to workaround
-#   their broken HTTP/1.1 implementation. Use variables "downgrade-1.0" and
-#   "force-response-1.0" for this.
-
-<IfModule mod_setenvif.c>
-
-    SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown \
-    downgrade-1.0 force-response-1.0
-
-</IfModule>
-
-#   Per-Server Logging:
-#   The home of a custom SSL log file. Use this when you want a
-#   compact non-error SSL logfile on a virtual host basis.
-
-<IfModule mod_log_config.c>
-CustomLog logs/ssl_request_log \
-          "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
-</IfModule>
-
-<IfModule mod_rewrite.c>
-RewriteEngine On
-RewriteOptions inherit
-</IfModule>
-
-</VirtualHost>                                  
-
-</IfModule>
diff --git a/net-www/apache/files/2.0.49/45_mod_dav.conf b/net-www/apache/files/2.0.49/45_mod_dav.conf
deleted file mode 100644
index 74dffd07d218..000000000000
--- a/net-www/apache/files/2.0.49/45_mod_dav.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-<IfDefine DAV>
-  <IfModule !mod_dav.c>
-    LoadModule dav_module    modules/mod_dav.so
-  </IfModule>
-</IfDefine>
-
-<IfDefine DAV_FS>
-  <IfModule !mod_dav_fs.c>
-    LoadModule dav_fs_module   modules/mod_dav_fs.so
-  </IfModule>
-</IfDefine>
-
-<IfModule mod_dav.c>
-
-    DavMinTimeout 600
-#	<Location /mypages>
-#		Options None
-#		Dav On
-#		<Limit PUT POST DELETE PROPFIND PROPPATCH MKCOL COPY MOVE LOCK UNLOCK>
-#			Require user greg
-#		</Limit>
-#	</Location>
-
-</IfModule>
-
-<IfModule mod_dav_fs.c>
-
-    # Location of the WebDAV lock database.
-    DavLockDB /var/lib/dav/lockdb
-
-</IfModule>
diff --git a/net-www/apache/files/2.0.49/46_mod_ldap.conf b/net-www/apache/files/2.0.49/46_mod_ldap.conf
deleted file mode 100644
index 25df4cf009b8..000000000000
--- a/net-www/apache/files/2.0.49/46_mod_ldap.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-<IfDefine LDAP>
-  <IfModule !util_ldap.c>
-    LoadModule ldap_module    extramodules/mod_ldap.so
-  </IfModule>
-</IfDefine>
-
-<IfDefine AUTH_LDAP>
-  <IfModule !mod_auth_ldap.c>
-    LoadModule auth_ldap_module   extramodules/mod_auth_ldap.so
-  </IfModule>
-</IfDefine>
-
-# Examples below are taken from the online documentation
-# Refer to:
-# http://localhost/manual/mod/mod_ldap.html
-# http://localhost/manual/mod/mod_auth_ldap.html
-
-<IfModule util_ldap.c>
-
-    LDAPSharedCacheSize 200000
-    LDAPCacheEntries 1024
-    LDAPCacheTTL 600
-    LDAPOpCacheEntries 1024
-    LDAPOpCacheTTL 600
-
-    <Location /ldap-status>
-        SetHandler ldap-status
-        Order deny,allow
-        Deny from all
-        Allow from 127.0.0.1
-    </Location>
-
-</IfModule>
-
-<IfModule mod_auth_ldap.c>
-
-    #AuthLDAPURL ldap://ldap1.airius.com:389/ou=People, o=Airius?uid?sub?(objectClass=*)
-    #require valid-user
-
-</IfModule>
diff --git a/net-www/apache/files/2.0.49/apache2-builtin-mods b/net-www/apache/files/2.0.49/apache2-builtin-mods
deleted file mode 100644
index 9b04b862e1b0..000000000000
--- a/net-www/apache/files/2.0.49/apache2-builtin-mods
+++ /dev/null
@@ -1,78 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/files/2.0.49/apache2-builtin-mods,v 1.2 2004/07/18 04:20:47 dragonheart Exp $
-#
-# This file will be installed into /etc/apache2 when you first emerge
-# Apache2.  If/when you upgrade, it will be consulted for your options,
-# thus preserving your previous configuration.  The default configuration
-# in files/ is used if the one in /etc/apache2 isn't available.
-#
-# To compile a module statically into the apache binary, simply put
-# static beside it.  To compile a module as a DSO, put shared beside
-# it.  To disable a module, simply put a - as the first character on
-# the line.
-#
-# Examples:
-# mod_access shared    ( this would build a DSO )
-# mod_actions static   ( this would get compiled statically )
-# - mod_alias shared   ( this module would not be built at all )
-#
-# Please be aware that if you _do_ customize these then you'll need
-# to manually adjust your apache2.conf file, tweaking the LoadModule
-# lines accordingly or else your server will fail to start; you've
-# been warned! (woodchip@gentoo.org  Nov 21 2002)
-
-- mod_example shared
-mod_access shared
-mod_auth shared
-mod_auth_dbm shared
-mod_auth_anon shared
-mod_auth_digest shared
-mod_alias shared
-mod_file-cache shared
-mod_echo shared
-mod_charset-lite shared
-mod_cache shared
-mod_disk-cache shared
-mod_mem-cache shared
-mod_ext-filter shared
-mod_case_filter shared
-mod_case-filter-in shared
-mod_deflate shared
-mod_mime-magic shared
-mod_cern-meta shared
-mod_expires shared
-mod_headers shared
-mod_usertrack shared
-mod_unique-id shared
-mod_proxy shared
-mod_proxy-connect shared
-mod_proxy-ftp shared
-mod_proxy-http shared
-mod_ssl shared
-- mod_optional-hook-export shared
-- mod_optional-hook-import shared
-- mod_optional-fn-import shared
-- mod_optional-fn-export shared
-- mod_bucketeer shared
-mod_info shared
-mod_include shared
-mod_cgi shared
-mod_cgid shared
-mod_dav shared
-mod_dav-fs shared
-mod_vhost-alias shared
-mod_speling shared
-mod_rewrite shared
-mod_log_config shared
-mod_logio shared
-mod_env shared
-mod_setenvif shared
-mod_mime shared
-mod_status shared
-mod_autoindex shared
-mod_asis shared
-mod_negotiation shared
-mod_dir shared
-mod_imap shared
-mod_actions shared
-mod_userdir shared
-mod_so static
diff --git a/net-www/apache/files/2.0.49/apache2.confd b/net-www/apache/files/2.0.49/apache2.confd
deleted file mode 100644
index 1ae8a60865d1..000000000000
--- a/net-www/apache/files/2.0.49/apache2.confd
+++ /dev/null
@@ -1,48 +0,0 @@
-# /etc/conf.d/apache2: config file for /etc/init.d/apache2
-
-# An example from /etc/apache2/conf/modules.d/40_mod_ssl.conf:
-#
-# <IfDefine SSL>
-#  <IfModule !mod_ssl.c>
-#    LoadModule ssl_module    extramodules/mod_ssl.so
-#  </IfModule>
-# </IfDefine>
-#
-# This means that the mod_ssl.so DSO module is only loaded
-# into the server when you pass "-D SSL" at startup.  To
-# enable WebDAV, add "-D DAV -D DAV_FS".  If you installed
-# mod_php then add "-D PHP4".  For more options, please
-# read the files in the /etc/apache2/conf/modules.d directory.
-
-#APACHE2_OPTS="-D SSL"
-
-# Extended options for advanced uses of Apache ONLY
-# You don't need to edit these unless you are doing crazy Apache stuff
-# As not having them set correctly, or feeding in an incorrect configuration
-# via them will result in Apache failing to start
-# YOU HAVE BEEN WARNED.
-
-# ServerRoot setting
-#SERVERROOT=/etc/apache2
-
-# Configuration file location
-# - If this does NOT start with a '/', then it is treated relative to
-# $SERVERROOT by Apache
-#CONFIGFILE=conf/apache2.conf
-
-# Location to log startup errors to
-# They are normally dumped to your terminal.
-#STARTUPERRORLOG="/var/log/apache2/startuperror.log"
-
-# PID file location
-# Note that this MUST match the setting in your configuration file!
-PIDFILE=/var/run/apache2.pid
-
-# Restart style
-# see http://httpd.apache.org/docs-2.0/stopping.html for more details
-# the default is 'graceful', the other possible value is 'restart'
-# If you use 'graceful', completion of the command does NOT imply that the system
-# has finished restarting. Restart is finished only when all child processes
-# have finished serving their current request sets. Read the URL for details.
-#RESTARTSTYLE="restart"
-RESTARTSTYLE="graceful"
diff --git a/net-www/apache/files/2.0.49/apache2.initd b/net-www/apache/files/2.0.49/apache2.initd
deleted file mode 100644
index abc7c45e0c6d..000000000000
--- a/net-www/apache/files/2.0.49/apache2.initd
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/files/2.0.49/apache2.initd,v 1.8 2004/07/15 00:24:42 agriffis Exp $
-
-opts="${opts} reload"
-
-[ "x${SERVERROOT}" != "x" ] && APACHE2_OPTS="${APACHE2_OPTS} -d ${SERVERROOT}"
-[ "x${CONFIGFILE}" != "x" ] && APACHE2_OPTS="${APACHE2_OPTS} -f ${CONFIGFILE}"
-[ "x${STARTUPERRORLOG}" != "x" ] && APACHE2_OPTS="${APACHE2_OPTS} -E ${STARTUPERRORLOG}"
-# set a default for PIDFILE/RESTARTSTYLE for those that FAILED to follow
-# instructiosn and update the conf.d/apache2 file.
-# (bug #38787)
-[ -z "${PIDFILE}" ] && PIDFILE=/var/run/apache2.pid
-[ -z "${RESTARTSTYLE}" ] && RESTARTSTYLE="graceful"
-
-checkconfig() {
-	local myconf="/etc/apache2/conf/apache2.conf"
-	if [ "x${CONFIGFILE}" != "x" ]; then
-		if [ ${CONFIGFILE:0:1} = "/" ]; then
-			myconf="${CONFIGFILE}"
-		else
-			myconf="${SERVERROOT:-/usr/lib/apache2}/${CONFIGFILE}"
-		fi
-	fi
-	if [ ! -r "${myconf}" ]; then
-		eerror "Unable to read configuration file: ${myconf}"
-		return 1
-	fi
-    if [ -z "${PIDFILE}" ]; then
-        eerror "\$PIDFILE is not set!"
-        eerror "Did you etc-update /etc/conf.d/apache2?"
-        return 1
-    fi
-    if [ -z "${RESTARTSTYLE}" ]; then
-        eerror "\$RESTARTSTYLE is not set!"
-        eerror "Did you etc-update /etc/conf.d/apache2?"
-        return 1
-    fi
-	/usr/sbin/apache2 -t ${APACHE2_OPTS} 1>/dev/null 2>&1
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		eerror "Apache2 has detected a syntax error in your configuration files:"
-		/usr/sbin/apache2 -t ${APACHE2_OPTS}
-	fi
-	return $ret
-}
-
-depend() {
-	need net
-	use mysql dns logger netmount postgres
-	after sshd
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting apache2"
-	[ -f /var/log/apache2/ssl_scache ] && rm /var/log/apache2/ssl_scache
-	[ -f /usr/lib/apache2/build/envvars ] && . /usr/lib/apache2/build/envvars
-	env -i PATH=$PATH /sbin/start-stop-daemon --quiet \
-		--start --startas /usr/sbin/apache2 \
-		--pidfile ${PIDFILE} -- -k start ${APACHE2_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping apache2"
-	/usr/sbin/apache2ctl stop >/dev/null
-	start-stop-daemon -o --quiet --stop --pidfile ${PIDFILE}
-	eend $?
-}
-
-reload() {
-	# restarting apache2 is much easier than apache1. The server handles most of the work for us. 
-	# see http://httpd.apache.org/docs-2.0/stopping.html for more details
-	ebegin "Restarting apache2"
-	/usr/sbin/apache2 ${APACHE2_OPTS} -k ${RESTARTSTYLE}
-	eend $?
-}
diff --git a/net-www/apache/files/2.0.49/apache2logserverstatus b/net-www/apache/files/2.0.49/apache2logserverstatus
deleted file mode 100644
index b27047415b4d..000000000000
--- a/net-www/apache/files/2.0.49/apache2logserverstatus
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/usr/bin/perl
-
-## ====================================================================
-## The Apache Software License, Version 1.1
-##
-## Copyright (c) 2000 The Apache Software Foundation.  All rights
-## reserved.
-##
-## Redistribution and use in source and binary forms, with or without
-## modification, are permitted provided that the following conditions
-## are met:
-##
-## 1. Redistributions of source code must retain the above copyright
-##    notice, this list of conditions and the following disclaimer.
-##
-## 2. Redistributions in binary form must reproduce the above copyright
-##    notice, this list of conditions and the following disclaimer in
-##    the documentation and/or other materials provided with the
-##    distribution.
-##
-## 3. The end-user documentation included with the redistribution,
-##    if any, must include the following acknowledgment:
-##       "This product includes software developed by the
-##        Apache Software Foundation (http://www.apache.org/)."
-##    Alternately, this acknowledgment may appear in the software itself,
-##    if and wherever such third-party acknowledgments normally appear.
-##
-## 4. The names "Apache" and "Apache Software Foundation" must
-##    not be used to endorse or promote products derived from this
-##    software without prior written permission. For written
-##    permission, please contact apache@apache.org.
-##
-## 5. Products derived from this software may not be called "Apache",
-##    nor may "Apache" appear in their name, without prior written
-##    permission of the Apache Software Foundation.
-##
-## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-## OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-## DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
-## ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-## SUCH DAMAGE.
-## ====================================================================
-##
-## This software consists of voluntary contributions made by many
-## individuals on behalf of the Apache Software Foundation.  For more
-## information on the Apache Software Foundation, please see
-## <http://www.apache.org/>.
-##
-## Portions of this software are based upon public domain software
-## originally written at the National Center for Supercomputing Applications,
-## University of Illinois, Urbana-Champaign.
-##
-
-
-# Log Server Status
-# Mark J Cox, UK Web Ltd 1996, mark@ukweb.com
-#
-# This script is designed to be run at a frequent interval by something
-# like cron.  It connects to the server and downloads the status
-# information.  It reformats the information to a single line and logs
-# it to a file.  Make sure the directory $wherelog is writable by the
-# user who runs this script.
-#
-require 'sys/socket.ph';
-
-# Logs will be like "/var/log/apache2/status/19960312"
-$wherelog = "/var/log/apache2/status/";
-$server = "localhost";          # Name of server, could be "www.foo.com"
-$port = "80";                   # Port on server
-$request = "/status/?auto";     # Request to send
-
-sub tcp_connect
-{
-	local($host,$port) =@_;
-        $sockaddr='S n a4 x8';
-        chop($hostname=`hostname`);
-        $port=(getservbyname($port, 'tcp'))[2]  unless $port =~ /^\d+$/;
-        $me=pack($sockaddr,&AF_INET,0,(gethostbyname($hostname))[4]);
-        $them=pack($sockaddr,&AF_INET,$port,(gethostbyname($host))[4]);
-        socket(S,&PF_INET,&SOCK_STREAM,(getprotobyname('tcp'))[2]) || 
-		die "socket: $!";
-        bind(S,$me) || return "bind: $!";
-        connect(S,$them) || return "connect: $!";
-        select(S); 
-	$| = 1; 
-	select(stdout);
-	return "";
-}
-
-### Main
-
-{
-        $year=`date +%y`;
-	chomp($year);
-	$year += ($year < 70) ? 2000 : 1900;
-	$date = $year . `date +%m%d:%H%M%S`;
-	chomp($date);
-	($day,$time)=split(/:/,$date);
-	$res=&tcp_connect($server,$port);
-	open(OUT,">>$wherelog$day");
-	if ($res) {
-		print OUT "$time:-1:-1:-1:-1:$res\n";
-		exit 1;
-	}
-	print S "GET $request\n";
-	while (<S>) {
-		$requests=$1 if ( m|^BusyServers:\ (\S+)|);
-		$idle=$1 if ( m|^IdleServers:\ (\S+)|);
-		$number=$1 if ( m|sses:\ (\S+)|);
-		$cpu=$1 if (m|^CPULoad:\ (\S+)|);
-	}
-	print OUT "$time:$requests:$idle:$number:$cpu\n";
-}
-
-
diff --git a/net-www/apache/files/2.0.49/apache2splitlogfile b/net-www/apache/files/2.0.49/apache2splitlogfile
deleted file mode 100644
index 4112b6477260..000000000000
--- a/net-www/apache/files/2.0.49/apache2splitlogfile
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/usr/bin/perl
-#
-## ====================================================================
-## The Apache Software License, Version 1.1
-##
-## Copyright (c) 2000 The Apache Software Foundation.  All rights
-## reserved.
-##
-## Redistribution and use in source and binary forms, with or without
-## modification, are permitted provided that the following conditions
-## are met:
-##
-## 1. Redistributions of source code must retain the above copyright
-##    notice, this list of conditions and the following disclaimer.
-##
-## 2. Redistributions in binary form must reproduce the above copyright
-##    notice, this list of conditions and the following disclaimer in
-##    the documentation and/or other materials provided with the
-##    distribution.
-##
-## 3. The end-user documentation included with the redistribution,
-##    if any, must include the following acknowledgment:
-##       "This product includes software developed by the
-##        Apache Software Foundation (http://www.apache.org/)."
-##    Alternately, this acknowledgment may appear in the software itself,
-##    if and wherever such third-party acknowledgments normally appear.
-##
-## 4. The names "Apache" and "Apache Software Foundation" must
-##    not be used to endorse or promote products derived from this
-##    software without prior written permission. For written
-##    permission, please contact apache@apache.org.
-##
-## 5. Products derived from this software may not be called "Apache",
-##    nor may "Apache" appear in their name, without prior written
-##    permission of the Apache Software Foundation.
-##
-## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-## OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-## DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
-## ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-## SUCH DAMAGE.
-## ====================================================================
-##
-## This software consists of voluntary contributions made by many
-## individuals on behalf of the Apache Software Foundation.  For more
-## information on the Apache Software Foundation, please see
-## <http://www.apache.org/>.
-##
-## Portions of this software are based upon public domain software
-## originally written at the National Center for Supercomputing Applications,
-## University of Illinois, Urbana-Champaign.
-##
-##
-
-## Heavily modified by Jean-Michel Dault <jmdault@mandrakesoft.com>
-## for use with in the Avanced Extranet Server.
-## This script can now be used with the CustomLogs directive, with a pipe.
-## When in combination with SetEnv VLOG <path>, it will write the log file
-## in the right place. Also, it splits the log automatically with a year
-## and month prefix. Finally, we open and re-close the logfile for every
-## log entry. It is slower, but it permits us to check for symlinks, and
-## flush the buffers so everything is realtime and we don't lose any entry.
-
-
-#
-# This script will take a combined Web server access
-# log file and break its contents into separate files.
-# It assumes that the first field of each line is the
-# virtual host identity (put there by "%v"), and that
-# the logfiles should be named that+".log" in the current
-# directory.
-#
-# The combined log file is read from stdin. Records read
-# will be appended to any existing log files.
-#
-
-use POSIX qw(strftime);
-
-while (<STDIN>) {
-    #
-    # Get the first token from the log record; it's the
-    # identity of the virtual host to which the record
-    # applies.
-    #
-    ($vhost) = split /\s/;
-    #
-    # Normalize the virtual host name to all lowercase.
-    # If it's blank, the request was handled by the default
-    # server, so supply a default name.  This shouldn't
-    # happen, but caution rocks.
-    #
-    $vhost = lc ($vhost) or "access";
-    #
-
-    s/VLOG=(.*)[\/]*$//;
-    $logs=$1;
-    if($logs eq "") {$logs="/var/log/apache2";}
-    $date=strftime("%Y-%m", localtime());
-    $filename="${logs}/VLOG-${date}-${vhost}.log";
-    if (-l $filename) { 
-	die "File $filename is a symlink, writing too dangerous, dying!\n";
-    }
-    open LOGFILE, ">>$filename"
-            or die ("Can't open $logs/$filename");
-    #
-    # Strip off the first token (which may be null in the
-    # case of the default server), and write the edited
-    # record to the current log file.
-    #
-    s/^\S*\s+//;
-    print LOGFILE $_;
-    close(LOGFILE);
-}
-
-exit(0);
diff --git a/net-www/apache/files/2.0.49/gentestcrt.sh b/net-www/apache/files/2.0.49/gentestcrt.sh
deleted file mode 100644
index 0a1b5c3692c2..000000000000
--- a/net-www/apache/files/2.0.49/gentestcrt.sh
+++ /dev/null
@@ -1,243 +0,0 @@
-#!/bin/sh
-## $Header: /var/cvsroot/gentoo-x86/net-www/apache/files/2.0.49/gentestcrt.sh,v 1.2 2004/07/18 04:20:47 dragonheart Exp $
-##
-##  gentestcrt -- Create self-signed test certificate
-##  (C) 2001 Jean-Michel Dault <jmdault@mandrakesoft.com> and Mandrakesoft
-##  Based on cca.sh script by Ralf S. Engelschall
-##
-
-#   external tools
-openssl="/usr/bin/openssl"
-
-#   some optional terminal sequences
-case $TERM in
-    xterm|xterm*|vt220|vt220*)
-        T_MD=`echo dummy | awk '{ printf("%c%c%c%c", 27, 91, 49, 109); }'`
-        T_ME=`echo dummy | awk '{ printf("%c%c%c", 27, 91, 109); }'`
-        ;;
-    vt100|vt100*)
-        T_MD=`echo dummy | awk '{ printf("%c%c%c%c%c%c", 27, 91, 49, 109, 0, 0); }'`
-        T_ME=`echo dummy | awk '{ printf("%c%c%c%c%c", 27, 91, 109, 0, 0); }'`
-        ;;
-    default)
-        T_MD=''
-        T_ME=''
-        ;;
-esac
-
-#   find some random files
-#   (do not use /dev/random here, because this device 
-#   doesn't work as expected on all platforms)
-randfiles=''
-for file in /var/log/messages /var/adm/messages \
-            /kernel /vmunix /vmlinuz \
-            /etc/hosts /etc/resolv.conf; do
-    if [ -f $file ]; then
-        if [ ".$randfiles" = . ]; then
-            randfiles="$file"
-        else
-            randfiles="${randfiles}:$file"
-        fi
-    fi
-done
-
-
-echo "${T_MD}maketestcrt -- Create self-signed test certificate${T_ME}"
-echo "(C) 2001 Jean-Michel Dault <jmdault@mandrakesoft.com> and Mandrakesoft"
-echo "Based on cca.sh script by Ralf S. Engelschall"
-echo ""
-
-grep -q -s DUMMY server.crt && mv server.crt server.crt.dummy
-grep -q -s DUMMY server.key && mv server.key server.key.dummy
-
-echo ""
-echo ""
-
-if [ ! -e ./server.crt -a ! -e ./server.key ];then 
-	echo "Will create server.key and server.crt in `pwd`"
-else
-	echo "server.key and server.crt already exist, dying"
-	exit
-fi
-
-echo ""
-
-
-mkdir -p /tmp/tmpssl-$$
-pushd /tmp/tmpssl-$$ > /dev/null
-
-
-    echo "${T_MD}INITIALIZATION${T_ME}"
-
-    echo ""
-    echo "${T_MD}Generating custom Certificate Authority (CA)${T_ME}"
-    echo "______________________________________________________________________"
-    echo ""
-    echo "${T_MD}STEP 1: Generating RSA private key for CA (1024 bit)${T_ME}"
-    cp /dev/null ca.rnd
-    echo '01' >ca.ser
-    if [ ".$randfiles" != . ]; then
-        $openssl genrsa -rand $randfiles -out ca.key 1024
-    else
-        $openssl genrsa -out ca.key 1024
-    fi
-    if [ $? -ne 0 ]; then
-        echo "cca:Error: Failed to generate RSA private key" 1>&2
-        exit 1
-    fi
-    echo "______________________________________________________________________"
-    echo ""
-    echo "${T_MD}STEP 2: Generating X.509 certificate signing request for CA${T_ME}"
-    cat >.cfg <<EOT
-[ req ]
-default_bits                    = 1024
-distinguished_name              = req_DN
-RANDFILE                        = ca.rnd
-[ req_DN ]
-countryName                     = "1. Country Name             (2 letter code)"
-#countryName_default             = CA
-#countryName_min                 = 2
-countryName_max                 = 2
-stateOrProvinceName             = "2. State or Province Name   (full name)    "
-#stateOrProvinceName_default     = "Quebec"
-localityName                    = "3. Locality Name            (eg, city)     "
-#localityName_default            = "Montreal"
-0.organizationName              = "4. Organization Name        (eg, company)  "
-0.organizationName_default      = "Apache HTTP Server"
-organizationalUnitName          = "5. Organizational Unit Name (eg, section)  "
-organizationalUnitName_default  = "For testing purposes only"
-commonName                      = "6. Common Name              (eg, CA name)  "
-commonName_max                  = 64
-commonName_default              = "localhost"
-emailAddress                    = "7. Email Address            (eg, name@FQDN)"
-emailAddress_max                = 40
-#emailAddress_default            = "root@localhost"
-EOT
-    $openssl req -config .cfg -new -key ca.key -out ca.csr
-    if [ $? -ne 0 ]; then
-        echo "cca:Error: Failed to generate certificate signing request" 1>&2
-        exit 1
-    fi
-    echo "______________________________________________________________________"
-    echo ""
-    echo "${T_MD}STEP 3: Generating X.509 certificate for CA signed by itself${T_ME}"
-    cat >.cfg <<EOT
-#extensions = x509v3
-#[ x509v3 ]
-#subjectAltName   = email:copy
-#basicConstraints = CA:true,pathlen:0
-#nsComment        = "CCA generated custom CA certificate"
-#nsCertType       = sslCA
-EOT
-    $openssl x509 -extfile .cfg -req -days 365 -signkey ca.key -in ca.csr -out ca.crt
-    if [ $? -ne 0 ]; then
-        echo "cca:Error: Failed to generate self-signed CA certificate" 1>&2
-        exit 1
-    fi
-    echo "______________________________________________________________________"
-    echo ""
-    echo "${T_MD}RESULT:${T_ME}"
-    $openssl verify ca.crt
-    if [ $? -ne 0 ]; then
-        echo "cca:Error: Failed to verify resulting X.509 certificate" 1>&2
-        exit 1
-    fi
-    $openssl x509 -text -in ca.crt
-    $openssl rsa -text -in ca.key
-
-    echo "${T_MD}CERTIFICATE GENERATION${T_ME}"
-    user="server"
-
-    echo ""
-    echo "${T_MD}Generating custom USER${T_ME} [$user]"
-    echo "______________________________________________________________________"
-    echo ""
-    echo "${T_MD}STEP 5: Generating RSA private key for USER (1024 bit)${T_ME}"
-    if [ ".$randfiles" != . ]; then
-        $openssl genrsa -rand $randfiles -out $user.key 1024
-    else
-        $openssl genrsa -out $user.key 1024
-    fi
-    if [ $? -ne 0 ]; then
-        echo "cca:Error: Failed to generate RSA private key" 1>&2
-        exit 1
-    fi
-    echo "______________________________________________________________________"
-    echo ""
-    echo "${T_MD}STEP 6: Generating X.509 certificate signing request for USER${T_ME}"
-    cat >.cfg <<EOT
-[ req ]
-default_bits                    = 1024
-distinguished_name              = req_DN
-RANDFILE                        = ca.rnd
-[ req_DN ]
-countryName                     = "1. Country Name             (2 letter code)"
-#countryName_default             = XY
-#countryName_min                 = 2
-countryName_max                 = 2
-stateOrProvinceName             = "2. State or Province Name   (full name)    "
-#stateOrProvinceName_default     = "Unknown"
-localityName                    = "3. Locality Name            (eg, city)     "
-#localityName_default            = "Server Room"
-0.organizationName              = "4. Organization Name        (eg, company)  "
-0.organizationName_default      = "Apache HTTP Server"
-organizationalUnitName          = "5. Organizational Unit Name (eg, section)  "
-organizationalUnitName_default  = "Test Certificate"
-commonName                      = "6. Common Name              (eg, DOMAIN NAME)  "
-commonName_max                  = 64
-commonName_default              = "localhost"
-emailAddress                    = "7. Email Address            (eg, name@fqdn)"
-emailAddress_max                = 40
-#emailAddress_default            = "root@localhost"
-EOT
-    $openssl req -config .cfg -new -key $user.key -out $user.csr
-    if [ $? -ne 0 ]; then
-        echo "cca:Error: Failed to generate certificate signing request" 1>&2
-        exit 1
-    fi
-    rm -f .cfg
-    echo "______________________________________________________________________"
-    echo ""
-    echo "${T_MD}STEP 7: Generating X.509 certificate signed by own CA${T_ME}"
-    cat >.cfg <<EOT
-#extensions = x509v3
-#[ x509v3 ]
-#subjectAltName   = email:copy
-#basicConstraints = CA:false,pathlen:0
-#nsComment        = "CCA generated client certificate"
-#nsCertType       = client
-EOT
-    $openssl x509 -extfile .cfg -days 365 -CAserial ca.ser -CA ca.crt -CAkey ca.key -in $user.csr -req -out $user.crt
-    if [ $? -ne 0 ]; then
-        echo "cca:Error: Failed to generate X.509 certificate" 1>&2
-        exit 1
-    fi
-    caname="`$openssl x509 -noout -text -in ca.crt |\
-             grep Subject: | sed -e 's;.*CN=;;' -e 's;/Em.*;;'`"
-    username="`$openssl x509 -noout -text -in $user.crt |\
-               grep Subject: | sed -e 's;.*CN=;;' -e 's;/Em.*;;'`"
-#    echo "Assembling PKCS#12 package"
-#    $openssl pkcs12 -export -in $user.crt -inkey $user.key -certfile ca.crt -name "$username" -caname "$caname" -out $user.p12
-    echo "______________________________________________________________________"
-    echo ""
-    echo "${T_MD}RESULT:${T_ME}"
-    $openssl verify -CAfile ca.crt $user.crt
-    if [ $? -ne 0 ]; then
-        echo "cca:Error: Failed to verify resulting X.509 certificate" 1>&2
-        exit 1
-    fi
-    $openssl x509 -text -in $user.crt
-    $openssl rsa -text -in $user.key
-
-
-popd >/dev/null
-
-
-rm -f /tmp/tmpssl-$$/*.csr
-rm -f /tmp/tmpssl-$$/ca.*
-chmod 400 /tmp/tmpssl-$$/*
-
-echo "Certificate creation done!"
-cp /tmp/tmpssl-$$/server.* .
-
-rm -rf /tmp/tmpssl-$$
diff --git a/net-www/apache/files/apache-2.0.48-export.diff b/net-www/apache/files/apache-2.0.48-export.diff
deleted file mode 100644
index dfae06bff1f4..000000000000
--- a/net-www/apache/files/apache-2.0.48-export.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- httpd-2.0.48/srclib/apr/threadproc/unix/threadpriv.c	2003-01-06 23:44:38.000000000 +0000
-+++ httpd-2.0.48-gentoo/srclib/apr/threadproc/unix/threadpriv.c	2004-01-05 10:41:58.000000000 +0000
-@@ -100,9 +100,9 @@
-     }
- }
- 
--#ifdef HAVE_PTHREAD_KEY_DELETE
- APR_DECLARE(apr_status_t) apr_threadkey_private_delete(apr_threadkey_t *key)
- {
-+#ifdef HAVE_PTHREAD_KEY_DELETE
-     apr_status_t stat;
- 
-     if ((stat = pthread_key_delete(key->key)) == 0) {
-@@ -110,8 +110,10 @@
-     }
- 
-     return stat;
--}
-+#else
-+    return APR_ENOTIMPL;
- #endif
-+}
- 
- APR_DECLARE(apr_status_t) apr_threadkey_data_get(void **data, const char *key,
-                                                  apr_threadkey_t *threadkey)
diff --git a/net-www/apache/files/apache-2.0.48-gentoo.diff b/net-www/apache/files/apache-2.0.48-gentoo.diff
deleted file mode 100644
index 6c5c02193543..000000000000
--- a/net-www/apache/files/apache-2.0.48-gentoo.diff
+++ /dev/null
@@ -1,151 +0,0 @@
-- enable the checks that the suexec wrapper is a setuid root binary;
-  so if people turn off setuid on the binary, suexec won't be enabled.
-
-- fix hardcoded path to suexec2
-
-- remove checks requiring /usr/sbin/httpd to be present: this is
-  unnecessary, we know that httpd contains mod_so, and only the
-  httpd-devel package should be required to build modules.
-
-- Allow startup after unclean shutdown: remove mutex before
-  creating it, use anonymous shm in shmcb.
-
-- allow server/exports.c to be generated in a parallel build successfully
-
-- ensure that when mod_ssl is unloaded, libcrypto doesn't still have the
-  thread_id callback pointing at a mod_ssl function.
-
-- make apache2ctl source /etc/conf.d/apache2 for startup options
-
-
-diff -uNr httpd-2.0.48/include/httpd.h httpd-2.0.48-gentoo/include/httpd.h
---- httpd-2.0.48/include/httpd.h	2003-10-24 12:19:31.000000000 -0400
-+++ httpd-2.0.48-gentoo/include/httpd.h	2003-10-29 21:58:46.000000000 -0500
-@@ -180,7 +180,7 @@
- 
- /* The path to the suExec wrapper, can be overridden in Configuration */
- #ifndef SUEXEC_BIN
--#define SUEXEC_BIN  HTTPD_ROOT "/bin/suexec"
-+#define SUEXEC_BIN  "/usr/sbin/suexec2"
- #endif
- 
- /* The timeout for waiting for messages */
-diff -uNr httpd-2.0.48/modules/ssl/ssl_engine_mutex.c httpd-2.0.48-gentoo/modules/ssl/ssl_engine_mutex.c
---- httpd-2.0.48/modules/ssl/ssl_engine_mutex.c	2003-09-15 21:00:06.000000000 -0400
-+++ httpd-2.0.48-gentoo/modules/ssl/ssl_engine_mutex.c	2003-10-29 22:04:22.000000000 -0500
-@@ -74,6 +74,8 @@
-     if (mc->nMutexMode == SSL_MUTEXMODE_NONE) 
-         return TRUE;
- 
-+    apr_file_remove(mc->szMutexFile, p);
-+
-     if ((rv = apr_global_mutex_create(&mc->pMutex, mc->szMutexFile,
-                                 mc->nMutexMech, p)) != APR_SUCCESS) {
-         if (mc->szMutexFile)
-diff -uNr httpd-2.0.48/modules/ssl/ssl_scache_shmcb.c httpd-2.0.48-gentoo/modules/ssl/ssl_scache_shmcb.c
---- httpd-2.0.48/modules/ssl/ssl_scache_shmcb.c	2003-02-03 12:31:54.000000000 -0500
-+++ httpd-2.0.48-gentoo/modules/ssl/ssl_scache_shmcb.c	2003-10-29 22:04:22.000000000 -0500
-@@ -375,7 +375,7 @@
- 
-     if ((rv = apr_shm_create(&(mc->pSessionCacheDataMM), 
-                              mc->nSessionCacheDataSize, 
--                             mc->szSessionCacheDataFile,
-+                             NULL,
-                              mc->pPool)) != APR_SUCCESS) {
-         char buf[100];
-         ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
-diff -uNr httpd-2.0.48/modules/ssl/ssl_util.c httpd-2.0.48-gentoo/modules/ssl/ssl_util.c
---- httpd-2.0.48/modules/ssl/ssl_util.c	2003-05-16 14:12:19.000000000 -0400
-+++ httpd-2.0.48-gentoo/modules/ssl/ssl_util.c	2003-10-29 23:06:06.000000000 -0500
-@@ -455,6 +455,8 @@
- {
-     CRYPTO_set_locking_callback(NULL);
- 
-+    CRYPTO_set_id_callback(NULL);
-+
-     /* Let the registered mutex cleanups do their own thing 
-      */
-     return APR_SUCCESS;
-diff -uNr httpd-2.0.48/os/unix/unixd.c httpd-2.0.48-gentoo/os/unix/unixd.c
---- httpd-2.0.48/os/unix/unixd.c	2003-09-15 21:00:06.000000000 -0400
-+++ httpd-2.0.48-gentoo/os/unix/unixd.c	2003-10-29 21:57:35.000000000 -0500
-@@ -243,23 +243,20 @@
- 
- AP_DECLARE(void) unixd_pre_config(apr_pool_t *ptemp)
- {
--    apr_finfo_t wrapper;
-+    struct stat wrapper;
- 
-     unixd_config.user_name = DEFAULT_USER;
-     unixd_config.user_id = ap_uname2id(DEFAULT_USER);
-     unixd_config.group_id = ap_gname2id(DEFAULT_GROUP);
- 
-     /* Check for suexec */
--    unixd_config.suexec_enabled = 0;
--    if ((apr_stat(&wrapper, SUEXEC_BIN, 
--                  APR_FINFO_NORM, ptemp)) != APR_SUCCESS) {
--        return;
--    }
--
--    /* XXX - apr_stat is incapable of checking suid bits (grumble) */
--    /* if ((wrapper.filetype & S_ISUID) && wrapper.user == 0) { */
-+    if (stat(SUEXEC_BIN, &wrapper) == 0 && 
-+	(wrapper.st_mode & S_ISUID) && wrapper.st_uid == 0) {
-         unixd_config.suexec_enabled = 1;
--    /* } */
-+    } else {
-+	unixd_config.suexec_enabled = 0;
-+    }
-+    
- }
- 
- 
-diff -uNr httpd-2.0.48/server/Makefile.in httpd-2.0.48-gentoo/server/Makefile.in
---- httpd-2.0.48/server/Makefile.in	2003-03-11 10:41:55.000000000 -0500
-+++ httpd-2.0.48-gentoo/server/Makefile.in	2003-10-29 22:07:41.000000000 -0500
-@@ -70,6 +70,9 @@
- # wtf does this have to be explicit????
- exports.lo: exports.c
- 
-+# Needed to allow exports.c to be generated in a parallel build successfully
-+.NOTPARALLEL: $(top_builddir)/server/exports.c
-+
- # Rule to make def file for OS/2 core dll
- ApacheCoreOS2.def: exports.c export_vars.h $(top_srcdir)/os/$(OS_DIR)/core_header.def
- 	cat $(top_srcdir)/os/$(OS_DIR)/core_header.def > $@
-diff -uNr httpd-2.0.48/support/apachectl.in httpd-2.0.48-gentoo/support/apachectl.in
---- httpd-2.0.48/support/apachectl.in	2003-02-03 12:32:08.000000000 -0500
-+++ httpd-2.0.48-gentoo/support/apachectl.in	2003-10-29 23:08:58.000000000 -0500
-@@ -28,7 +28,8 @@
- # --------------------                              --------------------
- # 
- # the path to your httpd binary, including options if necessary
--HTTPD='@exp_sbindir@/@progname@'
-+. /etc/conf.d/apache2
-+HTTPD="@exp_sbindir@/@progname@ ${APACHE2_OPTS}"
- #
- # pick up any necessary environment variables
- if test -f @exp_bindir@/envvars; then
-diff -uNr httpd-2.0.48/support/apxs.in httpd-2.0.48-gentoo/support/apxs.in
---- httpd-2.0.48/support/apxs.in	2003-05-21 07:39:52.000000000 -0400
-+++ httpd-2.0.48-gentoo/support/apxs.in	2003-10-29 22:02:48.000000000 -0500
-@@ -237,19 +237,6 @@
-     ($httpd = $0) =~ s:support/apxs$::;
- }
- 
--unless (-x "$httpd") {
--	error("$httpd not found or not executable");
--	exit 1;
--}
--
--unless (grep /mod_so/, `. $envvars && $httpd -l`) {
--    error("Sorry, no shared object support for Apache");
--    error("available under your platform. Make sure");
--    error("the Apache module mod_so is compiled into");
--    error("your server binary `$httpd'.");
--    exit 1;
--}
--
- sub get_config_vars{
-     my ($file, $rh_config) = @_;
- 
diff --git a/net-www/apache/files/apache-2.0.49-gentoo.diff b/net-www/apache/files/apache-2.0.49-gentoo.diff
deleted file mode 100644
index a1b7fb767e99..000000000000
--- a/net-www/apache/files/apache-2.0.49-gentoo.diff
+++ /dev/null
@@ -1,158 +0,0 @@
-- enable the checks that the suexec wrapper is a setuid root binary;
-  so if people turn off setuid on the binary, suexec won't be enabled.
-
-- fix hardcoded path to suexec2
-
-- remove checks requiring /usr/sbin/httpd to be present: this is
-  unnecessary, we know that httpd contains mod_so, and only the
-  httpd-devel package should be required to build modules.
-
-- Allow startup after unclean shutdown: remove mutex before
-  creating it, use anonymous shm in shmcb.
-
-- allow server/exports.c to be generated in a parallel build successfully
-
-- ensure that when mod_ssl is unloaded, libcrypto doesn't still have the
-  thread_id callback pointing at a mod_ssl function.
-
-- make apache2ctl source /etc/conf.d/apache2 for startup options
-
-diff -ur httpd-2.0.49.orig/include/httpd.h httpd-2.0.49/include/httpd.h
---- httpd-2.0.49.orig/include/httpd.h	2004-02-09 12:54:34.000000000 -0800
-+++ httpd-2.0.49/include/httpd.h	2004-03-22 10:38:40.000000000 -0800
-@@ -137,7 +137,7 @@
- 
- /* The path to the suExec wrapper, can be overridden in Configuration */
- #ifndef SUEXEC_BIN
--#define SUEXEC_BIN  HTTPD_ROOT "/bin/suexec"
-+#define SUEXEC_BIN  "/usr/sbin/suexec2"
- #endif
- 
- /* The timeout for waiting for messages */
-Only in httpd-2.0.49/include: httpd.h.orig
-diff -ur httpd-2.0.49.orig/modules/ssl/ssl_engine_mutex.c httpd-2.0.49/modules/ssl/ssl_engine_mutex.c
---- httpd-2.0.49.orig/modules/ssl/ssl_engine_mutex.c	2004-02-09 12:53:20.000000000 -0800
-+++ httpd-2.0.49/modules/ssl/ssl_engine_mutex.c	2004-03-22 10:38:40.000000000 -0800
-@@ -41,6 +41,8 @@
-     if (mc->nMutexMode == SSL_MUTEXMODE_NONE) 
-         return TRUE;
- 
-+    apr_file_remove(mc->szMutexFile, p);
-+
-     if ((rv = apr_global_mutex_create(&mc->pMutex, mc->szMutexFile,
-                                 mc->nMutexMech, p)) != APR_SUCCESS) {
-         if (mc->szMutexFile)
-Only in httpd-2.0.49/modules/ssl: ssl_engine_mutex.c.orig
-diff -ur httpd-2.0.49.orig/modules/ssl/ssl_scache_shmcb.c httpd-2.0.49/modules/ssl/ssl_scache_shmcb.c
---- httpd-2.0.49.orig/modules/ssl/ssl_scache_shmcb.c	2004-02-09 12:53:20.000000000 -0800
-+++ httpd-2.0.49/modules/ssl/ssl_scache_shmcb.c	2004-03-22 10:38:40.000000000 -0800
-@@ -341,7 +341,7 @@
- 
-     if ((rv = apr_shm_create(&(mc->pSessionCacheDataMM), 
-                              mc->nSessionCacheDataSize, 
--                             mc->szSessionCacheDataFile,
-+                             NULL,
-                              mc->pPool)) != APR_SUCCESS) {
-         char buf[100];
-         ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
-Only in httpd-2.0.49/modules/ssl: ssl_scache_shmcb.c.orig
-diff -ur httpd-2.0.49.orig/modules/ssl/ssl_util.c httpd-2.0.49/modules/ssl/ssl_util.c
---- httpd-2.0.49.orig/modules/ssl/ssl_util.c	2004-02-09 12:53:20.000000000 -0800
-+++ httpd-2.0.49/modules/ssl/ssl_util.c	2004-03-22 10:38:40.000000000 -0800
-@@ -422,6 +422,8 @@
-     CRYPTO_set_locking_callback(NULL);
-     CRYPTO_set_id_callback(NULL);
- 
-+    CRYPTO_set_id_callback(NULL);
-+
-     /* Let the registered mutex cleanups do their own thing 
-      */
-     return APR_SUCCESS;
-Only in httpd-2.0.49/modules/ssl: ssl_util.c.orig
-diff -ur httpd-2.0.49.orig/os/unix/unixd.c httpd-2.0.49/os/unix/unixd.c
---- httpd-2.0.49.orig/os/unix/unixd.c	2004-03-17 23:36:53.000000000 -0800
-+++ httpd-2.0.49/os/unix/unixd.c	2004-03-22 10:38:40.000000000 -0800
-@@ -200,23 +200,20 @@
- 
- AP_DECLARE(void) unixd_pre_config(apr_pool_t *ptemp)
- {
--    apr_finfo_t wrapper;
-+    struct stat wrapper;
- 
-     unixd_config.user_name = DEFAULT_USER;
-     unixd_config.user_id = ap_uname2id(DEFAULT_USER);
-     unixd_config.group_id = ap_gname2id(DEFAULT_GROUP);
- 
-     /* Check for suexec */
--    unixd_config.suexec_enabled = 0;
--    if ((apr_stat(&wrapper, SUEXEC_BIN, 
--                  APR_FINFO_NORM, ptemp)) != APR_SUCCESS) {
--        return;
--    }
--
--    /* XXX - apr_stat is incapable of checking suid bits (grumble) */
--    /* if ((wrapper.filetype & S_ISUID) && wrapper.user == 0) { */
-+    if (stat(SUEXEC_BIN, &wrapper) == 0 && 
-+	(wrapper.st_mode & S_ISUID) && wrapper.st_uid == 0) {
-         unixd_config.suexec_enabled = 1;
--    /* } */
-+    } else {
-+	unixd_config.suexec_enabled = 0;
-+    }
-+    
- }
- 
- 
-Only in httpd-2.0.49/os/unix: unixd.c.orig
-diff -ur httpd-2.0.49.orig/server/Makefile.in httpd-2.0.49/server/Makefile.in
---- httpd-2.0.49.orig/server/Makefile.in	2004-03-08 09:40:37.000000000 -0800
-+++ httpd-2.0.49/server/Makefile.in	2004-03-22 10:38:40.000000000 -0800
-@@ -67,6 +67,9 @@
- export_vars.h: export_files
- 	$(AWK) -f $(top_srcdir)/build/make_var_export.awk `cat $?` > $@
- 
-+# Needed to allow exports.c to be generated in a parallel build successfully
-+.NOTPARALLEL: $(top_builddir)/server/exports.c
-+
- # Rule to make def file for OS/2 core dll
- ApacheCoreOS2.def: exports.c export_vars.h $(top_srcdir)/os/$(OS_DIR)/core_header.def
- 	cat $(top_srcdir)/os/$(OS_DIR)/core_header.def > $@
-Only in httpd-2.0.49/server: Makefile.in.orig
-diff -ur httpd-2.0.49.orig/support/apachectl.in httpd-2.0.49/support/apachectl.in
---- httpd-2.0.49.orig/support/apachectl.in	2004-02-09 12:59:49.000000000 -0800
-+++ httpd-2.0.49/support/apachectl.in	2004-03-22 10:38:40.000000000 -0800
-@@ -40,7 +40,8 @@
- # --------------------                              --------------------
- # 
- # the path to your httpd binary, including options if necessary
--HTTPD='@exp_sbindir@/@progname@'
-+. /etc/conf.d/apache2
-+HTTPD="@exp_sbindir@/@progname@ ${APACHE2_OPTS}"
- #
- # pick up any necessary environment variables
- if test -f @exp_bindir@/envvars; then
-Only in httpd-2.0.49/support: apachectl.in.orig
-diff -ur httpd-2.0.49.orig/support/apxs.in httpd-2.0.49/support/apxs.in
---- httpd-2.0.49.orig/support/apxs.in	2004-02-09 12:59:49.000000000 -0800
-+++ httpd-2.0.49/support/apxs.in	2004-03-22 10:38:40.000000000 -0800
-@@ -198,19 +198,6 @@
-     ($httpd = $0) =~ s:support/apxs$::;
- }
- 
--unless (-x "$httpd") {
--	error("$httpd not found or not executable");
--	exit 1;
--}
--
--unless (grep /mod_so/, `. $envvars && $httpd -l`) {
--    error("Sorry, no shared object support for Apache");
--    error("available under your platform. Make sure");
--    error("the Apache module mod_so is compiled into");
--    error("your server binary `$httpd'.");
--    exit 1;
--}
--
- sub get_config_vars{
-     my ($file, $rh_config) = @_;
- 
-Only in httpd-2.0.49/support: apxs.in.orig
diff --git a/net-www/apache/files/apache-builtin-mods b/net-www/apache/files/apache-builtin-mods
deleted file mode 100644
index b2e4adc0dd31..000000000000
--- a/net-www/apache/files/apache-builtin-mods
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/files/apache-builtin-mods,v 1.3 2004/07/18 04:20:47 dragonheart Exp $
-#
-# This is a config file for choosing which Apache built-in modules you
-# want and how they should be compiled.  You have the option of either
-# compiling them statically into the apache binary, or building them
-# as DSO's (Dynamic Shared Object).  Please consult some documentation
-# for reasons why you'd want one versus the other.  This file simply
-# helps to make your life easier when customizing and upgrading your
-# Apache server.  The defaults are _fine_ for most users, and it is
-# assumed you _know_ what you're doing if you change things in here.
-#
-# This file will be installed into /etc/apache when you first emerge
-# Apache.  If/when you upgrade by installing a newer version, it will
-# be consulted for your options.  In this way, your previous
-# configuration is preserved without the need to edit the actual
-# ebuild.  The default configuration in the Apache ebuild's files/
-# directory is used as a fallback if the one in /etc/apache is not
-# available.
-#
-# To compile a module statically into the apache binary, simply put
-# static beside it.  To compile a module as a DSO, put shared beside
-# it.  To disable a module, simply put a - as the first character on
-# the line.
-#
-# Examples:
-# mod_access shared    ( this would build a DSO )
-# mod_actions static   ( this would get compiled statically )
-# - mod_alias shared   ( this module would not be built at all )
-#
-# Please be aware that if you _do_ customize these then you'll need
-# to manually adjust your apache.conf file, tweaking the LoadModule
-# and AddModule lines accordingly or else your server will fail to
-# start!  You've been warned ;)
-#
-# // woodchip
-
-mod_access shared
-mod_actions shared
-mod_alias shared
-mod_asis shared
-mod_auth shared
-mod_auth_anon shared
-mod_auth_db shared
-mod_auth_dbm shared
-mod_auth_digest shared
-mod_autoindex shared
-mod_cern_meta shared
-mod_cgi shared
-mod_digest shared
-mod_dir shared
-mod_env shared
-mod_example shared
-mod_expires shared
-mod_headers shared
-mod_imap shared
-mod_include shared
-mod_info shared
-mod_log_agent shared
-mod_log_config shared
-mod_log_referer shared
-mod_mime shared
-mod_mime_magic shared
-mod_mmap_static shared
-mod_negotiation shared
-mod_proxy shared
-mod_rewrite shared
-mod_setenvif shared
-mod_speling shared
-mod_status shared
-mod_unique_id shared
-mod_userdir shared
-mod_usertrack shared
-mod_vhost_alias shared
diff --git a/net-www/apache/files/apache.confd b/net-www/apache/files/apache.confd
deleted file mode 100644
index f1526caaca07..000000000000
--- a/net-www/apache/files/apache.confd
+++ /dev/null
@@ -1,26 +0,0 @@
-# /etc/conf.d/apache2: config file for /etc/init.d/apache2
-
-# Here's an example from /etc/apache/conf/apache.conf using mod_ssl:
-#
-# <IfDefine SSL>
-# LoadModule ssl_module    extramodules/libssl.so
-# </IfDefine>
-#
-# This means that libssl.so is only loaded into the server when you
-# pass "-D SSL" to it at startup.
-#
-# Anything else in apache.conf which is guarded similarly, like:
-#
-# <IfDefine FOO> ... </IfDefine>
-#
-
-# can be easily turned on/off by editing APACHE_OPTS below to
-# include or to not include "-D FOO".
-#
-# If you installed mod_throttle, you can add "-D THROTTLE"; if you
-# installed mod_dav, then add "-D DAV".  For mod_gzip use "-D GZIP".
-# The mod_contribs package has several options you can use.  See
-# your apache.conf file for more details.
-
-
-#APACHE_OPTS="-D SSL -D PHP4"
diff --git a/net-www/apache/files/apache.rc6 b/net-www/apache/files/apache.rc6
deleted file mode 100644
index fb7cd1dd84e5..000000000000
--- a/net-www/apache/files/apache.rc6
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/files/apache.rc6,v 1.20 2004/07/15 00:24:42 agriffis Exp $
-
-opts="${opts} reload"
-
-depend() {
-	need net
-	use mysql dns logger netmount postgres
-	after sshd
-}
-
-start() {
-	ebegin "Starting apache"
-	env -i PATH=$PATH PERL5LIB=PERL5LIB /sbin/start-stop-daemon -o --quiet \
-		--start --startas /usr/sbin/apache \
-		--pidfile /var/run/apache.pid -- ${APACHE_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping apache"
-	/usr/sbin/apachectl stop >/dev/null
-	start-stop-daemon -o --quiet --stop --pidfile /var/run/apache.pid
-	eend $?
-}
-
-reload() {
-	ebegin "Gracefully restarting apache"
-	/usr/sbin/apache -t ${APACHE_OPTS} &>/dev/null
-	if [ "$?" = "0" ]
-	then
-		if [ -f /var/run/apache.pid ]
-		then
-			kill -USR1 $(</var/run/apache.pid)
-			eend $?
-		else
-			svc_start
-			eend $?
-		fi
-	else
-		if [ -f /var/run/apache.pid ]
-		then
-			svc_stop
-		fi
-		#show the error(s)
-		/usr/sbin/apache -t ${APACHE_OPTS}
-		eend 1
-	fi
-}
diff --git a/net-www/apache/files/apache2 b/net-www/apache/files/apache2
deleted file mode 100644
index 20bf4fa6de70..000000000000
--- a/net-www/apache/files/apache2
+++ /dev/null
@@ -1,13 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/files/apache2,v 1.3 2004/07/18 04:20:47 dragonheart Exp $
-#
-# Apache2 logrotate snipet for Gentoo Linux
-# Contributes by Chuck Short
-#
-/var/log/apache2/*log {
-  missingok
-  notifempty
-  sharedscripts
-  postrotate
-  /etc/init.d/apache2 reload > /dev/null 2>&1 || true
-  endscript
-}
diff --git a/net-www/apache/files/apacheaddmod b/net-www/apache/files/apacheaddmod
deleted file mode 100644
index 3427b6a8df23..000000000000
--- a/net-www/apache/files/apacheaddmod
+++ /dev/null
@@ -1,211 +0,0 @@
-#!/usr/bin/perl
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/files/apacheaddmod,v 1.3 2004/07/18 04:20:47 dragonheart Exp $
-#
-# apacheaddmod
-# Script to modify the Apache configuration file to include a module
-# (C) 2001 Jean-Michel Dault <jmdault@mandrakesoft.com> and Mandrakesoft
-# You can use it under the Apache Licence
-
-# This script will try to add the module at the correct place in the config
-# file. It will try to find the last LoadModule and AddModule directives
-# that come before a special section (<Directory>, <VirtualHost>...) and 
-# try to place its directives there. If you specify a "before=mod_foo"
-# option, it will try to position itself before that module. If you specify
-# "define=WHATEVER", it will place the module between <IfDefine WHATEVER>
-# directives.
-
-$bakpath="/etc/apache/conf/bak";
-
-if ((!$ARGV[0]) || (!$ARGV[1]) || (!$ARGV[2]) || (!$ARGV[3])) {
-    print "Usage: $0 <conffile> <path/mod_filename.so> <mod_name.c> \n";
-    print "<name_module> [OPTIONS]\n";
-    print "Options:\n";
-    print " before=mod_filename will add before specified module\n";
-    print " define=WHATEVER will install module between <IfDefine WHATEVER>\n";
-    print " addconf=CONFFILE adds 'Include CONFFILE' in apache.conf\n";
-    die "\n";
-}
-
-sub debug{
-    if ($DEBUG) { foreach (@_) { print $_; } }
-}
-
-$modso=$ARGV[1];
-$modc=$ARGV[2];
-$name_mod=$ARGV[3];
-
-@confparts=split(/\//,$ARGV[0]);
-
-if ($#confparts==0) { 
-#    debug "confparts=0\n";
-    $confpath="/etc/apache/conf"; 
-    $conf="$ARGV[0]";
-} else {
-#    debug "confparts=$#confparts\n";
-    $conf="$confparts[$#confparts]";
-    $confpath=join('/',@confparts[0 .. $#confparts-1]);
-}
-
-system("mkdir -p $bakpath") ==0  
-	or die "Can't create backup directory $bakpath\n";
-
-#debug "Confpath: $confpath\n";
-#debug "Conffile: $conf\n";
-#debug "Backups: $bakpath\n";
-
-
-foreach (@ARGV) {
-    if (/before=(\w+)/i) {
-	$_=$1;
-	s/^mod_//g;
-	s/^lib//g;
-	s/\.so$//g;
-	$before1="mod_$_";
-	$before2="lib$_";
-	debug "##before1=$before1##before2=$before2\n";
-    }
-    if (/define=(\w+)/i) {
-	$opendef="<IfDefine $1>\n";
-	$closedef="</IfDefine>\n";
-	debug "##define=$1##\n";
-    }
-    if (/addconf=(\S+)/i) {
-	$addconf="Include  $1\n";
-    }
-}
-
-
-$_=`date +%Y%m%d-%T`;chop;s/:/./g;$dat=$_;
-$bak="$conf-$dat";
-debug "$bak\n";
-
-
-open(BAK,">$bakpath/$bak") or die "Can't create $bakpath/$bak\n";
-open(CONFF,"$confpath/$conf") or die "Can't open $confpath/$conf\n";
-
-while (<CONFF>) {
-    print BAK $_;
-    if ($insidesection==0) { $lastbeforesection=$.};
-    if (/^\<\w+/i) {
-	$insidesection=1;
-	if (/^\<IfDefine/i) { $lastbeforedefine=$.};
-	$lastbeforesection-=1;
-#	debug "Entering section $_";
-    }
-    if (/^\<\/\w+/i) {
-	$insidesection=0;
-	if (/^\<\/IfDefine/i) { $lastbeforedefine=0};
-#	debug "Leaving section $_";
-    }
-    if (/^\<(Directory)/i) {
-	if ($inmain==0) { debug "Met my first inmain directive\n"; }
-	$inmain=1;
-    }
-    if (/^\<(Location)/i) {
-	if ($inmain==0) { debug "Met my first inmain directive\n"; }
-	$inmain=1;
-    }
-    if (/^\<(Files)/i) {
-	if ($inmain==0) { debug "Met my first inmain directive\n"; }
-	$inmain=1;
-    }
-    if (/^\<(Limit)/i) {
-	if ($inmain==0) { debug "Met my first inmain directive\n"; }
-	$inmain=1;
-    }
-    if (/^\<(VirtualHost)/i) {
-	if ($inmain==0) { debug "Met my first inmain directive\n"; }
-	$inmain=1;
-    }
-    if (/^#*LoadModule\s+\w+_module\s+.*[\/]{1}(\w+)\./i) {
-	if ($inmain==0) {$lastload=$lastbeforesection}
-	if ($lastbeforedefine > 0) {$lastload=$lastbeforedefine}
-	if (($before1 eq $1) || ($before2 eq $1)) { 
-	    $beforeload=$lastload;
-	    debug "Found Loadmodule $1 at line $beforeload\n";
-	}
-#	debug "Load module #$1# at line line $lastload\n";
-    }
-    if (/^#*AddModule\s+(\w+)\./i) {
-	if ($inmain==0) {$lastadd=$lastbeforesection}
-	if ($lastbeforedefine > 0) {$lastadd=$lastbeforedefine}
-	if (($before1 eq $1) || ($before2 eq $1)) { 
-	    $beforeadd=$lastadd;
-	    debug "Found Addmodule $1 at line $beforeadd\n";
-	}
-#	debug "Add module #$1# at line $lastadd\n";
-    }
-}
-$lastline=$.;
-
-if ($lastload > 1) {
-    debug "Last valid LoadModule at line $lastload\n";
-} else {
-    debug "Did not find any valid LoadModule directive. Load at the end.\n";
-    $lastload=$lastline+1;
-}
-if ($lastadd > 1) {
-    debug "Last valid AddModule at line $lastadd\n";
-} else {
-    debug "Did not find any valid AddModule directive. Add at the end.\n";
-    $lastadd=$lastline+1;
-}
-
-
-if ($beforeload > $lastload) {
-    debug "$before1 or $before2 loaded too low in the config file!\n";
-    debug "Will load right before the last valid module\n";
-}
-
-if ($beforeadd > $lastadd) {
-    debug "$before1 or $before2 added too low in the config file!\n";
-    debug "Will add right before the last valid module\n";
-}
-
-if (($beforeload > 0) && ($beforeload <= $lastload)) {
-    $lastload=$beforeload;
-    debug "Beforeload exists and is before (or is) the last valid loaded module\n";
-    debug "Loading before $before1 or $before2 directive\n";
-}
-if (($beforeadd > 0) && ($beforeadd <= $lastadd)) {
-    $lastadd=$beforeadd;
-    debug "Beforeadd exists and is before (or is) the last valid loaded module\n";
-    debug "Adding before $before1 or $before2 directive\n";
-}
-
-#remove 1 from the line count
-$lastload-=1;$lastadd-=1;
-
-debug "Beforeload $beforeload\n";
-debug "Beforeadd $beforeadd\n";
-debug "Lastload: $lastload\n";
-debug "Lastadd: $lastadd\n";
-
-
-close(CONFF);
-close(BAK);
-
-debug "\nFinal results:\n";
-debug "Put Loadmodule after line: $lastload\n";
-debug "Put Addmodule after line: $lastadd\n";
-
-open(BAK,"$bakpath/$bak") or die "Can't open $bakpath/$bak\n";
-open(CONFF,">$confpath/$conf") or die "Can't create $confpath/$conf\n";
-
-while (<BAK>) {
-    print CONFF $_;
-    if ($.==$lastload) {
-	print CONFF "$opendef";
-	print CONFF "LoadModule $name_mod    $modso\n";
-	print CONFF "$closedef";
-    }
-    if ($.==$lastadd) {
-	print CONFF "$opendef";
-	print CONFF "AddModule $modc\n";
-	print CONFF "$closedef";
-    }
-}
-print CONFF $addconf;
-
-close(CONFF);
-close(BAK);
diff --git a/net-www/apache/files/apachedelmod b/net-www/apache/files/apachedelmod
deleted file mode 100644
index 9dba4d07159c..000000000000
--- a/net-www/apache/files/apachedelmod
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/usr/bin/perl
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/files/apachedelmod,v 1.3 2004/07/18 04:20:47 dragonheart Exp $
-#
-# apachedelmod
-# Script to modify the Apache configuration file to remove a module
-# (C) 2001 Jean-Michel Dault <jmdault@mandrakesoft.com> and Mandrakesoft
-# You can use it under the Apache Licence
-
-# See InstallModule for more info ;-)
-
-$bakpath="/etc/apache/conf/bak";
-
-if ((!$ARGV[0]) || (!$ARGV[1]) || (!$ARGV[2]) || (!$ARGV[3])) {
-    print "Usage: $0 <conffile> <mod_filename> <mod_name> \n";
-    print "<name_module> [OPTIONS]\n";
-    print "Options:\n";
-    print " define=WHATEVER will remove module between <IfDefine WHATEVER>\n";
-    print " addconf=CONFFILE removes 'Include CONFFILE' in apache.conf\n";
-    die "\n";
-}
-
-sub debug{
-    if ($DEBUG) { foreach (@_) { print $_; } }
-}
-
-$_=$ARGV[1];
-	s/^.*\///g;
-	s/^mod_//g;
-	s/^lib//g;
-	s/\.so$//g;
-$modso=$_;
-
-$modc=$ARGV[2];
-$name_mod=$ARGV[3];
-
-@confparts=split(/\//,$ARGV[0]);
-
-if ($#confparts==0) { 
-#    debug "confparts=0\n";
-    $confpath="/etc/apache/conf"; 
-    $conf="$ARGV[0]";
-} else {
-#    debug "confparts=$#confparts\n";
-    $conf="$confparts[$#confparts]";
-    $confpath=join('/',@confparts[0 .. $#confparts-1]);
-}
-
-system("mkdir -p $bakpath") ==0  
-	or die "Can't create backup directory $bakpath\n";
-
-#debug "Confpath: $confpath\n";
-#debug "Conffile: $conf\n";
-#debug "Backups: $bakpath\n";
-
-
-foreach (@ARGV) {
-    if (/define=(\w+)/i) {
-	$opendef="<IfDefine $1>\n";
-	$closedef="</IfDefine>\n";
-	debug "##define=$1##\n";
-    }
-    if (/addconf=(\S+)/i) {
-	$addconf=$1;
-    }
-}
-
-
-$_=`date +%Y%m%d-%T`;chop;s/:/./g;$dat=$_;
-$bak="$conf-$dat";
-debug "$bak\n";
-
-
-open(BAK,">$bakpath/$bak") or die "Can't create $bakpath/$bak\n";
-open(CONFF,"$confpath/$conf") or die "Can't open $confpath/$conf\n";
-
-while (<CONFF>) {
-    print BAK $_;
-    if (($opendef) && (/^$opendef/i)) { 
-	debug "$opendef";
-	$beginsection=$.;
-	$mysection=1;
-    }
-    if (/^#*LoadModule\s+$name_mod\s+.*$modso/i) {
-	$delline{$.}=1;
-	debug "Deleting Loadmodule at line $.\n";
-    }
-    if (/^#*AddModule\s+$modc/i) {
-	$delline{$.}=1;
-	debug "Deleting Addmodule at line $.\n";
-    }
-    if (($addconf) &&(/^#*Include\s+$addconf/i)) {
-	$delline{$.}=1;
-	debug "Deleting Include at line $.";
-    }
-    if (($closedef) && (/^$closedef/) && ($mysection > 0)) {
-	debug "$closedef";
-        if ((($.-$beginsection) == 2) && ($delline{$.-1}==1)) {
-	    debug "Removing entire section\n";
-	    $delline{$beginsection}=$delline{$.}=1;
-        }
-	if (($.-$beginsection) ==1) {
-	   debug "Empty section! Removing.\n";
-	   $delline{$beginsection}=$delline{$.}=1;
-        }
-	if (($.-$beginsection) >2) {
-	   debug "Section contain more than one directive...\n";
-	   debug "Leaving it alone.\n";
-        }
-	$mysection=0;
-    }
-}
-
-close(CONFF);
-close(BAK);
-
-debug "-----\n";
-foreach (sort keys %delline) {
-    debug "Delete line $_=";
-    debug $delline{$_};
-    debug "\n";
-}
-debug "-----\n";
-
-open(BAK,"$bakpath/$bak") or die "Can't open $bakpath/$bak\n";
-open(CONFF,">$confpath/$conf") or die "Can't create $confpath/$conf\n";
-
-while (<BAK>) {
-    if ($delline{$.}!=1) {
-    print CONFF $_;
-    }
-}
-
-close(CONFF);
-close(BAK);
diff --git a/net-www/apache/files/apachelogserverstatus b/net-www/apache/files/apachelogserverstatus
deleted file mode 100644
index aba57d9a9d80..000000000000
--- a/net-www/apache/files/apachelogserverstatus
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/usr/bin/perl
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/files/apachelogserverstatus,v 1.3 2004/07/18 04:20:47 dragonheart Exp $
-
-## ====================================================================
-## The Apache Software License, Version 1.1
-##
-## Copyright (c) 2000 The Apache Software Foundation.  All rights
-## reserved.
-##
-## Redistribution and use in source and binary forms, with or without
-## modification, are permitted provided that the following conditions
-## are met:
-##
-## 1. Redistributions of source code must retain the above copyright
-##    notice, this list of conditions and the following disclaimer.
-##
-## 2. Redistributions in binary form must reproduce the above copyright
-##    notice, this list of conditions and the following disclaimer in
-##    the documentation and/or other materials provided with the
-##    distribution.
-##
-## 3. The end-user documentation included with the redistribution,
-##    if any, must include the following acknowledgment:
-##       "This product includes software developed by the
-##        Apache Software Foundation (http://www.apache.org/)."
-##    Alternately, this acknowledgment may appear in the software itself,
-##    if and wherever such third-party acknowledgments normally appear.
-##
-## 4. The names "Apache" and "Apache Software Foundation" must
-##    not be used to endorse or promote products derived from this
-##    software without prior written permission. For written
-##    permission, please contact apache@apache.org.
-##
-## 5. Products derived from this software may not be called "Apache",
-##    nor may "Apache" appear in their name, without prior written
-##    permission of the Apache Software Foundation.
-##
-## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-## OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-## DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
-## ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-## SUCH DAMAGE.
-## ====================================================================
-##
-## This software consists of voluntary contributions made by many
-## individuals on behalf of the Apache Software Foundation.  For more
-## information on the Apache Software Foundation, please see
-## <http://www.apache.org/>.
-##
-## Portions of this software are based upon public domain software
-## originally written at the National Center for Supercomputing Applications,
-## University of Illinois, Urbana-Champaign.
-##
-
-
-# Log Server Status
-# Mark J Cox, UK Web Ltd 1996, mark@ukweb.com
-#
-# This script is designed to be run at a frequent interval by something
-# like cron.  It connects to the server and downloads the status
-# information.  It reformats the information to a single line and logs
-# it to a file.  Make sure the directory $wherelog is writable by the
-# user who runs this script.
-#
-require 'sys/socket.ph';
-
-$wherelog = "/var/log/apache/status/";  # Logs will be like "/var/log/graph/19960312"
-$server = "localhost";          # Name of server, could be "www.foo.com"
-$port = "80";                   # Port on server
-$request = "/status/?auto";     # Request to send
-
-sub tcp_connect
-{
-	local($host,$port) =@_;
-        $sockaddr='S n a4 x8';
-        chop($hostname=`hostname`);
-        $port=(getservbyname($port, 'tcp'))[2]  unless $port =~ /^\d+$/;
-        $me=pack($sockaddr,&AF_INET,0,(gethostbyname($hostname))[4]);
-        $them=pack($sockaddr,&AF_INET,$port,(gethostbyname($host))[4]);
-        socket(S,&PF_INET,&SOCK_STREAM,(getprotobyname('tcp'))[2]) || 
-		die "socket: $!";
-        bind(S,$me) || return "bind: $!";
-        connect(S,$them) || return "connect: $!";
-        select(S); 
-	$| = 1; 
-	select(stdout);
-	return "";
-}
-
-### Main
-
-{
-        $year=`date +%y`;
-	chomp($year);
-	$year += ($year < 70) ? 2000 : 1900;
-	$date = $year . `date +%m%d:%H%M%S`;
-	chomp($date);
-	($day,$time)=split(/:/,$date);
-	$res=&tcp_connect($server,$port);
-	open(OUT,">>$wherelog$day");
-	if ($res) {
-		print OUT "$time:-1:-1:-1:-1:$res\n";
-		exit 1;
-	}
-	print S "GET $request\n";
-	while (<S>) {
-		$requests=$1 if ( m|^BusyServers:\ (\S+)|);
-		$idle=$1 if ( m|^IdleServers:\ (\S+)|);
-		$number=$1 if ( m|sses:\ (\S+)|);
-		$cpu=$1 if (m|^CPULoad:\ (\S+)|);
-	}
-	print OUT "$time:$requests:$idle:$number:$cpu\n";
-}
-
-
diff --git a/net-www/apache/files/apachesplitlogfile b/net-www/apache/files/apachesplitlogfile
deleted file mode 100644
index c6859c75b8b0..000000000000
--- a/net-www/apache/files/apachesplitlogfile
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/usr/bin/perl
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/files/apachesplitlogfile,v 1.5 2004/06/14 15:44:23 zul Exp $
-
-## ====================================================================
-## The Apache Software License, Version 1.1
-##
-## Copyright (c) 2000 The Apache Software Foundation.  All rights
-## reserved.
-##
-## Redistribution and use in source and binary forms, with or without
-## modification, are permitted provided that the following conditions
-## are met:
-##
-## 1. Redistributions of source code must retain the above copyright
-##    notice, this list of conditions and the following disclaimer.
-##
-## 2. Redistributions in binary form must reproduce the above copyright
-##    notice, this list of conditions and the following disclaimer in
-##    the documentation and/or other materials provided with the
-##    distribution.
-##
-## 3. The end-user documentation included with the redistribution,
-##    if any, must include the following acknowledgment:
-##       "This product includes software developed by the
-##        Apache Software Foundation (http://www.apache.org/)."
-##    Alternately, this acknowledgment may appear in the software itself,
-##    if and wherever such third-party acknowledgments normally appear.
-##
-## 4. The names "Apache" and "Apache Software Foundation" must
-##    not be used to endorse or promote products derived from this
-##    software without prior written permission. For written
-##    permission, please contact apache@apache.org.
-##
-## 5. Products derived from this software may not be called "Apache",
-##    nor may "Apache" appear in their name, without prior written
-##    permission of the Apache Software Foundation.
-##
-## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-## OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-## DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
-## ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-## SUCH DAMAGE.
-## ====================================================================
-##
-## This software consists of voluntary contributions made by many
-## individuals on behalf of the Apache Software Foundation.  For more
-## information on the Apache Software Foundation, please see
-## <http://www.apache.org/>.
-##
-## Portions of this software are based upon public domain software
-## originally written at the National Center for Supercomputing Applications,
-## University of Illinois, Urbana-Champaign.
-##
-##
-
-## Heavily modified by Jean-Michel Dault <jmdault@mandrakesoft.com>
-## for use with in the Avanced Extranet Server.
-## This script can now be used with the CustomLogs directive, with a pipe.
-## When in combination with SetEnv VLOG <path>, it will write the log file
-## in the right place. Also, it splits the log automatically with a year
-## and month prefix. Finally, we open and re-close the logfile for every
-## log entry. It is slower, but it permits us to check for symlinks, and
-## flush the buffers so everything is realtime and we don't lose any entry.
-
-#
-# This script will take a combined Web server access
-# log file and break its contents into separate files.
-# It assumes that the first field of each line is the
-# virtual host identity (put there by "%v"), and that
-# the logfiles should be named that+".log" in the current
-# directory.
-#
-# The combined log file is read from stdin. Records read
-# will be appended to any existing log files.
-#
-
-use POSIX qw(strftime);
-
-while (<STDIN>) {
-    #
-    # Get the first token from the log record; it's the
-    # identity of the virtual host to which the record
-    # applies.
-    #
-    ($vhost) = split /\s/;
-    #
-    # Normalize the virtual host name to all lowercase.
-    # If it's blank, the request was handled by the default
-    # server, so supply a default name.  This shouldn't
-    # happen, but caution rocks.
-    #
-    $vhost = lc ($vhost) or "access";
-    #
-
-    s/VLOG=(.*)[\/]*$//;
-    $logs=$1;
-    if($logs eq "") {$logs="/var/log/apache";}
-    #$date=`date +%Y-%m`;
-    #chop $date;
-    #$filename="$logs/VLOG-$date-${vhost}.log";
-    $date=strftime("%Y-%m", localtime());
-    $filename="${logs}/VLOG-${date}-${vhost}.log";
-    if (-l $filename) { 
-	die "File $filename is a symlink, writing too dangerous, dying!\n";
-    }
-    open LOGFILE, ">>$filename"
-            or die ("Can't open $filename");
-    #
-    # Strip off the first token (which may be null in the
-    # case of the default server), and write the edited
-    # record to the current log file.
-    #
-    s/^\S*\s+//;
-    print LOGFILE $_;
-    close(LOGFILE);
-}
-
-exit(0);
diff --git a/net-www/apache/files/common/apr-config.layout b/net-www/apache/files/common/apr-config.layout
deleted file mode 100644
index 11e009ab05dd..000000000000
--- a/net-www/apache/files/common/apr-config.layout
+++ /dev/null
@@ -1,16 +0,0 @@
-<Layout Gentoo>
-prefix:          /usr
-exec_prefix:     /usr
-bindir:          /usr/bin
-sbindir:         /usr/sbin
-libdir:          /usr/lib
-libexecdir:      /usr/lib/apache2/modules
-mandir:          /usr/share/man
-sysconfdir:      /etc/apache2/conf
-datadir:         /var/www/localhost
-installbuilddir: /usr/lib/apache2/build
-includedir:      /usr/include/apache2
-localstatedir:   /var
-libsuffix:       -${APR_MAJOR_VERSION}
-</Layout>
-
diff --git a/net-www/apache/files/common/apr-util-config.layout b/net-www/apache/files/common/apr-util-config.layout
deleted file mode 100644
index 8f1f63a3fe6a..000000000000
--- a/net-www/apache/files/common/apr-util-config.layout
+++ /dev/null
@@ -1,15 +0,0 @@
-<Layout Gentoo>
-prefix:          /usr
-exec_prefix:     /usr
-bindir:          /usr/bin
-sbindir:         /usr/sbin
-libdir:          /usr/lib
-libexecdir:      /usr/lib/apache2/modules
-mandir:          /usr/share/man
-sysconfdir:      /etc/apache2/conf
-datadir:         /var/www/localhost
-installbuilddir: /usr/lib/apache2/build
-includedir:      /usr/include/apache2
-localstatedir:   /var
-libsuffix:       -${APRUTIL_MAJOR_VERSION}
-</Layout>
diff --git a/net-www/apache/files/common/config.layout b/net-www/apache/files/common/config.layout
deleted file mode 100644
index 85f44a477444..000000000000
--- a/net-www/apache/files/common/config.layout
+++ /dev/null
@@ -1,23 +0,0 @@
-<Layout Gentoo>
-prefix:          /usr
-exec_prefix:     /usr
-bindir:          /usr/bin
-sbindir:         /usr/sbin
-libdir:          /usr/lib
-libexecdir:      /usr/lib/apache2/modules
-mandir:          /usr/share/man
-infodir:         /usr/share/info
-includedir:      /usr/include/apache2
-installbuilddir: /usr/lib/apache2/build
-datadir:         /var/www/localhost
-errordir:        /var/www/localhost/error
-iconsdir:        /var/www/localhost/icons
-htdocsdir:       /var/www/localhost/htdocs
-cgidir:          /var/www/localhost/cgi-bin
-manualdir:       /usr/share/doc/version/manual
-sysconfdir:      /etc/apache2/conf
-localstatedir:   /var
-runtimedir:      /var/run
-logfiledir:      /var/log/apache2
-proxycachedir:   /var/cache/apache2
-</Layout>
diff --git a/net-www/apache/files/conf/DynamicVhosts.conf b/net-www/apache/files/conf/DynamicVhosts.conf
deleted file mode 100644
index 42c8d3d895ac..000000000000
--- a/net-www/apache/files/conf/DynamicVhosts.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/files/conf/DynamicVhosts.conf,v 1.3 2004/07/18 04:20:47 dragonheart Exp $
-
-#Simple dynamic virtual hosts
-#
-#   This extract from apache.conf implements the virtual host arrangement
-#   outlined at http://www.apache.org/docs/vhosts/mass.html, using
-#   mod_vhost_alias.
-
-# get the server name from the Host: header
-#UseCanonicalName Off
-#
-# this log format can be split per-virtual-host based on the first field
-#LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon
-#CustomLog logs/access_log vcommon
-#
-# include the server name in the filenames used to satisfy requests
-#VirtualDocumentRoot /www/hosts/%0/docs
-#VirtualScriptAlias  /www/hosts/%0/cgi-bin
-#
-#   This configuration can be changed into an IP-based virtual hosting
-#   solution by just turning UseCanonicalName Off into UseCanonicalName DNS.
-#   The server name that is inserted into the filename is then derived from
-#   the IP address of the virtual host.
-
diff --git a/net-www/apache/files/conf/Vhosts.conf b/net-www/apache/files/conf/Vhosts.conf
deleted file mode 100644
index 9298b89fe5f7..000000000000
--- a/net-www/apache/files/conf/Vhosts.conf
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/files/conf/Vhosts.conf,v 1.4 2004/07/18 04:20:47 dragonheart Exp $
-
-################# Vhosts.conf
-#This is where we store the VirtualHosts configuration. 
-#
-#Since Apache 1.3.19, we modified the setup to include some nice tricks:
-#
-#- We added the User and Group directives so VirtualHosts now work with
-#  suexec directive. If set, Apache will run all cgi scripts under that
-#  user and group (provided the uid and gid are > 1000 for security). The
-#  directories and cgi files *must* belong to that user/group for the
-#  feature to work
-#- We added the Setenv VLOG directive. This works in conjunction with
-#  the CustomLog in common.conf. When Setenv VLOG is set, apache will
-#  create a /var/log/httpd/VLOG-YYYY-MM-<ServerName>.log instead of logging
-#  to access_log. Use this instead of defining a special logfile for
-#  each vhost, otherwise you eat up file descriptors.
-#- You can also specify a path for the VLOG for each Vhost, for example,
-#  to place the logs in each user's directory. However, if you want to
-#  use the file for accounting, place it in a directory owned by root,
-#  otherwise the user will be able to erase it.
-#- I suggest only including the ErrorLog *only* if the vhost will use
-#  cgi scripts. Again, it saves file descriptors!
-
-#This is needed for Frontpage support
-Port 80
-ServerRoot /etc/apache
-ResourceConfig /dev/null
-AccessConfig /dev/null
-
-################# IP-based Virtual Hosts 
-#<VirtualHost 192.168.2.100>
-#User jmdault
-#Group jmdault
-#DocumentRoot /home/jmdault/public_html
-#ServerName test2.com
-#Setenv VLOG /home/jmdault/logs
-#ErrorLog /home/jmdault/test2-error_log
-#RewriteEngine On
-#RewriteOptions inherit
-#</VirtualHost>
-
-################# Named VirtualHosts
-#NameVirtualHost 111.222.33.44
-#<VirtualHost 111.222.33.44>
-#ServerName www.domain.tld
-#ServerPath /domain
-#DocumentRoot /web/domain
-#</VirtualHost>
-
diff --git a/net-www/apache/files/conf/VirtualHomePages.conf b/net-www/apache/files/conf/VirtualHomePages.conf
deleted file mode 100644
index 5e889c74ef2d..000000000000
--- a/net-www/apache/files/conf/VirtualHomePages.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/files/conf/VirtualHomePages.conf,v 1.3 2004/07/18 04:20:47 dragonheart Exp $
-
-#A virtually hosted homepages system
-#
-#   This is an adjustment of the above system tailored for an ISP's
-#   homepages server. Using a slightly more complicated configuration we can
-#   select substrings of the server name to use in the filename so that e.g.
-#   the documents for www.user.isp.com are found in /home/user/. It uses a
-#   single cgi-bin directory instead of one per virtual host.
-
-# get the server name from the Host: header
-#UseCanonicalName Off
-# this log format can be split per-virtual-host based on the first field
-#LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon
-#CustomLog logs/access_log vcommon
-
-# include part of the server name in the filenames
-#VirtualDocumentRoot /www/hosts/%2/docs
-# single cgi-bin directory
-#ScriptAlias  /cgi-bin/  /www/std-cgi/
-
diff --git a/net-www/apache/files/conf/apache.conf b/net-www/apache/files/conf/apache.conf
deleted file mode 100644
index 6fe16d7f466d..000000000000
--- a/net-www/apache/files/conf/apache.conf
+++ /dev/null
@@ -1,229 +0,0 @@
-### /etc/apache/conf/apache.conf
-### $Id: apache.conf,v 1.4 2004/04/04 17:59:30 zul Exp $
-###
-### Main Configuration Section
-### You really shouldn't change these settings unless you're a guru
-###
-ServerType standalone
-ServerRoot /etc/apache
-#ServerName localhost
-#LockFile /etc/httpd/httpd.lock
-PidFile /var/run/apache.pid
-ScoreBoardFile /etc/apache/apache.scoreboard
-ErrorLog logs/error_log
-LogLevel warn
-ResourceConfig /dev/null
-AccessConfig /dev/null
-DocumentRoot /var/www/localhost/htdocs
-
-
-### Dynamic Shared Object (DSO) Support
-### 
-###
-LoadModule mmap_static_module modules/mod_mmap_static.so
-LoadModule env_module         modules/mod_env.so
-LoadModule config_log_module  modules/mod_log_config.so
-LoadModule agent_log_module   modules/mod_log_agent.so
-LoadModule referer_log_module modules/mod_log_referer.so
-LoadModule mime_magic_module  modules/mod_mime_magic.so
-LoadModule mime_module        modules/mod_mime.so
-LoadModule negotiation_module modules/mod_negotiation.so
-LoadModule status_module      modules/mod_status.so
-LoadModule info_module        modules/mod_info.so
-LoadModule includes_module    modules/mod_include.so
-LoadModule autoindex_module   modules/mod_autoindex.so
-LoadModule dir_module         modules/mod_dir.so
-LoadModule cgi_module         modules/mod_cgi.so
-LoadModule asis_module        modules/mod_asis.so
-LoadModule imap_module        modules/mod_imap.so
-LoadModule action_module      modules/mod_actions.so
-LoadModule speling_module     modules/mod_speling.so
-LoadModule userdir_module     modules/mod_userdir.so
-LoadModule proxy_module       modules/libproxy.so
-LoadModule alias_module       modules/mod_alias.so
-LoadModule rewrite_module     modules/mod_rewrite.so
-LoadModule access_module      modules/mod_access.so
-LoadModule auth_module        modules/mod_auth.so
-LoadModule anon_auth_module   modules/mod_auth_anon.so
-LoadModule dbm_auth_module    modules/mod_auth_dbm.so
-LoadModule db_auth_module     modules/mod_auth_db.so
-LoadModule digest_module      modules/mod_digest.so
-LoadModule cern_meta_module   modules/mod_cern_meta.so
-LoadModule expires_module     modules/mod_expires.so
-LoadModule headers_module     modules/mod_headers.so
-LoadModule usertrack_module   modules/mod_usertrack.so
-LoadModule example_module     modules/mod_example.so
-LoadModule unique_id_module   modules/mod_unique_id.so
-LoadModule setenvif_module    modules/mod_setenvif.so
-LoadModule vhost_alias_module	modules/mod_vhost_alias.so
-
-#  Reconstruction of the complete module list from all available modules
-#  (static and shared ones) to achieve correct module execution order.
-#  [WHENEVER YOU CHANGE THE LOADMODULE SECTION ABOVE UPDATE THIS, TOO]
-ClearModuleList
-AddModule mod_mmap_static.c
-AddModule mod_env.c
-AddModule mod_log_config.c
-AddModule mod_log_agent.c
-AddModule mod_log_referer.c
-AddModule mod_mime_magic.c
-AddModule mod_mime.c
-AddModule mod_negotiation.c
-AddModule mod_status.c
-AddModule mod_info.c
-AddModule mod_include.c
-AddModule mod_autoindex.c
-AddModule mod_dir.c
-AddModule mod_cgi.c
-AddModule mod_asis.c
-AddModule mod_imap.c
-AddModule mod_actions.c
-AddModule mod_speling.c
-AddModule mod_userdir.c
-AddModule mod_proxy.c
-AddModule mod_alias.c
-AddModule mod_rewrite.c
-AddModule mod_access.c
-AddModule mod_auth.c
-AddModule mod_auth_anon.c
-AddModule mod_auth_dbm.c
-AddModule mod_auth_db.c
-AddModule mod_digest.c
-AddModule mod_cern_meta.c
-AddModule mod_expires.c
-AddModule mod_headers.c
-AddModule mod_usertrack.c
-AddModule mod_example.c
-AddModule mod_unique_id.c
-AddModule mod_so.c
-AddModule mod_setenvif.c
-AddModule mod_vhost_alias.c
-
-###
-### Global Configuration
-###
-# Splitting up apache.conf into two files makes it possible to support
-# multiple configurations on the same serer.  In commonapache.conf
-# you keep directives that apply to all implementations and in this
-# file you keep server-specific directives.  While we don't yet have
-# multiple configurations out-of-the-box, this allows us to do that
-# in the future easily.
-Include conf/commonapache.conf
-
-
-###
-### IP Address/Port
-###
-#BindAddress *
-Port 80
-Listen 80
-
-
-###
-### Log configuration Section
-###
-# Single logfile with access, agent and referer information
-# This is the default, if vlogs are not defined for the main server
-CustomLog logs/access_log combined env=!VLOG
-# If VLOG is defined in conf/vhosts/Vhosts.conf, we use this entry
-#CustomLog "|/usr/sbin/apachesplitlogfile" vhost env=VLOG
-
-
-###
-### Virtual Hosts 
-###
-# We include different templates for Virtual Hosting. Have a look in the 
-# vhosts directory and modify to suit your needs.
-#Include conf/vhosts/Vhosts.conf
-#Include conf/vhosts/DynamicVhosts.conf
-#Include conf/vhosts/VirtualHomePages.conf
-
-
-###
-### Performance settings Section
-###
-#
-# Timeout: The number of seconds before receives and sends time out.
-#
-Timeout 300
-
-#
-# KeepAlive: Whether or not to allow persistent connections (more than
-# one request per connection). Set to "Off" to deactivate.
-#
-KeepAlive On
-
-#
-# MaxKeepAliveRequests: The maximum number of requests to allow
-# during a persistent connection. Set to 0 to allow an unlimited amount.
-# We recommend you leave this number high, for maximum performance.
-#
-MaxKeepAliveRequests 100
-
-#
-# KeepAliveTimeout: Number of seconds to wait for the next request from the
-# same client on the same connection.
-#
-KeepAliveTimeout 15
-
-#
-# Server-pool size regulation.  Rather than making you guess how many
-# server processes you need, Apache dynamically adapts to the load it
-# sees --- that is, it tries to maintain enough server processes to
-# handle the current load, plus a few spare servers to handle transient
-# load spikes (e.g., multiple simultaneous requests from a single
-# Netscape browser).
-#
-# It does this by periodically checking how many servers are waiting
-# for a request.  If there are fewer than MinSpareServers, it creates
-# a new spare.  If there are more than MaxSpareServers, some of the
-# spares die off.  The default values are probably OK for most sites.
-#
-MinSpareServers 4
-MaxSpareServers 10
-
-#
-# Number of servers to start initially --- should be a reasonable ballpark
-# figure.
-#
-StartServers 4
-
-#
-# Limit on total number of servers running, i.e., limit on the number
-# of clients who can simultaneously connect --- if this limit is ever
-# reached, clients will be LOCKED OUT, so it should NOT BE SET TOO LOW.
-# It is intended mainly as a brake to keep a runaway server from taking
-# the system with it as it spirals down...
-#
-MaxClients 150
-
-#
-# MaxRequestsPerChild: the number of requests each child process is
-# allowed to process before the child dies.  The child will exit so
-# as to avoid problems after prolonged use when Apache (and maybe the
-# libraries it uses) leak memory or other resources.  On most systems, this
-# isn't really needed, but a few (such as Solaris) do have notable leaks
-# in the libraries. For these platforms, set to something like 10000
-# or so; a setting of 0 means unlimited.
-#
-# NOTE: This value does not include keepalive requests after the initial
-#       request per connection. For example, if a child process handles
-#       an initial request and 10 subsequent "keptalive" requests, it
-#       would only count as 1 request towards this limit.
-#
-MaxRequestsPerChild 500
-
-# LimitRequestBody: This directvie specifies the number of bytes from 0 
-# (meaning unlimited) to 2147483647 (2B) that are allows in a request body.
-# The LimitRequestBody directive allows the user to set a limit on allowed
-# size of an HTTP request message body within the context in which the
-# directive is given ( server, per-directory, per-file, or per-location).
-# If the client requests exceeds that limit, the server will return an 
-# error response insteam of servicing the request. The size of a normal
-# request message body will vary greatly depending on the nature of the resource# and the methods aloowed on the resource. 
-#
-# NOTE: If, for example, you are permitting file uploads to a particular
-# location, and wich to limit the size of the upload to 100K, you might use the
-# following directive: LimitRequestBody 102400
-# Default: 524288
-#LimitRequestBody 524288
diff --git a/net-www/apache/files/conf/commonapache.conf b/net-www/apache/files/conf/commonapache.conf
deleted file mode 100644
index c42cf6c80bae..000000000000
--- a/net-www/apache/files/conf/commonapache.conf
+++ /dev/null
@@ -1,727 +0,0 @@
-### /etc/apache/conf/commonapache.conf
-### $Id: commonapache.conf,v 1.7 2004/06/03 16:25:52 zul Exp $
-###
-### Common server configuration.
-###
-User apache
-Group apache
-
-#
-# ServerAdmin: Your address, where problems with the server should be
-# e-mailed.  This address appears on some server-generated pages, such
-# as error documents.
-#
-ServerAdmin root@localhost
-
-# DocumentRoot: The directory out of which you will serve your
-# documents. By default, all requests are taken from this directory, but
-# symbolic links and aliases may be used to point to other locations.
-# DO NOT MODIFY THIS ONE, USE apache.conf.
-#DocumentRoot /home/httpd/htdocs
-
-
-#
-# Each directory to which Apache has access, can be configured with respect
-# to which services and features are allowed and/or disabled in that
-# directory (and its subdirectories). 
-#
-# First, we configure the "default" to be a very restrictive set of 
-# permissions.  
-#
-# Also, for security, we disable indexes globally
-#
-#<Directory />
-#    Options -Indexes FollowSymLinks
-#    AllowOverride None
-#</Directory>
-
-#Restricted set of options 
-<Directory />
-  Options -All -Multiviews
-  AllowOverride None
-  Order deny,allow
-  Deny from all
-</Directory>
-
-
-#
-# Note that from this point forward you must specifically allow
-# particular features to be enabled - so if something's not working as
-# you might expect, make sure that you have specifically enabled it
-# below.
-#
-
-
-#
-# UserDir: The name of the directory which is appended onto a user's home
-# directory if a ~user request is received.
-#
-<IfModule mod_userdir.c>
-    UserDir public_html
-</IfModule>
-
-    
-#
-# DirectoryIndex: Name of the file or files to use as a pre-written HTML
-# directory index.  Separate multiple entries with spaces.
-#
-<IfModule mod_dir.c>
-    DirectoryIndex index.html index.php index.php3 index.shtml index.cgi index.pl index.htm Default.htm default.htm
-</IfModule>
-
-#
-# AccessFileName: The name of the file to look for in each directory
-# for access control information.
-#
-AccessFileName .htaccess
-
-#
-# The following lines prevent .htaccess files from being viewed by
-# Web clients.  Since .htaccess files often contain authorization
-# information, access is disallowed for security reasons.  Comment
-# these lines out if you want Web visitors to see the contents of
-# .htaccess files.  If you change the AccessFileName directive above,
-# be sure to make the corresponding changes here.
-#
-# Also, folks tend to use names such as .htpasswd for password
-# files, so this will protect those as well.
-#
-<Files ~ "^\.ht">
-    Order allow,deny
-    Deny from all
-</Files>
-
-#
-# CacheNegotiatedDocs: By default, Apache sends "Pragma: no-cache" with each
-# document that was negotiated on the basis of content. This asks proxy
-# servers not to cache the document. Uncommenting the following line disables
-# this behavior, and proxies will be allowed to cache the documents.
-#
-#CacheNegotiatedDocs
-
-#
-# UseCanonicalName:  (new for 1.3)  With this setting turned on, whenever
-# Apache needs to construct a self-referencing URL (a URL that refers back
-# to the server the response is coming from) it will use ServerName and
-# Port to form a "canonical" name.  With this setting off, Apache will
-# use the hostname:port that the client supplied, when possible.  This
-# also affects SERVER_NAME and SERVER_PORT in CGI scripts.
-#
-UseCanonicalName On
-
-#
-# TypesConfig describes where the mime.types file (or equivalent) is
-# to be found.
-#
-<IfModule mod_mime.c>
-    TypesConfig conf/mime.types
-</IfModule>
-
-#
-# DefaultType is the default MIME type the server will use for a document
-# if it cannot otherwise determine one, such as from filename extensions.
-# If your server contains mostly text or HTML documents, "text/plain" is
-# a good value.  If most of your content is binary, such as applications
-# or images, you may want to use "application/octet-stream" instead to
-# keep browsers from trying to display binary files as though they are
-# text.
-#
-DefaultType text/plain
-
-#
-# The mod_mime_magic module allows the server to use various hints from the
-# contents of the file itself to determine its type.  The MIMEMagicFile
-# directive tells the module where the hint definitions are located.
-# mod_mime_magic is not part of the default server (you have to add
-# it yourself with a LoadModule [see the DSO paragraph in the 'Global
-# Environment' section], or recompile the server and include mod_mime_magic
-# as part of the configuration), so it's enclosed in an <IfModule> container.
-# This means that the MIMEMagicFile directive will only be processed if the
-# module is part of the server.
-#
-<IfModule mod_mime_magic.c>
-    MIMEMagicFile conf/magic
-</IfModule>
-
-#
-# HostnameLookups: Log the names of clients or just their IP addresses
-# e.g., www.apache.org (on) or 204.62.129.132 (off).
-# The default is off because it'd be overall better for the net if people
-# had to knowingly turn this feature on, since enabling it means that
-# each client request will result in AT LEAST one lookup request to the
-# nameserver.
-#
-HostnameLookups Off
-
-# The following directives define some format nicknames for use with
-# a CustomLog directive (see below).
-#
-LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
-LogFormat "%h %l %u %t \"%r\" %>s %b" common
-LogFormat "%{Referer}i -> %U" referer
-LogFormat "%{User-agent}i" agent
-LogFormat "%v %h %l %u %t \"%r\" %>s %b %T" script
-LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" VLOG=%{VLOG}e" vhost
-
-#
-# The location and format of the access logfile (Common Logfile Format).
-#CustomLog logs/access_log common
-
-#
-# If you would like to have agent and referer logfiles, uncomment the
-# following directives.
-#
-#CustomLog logs/referer_log referer
-#CustomLog logs/agent_log agent
-
-#
-# If you prefer a single logfile with access, agent, and referer information
-# (Combined Logfile Format) you can use the following directive.
-#
-#CustomLog logs/access_log combined
-
-#
-# Optionally add a line containing the server version and virtual host
-# name to server-generated pages (error documents, FTP directory listings,
-# mod_status and mod_info output etc., but not CGI generated documents).
-# Set to "EMail" to also include a mailto: link to the ServerAdmin.
-# Set to one of:  On | Off | EMail
-#
-ServerSignature On
-
-#
-# Aliases: Add here as many aliases as you need (with no limit). The format is 
-# Alias fakename realname
-#
-<IfModule mod_alias.c>
-
-    #
-    # Note that if you include a trailing / on fakename then the server will
-    # require it to be present in the URL.  So "/icons" isn't aliased in this
-    # example, only "/icons/"..
-    #
-    Alias /icons/ /var/www/localhost/icons/
-    Alias /doc /usr/share/doc
-
-
-    #
-    # ScriptAlias: This controls which directories contain server scripts.
-    # ScriptAliases are essentially the same as Aliases, except that
-    # documents in the realname directory are treated as applications and
-    # run by the server when requested rather than as documents sent to the client.
-    # The same rules about trailing "/" apply to ScriptAlias directives as to
-    # Alias.
-    #
-    ScriptAlias /cgi-bin/ /var/www/localhost/cgi-bin/
-
-</IfModule>
-# End of aliases.
-
-#
-# Redirect allows you to tell clients about documents which used to exist in
-# your server's namespace, but do not anymore. This allows you to tell the
-# clients where to look for the relocated document.
-# Format: Redirect old-URI new-URL
-#
-
-#
-# Directives controlling the display of server-generated directory listings.
-#
-<IfModule mod_autoindex.c>
-
-    #
-    # FancyIndexing is whether you want fancy directory indexing or standard
-    #
-    IndexOptions FancyIndexing
-
-    #
-    # AddIcon* directives tell the server which icon to show for different
-    # files or filename extensions.  These are only displayed for
-    # FancyIndexed directories.
-    #
-    AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip
-
-    AddIconByType (TXT,/icons/text.gif) text/*
-    AddIconByType (IMG,/icons/image2.gif) image/*
-    AddIconByType (SND,/icons/sound2.gif) audio/*
-    AddIconByType (VID,/icons/movie.gif) video/*
-
-    AddIcon /icons/binary.gif .bin .exe
-    AddIcon /icons/binhex.gif .hqx
-    AddIcon /icons/tar.gif .tar
-    AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv
-    AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip .bz2
-    AddIcon /icons/a.gif .ps .ai .eps
-    AddIcon /icons/layout.gif .html .shtml .htm .pdf
-    AddIcon /icons/text.gif .txt
-    AddIcon /icons/c.gif .c
-    AddIcon /icons/p.gif .pl .py .php .php3
-    AddIcon /icons/f.gif .for
-    AddIcon /icons/dvi.gif .dvi
-    AddIcon /icons/uuencoded.gif .uu
-    AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl
-    AddIcon /icons/tex.gif .tex
-    AddIcon /icons/bomb.gif core
-
-    AddIcon /icons/back.gif ..
-    AddIcon /icons/hand.right.gif README
-    AddIcon /icons/folder.gif ^^DIRECTORY^^
-    AddIcon /icons/blank.gif ^^BLANKICON^^
-
-    #
-    # DefaultIcon is which icon to show for files which do not have an icon
-    # explicitly set.
-    #
-    DefaultIcon /icons/unknown.gif
-
-    #
-    # AddDescription allows you to place a short description after a file in
-    # server-generated indexes.  These are only displayed for FancyIndexed
-    # directories.
-    # Format: AddDescription "description" filename
-    #
-    #AddDescription "GZIP compressed document" .gz
-    #AddDescription "tar archive" .tar
-    #AddDescription "GZIP compressed tar archive" .tgz
-
-    #
-    # ReadmeName is the name of the README file the server will look for by
-    # default, and append to directory listings.
-    #
-    # HeaderName is the name of a file which should be prepended to
-    # directory indexes. 
-    #
-    # If MultiViews are amongst the Options in effect, the server will
-    # first look for name.html and include it if found.  If name.html
-    # doesn't exist, the server will then look for name.txt and include
-    # it as plaintext if found.
-    #
-    ReadmeName README
-    HeaderName HEADER
-
-    #
-    # IndexIgnore is a set of filenames which directory indexing should ignore
-    # and not include in the listing.  Shell-style wildcarding is permitted.
-    #
-    IndexIgnore .??* *~ *# HEADER* RCS CVS *,v *,t
-
-</IfModule>
-# End of indexing directives.
-
-#
-# Document types.
-#
-<IfModule mod_mime.c>
-
-    #
-    # AddEncoding allows you to have certain browsers (Mosaic/X 2.1+) uncompress
-    # information on the fly. Note: Not all browsers support this.
-    # Despite the name similarity, the following Add* directives have nothing
-    # to do with the FancyIndexing customization directives above.
-    #
-    AddEncoding x-compress Z
-    AddEncoding x-gzip gz tgz
-
-    #
-    # AddLanguage allows you to specify the language of a document. You can
-    # then use content negotiation to give a browser a file in a language
-    # it can understand.  
-    #
-    # Note 1: The suffix does not have to be the same as the language 
-    # keyword --- those with documents in Polish (whose net-standard 
-    # language code is pl) may wish to use "AddLanguage pl .po" to 
-    # avoid the ambiguity with the common suffix for perl scripts.
-    #
-    # Note 2: The example entries below illustrate that in quite
-    # some cases the two character 'Language' abbreviation is not
-    # identical to the two character 'Country' code for its country,
-    # E.g. 'Danmark/dk' versus 'Danish/da'.
-    #
-    # Note 3: In the case of 'ltz' we violate the RFC by using a three char 
-    # specifier. But there is 'work in progress' to fix this and get 
-    # the reference data for rfc1766 cleaned up.
-    #
-    # Danish (da) - Dutch (nl) - English (en) - Estonian (ee)
-    # French (fr) - German (de) - Greek-Modern (el)
-    # Italian (it) - Korean (kr) - Norwegian (no)
-    # Portugese (pt) - Luxembourgeois* (ltz)
-    # Spanish (es) - Swedish (sv) - Catalan (ca) - Czech(cz)
-    # Polish (pl) - Brazilian Portuguese (pt-br) - Japanese (ja)
-    # Russian (ru)
-    #
-    AddLanguage da .dk
-    AddLanguage nl .nl
-    AddLanguage en .en
-    AddLanguage et .ee
-    AddLanguage fr .fr
-    AddLanguage de .de
-    AddLanguage el .el
-    AddLanguage he .he
-    AddCharset ISO-8859-8 .iso8859-8
-    AddLanguage it .it
-    AddLanguage ja .ja
-    AddCharset ISO-2022-JP .jis
-    AddLanguage kr .kr
-    AddCharset ISO-2022-KR .iso-kr
-    AddLanguage no .no
-    AddLanguage pl .po
-    AddCharset ISO-8859-2 .iso-pl
-    AddLanguage pt .pt
-    AddLanguage pt-br .pt-br
-    AddLanguage ltz .lu
-    AddLanguage ca .ca
-    AddLanguage es .es
-    AddLanguage sv .se
-    AddLanguage cz .cz
-    AddLanguage ru .ru
-    AddLanguage zh-tw .tw
-    AddLanguage tw .tw
-    AddCharset Big5         .Big5    .big5
-    AddCharset WINDOWS-1251 .cp-1251
-    AddCharset CP866        .cp866
-    AddCharset ISO-8859-5   .iso-ru
-    AddCharset KOI8-R       .koi8-r
-    AddCharset UCS-2        .ucs2
-    AddCharset UCS-4        .ucs4
-    AddCharset UTF-8        .utf8
-
-    # LanguagePriority allows you to give precedence to some languages
-    # in case of a tie during content negotiation.
-    #
-    # Just list the languages in decreasing order of preference. We have
-    # more or less alphabetized them here. You probably want to change this.
-    #
-    <IfModule mod_negotiation.c>
-        LanguagePriority en fr de es it da nl et el ja kr no pl pt pt-br ru ltz ca sv tw
-    </IfModule>
-
-    AddType application/x-tar .tgz
-
-    #
-    # AddHandler allows you to map certain file extensions to "handlers",
-    # actions unrelated to filetype. These can be either built into the server
-    # or added with the Action command (see below)
-    #
-    # If you want to use server side includes, or CGI outside
-    # ScriptAliased directories, uncomment the following lines.
-    #
-    # To use CGI scripts:
-    #
-    AddHandler cgi-script .cgi
-
-    #
-    # To use server-parsed HTML files
-    #
-    AddType text/html .shtml
-    AddHandler server-parsed .shtml
-
-    #
-    # Uncomment the following line to enable Apache's send-asis HTTP file
-    # feature
-    #
-    #AddHandler send-as-is asis
-
-    #
-    # If you wish to use server-parsed imagemap files, use
-    #
-    AddHandler imap-file map
-
-    #
-    # To enable type maps, you might want to use
-    #
-    #AddHandler type-map var
-
-</IfModule>
-# End of document types.
-
-#
-# Action lets you define media types that will execute a script whenever
-# a matching file is called. This eliminates the need for repeated URL
-# pathnames for oft-used CGI file processors.
-# Format: Action media/type /cgi-script/location
-# Format: Action handler-name /cgi-script/location
-#
-
-#
-# MetaDir: specifies the name of the directory in which Apache can find
-# meta information files. These files contain additional HTTP headers
-# to include when sending the document
-#
-#MetaDir .web
-
-#
-# MetaSuffix: specifies the file name suffix for the file containing the
-# meta information.
-#
-#MetaSuffix .meta
-
-#
-# Customizable error response (Apache style)
-#  these come in three flavors
-#
-#    1) plain text
-#ErrorDocument 500 "The server made a boo boo.
-#  n.b.  the single leading (") marks it as text, it does not get output
-#
-#    2) local redirects
-#ErrorDocument 404 /missing.html
-#  to redirect to local URL /missing.html
-#ErrorDocument 404 /cgi-bin/missing_handler.pl
-#  N.B.: You can redirect to a script or a document using server-side-includes.
-#
-#    3) external redirects
-#ErrorDocument 402 http://some.other_server.com/subscription_info.html
-#  N.B.: Many of the environment variables associated with the original
-#  request will *not* be available to such a script.
-
-<Location /manual>
-Options Multiviews
-ErrorDocument 404 "The document you requested has not been installed on your system."
-</Location>
-
-
-#
-# Customize behaviour based on the browser
-#
-<IfModule mod_setenvif.c>
-
-    #
-    # The following directives modify normal HTTP response behavior.
-    # The first directive disables keepalive for Netscape 2.x and browsers that
-    # spoof it. There are known problems with these browser implementations.
-    # The second directive is for Microsoft Internet Explorer 4.0b2
-    # which has a broken HTTP/1.1 implementation and does not properly
-    # support keepalive when it is used on 301 or 302 (redirect) responses.
-    #
-    BrowserMatch "Mozilla/2" nokeepalive
-    BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0
-
-    #
-    # The following directive disables HTTP/1.1 responses to browsers which
-    # are in violation of the HTTP/1.0 spec by not being able to grok a
-    # basic 1.1 response.
-    #
-    BrowserMatch "RealPlayer 4\.0" force-response-1.0
-    BrowserMatch "Java/1\.0" force-response-1.0
-    BrowserMatch "JDK/1\.0" force-response-1.0
-
-</IfModule>
-# End of browser customization directives
-
-#
-# Allow server status reports, with the URL of http://servername/server-status
-# Change the ".your_domain.com" to match your domain to enable.
-#
-<IfModule mod_status.c>
-    <Location /server-status>
-        SetHandler server-status
-        Order deny,allow
-        Deny from all
-        allow from 127.0.0.1
-        #Allow from .your_domain.com
-    </Location>
-#
-# ExtendedStatus controls whether Apache will generate "full" status
-# information (ExtendedStatus On) or just basic information (ExtendedStatus
-# Off) when the "server-status" handler is called. The default is Off.
-#
-#ExtendedStatus On
-</IfModule>
-
-#
-# Allow remote server configuration reports, with the URL of
-# http://servername/server-info (requires that mod_info.c be loaded).
-# Change the ".your_domain.com" to match your domain to enable.
-#
-<IfModule mod_info.c>
-    <Location /server-info>
-	SetHandler server-info
-	Order deny,allow
-	Deny from all
-	Allow from 127.0.0.1
-	#Allow from .your_domain.com
-    </Location>
-</IfModule>
-
-<IfModule mod_perl.c>
-    <Location /perl-status>
-	SetHandler perl-script
-	PerlHandler Apache::Status
-	Order deny,allow
-	Deny from all
-	Allow from 127.0.0.1
-	#Allow from .your_domain.com
-    </Location>
-</IfModule>
-
-#
-# There have been reports of people trying to abuse an old bug from pre-1.1
-# days.  This bug involved a CGI script distributed as a part of Apache.
-# By uncommenting these lines you can redirect these attacks to a logging 
-# script on phf.apache.org.  Or, you can record them yourself, using the script
-# support/phf_abuse_log.cgi.
-#
-#<Location /cgi-bin/phf*>
-#    Deny from all
-#    ErrorDocument 403 http://phf.apache.org/phf_abuse_log.cgi
-#</Location>
-
-#
-# Proxy Server directives. Uncomment the following lines to
-# enable the proxy server:
-#
-#<IfModule mod_proxy.c>
-#    ProxyRequests On
-
-#    <Directory proxy:*>
-#        Order deny,allow
-#        Deny from all
-#        Allow from .your_domain.com
-#    </Directory>
-
-    #
-    # Enable/disable the handling of HTTP/1.1 "Via:" headers.
-    # ("Full" adds the server version; "Block" removes all outgoing Via: headers)
-    # Set to one of: Off | On | Full | Block
-    #
-#    ProxyVia On
-
-    #
-    # To enable the cache as well, edit and uncomment the following lines:
-    # (no cacheing without CacheRoot)
-    #
-#    CacheRoot /var/cache/apache
-#    CacheSize 5
-#    CacheGcInterval 4
-#    CacheMaxExpire 24
-#    CacheLastModifiedFactor 0.1
-#    CacheDefaultExpire 1
-#    NoCache a_domain.com another_domain.edu joes.garage_sale.com
-
-#</IfModule>
-# End of proxy directives.
-
-<IfModule mod_dav.c>
-     DavLockDB /var/lock/mod_dav
-</IfModule>
-
-<IfModule mod_include.c>
-#    XBitHack on
-</IfModule>
-
-
-#
-# This should be changed to whatever you set DocumentRoot to.
-#
-<Directory /var/www/localhost/htdocs>
-
-#
-# This may also be "None", "All", or any combination of "Indexes",
-# "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
-#
-# Note that "MultiViews" must be named *explicitly* --- "Options All"
-# doesn't give it to you.
-#
-    Options Indexes FollowSymLinks MultiViews
-
-#
-# This controls which options the .htaccess files in directories can
-# override. Can also be "All", or any combination of "Options", "FileInfo", 
-# "AuthConfig", and "Limit"
-#
-    AllowOverride All
-
-#
-# Controls who can get stuff from this server.
-#
-    Order allow,deny
-    Allow from all
-</Directory>
-
-<Directory /var/www/localhost/cgi-bin>
-    AllowOverride All
-    Options ExecCGI
-    Order allow,deny
-    Allow from all
-</Directory>
-
-#
-# Control access to UserDir directories.  The following is an example
-# for a site where these directories are restricted to read-only.
-#
-#<Directory /home/*/public_html>
-#    AllowOverride FileInfo AuthConfig Limit
-#    Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
-#    <Limit GET POST OPTIONS PROPFIND>
-#        Order allow,deny
-#        Allow from all
-#    </Limit>
-#    <LimitExcept GET POST OPTIONS PROPFIND>
-#        Order deny,allow
-#        Deny from all
-#    </LimitExcept>
-#</Directory>
-
-# These settings are pretty flexible, and allow for Frontpage and XSSI
-<Directory /home/*/public_html>
-    AllowOverride All
-    Options MultiViews -Indexes Includes FollowSymLinks
-    Order allow,deny
-    Allow from all
-</Directory>
-
-<Directory /home/*/public_html/cgi-bin>
-     Options +ExecCGI -Includes -Indexes
-     SetHandler cgi-script
-</Directory>
-
-<IfModule mod_perl.c>
-    <Directory /home/*/public_html/perl>
-	SetHandler perl-script
-	PerlHandler Apache::PerlRun
-	Options -Indexes ExecCGI
-	PerlSendHeader On
-    </Directory>
-</IfModule>
-
-<Directory /var/www/localhost/icons>
-    Options -Indexes MultiViews
-    AllowOverride None
-    Order allow,deny
-    Allow from all
-</Directory>
-
-<Directory /usr/share/doc>
-    Options Indexes FollowSymLinks MultiViews
-    Order deny,allow
-    Deny from all
-    Allow from 127.0.0.1
-    #allow from .your_domain.com
-</Directory>
-
-<Location /index.shtml>
-    Options +Includes
-</Location>
-
-#<IfModule mod_perl.c>
-#    PerlModule Apache::Registry
-#    
-#    #set Apache::Registry Mode for /perl Alias
-#    <Location /perl/*.pl>
-#    or
-#    <Location ~ "^/perl/*\.pl$>
-#	SetHandler perl-script
-#	PerlHandler Apache::Registry
-#	Options -Indexes ExecCGI
-#	PerlSendHeader On
-#    </Location>
-#
-#    #set Apache::PerlRun Mode for /cgi-perl Alias
-#    <Location /cgi-perl/*.pl>
-#	SetHandler perl-script
-#	PerlHandler Apache::PerlRun
-#	Options -Indexes ExecCGI
-#	PerlSendHeader On
-#    </Location>
-#</IfModule>
-
diff --git a/net-www/apache/files/digest-apache-1.3.32-r1 b/net-www/apache/files/digest-apache-1.3.32-r1
deleted file mode 100644
index dd25591cf45b..000000000000
--- a/net-www/apache/files/digest-apache-1.3.32-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 6411d4d87cecc129f6a7bf5eb2aa4817 apache-patches-1.3.32-r1.tar.bz2 15741
-RMD160 928f1b1f881d38df138c61891fcf45d156816815 apache-patches-1.3.32-r1.tar.bz2 15741
-SHA256 4b044663778a5a1fce0e1ff38a56602ad885d36dc670bd2c7e1538cb56090449 apache-patches-1.3.32-r1.tar.bz2 15741
-MD5 45164531fb57bfa18af4b9efd0850dd3 apache_1.3.32.tar.gz 2472811
-RMD160 f81e6f0a75b00183981519092262e5352d6d56e1 apache_1.3.32.tar.gz 2472811
-SHA256 16249933a42836fdcd1bcaad1f436a599b4163626bf35936e89f5049a681a8e5 apache_1.3.32.tar.gz 2472811
-MD5 19994ade6f8c46aa6cac87bca797fe82 mod_ssl-2.8.21-1.3.32.tar.gz 754629
-RMD160 559124e89e51ebb362f2468103f4432439bf5a18 mod_ssl-2.8.21-1.3.32.tar.gz 754629
-SHA256 1717eb96e9de60a24d73e9616fb7e6bcc9d47891c6e77cb26d4bf529c4382260 mod_ssl-2.8.21-1.3.32.tar.gz 754629
diff --git a/net-www/apache/files/digest-apache-1.3.33-r13 b/net-www/apache/files/digest-apache-1.3.33-r13
deleted file mode 100644
index fe34f302db99..000000000000
--- a/net-www/apache/files/digest-apache-1.3.33-r13
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 3dfd2c3778f37a2dfc22b97417a61407 apache_1.3.33.tar.gz 2468567
-RMD160 80e9ea2c7c75f49454acfd83cead5506c5ffddea apache_1.3.33.tar.gz 2468567
-SHA256 c7327891a6dba926e97d701463f9877fa164757189d192aac8d52100bf2a2484 apache_1.3.33.tar.gz 2468567
-MD5 1e6655aef0192da5381748f449cc569c gentoo-apache-1.3.33-r13-20051204.tar.bz2 28158
-RMD160 7cbbd0b9f231723dba5762e7a3fec5d4c162ce79 gentoo-apache-1.3.33-r13-20051204.tar.bz2 28158
-SHA256 ae05455b53686b596c2250e2b67b7f9a9b5bf55c6017f369ef904654428268b3 gentoo-apache-1.3.33-r13-20051204.tar.bz2 28158
-MD5 6401015bafad4f44fdf8a9a1795d9258 lingerd-0.94.tar.gz 33938
-RMD160 2d7363b763a68c0c7acdadc23779929f4d02153f lingerd-0.94.tar.gz 33938
-SHA256 632030f9c1b9e8f817ee19bad74988f3dce7f6ec617677ad5a522e8d491382a0 lingerd-0.94.tar.gz 33938
-MD5 4f28dcf0f090a7dc2ab148e6a503e99a mod_ssl-2.8.24-1.3.33.tar.gz 820292
-RMD160 1651dcd85abd37d6955f241c730e101df482d545 mod_ssl-2.8.24-1.3.33.tar.gz 820292
-SHA256 cb5907d74a1aef6100c0bd9a50aab33332249c85ae2f3e3431fafff5494c14fa mod_ssl-2.8.24-1.3.33.tar.gz 820292
diff --git a/net-www/apache/files/digest-apache-1.3.33-r6 b/net-www/apache/files/digest-apache-1.3.33-r6
deleted file mode 100644
index 410814be1b28..000000000000
--- a/net-www/apache/files/digest-apache-1.3.33-r6
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 e27f09389d8b8b8c5a75816d98329a72 apache-patches-1.3.33-20050711.tar.bz2 14272
-RMD160 59f7a6bfa3b5756bf61c1db0ba3df5545b27e298 apache-patches-1.3.33-20050711.tar.bz2 14272
-SHA256 6cce6437c840c6400265b4905cdc18760e5b14c5ba2a0d2a92599007f8021c4a apache-patches-1.3.33-20050711.tar.bz2 14272
-MD5 3dfd2c3778f37a2dfc22b97417a61407 apache_1.3.33.tar.gz 2468567
-RMD160 80e9ea2c7c75f49454acfd83cead5506c5ffddea apache_1.3.33.tar.gz 2468567
-SHA256 c7327891a6dba926e97d701463f9877fa164757189d192aac8d52100bf2a2484 apache_1.3.33.tar.gz 2468567
-MD5 4f28dcf0f090a7dc2ab148e6a503e99a mod_ssl-2.8.24-1.3.33.tar.gz 820292
-RMD160 1651dcd85abd37d6955f241c730e101df482d545 mod_ssl-2.8.24-1.3.33.tar.gz 820292
-SHA256 cb5907d74a1aef6100c0bd9a50aab33332249c85ae2f3e3431fafff5494c14fa mod_ssl-2.8.24-1.3.33.tar.gz 820292
diff --git a/net-www/apache/files/digest-apache-1.3.34-r1 b/net-www/apache/files/digest-apache-1.3.34-r1
deleted file mode 100644
index 266e6fafa0b4..000000000000
--- a/net-www/apache/files/digest-apache-1.3.34-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 e27f09389d8b8b8c5a75816d98329a72 apache-patches-1.3.33-20050711.tar.bz2 14272
-RMD160 59f7a6bfa3b5756bf61c1db0ba3df5545b27e298 apache-patches-1.3.33-20050711.tar.bz2 14272
-SHA256 6cce6437c840c6400265b4905cdc18760e5b14c5ba2a0d2a92599007f8021c4a apache-patches-1.3.33-20050711.tar.bz2 14272
-MD5 9978cc552b423f0015c1052d23ab619e apache_1.3.34.tar.gz 2468056
-RMD160 e39dfc57b7f9164aa76641de3fa74f0314c9ec9e apache_1.3.34.tar.gz 2468056
-SHA256 ceed243f4f98e4323b48e5f7f80e306d1abb00c592e18de5575983db42d6f8d4 apache_1.3.34.tar.gz 2468056
-MD5 1ef2a6cb47573444779b2fd10502514b mod_ssl-2.8.25-1.3.34.tar.gz 820352
-RMD160 90a3913d30c7f4d194907463125c90101005837a mod_ssl-2.8.25-1.3.34.tar.gz 820352
-SHA256 832b240157666efdbdfc1a2fd593ee4eebbc9441ec48ece8276660092b974d07 mod_ssl-2.8.25-1.3.34.tar.gz 820352
diff --git a/net-www/apache/files/digest-apache-1.3.34-r2 b/net-www/apache/files/digest-apache-1.3.34-r2
deleted file mode 100644
index c24683b5d6f0..000000000000
--- a/net-www/apache/files/digest-apache-1.3.34-r2
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 016da4d5061ac8b7a95080910142dc32 apache-patches-1.3.34-20060131.tar.bz2 14655
-RMD160 2c7b3abea9bac00b541e17e0e5e25a1362f9e806 apache-patches-1.3.34-20060131.tar.bz2 14655
-SHA256 05f50b5412d681ebabcd03c30e9957fafe60e1f4f42846a6bc4044ee9993e17b apache-patches-1.3.34-20060131.tar.bz2 14655
-MD5 9978cc552b423f0015c1052d23ab619e apache_1.3.34.tar.gz 2468056
-RMD160 e39dfc57b7f9164aa76641de3fa74f0314c9ec9e apache_1.3.34.tar.gz 2468056
-SHA256 ceed243f4f98e4323b48e5f7f80e306d1abb00c592e18de5575983db42d6f8d4 apache_1.3.34.tar.gz 2468056
-MD5 1ef2a6cb47573444779b2fd10502514b mod_ssl-2.8.25-1.3.34.tar.gz 820352
-RMD160 90a3913d30c7f4d194907463125c90101005837a mod_ssl-2.8.25-1.3.34.tar.gz 820352
-SHA256 832b240157666efdbdfc1a2fd593ee4eebbc9441ec48ece8276660092b974d07 mod_ssl-2.8.25-1.3.34.tar.gz 820352
diff --git a/net-www/apache/files/digest-apache-2.0.54-r15 b/net-www/apache/files/digest-apache-2.0.54-r15
deleted file mode 100644
index 34f6b626f8a3..000000000000
--- a/net-www/apache/files/digest-apache-2.0.54-r15
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 9cea7af89f76c06d859389429b2580a4 apache-conf-2.0.54-r15.tar.bz2 24832
-RMD160 2db1ed0940033f2e747139e0abb1015bff835402 apache-conf-2.0.54-r15.tar.bz2 24832
-SHA256 0ca8fced4e01d9ee64e983e3a0f4f11f7ae1dfe63afbed72d3ec73f60c9361d1 apache-conf-2.0.54-r15.tar.bz2 24832
-MD5 edc662452abf5f0c9522221f15e9b46d apache-patches-2.0.54-r15.tar.bz2 11475
-RMD160 127189ffb8139c16c4362b89a3fc9e0f1a293eed apache-patches-2.0.54-r15.tar.bz2 11475
-SHA256 a273683930a94598400d873016b4604073aa570bc8dc02ec47544d67016ef49a apache-patches-2.0.54-r15.tar.bz2 11475
-MD5 4ae8a38c6b5db9046616ce10a0d551a2 httpd-2.0.54.tar.bz2 5566979
-RMD160 c511cb2fa396ba04caf77bfc6ca03413df48ea08 httpd-2.0.54.tar.bz2 5566979
-SHA256 55a3d1c3fc4ff5ed5a4c4a20050ab68d98a10b2ab7d52f02a485da1a0fb060e3 httpd-2.0.54.tar.bz2 5566979
diff --git a/net-www/apache/files/digest-apache-2.0.54-r16 b/net-www/apache/files/digest-apache-2.0.54-r16
deleted file mode 100644
index 4f5245f12379..000000000000
--- a/net-www/apache/files/digest-apache-2.0.54-r16
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 dced19b097cc84d8b13fcb014bff70bb apache-conf-2.0.54-r16.tar.bz2 24850
-RMD160 da7a70f0e2fa86756e2fcbb3b550367ffa129d3b apache-conf-2.0.54-r16.tar.bz2 24850
-SHA256 eddb875e048862682051992e7fb955631366e98a85ef192bd2e6940f21bffa30 apache-conf-2.0.54-r16.tar.bz2 24850
-MD5 2108f75d179cad41283db6369b523c2d apache-patches-2.0.54-r16.tar.bz2 12016
-RMD160 a265531af9152d276d4d73d4b2d5774210e312d6 apache-patches-2.0.54-r16.tar.bz2 12016
-SHA256 b8dc23dc0ca9ac1fb04d0800bd1f8acf80c346cd9412c16c05011ae6ab1ecfa2 apache-patches-2.0.54-r16.tar.bz2 12016
-MD5 4ae8a38c6b5db9046616ce10a0d551a2 httpd-2.0.54.tar.bz2 5566979
-RMD160 c511cb2fa396ba04caf77bfc6ca03413df48ea08 httpd-2.0.54.tar.bz2 5566979
-SHA256 55a3d1c3fc4ff5ed5a4c4a20050ab68d98a10b2ab7d52f02a485da1a0fb060e3 httpd-2.0.54.tar.bz2 5566979
diff --git a/net-www/apache/files/digest-apache-2.0.54-r30 b/net-www/apache/files/digest-apache-2.0.54-r30
deleted file mode 100644
index 79ca4c8af660..000000000000
--- a/net-www/apache/files/digest-apache-2.0.54-r30
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 77643795d01f2de4e82577b597a46ecb gentoo-apache-2.0.54-r30-20050910.tar.bz2 54255
-RMD160 ccae3665a245efbb02e541922b4459e66369081e gentoo-apache-2.0.54-r30-20050910.tar.bz2 54255
-SHA256 6610d28064957b96ac00c4951cd7c9848f48eb0c50f0d91d7361d6c360311759 gentoo-apache-2.0.54-r30-20050910.tar.bz2 54255
-MD5 4ae8a38c6b5db9046616ce10a0d551a2 httpd-2.0.54.tar.bz2 5566979
-RMD160 c511cb2fa396ba04caf77bfc6ca03413df48ea08 httpd-2.0.54.tar.bz2 5566979
-SHA256 55a3d1c3fc4ff5ed5a4c4a20050ab68d98a10b2ab7d52f02a485da1a0fb060e3 httpd-2.0.54.tar.bz2 5566979
diff --git a/net-www/apache/files/digest-apache-2.0.54-r9 b/net-www/apache/files/digest-apache-2.0.54-r9
deleted file mode 100644
index 99ca0df60cd0..000000000000
--- a/net-www/apache/files/digest-apache-2.0.54-r9
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 aac1ccf2b75391de8858bdcbb25503bd apache-conf-2.0.54-r9.tar.bz2 24869
-RMD160 c20ebe4217cfa46047161738837c5a14b850c5c2 apache-conf-2.0.54-r9.tar.bz2 24869
-SHA256 3c1bb9b281e553d4a16b3019ba927ee3e0c19e938b04d378e7e2081a3b840c20 apache-conf-2.0.54-r9.tar.bz2 24869
-MD5 ec50865412d45fde09b63b54b7c59507 apache-patches-2.0.54-r9.tar.bz2 9507
-RMD160 23de1c69bcfd5f22dfd344f303abdb6fe72b2331 apache-patches-2.0.54-r9.tar.bz2 9507
-SHA256 4038d291852c437510324a86d40388a61c2886e1993f1e6ff7f0d438f40df301 apache-patches-2.0.54-r9.tar.bz2 9507
-MD5 4ae8a38c6b5db9046616ce10a0d551a2 httpd-2.0.54.tar.bz2 5566979
-RMD160 c511cb2fa396ba04caf77bfc6ca03413df48ea08 httpd-2.0.54.tar.bz2 5566979
-SHA256 55a3d1c3fc4ff5ed5a4c4a20050ab68d98a10b2ab7d52f02a485da1a0fb060e3 httpd-2.0.54.tar.bz2 5566979
diff --git a/net-www/apache/files/digest-apache-2.0.55 b/net-www/apache/files/digest-apache-2.0.55
deleted file mode 100644
index 1f15bb20672d..000000000000
--- a/net-www/apache/files/digest-apache-2.0.55
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 3ea3f4893669866c08d75b4f1a85af53 gentoo-apache-2.0.55-20051023.tar.bz2 51148
-RMD160 ceca9fdc0adc8b249a35b435286245dd64e221c5 gentoo-apache-2.0.55-20051023.tar.bz2 51148
-SHA256 9fcd2a6dc2e46e040cc55a8a66b37d08e27b46178914816c073ef3ec70c6f02e gentoo-apache-2.0.55-20051023.tar.bz2 51148
-MD5 f1b5b65c8661db9ffe38b5a4a865a0e2 httpd-2.0.55.tar.bz2 4745220
-RMD160 04749dcf9ea369152eddf9422e49bc0a77a443eb httpd-2.0.55.tar.bz2 4745220
-SHA256 764d12f9f3ca1b01218077681a9c08b43bc8239079ec7c2ca99c8a7fa47d3652 httpd-2.0.55.tar.bz2 4745220
diff --git a/net-www/apache/files/digest-apache-2.0.55-r2 b/net-www/apache/files/digest-apache-2.0.55-r2
deleted file mode 100644
index 85f400a5b557..000000000000
--- a/net-www/apache/files/digest-apache-2.0.55-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 ca4c88f55c2dab9ec3ef24fe2010b33e gentoo-apache-2.0.55-r2-20060331.tar.bz2 51427
-RMD160 b0e86eff63f8fa98edcea14fccb583eb44615f6d gentoo-apache-2.0.55-r2-20060331.tar.bz2 51427
-SHA256 be37642bd1425bde8ae47bb968b015bb310c131f7ec91379841faef969a717ea gentoo-apache-2.0.55-r2-20060331.tar.bz2 51427
-MD5 f1b5b65c8661db9ffe38b5a4a865a0e2 httpd-2.0.55.tar.bz2 4745220
-RMD160 04749dcf9ea369152eddf9422e49bc0a77a443eb httpd-2.0.55.tar.bz2 4745220
-SHA256 764d12f9f3ca1b01218077681a9c08b43bc8239079ec7c2ca99c8a7fa47d3652 httpd-2.0.55.tar.bz2 4745220
diff --git a/net-www/apache/files/httpd-2.0.48-ipv6.patch b/net-www/apache/files/httpd-2.0.48-ipv6.patch
deleted file mode 100644
index 1e7b3dedd8c6..000000000000
--- a/net-www/apache/files/httpd-2.0.48-ipv6.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- httpd-2.0.48/server/.orig/listen.c	2003-12-10 11:40:28.000000000 -0600
-+++ httpd-2.0.48/server/listen.c	2003-12-10 11:41:26.000000000 -0600
-@@ -117,20 +117,6 @@
-         return stat;
-     }
- 
--#if APR_HAVE_IPV6
--    if (server->bind_addr->family == APR_INET6) {
--        stat = apr_socket_opt_set(s, APR_IPV6_V6ONLY, v6only_setting);
--        if (stat != APR_SUCCESS && stat != APR_ENOTIMPL) {
--            ap_log_perror(APLOG_MARK, APLOG_CRIT, stat, p,
--                          "make_sock: for address %pI, apr_socket_opt_set: "
--                          "(IPV6_V6ONLY)",
--                          server->bind_addr);
--            apr_socket_close(s);
--            return stat;
--        }
--    }
--#endif
--
-     /*
-      * To send data over high bandwidth-delay connections at full
-      * speed we must force the TCP window to open wide enough to keep the
diff --git a/net-www/apache/files/httpd-2.0.49-cgi.patch b/net-www/apache/files/httpd-2.0.49-cgi.patch
deleted file mode 100644
index 023fd428d8bf..000000000000
--- a/net-www/apache/files/httpd-2.0.49-cgi.patch
+++ /dev/null
@@ -1,322 +0,0 @@
-diff -Naur httpd-2.0.49/modules/generators/mod_cgi.c httpd-2.0.49-gentoo/modules/generators/mod_cgi.c
---- httpd-2.0.49/modules/generators/mod_cgi.c	2004-02-09 20:53:17.000000000 +0000
-+++ httpd-2.0.49-gentoo/modules/generators/mod_cgi.c	2004-05-17 17:43:52.871026864 +0000
-@@ -32,6 +32,7 @@
- #include "apr_optional.h"
- #include "apr_buckets.h"
- #include "apr_lib.h"
-+#include "apr_poll.h"
- 
- #define APR_WANT_STRFUNC
- #include "apr_want.h"
-@@ -191,13 +192,14 @@
- 
- /* Soak up stderr from a script and redirect it to the error log. 
-  */
--static void log_script_err(request_rec *r, apr_file_t *script_err)
-+static apr_status_t log_script_err(request_rec *r, apr_file_t *script_err)
- {
-     char argsbuffer[HUGE_STRING_LEN];
-     char *newline;
-+    apr_status_t rv;
- 
--    while (apr_file_gets(argsbuffer, HUGE_STRING_LEN,
--                         script_err) == APR_SUCCESS) {
-+    while ((rv = apr_file_gets(argsbuffer, HUGE_STRING_LEN,
-+                               script_err)) == APR_SUCCESS) {
-         newline = strchr(argsbuffer, '\n');
-         if (newline) {
-             *newline = '\0';
-@@ -205,6 +207,8 @@
-         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, 
-                       "%s", argsbuffer);            
-     }
-+
-+    return rv;
- }
- 
- static int log_script(request_rec *r, cgi_server_conf * conf, int ret,
-@@ -539,6 +543,172 @@
-     }
- }
- 
-+#if APR_FILES_AS_SOCKETS
-+
-+/* A CGI bucket type is needed to catch any output to stderr from the
-+ * script; see PR 22030. */
-+static const apr_bucket_type_t bucket_type_cgi;
-+
-+struct cgi_bucket_data {
-+    apr_pollset_t *pollset;
-+    request_rec *r;
-+};
-+
-+/* Create a CGI bucket using pipes from script stdout 'out'
-+ * and stderr 'err', for request 'r'. */
-+static apr_bucket *cgi_bucket_create(request_rec *r,
-+                                     apr_file_t *out, apr_file_t *err,
-+                                     apr_bucket_alloc_t *list)
-+{
-+    apr_bucket *b = apr_bucket_alloc(sizeof(*b), list);
-+    apr_status_t rv;
-+    apr_pollfd_t fd;
-+    struct cgi_bucket_data *data = apr_palloc(r->pool, sizeof *data);
-+    
-+    APR_BUCKET_INIT(b);
-+    b->free = apr_bucket_free;
-+    b->list = list;
-+    b->type = &bucket_type_cgi;
-+    b->length = (apr_size_t)(-1);
-+    b->start = -1;
-+
-+    /* Create the pollset */
-+    rv = apr_pollset_create(&data->pollset, 2, r->pool, 0);
-+    AP_DEBUG_ASSERT(rv == APR_SUCCESS);
-+
-+    fd.desc_type = APR_POLL_FILE;
-+    fd.reqevents = APR_POLLIN;
-+    fd.p = r->pool;
-+    fd.desc.f = out; /* script's stdout */
-+    fd.client_data = (void *)1;
-+    rv = apr_pollset_add(data->pollset, &fd);
-+    AP_DEBUG_ASSERT(rv == APR_SUCCESS);
-+    
-+    fd.desc.f = err; /* script's stderr */
-+    fd.client_data = (void *)2;
-+    rv = apr_pollset_add(data->pollset, &fd);
-+    AP_DEBUG_ASSERT(rv == APR_SUCCESS);
-+    
-+    data->r = r;
-+    b->data = data;
-+    return b;
-+}
-+
-+/* Create a duplicate CGI bucket using given bucket data */
-+static apr_bucket *cgi_bucket_dup(struct cgi_bucket_data *data,
-+                                  apr_bucket_alloc_t *list)
-+{
-+    apr_bucket *b = apr_bucket_alloc(sizeof(*b), list);
-+    APR_BUCKET_INIT(b);
-+    b->free = apr_bucket_free;
-+    b->list = list;
-+    b->type = &bucket_type_cgi;
-+    b->length = (apr_size_t)(-1);
-+    b->start = -1;
-+    b->data = data;
-+    return b;
-+}
-+
-+/* Handle stdout from CGI child.  Duplicate of logic from the _read
-+ * method of the real APR pipe bucket implementation. */
-+static apr_status_t cgi_read_stdout(apr_bucket *a, apr_file_t *out,
-+                                    const char **str, apr_size_t *len)
-+{
-+    char *buf;
-+    apr_status_t rv;
-+
-+    *str = NULL;
-+    *len = APR_BUCKET_BUFF_SIZE;
-+    buf = apr_bucket_alloc(*len, a->list); /* XXX: check for failure? */
-+
-+    rv = apr_file_read(out, buf, len);
-+
-+    if (rv != APR_SUCCESS && rv != APR_EOF) {
-+        apr_bucket_free(buf);
-+        return rv;
-+    }
-+
-+    if (*len > 0) {
-+        struct cgi_bucket_data *data = a->data;
-+        apr_bucket_heap *h;
-+
-+        /* Change the current bucket to refer to what we read */
-+        a = apr_bucket_heap_make(a, buf, *len, apr_bucket_free);
-+        h = a->data;
-+        h->alloc_len = APR_BUCKET_BUFF_SIZE; /* note the real buffer size */
-+        *str = buf;
-+        APR_BUCKET_INSERT_AFTER(a, cgi_bucket_dup(data, a->list));
-+    }
-+    else {
-+        apr_bucket_free(buf);
-+        a = apr_bucket_immortal_make(a, "", 0);
-+        *str = a->data;
-+    }
-+    return rv;
-+}
-+
-+/* Read method of CGI bucket: polls on stderr and stdout of the child,
-+ * sending any stderr output immediately away to the error log. */
-+static apr_status_t cgi_bucket_read(apr_bucket *b, const char **str,
-+                                    apr_size_t *len, apr_read_type_e block)
-+{
-+    struct cgi_bucket_data *data = b->data;
-+    apr_interval_time_t timeout;
-+    apr_status_t rv;
-+    int gotdata = 0;
-+
-+    timeout = block == APR_NONBLOCK_READ ? 0 : data->r->server->timeout;
-+
-+    do {
-+        const apr_pollfd_t *results;
-+        apr_int32_t num;
-+
-+        rv = apr_pollset_poll(data->pollset, timeout, &num, &results);
-+        if (APR_STATUS_IS_TIMEUP(rv)) {
-+            return timeout == 0 ? APR_EAGAIN : rv;
-+        }
-+        else if (APR_STATUS_IS_EINTR(rv)) {
-+            continue;
-+        }
-+        else if (rv != APR_SUCCESS) {
-+            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, data->r,
-+                          "poll failed waiting for CGI child");
-+            return rv;
-+        }
-+        
-+        for (; num; num--, results++) {
-+            if (results[0].client_data == (void *)1) {
-+                /* stdout */
-+                rv = cgi_read_stdout(b, results[0].desc.f, str, len);
-+                if (APR_STATUS_IS_EOF(rv)) {
-+                    rv = APR_SUCCESS;
-+                }
-+                gotdata = 1;
-+            } else {
-+                /* stderr */
-+                apr_status_t rv2 = log_script_err(data->r, results[0].desc.f);
-+                if (APR_STATUS_IS_EOF(rv2)) {
-+                    apr_pollset_remove(data->pollset, &results[0]);
-+                }
-+            }
-+        }
-+
-+    } while (!gotdata);
-+
-+    return rv;
-+}
-+
-+static const apr_bucket_type_t bucket_type_cgi = {
-+    "CGI", 5, APR_BUCKET_DATA,
-+    apr_bucket_destroy_noop,
-+    cgi_bucket_read,
-+    apr_bucket_setaside_notimpl,
-+    apr_bucket_split_notimpl,
-+    apr_bucket_copy_notimpl
-+};
-+
-+#endif
-+
- static int cgi_handler(request_rec *r)
- {
-     int nph;
-@@ -556,6 +726,7 @@
-     cgi_server_conf *conf;
-     apr_status_t rv;
-     cgi_exec_info_t e_info;
-+    conn_rec *c = r->connection;
- 
-     if(strcmp(r->handler, CGI_MAGIC_TYPE) && strcmp(r->handler, "cgi-script"))
-         return DECLINED;
-@@ -637,7 +808,7 @@
-     /* Transfer any put/post args, CERN style...
-      * Note that we already ignore SIGPIPE in the core server.
-      */
--    bb = apr_brigade_create(r->pool, r->connection->bucket_alloc);
-+    bb = apr_brigade_create(r->pool, c->bucket_alloc);
-     seen_eos = 0;
-     child_stopped_reading = 0;
-     if (conf->logname) {
-@@ -710,18 +881,28 @@
-     apr_file_flush(script_out);
-     apr_file_close(script_out);
- 
-+    AP_DEBUG_ASSERT(script_in != NULL);
-+
-+    apr_brigade_cleanup(bb);
-+
-+#if APR_FILES_AS_SOCKETS
-+    apr_file_pipe_timeout_set(script_in, 0);
-+    apr_file_pipe_timeout_set(script_err, 0);
-+    
-+    b = cgi_bucket_create(r, script_in, script_err, c->bucket_alloc);
-+#else
-+    b = apr_bucket_pipe_create(script_in, c->bucket_alloc);
-+#endif
-+    APR_BRIGADE_INSERT_TAIL(bb, b);
-+    b = apr_bucket_eos_create(c->bucket_alloc);
-+    APR_BRIGADE_INSERT_TAIL(bb, b);
-+
-     /* Handle script return... */
--    if (script_in && !nph) {
--        conn_rec *c = r->connection;
-+    if (!nph) {
-         const char *location;
-         char sbuf[MAX_STRING_LEN];
-         int ret;
- 
--        b = apr_bucket_pipe_create(script_in, c->bucket_alloc);
--        APR_BRIGADE_INSERT_TAIL(bb, b);
--        b = apr_bucket_eos_create(c->bucket_alloc);
--        APR_BRIGADE_INSERT_TAIL(bb, b);
--
-         if ((ret = ap_scan_script_header_err_brigade(r, bb, sbuf))) {
-             return log_script(r, conf, ret, dbuf, sbuf, bb, script_err);
-         }
-@@ -731,6 +912,7 @@
-         if (location && location[0] == '/' && r->status == 200) {
-             discard_script_output(bb);
-             apr_brigade_destroy(bb);
-+            apr_file_pipe_timeout_set(script_err, r->server->timeout);
-             log_script_err(r, script_err);
-             /* This redirect needs to be a GET no matter what the original
-              * method was.
-@@ -757,22 +939,8 @@
-         }
- 
-         rv = ap_pass_brigade(r->output_filters, bb);
--
--        /* don't soak up script output if errors occurred
--         * writing it out...  otherwise, we prolong the
--         * life of the script when the connection drops
--         * or we stopped sending output for some other
--         * reason
--         */
--        if (rv == APR_SUCCESS && !r->connection->aborted) {
--            log_script_err(r, script_err);
--        }
--
--        apr_file_close(script_err);
-     }
--
--    if (script_in && nph) {
--        conn_rec *c = r->connection;
-+    else /* nph */ {
-         struct ap_filter_t *cur;
-         
-         /* get rid of all filters up through protocol...  since we
-@@ -786,13 +954,19 @@
-         }
-         r->output_filters = r->proto_output_filters = cur;
- 
--        bb = apr_brigade_create(r->pool, c->bucket_alloc);
--        b = apr_bucket_pipe_create(script_in, c->bucket_alloc);
--        APR_BRIGADE_INSERT_TAIL(bb, b);
--        b = apr_bucket_eos_create(c->bucket_alloc);
--        APR_BRIGADE_INSERT_TAIL(bb, b);
--        ap_pass_brigade(r->output_filters, bb);
-+        rv = ap_pass_brigade(r->output_filters, bb);
-+    }
-+
-+    /* don't soak up script output if errors occurred writing it
-+     * out...  otherwise, we prolong the life of the script when the
-+     * connection drops or we stopped sending output for some other
-+     * reason */
-+    if (rv == APR_SUCCESS && !r->connection->aborted) {
-+        apr_file_pipe_timeout_set(script_err, r->server->timeout);
-+        log_script_err(r, script_err);
-     }
-+    
-+    apr_file_close(script_err);
- 
-     return OK;                      /* NOT r->status, even if it has changed. */
- }
diff --git a/net-www/apache/files/httpd-2.0.49-ipv6.patch b/net-www/apache/files/httpd-2.0.49-ipv6.patch
deleted file mode 100644
index 46f8f85e5fa1..000000000000
--- a/net-www/apache/files/httpd-2.0.49-ipv6.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- httpd-2.0.49/server/.orig/listen.c	2004-03-24 18:01:40.000000000 -0600
-+++ httpd-2.0.49/server/listen.c	2004-03-24 18:07:30.000000000 -0600
-@@ -74,19 +74,6 @@
-         return stat;
-     }
- 
--#if APR_HAVE_IPV6
--    if (server->bind_addr->family == APR_INET6) {
--        stat = apr_socket_opt_set(s, APR_IPV6_V6ONLY, v6only_setting);
--        if (stat != APR_SUCCESS && stat != APR_ENOTIMPL) {
--            ap_log_perror(APLOG_MARK, APLOG_CRIT, stat, p,
--                          "make_sock: for address %pI, apr_socket_opt_set: "
--                          "(IPV6_V6ONLY)",
--                          server->bind_addr);
--            apr_socket_close(s);
--            return stat;
--        }
--    }
--#endif
- 
-     /*
-      * To send data over high bandwidth-delay connections at full
diff --git a/net-www/apache/files/patches/2.0.49-r1/00_ssl_verify_client.patch b/net-www/apache/files/patches/2.0.49-r1/00_ssl_verify_client.patch
deleted file mode 100644
index 5078b45d052c..000000000000
--- a/net-www/apache/files/patches/2.0.49-r1/00_ssl_verify_client.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-*** mod_ssl.h.patched	Thu Dec 18 13:11:48 2003
---- mod_ssl.h	Thu Dec 18 13:13:19 2003
-***************
-*** 709,714 ****
---- 709,715 ----
-  void         ssl_io_filter_init(conn_rec *, SSL *);
-  void         ssl_io_filter_register(apr_pool_t *);
-  long         ssl_io_data_cb(BIO *, int, MODSSL_BIO_CB_ARG_TYPE *, int, long, long);
-+ long         ssl_io_suck(request_rec *);
-  
-  /*  PRNG  */
-  int          ssl_rand_seed(server_rec *, apr_pool_t *, ssl_rsctx_t, char *);
-*** ssl_engine_kernel.c.patched	Thu Dec 18 13:11:39 2003
---- ssl_engine_kernel.c	Thu Dec 18 13:15:04 2003
-***************
-*** 583,596 ****
-       *
-       * !! BUT ALL THIS IS STILL NOT RE-IMPLEMENTED FOR APACHE 2.0 !!
-       */
-!     if (renegotiate && !renegotiate_quick && (r->method_number == M_POST)) {
-          ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
-                       "SSL Re-negotiation in conjunction "
-                       "with POST method not supported!\n"
-                       "hint: try SSLOptions +OptRenegotiate");
-! 
-          return HTTP_METHOD_NOT_ALLOWED;
-      }
-  
-      /*
-       * now do the renegotiation if anything was actually reconfigured
---- 583,602 ----
-       *
-       * !! BUT ALL THIS IS STILL NOT RE-IMPLEMENTED FOR APACHE 2.0 !!
-       */
-! 	if (renegotiate && !renegotiate_quick && (r->method_number == M_POST)) {
-! #ifdef SSL_CONSERVATIVE 		
-          ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
-                       "SSL Re-negotiation in conjunction "
-                       "with POST method not supported!\n"
-                       "hint: try SSLOptions +OptRenegotiate");
-! 		
-          return HTTP_METHOD_NOT_ALLOWED;
-+ #else		
-+ 		if( ssl_io_suck(r) != OK) {
-+ 			return HTTP_METHOD_NOT_ALLOWED;
-+ 		}
-      }
-+ #endif /* SSL_CONSERVATIVE */
-  
-      /*
-       * now do the renegotiation if anything was actually reconfigured
-*** ssl_engine_io.c.patched	Thu Dec 18 13:12:02 2003
---- ssl_engine_io.c	Thu Dec 18 13:21:31 2003
-***************
-*** 897,902 ****
---- 897,987 ----
-  }
-  
-  static const char ssl_io_filter[] = "SSL/TLS Filter";
-+ static const char ssl_buff_filter[] = "SSL/TLS Buffering Filter";
-+ /*
-+  * reads the buffered data during a POST request with renegotiation
-+  * will be registere at runtime.
-+  * NOTE: we try to buffer the complete body. Use the attribute 'LimitRequestBody'
-+  * preventing DOS attacks.
-+  */
-+ long ssl_io_suck(request_rec *r)
-+ {
-+ 	apr_bucket *bucket;
-+ 	apr_bucket_brigade *bb = apr_brigade_create(r->pool,r->connection->bucket_alloc);
-+ 
-+ 	int readed = 0;
-+ 	int len = 0;
-+ 	int toRead= 0;
-+ 	char *buffer = NULL;
-+ 	char *pos = NULL;
-+ 	
-+ 	if(ap_setup_client_block(r,REQUEST_CHUNKED_DECHUNK) !=OK) {
-+ 		return HTTP_METHOD_NOT_ALLOWED; 
-+ 	}
-+ 
-+ 	if(!ap_should_client_block(r)) {
-+ 		return OK;
-+ 	}
-+ 	
-+ 	do {
-+ 		buffer = apr_pcalloc(r->pool,HUGE_STRING_LEN);
-+ 		toRead = HUGE_STRING_LEN;
-+ 
-+ 		/* check malloc */
-+ 		if(buffer == NULL) {
-+ 			ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
-+                      "SSL Re-negotiation in conjunction "
-+ 				     "with POST (buffering body failed)!\n");
-+ 			apr_brigade_destroy(bb);
-+ 			return HTTP_METHOD_NOT_ALLOWED;			
-+ 		}
-+ 		
-+ 		/* fill the bucket */
-+ 		pos = buffer;
-+ 		len = 0;
-+ 		do {
-+ 			readed  = ap_get_client_block(r,pos,toRead);
-+ 
-+ 			if(readed <=0) {
-+ 				break;
-+ 			}
-+ 			
-+ 			toRead  -= readed;
-+ 			
-+ 			/* sanity */
-+ 			if(toRead<0) {
-+ 				return HTTP_METHOD_NOT_ALLOWED;
-+ 			}
-+ 
-+ 			pos += readed;
-+ 			len += readed;	
-+ 		}
-+ 		while(toRead>0);
-+ 
-+ 		/* check last read result */
-+ 		if(readed<0) {
-+ 			ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
-+                      "SSL Re-negotiation in conjunction "
-+ 				     "with POST (reading body failed)!\n");
-+ 			apr_brigade_destroy(bb);
-+ 			return HTTP_METHOD_NOT_ALLOWED; 
-+ 		}
-+ 		
-+ 		/* check if we have readed everything */
-+ 		if(len == 0) {
-+ 			break;
-+ 		}
-+ 		bucket = apr_bucket_pool_create(buffer,len,r->pool,r->connection->bucket_alloc);
-+ 		
-+         APR_BRIGADE_INSERT_TAIL(bb, bucket);
-+ 	} 
-+ 	while(1);
-+ 	
-+ 	//add the ssl_buff_filter_input
-+ 	ap_add_input_filter(ssl_buff_filter, bb, r, r->connection);
-+ 	
-+ 	return OK;									  
-+ }
-  
-  /*
-   *  Close the SSL part of the socket connection
-***************
-*** 1361,1366 ****
---- 1446,1529 ----
-      return status;
-  }
-  
-+ static apr_status_t ssl_buff_filter_input(ap_filter_t *f,
-+                                         apr_bucket_brigade *bb,
-+                                         ap_input_mode_t mode,
-+                                         apr_read_type_e block,
-+                                         apr_off_t readbytes)
-+ {
-+ 	apr_bucket_brigade *aa = f->ctx;
-+ 	apr_status_t  rv;
-+ 	
-+ 	if(aa && !APR_BRIGADE_EMPTY(aa)) {
-+ 
-+ 		if(mode == AP_MODE_READBYTES) {
-+ 			apr_bucket *b;
-+ 			apr_off_t missing = readbytes;
-+ 			apr_size_t len;
-+ 			const char *tmp;
-+ 	
-+ 			while (!APR_BRIGADE_EMPTY(aa)) {
-+ 				b = APR_BRIGADE_FIRST(aa);
-+ 			
-+ 				rv = apr_bucket_read(b, &tmp, &len, APR_BLOCK_READ);
-+ 				if (rv != APR_SUCCESS) {
-+ 					return rv;
-+ 				}
-+ 				
-+ 				/* consume whole bucket */
-+ 				if(missing >= len) {
-+ 					APR_BUCKET_REMOVE(b);
-+ 					APR_BRIGADE_INSERT_TAIL(bb,b);
-+ 				}
-+ 				/* comsume only a part */ 
-+ 				else{
-+ 					rv = apr_bucket_split(b, missing);
-+ 					if (rv != APR_SUCCESS) {
-+ 						return rv;
-+ 					}
-+ 					
-+ 					APR_BUCKET_REMOVE(b);
-+ 					APR_BRIGADE_INSERT_TAIL(bb, b);
-+ 					break;
-+ 				}
-+ 				
-+ 				missing -= len;
-+ 				
-+ 				if (missing = 0) {
-+ 					break;
-+ 				}
-+ 
-+ 				if(missing<0) {
-+ 					return AP_FILTER_ERROR;
-+ 				}
-+ 			}
-+ 			return APR_SUCCESS;
-+ 		}
-+ 		else if (mode == AP_MODE_READBYTES) {
-+ 			apr_bucket_brigade *nb = apr_brigade_create(f->r->pool,f->c->bucket_alloc);
-+ 			
-+ 			/* split */
-+ 			rv = apr_brigade_split_line(nb,aa,block,readbytes);
-+ 			if( rv != APR_SUCCESS) {				
-+ 				return rv;
-+ 			} 
-+ 
-+ 			/* concatinate */
-+ 			APR_BRIGADE_CONCAT(bb,aa);
-+ 			
-+ 			/* remember the rest */
-+ 			f->ctx = nb;
-+ 			
-+ 			return APR_SUCCESS;	
-+ 		}
-+ 		
-+ 	}
-+ 	
-+ 	
-+ 	return ap_pass_brigade(f->next, bb);
-+ }
-+ 
-  static void ssl_io_input_add_filter(ssl_filter_ctx_t *filter_ctx, conn_rec *c,
-                                      SSL *ssl)
-  {
-***************
-*** 1417,1422 ****
---- 1580,1586 ----
-  {
-      ap_register_input_filter  (ssl_io_filter, ssl_io_filter_input,  NULL, AP_FTYPE_CONNECTION + 5);
-      ap_register_output_filter (ssl_io_filter, ssl_io_filter_output, NULL, AP_FTYPE_CONNECTION + 5);
-+     ap_register_input_filter  (ssl_buff_filter, ssl_buff_filter_input,  NULL, AP_FTYPE_PROTOCOL - 1);
-      return;
-  }
-  
diff --git a/net-www/apache/files/patches/2.0.49-r1/01_apache_ldap_fixes.patch b/net-www/apache/files/patches/2.0.49-r1/01_apache_ldap_fixes.patch
deleted file mode 100644
index 5e7450413bac..000000000000
--- a/net-www/apache/files/patches/2.0.49-r1/01_apache_ldap_fixes.patch
+++ /dev/null
@@ -1,542 +0,0 @@
-diff -Naur httpd-2.0.49/modules/experimental/NWGNUauthldap httpd-2.0.49-gentoo/modules/experimental/NWGNUauthldap
---- httpd-2.0.49/modules/experimental/NWGNUauthldap	2003-03-07 20:12:29.000000000 +0000
-+++ httpd-2.0.49-gentoo/modules/experimental/NWGNUauthldap	2004-05-23 21:45:34.330922280 +0000
-@@ -186,7 +186,6 @@
- 	lldapsdk \
- 	lldapssl \
- 	lldapx \
--	utilldap \
- 	$(EOLIST)
- 
- #
-@@ -210,7 +209,8 @@
- FILES_nlm_Ximports = \
- 	util_ldap_connection_find \
- 	util_ldap_connection_close \
--	util_ldap_connection_destroy \
-+	util_ldap_connection_unbind \
-+	util_ldap_connection_cleanup \
- 	util_ldap_cache_checkuserid \
- 	util_ldap_cache_compare \
- 	util_ldap_cache_comparedn \
-diff -Naur httpd-2.0.49/modules/experimental/NWGNUutilldap httpd-2.0.49-gentoo/modules/experimental/NWGNUutilldap
---- httpd-2.0.49/modules/experimental/NWGNUutilldap	2003-03-07 20:12:29.000000000 +0000
-+++ httpd-2.0.49-gentoo/modules/experimental/NWGNUutilldap	2004-05-23 21:45:34.335921520 +0000
-@@ -223,7 +223,8 @@
- 	ldap_module \
- 	util_ldap_connection_find \
- 	util_ldap_connection_close \
--	util_ldap_connection_destroy \
-+	util_ldap_connection_unbind \
-+	util_ldap_connection_cleanup \
- 	util_ldap_cache_checkuserid \
- 	util_ldap_cache_compare \
- 	util_ldap_cache_comparedn \
-diff -Naur httpd-2.0.49/modules/experimental/README httpd-2.0.49-gentoo/modules/experimental/README
---- httpd-2.0.49/modules/experimental/README	2002-04-12 11:20:47.000000000 +0000
-+++ httpd-2.0.49-gentoo/modules/experimental/README	2004-05-23 21:45:34.338921064 +0000
-@@ -16,7 +16,7 @@
- the example module did as the various callbacks were made.
- 
- To include the example module in your server add --enable-example to the
--other ./configure arguments executed from the httpd-2.0 directory. After
-+other ./configure arguments executed from the httpd-2.1 directory. After
- that run 'make'.
- 
- To add another module of your own:
-diff -Naur httpd-2.0.49/modules/experimental/mod_auth_ldap.c httpd-2.0.49-gentoo/modules/experimental/mod_auth_ldap.c
---- httpd-2.0.49/modules/experimental/mod_auth_ldap.c	2004-02-09 20:53:16.000000000 +0000
-+++ httpd-2.0.49-gentoo/modules/experimental/mod_auth_ldap.c	2004-05-23 21:45:34.324923192 +0000
-@@ -42,7 +42,7 @@
- #include "http_request.h"
- #include "util_ldap.h"
- 
--#ifndef APU_HAS_LDAP
-+#if !APR_HAS_LDAP
- #error mod_auth_ldap requires APR-util to have LDAP support built in
- #endif
- 
-@@ -113,7 +113,6 @@
- static char* derive_codepage_from_lang (apr_pool_t *p, char *language)
- {
-     int lang_len;
--    int check_short = 0;
-     char *charset;
-     
-     if (!language)          /* our default codepage */
-@@ -330,7 +329,6 @@
- 
-     /* sanity check - if server is down, retry it up to 5 times */
-     if (result == LDAP_SERVER_DOWN) {
--        util_ldap_connection_destroy(ldc);
-         if (failures++ <= 5) {
-             goto start_over;
-         }
-@@ -475,8 +473,8 @@
-         method_restricted = 1;
- 	
-         t = reqs[x].requirement;
--        w = ap_getword_white(r->pool, &t);    
--
-+        w = ap_getword_white(r->pool, &t);
-+    
-         if (strcmp(w, "valid-user") == 0) {
-             /*
-              * Valid user will always be true if we authenticated with ldap,
-@@ -953,6 +951,15 @@
-     }
-     */
- 
-+    /* make sure that mod_ldap (util_ldap) is loaded */
-+    if (ap_find_linked_module("util_ldap.c") == NULL) {
-+        ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s,
-+                     "Module mod_ldap missing. Mod_ldap (aka. util_ldap) "
-+                     "must be loaded in order for mod_auth_ldap to function properly");
-+        return HTTP_INTERNAL_SERVER_ERROR;
-+
-+    }
-+
-     if (!charset_confname) {
-         return OK;
-     }
-diff -Naur httpd-2.0.49/modules/experimental/util_ldap.c httpd-2.0.49-gentoo/modules/experimental/util_ldap.c
---- httpd-2.0.49/modules/experimental/util_ldap.c	2004-02-11 18:07:46.000000000 +0000
-+++ httpd-2.0.49-gentoo/modules/experimental/util_ldap.c	2004-05-23 21:45:34.469901152 +0000
-@@ -38,7 +38,7 @@
- #include <unistd.h>
- #endif
- 
--#ifndef APU_HAS_LDAP
-+#if !APR_HAS_LDAP
- #error mod_ldap requires APR-util to have LDAP support built in
- #endif
- 
-@@ -88,6 +88,20 @@
-                           "\"http://www.w3.org/TR/REC-html40/frameset.dtd\">\n"
- #endif
- 
-+
-+static void util_ldap_strdup (char **str, const char *newstr)
-+{
-+    if (*str) {
-+        free(*str);
-+        *str = NULL;
-+    }
-+
-+    if (newstr) {
-+        *str = calloc(1, strlen(newstr)+1);
-+        strcpy (*str, newstr);
-+    }
-+}
-+
- /*
-  * Status Handler
-  * --------------
-@@ -171,32 +185,52 @@
- 
- 
- /*
-- * Destroys an LDAP connection by unbinding. This function is registered
-- * with the pool cleanup function - causing the LDAP connections to be
-- * shut down cleanly on graceful restart.
-+ * Destroys an LDAP connection by unbinding and closing the connection to
-+ * the LDAP server. It is used to bring the connection back to a known
-+ * state after an error, and during pool cleanup.
-  */
--LDAP_DECLARE_NONSTD(apr_status_t) util_ldap_connection_destroy(void *param)
-+LDAP_DECLARE_NONSTD(apr_status_t) util_ldap_connection_unbind(void *param)
- {
-     util_ldap_connection_t *ldc = param;
- 
--    /* unbinding from the LDAP server */
--    if (ldc->ldap) {
--        ldap_unbind_s(ldc->ldap);
-+    if (ldc) {
-+        if (ldc->ldap) {
-+            ldap_unbind_s(ldc->ldap);
-+            ldc->ldap = NULL;
-+        }
-         ldc->bound = 0;
--        ldc->ldap = NULL;
-     }
- 
--    /* release the lock we were using.  The lock should have
--       already been released in the close connection call.  
--       But just in case it wasn't, we first try to get the lock
--       before unlocking it to avoid unlocking an unheld lock. 
--       Unlocking an unheld lock causes problems on NetWare.  The
--       other option would be to assume that close connection did
--       its job. */
--#if APR_HAS_THREADS
--    apr_thread_mutex_trylock(ldc->lock);
--    apr_thread_mutex_unlock(ldc->lock);
--#endif
-+    return APR_SUCCESS;
-+}
-+
-+
-+/*
-+ * Clean up an LDAP connection by unbinding and unlocking the connection.
-+ * This function is registered with the pool cleanup function - causing
-+ * the LDAP connections to be shut down cleanly on graceful restart.
-+ */
-+LDAP_DECLARE_NONSTD(apr_status_t) util_ldap_connection_cleanup(void *param)
-+{
-+    util_ldap_connection_t *ldc = param;
-+
-+    if (ldc) {
-+
-+        /* unbind and disconnect from the LDAP server */
-+        util_ldap_connection_unbind(ldc);
-+
-+        /* free the username and password */
-+        if (ldc->bindpw) {
-+            free((void*)ldc->bindpw);
-+        }
-+        if (ldc->binddn) {
-+            free((void*)ldc->binddn);
-+        }
-+
-+        /* unlock this entry */
-+        util_ldap_connection_close(ldc);
-+    
-+    }
- 
-     return APR_SUCCESS;
- }
-@@ -290,11 +324,6 @@
-         /* always default to LDAP V3 */
-         ldap_set_option(ldc->ldap, LDAP_OPT_PROTOCOL_VERSION, &version);
- 
--
--        /* add the cleanup to the pool */
--        apr_pool_cleanup_register(ldc->pool, ldc,
--                                  util_ldap_connection_destroy,
--                                  apr_pool_cleanup_null);
-     }
- 
- 
-@@ -313,9 +342,6 @@
-             break;
-     }
- 
--    ldc->bound = 1;
--    ldc->reason = "LDAP: connection open successful";
--
-     /* free the handle if there was an error
-     */
-     if (LDAP_SUCCESS != result)
-@@ -325,6 +351,10 @@
-         ldc->bound = 0;
-         ldc->reason = "LDAP: ldap_simple_bind_s() failed";
-     }
-+    else {
-+        ldc->bound = 1;
-+        ldc->reason = "LDAP: connection open successful";
-+    }
- 
-     return(result);
- }
-@@ -362,18 +392,22 @@
-      */
-     for (l=st->connections,p=NULL; l; l=l->next) {
- #if APR_HAS_THREADS
--        if ( (APR_SUCCESS == apr_thread_mutex_trylock(l->lock)) &&
--#else
--        if (
-+        if (APR_SUCCESS == apr_thread_mutex_trylock(l->lock)) {
- #endif
--            l->port == port
--	    && strcmp(l->host, host) == 0
--	    && ( (!l->binddn && !binddn) || (l->binddn && binddn && !strcmp(l->binddn, binddn)) )
--	    && ( (!l->bindpw && !bindpw) || (l->bindpw && bindpw && !strcmp(l->bindpw, bindpw)) )
--            && l->deref == deref
--            && l->secure == secure 
--            )
-+        if ((l->port == port) && (strcmp(l->host, host) == 0) && 
-+            ((!l->binddn && !binddn) || (l->binddn && binddn && !strcmp(l->binddn, binddn))) && 
-+            ((!l->bindpw && !bindpw) || (l->bindpw && bindpw && !strcmp(l->bindpw, bindpw))) && 
-+            (l->deref == deref) && (l->secure == secure)) {
-+
-             break;
-+        }
-+#if APR_HAS_THREADS
-+            /* If this connection didn't match the criteria, then we
-+             * need to unlock the mutex so it is available to be reused.
-+             */
-+            apr_thread_mutex_unlock(l->lock);
-+        }
-+#endif
-         p = l;
-     }
- 
-@@ -383,21 +417,25 @@
-     if (!l) {
-         for (l=st->connections,p=NULL; l; l=l->next) {
- #if APR_HAS_THREADS
--            if ( (APR_SUCCESS == apr_thread_mutex_trylock(l->lock)) &&
--#else
--            if (
-+            if (APR_SUCCESS == apr_thread_mutex_trylock(l->lock)) {
-+
- #endif
--                l->port == port
--	        && strcmp(l->host, host) == 0
--                && l->deref == deref
--                && l->secure == secure
--                ) {
-+            if ((l->port == port) && (strcmp(l->host, host) == 0) && 
-+                (l->deref == deref) && (l->secure == secure)) {
-+
-                 /* the bind credentials have changed */
-                 l->bound = 0;
--                l->binddn = apr_pstrdup(st->pool, binddn);
--                l->bindpw = apr_pstrdup(st->pool, bindpw);
-+                util_ldap_strdup((char**)&(l->binddn), binddn);
-+                util_ldap_strdup((char**)&(l->bindpw), bindpw);
-                 break;
-             }
-+#if APR_HAS_THREADS
-+                /* If this connection didn't match the criteria, then we
-+                 * need to unlock the mutex so it is available to be reused.
-+                 */
-+                apr_thread_mutex_unlock(l->lock);
-+            }
-+#endif
-             p = l;
-         }
-     }
-@@ -426,10 +464,15 @@
-         l->host = apr_pstrdup(st->pool, host);
-         l->port = port;
-         l->deref = deref;
--        l->binddn = apr_pstrdup(st->pool, binddn);
--        l->bindpw = apr_pstrdup(st->pool, bindpw);
-+        util_ldap_strdup((char**)&(l->binddn), binddn);
-+        util_ldap_strdup((char**)&(l->bindpw), bindpw);
-         l->secure = secure;
- 
-+        /* add the cleanup to the pool */
-+        apr_pool_cleanup_register(l->pool, l,
-+                                  util_ldap_connection_cleanup,
-+                                  apr_pool_cleanup_null);
-+
-         if (p) {
-             p->next = l;
-         }
-@@ -531,8 +574,8 @@
-     if ((result = ldap_search_ext_s(ldc->ldap, const_cast(reqdn), LDAP_SCOPE_BASE, 
- 				    "(objectclass=*)", NULL, 1, 
- 				    NULL, NULL, NULL, -1, &res)) == LDAP_SERVER_DOWN) {
--        util_ldap_connection_close(ldc);
-         ldc->reason = "DN Comparison ldap_search_ext_s() failed with server down";
-+        util_ldap_connection_unbind(ldc);
-         goto start_over;
-     }
-     if (result != LDAP_SUCCESS) {
-@@ -584,7 +627,7 @@
-     util_url_node_t curnode;
-     util_compare_node_t *compare_nodep;
-     util_compare_node_t the_compare_node;
--    apr_time_t curtime;
-+    apr_time_t curtime = 0; /* silence gcc -Wall */
-     int failures = 0;
- 
-     util_ldap_state_t *st = 
-@@ -660,8 +703,8 @@
-     if ((result = ldap_compare_s(ldc->ldap, const_cast(dn), const_cast(attrib), const_cast(value)))
-         == LDAP_SERVER_DOWN) { 
-         /* connection failed - try again */
--        util_ldap_connection_close(ldc);
-         ldc->reason = "ldap_compare_s() failed with server down";
-+        util_ldap_connection_unbind(ldc);
-         goto start_over;
-     }
- 
-@@ -781,6 +824,7 @@
- 				    const_cast(filter), attrs, 0, 
- 				    NULL, NULL, NULL, -1, &res)) == LDAP_SERVER_DOWN) {
-         ldc->reason = "ldap_search_ext_s() for user failed with server down";
-+        util_ldap_connection_unbind(ldc);
-         goto start_over;
-     }
- 
-@@ -809,7 +853,7 @@
- 
-     /* Grab the dn, copy it into the pool, and free it again */
-     dn = ldap_get_dn(ldc->ldap, entry);
--    *binddn = apr_pstrdup(st->pool, dn);
-+    *binddn = apr_pstrdup(r->pool, dn);
-     ldap_memfree(dn);
- 
-     /* 
-@@ -835,6 +879,7 @@
-          LDAP_SERVER_DOWN) {
-         ldc->reason = "ldap_simple_bind_s() to check user credentials failed with server down";
-         ldap_msgfree(res);
-+        util_ldap_connection_unbind(ldc);
-         goto start_over;
-     }
- 
-@@ -842,8 +887,18 @@
-     if (result != LDAP_SUCCESS) {
-         ldc->reason = "ldap_simple_bind_s() to check user credentials failed";
-         ldap_msgfree(res);
-+        util_ldap_connection_unbind(ldc);
-         return result;
-     }
-+    else {
-+        /*
-+         * We have just bound the connection to a different user and password
-+         * combination, which might be reused unintentionally next time this
-+         * connection is used from the connection pool. To ensure no confusion,
-+         * we mark the connection as unbound.
-+         */
-+        ldc->bound = 0;
-+    }
- 
-     /*
-      * Get values for the provided attributes.
-@@ -873,22 +928,23 @@
-     /* 		
-      * Add the new username to the search cache.
-      */
--    LDAP_CACHE_WRLOCK();
--    the_search_node.username = filter;
--    the_search_node.dn = *binddn;
--    the_search_node.bindpw = bindpw;
--    the_search_node.lastbind = apr_time_now();
--    the_search_node.vals = vals;
-     if (curl) {
-+        LDAP_CACHE_WRLOCK();
-+        the_search_node.username = filter;
-+        the_search_node.dn = *binddn;
-+        the_search_node.bindpw = bindpw;
-+        the_search_node.lastbind = apr_time_now();
-+        the_search_node.vals = vals;
-         util_ald_cache_insert(curl->search_cache, &the_search_node);
-+        LDAP_CACHE_UNLOCK();
-     }
-     ldap_msgfree(res);
--    LDAP_CACHE_UNLOCK();
- 
-     ldc->reason = "Authentication successful";
-     return LDAP_SUCCESS;
- }
- 
-+
- /*
-  * Reports if ssl support is enabled 
-  *
-@@ -916,8 +972,9 @@
-     st->cache_bytes = atol(bytes);
- 
-     ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, cmd->server, 
--                      "[%d] ldap cache: Setting shared memory cache size to %d bytes.", 
--                      getpid(), st->cache_bytes);
-+                 "[%" APR_PID_T_FMT "] ldap cache: Setting shared memory "
-+                 " cache size to %" APR_SIZE_T_FMT " bytes.", 
-+                 getpid(), st->cache_bytes);
- 
-     return NULL;
- }
-@@ -1025,7 +1082,7 @@
- }
- 
- 
--const char *util_ldap_set_cert_type(cmd_parms *cmd, void *dummy, const char *Type)
-+static const char *util_ldap_set_cert_type(cmd_parms *cmd, void *dummy, const char *Type)
- {
-     util_ldap_state_t *st = 
-     (util_ldap_state_t *)ap_get_module_config(cmd->server->module_config, 
-@@ -1073,19 +1130,16 @@
- 
- static apr_status_t util_ldap_cleanup_module(void *data)
- {
-+#if APR_HAS_LDAP_SSL && APR_HAS_NOVELL_LDAPSDK
-     server_rec *s = data;
--
-     util_ldap_state_t *st = (util_ldap_state_t *)ap_get_module_config(
--                                          s->module_config, &ldap_module);
-+        s->module_config, &ldap_module);
-+    
-+    if (st->ssl_support)
-+        ldapssl_client_deinit();
- 
--    #if APR_HAS_LDAP_SSL
--        #if APR_HAS_NOVELL_LDAPSDK
--            if (st->ssl_support)
--                ldapssl_client_deinit();
--        #endif
--    #endif
--   
--    return(APR_SUCCESS);
-+#endif
-+    return APR_SUCCESS;
- }
- 
- static int util_ldap_post_config(apr_pool_t *p, apr_pool_t *plog, 
-@@ -1115,7 +1169,7 @@
-         s_vhost = s->next;
-         while (s_vhost) {
-             ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, result, s, 
--                         "LDAP merging Shared Cache conf: shm=0x%x rmm=0x%x for VHOST: %s",
-+                         "LDAP merging Shared Cache conf: shm=0x%pp rmm=0x%pp for VHOST: %s",
-                          st->cache_shm, st->cache_rmm, s_vhost->server_hostname);
- 
-             st_vhost = (util_ldap_state_t *)ap_get_module_config(s_vhost->module_config, &ldap_module);
-diff -Naur httpd-2.0.49/modules/experimental/util_ldap_cache.c httpd-2.0.49-gentoo/modules/experimental/util_ldap_cache.c
---- httpd-2.0.49/modules/experimental/util_ldap_cache.c	2004-02-11 18:07:46.000000000 +0000
-+++ httpd-2.0.49-gentoo/modules/experimental/util_ldap_cache.c	2004-05-23 21:45:34.565886560 +0000
-@@ -25,7 +25,7 @@
- #include "util_ldap.h"
- #include "util_ldap_cache.h"
- 
--#ifdef APU_HAS_LDAP
-+#if APR_HAS_LDAP
- 
- #if APR_HAS_SHARED_MEMORY
- #define MODLDAP_SHMEM_CACHE "/tmp/mod_ldap_cache"
-@@ -292,4 +292,4 @@
- }
- 
- 
--#endif /* APU_HAS_LDAP */
-+#endif /* APR_HAS_LDAP */
-diff -Naur httpd-2.0.49/modules/experimental/util_ldap_cache.h httpd-2.0.49-gentoo/modules/experimental/util_ldap_cache.h
---- httpd-2.0.49/modules/experimental/util_ldap_cache.h	2004-02-11 18:07:46.000000000 +0000
-+++ httpd-2.0.49-gentoo/modules/experimental/util_ldap_cache.h	2004-05-23 21:45:34.569885952 +0000
-@@ -21,7 +21,7 @@
-  */
- 
- /* this whole thing disappears if LDAP is not enabled */
--#ifdef APU_HAS_LDAP
-+#if APR_HAS_LDAP
- 
- 
- /*
-@@ -195,5 +195,5 @@
- char *util_ald_cache_display_stats(apr_pool_t *p, util_ald_cache_t *cache,
-                                  char *name);
- 
--#endif /* APU_HAS_LDAP */
-+#endif /* APR_HAS_LDAP */
- #endif /* APU_LDAP_CACHE_H */
-diff -Naur httpd-2.0.49/modules/experimental/util_ldap_cache_mgr.c httpd-2.0.49-gentoo/modules/experimental/util_ldap_cache_mgr.c
---- httpd-2.0.49/modules/experimental/util_ldap_cache_mgr.c	2004-03-01 18:04:45.000000000 +0000
-+++ httpd-2.0.49-gentoo/modules/experimental/util_ldap_cache_mgr.c	2004-05-23 21:45:34.577884736 +0000
-@@ -26,7 +26,7 @@
- #include "util_ldap_cache.h"
- #include <apr_strings.h>
- 
--#ifdef APU_HAS_LDAP
-+#if APR_HAS_LDAP
- 
- /* only here until strdup is gone */
- #include <string.h>
-@@ -515,4 +515,4 @@
-     return buf;
- }
- 
--#endif /* APU_HAS_LDAP */
-+#endif /* APR_HAS_LDAP */
diff --git a/net-www/apache/files/patches/2.0.49-r1/04_ssl_makefile.patch b/net-www/apache/files/patches/2.0.49-r1/04_ssl_makefile.patch
deleted file mode 100644
index 3975a3677aa9..000000000000
--- a/net-www/apache/files/patches/2.0.49-r1/04_ssl_makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- modules/ssl/Makefile.in.orig	2004-05-26 10:50:53.152391390 +0100
-+++ modules/ssl/Makefile.in		2004-05-26 10:51:31.164735393 +0100
-@@ -57,10 +57,6 @@
- #   (we really don't expect end users to use these targets!)
- #
- 
--ssl_expr_scan.c: $(top_srcdir)/modules/ssl/ssl_expr_scan.l ssl_expr_parse.h
--	flex -Pssl_expr_yy -s -B $(top_srcdir)/modules/ssl/ssl_expr_scan.l
--	sed -e '/$$Header:/d' <lex.ssl_expr_yy.c >ssl_expr_scan.c && rm -f lex.ssl_expr_yy.c
--
- ssl_expr_parse.c ssl_expr_parse.h: $(top_srcdir)/modules/ssl/ssl_expr_parse.y
- 	yacc -d $(top_srcdir)/modules/ssl/ssl_expr_parse.y
- 	sed -e 's;yy;ssl_expr_yy;g' \
diff --git a/net-www/apache/files/patches/2.0.49-r1/Readme.PATCHES b/net-www/apache/files/patches/2.0.49-r1/Readme.PATCHES
deleted file mode 100644
index 15d9af0ed700..000000000000
--- a/net-www/apache/files/patches/2.0.49-r1/Readme.PATCHES
+++ /dev/null
@@ -1,21 +0,0 @@
-This is the list of patches that we use for our apatch ebuilds.
-
-This is the general format of the patch.
-
-xx_<patch name>.patch
-
-Where xx can be one of the following:
-
-00 - bug fixes from apache.
-01 - new features
-02 - performance patches
-03 - vendor patches
-04 - gentoo patches
-
-
-Name				Purpose
-----				------
-
-00_ssl_engine.patch		Better error message for child crashing in SSL.
-00_ssl_verify_client.patch	Fixes 12355 from apache bugzilla.
-04_ssl_makefile.patch		Works around broken lex file in mod_ssl
diff --git a/net-www/apache/files/patches/2.0.49-r2/01_gentoo_cgi.patch b/net-www/apache/files/patches/2.0.49-r2/01_gentoo_cgi.patch
deleted file mode 100644
index 023fd428d8bf..000000000000
--- a/net-www/apache/files/patches/2.0.49-r2/01_gentoo_cgi.patch
+++ /dev/null
@@ -1,322 +0,0 @@
-diff -Naur httpd-2.0.49/modules/generators/mod_cgi.c httpd-2.0.49-gentoo/modules/generators/mod_cgi.c
---- httpd-2.0.49/modules/generators/mod_cgi.c	2004-02-09 20:53:17.000000000 +0000
-+++ httpd-2.0.49-gentoo/modules/generators/mod_cgi.c	2004-05-17 17:43:52.871026864 +0000
-@@ -32,6 +32,7 @@
- #include "apr_optional.h"
- #include "apr_buckets.h"
- #include "apr_lib.h"
-+#include "apr_poll.h"
- 
- #define APR_WANT_STRFUNC
- #include "apr_want.h"
-@@ -191,13 +192,14 @@
- 
- /* Soak up stderr from a script and redirect it to the error log. 
-  */
--static void log_script_err(request_rec *r, apr_file_t *script_err)
-+static apr_status_t log_script_err(request_rec *r, apr_file_t *script_err)
- {
-     char argsbuffer[HUGE_STRING_LEN];
-     char *newline;
-+    apr_status_t rv;
- 
--    while (apr_file_gets(argsbuffer, HUGE_STRING_LEN,
--                         script_err) == APR_SUCCESS) {
-+    while ((rv = apr_file_gets(argsbuffer, HUGE_STRING_LEN,
-+                               script_err)) == APR_SUCCESS) {
-         newline = strchr(argsbuffer, '\n');
-         if (newline) {
-             *newline = '\0';
-@@ -205,6 +207,8 @@
-         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, 
-                       "%s", argsbuffer);            
-     }
-+
-+    return rv;
- }
- 
- static int log_script(request_rec *r, cgi_server_conf * conf, int ret,
-@@ -539,6 +543,172 @@
-     }
- }
- 
-+#if APR_FILES_AS_SOCKETS
-+
-+/* A CGI bucket type is needed to catch any output to stderr from the
-+ * script; see PR 22030. */
-+static const apr_bucket_type_t bucket_type_cgi;
-+
-+struct cgi_bucket_data {
-+    apr_pollset_t *pollset;
-+    request_rec *r;
-+};
-+
-+/* Create a CGI bucket using pipes from script stdout 'out'
-+ * and stderr 'err', for request 'r'. */
-+static apr_bucket *cgi_bucket_create(request_rec *r,
-+                                     apr_file_t *out, apr_file_t *err,
-+                                     apr_bucket_alloc_t *list)
-+{
-+    apr_bucket *b = apr_bucket_alloc(sizeof(*b), list);
-+    apr_status_t rv;
-+    apr_pollfd_t fd;
-+    struct cgi_bucket_data *data = apr_palloc(r->pool, sizeof *data);
-+    
-+    APR_BUCKET_INIT(b);
-+    b->free = apr_bucket_free;
-+    b->list = list;
-+    b->type = &bucket_type_cgi;
-+    b->length = (apr_size_t)(-1);
-+    b->start = -1;
-+
-+    /* Create the pollset */
-+    rv = apr_pollset_create(&data->pollset, 2, r->pool, 0);
-+    AP_DEBUG_ASSERT(rv == APR_SUCCESS);
-+
-+    fd.desc_type = APR_POLL_FILE;
-+    fd.reqevents = APR_POLLIN;
-+    fd.p = r->pool;
-+    fd.desc.f = out; /* script's stdout */
-+    fd.client_data = (void *)1;
-+    rv = apr_pollset_add(data->pollset, &fd);
-+    AP_DEBUG_ASSERT(rv == APR_SUCCESS);
-+    
-+    fd.desc.f = err; /* script's stderr */
-+    fd.client_data = (void *)2;
-+    rv = apr_pollset_add(data->pollset, &fd);
-+    AP_DEBUG_ASSERT(rv == APR_SUCCESS);
-+    
-+    data->r = r;
-+    b->data = data;
-+    return b;
-+}
-+
-+/* Create a duplicate CGI bucket using given bucket data */
-+static apr_bucket *cgi_bucket_dup(struct cgi_bucket_data *data,
-+                                  apr_bucket_alloc_t *list)
-+{
-+    apr_bucket *b = apr_bucket_alloc(sizeof(*b), list);
-+    APR_BUCKET_INIT(b);
-+    b->free = apr_bucket_free;
-+    b->list = list;
-+    b->type = &bucket_type_cgi;
-+    b->length = (apr_size_t)(-1);
-+    b->start = -1;
-+    b->data = data;
-+    return b;
-+}
-+
-+/* Handle stdout from CGI child.  Duplicate of logic from the _read
-+ * method of the real APR pipe bucket implementation. */
-+static apr_status_t cgi_read_stdout(apr_bucket *a, apr_file_t *out,
-+                                    const char **str, apr_size_t *len)
-+{
-+    char *buf;
-+    apr_status_t rv;
-+
-+    *str = NULL;
-+    *len = APR_BUCKET_BUFF_SIZE;
-+    buf = apr_bucket_alloc(*len, a->list); /* XXX: check for failure? */
-+
-+    rv = apr_file_read(out, buf, len);
-+
-+    if (rv != APR_SUCCESS && rv != APR_EOF) {
-+        apr_bucket_free(buf);
-+        return rv;
-+    }
-+
-+    if (*len > 0) {
-+        struct cgi_bucket_data *data = a->data;
-+        apr_bucket_heap *h;
-+
-+        /* Change the current bucket to refer to what we read */
-+        a = apr_bucket_heap_make(a, buf, *len, apr_bucket_free);
-+        h = a->data;
-+        h->alloc_len = APR_BUCKET_BUFF_SIZE; /* note the real buffer size */
-+        *str = buf;
-+        APR_BUCKET_INSERT_AFTER(a, cgi_bucket_dup(data, a->list));
-+    }
-+    else {
-+        apr_bucket_free(buf);
-+        a = apr_bucket_immortal_make(a, "", 0);
-+        *str = a->data;
-+    }
-+    return rv;
-+}
-+
-+/* Read method of CGI bucket: polls on stderr and stdout of the child,
-+ * sending any stderr output immediately away to the error log. */
-+static apr_status_t cgi_bucket_read(apr_bucket *b, const char **str,
-+                                    apr_size_t *len, apr_read_type_e block)
-+{
-+    struct cgi_bucket_data *data = b->data;
-+    apr_interval_time_t timeout;
-+    apr_status_t rv;
-+    int gotdata = 0;
-+
-+    timeout = block == APR_NONBLOCK_READ ? 0 : data->r->server->timeout;
-+
-+    do {
-+        const apr_pollfd_t *results;
-+        apr_int32_t num;
-+
-+        rv = apr_pollset_poll(data->pollset, timeout, &num, &results);
-+        if (APR_STATUS_IS_TIMEUP(rv)) {
-+            return timeout == 0 ? APR_EAGAIN : rv;
-+        }
-+        else if (APR_STATUS_IS_EINTR(rv)) {
-+            continue;
-+        }
-+        else if (rv != APR_SUCCESS) {
-+            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, data->r,
-+                          "poll failed waiting for CGI child");
-+            return rv;
-+        }
-+        
-+        for (; num; num--, results++) {
-+            if (results[0].client_data == (void *)1) {
-+                /* stdout */
-+                rv = cgi_read_stdout(b, results[0].desc.f, str, len);
-+                if (APR_STATUS_IS_EOF(rv)) {
-+                    rv = APR_SUCCESS;
-+                }
-+                gotdata = 1;
-+            } else {
-+                /* stderr */
-+                apr_status_t rv2 = log_script_err(data->r, results[0].desc.f);
-+                if (APR_STATUS_IS_EOF(rv2)) {
-+                    apr_pollset_remove(data->pollset, &results[0]);
-+                }
-+            }
-+        }
-+
-+    } while (!gotdata);
-+
-+    return rv;
-+}
-+
-+static const apr_bucket_type_t bucket_type_cgi = {
-+    "CGI", 5, APR_BUCKET_DATA,
-+    apr_bucket_destroy_noop,
-+    cgi_bucket_read,
-+    apr_bucket_setaside_notimpl,
-+    apr_bucket_split_notimpl,
-+    apr_bucket_copy_notimpl
-+};
-+
-+#endif
-+
- static int cgi_handler(request_rec *r)
- {
-     int nph;
-@@ -556,6 +726,7 @@
-     cgi_server_conf *conf;
-     apr_status_t rv;
-     cgi_exec_info_t e_info;
-+    conn_rec *c = r->connection;
- 
-     if(strcmp(r->handler, CGI_MAGIC_TYPE) && strcmp(r->handler, "cgi-script"))
-         return DECLINED;
-@@ -637,7 +808,7 @@
-     /* Transfer any put/post args, CERN style...
-      * Note that we already ignore SIGPIPE in the core server.
-      */
--    bb = apr_brigade_create(r->pool, r->connection->bucket_alloc);
-+    bb = apr_brigade_create(r->pool, c->bucket_alloc);
-     seen_eos = 0;
-     child_stopped_reading = 0;
-     if (conf->logname) {
-@@ -710,18 +881,28 @@
-     apr_file_flush(script_out);
-     apr_file_close(script_out);
- 
-+    AP_DEBUG_ASSERT(script_in != NULL);
-+
-+    apr_brigade_cleanup(bb);
-+
-+#if APR_FILES_AS_SOCKETS
-+    apr_file_pipe_timeout_set(script_in, 0);
-+    apr_file_pipe_timeout_set(script_err, 0);
-+    
-+    b = cgi_bucket_create(r, script_in, script_err, c->bucket_alloc);
-+#else
-+    b = apr_bucket_pipe_create(script_in, c->bucket_alloc);
-+#endif
-+    APR_BRIGADE_INSERT_TAIL(bb, b);
-+    b = apr_bucket_eos_create(c->bucket_alloc);
-+    APR_BRIGADE_INSERT_TAIL(bb, b);
-+
-     /* Handle script return... */
--    if (script_in && !nph) {
--        conn_rec *c = r->connection;
-+    if (!nph) {
-         const char *location;
-         char sbuf[MAX_STRING_LEN];
-         int ret;
- 
--        b = apr_bucket_pipe_create(script_in, c->bucket_alloc);
--        APR_BRIGADE_INSERT_TAIL(bb, b);
--        b = apr_bucket_eos_create(c->bucket_alloc);
--        APR_BRIGADE_INSERT_TAIL(bb, b);
--
-         if ((ret = ap_scan_script_header_err_brigade(r, bb, sbuf))) {
-             return log_script(r, conf, ret, dbuf, sbuf, bb, script_err);
-         }
-@@ -731,6 +912,7 @@
-         if (location && location[0] == '/' && r->status == 200) {
-             discard_script_output(bb);
-             apr_brigade_destroy(bb);
-+            apr_file_pipe_timeout_set(script_err, r->server->timeout);
-             log_script_err(r, script_err);
-             /* This redirect needs to be a GET no matter what the original
-              * method was.
-@@ -757,22 +939,8 @@
-         }
- 
-         rv = ap_pass_brigade(r->output_filters, bb);
--
--        /* don't soak up script output if errors occurred
--         * writing it out...  otherwise, we prolong the
--         * life of the script when the connection drops
--         * or we stopped sending output for some other
--         * reason
--         */
--        if (rv == APR_SUCCESS && !r->connection->aborted) {
--            log_script_err(r, script_err);
--        }
--
--        apr_file_close(script_err);
-     }
--
--    if (script_in && nph) {
--        conn_rec *c = r->connection;
-+    else /* nph */ {
-         struct ap_filter_t *cur;
-         
-         /* get rid of all filters up through protocol...  since we
-@@ -786,13 +954,19 @@
-         }
-         r->output_filters = r->proto_output_filters = cur;
- 
--        bb = apr_brigade_create(r->pool, c->bucket_alloc);
--        b = apr_bucket_pipe_create(script_in, c->bucket_alloc);
--        APR_BRIGADE_INSERT_TAIL(bb, b);
--        b = apr_bucket_eos_create(c->bucket_alloc);
--        APR_BRIGADE_INSERT_TAIL(bb, b);
--        ap_pass_brigade(r->output_filters, bb);
-+        rv = ap_pass_brigade(r->output_filters, bb);
-+    }
-+
-+    /* don't soak up script output if errors occurred writing it
-+     * out...  otherwise, we prolong the life of the script when the
-+     * connection drops or we stopped sending output for some other
-+     * reason */
-+    if (rv == APR_SUCCESS && !r->connection->aborted) {
-+        apr_file_pipe_timeout_set(script_err, r->server->timeout);
-+        log_script_err(r, script_err);
-     }
-+    
-+    apr_file_close(script_err);
- 
-     return OK;                      /* NOT r->status, even if it has changed. */
- }
diff --git a/net-www/apache/files/robots.txt b/net-www/apache/files/robots.txt
deleted file mode 100644
index 77765194e2e2..000000000000
--- a/net-www/apache/files/robots.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/files/robots.txt,v 1.3 2004/07/18 04:20:47 dragonheart Exp $
-# exclude help system from robots
-User-agent: *
-Disallow: /manual/ 
-Disallow: /doc/ 
-Disallow: /gif/
-# but allow htdig to index our doc-tree
-User-agent: susedig
-Disallow:
-# disallow stress test
-user-agent: stress-agent
-Disallow: /
diff --git a/net-www/apache/files/suexec.pam b/net-www/apache/files/suexec.pam
deleted file mode 100644
index 8cf0b817dc62..000000000000
--- a/net-www/apache/files/suexec.pam
+++ /dev/null
@@ -1,2 +0,0 @@
-#%PAM-1.0
-session   required   /lib/security/pam_limits.so
diff --git a/net-www/apache/files/suexec_pam_gentoo.patch b/net-www/apache/files/suexec_pam_gentoo.patch
deleted file mode 100644
index cad50147b683..000000000000
--- a/net-www/apache/files/suexec_pam_gentoo.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -ur apache_1.3.27/src/support/Makefile.tmpl apache_1.3.27.old/src/support/Makefile.tmpl~
---- apache_1.3.27/src/support/Makefile.tmpl	Sat Mar  2 20:46:23 2002
-+++ apache_1.3.27.old/src/support/Makefile.tmpl	Mon Nov  4 14:33:14 2002
-@@ -49,6 +49,8 @@
- 	    -e 's%@LDFLAGS_MOD_SHLIB@%$(LDFLAGS_MOD_SHLIB)%g' \
- 	    -e 's%@LIBS_SHLIB@%$(LIBS_SHLIB)%g' && chmod a+x apxs
- 
-+suexec: CFLAGS += -DSUEXEC_PAM_SESSION
-+suexec: LIBS += -lpam
- suexec: suexec.o
- 	$(CC) $(CFLAGS) -o suexec $(LDFLAGS) suexec.o $(LIBS)
- 
-diff -ur apache_1.3.27/src/support/suexec.c apache_1.3.27.old/src/support/suexec.c
---- apache_1.3.27/src/support/suexec.c	Mon Nov  4 14:30:16 2002
-+++ apache_1.3.27.old/src/support/suexec.c	Mon Nov  4 14:35:45 2002
-@@ -92,6 +92,10 @@
- #include <stdarg.h>
- #include <strings.h>
- 
-+#ifdef SUEXEC_PAM_SESSION
-+#include <security/pam_appl.h>
-+#endif
-+
- #include "suexec.h"
- 
- /*
-@@ -848,6 +852,43 @@
- #endif /* SUEXEC_UMASK */
-     clean_env();
- 
-+#ifdef SUEXEC_PAM_SESSION
-+    /*
-+     * Use PAM session support. Initial goal was to use the pam_limits module.
-+     */
-+
-+#ifndef PAM_SERVICE_NAME
-+#define PAM_SERVICE_NAME "suexec"
-+#endif /* PAM_SERVICE_NAME */
-+
-+#define PAM_CALL(call, name, err_code, do_end) \
-+    do \
-+    { \
-+       rc = (call); \
-+       if (rc != PAM_SUCCESS) \
-+       { \
-+           log_err("error: %s(): [%d] %s\n", (name), rc, pam_strerror(pamh, rc)); \
-+           (do_end) && pam_end(pamh, rc); \
-+           exit(err_code); \
-+	} \
-+    } while (0)
-+
-+    {
-+       int             rc;
-+       pam_handle_t    *pamh = NULL;
-+       struct pam_conv pamc = { NULL, NULL };
-+
-+       PAM_CALL(pam_start(PAM_SERVICE_NAME, actual_uname, &pamc, &pamh),
-+                "pam_start", 241, 0);
-+       PAM_CALL(pam_open_session(pamh, 0), "pam_open_session", 242, 1);
-+       PAM_CALL(pam_close_session(pamh, 0), "pam_close_session", 243, 1);
-+       PAM_CALL(pam_end(pamh, 0), "pam_end", 244, 0);
-+    }
-+
-+#undef PAM_CALL
-+#undef PAM_SERVICE_NAME
-+#endif /* SUEXEC_PAM_SESSION */
-+
-     /* 
-      * Be sure to close the log file so the CGI can't
-      * mess with it.  If the exec fails, it will be reopened