Clean out old versions.
authorBryan Østergaard <kloeri@gentoo.org>
Tue, 9 Jan 2007 14:35:51 +0000 (14:35 +0000)
committerBryan Østergaard <kloeri@gentoo.org>
Tue, 9 Jan 2007 14:35:51 +0000 (14:35 +0000)
Package-Manager: portage-2.1.2_rc4-r6

13 files changed:
net-www/apache/Manifest
net-www/apache/apache-1.3.34-r10.ebuild [deleted file]
net-www/apache/apache-1.3.34-r11.ebuild [deleted file]
net-www/apache/apache-2.0.54-r31.ebuild [deleted file]
net-www/apache/apache-2.0.58.ebuild [deleted file]
net-www/apache/apache-2.0.59.ebuild [deleted file]
net-www/apache/apache-2.2.2-r1.ebuild [deleted file]
net-www/apache/files/digest-apache-1.3.34-r10 [deleted file]
net-www/apache/files/digest-apache-1.3.34-r11 [deleted file]
net-www/apache/files/digest-apache-2.0.54-r31 [deleted file]
net-www/apache/files/digest-apache-2.0.58 [deleted file]
net-www/apache/files/digest-apache-2.0.59 [deleted file]
net-www/apache/files/digest-apache-2.2.2-r1 [deleted file]

index 31fee220def36f196000efc421320c6a288e677d..86f60ab2465a9e1da682c88ff8a57d3a4d1d3101 100644 (file)
@@ -1,36 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST apache_1.3.34.tar.gz 2468056 RMD160 e39dfc57b7f9164aa76641de3fa74f0314c9ec9e SHA1 df082b73f1220555dc416c0c5afa746e30a9e0de SHA256 ceed243f4f98e4323b48e5f7f80e306d1abb00c592e18de5575983db42d6f8d4
-DIST apache_1.3.37.tar.gz 2665370 RMD160 de84adf2fd0a745c32072ca5dc5e1374cfcf04f7 SHA1 b422fac1dda10baa483e8f4378dff58faf3f85b4 SHA256 9f27889bfbf418b987a892160e52fd217d66391df2870f3ecac877ef565c4bfc
-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-r14-20060726.tar.bz2 28001 RMD160 955a0ba00287db8859ce03ba6ccfdc2cfaa3bd12 SHA1 d05f1d554bc5b7021fa89750cd47e79aeecc94f7 SHA256 808e88b32d9ee7181d1cb789f24da21ccd059c8789eff9989bd92826fe826149
-DIST gentoo-apache-1.3.37-20060729.tar.bz2 27992 RMD160 fdb8c3690c8daad501339545b2e348d533d1be09 SHA1 05d3d2b4309365de54adfc5d1aba9ff4758fc3fc SHA256 00d759d184bec0c2aafbfaba2b748247ceae54bc04570d47979dc237b028ef2b
-DIST gentoo-apache-2.0.54-r31-20050918-02.tar.bz2 52990 RMD160 bc85ac9de56e017c035d798d9aa45cabab265006 SHA1 7ec8eb508404f572ad581446b12cf189c9e1c38c SHA256 23f2431f6285a24959a99ab9d55d52cef349e828bcb0e7bea026bbae14695ce5
-DIST gentoo-apache-2.0.58-20060515.tar.bz2 51174 RMD160 e029caa8107e37b66999935d6c1e9ed2e95351f0 SHA1 c88f42534f7419517905679f028be8b5754af962 SHA256 3d11702d3fd6b5c143b1c238e9b4a0d4bed2b3c4b9834efa6a3436cca492c0e5
-DIST gentoo-apache-2.0.58-r2-20060726.tar.bz2 58758 RMD160 46c6da577db444a6553b60d3ae30c61ae3b741fa SHA1 5399c6076fbccc36b1d8a5ed783f77918c3398eb SHA256 b8e0356e87fdd7b55fcecbee804c9a41525b3e6fe8309f87f2509abd161c8e6b
-DIST gentoo-apache-2.0.59-20060729.tar.bz2 58736 RMD160 f722780db04484f80caea7a6977017a7216e1344 SHA1 085c76939be1d3d77c615033b5c15a8b8c7b23cb SHA256 10ef9a3279bbe25b302ae72b3dbe0d91d24d163d23526287626669b9c0cc0c62
-DIST gentoo-apache-2.0.59-r2-20061102.tar.bz2 58768 RMD160 d20d39e66e3cb52befeb697133172c8d494e2c78 SHA1 1f8543ecdba7cef911456757a0d12e9c15abe355 SHA256 c8de97abe4077e2f6d827726a5fb0b03f6e8bd9514d8f9b9ca2a35a1c9698518
-DIST gentoo-apache-2.2.2-r1-20060726.tar.bz2 51572 RMD160 247f5766d7875f6f3a9c8b64170fa8354b33b661 SHA1 d73224457a307c71ddd30a6f9cdc31de8e855bcd SHA256 17e23002ac5fb31f07a02577bf78e9d5ea7fb6d8317743591baf68abefb37ab0
+DIST apache_1.3.34.tar.gz 2468056 RMD160 e39dfc57b7f9164aa76641de3fa74f0314c9ec9e SHA256 ceed243f4f98e4323b48e5f7f80e306d1abb00c592e18de5575983db42d6f8d4
+DIST apache_1.3.37.tar.gz 2665370 RMD160 de84adf2fd0a745c32072ca5dc5e1374cfcf04f7 SHA256 9f27889bfbf418b987a892160e52fd217d66391df2870f3ecac877ef565c4bfc
+DIST gentoo-apache-1.3.34-r14-20060726.tar.bz2 28001 RMD160 955a0ba00287db8859ce03ba6ccfdc2cfaa3bd12 SHA256 808e88b32d9ee7181d1cb789f24da21ccd059c8789eff9989bd92826fe826149
+DIST gentoo-apache-1.3.37-20060729.tar.bz2 27992 RMD160 fdb8c3690c8daad501339545b2e348d533d1be09 SHA256 00d759d184bec0c2aafbfaba2b748247ceae54bc04570d47979dc237b028ef2b
+DIST gentoo-apache-2.0.58-r2-20060726.tar.bz2 58758 RMD160 46c6da577db444a6553b60d3ae30c61ae3b741fa SHA256 b8e0356e87fdd7b55fcecbee804c9a41525b3e6fe8309f87f2509abd161c8e6b
+DIST gentoo-apache-2.0.59-r2-20061102.tar.bz2 58768 RMD160 d20d39e66e3cb52befeb697133172c8d494e2c78 SHA256 c8de97abe4077e2f6d827726a5fb0b03f6e8bd9514d8f9b9ca2a35a1c9698518
 DIST gentoo-apache-2.2.3-20060729.tar.bz2 51526 RMD160 c5f1e367e73090d378c461134961bc8c0a95396a SHA1 3088502349dd8df36bb97708bbc7bebef11709f0 SHA256 5194ef7b23b18b333b2864ccb45f90cf5bca1cfc4e65f6552eaa4561c107d24c
 DIST gentoo-apache-2.2.3-r1-20061126.tar.bz2 54107 RMD160 a44c10cd0f0bd7dc4695b1fb7bf79c31397a2791 SHA1 48580fac951d1ae8d3627a791a29519cf998c047 SHA256 18fbdf626494832cc2557b3bef2b6dfc687580d7754d0ea46309a4c00fa80e55
-DIST httpd-2.0.54.tar.bz2 5566979 RMD160 c511cb2fa396ba04caf77bfc6ca03413df48ea08 SHA1 15b4fc3024cceea6562fb03383fd624e84e5e35a SHA256 55a3d1c3fc4ff5ed5a4c4a20050ab68d98a10b2ab7d52f02a485da1a0fb060e3
-DIST httpd-2.0.58.tar.bz2 4704318 RMD160 2ff44b2254552db908f1defd09e3142527f9bf83 SHA1 697e1674f8efbbe05b9f6c1ba00cd28a37293229 SHA256 4f746715c408f4cac48099ea72560c50ef190568dfcfa8e0762bae66c0398029
+DIST httpd-2.0.58.tar.bz2 4704318 RMD160 2ff44b2254552db908f1defd09e3142527f9bf83 SHA256 4f746715c408f4cac48099ea72560c50ef190568dfcfa8e0762bae66c0398029
 DIST httpd-2.0.59.tar.bz2 4743549 RMD160 78b802354e338798a6978ece8b3568be97542174 SHA1 908209cd6e52f700d2a841a25de36e44d469c376 SHA256 bbac543ca9f80826f71eb16945610f8f90a36b346efc658be3b466ec0c990c0d
-DIST httpd-2.2.2.tar.bz2 4851887 RMD160 618e8365fe790f5fef8c329dc294be373d19acf2 SHA1 26544ebc5a9f8c383ffc247dcd47f65dae12a732 SHA256 51f8e00ca27ba4d4259daeff30ce6efcdcf086d277ffb7130e215b492a6f77cc
 DIST httpd-2.2.3.tar.bz2 4905728 RMD160 291e093f48d980daba482140581a525ecbfae4d2 SHA1 30d445302e63326d81705687ee734fdfb692dcde SHA256 dd86e8221f9efb85497c46229d0f04237d4e66d293fabe98eb0745166aaf4b6c
-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
-DIST mod_ssl-2.8.28-1.3.37.tar.gz 820417 RMD160 6b12c0a52fe0fbb7b91221d1cb37f93fbe59bb11 SHA1 9db2a7240e499da2b99d0df9c1a6fbae0580ba0b SHA256 76437105b5b5593a7dbd8ee45af417233897dcaf910cbc337a68b0db24e35489
-EBUILD apache-1.3.34-r10.ebuild 8736 RMD160 54bc1bfcb8e64eed044bf06eb755bc589119c064 SHA1 b5975bffedca5e1237820f36e869bd5832e19b2a SHA256 f7b86dcd487a55973e31f148a7e51fb4b097633dc46730d49f3f49420e1476c8
-MD5 d6411a62eda0981466975b843baa144c apache-1.3.34-r10.ebuild 8736
-RMD160 54bc1bfcb8e64eed044bf06eb755bc589119c064 apache-1.3.34-r10.ebuild 8736
-SHA256 f7b86dcd487a55973e31f148a7e51fb4b097633dc46730d49f3f49420e1476c8 apache-1.3.34-r10.ebuild 8736
-EBUILD apache-1.3.34-r11.ebuild 8877 RMD160 f1f6af8cfa2c12113feae085a813e035daa9c421 SHA1 499b3d2f550aa67f437c711eddbc1135de547315 SHA256 c680b0e3684775f359e11e79f0e1d7bbdecb045a88dfa9a8d5ffa967272caf76
-MD5 78a9a83e4d034ca23578beffda469f25 apache-1.3.34-r11.ebuild 8877
-RMD160 f1f6af8cfa2c12113feae085a813e035daa9c421 apache-1.3.34-r11.ebuild 8877
-SHA256 c680b0e3684775f359e11e79f0e1d7bbdecb045a88dfa9a8d5ffa967272caf76 apache-1.3.34-r11.ebuild 8877
+DIST lingerd-0.94.tar.gz 33938 RMD160 2d7363b763a68c0c7acdadc23779929f4d02153f SHA256 632030f9c1b9e8f817ee19bad74988f3dce7f6ec617677ad5a522e8d491382a0
+DIST mod_ssl-2.8.25-1.3.34.tar.gz 820352 RMD160 90a3913d30c7f4d194907463125c90101005837a SHA256 832b240157666efdbdfc1a2fd593ee4eebbc9441ec48ece8276660092b974d07
+DIST mod_ssl-2.8.28-1.3.37.tar.gz 820417 RMD160 6b12c0a52fe0fbb7b91221d1cb37f93fbe59bb11 SHA256 76437105b5b5593a7dbd8ee45af417233897dcaf910cbc337a68b0db24e35489
 EBUILD apache-1.3.34-r14.ebuild 8876 RMD160 ac9943037ebbe6fecf08d80294b859a68941ffd0 SHA1 4e9fa3ee8a72841077af7dfdd76f5e51a3cb011b SHA256 e898afa7e82964bee5c6f1491ee31b490b08119ca839cd0ad067d389c82f9ead
 MD5 95999893e99fae6382abb4da3fbc3405 apache-1.3.34-r14.ebuild 8876
 RMD160 ac9943037ebbe6fecf08d80294b859a68941ffd0 apache-1.3.34-r14.ebuild 8876
@@ -39,30 +23,14 @@ EBUILD apache-1.3.37.ebuild 9053 RMD160 d69ab0628df3af5e623440c3b8c3daf6a924fc82
 MD5 bdbbac828c5941aeea512ccca376cde5 apache-1.3.37.ebuild 9053
 RMD160 d69ab0628df3af5e623440c3b8c3daf6a924fc82 apache-1.3.37.ebuild 9053
 SHA256 87fa8da5883da8d0d1ad77ad7978051b61255eb4c20abc4cc7c52530d4787b13 apache-1.3.37.ebuild 9053
-EBUILD apache-2.0.54-r31.ebuild 13531 RMD160 d2c5162f30a80d1138839b45d7870122c42b52c1 SHA1 8e15efcff6a9dd5d7fc39e9d4d897c674fcd7c70 SHA256 d55ae988568eb8a6b48b84d696c3fd2a9ad598715bfafa240a937c958ee5bcb1
-MD5 14a6d5e53f28203e6ae728abafe5d521 apache-2.0.54-r31.ebuild 13531
-RMD160 d2c5162f30a80d1138839b45d7870122c42b52c1 apache-2.0.54-r31.ebuild 13531
-SHA256 d55ae988568eb8a6b48b84d696c3fd2a9ad598715bfafa240a937c958ee5bcb1 apache-2.0.54-r31.ebuild 13531
 EBUILD apache-2.0.58-r2.ebuild 13823 RMD160 89544f4f2c72e3201e7d597cbfeb41cc99c5c705 SHA1 e2d4fe68252153453c85c0315470cf98244f5d08 SHA256 fe8c445a032fa725ed1270b18ed12f28ce261b9f3de2d52f33dd9e37b78ecad7
 MD5 432e14d298b01e14fb26493f52f3faf5 apache-2.0.58-r2.ebuild 13823
 RMD160 89544f4f2c72e3201e7d597cbfeb41cc99c5c705 apache-2.0.58-r2.ebuild 13823
 SHA256 fe8c445a032fa725ed1270b18ed12f28ce261b9f3de2d52f33dd9e37b78ecad7 apache-2.0.58-r2.ebuild 13823
-EBUILD apache-2.0.58.ebuild 13744 RMD160 a6d9f7ab7374b9172e2305791c6e40bd39852576 SHA1 bd5cb7f677162a8f6a008f2f7d86e19a93aba901 SHA256 01008d6dd3283c582fb476ace5d8d229aa357ddc62d6a7a6f758ce764a9ae693
-MD5 838b96605f46629201c50f460b083eb6 apache-2.0.58.ebuild 13744
-RMD160 a6d9f7ab7374b9172e2305791c6e40bd39852576 apache-2.0.58.ebuild 13744
-SHA256 01008d6dd3283c582fb476ace5d8d229aa357ddc62d6a7a6f758ce764a9ae693 apache-2.0.58.ebuild 13744
 EBUILD apache-2.0.59-r2.ebuild 14070 RMD160 242378f61d0ab8247c56e8ab0a668fcef24c5c97 SHA1 02cf82f9bd851f7238712e5d49bce3f28fba3565 SHA256 917ebe9bdf0fb4badc32868a1933c566702f957b0354416b043c14bd78f43229
 MD5 154e3b9b3191e0d2ccfd532e46ab37b2 apache-2.0.59-r2.ebuild 14070
 RMD160 242378f61d0ab8247c56e8ab0a668fcef24c5c97 apache-2.0.59-r2.ebuild 14070
 SHA256 917ebe9bdf0fb4badc32868a1933c566702f957b0354416b043c14bd78f43229 apache-2.0.59-r2.ebuild 14070
-EBUILD apache-2.0.59.ebuild 14067 RMD160 46f7a4bd32e7be999927c0a746deed4e8ad520c0 SHA1 cb214610a19618a643225548460c540e062d2225 SHA256 8e28ec93914c9cbbc773f24810c2606494feb93366e503407bf44e09b87e526c
-MD5 e55308c6b2ff469c644ce70fe20ea3ad apache-2.0.59.ebuild 14067
-RMD160 46f7a4bd32e7be999927c0a746deed4e8ad520c0 apache-2.0.59.ebuild 14067
-SHA256 8e28ec93914c9cbbc773f24810c2606494feb93366e503407bf44e09b87e526c apache-2.0.59.ebuild 14067
-EBUILD apache-2.2.2-r1.ebuild 13917 RMD160 5161421d45b6cb90ef5d3d8bcc6a1c35dcf2b260 SHA1 5855016b752c600cc989e739840a43a99eb42b39 SHA256 81e670d086de3e0070729b54ed5c4e99d73d99a44bbe0d86af092adbcbd8f4c6
-MD5 e38650882542f572bfe56f47fb1b7bb6 apache-2.2.2-r1.ebuild 13917
-RMD160 5161421d45b6cb90ef5d3d8bcc6a1c35dcf2b260 apache-2.2.2-r1.ebuild 13917
-SHA256 81e670d086de3e0070729b54ed5c4e99d73d99a44bbe0d86af092adbcbd8f4c6 apache-2.2.2-r1.ebuild 13917
 EBUILD apache-2.2.3-r1.ebuild 15228 RMD160 7b42d9e35a41ded3fe417e17f16cb82b67c88e4d SHA1 fddf532cdbba0182210f2b0ad3936e3bd19ad4ea SHA256 afb92882b63f2c0d712740983b46063675be639501052983aeff5fb45fdedf7f
 MD5 220417e2c9c8cdf447896b6a00778a3e apache-2.2.3-r1.ebuild 15228
 RMD160 7b42d9e35a41ded3fe417e17f16cb82b67c88e4d apache-2.2.3-r1.ebuild 15228
@@ -71,44 +39,26 @@ EBUILD apache-2.2.3.ebuild 13997 RMD160 2fc33d3a695f9066d92274a887839160f08f9982
 MD5 90dd04754a5b1ad60227d057517a4191 apache-2.2.3.ebuild 13997
 RMD160 2fc33d3a695f9066d92274a887839160f08f9982 apache-2.2.3.ebuild 13997
 SHA256 dca0e620a5f7aa36f0050cf4eac138d0d23f12c888ead5ede311de32b2d890c2 apache-2.2.3.ebuild 13997
-MISC ChangeLog 86592 RMD160 4d38e64492816fe4636fd826d1511e433c79488e SHA1 8fc337d415f93553f13411b86bf2525bd5660876 SHA256 cc2dd70a5cb88ff3bb0327b6c3d082e2a5b85556a605426fd523191f37043ad5
-MD5 0bacbe438b2353935ea28ced345d0aa4 ChangeLog 86592
-RMD160 4d38e64492816fe4636fd826d1511e433c79488e ChangeLog 86592
-SHA256 cc2dd70a5cb88ff3bb0327b6c3d082e2a5b85556a605426fd523191f37043ad5 ChangeLog 86592
+MISC ChangeLog 86830 RMD160 511abdd3edb854b026560e4f462d0998d138a2ca SHA1 41bada20abd4157fd15a0ecb5de7a87c2fa95831 SHA256 63653b46b3a4feb8346143c6a7e4bcd5ede0a4d7e8f03d43ae4f2afabc4454be
+MD5 c5a19fa7cb2ce004cbfe9551aa32ec62 ChangeLog 86830
+RMD160 511abdd3edb854b026560e4f462d0998d138a2ca ChangeLog 86830
+SHA256 63653b46b3a4feb8346143c6a7e4bcd5ede0a4d7e8f03d43ae4f2afabc4454be ChangeLog 86830
 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 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
-MD5 4a0fbef84abd8df470ad998b705bcf88 files/digest-apache-1.3.34-r11 1045
-RMD160 e1ab04376bf7b8d1b5cc437159444e1f699e4da4 files/digest-apache-1.3.34-r11 1045
-SHA256 f572c9c3b245a86f11d6bb98b88a7280bdcfd168b372195fccbd3aa697712b5a files/digest-apache-1.3.34-r11 1045
 MD5 9898e1d5318e43832fc20c4e71e49110 files/digest-apache-1.3.34-r14 1045
 RMD160 e3177b6c4899756c982888044d1c321733d121ef files/digest-apache-1.3.34-r14 1045
 SHA256 06ec0bcb6e35bc9e1cb81c6d264bb4684bd766fda12aa1d788c1c2d35a9173dc files/digest-apache-1.3.34-r14 1045
 MD5 9f2ae7acf0bff8d41440c7060bc8e3e9 files/digest-apache-1.3.37 1033
 RMD160 b5831b6b0f2a18f0319f68e8ca60fc93a3fff3b1 files/digest-apache-1.3.37 1033
 SHA256 03b05d6906fa667af8af8d84f5a3150ccd924dedbb8c3dc8777a1a9381c95012 files/digest-apache-1.3.37 1033
-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 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
 MD5 0524614b17efc5f1bfa0d40607b87f41 files/digest-apache-2.0.58-r2 542
 RMD160 032bc41c0d58aa7e02d26e6798494cf838af864c files/digest-apache-2.0.58-r2 542
 SHA256 a168cb54770884f50f48411842613b904f1cbf24ca9596ea43b28eeed7688936 files/digest-apache-2.0.58-r2 542
-MD5 16816198f966a70f500b1b460ed40199 files/digest-apache-2.0.59 533
-RMD160 bab9bfe89f7a544c37105d66a10e01a0bc941356 files/digest-apache-2.0.59 533
-SHA256 9873a7f70a367c81172ae495807b3a2433c2b5006070489381e1a2f6cd9e4411 files/digest-apache-2.0.59 533
 MD5 fb6513d7e3c17a25d505a7c7a06d43d7 files/digest-apache-2.0.59-r2 542
 RMD160 124580b340dddc55cb1c92565a0de043a9b27ab1 files/digest-apache-2.0.59-r2 542
 SHA256 d3d9b85e6d0dc1610726f52d7f45f34e144351cf96d449bdabcd362482405cb5 files/digest-apache-2.0.59-r2 542
-MD5 f79fabc348ee9af7b4453493774e66d0 files/digest-apache-2.2.2-r1 536
-RMD160 35e1b80804733777550c22cb6bee1f48e6f89546 files/digest-apache-2.2.2-r1 536
-SHA256 ccf6b0ba8e729efd9a1837791145dd2dc056339b58ae166e677993500d22f971 files/digest-apache-2.2.2-r1 536
 MD5 2b4672f81e282ff8016bdf01018d7250 files/digest-apache-2.2.3 527
 RMD160 cb393c64814165541762b6b6d2c4952c5273aee3 files/digest-apache-2.2.3 527
 SHA256 a3cc6958b1fe0467e885412864c3f753a7cc7f2a0eba1b4f1633cac588463c4e files/digest-apache-2.2.3 527
@@ -118,7 +68,7 @@ SHA256 7a632ba04efc8017554a0f11673c7cca41cfc0e6cea299d8b2596888252854d9 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFossCyuNVb5qfaOYRAv/qAJ0VLzB5ys9R7i7x+6VxAPd4ds4H5wCfQPn7
-4VmTfXj5TrT2dlFlXl+A7t0=
-=l3y1
+iD8DBQFFo6fkugEuf3OQ0akRAl7kAKCHTwGNbgqmvpc0Vw0xq9JXst0hyACeNpMS
+Twmd8hLDHbenjCZG6xWPRxs=
+=iaFs
 -----END PGP SIGNATURE-----
diff --git a/net-www/apache/apache-1.3.34-r10.ebuild b/net-www/apache/apache-1.3.34-r10.ebuild
deleted file mode 100644 (file)
index c13856c..0000000
+++ /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.34-r10.ebuild,v 1.10 2006/09/20 05:11:35 vericgar Exp $
-
-inherit eutils fixheadtails multilib
-
-# latest gentoo apache files
-GENTOO_PATCHNAME="gentoo-apache-${PVR}"
-GENTOO_PATCHSTAMP="20051213"
-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.25
-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 s390 sh sparc x86"
-IUSE="doc ssl pam lingerd 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}-r10 )"
-
-S=${WORKDIR}/${PN}_${PV}
-
-pkg_setup() {
-       # setup apache user and group
-       enewgroup apache 81
-       enewuser apache 81 -1 /var/www apache
-}
-
-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"
-
-# no more USE=no-suexec because of bug 148082
-# see the 2.2 ebuilds for how this can be done cleanly with a working system
-# "out of the box"
-#      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
-}
-
-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() {
-
-       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.34-r11.ebuild b/net-www/apache/apache-1.3.34-r11.ebuild
deleted file mode 100644 (file)
index 34cbe86..0000000
+++ /dev/null
@@ -1,309 +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-r11.ebuild,v 1.12 2006/11/12 04:33:14 vapier Exp $
-
-inherit eutils fixheadtails multilib
-
-# latest gentoo apache files
-GENTOO_PATCHNAME="gentoo-apache-${PVR}"
-GENTOO_PATCHSTAMP="20060131"
-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.25
-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 s390 sh sparc x86"
-IUSE="doc ssl pam lingerd 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}-r10 )"
-
-S=${WORKDIR}/${PN}_${PV}
-
-pkg_setup() {
-       # setup apache user and group
-       enewgroup apache 81
-       enewuser apache 81 -1 /var/www apache
-}
-
-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"
-
-       # patch codes:
-       # 00-29 patches to work with gentoo
-       # 30-89 USE-flag patches
-       # 90-99 security patches
-       EPATCH_SUFFIX="patch"
-       epatch ${GENTOO_PATCHDIR}/patches/[0-2]*
-       epatch ${GENTOO_PATCHDIR}/patches/9*
-
-       # 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"
-
-# no more USE=no-suexec because of bug 148082
-# see the 2.2 ebuilds for how this can be done cleanly with a working system
-# "out of the box"
-#      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
-}
-
-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() {
-
-       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-2.0.54-r31.ebuild b/net-www/apache/apache-2.0.54-r31.ebuild
deleted file mode 100644 (file)
index 8082655..0000000
+++ /dev/null
@@ -1,445 +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-r31.ebuild,v 1.22 2006/09/20 05:11:34 vericgar Exp $
-
-inherit eutils gnuconfig multilib
-
-# latest gentoo apache files
-GENTOO_PATCHNAME="gentoo-apache-${PVR}"
-GENTOO_PATCHSTAMP="20050918-02"
-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 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
-
-       # setup apache user and group
-       enewgroup apache 81
-       enewuser apache 81 -1 /var/www apache
-}
-
-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
-
-# no more USE=no-suexec because of bug 148082
-# see the 2.2 ebuilds for how this can be done cleanly with a working system
-# "out of the box"
-#      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
-}
-
-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
-       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 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.58.ebuild b/net-www/apache/apache-2.0.58.ebuild
deleted file mode 100644 (file)
index 24ffe61..0000000
+++ /dev/null
@@ -1,452 +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.58.ebuild,v 1.11 2006/09/20 05:11:35 vericgar Exp $
-
-inherit eutils flag-o-matic gnuconfig multilib
-
-# latest gentoo apache files
-GENTOO_PATCHNAME="gentoo-apache-${PVR}"
-GENTOO_PATCHSTAMP="20060515"
-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 ssl static-modules threads selinux"
-
-RDEPEND="dev-lang/perl
-       ~dev-libs/apr-0.9.12
-       ~dev-libs/apr-util-0.9.12
-       dev-libs/expat
-       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
-
-}
-
-pkg_setup() {
-       big_fat_warnings
-       select_mpms
-
-       # setup apache user and group
-       enewgroup apache 81
-       enewuser apache 81 -1 /var/www apache
-}
-
-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() {
-
-       # bug 128505
-       filter-ldflags -Wl,--as-needed --as-needed
-
-       # 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
-       USERDIR="${USERDIR:-public_html}"
-
-       einfo "USERDIR is set to: ${USERDIR}"
-
-       select_mpms
-
-       # 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}"
-       useq ssl || myconf="${myconf} --disable-ssl"
-
-       # 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
-
-# no more USE=no-suexec because of bug 148082
-# see the 2.2 ebuilds for how this can be done cleanly with a working system
-# "out of the box"
-#      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
-}
-
-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
-
-       # the default webroot gets stored in /usr/share/doc
-       einfo "Installing default webroot to /usr/share/doc/${PF}"
-       mv ${D}/var/www/localhost ${D}/usr/share/doc/${PF}/webroot
-
-       # 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() {
-       # 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
-
-       # we do this here because the default webroot is a copy of the files
-       # that exist elsewhere and we don't want them managed/removed by portage
-       # when apache is upgraded.
-       if [ -e "${ROOT}/var/www/localhost" ]; then
-               einfo "The default webroot has not been installed into"
-               einfo "${ROOT}/var/www/localhost because the directory already exists"
-               einfo "and we do not want to overwrite any files you have put there."
-               einfo
-               einfo "If you would like to install the latest webroot, please run"
-               einfo "emerge --config =${PF}"
-       else
-               einfo "Installing default webroot to ${ROOT}/var/www/localhost"
-               mkdir -p ${ROOT}/var/www/localhost
-               cp -r ${ROOT}/usr/share/doc/${PF}/webroot/* ${ROOT}/var/www/localhost
-               chown -R apache: ${ROOT}/var/www/localhost
-       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
-}
-
-pkg_config() {
-
-       einfo "Installing default webroot to ${ROOT}/var/www/localhost"
-       mkdir -p ${ROOT}/var/www/localhost
-       cp -r ${ROOT}/usr/share/doc/${PF}/webroot/* ${ROOT}/var/www/localhost
-       chown -R apache: ${ROOT}/var/www/localhost
-
-}
-
-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."
-}
-
-select_mpms() {
-
-       mpm=""
-
-       for trympm in prefork worker peruser threadpool leader; do
-               if useq mpm-${trympm}; then
-                       if [ "x${mpm}" = "x" ]; then
-                               mpm=${trympm}
-                       else
-                               mpm_die ${trympm} ${mpm}
-                       fi
-               fi
-       done
-
-       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.59.ebuild b/net-www/apache/apache-2.0.59.ebuild
deleted file mode 100644 (file)
index 275c0ef..0000000
+++ /dev/null
@@ -1,461 +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.59.ebuild,v 1.2 2006/09/20 05:11:35 vericgar Exp $
-
-inherit eutils flag-o-matic gnuconfig multilib
-
-# latest gentoo apache files
-GENTOO_PATCHNAME="gentoo-apache-${PVR}"
-GENTOO_PATCHSTAMP="20060729"
-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-itk mpm-leader mpm-peruser mpm-prefork mpm-threadpool mpm-worker ssl static-modules threads selinux"
-
-RDEPEND="dev-lang/perl
-       ~dev-libs/apr-0.9.12
-       ~dev-libs/apr-util-0.9.12
-       dev-libs/expat
-       app-misc/mime-types
-       sys-libs/zlib
-       mpm-itk? ( sys-libs/libcap )
-       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 || use mpm-itk; then
-               ewarn "-BIG- -FAT- -WARNING-"
-               ewarn
-               ewarn "The peruser (USE=mpm-peruser) and itk (USE=mpm-itk) MPMs are considered"
-               ewarn "highly experimental and are not (yet) supported, nor are they recommended"
-               ewarn "for production use. You have been warned!"
-               ewarn
-               ewarn "Continuing in 5 seconds ..."
-               sleep 5
-       fi
-
-}
-
-pkg_setup() {
-       big_fat_warnings
-       select_mpms
-
-       # setup apache user and group
-       enewgroup apache 81
-       enewuser apache 81 -1 /var/www apache
-
-}
-
-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-8]* || die "internal ebuild error"
-
-       # security patches are version based
-       # 99_all_${PV}_Name.patch
-       if $(ls ${GENTOO_PATCHDIR}/patches/9?_*_${PV}_* &>/dev/null); then
-               epatch ${GENTOO_PATCHDIR}/patches/9?_*_${PV}_* || \
-                       die "Patching for version ${PV} failed"
-       fi
-
-       # 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() {
-
-       # bug 128505
-       filter-ldflags -Wl,--as-needed --as-needed
-
-       # 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
-       USERDIR="${USERDIR:-public_html}"
-
-       einfo "USERDIR is set to: ${USERDIR}"
-
-       select_mpms
-
-       # 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}"
-       useq ssl || myconf="${myconf} --disable-ssl"
-
-       # 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
-
-# no more USE=no-suexec because of bug 148082
-# see the 2.2 ebuilds for how this can be done cleanly with a working system
-# "out of the box"
-#      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
-}
-
-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
-
-       # the default webroot gets stored in /usr/share/doc
-       einfo "Installing default webroot to /usr/share/doc/${PF}"
-       mv ${D}/var/www/localhost ${D}/usr/share/doc/${PF}/webroot
-
-       # 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() {
-       # 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
-
-       # we do this here because the default webroot is a copy of the files
-       # that exist elsewhere and we don't want them managed/removed by portage
-       # when apache is upgraded.
-       if [ -e "${ROOT}/var/www/localhost" ]; then
-               einfo "The default webroot has not been installed into"
-               einfo "${ROOT}/var/www/localhost because the directory already exists"
-               einfo "and we do not want to overwrite any files you have put there."
-               einfo
-               einfo "If you would like to install the latest webroot, please run"
-               einfo "emerge --config =${PF}"
-       else
-               einfo "Installing default webroot to ${ROOT}/var/www/localhost"
-               mkdir -p ${ROOT}/var/www/localhost
-               cp -r ${ROOT}/usr/share/doc/${PF}/webroot/* ${ROOT}/var/www/localhost
-               chown -R apache: ${ROOT}/var/www/localhost
-       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
-}
-
-pkg_config() {
-
-       einfo "Installing default webroot to ${ROOT}/var/www/localhost"
-       mkdir -p ${ROOT}/var/www/localhost
-       cp -r ${ROOT}/usr/share/doc/${PF}/webroot/* ${ROOT}/var/www/localhost
-       chown -R apache: ${ROOT}/var/www/localhost
-
-}
-
-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."
-}
-
-select_mpms() {
-
-       mpm=""
-
-       for trympm in prefork worker peruser threadpool leader itk; do
-               if useq mpm-${trympm}; then
-                       if [ "x${mpm}" = "x" ]; then
-                               mpm=${trympm}
-                       else
-                               mpm_die ${trympm} ${mpm}
-                       fi
-               fi
-       done
-
-       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.2.2-r1.ebuild b/net-www/apache/apache-2.2.2-r1.ebuild
deleted file mode 100644 (file)
index be0f68c..0000000
+++ /dev/null
@@ -1,491 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.2.2-r1.ebuild,v 1.2 2007/01/08 23:28:41 phreak Exp $
-
-inherit eutils flag-o-matic gnuconfig multilib autotools
-
-WANT_AUTOCONF="2.5"
-
-# latest gentoo apache files
-GENTOO_PATCHNAME="gentoo-apache-${PVR}"
-GENTOO_PATCHSTAMP="20060726"
-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"
-
-# some helper scripts are apache-1.1, thus both are here
-LICENSE="Apache-2.0 Apache-1.1"
-
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="debug doc ldap no-suexec ssl static-modules threads selinux mpm-prefork mpm-worker mpm-event mpm-peruser"
-
-RDEPEND="dev-lang/perl
-       >=dev-libs/apr-1.2.7
-       >=dev-libs/apr-util-1.2.7
-       dev-libs/expat
-       dev-libs/libpcre
-       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}"
-
-
-
-pkg_setup() {
-       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
-
-       # select our MPM
-       MPM_LIST="prefork worker event peruser"
-       for x in ${MPM_LIST}; do
-               if useq mpm-${x}; then
-                       if [ "x${mpm}" == "x" ]; then
-                               mpm=${x}
-                               einfo "Selected MPM: ${mpm}"
-                       else
-                               eerror "You have selected more then one mpm USE-flag."
-                               eerror "Only one MPM is supported."
-                               die "more then one mpm was specified"
-                       fi
-               fi
-       done
-
-       if [ "x${mpm}" == "x" ]; then
-               if useq "threads"; then
-                       mpm=worker
-                       einfo "Selected default threaded MPM: ${mpm}";
-               else
-                       mpm=prefork
-                       einfo "Selected default MPM: ${mpm}";
-               fi
-       fi
-
-       # setup apache user and group
-       enewgroup apache 81
-       enewuser apache 81 -1 /var/www apache
-}
-
-
-
-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,scripts/Makefile.suexec,scripts/suexec2-config} \
-               || die "sed failed"
-
-
-       #### Patch Organization
-       # 00-19 Gentoo specific  (00_all_some-title.patch)
-       # 20-39 Additional MPMs  (20_all_${MPM}_some-title.patch)
-       # 40-59 USE-flag based   (40_all_${USE}_some-title.patch)
-       # 60-79 Version specific (60_all_${PV}_some-title.patch)
-       # 80-99 Security patches (80_all_${PV}_cve-####-####.patch)
-
-       EPATCH_SUFFIX="patch"
-       epatch ${GENTOO_PATCHDIR}/patches/[0-1]* || die "Patching failed"
-       if $(ls ${GENTOO_PATCHDIR}/patches/[2-3]?_*_${mpm}_* &>/dev/null); then
-               epatch ${GENTOO_PATCHDIR}/patches/[2-3]?_*_${mpm}_* || \
-               die "MPM ${mpm} Patching failed"
-       fi
-       for uf in ${IUSE}; do
-               if useq ${uf} && $(ls ${GENTOO_PATCHDIR}/patches/[4-5]?_*_${uf}_* &>/dev/null)
-               then
-                       epatch ${GENTOO_PATCHDIR}/patches/[4-5]?_*_${uf}_* || \
-                       die "USE=\"${uf}\" Patching failed"
-               fi
-       done
-       if $(ls ${GENTOO_PATCHDIR}/patches/[6-9]?_*_${PV}_* &>/dev/null); then
-               epatch ${GENTOO_PATCHDIR}/patches/[6-9]?_*_${PV}_* || \
-               die "Version ${PV} Patching failed"
-       fi
-
-
-       # 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
-
-       # patched-in MPMs need the build environment rebuilt
-       sed -i -e '/sinclude/d' configure.in
-       AT_GNUCONF_UPDATE=yes AT_M4DIR=build WANT_AUTOCONF=2.5 eautoreconf
-
-}
-
-
-
-src_compile() {
-
-       local modtype
-       if useq static-modules; then
-               modtype="static"
-       else
-               modtype="shared"
-       fi
-
-       select_modules_config || die "determining modules failed"
-
-       local myconf
-       useq ldap && mods="${mods} ldap authnz-ldap" && \
-               myconf="${myconf} --enable-authnz-ldap=${modtype}" && \
-               myconf="${myconf} --enable-ldap=${modtype}"
-       useq ssl && mods="${mods} 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
-               mods="${mods} suexec"
-               myconf="${myconf} $(${GENTOO_PATCHDIR}/scripts/suexec2-config --config)"
-
-               myconf="${myconf}
-                               --with-suexec-bin=/usr/sbin/suexec2 \
-                               --enable-suexec=${modtype}"
-       fi
-
-       # common confopts
-       myconf="${myconf} \
-                       --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 \
-                       --host=${CHOST} ${MY_BUILTINS} \
-                       --with-apr=/usr \
-                       --with-apr-util=/usr \
-                       --with-pcre=/usr "
-
-       # 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"
-
-       sed -i -e 's:apache2\.conf:httpd.conf:' include/ap_config_auto.h
-
-       emake || die "problem compiling apache2"
-
-}
-
-src_install () {
-
-       #### DEFAULT SETUP & INSTALL
-
-       # general install
-       einfo "Beginning install phase"
-       make DESTDIR=${D} install || die
-
-       #### CLEAN-UP
-       rm -rf ${D}/etc
-       rm ${D}/usr/sbin/envvars*
-       rm ${D}/usr/sbin/apachectl
-
-       #### CONFIGURATION
-       einfo "Setting up configuration"
-       insinto /etc/apache2
-
-       # restore the magic file
-       doins docs/conf/magic
-
-
-       # This is a mapping of module names to the -D option in APACHE2_OPTS
-       # Used for creating optional LoadModule lines
-       mod_defines="info:INFO status:INFO
-                               ldap:LDAP authnz-ldap:AUTH_LDAP
-                               proxy:PROXY proxy_connect:PROXY proxy_http:PROXY
-                               ssl:SSL
-                               suexec:SUEXEC
-                               userdir:USERDIR"
-
-       # create our LoadModule lines
-       if ! useq static-modules; then
-       load_module=''
-       moddir="${D}/usr/$(get_libdir)/apache2/modules"
-       for m in ${mods}; do
-               endid="no"
-
-               if [ -e "${moddir}/mod_${m}.so" ]; then
-                       for def in ${mod_defines}; do
-                               if [ "${m}" == "${def%:*}" ]; then
-                                       load_module="${load_module}\n<IfDefine ${def#*:}>"
-                                       endid="yes"
-                               fi
-                       done
-                       load_module="${load_module}\nLoadModule ${m}_module modules/mod_${m}.so"
-                       if [ "${endid}" == "yes" ]; then
-                               load_module="${load_module}\n</IfDefine>"
-                       fi
-               fi
-       done
-       fi
-       sed -i -e "s:%%LOAD_MODULE%%:${load_module}:" \
-               ${GENTOO_PATCHDIR}/conf/httpd.conf || die "sed failed"
-
-       # install our configuration     
-       doins -r ${GENTOO_PATCHDIR}/conf/*
-
-       insinto /etc/logrotate.d
-       newins ${GENTOO_PATCHDIR}/scripts/apache2-logrotate apache2
-
-       # generate a sane default APACHE2_OPTS
-       APACHE2_OPTS="-D DEFAULT_VHOST -D INFO -D LANGUAGE"
-       useq doc && APACHE2_OPTS="${APACHE2_OPTS} -D MANUAL"
-       useq ssl && APACHE2_OPTS="${APACHE2_OPTS} -D SSL -D SSL_DEFAULT_VHOST"
-       useq no-suexec || APACHE2_OPTS="${APACHE2_OPTS} -D SUEXEC"
-
-       sed -i -e "s:APACHE2_OPTS=\".*\":APACHE2_OPTS=\"${APACHE2_OPTS}\":" \
-               ${GENTOO_PATCHDIR}/init/apache2.confd \
-               || die "sed failed"
-
-       mv ${D}/etc/apache2/apache2-builtin-mods ${D}/etc/apache2/apache2-builtin-mods-2.2
-
-       newconfd ${GENTOO_PATCHDIR}/init/apache2.confd apache2
-       newinitd ${GENTOO_PATCHDIR}/init/apache2.initd apache2
-
-
-       #### HELPER SCRIPTS
-       einfo "Installing helper scripts"
-       exeinto /usr/sbin
-       for i in apache2logserverstatus apache2splitlogfile suexec2-config; do
-               doexe ${GENTOO_PATCHDIR}/scripts/${i}
-       done
-       useq ssl && doexe ${GENTOO_PATCHDIR}/scripts/gentestcrt.sh
-
-       for i in logresolve.pl split-logfile log_server_status; do
-               doexe support/${i}
-       done
-
-       # needed for suexec2-config
-       insinto /usr/$(get_libdir)/apache2/build
-       doins ${GENTOO_PATCHDIR}/scripts/Makefile.suexec
-       doins support/suexec.c
-
-
-       #### SLOTTING
-       einfo "Applying SLOT=2"
-       cd ${D}
-
-       # sbin binaries
-       slotmv="apxs htpasswd htdigest rotatelogs logresolve log_server_status
-                       ab checkgid dbmmanage split-logfile suexec"
-       for i in ${slotmv}; do
-               mv usr/sbin/${i} usr/sbin/${i}2
-       done
-       mv usr/sbin/logresolve.pl usr/sbin/logresolve2.pl
-
-       # man.1
-       for i in dbmmanage htdigest htpasswd; do
-               mv usr/share/man/man1/${i}.1 usr/share/man/man1/${i}2.1
-       done
-
-       # man.8
-       for i in ab apxs logresolve rotatelogs suexec; do
-               mv usr/share/man/man8/${i}.8 usr/share/man/man8/${i}2.8
-       done
-
-       mv usr/share/man/man8/httpd.8 usr/share/man/man8/apache2.8
-       mv usr/share/man/man8/apachectl.8 usr/share/man/man8/apache2ctl.8
-
-
-
-       #### DOCS
-       # basic info
-       einfo "Installing docs"
-       cd ${S}
-       dodoc ABOUT_APACHE CHANGES LAYOUT README README.platforms VERSIONING
-
-       # drop in a convenient link to the manual
-       if useq doc; then
-               sed -i -e "s:VERSION:${PVR}:" ${D}/etc/apache2/modules.d/00_apache_manual.conf
-       else
-               einfo "USE=-docs :: Removing Manual"
-               rm ${D}/etc/apache2/modules.d/00_apache_manual.conf
-               rm -rf ${D}/usr/share/doc/${PF}/manual
-       fi
-
-       # the default webroot gets stored in /usr/share/doc
-       einfo "Installing default webroot to /usr/share/doc/${PF}"
-       mv ${D}/var/www/localhost ${D}/usr/share/doc/${PF}/webroot
-
-
-       #### PERMISSONS
-       einfo "Applying permissions"
-
-
-       # protect the suexec binary
-       if ! useq no-suexec; then
-               fowners root:apache /usr/sbin/suexec2
-               fperms 4710 /usr/sbin/suexec2
-       fi
-
-       keepdir /etc/apache2/vhosts.d
-       keepdir /etc/apache2/modules.d
-
-       # 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
-
-       fperms 755 /usr/sbin/apache2logserverstatus
-       fperms 755 /usr/sbin/apache2splitlogfile
-
-}
-
-pkg_postinst() {
-       # 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
-
-       # we do this here because the default webroot is a copy of the files
-       # that exist elsewhere and we don't want them managed/removed by portage
-       # when apache is upgraded.
-       if [ -e "${ROOT}/var/www/localhost" ]; then
-               einfo "The default webroot has not been installed into"
-               einfo "${ROOT}/var/www/localhost because the directory already exists"
-               einfo "and we do not want to overwrite any files you have put there."
-               einfo
-               einfo "If you would like to install the latest webroot, please run"
-               einfo "emerge --config =${PF}"
-       else
-               einfo "Installing default webroot to ${ROOT}/var/www/localhost"
-               cp -r ${ROOT}/usr/share/doc/${PF}/webroot/* ${ROOT}/var/www/localhost
-               chown -R apache: ${ROOT}/var/www/localhost
-       fi
-
-       # Check for dual/upgrade install
-       # The hasq is a hack so we don't throw QA warnings for not putting
-       # apache2 in IUSE - the only use of the flag is this warning
-       if has_version '=net-www/apache-1*' || ! hasq apache2 ${USE}; 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
-
-
-       if has_version '<net-www/apache-2.2.0'; then
-               einfo
-               einfo "When upgrading from versions below 2.2.0 to this version, you"
-               einfo "need to rebuild all your modules. Please do so for your modules"
-               einfo "to continue working correctly."
-               einfo
-               einfo "Also note that some configuration directives have been"
-               einfo "split into thier own files under /etc/apache2/modules.d"
-               einfo
-               einfo "For more information on what you may need to change, please"
-               einfo "see the overview of changes at:"
-               einfo "http://httpd.apache.org/docs/2.2/new_features_2_2.html"
-               einfo
-       fi
-
-}
-
-
-pkg_config() {
-
-       einfo "Installing default webroot to ${ROOT}/var/www/localhost"
-       cp -r ${ROOT}/usr/share/doc/${PF}/webroot/* ${ROOT}/var/www/localhost
-       chown -R apache: ${ROOT}/var/www/localhost
-
-}
-
-
-
-
-
-parse_modules_config() {
-       local name=""
-       local disable=""
-       local version="undef"
-       MY_BUILTINS=""
-       mods=""
-       [ -f "${1}" ] || return 1
-
-       for i in $(sed 's/#.*//' < $1); do
-
-               if [ "$i" == "VERSION:" ]; then
-                       version="select"
-               elif [ "${version}" == "select" ]; then
-                       version=$i
-               # start with - option for backwards compatibility only
-               elif [ "$i" == "-" ]; then
-                       disable="true"
-               elif [ -z "${name}" ] && [ "$i" != "${i/mod_/}" ]; then
-                       name="${i/mod_/}"
-               elif [ -n "${disable}" ] || [ "$i" == "disabled" ]; 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"
-                       mods="${mods} ${name}"
-                       name="" ; disable=""
-               else
-                       ewarn "Parse error in ${1} - unknown option: $i";
-               fi
-       done
-
-       # reject the file if it's unversioned or doesn't match our
-       # package major.minor. This is to make upgrading work smoothly.
-       if [ "${version}" != "${PV%.*}" ]; then
-               mods=""
-               MY_BUILTINS=""
-               return 1
-       fi
-
-       einfo "Using ${1}"
-       einfo "options: ${MY_BUILTINS}"
-       einfo "LoadModules: ${mods}"
-}
-
-select_modules_config() {
-       parse_modules_config /etc/apache2/apache2-builtin-mods-2.2 || \
-       parse_modules_config ${GENTOO_PATCHDIR}/conf/apache2-builtin-mods || \
-       return 1
-}
-
-# vim:ts=4
diff --git a/net-www/apache/files/digest-apache-1.3.34-r10 b/net-www/apache/files/digest-apache-1.3.34-r10
deleted file mode 100644 (file)
index 2af33de..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-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 40a56660a65106c273af08ddb9d8a117 gentoo-apache-1.3.34-r10-20051213.tar.bz2 27570
-RMD160 a45c59edcd7f5744f52ebced3ffb7f6b67e21a23 gentoo-apache-1.3.34-r10-20051213.tar.bz2 27570
-SHA256 111d9cdfac6782bc8720acc6b20d2a1de9c310f0d2f18228f29bf3824c74635f gentoo-apache-1.3.34-r10-20051213.tar.bz2 27570
-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 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-r11 b/net-www/apache/files/digest-apache-1.3.34-r11
deleted file mode 100644 (file)
index 5b9cb20..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-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 31d6e4403f7fb24b67024c264ab73ecb gentoo-apache-1.3.34-r11-20060131.tar.bz2 27897
-RMD160 bbb33be5ac758f71041fc6a1b0eb79f24a235ea3 gentoo-apache-1.3.34-r11-20060131.tar.bz2 27897
-SHA256 aad479c67c8ffe59312d107094f86d4cf76fe2e046cb98d297d8e526fc85f9a7 gentoo-apache-1.3.34-r11-20060131.tar.bz2 27897
-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 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-r31 b/net-www/apache/files/digest-apache-2.0.54-r31
deleted file mode 100644 (file)
index f87e9e0..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 30168238d0ca6ad165e3dcc46c61de01 gentoo-apache-2.0.54-r31-20050918-02.tar.bz2 52990
-RMD160 bc85ac9de56e017c035d798d9aa45cabab265006 gentoo-apache-2.0.54-r31-20050918-02.tar.bz2 52990
-SHA256 23f2431f6285a24959a99ab9d55d52cef349e828bcb0e7bea026bbae14695ce5 gentoo-apache-2.0.54-r31-20050918-02.tar.bz2 52990
-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.58 b/net-www/apache/files/digest-apache-2.0.58
deleted file mode 100644 (file)
index 814eb92..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 04066f6949eea2faa7a05d4d3e789ad4 gentoo-apache-2.0.58-20060515.tar.bz2 51174
-RMD160 e029caa8107e37b66999935d6c1e9ed2e95351f0 gentoo-apache-2.0.58-20060515.tar.bz2 51174
-SHA256 3d11702d3fd6b5c143b1c238e9b4a0d4bed2b3c4b9834efa6a3436cca492c0e5 gentoo-apache-2.0.58-20060515.tar.bz2 51174
-MD5 ac732a8b3ec5760baa582888f5dbad66 httpd-2.0.58.tar.bz2 4704318
-RMD160 2ff44b2254552db908f1defd09e3142527f9bf83 httpd-2.0.58.tar.bz2 4704318
-SHA256 4f746715c408f4cac48099ea72560c50ef190568dfcfa8e0762bae66c0398029 httpd-2.0.58.tar.bz2 4704318
diff --git a/net-www/apache/files/digest-apache-2.0.59 b/net-www/apache/files/digest-apache-2.0.59
deleted file mode 100644 (file)
index 4ab88ab..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 f75d168ba9e49a16951344b658b62d11 gentoo-apache-2.0.59-20060729.tar.bz2 58736
-RMD160 f722780db04484f80caea7a6977017a7216e1344 gentoo-apache-2.0.59-20060729.tar.bz2 58736
-SHA256 10ef9a3279bbe25b302ae72b3dbe0d91d24d163d23526287626669b9c0cc0c62 gentoo-apache-2.0.59-20060729.tar.bz2 58736
-MD5 b0200a497d1c89daad680c676d32a6df httpd-2.0.59.tar.bz2 4743549
-RMD160 78b802354e338798a6978ece8b3568be97542174 httpd-2.0.59.tar.bz2 4743549
-SHA256 bbac543ca9f80826f71eb16945610f8f90a36b346efc658be3b466ec0c990c0d httpd-2.0.59.tar.bz2 4743549
diff --git a/net-www/apache/files/digest-apache-2.2.2-r1 b/net-www/apache/files/digest-apache-2.2.2-r1
deleted file mode 100644 (file)
index 7a54350..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 47d4ec48c2742ab605dc6fc1ab7f3575 gentoo-apache-2.2.2-r1-20060726.tar.bz2 51572
-RMD160 247f5766d7875f6f3a9c8b64170fa8354b33b661 gentoo-apache-2.2.2-r1-20060726.tar.bz2 51572
-SHA256 17e23002ac5fb31f07a02577bf78e9d5ea7fb6d8317743591baf68abefb37ab0 gentoo-apache-2.2.2-r1-20060726.tar.bz2 51572
-MD5 9c759a9744436de6a6aa2ddbc49d6e81 httpd-2.2.2.tar.bz2 4851887
-RMD160 618e8365fe790f5fef8c329dc294be373d19acf2 httpd-2.2.2.tar.bz2 4851887
-SHA256 51f8e00ca27ba4d4259daeff30ce6efcdcf086d277ffb7130e215b492a6f77cc httpd-2.2.2.tar.bz2 4851887