security cleanup - bug #191912 and others

Package-Manager: portage-2.1.3.9

36 files changed, 31 insertions, 3119 deletions

diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index 4405b58b1a0f..a2e828589e55 100644
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,32 @@
 # ChangeLog for www-servers/lighttpd
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.148 2007/09/13 15:14:56 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.149 2007/10/12 14:09:36 bangert Exp $
+
+  12 Oct 2007; Thilo Bangert <bangert@gentoo.org>
+  -files/1.4.13/03_all_lighttpd-1.4.11-errorlog-pipe.diff,
+  -files/1.4.15/03_all_lighttpd-1.4.11-errorlog-pipe.diff,
+  -files/1.4.15-r1/03_all_lighttpd-1.4.11-errorlog-pipe.diff,
+  -files/lighttpd.initd-1.4.13-r1, -files/lighttpd.initd-1.4.13-r2,
+  -files/1.4.13/01_all_lighttpd-1.4.13-99cpu-fix.diff,
+  -files/1.4.11/01_all_r1046.mod_compress.c-fixes.diff,
+  -files/1.4.13/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff,
+  -files/1.4.15/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff,
+  -files/1.4.15-r1/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff,
+  -files/1.4.13/02_all_lighttpd-1.4.13-fcgi-auth-type.diff,
+  -files/1.4.11/02_all_r1057_fix_If-Modified-Since-ETag.diff,
+  -files/1.4.15-r1/07_all_lighttpd-1.4.15-duplicated_headers_with_folding_cr
+  ash.diff, -files/1.4.11/03_all_r1095_fix_stalling_SSL_POST_requests.diff,
+  -files/1.4.15-r1/08_all_lighttpd-1.4.15-mod_acces_bypass.diff,
+  -files/1.4.11/21_all_mod_scgi_segfault.diff,
+  -files/1.4.15-r1/09_all_lighttpd-1.4.15-mod_fastcgi_local_dos.diff,
+  -files/1.4.11/22_all_bug606_fix_SSI_echo.diff,
+  -files/1.4.15-r1/10_all_lighttpd-1.4.15-mod_scgi_crash.diff,
+  -files/1.4.11/23_all_mod_ssi_gcc-4.1.1_compile_fix.diff,
+  -lighttpd-1.4.11.ebuild, -lighttpd-1.4.13.ebuild,
+  -lighttpd-1.4.13-r1.ebuild, -lighttpd-1.4.13-r2.ebuild,
+  -lighttpd-1.4.13-r3.ebuild, -lighttpd-1.4.15.ebuild,
+  -lighttpd-1.4.15-r1.ebuild:
+  security cleanup - bug #191912 and others
 
   13 Sep 2007; Jeroen Roovers <jer@gentoo.org> lighttpd-1.4.18.ebuild:
   Stable for SPARC (bug #191912).
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 5b0b73afcb3b..c876fad33c20 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1,75 +1,3 @@
-AUX 1.4.11/01_all_r1046.mod_compress.c-fixes.diff 5992 RMD160 1288d18449115f4a99307cb9a68786d34f867e36 SHA1 8785f13c4020493eb13842c9f09da109f862d8e4 SHA256 20818c8cca47ad3ab405ec3841d0077e3b478bf3115828e920b6c9486e6d3479
-MD5 1b3bebe51407cf5a2f406a53465d9901 files/1.4.11/01_all_r1046.mod_compress.c-fixes.diff 5992
-RMD160 1288d18449115f4a99307cb9a68786d34f867e36 files/1.4.11/01_all_r1046.mod_compress.c-fixes.diff 5992
-SHA256 20818c8cca47ad3ab405ec3841d0077e3b478bf3115828e920b6c9486e6d3479 files/1.4.11/01_all_r1046.mod_compress.c-fixes.diff 5992
-AUX 1.4.11/02_all_r1057_fix_If-Modified-Since-ETag.diff 2464 RMD160 bea954532d057a3a12e2cd6b56710c2fdc611815 SHA1 a79e543f09608de521a1a153f07c88c511d86b1c SHA256 977abd3b59054c9afbb4e496e2c451d7e30bd0655d5cd8d4164ee42af1aa3db7
-MD5 322a27dd300158534f8cb65ffad9e03d files/1.4.11/02_all_r1057_fix_If-Modified-Since-ETag.diff 2464
-RMD160 bea954532d057a3a12e2cd6b56710c2fdc611815 files/1.4.11/02_all_r1057_fix_If-Modified-Since-ETag.diff 2464
-SHA256 977abd3b59054c9afbb4e496e2c451d7e30bd0655d5cd8d4164ee42af1aa3db7 files/1.4.11/02_all_r1057_fix_If-Modified-Since-ETag.diff 2464
-AUX 1.4.11/03_all_r1095_fix_stalling_SSL_POST_requests.diff 500 RMD160 f30b7af2d27740ba0e0df6993d816f813be24877 SHA1 1d4e63cae9cb5dbd4003ac47f61b54ba961b9e08 SHA256 d01e4f69bdfa18abc8dd14ae44e192b4b71d8299e8a0049e9fbf2e020d7097fa
-MD5 efe7fb8d01b34d2bef55f80b450f7a86 files/1.4.11/03_all_r1095_fix_stalling_SSL_POST_requests.diff 500
-RMD160 f30b7af2d27740ba0e0df6993d816f813be24877 files/1.4.11/03_all_r1095_fix_stalling_SSL_POST_requests.diff 500
-SHA256 d01e4f69bdfa18abc8dd14ae44e192b4b71d8299e8a0049e9fbf2e020d7097fa files/1.4.11/03_all_r1095_fix_stalling_SSL_POST_requests.diff 500
-AUX 1.4.11/21_all_mod_scgi_segfault.diff 458 RMD160 9cd971db1f8999b78031fb908092d509e11a52eb SHA1 3b99dfe080534c950258e734b01d545056cdcbcc SHA256 c319256b7cc14c609773dfae03e578f46a6994522dbacf966c6a88cf7eba6ea7
-MD5 560787bd4caa409af1cebdb03a76bebc files/1.4.11/21_all_mod_scgi_segfault.diff 458
-RMD160 9cd971db1f8999b78031fb908092d509e11a52eb files/1.4.11/21_all_mod_scgi_segfault.diff 458
-SHA256 c319256b7cc14c609773dfae03e578f46a6994522dbacf966c6a88cf7eba6ea7 files/1.4.11/21_all_mod_scgi_segfault.diff 458
-AUX 1.4.11/22_all_bug606_fix_SSI_echo.diff 4905 RMD160 c99c0130b1a039f5202e7388a31d2026e1f32a72 SHA1 4272f52032b0d09c11b1280e8dc76bdea3704abb SHA256 a3d8d47593b51e0b9f5f82cf7ca7baad785597aec824bfafe70190f835be879f
-MD5 d1027d3e457185a382d4f6457e95bb3b files/1.4.11/22_all_bug606_fix_SSI_echo.diff 4905
-RMD160 c99c0130b1a039f5202e7388a31d2026e1f32a72 files/1.4.11/22_all_bug606_fix_SSI_echo.diff 4905
-SHA256 a3d8d47593b51e0b9f5f82cf7ca7baad785597aec824bfafe70190f835be879f files/1.4.11/22_all_bug606_fix_SSI_echo.diff 4905
-AUX 1.4.11/23_all_mod_ssi_gcc-4.1.1_compile_fix.diff 353 RMD160 d6beacffdba06fbaeabc0310765c39d8a23047ad SHA1 fcf1c8ecdd2c40ca35e0bedde101e4fb65ed4b2e SHA256 67ce14b3f41f37c22e75fe897f2bfa427cfc1bacd4df72d1e7f73929b0ebce70
-MD5 0ce285405a1c07a6f7cf2905a056f299 files/1.4.11/23_all_mod_ssi_gcc-4.1.1_compile_fix.diff 353
-RMD160 d6beacffdba06fbaeabc0310765c39d8a23047ad files/1.4.11/23_all_mod_ssi_gcc-4.1.1_compile_fix.diff 353
-SHA256 67ce14b3f41f37c22e75fe897f2bfa427cfc1bacd4df72d1e7f73929b0ebce70 files/1.4.11/23_all_mod_ssi_gcc-4.1.1_compile_fix.diff 353
-AUX 1.4.13/01_all_lighttpd-1.4.13-99cpu-fix.diff 295 RMD160 412d2871c7a0bdff71543e4c3a3f4fb975968536 SHA1 70d073ea4ef1dfabbe74b8ae5ade735a59e44fc2 SHA256 97330f9b6f81b351839a9c68391e55726c26dc9d47793311f04dfba39d8bfff9
-MD5 c990dd57e491c3df9bd685e4d8b1e40f files/1.4.13/01_all_lighttpd-1.4.13-99cpu-fix.diff 295
-RMD160 412d2871c7a0bdff71543e4c3a3f4fb975968536 files/1.4.13/01_all_lighttpd-1.4.13-99cpu-fix.diff 295
-SHA256 97330f9b6f81b351839a9c68391e55726c26dc9d47793311f04dfba39d8bfff9 files/1.4.13/01_all_lighttpd-1.4.13-99cpu-fix.diff 295
-AUX 1.4.13/02_all_lighttpd-1.4.13-fcgi-auth-type.diff 2087 RMD160 fcd67f8f5b06b7605210d97ae12ec5c22e7f4b4f SHA1 877d864fbc6abf39f48a7bb29de809437298f158 SHA256 adb11e29f1a76c57aced62fc30aaa5dcbca85d30967fff637a4f782d7ab4b848
-MD5 b2e5994810ffd6ad28fa31cc386674c0 files/1.4.13/02_all_lighttpd-1.4.13-fcgi-auth-type.diff 2087
-RMD160 fcd67f8f5b06b7605210d97ae12ec5c22e7f4b4f files/1.4.13/02_all_lighttpd-1.4.13-fcgi-auth-type.diff 2087
-SHA256 adb11e29f1a76c57aced62fc30aaa5dcbca85d30967fff637a4f782d7ab4b848 files/1.4.13/02_all_lighttpd-1.4.13-fcgi-auth-type.diff 2087
-AUX 1.4.13/03_all_lighttpd-1.4.11-errorlog-pipe.diff 5267 RMD160 c23c816fcddbc99758a0426fc11f70677dbc06e9 SHA1 22e0d05d49cecb652d1250ac66de13fdf228cce4 SHA256 b37042549247ca2d83581aa3bcd1a5356c37015000711cecafda05aa6d6a15c4
-MD5 34d6720749f96327d311661a02886a65 files/1.4.13/03_all_lighttpd-1.4.11-errorlog-pipe.diff 5267
-RMD160 c23c816fcddbc99758a0426fc11f70677dbc06e9 files/1.4.13/03_all_lighttpd-1.4.11-errorlog-pipe.diff 5267
-SHA256 b37042549247ca2d83581aa3bcd1a5356c37015000711cecafda05aa6d6a15c4 files/1.4.13/03_all_lighttpd-1.4.11-errorlog-pipe.diff 5267
-AUX 1.4.13/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff 502 RMD160 a10372a6cdfce349c6221f5038f2fda699f5f74e SHA1 12c39cd4ca731509256e271daf4aaac8a62e82c4 SHA256 0a7f3626e23291b3859e953bcc1762117a1585c2717adc065ccbb0ccf2f3577a
-MD5 87cf789e1f6866b9ece50a4af418b5b8 files/1.4.13/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff 502
-RMD160 a10372a6cdfce349c6221f5038f2fda699f5f74e files/1.4.13/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff 502
-SHA256 0a7f3626e23291b3859e953bcc1762117a1585c2717adc065ccbb0ccf2f3577a files/1.4.13/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff 502
-AUX 1.4.15-r1/03_all_lighttpd-1.4.11-errorlog-pipe.diff 5267 RMD160 c23c816fcddbc99758a0426fc11f70677dbc06e9 SHA1 22e0d05d49cecb652d1250ac66de13fdf228cce4 SHA256 b37042549247ca2d83581aa3bcd1a5356c37015000711cecafda05aa6d6a15c4
-MD5 34d6720749f96327d311661a02886a65 files/1.4.15-r1/03_all_lighttpd-1.4.11-errorlog-pipe.diff 5267
-RMD160 c23c816fcddbc99758a0426fc11f70677dbc06e9 files/1.4.15-r1/03_all_lighttpd-1.4.11-errorlog-pipe.diff 5267
-SHA256 b37042549247ca2d83581aa3bcd1a5356c37015000711cecafda05aa6d6a15c4 files/1.4.15-r1/03_all_lighttpd-1.4.11-errorlog-pipe.diff 5267
-AUX 1.4.15-r1/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff 502 RMD160 a10372a6cdfce349c6221f5038f2fda699f5f74e SHA1 12c39cd4ca731509256e271daf4aaac8a62e82c4 SHA256 0a7f3626e23291b3859e953bcc1762117a1585c2717adc065ccbb0ccf2f3577a
-MD5 87cf789e1f6866b9ece50a4af418b5b8 files/1.4.15-r1/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff 502
-RMD160 a10372a6cdfce349c6221f5038f2fda699f5f74e files/1.4.15-r1/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff 502
-SHA256 0a7f3626e23291b3859e953bcc1762117a1585c2717adc065ccbb0ccf2f3577a files/1.4.15-r1/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff 502
-AUX 1.4.15-r1/07_all_lighttpd-1.4.15-duplicated_headers_with_folding_crash.diff 3166 RMD160 98110f2a772f0b7bd601dd9bbf1741166730d9e1 SHA1 a52de9fcc0b1605d176984e7a4b778ea5d4a13fe SHA256 d7526ac5605a5c23a39c837967551d3f433f0e70e70b03193fa463693234fb63
-MD5 9295078a5c43574707da9d45a2594fd3 files/1.4.15-r1/07_all_lighttpd-1.4.15-duplicated_headers_with_folding_crash.diff 3166
-RMD160 98110f2a772f0b7bd601dd9bbf1741166730d9e1 files/1.4.15-r1/07_all_lighttpd-1.4.15-duplicated_headers_with_folding_crash.diff 3166
-SHA256 d7526ac5605a5c23a39c837967551d3f433f0e70e70b03193fa463693234fb63 files/1.4.15-r1/07_all_lighttpd-1.4.15-duplicated_headers_with_folding_crash.diff 3166
-AUX 1.4.15-r1/08_all_lighttpd-1.4.15-mod_acces_bypass.diff 3775 RMD160 25dc83e84d1c8d4c63d0e580c3b1336531fb592d SHA1 964cb4b80dab8c52ddf33aa246355bb5136a3f31 SHA256 31b2903c8302b55264e32c15afd9496379909469225e1982a3fc555d713ca785
-MD5 2df0144efa29fcb308dce1262794cd02 files/1.4.15-r1/08_all_lighttpd-1.4.15-mod_acces_bypass.diff 3775
-RMD160 25dc83e84d1c8d4c63d0e580c3b1336531fb592d files/1.4.15-r1/08_all_lighttpd-1.4.15-mod_acces_bypass.diff 3775
-SHA256 31b2903c8302b55264e32c15afd9496379909469225e1982a3fc555d713ca785 files/1.4.15-r1/08_all_lighttpd-1.4.15-mod_acces_bypass.diff 3775
-AUX 1.4.15-r1/09_all_lighttpd-1.4.15-mod_fastcgi_local_dos.diff 463 RMD160 b1841be8246289a517b0f3e343a6fc9b9e65bd79 SHA1 3afce133722f96dd68060d1608843609b306519e SHA256 8183e4ded4aabfdf4fd17c857a0f9d10f4de38d9af6249d5569d8884a37c097c
-MD5 12cf0ac9ed7c83a3959685206c0bac08 files/1.4.15-r1/09_all_lighttpd-1.4.15-mod_fastcgi_local_dos.diff 463
-RMD160 b1841be8246289a517b0f3e343a6fc9b9e65bd79 files/1.4.15-r1/09_all_lighttpd-1.4.15-mod_fastcgi_local_dos.diff 463
-SHA256 8183e4ded4aabfdf4fd17c857a0f9d10f4de38d9af6249d5569d8884a37c097c files/1.4.15-r1/09_all_lighttpd-1.4.15-mod_fastcgi_local_dos.diff 463
-AUX 1.4.15-r1/10_all_lighttpd-1.4.15-mod_scgi_crash.diff 530 RMD160 d29aaae504613b2f89592c19bff27c7947b93f0a SHA1 7f9799092aed18ccecd7504e9fad77830c146b55 SHA256 945fea99cb5138d0bcdea1ffb94562de2a5e37b0079a150e900f4ca5dad442f8
-MD5 5d82f3b10f9511949882e2cad1cb3e64 files/1.4.15-r1/10_all_lighttpd-1.4.15-mod_scgi_crash.diff 530
-RMD160 d29aaae504613b2f89592c19bff27c7947b93f0a files/1.4.15-r1/10_all_lighttpd-1.4.15-mod_scgi_crash.diff 530
-SHA256 945fea99cb5138d0bcdea1ffb94562de2a5e37b0079a150e900f4ca5dad442f8 files/1.4.15-r1/10_all_lighttpd-1.4.15-mod_scgi_crash.diff 530
-AUX 1.4.15/03_all_lighttpd-1.4.11-errorlog-pipe.diff 5267 RMD160 c23c816fcddbc99758a0426fc11f70677dbc06e9 SHA1 22e0d05d49cecb652d1250ac66de13fdf228cce4 SHA256 b37042549247ca2d83581aa3bcd1a5356c37015000711cecafda05aa6d6a15c4
-MD5 34d6720749f96327d311661a02886a65 files/1.4.15/03_all_lighttpd-1.4.11-errorlog-pipe.diff 5267
-RMD160 c23c816fcddbc99758a0426fc11f70677dbc06e9 files/1.4.15/03_all_lighttpd-1.4.11-errorlog-pipe.diff 5267
-SHA256 b37042549247ca2d83581aa3bcd1a5356c37015000711cecafda05aa6d6a15c4 files/1.4.15/03_all_lighttpd-1.4.11-errorlog-pipe.diff 5267
-AUX 1.4.15/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff 502 RMD160 a10372a6cdfce349c6221f5038f2fda699f5f74e SHA1 12c39cd4ca731509256e271daf4aaac8a62e82c4 SHA256 0a7f3626e23291b3859e953bcc1762117a1585c2717adc065ccbb0ccf2f3577a
-MD5 87cf789e1f6866b9ece50a4af418b5b8 files/1.4.15/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff 502
-RMD160 a10372a6cdfce349c6221f5038f2fda699f5f74e files/1.4.15/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff 502
-SHA256 0a7f3626e23291b3859e953bcc1762117a1585c2717adc065ccbb0ccf2f3577a files/1.4.15/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff 502
 AUX 1.4.16/03_all_lighttpd-1.4.11-errorlog-pipe.diff 5267 RMD160 c23c816fcddbc99758a0426fc11f70677dbc06e9 SHA1 22e0d05d49cecb652d1250ac66de13fdf228cce4 SHA256 b37042549247ca2d83581aa3bcd1a5356c37015000711cecafda05aa6d6a15c4
 MD5 34d6720749f96327d311661a02886a65 files/1.4.16/03_all_lighttpd-1.4.11-errorlog-pipe.diff 5267
 RMD160 c23c816fcddbc99758a0426fc11f70677dbc06e9 files/1.4.16/03_all_lighttpd-1.4.11-errorlog-pipe.diff 5267
@@ -134,14 +62,6 @@ AUX lighttpd.initd 1164 RMD160 5db761cd95781c457035a0b03459c22554b54dab SHA1 ee4
 MD5 063fe5cdf400eebf73c263188f76f03e files/lighttpd.initd 1164
 RMD160 5db761cd95781c457035a0b03459c22554b54dab files/lighttpd.initd 1164
 SHA256 823ed1ae9b0dde0939285761b8af547116c51b597c1488dbd3f45a934e291213 files/lighttpd.initd 1164
-AUX lighttpd.initd-1.4.13-r1 1641 RMD160 b038e21964d92a1c3bd9d99b676c0d25b76087f0 SHA1 b31368f70854acccd44b5d9a4b87d4fb07920e78 SHA256 3eeaef628418745207ad4bb77dfbc378ff31f52dbc5413d19647303d5ad27d71
-MD5 5afc28fbed9597270f6eab8ef153b859 files/lighttpd.initd-1.4.13-r1 1641
-RMD160 b038e21964d92a1c3bd9d99b676c0d25b76087f0 files/lighttpd.initd-1.4.13-r1 1641
-SHA256 3eeaef628418745207ad4bb77dfbc378ff31f52dbc5413d19647303d5ad27d71 files/lighttpd.initd-1.4.13-r1 1641
-AUX lighttpd.initd-1.4.13-r2 1461 RMD160 823c7f1d85c69d928f38128ad1b2e231cc891e2f SHA1 ec1b4ca7e3c40dbd643e2c3a021df05727879c2c SHA256 be684fee10ef15b557d3f48df38341477729c2153b923b457ee7394e818bcfe9
-MD5 dfe1a77b1129e6297e5bf0b83b30b220 files/lighttpd.initd-1.4.13-r2 1461
-RMD160 823c7f1d85c69d928f38128ad1b2e231cc891e2f files/lighttpd.initd-1.4.13-r2 1461
-SHA256 be684fee10ef15b557d3f48df38341477729c2153b923b457ee7394e818bcfe9 files/lighttpd.initd-1.4.13-r2 1461
 AUX lighttpd.initd-1.4.13-r3 1444 RMD160 547b4f38f00dac4ea695767f68a35a6220f5cdea SHA1 7aa79dc2fd4b98203d60da7be17078c1be1cb5bd SHA256 edfd7fbdbef984f4f4d998d42fc3ee104f90b06cf42321b945b67624f269bad1
 MD5 e61848afd0aa10efd184143fd31a142c files/lighttpd.initd-1.4.13-r3 1444
 RMD160 547b4f38f00dac4ea695767f68a35a6220f5cdea files/lighttpd.initd-1.4.13-r3 1444
@@ -159,43 +79,12 @@ MD5 78bc6ceac57ecaa47abf4d5df857fe57 files/spawn-fcgi.initd 1398
 RMD160 3fd0fa41d100629e85960034237abc0866ec3d38 files/spawn-fcgi.initd 1398
 SHA256 ae10c764e2bde9bfc483c57ca94a63d87c24cba00b4c06917885c533d2d245b1 files/spawn-fcgi.initd 1398
 DIST lighttpd-1.3.16.tar.gz 706362 RMD160 3bf9b50be2e2d9b83f6fe4fe1b8bf5d8dca417d9 SHA1 47449370b58f488350a54d54b416747228e4120f SHA256 92f90ef3db84c4ebaf8f1fecc82547c2e99c95b3f4cce429e07a58d7440c2369
-DIST lighttpd-1.4.11.tar.gz 781656 RMD160 0434e6c09383f1ad443d985fd168a29f6f132d1f SHA1 ca904d3d4d9dde76f85156f2c709a394f30e28c8 SHA256 7782ac82af8ea8d14df5d35b6668c0d45c00f3ba43a6203c29c7fe7dfe98999c
-DIST lighttpd-1.4.13.tar.gz 797813 RMD160 4e67e42dc3692d50c044561cc903de7b906f260c SHA1 b17553e66609f85baec50263712a4a5aeca50ca5 SHA256 62d5997fdb41afa9400adcdb040d04a1f5fa950045df96e3e3f593e8f0de5739
-DIST lighttpd-1.4.15.tar.bz2 591304 RMD160 6a0f7a498b2815c2eb576917e88775a8e16aad5c SHA1 742b567eca011fa5ef2cc506038389a4959eab56 SHA256 75128e53231c69a22c94ad0a01da974eaa266b21668c1354f71ad07e5f94d9cc
 DIST lighttpd-1.4.16.tar.bz2 592540 RMD160 185948bb05f5e667d604a5e9c6db4f0d64526ba4 SHA1 8f137ff71f629fe24a745c758b72dce24a8669f2 SHA256 568a6ce34d0a185b3164be99bce88011201957952f4ac817f7e7101bc526b59f
 DIST lighttpd-1.4.18.tar.bz2 600227 RMD160 9fcd5e09ee2b1b517868d8843883228cd8b4145f SHA1 a53a8f8ae8d42d036f0b5129764b822e943cc778 SHA256 d59123850f3dd4a10f067d9a0c527324a70203cd3f82f70f0e44b8cb8068db43
 EBUILD lighttpd-1.3.16.ebuild 2586 RMD160 ebcf74cf84ec75c361ea5894115d54f93f6eea51 SHA1 0984b9d7fb378b6b7bb08fd8155ff30b480adac0 SHA256 12818ec066898a0e019dcbb50fb4d190fe60363052d03213e8b5e4f4da5bbfe1
 MD5 21b1cf627412a4e10256724537880485 lighttpd-1.3.16.ebuild 2586
 RMD160 ebcf74cf84ec75c361ea5894115d54f93f6eea51 lighttpd-1.3.16.ebuild 2586
 SHA256 12818ec066898a0e019dcbb50fb4d190fe60363052d03213e8b5e4f4da5bbfe1 lighttpd-1.3.16.ebuild 2586
-EBUILD lighttpd-1.4.11.ebuild 5434 RMD160 91b98a2e409e22ae721f369f964e4cf4327db2fc SHA1 295eca52f839b7c573fa151f0ca2b63b8b94fd35 SHA256 505e545ae8fa4410bffd66f66f8fa1fb328f30a2e9daaf38465f516ae34ff422
-MD5 a9a01acb4e9c264869cee670434ecec2 lighttpd-1.4.11.ebuild 5434
-RMD160 91b98a2e409e22ae721f369f964e4cf4327db2fc lighttpd-1.4.11.ebuild 5434
-SHA256 505e545ae8fa4410bffd66f66f8fa1fb328f30a2e9daaf38465f516ae34ff422 lighttpd-1.4.11.ebuild 5434
-EBUILD lighttpd-1.4.13-r1.ebuild 5529 RMD160 c6b9411bc4f760c9339f6c7a1062c5c6398be5bb SHA1 35401caaba7e2dd7a1061ff2191884c3ef1c5e8e SHA256 a658d652784c1274caeec7e3ba7194eaff2269552d2ee0d143b4dabeea7ccb59
-MD5 bfce8cb7427ecbd9e6fd2aaf2275096e lighttpd-1.4.13-r1.ebuild 5529
-RMD160 c6b9411bc4f760c9339f6c7a1062c5c6398be5bb lighttpd-1.4.13-r1.ebuild 5529
-SHA256 a658d652784c1274caeec7e3ba7194eaff2269552d2ee0d143b4dabeea7ccb59 lighttpd-1.4.13-r1.ebuild 5529
-EBUILD lighttpd-1.4.13-r2.ebuild 5840 RMD160 7efbd91392baf4fe323483291ab1f559a700f212 SHA1 026891edf0a777b68840aff61ecee29ce74790fd SHA256 c13c3f165da34b18d270db4c0942b9b56d54c4f0a9a1f776bf8e5d823d9c4406
-MD5 31b709fa8daf2e47c26faeb8a816d4ec lighttpd-1.4.13-r2.ebuild 5840
-RMD160 7efbd91392baf4fe323483291ab1f559a700f212 lighttpd-1.4.13-r2.ebuild 5840
-SHA256 c13c3f165da34b18d270db4c0942b9b56d54c4f0a9a1f776bf8e5d823d9c4406 lighttpd-1.4.13-r2.ebuild 5840
-EBUILD lighttpd-1.4.13-r3.ebuild 5840 RMD160 de3d3afd6ead4366dc7e3f692bf8a912e719a377 SHA1 7a16f53a32a0b161d75dbfb12a20ed7f5e0393dc SHA256 0697095ebbde3494ebd96b4a7111ae8eaf04d8a795dca8e1831dc06acf81d21a
-MD5 98fe2efabbccda9a812f5b3b053efdaa lighttpd-1.4.13-r3.ebuild 5840
-RMD160 de3d3afd6ead4366dc7e3f692bf8a912e719a377 lighttpd-1.4.13-r3.ebuild 5840
-SHA256 0697095ebbde3494ebd96b4a7111ae8eaf04d8a795dca8e1831dc06acf81d21a lighttpd-1.4.13-r3.ebuild 5840
-EBUILD lighttpd-1.4.13.ebuild 5431 RMD160 f56cd0ddad8c2e0ca84c74b5bf6fcf38309199a0 SHA1 9b04912b6d61737bff174931d7a0ba8b9ef8ec9b SHA256 3a62f76a2720f7b1ccc3557d79df36df292bff85e9dc03da6a44d94015f09ad5
-MD5 cca2c68140d653460de5c5895f3b6d6e lighttpd-1.4.13.ebuild 5431
-RMD160 f56cd0ddad8c2e0ca84c74b5bf6fcf38309199a0 lighttpd-1.4.13.ebuild 5431
-SHA256 3a62f76a2720f7b1ccc3557d79df36df292bff85e9dc03da6a44d94015f09ad5 lighttpd-1.4.13.ebuild 5431
-EBUILD lighttpd-1.4.15-r1.ebuild 5810 RMD160 8a185cb1cd039f5d6c8fa747067c0d96f4a39d3e SHA1 3c63d8b9dcbe0086f0ae68bfa11521292ea0e29e SHA256 520ef24345166cbe259c72c151712f19542b05911a989166f71f2828bdd7aa1c
-MD5 16862256592430e030b0bbec9fc287f1 lighttpd-1.4.15-r1.ebuild 5810
-RMD160 8a185cb1cd039f5d6c8fa747067c0d96f4a39d3e lighttpd-1.4.15-r1.ebuild 5810
-SHA256 520ef24345166cbe259c72c151712f19542b05911a989166f71f2828bdd7aa1c lighttpd-1.4.15-r1.ebuild 5810
-EBUILD lighttpd-1.4.15.ebuild 5843 RMD160 1fb147ea2d8c47779e38651f7eeb658ca68b3c9e SHA1 99d8000b6d16623756b3b0701b9355418703da0c SHA256 bae4747c4ceb621f7835a085c4425dec168b7ff8e7f81eb5cd046b614e1944d1
-MD5 b4b1dd9afc16edb716a3d1889774f991 lighttpd-1.4.15.ebuild 5843
-RMD160 1fb147ea2d8c47779e38651f7eeb658ca68b3c9e lighttpd-1.4.15.ebuild 5843
-SHA256 bae4747c4ceb621f7835a085c4425dec168b7ff8e7f81eb5cd046b614e1944d1 lighttpd-1.4.15.ebuild 5843
 EBUILD lighttpd-1.4.16.ebuild 5807 RMD160 20a923cc40d48fb14731323068f4f37ce49231cd SHA1 e3d9043bf43d45565249c94942a75f485a5954b8 SHA256 7f30930336b270e37eee98f50785623388113632e074a31cd9492bcfe47dcacf
 MD5 39f51f43acf42d078bf9675e432db770 lighttpd-1.4.16.ebuild 5807
 RMD160 20a923cc40d48fb14731323068f4f37ce49231cd lighttpd-1.4.16.ebuild 5807
@@ -204,10 +93,10 @@ EBUILD lighttpd-1.4.18.ebuild 5805 RMD160 01e9138c52205b0a0406ef41b650c0a97c7cb9
 MD5 3a2187a4caea72d09285c6e55ce429c3 lighttpd-1.4.18.ebuild 5805
 RMD160 01e9138c52205b0a0406ef41b650c0a97c7cb9f1 lighttpd-1.4.18.ebuild 5805
 SHA256 df6c3771fba0da7aff39d6d9336df6a86961ae50f82d1d259d7a8c93f3ba8553 lighttpd-1.4.18.ebuild 5805
-MISC ChangeLog 34650 RMD160 e7b652a154d5c81e25fb2314dcba893f364fe133 SHA1 efea298c1eabc1fd8585f26185865788bd86de9c SHA256 d72bc537768088e3b4ca1761da88236d43388788905a614b053d800732fe43c1
-MD5 02a29908963ccedb8569fb3c6444be81 ChangeLog 34650
-RMD160 e7b652a154d5c81e25fb2314dcba893f364fe133 ChangeLog 34650
-SHA256 d72bc537768088e3b4ca1761da88236d43388788905a614b053d800732fe43c1 ChangeLog 34650
+MISC ChangeLog 36129 RMD160 15637b179118d7318b47ef0c02186ddcb8f2a437 SHA1 54daedf8ed143363df3211ec6fd5a1a356928b74 SHA256 7fb3719748edb908c0c3816936fc8ebde3d40ba59d1f5083f33a285a44acc365
+MD5 6f5bbfe61fe3e5523ab303dcfde48aef ChangeLog 36129
+RMD160 15637b179118d7318b47ef0c02186ddcb8f2a437 ChangeLog 36129
+SHA256 7fb3719748edb908c0c3816936fc8ebde3d40ba59d1f5083f33a285a44acc365 ChangeLog 36129
 MISC metadata.xml 633 RMD160 f53110608c976ad01e089359eb60da7b8d1d8812 SHA1 f072b189d3973eb56e8bb059197ef2b1683d2790 SHA256 ec78010aee8ea37993d032389ba33c1a00488d0c658e4b25cf096556af8f962e
 MD5 d45b737e7a98ec0d98b925eef6462a66 metadata.xml 633
 RMD160 f53110608c976ad01e089359eb60da7b8d1d8812 metadata.xml 633
@@ -215,27 +104,6 @@ SHA256 ec78010aee8ea37993d032389ba33c1a00488d0c658e4b25cf096556af8f962e metadata
 MD5 669eed61cca360d002ddb0c7efe0afe5 files/digest-lighttpd-1.3.16 247
 RMD160 0dc0c93bf17aeb37c6bf4b65a89bbd7ebca92779 files/digest-lighttpd-1.3.16 247
 SHA256 ab1ef738bc2850a97e6a69183d8a8e19e07dd08103b3e7bca611f1b545851b81 files/digest-lighttpd-1.3.16 247
-MD5 c8db26191b779d4a3d84919e681ddffd files/digest-lighttpd-1.4.11 247
-RMD160 b24bbce0321852d8953330bd31b51a0c1b9959ab files/digest-lighttpd-1.4.11 247
-SHA256 134236010b24b21a1a403a663ca1fc927bee6247a0f9b3ba8b2d525905381d82 files/digest-lighttpd-1.4.11 247
-MD5 c125c79044d8e508cc765d805eeed9b5 files/digest-lighttpd-1.4.13 247
-RMD160 988b066988cbca78884400d666744793d2bc6e15 files/digest-lighttpd-1.4.13 247
-SHA256 2cde60e43bf9a47baa9efa1aaaaae485d6ebd17c45e093e998c83877f1cd1c6e files/digest-lighttpd-1.4.13 247
-MD5 c125c79044d8e508cc765d805eeed9b5 files/digest-lighttpd-1.4.13-r1 247
-RMD160 988b066988cbca78884400d666744793d2bc6e15 files/digest-lighttpd-1.4.13-r1 247
-SHA256 2cde60e43bf9a47baa9efa1aaaaae485d6ebd17c45e093e998c83877f1cd1c6e files/digest-lighttpd-1.4.13-r1 247
-MD5 c125c79044d8e508cc765d805eeed9b5 files/digest-lighttpd-1.4.13-r2 247
-RMD160 988b066988cbca78884400d666744793d2bc6e15 files/digest-lighttpd-1.4.13-r2 247
-SHA256 2cde60e43bf9a47baa9efa1aaaaae485d6ebd17c45e093e998c83877f1cd1c6e files/digest-lighttpd-1.4.13-r2 247
-MD5 c125c79044d8e508cc765d805eeed9b5 files/digest-lighttpd-1.4.13-r3 247
-RMD160 988b066988cbca78884400d666744793d2bc6e15 files/digest-lighttpd-1.4.13-r3 247
-SHA256 2cde60e43bf9a47baa9efa1aaaaae485d6ebd17c45e093e998c83877f1cd1c6e files/digest-lighttpd-1.4.13-r3 247
-MD5 aeb9038042587a68806c8bae25abc8b0 files/digest-lighttpd-1.4.15 250
-RMD160 30662c16f3be53c5609f5645ab3846eda1e05c8d files/digest-lighttpd-1.4.15 250
-SHA256 92da9c6894ac3d83e16b7d8f90d1811f6740974d519c5d1ba3b6029eab0d1f7c files/digest-lighttpd-1.4.15 250
-MD5 aeb9038042587a68806c8bae25abc8b0 files/digest-lighttpd-1.4.15-r1 250
-RMD160 30662c16f3be53c5609f5645ab3846eda1e05c8d files/digest-lighttpd-1.4.15-r1 250
-SHA256 92da9c6894ac3d83e16b7d8f90d1811f6740974d519c5d1ba3b6029eab0d1f7c files/digest-lighttpd-1.4.15-r1 250
 MD5 2fb4bc23268ae1aa73b140aa3c457f1b files/digest-lighttpd-1.4.16 250
 RMD160 a3e8bb89832d7e58cbc37ecc9d4d3de08eb4462f files/digest-lighttpd-1.4.16 250
 SHA256 856932c18c71a7324290166a6e16bfb28d337ab9aa1c4ba5c990087c2dc7a3ff files/digest-lighttpd-1.4.16 250
diff --git a/www-servers/lighttpd/files/1.4.11/01_all_r1046.mod_compress.c-fixes.diff b/www-servers/lighttpd/files/1.4.11/01_all_r1046.mod_compress.c-fixes.diff
deleted file mode 100644
index fdb419913939..000000000000
--- a/www-servers/lighttpd/files/1.4.11/01_all_r1046.mod_compress.c-fixes.diff
+++ /dev/null
@@ -1,186 +0,0 @@
---- lighttpd-1.4.11.orig/src/mod_compress.c (revision 861)
-+++ lighttpd-1.4.11/src/mod_compress.c (revision 1046)
-@@ -15,4 +15,5 @@
- #include "response.h"
- #include "stat_cache.h"
-+#include "http_chunk.h"
- 
- #include "plugin.h"
-@@ -327,4 +328,7 @@
- 	const char *filename = fn->ptr;
- 	ssize_t r;
-+	stat_cache_entry *compressed_sce = NULL;
-+
-+	if (buffer_is_empty(p->conf.compress_cache_dir)) return -1;
- 	
- 	/* overflow */
-@@ -384,25 +388,32 @@
- 	
- 	buffer_append_string_buffer(p->ofn, sce->etag);
-+
-+
-+	if (HANDLER_ERROR != stat_cache_get_entry(srv, con, p->ofn, &compressed_sce)) {
-+		/* file exists */
-+
-+		http_chunk_append_file(srv, con, p->ofn, 0, compressed_sce->st.st_size);
-+		con->file_finished = 1;
-+
-+		return 0;
-+	}
- 	
- 	if (-1 == (ofd = open(p->ofn->ptr, O_WRONLY | O_CREAT | O_EXCL | O_BINARY, 0600))) {
- 		if (errno == EEXIST) {
- 			/* cache-entry exists */
--#if 0
--			log_error_write(srv, __FILE__, __LINE__, "bs", p->ofn, "compress-cache hit");
--#endif
--			buffer_copy_string_buffer(con->physical.path, p->ofn);
--			
--			return 0;
-+	
- 		}
- 		
--		log_error_write(srv, __FILE__, __LINE__, "sbss", "creating cachefile", p->ofn, "failed", strerror(errno));
--		
--		return -1;
--	}
--#if 0
--	log_error_write(srv, __FILE__, __LINE__, "bs", p->ofn, "compress-cache miss");
--#endif	
-+		log_error_write(srv, __FILE__, __LINE__, "sbss", 
-+				"creating cachefile", p->ofn, 
-+				"failed", strerror(errno));
-+		
-+		return -1;
-+	}
-+
- 	if (-1 == (ifd = open(filename, O_RDONLY | O_BINARY))) {
--		log_error_write(srv, __FILE__, __LINE__, "sbss", "opening plain-file", fn, "failed", strerror(errno));
-+		log_error_write(srv, __FILE__, __LINE__, "sbss", 
-+				"opening plain-file", fn, 
-+				"failed", strerror(errno));
- 		
- 		close(ofd);
-@@ -413,5 +424,7 @@
- 	
- 	if (MAP_FAILED == (start = mmap(NULL, sce->st.st_size, PROT_READ, MAP_SHARED, ifd, 0))) {
--		log_error_write(srv, __FILE__, __LINE__, "sbss", "mmaping", fn, "failed", strerror(errno));
-+		log_error_write(srv, __FILE__, __LINE__, "sbss", 
-+				"mmaping", fn, 
-+				"failed", strerror(errno));
- 		
- 		close(ofd);
-@@ -456,6 +469,7 @@
- 	if (ret != 0) return -1;
- 	
--	buffer_copy_string_buffer(con->physical.path, p->ofn);
--	
-+	http_chunk_append_file(srv, con, p->ofn, 0, r);
-+	con->file_finished = 1;
-+
- 	return 0;
- }
-@@ -477,5 +491,4 @@
- 	if (sce->st.st_size > 128 * 1024 * 1024) return -1;
- 	
--	
- 	if (-1 == (ifd = open(fn->ptr, O_RDONLY | O_BINARY))) {
- 		log_error_write(srv, __FILE__, __LINE__, "sbss", "opening plain-file", fn, "failed", strerror(errno));
-@@ -483,13 +496,15 @@
- 		return -1;
- 	}
--	
--	
--	if (MAP_FAILED == (start = mmap(NULL, sce->st.st_size, PROT_READ, MAP_SHARED, ifd, 0))) {
-+
-+	start = mmap(NULL, sce->st.st_size, PROT_READ, MAP_SHARED, ifd, 0);
-+	
-+	close(ifd);
-+
-+	if (MAP_FAILED == start) {
- 		log_error_write(srv, __FILE__, __LINE__, "sbss", "mmaping", fn, "failed", strerror(errno));
- 		
--		close(ifd);
--		return -1;
--	}
--	
-+		return -1;
-+	}
-+
- 	switch(type) {
- #ifdef USE_ZLIB
-@@ -512,5 +527,4 @@
- 		
- 	munmap(start, sce->st.st_size);
--	close(ifd);
- 	
- 	if (ret != 0) return -1;
-@@ -589,4 +603,7 @@
- 	/* don't compress files that are too large as we need to much time to handle them */
- 	if (max_fsize && (sce->st.st_size >> 10) > max_fsize) return HANDLER_GO_ON;
-+
-+	/* compressing the file might lead to larger files instead */
-+	if (sce->st.st_size < 128) return HANDLER_GO_ON;
- 		
- 	/* check if mimetype is in compress-config */
-@@ -639,5 +656,18 @@
- 					const char *compression_name = NULL;
- 					int compression_type = 0;
-+					buffer *mtime;
- 					
-+					mtime = strftime_cache_get(srv, sce->st.st_mtime);
-+					etag_mutate(con->physical.etag, sce->etag);
-+
-+					response_header_overwrite(srv, con, CONST_STR_LEN("Last-Modified"), CONST_BUF_LEN(mtime));
-+					response_header_overwrite(srv, con, CONST_STR_LEN("ETag"), CONST_BUF_LEN(con->physical.etag));
-+
-+					/* perhaps we don't even have to compress the file as the browser still has the
-+					 * current version */
-+					if (HANDLER_FINISHED == http_response_handle_cachable(srv, con, mtime)) {
-+						return HANDLER_FINISHED;
-+					}
-+
- 					/* select best matching encoding */
- 					if (matched_encodings & HTTP_ACCEPT_ENCODING_BZIP2) {
-@@ -652,28 +682,18 @@
- 					}
- 					
--					/* deflate it */
--					if (p->conf.compress_cache_dir->used) {
--						if (0 == deflate_file_to_file(srv, con, p,
--									      con->physical.path, sce, compression_type)) {
--							buffer *mtime;
-+					/* deflate it to file (cached) or to memory */
-+					if (0 == deflate_file_to_file(srv, con, p,
-+							con->physical.path, sce, compression_type) ||
-+					    0 == deflate_file_to_buffer(srv, con, p,
-+							con->physical.path, sce, compression_type)) {
- 							
--							response_header_overwrite(srv, con, CONST_STR_LEN("Content-Encoding"), compression_name, strlen(compression_name));
--							
--							mtime = strftime_cache_get(srv, sce->st.st_mtime);
--							response_header_overwrite(srv, con, CONST_STR_LEN("Last-Modified"), CONST_BUF_LEN(mtime));
--
--							etag_mutate(con->physical.etag, sce->etag);
--							response_header_overwrite(srv, con, CONST_STR_LEN("ETag"), CONST_BUF_LEN(con->physical.etag));
--
--							response_header_overwrite(srv, con, CONST_STR_LEN("Content-Type"), CONST_BUF_LEN(sce->content_type));
--
--							return HANDLER_GO_ON;
--						}
--					} else if (0 == deflate_file_to_buffer(srv, con, p,
--									       con->physical.path, sce, compression_type)) {
--							
--						response_header_overwrite(srv, con, CONST_STR_LEN("Content-Encoding"), compression_name, strlen(compression_name));
--						response_header_overwrite(srv, con, CONST_STR_LEN("Content-Type"), CONST_BUF_LEN(sce->content_type));
--						
-+						response_header_overwrite(srv, con, 
-+								CONST_STR_LEN("Content-Encoding"), 
-+								compression_name, strlen(compression_name));
-+
-+						response_header_overwrite(srv, con, 
-+								CONST_STR_LEN("Content-Type"), 
-+								CONST_BUF_LEN(sce->content_type));
-+
- 						return HANDLER_FINISHED;
- 					}
diff --git a/www-servers/lighttpd/files/1.4.11/02_all_r1057_fix_If-Modified-Since-ETag.diff b/www-servers/lighttpd/files/1.4.11/02_all_r1057_fix_If-Modified-Since-ETag.diff
deleted file mode 100644
index b1fc8340fcba..000000000000
--- a/www-servers/lighttpd/files/1.4.11/02_all_r1057_fix_If-Modified-Since-ETag.diff
+++ /dev/null
@@ -1,85 +0,0 @@
---- lighttpd-1.4.11.orig/src/http-header-glue.c (revision 989)
-+++ lighttpd-1.4.11/src/http-header-glue.c (revision 1057)
-@@ -263,24 +263,9 @@
- 					} else {
- 						char buf[sizeof("Sat, 23 Jul 2005 21:20:01 GMT")];
--
--						/* convert to timestamp */
--						if (used_len < sizeof(buf)) {
--							time_t t_header, t_file;
--							struct tm tm;
--							
--							strncpy(buf, con->request.http_if_modified_since, used_len);
--							buf[used_len] = '\0';
--							
--							strptime(buf, "%a, %d %b %Y %H:%M:%S GMT", &tm);
--							t_header = mktime(&tm);
--							
--							strptime(mtime->ptr, "%a, %d %b %Y %H:%M:%S GMT", &tm);
--							t_file = mktime(&tm);
--
--							if (t_file > t_header) {
--								con->http_status = 304;
--								return HANDLER_FINISHED;
--							}
--						} else {
-+						time_t t_header, t_file;
-+						struct tm tm;
-+
-+						/* check if we can safely copy the string */
-+						if (used_len >= sizeof(buf)) {
- 							log_error_write(srv, __FILE__, __LINE__, "ssdd", 
- 									"DEBUG: Last-Modified check failed as the received timestamp was too long:", 
-@@ -290,4 +275,19 @@
- 							return HANDLER_FINISHED;
- 						}
-+
-+							
-+						strncpy(buf, con->request.http_if_modified_since, used_len);
-+						buf[used_len] = '\0';
-+							
-+						strptime(buf, "%a, %d %b %Y %H:%M:%S GMT", &tm);
-+						t_header = mktime(&tm);
-+							
-+						strptime(mtime->ptr, "%a, %d %b %Y %H:%M:%S GMT", &tm);
-+						t_file = mktime(&tm);
-+
-+						if (t_file > t_header) return HANDLER_GO_ON;
-+	
-+						con->http_status = 304;
-+						return HANDLER_FINISHED;
- 					}
- 				} else {
-@@ -303,5 +303,5 @@
- 		size_t used_len;
- 		char *semicolon;
--		
-+
- 		if (NULL == (semicolon = strchr(con->request.http_if_modified_since, ';'))) {
- 			used_len = strlen(con->request.http_if_modified_since);
-@@ -313,4 +313,25 @@
- 			con->http_status = 304;
- 			return HANDLER_FINISHED;
-+		} else {
-+			char buf[sizeof("Sat, 23 Jul 2005 21:20:01 GMT")];
-+			time_t t_header, t_file;
-+			struct tm tm;
-+
-+			/* convert to timestamp */
-+			if (used_len >= sizeof(buf)) return HANDLER_GO_ON;
-+
-+			strncpy(buf, con->request.http_if_modified_since, used_len);
-+			buf[used_len] = '\0';
-+					
-+			strptime(buf, "%a, %d %b %Y %H:%M:%S GMT", &tm);
-+			t_header = mktime(&tm);
-+							
-+			strptime(mtime->ptr, "%a, %d %b %Y %H:%M:%S GMT", &tm);
-+			t_file = mktime(&tm);
-+
-+			if (t_file > t_header) return HANDLER_GO_ON;
-+
-+			con->http_status = 304;
-+			return HANDLER_FINISHED;
- 		}
- 	}
diff --git a/www-servers/lighttpd/files/1.4.11/03_all_r1095_fix_stalling_SSL_POST_requests.diff b/www-servers/lighttpd/files/1.4.11/03_all_r1095_fix_stalling_SSL_POST_requests.diff
deleted file mode 100644
index 672dc950b9bc..000000000000
--- a/www-servers/lighttpd/files/1.4.11/03_all_r1095_fix_stalling_SSL_POST_requests.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- lighttpd-1.4.11.orig/src/connections.c (revision 1092)
-+++ lighttpd-1.4.11/src/connections.c (revision 1095)
-@@ -1182,4 +1182,11 @@
- 	    con->state == CON_STATE_READ_POST) {
- 		connection_handle_read_state(srv, con);
-+		/**
-+		 * if SSL_read() is not readin in the full packet we won't get
-+		 * a fdevent as the low-level has already fetched everything.
-+		 *
-+		 * we have to call the state-engine to read the rest of the packet
-+		 */
-+		if (con->is_readable) joblist_append(srv, con);
- 	}
- 
diff --git a/www-servers/lighttpd/files/1.4.11/21_all_mod_scgi_segfault.diff b/www-servers/lighttpd/files/1.4.11/21_all_mod_scgi_segfault.diff
deleted file mode 100644
index 6455c569231c..000000000000
--- a/www-servers/lighttpd/files/1.4.11/21_all_mod_scgi_segfault.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- lighttpd-1.4.11.orig/src/mod_scgi.c	2006-04-05 19:29:01.000000000 +0200
-+++ lighttpd-1.4.11/src/mod_scgi.c	2006-04-05 19:27:32.000000000 +0200
-@@ -2536,7 +2536,7 @@
- 					return HANDLER_WAIT_FOR_FD;
- 				}
- 				
--				log_error_write(srv, __FILE__, __LINE__, "sdsdsd", 
-+				log_error_write(srv, __FILE__, __LINE__, "sosdsd", 
- 						"response not sent, request sent:", hctx->wb->bytes_out,
- 						"connection-fd:", con->fd,
- 						"fcgi-fd:", hctx->fd);
diff --git a/www-servers/lighttpd/files/1.4.11/22_all_bug606_fix_SSI_echo.diff b/www-servers/lighttpd/files/1.4.11/22_all_bug606_fix_SSI_echo.diff
deleted file mode 100644
index 6af338d91dd9..000000000000
--- a/www-servers/lighttpd/files/1.4.11/22_all_bug606_fix_SSI_echo.diff
+++ /dev/null
@@ -1,157 +0,0 @@
---- lighttpd-1.4.11.orig/src/mod_ssi.c	Sun Apr  2 01:20:30 2006
-+++ lighttpd-1.4.11/src/mod_ssi.c.modify	Sun Apr  2 01:21:05 2006
-@@ -36,6 +36,9 @@
- #include <sys/filio.h>
- #endif
- 
-+/* determine if process finished */
-+int h_finished = 0;
-+
- /* init the plugin data */
- INIT_FUNC(mod_ssi_init) {
- 	plugin_data *p;
-@@ -57,7 +60,7 @@ FREE_FUNC(mod_ssi_free) {
- 	UNUSED(srv);
- 	
- 	if (!p) return HANDLER_GO_ON;
--	
-+
- 	if (p->config_storage) {
- 		size_t i;
- 		for (i = 0; i < srv->config_context->used; i++) {
-@@ -286,6 +289,37 @@ static int build_ssi_cgi_vars(server *sr
- 	return 0;
- }
- 
-+URIHANDLER_FUNC(mod_ssi_physical_path) {
-+	plugin_data *p = p_d;
-+	size_t k;
-+	
-+	if (con->physical.path->used == 0) return HANDLER_GO_ON;
-+
-+	con->loops_per_request++;
-+	
-+	mod_ssi_patch_connection(srv, con, p);
-+	
-+	for (k = 0; k < p->conf.ssi_extension->used; k++) {
-+		data_string *ds = (data_string *)p->conf.ssi_extension->data[k];
-+		
-+		if (ds->value->used == 0) continue;
-+		
-+		if (buffer_is_equal_right_len(con->physical.path, ds->value, ds->value->used - 1)) {
-+			/* handle ssi-request */
-+			
-+			if (mod_ssi_handle_request(srv, con, p)) {
-+				/* on error */
-+				con->http_status = 500;
-+			}
-+			
-+			return HANDLER_FINISHED;
-+		}
-+	}
-+	
-+	/* not found */
-+	return HANDLER_GO_ON;
-+}
-+
- static int process_ssi_stmt(server *srv, connection *con, plugin_data *p, 
- 			    const char **l, size_t n) {
- 	size_t i, ssicmd = 0;
-@@ -467,7 +501,11 @@ static int process_ssi_stmt(server *srv,
- 			if (NULL != (ds = (data_string *)array_get_element(p->ssi_cgi_env, var_val))) {
- 				buffer_copy_string_buffer(b, ds->value);
- 			} else {
--				buffer_copy_string(b, "(none)");
-+				if (NULL != (ds = (data_string *)array_get_element(p->ssi_vars, var_val))) {
-+					buffer_copy_string_buffer(b, ds->value);
-+				} else {
-+					buffer_copy_string(b, "(none)");
-+				}
- 			}
- 			
- 			break;
-@@ -481,6 +519,7 @@ static int process_ssi_stmt(server *srv,
- 		const char * file_path = NULL, *virt_path = NULL;
- 		struct stat st;
- 		char *sl;
-+		buffer *tmp;
- 		
- 		for (i = 2; i < n; i += 2) {
- 			if (0 == strcmp(l[i], "file")) {
-@@ -574,7 +613,26 @@ static int process_ssi_stmt(server *srv,
- 				}
- 				break;
- 			case SSI_INCLUDE:
--				chunkqueue_append_file(con->write_queue, p->stat_fn, 0, st.st_size);
-+                                /* do recursive SSI expansion */
-+                                /* prevents infinite loop */
-+                                if (con->loops_per_request > 25 || buffer_is_equal(con->physical.path, p->stat_fn)) {
-+                                        buffer_copy_string(srv->tmp_buf, "<!-- your include directives create an infinite loop, aborting -->");
-+                                        chunkqueue_append_buffer(con->write_queue, srv->tmp_buf);
-+                                        break;
-+                                }
-+
-+                                tmp = buffer_init();
-+                                buffer_copy_string_buffer(tmp, con->physical.path); /* save path of current document */
-+                                buffer_copy_string_buffer(con->physical.path, p->stat_fn); /* next sub-document to parse */
-+                                if (mod_ssi_physical_path(srv, con, p) != HANDLER_FINISHED) {
-+                                        /* the document was not processed, so write it as is */
-+                                        chunkqueue_append_file(con->write_queue, con->physical.path, 0, st.st_size);
-+				} else {
-+					h_finished = 1;	
-+				}
-+                                buffer_copy_string_buffer(con->physical.path, tmp); /* restore saved path */
-+                                buffer_free(tmp);
-+				
- 				break;
- 			}
- 		} else {
-@@ -897,7 +955,11 @@ static int mod_ssi_handle_request(server
- 	
- 	/* get a stream to the file */
- 	
--	array_reset(p->ssi_vars);
-+	if (h_finished == 1)
-+	{
-+		array_reset(p->ssi_vars);
-+		h_finished = 0;
-+	}
- 	array_reset(p->ssi_cgi_env);
- 	buffer_copy_string(p->timefmt, "%a, %d %b %Y %H:%M:%S %Z");
- 	p->sizefmt = 0;
-@@ -1038,35 +1100,6 @@ static int mod_ssi_patch_connection(serv
- }
- #undef PATCH
- 
--URIHANDLER_FUNC(mod_ssi_physical_path) {
--	plugin_data *p = p_d;
--	size_t k;
--	
--	if (con->physical.path->used == 0) return HANDLER_GO_ON;
--	
--	mod_ssi_patch_connection(srv, con, p);
--	
--	for (k = 0; k < p->conf.ssi_extension->used; k++) {
--		data_string *ds = (data_string *)p->conf.ssi_extension->data[k];
--		
--		if (ds->value->used == 0) continue;
--		
--		if (buffer_is_equal_right_len(con->physical.path, ds->value, ds->value->used - 1)) {
--			/* handle ssi-request */
--			
--			if (mod_ssi_handle_request(srv, con, p)) {
--				/* on error */
--				con->http_status = 500;
--			}
--			
--			return HANDLER_FINISHED;
--		}
--	}
--	
--	/* not found */
--	return HANDLER_GO_ON;
--}
--
- /* this function is called at dlopen() time and inits the callbacks */
- 
- int mod_ssi_plugin_init(plugin *p) {
diff --git a/www-servers/lighttpd/files/1.4.11/23_all_mod_ssi_gcc-4.1.1_compile_fix.diff b/www-servers/lighttpd/files/1.4.11/23_all_mod_ssi_gcc-4.1.1_compile_fix.diff
deleted file mode 100644
index 4991bc52a263..000000000000
--- a/www-servers/lighttpd/files/1.4.11/23_all_mod_ssi_gcc-4.1.1_compile_fix.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- lighttpd-1.4.11.orig/src/mod_ssi.c
-+++ lighttpd-1.4.11/src/mod_ssi.c
-@@ -36,6 +36,9 @@
- #include <sys/filio.h>
- #endif
- 
-+static int mod_ssi_handle_request(server *srv, connection *con, plugin_data *p);
-+static int mod_ssi_patch_connection(server *srv, connection *con, plugin_data *p);
-+
- /* determine if process finished */
- int h_finished = 0;
- 
diff --git a/www-servers/lighttpd/files/1.4.13/01_all_lighttpd-1.4.13-99cpu-fix.diff b/www-servers/lighttpd/files/1.4.13/01_all_lighttpd-1.4.13-99cpu-fix.diff
deleted file mode 100644
index 4b7c4494f87f..000000000000
--- a/www-servers/lighttpd/files/1.4.13/01_all_lighttpd-1.4.13-99cpu-fix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- lighttpd-1.4.13/src/connections.c.orig	2007-01-05 10:56:08.000000000 -0800
-+++ lighttpd-1.4.13/src/connections.c	2007-01-05 10:56:23.000000000 -0800
-@@ -970,7 +970,7 @@
- 								}
- 							} else {
- 								/* a splited \r \n */
--								return -1;
-+								break;
- 							}
- 						}
- 					}
diff --git a/www-servers/lighttpd/files/1.4.13/02_all_lighttpd-1.4.13-fcgi-auth-type.diff b/www-servers/lighttpd/files/1.4.13/02_all_lighttpd-1.4.13-fcgi-auth-type.diff
deleted file mode 100644
index aa051c7e1b36..000000000000
--- a/www-servers/lighttpd/files/1.4.13/02_all_lighttpd-1.4.13-fcgi-auth-type.diff
+++ /dev/null
@@ -1,41 +0,0 @@
---- lighttpd-1.4.13/src/mod_fastcgi.c	2006-10-05 03:22:32.000000000 -0700
-+++ lighttpd-1.4.13.patch/src/mod_fastcgi.c	2006-10-18 00:57:19.000000000 -0700
-@@ -1875,8 +1875,36 @@
- 	fcgi_env_add(p->fcgi_env, CONST_STR_LEN("REMOTE_ADDR"), s, strlen(s));
- 
- 	if (!buffer_is_empty(con->authed_user)) {
--		fcgi_env_add(p->fcgi_env, CONST_STR_LEN("REMOTE_USER"),
--			     CONST_BUF_LEN(con->authed_user));
-+		fcgi_env_add(p->fcgi_env, CONST_STR_LEN("REMOTE_USER"), CONST_BUF_LEN(con->authed_user));
-+	
-+		/* AUTH_TYPE fix by Troy Kruthoff (tkruthoff@gmail.com)
-+		 * section 4.1.1 of RFC 3875 (cgi spec) requires the server to set a AUTH_TYPE env
-+		 * declaring the type of authentication used.	 (see http://tools.ietf.org/html/rfc3875#page-11)
-+		 *
-+		 * I copied this code from mod_auth.c where it extracts auth info from the "Authorization" 
-+		 * header to authenticate the user before allowing the request to proceed.  I'm guessing it makes
-+		 * sense to re-parse the header here, as mod_auth is unaware if the request is headed for cgi/fcgi.
-+		 * Someone more familiar with the lighty internals should be able to quickly determine if we are 
-+		 * better storing AUTH_TYPE on the initial parse in mod_auth.
-+		 */
-+		char *http_authorization = NULL;
-+		data_string *ds;
-+	  	
-+		if (NULL != (ds = (data_string *)array_get_element(con->request.headers, "Authorization"))) {
-+			http_authorization = ds->value->ptr;
-+		}
-+	
-+		if (ds && ds->value && ds->value->used) {
-+			char *auth_realm;
-+		  if (NULL != (auth_realm = strchr(http_authorization, ' '))) {
-+				int auth_type_len = auth_realm - http_authorization;
-+				if ((auth_type_len == 5) && (0 == strncmp(http_authorization, "Basic", auth_type_len))) {
-+					  fcgi_env_add(p->fcgi_env, CONST_STR_LEN("AUTH_TYPE"), CONST_STR_LEN("Basic"));
-+				} else if ((auth_type_len == 6) && (0 == strncmp(http_authorization, "Digest", auth_type_len))) {
-+					  fcgi_env_add(p->fcgi_env, CONST_STR_LEN("AUTH_TYPE"), CONST_STR_LEN("Digest"));
-+				}
-+			}
-+		}
- 	}
- 
- 	if (con->request.content_length > 0 && host->mode != FCGI_AUTHORIZER) {
diff --git a/www-servers/lighttpd/files/1.4.13/03_all_lighttpd-1.4.11-errorlog-pipe.diff b/www-servers/lighttpd/files/1.4.13/03_all_lighttpd-1.4.11-errorlog-pipe.diff
deleted file mode 100644
index c168eba74683..000000000000
--- a/www-servers/lighttpd/files/1.4.13/03_all_lighttpd-1.4.11-errorlog-pipe.diff
+++ /dev/null
@@ -1,179 +0,0 @@
-diff -ur lighttpd-1.4.11.orig/src/base.h lighttpd-1.4.11/src/base.h
---- lighttpd-1.4.11.orig/src/base.h	2006-01-13 06:51:04.000000000 -0800
-+++ lighttpd-1.4.11/src/base.h	2006-12-17 18:01:39.000000000 -0800
-@@ -505,7 +505,7 @@
- 	
- 	/* the errorlog */
- 	int errorlog_fd;
--	enum { ERRORLOG_STDERR, ERRORLOG_FILE, ERRORLOG_SYSLOG } errorlog_mode;
-+	enum { ERRORLOG_STDERR, ERRORLOG_FILE, ERRORLOG_SYSLOG, ERRORLOG_PIPE } errorlog_mode;
- 	buffer *errorlog_buf;
- 	
- 	fdevents *ev, *ev_ins;
-diff -ur lighttpd-1.4.11.orig/src/log.c lighttpd-1.4.11/src/log.c
---- lighttpd-1.4.11.orig/src/log.c	2005-13-07 05:01:35.000000000 -0800
-+++ lighttpd-1.4.11/src/log.c	2006-12-17 18:09:43.000000000 -0800
-@@ -34,10 +34,11 @@
- /** 
-  * open the errorlog
-  * 
-- * we have 3 possibilities:
-+ * we have 4 possibilities:
-  * - stderr (default)
-  * - syslog 
-  * - logfile
-+ * - pipe
-  * 
-  * if the open failed, report to the user and die
-  * 
-@@ -57,21 +58,81 @@
- 		srv->errorlog_mode = ERRORLOG_SYSLOG;
- 	} else if (!buffer_is_empty(srv->srvconf.errorlog_file)) {
- 		const char *logfile = srv->srvconf.errorlog_file->ptr;
--		
--		if (-1 == (srv->errorlog_fd = open(logfile, O_APPEND | O_WRONLY | O_CREAT | O_LARGEFILE, 0644))) {
--			log_error_write(srv, __FILE__, __LINE__, "SSSS", 
--					"opening errorlog '", logfile,
--					"' failed: ", strerror(errno));
--			
-+
-+		if (logfile[0] == '|') {
-+#ifdef HAVE_FORK
-+			/* create write pipe and spawn process */
-+
-+			int to_log_fds[2];
-+			pid_t pid;
-+
-+			if (pipe(to_log_fds)) {
-+				log_error_write(srv, __FILE__, __LINE__, "ss",
-+				"pipe failed: ", strerror(errno));
-+				return -1;
-+			}
-+
-+			/* fork, execve */
-+			switch (pid = fork()) {
-+			case 0:
-+				/* child */
-+
-+				close(STDIN_FILENO);
-+				dup2(to_log_fds[0], STDIN_FILENO);
-+				close(to_log_fds[0]);
-+				/* not needed */
-+				close(to_log_fds[1]);
-+
-+				/* we don't need the client socket */
-+				for (fd = 3; fd < 256; fd++) {
-+					close(fd);
-+				}
-+
-+				/* exec the log-process (skip the | )
-+				 *
-+				 */
-+
-+				execl("/bin/sh", "sh", "-c", logfile + 1, NULL);
-+				
-+				log_error_write(srv, __FILE__, __LINE__, "sss",
-+					"spawning log-process failed: ",
-+					strerror(errno), logfile + 1);
-+
-+				exit(-1);
-+				break;
-+			case -1:
-+				/* error */
-+				log_error_write(srv, __FILE__, __LINE__, "ss", "fork failed:", strerror(errno));
-+				break;
-+			default:
-+				close(to_log_fds[0]);
-+
-+				srv->errorlog_fd = to_log_fds[1];
-+
-+				break;
-+			}
-+			srv->errorlog_mode = ERRORLOG_PIPE;
-+#else
-+			log_error_write(srv, __FILE__, __LINE__, "SSS",
-+				"opening errorlog '", logfile,"' impossible");
- 			return -1;
--		}
-+#endif
-+		} else {
-+			if (-1 == (srv->errorlog_fd = open(logfile, O_APPEND | O_WRONLY | O_CREAT | O_LARGEFILE, 0644))) {
-+				log_error_write(srv, __FILE__, __LINE__, "SSSS",
-+  					"opening errorlog '", logfile,
-+  					"' failed: ", strerror(errno));
-+  
-+				return -1;
-+			}
-+			srv->errorlog_mode = ERRORLOG_FILE;
-+  		}
- #ifdef FD_CLOEXEC
--		/* close fd on exec (cgi) */
--		fcntl(srv->errorlog_fd, F_SETFD, FD_CLOEXEC);
-+  		/* close fd on exec (cgi) */
-+  		fcntl(srv->errorlog_fd, F_SETFD, FD_CLOEXEC);
- #endif
--		srv->errorlog_mode = ERRORLOG_FILE;
--	}
--	
-+  	}
-+  
- 	log_error_write(srv, __FILE__, __LINE__, "s", "server started");
- 	
- #ifdef HAVE_VALGRIND_VALGRIND_H
-@@ -99,7 +160,7 @@
-  */
- 
- int log_error_cycle(server *srv) {
--	/* only cycle if we are not in syslog-mode */
-+	/* only cycle if the error log is a file */
- 	
- 	if (srv->errorlog_mode == ERRORLOG_FILE) {
- 		const char *logfile = srv->srvconf.errorlog_file->ptr;
-@@ -135,6 +196,7 @@
- 	log_error_write(srv, __FILE__, __LINE__, "s", "server stopped");
- 	
- 	switch(srv->errorlog_mode) {
-+	case ERRORLOG_PIPE: /* fall through */
- 	case ERRORLOG_FILE:
- 		close(srv->errorlog_fd);
- 		break;
-@@ -154,6 +216,7 @@
- 	va_list ap;
- 	
- 	switch(srv->errorlog_mode) {
-+	case ERRORLOG_PIPE:
- 	case ERRORLOG_FILE:
- 	case ERRORLOG_STDERR:
- 		/* cache the generated timestamp */
-@@ -238,6 +301,7 @@
- 	va_end(ap);
- 	
- 	switch(srv->errorlog_mode) {
-+	case ERRORLOG_PIPE: /* fall through */
- 	case ERRORLOG_FILE:
- 		BUFFER_APPEND_STRING_CONST(srv->errorlog_buf, "\n");
- 		write(srv->errorlog_fd, srv->errorlog_buf->ptr, srv->errorlog_buf->used - 1);
-diff -ur lighttpd-1.4.11.orig/src/mod_cgi.c lighttpd-1.4.11/src/mod_cgi.c
---- lighttpd-1.4.11.orig/src/mod_cgi.c	2006-02-22 05:15:10.000000000 -0800
-+++ lighttpd-1.4.11/src/mod_cgi.c	2006-12-17 18:01:39.000000000 -0800
-@@ -750,7 +750,7 @@
- 		 *
- 		 * we feed the stderr of the CGI to our errorlog, if possible
- 		 */
--		if (srv->errorlog_mode == ERRORLOG_FILE) {
-+		if ((srv->errorlog_mode == ERRORLOG_FILE) || (srv->errorlog_mode == ERRORLOG_PIPE)) {
- 			close(STDERR_FILENO);
- 			dup2(srv->errorlog_fd, STDERR_FILENO);
- 		}
-diff -ur lighttpd-1.4.11.orig/src/mod_rrdtool.c lighttpd-1.4.11/src/mod_rrdtool.c
---- lighttpd-1.4.11.orig/src/mod_rrdtool.c	2005-08-21 15:52:24.000000000 -0700
-+++ lighttpd-1.4.11/src/mod_rrdtool.c	2006-12-17 18:01:39.000000000 -0800
-@@ -134,7 +134,7 @@
- 		
- 		close(STDERR_FILENO);
- 		
--		if (srv->errorlog_mode == ERRORLOG_FILE) {
-+		if ((srv->errorlog_mode == ERRORLOG_FILE) || (srv->errorlog_mode == ERRORLOG_PIPE)) {
- 			dup2(srv->errorlog_fd, STDERR_FILENO);
- 			close(srv->errorlog_fd);
- 		}
diff --git a/www-servers/lighttpd/files/1.4.13/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff b/www-servers/lighttpd/files/1.4.13/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff
deleted file mode 100644
index 259ad4b279a5..000000000000
--- a/www-servers/lighttpd/files/1.4.13/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- lighttpd-1.4.13.old/src/Makefile.am	2006-10-09 12:19:34.000000000 -0400
-+++ lighttpd-1.4.13/src/Makefile.am	2007-03-26 10:10:26.000000000 -0400
-@@ -213,6 +213,7 @@
- mod_auth_la_SOURCES = mod_auth.c http_auth_digest.c http_auth.c
- mod_auth_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
- mod_auth_la_LIBADD = $(CRYPT_LIB) $(LDAP_LIB) $(LBER_LIB) $(common_libadd)
-+mod_auth_la_CFLAGS = -DLDAP_DEPRECATED
- 
- lib_LTLIBRARIES += mod_rewrite.la
- mod_rewrite_la_SOURCES = mod_rewrite.c
diff --git a/www-servers/lighttpd/files/1.4.15-r1/03_all_lighttpd-1.4.11-errorlog-pipe.diff b/www-servers/lighttpd/files/1.4.15-r1/03_all_lighttpd-1.4.11-errorlog-pipe.diff
deleted file mode 100644
index c168eba74683..000000000000
--- a/www-servers/lighttpd/files/1.4.15-r1/03_all_lighttpd-1.4.11-errorlog-pipe.diff
+++ /dev/null
@@ -1,179 +0,0 @@
-diff -ur lighttpd-1.4.11.orig/src/base.h lighttpd-1.4.11/src/base.h
---- lighttpd-1.4.11.orig/src/base.h	2006-01-13 06:51:04.000000000 -0800
-+++ lighttpd-1.4.11/src/base.h	2006-12-17 18:01:39.000000000 -0800
-@@ -505,7 +505,7 @@
- 	
- 	/* the errorlog */
- 	int errorlog_fd;
--	enum { ERRORLOG_STDERR, ERRORLOG_FILE, ERRORLOG_SYSLOG } errorlog_mode;
-+	enum { ERRORLOG_STDERR, ERRORLOG_FILE, ERRORLOG_SYSLOG, ERRORLOG_PIPE } errorlog_mode;
- 	buffer *errorlog_buf;
- 	
- 	fdevents *ev, *ev_ins;
-diff -ur lighttpd-1.4.11.orig/src/log.c lighttpd-1.4.11/src/log.c
---- lighttpd-1.4.11.orig/src/log.c	2005-13-07 05:01:35.000000000 -0800
-+++ lighttpd-1.4.11/src/log.c	2006-12-17 18:09:43.000000000 -0800
-@@ -34,10 +34,11 @@
- /** 
-  * open the errorlog
-  * 
-- * we have 3 possibilities:
-+ * we have 4 possibilities:
-  * - stderr (default)
-  * - syslog 
-  * - logfile
-+ * - pipe
-  * 
-  * if the open failed, report to the user and die
-  * 
-@@ -57,21 +58,81 @@
- 		srv->errorlog_mode = ERRORLOG_SYSLOG;
- 	} else if (!buffer_is_empty(srv->srvconf.errorlog_file)) {
- 		const char *logfile = srv->srvconf.errorlog_file->ptr;
--		
--		if (-1 == (srv->errorlog_fd = open(logfile, O_APPEND | O_WRONLY | O_CREAT | O_LARGEFILE, 0644))) {
--			log_error_write(srv, __FILE__, __LINE__, "SSSS", 
--					"opening errorlog '", logfile,
--					"' failed: ", strerror(errno));
--			
-+
-+		if (logfile[0] == '|') {
-+#ifdef HAVE_FORK
-+			/* create write pipe and spawn process */
-+
-+			int to_log_fds[2];
-+			pid_t pid;
-+
-+			if (pipe(to_log_fds)) {
-+				log_error_write(srv, __FILE__, __LINE__, "ss",
-+				"pipe failed: ", strerror(errno));
-+				return -1;
-+			}
-+
-+			/* fork, execve */
-+			switch (pid = fork()) {
-+			case 0:
-+				/* child */
-+
-+				close(STDIN_FILENO);
-+				dup2(to_log_fds[0], STDIN_FILENO);
-+				close(to_log_fds[0]);
-+				/* not needed */
-+				close(to_log_fds[1]);
-+
-+				/* we don't need the client socket */
-+				for (fd = 3; fd < 256; fd++) {
-+					close(fd);
-+				}
-+
-+				/* exec the log-process (skip the | )
-+				 *
-+				 */
-+
-+				execl("/bin/sh", "sh", "-c", logfile + 1, NULL);
-+				
-+				log_error_write(srv, __FILE__, __LINE__, "sss",
-+					"spawning log-process failed: ",
-+					strerror(errno), logfile + 1);
-+
-+				exit(-1);
-+				break;
-+			case -1:
-+				/* error */
-+				log_error_write(srv, __FILE__, __LINE__, "ss", "fork failed:", strerror(errno));
-+				break;
-+			default:
-+				close(to_log_fds[0]);
-+
-+				srv->errorlog_fd = to_log_fds[1];
-+
-+				break;
-+			}
-+			srv->errorlog_mode = ERRORLOG_PIPE;
-+#else
-+			log_error_write(srv, __FILE__, __LINE__, "SSS",
-+				"opening errorlog '", logfile,"' impossible");
- 			return -1;
--		}
-+#endif
-+		} else {
-+			if (-1 == (srv->errorlog_fd = open(logfile, O_APPEND | O_WRONLY | O_CREAT | O_LARGEFILE, 0644))) {
-+				log_error_write(srv, __FILE__, __LINE__, "SSSS",
-+  					"opening errorlog '", logfile,
-+  					"' failed: ", strerror(errno));
-+  
-+				return -1;
-+			}
-+			srv->errorlog_mode = ERRORLOG_FILE;
-+  		}
- #ifdef FD_CLOEXEC
--		/* close fd on exec (cgi) */
--		fcntl(srv->errorlog_fd, F_SETFD, FD_CLOEXEC);
-+  		/* close fd on exec (cgi) */
-+  		fcntl(srv->errorlog_fd, F_SETFD, FD_CLOEXEC);
- #endif
--		srv->errorlog_mode = ERRORLOG_FILE;
--	}
--	
-+  	}
-+  
- 	log_error_write(srv, __FILE__, __LINE__, "s", "server started");
- 	
- #ifdef HAVE_VALGRIND_VALGRIND_H
-@@ -99,7 +160,7 @@
-  */
- 
- int log_error_cycle(server *srv) {
--	/* only cycle if we are not in syslog-mode */
-+	/* only cycle if the error log is a file */
- 	
- 	if (srv->errorlog_mode == ERRORLOG_FILE) {
- 		const char *logfile = srv->srvconf.errorlog_file->ptr;
-@@ -135,6 +196,7 @@
- 	log_error_write(srv, __FILE__, __LINE__, "s", "server stopped");
- 	
- 	switch(srv->errorlog_mode) {
-+	case ERRORLOG_PIPE: /* fall through */
- 	case ERRORLOG_FILE:
- 		close(srv->errorlog_fd);
- 		break;
-@@ -154,6 +216,7 @@
- 	va_list ap;
- 	
- 	switch(srv->errorlog_mode) {
-+	case ERRORLOG_PIPE:
- 	case ERRORLOG_FILE:
- 	case ERRORLOG_STDERR:
- 		/* cache the generated timestamp */
-@@ -238,6 +301,7 @@
- 	va_end(ap);
- 	
- 	switch(srv->errorlog_mode) {
-+	case ERRORLOG_PIPE: /* fall through */
- 	case ERRORLOG_FILE:
- 		BUFFER_APPEND_STRING_CONST(srv->errorlog_buf, "\n");
- 		write(srv->errorlog_fd, srv->errorlog_buf->ptr, srv->errorlog_buf->used - 1);
-diff -ur lighttpd-1.4.11.orig/src/mod_cgi.c lighttpd-1.4.11/src/mod_cgi.c
---- lighttpd-1.4.11.orig/src/mod_cgi.c	2006-02-22 05:15:10.000000000 -0800
-+++ lighttpd-1.4.11/src/mod_cgi.c	2006-12-17 18:01:39.000000000 -0800
-@@ -750,7 +750,7 @@
- 		 *
- 		 * we feed the stderr of the CGI to our errorlog, if possible
- 		 */
--		if (srv->errorlog_mode == ERRORLOG_FILE) {
-+		if ((srv->errorlog_mode == ERRORLOG_FILE) || (srv->errorlog_mode == ERRORLOG_PIPE)) {
- 			close(STDERR_FILENO);
- 			dup2(srv->errorlog_fd, STDERR_FILENO);
- 		}
-diff -ur lighttpd-1.4.11.orig/src/mod_rrdtool.c lighttpd-1.4.11/src/mod_rrdtool.c
---- lighttpd-1.4.11.orig/src/mod_rrdtool.c	2005-08-21 15:52:24.000000000 -0700
-+++ lighttpd-1.4.11/src/mod_rrdtool.c	2006-12-17 18:01:39.000000000 -0800
-@@ -134,7 +134,7 @@
- 		
- 		close(STDERR_FILENO);
- 		
--		if (srv->errorlog_mode == ERRORLOG_FILE) {
-+		if ((srv->errorlog_mode == ERRORLOG_FILE) || (srv->errorlog_mode == ERRORLOG_PIPE)) {
- 			dup2(srv->errorlog_fd, STDERR_FILENO);
- 			close(srv->errorlog_fd);
- 		}
diff --git a/www-servers/lighttpd/files/1.4.15-r1/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff b/www-servers/lighttpd/files/1.4.15-r1/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff
deleted file mode 100644
index 259ad4b279a5..000000000000
--- a/www-servers/lighttpd/files/1.4.15-r1/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- lighttpd-1.4.13.old/src/Makefile.am	2006-10-09 12:19:34.000000000 -0400
-+++ lighttpd-1.4.13/src/Makefile.am	2007-03-26 10:10:26.000000000 -0400
-@@ -213,6 +213,7 @@
- mod_auth_la_SOURCES = mod_auth.c http_auth_digest.c http_auth.c
- mod_auth_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
- mod_auth_la_LIBADD = $(CRYPT_LIB) $(LDAP_LIB) $(LBER_LIB) $(common_libadd)
-+mod_auth_la_CFLAGS = -DLDAP_DEPRECATED
- 
- lib_LTLIBRARIES += mod_rewrite.la
- mod_rewrite_la_SOURCES = mod_rewrite.c
diff --git a/www-servers/lighttpd/files/1.4.15-r1/07_all_lighttpd-1.4.15-duplicated_headers_with_folding_crash.diff b/www-servers/lighttpd/files/1.4.15-r1/07_all_lighttpd-1.4.15-duplicated_headers_with_folding_crash.diff
deleted file mode 100644
index 6bb175a657b1..000000000000
--- a/www-servers/lighttpd/files/1.4.15-r1/07_all_lighttpd-1.4.15-duplicated_headers_with_folding_crash.diff
+++ /dev/null
@@ -1,122 +0,0 @@
-Index: src/request.c
-===================================================================
---- src/request.c	(revision 1868)
-+++ src/request.c	(revision 1870)
-@@ -284,8 +284,6 @@
- 
- 	int done = 0;
- 
--	data_string *ds = NULL;
--
- 	/*
- 	 * Request: "^(GET|POST|HEAD) ([^ ]+(\\?[^ ]+|)) (HTTP/1\\.[01])$"
- 	 * Option : "^([-a-zA-Z]+): (.+)$"
-@@ -715,12 +713,24 @@
- 			switch(*cur) {
- 			case '\r':
- 				if (con->parse_request->ptr[i+1] == '\n') {
-+					data_string *ds = NULL;
-+
- 					/* End of Headerline */
- 					con->parse_request->ptr[i] = '\0';
- 					con->parse_request->ptr[i+1] = '\0';
- 
- 					if (in_folding) {
--						if (!ds) {
-+						buffer *key_b;
-+						/**
-+						 * we use a evil hack to handle the line-folding
-+						 * 
-+						 * As array_insert_unique() deletes 'ds' in the case of a duplicate
-+						 * ds points somewhere and we get a evil crash. As a solution we keep the old
-+						 * "key" and get the current value from the hash and append us
-+						 *
-+						 * */
-+
-+						if (!key || !key_len) {
- 							/* 400 */
- 
- 							if (srv->srvconf.log_request_header_on_error) {
-@@ -737,7 +747,15 @@
- 							con->response.keep_alive = 0;
- 							return 0;
- 						}
--						buffer_append_string(ds->value, value);
-+
-+						key_b = buffer_init();
-+						buffer_copy_string_len(key_b, key, key_len);
-+
-+						if (NULL != (ds = (data_string *)array_get_element(con->request.headers, key_b->ptr))) {
-+							buffer_append_string(ds->value, value);
-+						}
-+
-+						buffer_free(key_b);
- 					} else {
- 						int s_len;
- 						key = con->parse_request->ptr + first;
-@@ -969,7 +987,12 @@
- 					first = i+1;
- 					is_key = 1;
- 					value = 0;
--					key_len = 0;
-+#if 0
-+					/**
-+					 * for Bug 1230 keep the key_len a live
-+					 */
-+					key_len = 0; 
-+#endif
- 					in_folding = 0;
- 				} else {
- 					if (srv->srvconf.log_request_header_on_error) {
-Index: tests/core-request.t
-===================================================================
---- tests/core-request.t	(revision 1868)
-+++ tests/core-request.t	(revision 1870)
-@@ -8,7 +8,7 @@
- 
- use strict;
- use IO::Socket;
--use Test::More tests => 33;
-+use Test::More tests => 36;
- use LightyTest;
- 
- my $tf = LightyTest->new();
-@@ -273,6 +273,38 @@
- $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ];
- ok($tf->handle_http($t) == 0, 'uppercase filenames');
- 
-+$t->{REQUEST}  = ( <<EOF
-+GET / HTTP/1.0
-+Location: foo
-+Location: foobar
-+  baz
-+EOF
-+ );
-+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ];
-+ok($tf->handle_http($t) == 0, '#1232 - duplicate headers with line-wrapping');
- 
-+$t->{REQUEST}  = ( <<EOF
-+GET / HTTP/1.0
-+Location: 
-+Location: foobar
-+  baz
-+EOF
-+ );
-+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ];
-+ok($tf->handle_http($t) == 0, '#1232 - duplicate headers with line-wrapping - test 2');
-+
-+$t->{REQUEST}  = ( <<EOF
-+GET / HTTP/1.0
-+A: 
-+Location: foobar
-+  baz
-+EOF
-+ );
-+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ];
-+ok($tf->handle_http($t) == 0, '#1232 - duplicate headers with line-wrapping - test 3');
-+
-+
-+
-+
- ok($tf->stop_proc == 0, "Stopping lighttpd");
- 
diff --git a/www-servers/lighttpd/files/1.4.15-r1/08_all_lighttpd-1.4.15-mod_acces_bypass.diff b/www-servers/lighttpd/files/1.4.15-r1/08_all_lighttpd-1.4.15-mod_acces_bypass.diff
deleted file mode 100644
index 3165cd7b7012..000000000000
--- a/www-servers/lighttpd/files/1.4.15-r1/08_all_lighttpd-1.4.15-mod_acces_bypass.diff
+++ /dev/null
@@ -1,129 +0,0 @@
-Index: src/mod_access.c
-===================================================================
---- src/mod_access.c	(revision 1870)
-+++ src/mod_access.c	(revision 1871)
-@@ -111,6 +111,15 @@
- }
- #undef PATCH
- 
-+/**
-+ * URI handler
-+ *
-+ * we will get called twice:
-+ * - after the clean up of the URL and 
-+ * - after the pathinfo checks are done
-+ *
-+ * this handles the issue of trailing slashes
-+ */
- URIHANDLER_FUNC(mod_access_uri_handler) {
- 	plugin_data *p = p_d;
- 	int s_len;
-@@ -122,28 +131,41 @@
- 
- 	s_len = con->uri.path->used - 1;
- 
-+	if (con->conf.log_request_handling) {
-+ 		log_error_write(srv, __FILE__, __LINE__, "s", 
-+				"-- mod_access_uri_handler called");
-+	}
-+
- 	for (k = 0; k < p->conf.access_deny->used; k++) {
- 		data_string *ds = (data_string *)p->conf.access_deny->data[k];
- 		int ct_len = ds->value->used - 1;
-+		int denied = 0;
- 
-+
- 		if (ct_len > s_len) continue;
--
- 		if (ds->value->used == 0) continue;
- 
- 		/* if we have a case-insensitive FS we have to lower-case the URI here too */
- 
- 		if (con->conf.force_lowercase_filenames) {
- 			if (0 == strncasecmp(con->uri.path->ptr + s_len - ct_len, ds->value->ptr, ct_len)) {
--				con->http_status = 403;
--
--				return HANDLER_FINISHED;
-+				denied = 1;
- 			}
- 		} else {
- 			if (0 == strncmp(con->uri.path->ptr + s_len - ct_len, ds->value->ptr, ct_len)) {
--				con->http_status = 403;
-+				denied = 1;
-+			}
-+		}
- 
--				return HANDLER_FINISHED;
-+		if (denied) {
-+			con->http_status = 403;
-+
-+			if (con->conf.log_request_handling) {
-+	 			log_error_write(srv, __FILE__, __LINE__, "sb", 
-+					"url denied as we match:", ds->value);
- 			}
-+
-+			return HANDLER_FINISHED;
- 		}
- 	}
- 
-@@ -158,7 +180,8 @@
- 
- 	p->init        = mod_access_init;
- 	p->set_defaults = mod_access_set_defaults;
--	p->handle_uri_clean  = mod_access_uri_handler;
-+	p->handle_uri_clean = mod_access_uri_handler;
-+	p->handle_subrequest_start  = mod_access_uri_handler;
- 	p->cleanup     = mod_access_free;
- 
- 	p->data        = NULL;
-Index: tests/mod-access.t
-===================================================================
---- tests/mod-access.t	(revision 1870)
-+++ tests/mod-access.t	(revision 1871)
-@@ -8,7 +8,7 @@
- 
- use strict;
- use IO::Socket;
--use Test::More tests => 3;
-+use Test::More tests => 4;
- use LightyTest;
- 
- my $tf = LightyTest->new();
-@@ -23,5 +23,12 @@
- $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 403 } ];
- ok($tf->handle_http($t) == 0, 'forbid access to ...~');
- 
-+$t->{REQUEST}  = ( <<EOF
-+GET /index.html~/ HTTP/1.0
-+EOF
-+ );
-+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 403 } ];
-+ok($tf->handle_http($t) == 0, '#1230 - forbid access to ...~ - trailing slash');
-+
- ok($tf->stop_proc == 0, "Stopping lighttpd");
- 
-Index: tests/prepare.sh
-===================================================================
---- tests/prepare.sh	(revision 1870)
-+++ tests/prepare.sh	(revision 1871)
-@@ -25,6 +25,7 @@
- # copy everything into the right places
- cp $srcdir/docroot/www/*.html \
-    $srcdir/docroot/www/*.php \
-+   $srcdir/docroot/www/*.html~ \
-    $srcdir/docroot/www/*.pl \
-    $srcdir/docroot/www/*.fcgi \
-    $srcdir/docroot/www/*.shtml \
-Index: tests/docroot/www/index.html~
-===================================================================
-Index: tests/docroot/www/Makefile.am
-===================================================================
---- tests/docroot/www/Makefile.am	(revision 1870)
-+++ tests/docroot/www/Makefile.am	(revision 1871)
-@@ -1,5 +1,5 @@
- EXTRA_DIST=cgi.php cgi.pl dummydir index.html index.txt phpinfo.php \
- 	   redirect.php cgi-pathinfo.pl get-env.php get-server-env.php \
- 	   nph-status.pl prefix.fcgi get-header.pl ssi.shtml get-post-len.pl \
--	   exec-date.shtml
-+	   exec-date.shtml index.html~
- SUBDIRS=go indexfile expire
diff --git a/www-servers/lighttpd/files/1.4.15-r1/09_all_lighttpd-1.4.15-mod_fastcgi_local_dos.diff b/www-servers/lighttpd/files/1.4.15-r1/09_all_lighttpd-1.4.15-mod_fastcgi_local_dos.diff
deleted file mode 100644
index 7c8f4e91c1e6..000000000000
--- a/www-servers/lighttpd/files/1.4.15-r1/09_all_lighttpd-1.4.15-mod_fastcgi_local_dos.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: src/mod_fastcgi.c
-===================================================================
---- src/mod_fastcgi.c	(revision 1878)
-+++ src/mod_fastcgi.c	(revision 1879)
-@@ -2440,7 +2440,6 @@
- 		b->used = r + 1; /* one extra for the fake \0 */
- 		b->ptr[b->used - 1] = '\0';
- 	} else {
--		if (errno == EAGAIN) return 0;
- 		log_error_write(srv, __FILE__, __LINE__, "ssdsb",
- 				"unexpected end-of-file (perhaps the fastcgi process died):",
- 				"pid:", proc->pid,
diff --git a/www-servers/lighttpd/files/1.4.15-r1/10_all_lighttpd-1.4.15-mod_scgi_crash.diff b/www-servers/lighttpd/files/1.4.15-r1/10_all_lighttpd-1.4.15-mod_scgi_crash.diff
deleted file mode 100644
index f5bb6a128b1b..000000000000
--- a/www-servers/lighttpd/files/1.4.15-r1/10_all_lighttpd-1.4.15-mod_scgi_crash.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nura lighttpd-1.4.15/src/mod_scgi.c lighttpd-1.4.15-scgi/src/mod_scgi.c
---- lighttpd-1.4.15/src/mod_scgi.c	2007-02-08 13:34:45.000000000 -0300
-+++ lighttpd-1.4.15-scgi/src/mod_scgi.c	2007-07-20 10:35:41.000000000 -0300
-@@ -2536,7 +2536,7 @@
- 					return HANDLER_WAIT_FOR_FD;
- 				}
- 
--				log_error_write(srv, __FILE__, __LINE__, "sdsdsd",
-+				log_error_write(srv, __FILE__, __LINE__, "sosdsd",
- 						"response not sent, request sent:", hctx->wb->bytes_out,
- 						"connection-fd:", con->fd,
- 						"fcgi-fd:", hctx->fd);
diff --git a/www-servers/lighttpd/files/1.4.15/03_all_lighttpd-1.4.11-errorlog-pipe.diff b/www-servers/lighttpd/files/1.4.15/03_all_lighttpd-1.4.11-errorlog-pipe.diff
deleted file mode 100644
index c168eba74683..000000000000
--- a/www-servers/lighttpd/files/1.4.15/03_all_lighttpd-1.4.11-errorlog-pipe.diff
+++ /dev/null
@@ -1,179 +0,0 @@
-diff -ur lighttpd-1.4.11.orig/src/base.h lighttpd-1.4.11/src/base.h
---- lighttpd-1.4.11.orig/src/base.h	2006-01-13 06:51:04.000000000 -0800
-+++ lighttpd-1.4.11/src/base.h	2006-12-17 18:01:39.000000000 -0800
-@@ -505,7 +505,7 @@
- 	
- 	/* the errorlog */
- 	int errorlog_fd;
--	enum { ERRORLOG_STDERR, ERRORLOG_FILE, ERRORLOG_SYSLOG } errorlog_mode;
-+	enum { ERRORLOG_STDERR, ERRORLOG_FILE, ERRORLOG_SYSLOG, ERRORLOG_PIPE } errorlog_mode;
- 	buffer *errorlog_buf;
- 	
- 	fdevents *ev, *ev_ins;
-diff -ur lighttpd-1.4.11.orig/src/log.c lighttpd-1.4.11/src/log.c
---- lighttpd-1.4.11.orig/src/log.c	2005-13-07 05:01:35.000000000 -0800
-+++ lighttpd-1.4.11/src/log.c	2006-12-17 18:09:43.000000000 -0800
-@@ -34,10 +34,11 @@
- /** 
-  * open the errorlog
-  * 
-- * we have 3 possibilities:
-+ * we have 4 possibilities:
-  * - stderr (default)
-  * - syslog 
-  * - logfile
-+ * - pipe
-  * 
-  * if the open failed, report to the user and die
-  * 
-@@ -57,21 +58,81 @@
- 		srv->errorlog_mode = ERRORLOG_SYSLOG;
- 	} else if (!buffer_is_empty(srv->srvconf.errorlog_file)) {
- 		const char *logfile = srv->srvconf.errorlog_file->ptr;
--		
--		if (-1 == (srv->errorlog_fd = open(logfile, O_APPEND | O_WRONLY | O_CREAT | O_LARGEFILE, 0644))) {
--			log_error_write(srv, __FILE__, __LINE__, "SSSS", 
--					"opening errorlog '", logfile,
--					"' failed: ", strerror(errno));
--			
-+
-+		if (logfile[0] == '|') {
-+#ifdef HAVE_FORK
-+			/* create write pipe and spawn process */
-+
-+			int to_log_fds[2];
-+			pid_t pid;
-+
-+			if (pipe(to_log_fds)) {
-+				log_error_write(srv, __FILE__, __LINE__, "ss",
-+				"pipe failed: ", strerror(errno));
-+				return -1;
-+			}
-+
-+			/* fork, execve */
-+			switch (pid = fork()) {
-+			case 0:
-+				/* child */
-+
-+				close(STDIN_FILENO);
-+				dup2(to_log_fds[0], STDIN_FILENO);
-+				close(to_log_fds[0]);
-+				/* not needed */
-+				close(to_log_fds[1]);
-+
-+				/* we don't need the client socket */
-+				for (fd = 3; fd < 256; fd++) {
-+					close(fd);
-+				}
-+
-+				/* exec the log-process (skip the | )
-+				 *
-+				 */
-+
-+				execl("/bin/sh", "sh", "-c", logfile + 1, NULL);
-+				
-+				log_error_write(srv, __FILE__, __LINE__, "sss",
-+					"spawning log-process failed: ",
-+					strerror(errno), logfile + 1);
-+
-+				exit(-1);
-+				break;
-+			case -1:
-+				/* error */
-+				log_error_write(srv, __FILE__, __LINE__, "ss", "fork failed:", strerror(errno));
-+				break;
-+			default:
-+				close(to_log_fds[0]);
-+
-+				srv->errorlog_fd = to_log_fds[1];
-+
-+				break;
-+			}
-+			srv->errorlog_mode = ERRORLOG_PIPE;
-+#else
-+			log_error_write(srv, __FILE__, __LINE__, "SSS",
-+				"opening errorlog '", logfile,"' impossible");
- 			return -1;
--		}
-+#endif
-+		} else {
-+			if (-1 == (srv->errorlog_fd = open(logfile, O_APPEND | O_WRONLY | O_CREAT | O_LARGEFILE, 0644))) {
-+				log_error_write(srv, __FILE__, __LINE__, "SSSS",
-+  					"opening errorlog '", logfile,
-+  					"' failed: ", strerror(errno));
-+  
-+				return -1;
-+			}
-+			srv->errorlog_mode = ERRORLOG_FILE;
-+  		}
- #ifdef FD_CLOEXEC
--		/* close fd on exec (cgi) */
--		fcntl(srv->errorlog_fd, F_SETFD, FD_CLOEXEC);
-+  		/* close fd on exec (cgi) */
-+  		fcntl(srv->errorlog_fd, F_SETFD, FD_CLOEXEC);
- #endif
--		srv->errorlog_mode = ERRORLOG_FILE;
--	}
--	
-+  	}
-+  
- 	log_error_write(srv, __FILE__, __LINE__, "s", "server started");
- 	
- #ifdef HAVE_VALGRIND_VALGRIND_H
-@@ -99,7 +160,7 @@
-  */
- 
- int log_error_cycle(server *srv) {
--	/* only cycle if we are not in syslog-mode */
-+	/* only cycle if the error log is a file */
- 	
- 	if (srv->errorlog_mode == ERRORLOG_FILE) {
- 		const char *logfile = srv->srvconf.errorlog_file->ptr;
-@@ -135,6 +196,7 @@
- 	log_error_write(srv, __FILE__, __LINE__, "s", "server stopped");
- 	
- 	switch(srv->errorlog_mode) {
-+	case ERRORLOG_PIPE: /* fall through */
- 	case ERRORLOG_FILE:
- 		close(srv->errorlog_fd);
- 		break;
-@@ -154,6 +216,7 @@
- 	va_list ap;
- 	
- 	switch(srv->errorlog_mode) {
-+	case ERRORLOG_PIPE:
- 	case ERRORLOG_FILE:
- 	case ERRORLOG_STDERR:
- 		/* cache the generated timestamp */
-@@ -238,6 +301,7 @@
- 	va_end(ap);
- 	
- 	switch(srv->errorlog_mode) {
-+	case ERRORLOG_PIPE: /* fall through */
- 	case ERRORLOG_FILE:
- 		BUFFER_APPEND_STRING_CONST(srv->errorlog_buf, "\n");
- 		write(srv->errorlog_fd, srv->errorlog_buf->ptr, srv->errorlog_buf->used - 1);
-diff -ur lighttpd-1.4.11.orig/src/mod_cgi.c lighttpd-1.4.11/src/mod_cgi.c
---- lighttpd-1.4.11.orig/src/mod_cgi.c	2006-02-22 05:15:10.000000000 -0800
-+++ lighttpd-1.4.11/src/mod_cgi.c	2006-12-17 18:01:39.000000000 -0800
-@@ -750,7 +750,7 @@
- 		 *
- 		 * we feed the stderr of the CGI to our errorlog, if possible
- 		 */
--		if (srv->errorlog_mode == ERRORLOG_FILE) {
-+		if ((srv->errorlog_mode == ERRORLOG_FILE) || (srv->errorlog_mode == ERRORLOG_PIPE)) {
- 			close(STDERR_FILENO);
- 			dup2(srv->errorlog_fd, STDERR_FILENO);
- 		}
-diff -ur lighttpd-1.4.11.orig/src/mod_rrdtool.c lighttpd-1.4.11/src/mod_rrdtool.c
---- lighttpd-1.4.11.orig/src/mod_rrdtool.c	2005-08-21 15:52:24.000000000 -0700
-+++ lighttpd-1.4.11/src/mod_rrdtool.c	2006-12-17 18:01:39.000000000 -0800
-@@ -134,7 +134,7 @@
- 		
- 		close(STDERR_FILENO);
- 		
--		if (srv->errorlog_mode == ERRORLOG_FILE) {
-+		if ((srv->errorlog_mode == ERRORLOG_FILE) || (srv->errorlog_mode == ERRORLOG_PIPE)) {
- 			dup2(srv->errorlog_fd, STDERR_FILENO);
- 			close(srv->errorlog_fd);
- 		}
diff --git a/www-servers/lighttpd/files/1.4.15/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff b/www-servers/lighttpd/files/1.4.15/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff
deleted file mode 100644
index 259ad4b279a5..000000000000
--- a/www-servers/lighttpd/files/1.4.15/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- lighttpd-1.4.13.old/src/Makefile.am	2006-10-09 12:19:34.000000000 -0400
-+++ lighttpd-1.4.13/src/Makefile.am	2007-03-26 10:10:26.000000000 -0400
-@@ -213,6 +213,7 @@
- mod_auth_la_SOURCES = mod_auth.c http_auth_digest.c http_auth.c
- mod_auth_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
- mod_auth_la_LIBADD = $(CRYPT_LIB) $(LDAP_LIB) $(LBER_LIB) $(common_libadd)
-+mod_auth_la_CFLAGS = -DLDAP_DEPRECATED
- 
- lib_LTLIBRARIES += mod_rewrite.la
- mod_rewrite_la_SOURCES = mod_rewrite.c
diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.4.11 b/www-servers/lighttpd/files/digest-lighttpd-1.4.11
deleted file mode 100644
index 313e29e22093..000000000000
--- a/www-servers/lighttpd/files/digest-lighttpd-1.4.11
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f55eebb9815c94a7de35906bb557ecd3 lighttpd-1.4.11.tar.gz 781656
-RMD160 0434e6c09383f1ad443d985fd168a29f6f132d1f lighttpd-1.4.11.tar.gz 781656
-SHA256 7782ac82af8ea8d14df5d35b6668c0d45c00f3ba43a6203c29c7fe7dfe98999c lighttpd-1.4.11.tar.gz 781656
diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.4.13 b/www-servers/lighttpd/files/digest-lighttpd-1.4.13
deleted file mode 100644
index 7a885e91935a..000000000000
--- a/www-servers/lighttpd/files/digest-lighttpd-1.4.13
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d775d6478391b95d841a1018c8db0b95 lighttpd-1.4.13.tar.gz 797813
-RMD160 4e67e42dc3692d50c044561cc903de7b906f260c lighttpd-1.4.13.tar.gz 797813
-SHA256 62d5997fdb41afa9400adcdb040d04a1f5fa950045df96e3e3f593e8f0de5739 lighttpd-1.4.13.tar.gz 797813
diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.4.13-r1 b/www-servers/lighttpd/files/digest-lighttpd-1.4.13-r1
deleted file mode 100644
index 7a885e91935a..000000000000
--- a/www-servers/lighttpd/files/digest-lighttpd-1.4.13-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d775d6478391b95d841a1018c8db0b95 lighttpd-1.4.13.tar.gz 797813
-RMD160 4e67e42dc3692d50c044561cc903de7b906f260c lighttpd-1.4.13.tar.gz 797813
-SHA256 62d5997fdb41afa9400adcdb040d04a1f5fa950045df96e3e3f593e8f0de5739 lighttpd-1.4.13.tar.gz 797813
diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.4.13-r2 b/www-servers/lighttpd/files/digest-lighttpd-1.4.13-r2
deleted file mode 100644
index 7a885e91935a..000000000000
--- a/www-servers/lighttpd/files/digest-lighttpd-1.4.13-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d775d6478391b95d841a1018c8db0b95 lighttpd-1.4.13.tar.gz 797813
-RMD160 4e67e42dc3692d50c044561cc903de7b906f260c lighttpd-1.4.13.tar.gz 797813
-SHA256 62d5997fdb41afa9400adcdb040d04a1f5fa950045df96e3e3f593e8f0de5739 lighttpd-1.4.13.tar.gz 797813
diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.4.13-r3 b/www-servers/lighttpd/files/digest-lighttpd-1.4.13-r3
deleted file mode 100644
index 7a885e91935a..000000000000
--- a/www-servers/lighttpd/files/digest-lighttpd-1.4.13-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d775d6478391b95d841a1018c8db0b95 lighttpd-1.4.13.tar.gz 797813
-RMD160 4e67e42dc3692d50c044561cc903de7b906f260c lighttpd-1.4.13.tar.gz 797813
-SHA256 62d5997fdb41afa9400adcdb040d04a1f5fa950045df96e3e3f593e8f0de5739 lighttpd-1.4.13.tar.gz 797813
diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.4.15 b/www-servers/lighttpd/files/digest-lighttpd-1.4.15
deleted file mode 100644
index 0b575e222c44..000000000000
--- a/www-servers/lighttpd/files/digest-lighttpd-1.4.15
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b994b8c359da578dec073cae52c4924f lighttpd-1.4.15.tar.bz2 591304
-RMD160 6a0f7a498b2815c2eb576917e88775a8e16aad5c lighttpd-1.4.15.tar.bz2 591304
-SHA256 75128e53231c69a22c94ad0a01da974eaa266b21668c1354f71ad07e5f94d9cc lighttpd-1.4.15.tar.bz2 591304
diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.4.15-r1 b/www-servers/lighttpd/files/digest-lighttpd-1.4.15-r1
deleted file mode 100644
index 0b575e222c44..000000000000
--- a/www-servers/lighttpd/files/digest-lighttpd-1.4.15-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b994b8c359da578dec073cae52c4924f lighttpd-1.4.15.tar.bz2 591304
-RMD160 6a0f7a498b2815c2eb576917e88775a8e16aad5c lighttpd-1.4.15.tar.bz2 591304
-SHA256 75128e53231c69a22c94ad0a01da974eaa266b21668c1354f71ad07e5f94d9cc lighttpd-1.4.15.tar.bz2 591304
diff --git a/www-servers/lighttpd/files/lighttpd.initd-1.4.13-r1 b/www-servers/lighttpd/files/lighttpd.initd-1.4.13-r1
deleted file mode 100644
index 464ad7746ddb..000000000000
--- a/www-servers/lighttpd/files/lighttpd.initd-1.4.13-r1
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/lighttpd.initd-1.4.13-r1,v 1.2 2007/01/09 20:56:24 robbat2 Exp $
-
-opts="depend checkconfig start stop reload graceful"
-
-depend() {
-	need net
-	use mysql logger spawn-fcgi ldap slapd
-	after famd
-	after sshd
-}
-
-checkconfig() {
-	if [[ ! -f ${LIGHTTPD_CONF} ]] ; then
-		ewarn "${LIGHTTPD_CONF} does not exist."
-		return 1
-	fi
-
-	/usr/sbin/lighttpd -t -f ${LIGHTTPD_CONF} >/dev/null
-}
-			
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting lighttpd"
-	start-stop-daemon --start --quiet \
-		--background --pidfile ${LIGHTTPD_PID} \
-		--exec /usr/sbin/lighttpd -- -f ${LIGHTTPD_CONF}
-	eend $?
-}
-
-stop() {
-	local rv=0
-	ebegin "Stopping lighttpd"
-	if start-stop-daemon --stop --quiet --pidfile ${LIGHTTPD_PID} \
-			--signal 2 ; then
-		rm -f ${LIGHTTPD_PID} 
-	else
-		rv=1
-	fi
-	eend $rv
-}
-
-reload() {
-	if [ ! -f ${LIGHTTPD_PID} ]; then
-		eerror "lighttpd isn't running"
-		return 1
-	fi
-	checkconfig || return 1
-	ebegin "Re-opening lighttpd log files"
-	kill -HUP $(<${LIGHTTPD_PID}) &>/dev/null
-	eend $?
-}
-
-graceful() {
-	if ! service_started "${myservice}" ; then
-		eerror "Lighttpd is not running! Please start it before trying to reload it."
-	else
-		checkconfig || return 1
-		ebegin "Gracefully stopping lighttpd"
-		## s-s-d for consistency or kill because it's cleaner?
-		## s-s-d causes a 5 second delay here
-		#start-stop-daemon --stop --quiet --pidfile ${LIGHTTPD_PID} \
-		#	--signal SIGINT
-		kill -INT $(<${LIGHTTPD_PID})
-		rm -f ${LIGHTTPD_PID}
-		start
-	fi
-}
diff --git a/www-servers/lighttpd/files/lighttpd.initd-1.4.13-r2 b/www-servers/lighttpd/files/lighttpd.initd-1.4.13-r2
deleted file mode 100644
index 606c283bf7e8..000000000000
--- a/www-servers/lighttpd/files/lighttpd.initd-1.4.13-r2
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/lighttpd.initd-1.4.13-r2,v 1.1 2007/04/01 22:55:08 robbat2 Exp $
-
-opts="reload graceful"
-
-depend() {
-	need net
-	use mysql logger spawn-fcgi ldap slapd
-	after famd
-	after sshd
-}
-
-checkconfig() {
-	if [ ! -f "${LIGHTTPD_CONF}" ] ; then
-		ewarn "${LIGHTTPD_CONF} does not exist."
-		return 1
-	fi
-
-	/usr/sbin/lighttpd -t -f ${LIGHTTPD_CONF} >/dev/null
-}
-			
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting lighttpd"
-	start-stop-daemon --start --quiet \
-		--background --pidfile "${LIGHTTPD_PID}" \
-		--exec /usr/sbin/lighttpd -- -f "${LIGHTTPD_CONF}"
-	eend $?
-}
-
-stop() {
-	local rv=0
-	ebegin "Stopping lighttpd"
-	start-stop-daemon --stop --quiet --pidfile "${LIGHTTPD_PID}"
-	eend $?
-}
-
-reload() {
-	if ! service_started "${SVCNAME}" ; then
-		eerror "${SVCNAME} isn't running"
-		return 1
-	fi
-	checkconfig || return 1
-
-	ebegin "Re-opening lighttpd log files"
-	start-stop-daemon --stop --oknodo --quiet --pidfile "${LIGHTTPD_PID}" \
-		--signal HUP
-	eend $?
-}
-
-graceful() {
-	if ! service_started "${SVCNAME}" ; then
-		eerror "${SVCNAME} isn't running"
-		return 1
-	fi
-	checkconfig || return 1
-
-	ebegin "Gracefully stopping lighttpd"
-	start-stop-daemon --stop --oknodo --quiet --pidfile "${LIGHTTPD_PID}" \
-		--signal INT
-	if eend $? ; then
-		rm -f "${LIGHTTPD_PID}"
-		start
-	fi
-}
diff --git a/www-servers/lighttpd/lighttpd-1.4.11.ebuild b/www-servers/lighttpd/lighttpd-1.4.11.ebuild
deleted file mode 100644
index 18d31a45abf4..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.11.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.11.ebuild,v 1.20 2007/01/19 19:26:05 eroyf Exp $
-
-WANT_AUTOCONF=latest
-WANT_AUTOMAKE=latest
-inherit eutils autotools depend.php
-
-DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="http://www.lighttpd.net/"
-SRC_URI="http://www.lighttpd.net/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="bzip2 doc fam fastcgi gdbm ipv6 ldap lua minimal memcache mysql pcre php rrdtool ssl test webdav xattr"
-
-RDEPEND=">=sys-libs/zlib-1.1
-	bzip2?    ( app-arch/bzip2 )
-	fam?      ( virtual/fam )
-	gdbm?     ( sys-libs/gdbm )
-	ldap?     ( >=net-nds/openldap-2.1.26 )
-	lua?      ( dev-lang/lua )
-	memcache? ( dev-libs/libmemcache )
-	mysql?    ( >=virtual/mysql-4.0 )
-	pcre?     ( >=dev-libs/libpcre-3.1 )
-	php?      (
-		virtual/httpd-php
-		!net-www/spawn-fcgi
-	)
-	rrdtool? ( net-analyzer/rrdtool )
-	ssl?    ( >=dev-libs/openssl-0.9.7 )
-	webdav? (
-		dev-libs/libxml2
-		>=dev-db/sqlite-3
-	)
-	xattr? ( kernel_linux? ( sys-apps/attr ) )"
-
-DEPEND="${RDEPEND}
-	doc?  ( dev-python/docutils )
-	test? (
-		virtual/perl-Test-Harness
-		dev-libs/fcgi
-	)"
-
-# update certain parts of lighttpd.conf based on conditionals
-update_config() {
-	local config="/etc/lighttpd/lighttpd.conf"
-
-	# enable php/mod_fastcgi settings
-	use php && \
-		dosed 's|#.*\(include.*fastcgi.*$\)|\1|' ${config}
-
-	# enable stat() caching
-	use fam && \
-		dosed 's|#\(.*stat-cache.*$\)|\1|' ${config}
-}
-
-# remove non-essential stuff (for USE=minimal)
-remove_non_essential() {
-	local libdir="${D}/usr/$(get_libdir)/${PN}"
-
-	# text docs
-	use doc || rm -fr ${D}/usr/share/doc/${PF}/txt
-
-	# non-essential modules
-	rm -f \
-		${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.*
-
-	# allow users to keep some based on USE flags
-	use pcre    || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
-	use webdav  || rm -f ${libdir}/mod_webdav.*
-	use mysql   || rm -f ${libdir}/mod_mysql_vhost.*
-	use lua     || rm -f ${libdir}/mod_cml.*
-	use rrdtool || rm -f ${libdir}/mod_rrdtool.*
-
-	if ! use fastcgi ; then
-		rm -f ${libdir}/mod_fastcgi.* ${D}/usr/bin/spawn-fcgi \
-			${D}/usr/share/man/man1/spawn-fcgi.*
-	fi
-}
-
-pkg_setup() {
-	if ! use pcre ; then
-		ewarn "It is highly recommended that you build ${PN}"
-		ewarn "with perl regular expressions support via USE=pcre."
-		ewarn "Otherwise you lose support for some core options such"
-		ewarn "as conditionals and modules such as mod_re{write,direct}"
-		ewarn "and mod_ssi."
-		ebeep 5
-	fi
-
-	use php && require_php_with_use cgi
-
-	enewgroup lighttpd
-	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	EPATCH_SUFFIX="diff" epatch ${FILESDIR}/${PV} || die "Patching failed!"
-
-	eautoreconf || die
-
-	# dev-python/docutils installs rst2html.py not rst2html
-	sed -i -e 's|\(rst2html\)|\1.py|g' doc/Makefile.in || \
-		die "sed doc/Makefile.in failed"
-
-	# fix typo
-	sed -i -e 's|\(output_content\)_\(type\)|\1\2|' doc/cml.txt || \
-		die "sed doc/cml.txt failed"
-}
-
-src_compile() {
-	econf --libdir=/usr/$(get_libdir)/${PN} \
-		--enable-lfs \
-		$(use_enable ipv6) \
-		$(use_with bzip2) \
-		$(use_with fam) \
-		$(use_with gdbm) \
-		$(use_with lua) \
-		$(use_with ldap) \
-		$(use_with memcache) \
-		$(use_with mysql) \
-		$(use_with pcre) \
-		$(use_with ssl openssl) \
-		$(use_with webdav webdav-props) \
-		$(use_with xattr attr) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-
-	if use doc ; then
-		einfo "Building HTML documentation"
-		cd doc
-		emake html || die "failed to build HTML documentation"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# init script stuff
-	newinitd ${FILESDIR}/lighttpd.initd lighttpd || die
-	newconfd ${FILESDIR}/lighttpd.confd lighttpd || die
-	use fam && has_version app-admin/fam && \
-		sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd
-
-	if use php || use fastcgi ; then
-		newinitd ${FILESDIR}/spawn-fcgi.initd spawn-fcgi || die
-		newconfd ${FILESDIR}/spawn-fcgi.confd spawn-fcgi || die
-	fi
-
-	# configs
-	insinto /etc/lighttpd
-	doins ${FILESDIR}/conf/*.conf
-
-	# update lighttpd.conf directives based on conditionals
-	update_config
-
-	# docs
-	dodoc AUTHORS README NEWS ChangeLog doc/*.sh
-	newdoc doc/lighttpd.conf lighttpd.conf.distrib
-
-	use doc && dohtml -r doc/*
-
-	docinto txt
-	dodoc doc/*.txt
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins ${FILESDIR}/lighttpd.logrotate lighttpd || die
-
-	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
-	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
-	fperms 0750 /var/l{ib,og}/lighttpd
-
-	use minimal && remove_non_essential
-}
-
-pkg_postinst () {
-	echo
-	if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then
-		einfo "spawn-fcgi is now included with lighttpd"
-		einfo "spawn-fcgi's init script configuration is now located"
-		einfo "at /etc/conf.d/spawn-fcgi."
-		echo
-	fi
-
-	if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then
-		ewarn "As of lighttpd-1.4.1, Gentoo has a customized configuration,"
-		ewarn "which is now located in /etc/lighttpd.  Please migrate your"
-		ewarn "existing configuration."
-		ebeep 5
-	fi
-
-	if use fam ; then
-		einfo "Remember to re-emerge lighttpd should you switch from"
-		einfo "app-admin/famd to app-admin/gamin or vice versa."
-	fi
-	echo
-}
diff --git a/www-servers/lighttpd/lighttpd-1.4.13-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.13-r1.ebuild
deleted file mode 100644
index a1a816adae6d..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.13-r1.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.13-r1.ebuild,v 1.11 2007/04/10 10:34:20 robbat2 Exp $
-
-WANT_AUTOCONF=latest
-WANT_AUTOMAKE=latest
-inherit eutils autotools depend.php
-
-DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="http://www.lighttpd.net/"
-SRC_URI="http://www.lighttpd.net/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ppc ppc64 sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="bzip2 doc fam fastcgi gdbm ipv6 ldap lua minimal memcache mysql pcre php rrdtool ssl test webdav xattr"
-
-RDEPEND=">=sys-libs/zlib-1.1
-	bzip2?    ( app-arch/bzip2 )
-	fam?      ( virtual/fam )
-	gdbm?     ( sys-libs/gdbm )
-	ldap?     ( >=net-nds/openldap-2.1.26 )
-	lua?      ( >=dev-lang/lua-5.1 )
-	memcache? ( dev-libs/libmemcache )
-	mysql?    ( >=virtual/mysql-4.0 )
-	pcre?     ( >=dev-libs/libpcre-3.1 )
-	php?      (
-		virtual/httpd-php
-		!net-www/spawn-fcgi
-	)
-	rrdtool? ( net-analyzer/rrdtool )
-	ssl?    ( >=dev-libs/openssl-0.9.7 )
-	webdav? (
-		dev-libs/libxml2
-		>=dev-db/sqlite-3
-		sys-fs/e2fsprogs
-	)
-	xattr? ( kernel_linux? ( sys-apps/attr ) )"
-
-DEPEND="${RDEPEND}
-	doc?  ( dev-python/docutils )
-	test? (
-		virtual/perl-Test-Harness
-		dev-libs/fcgi
-	)"
-
-# update certain parts of lighttpd.conf based on conditionals
-update_config() {
-	local config="/etc/lighttpd/lighttpd.conf"
-
-	# enable php/mod_fastcgi settings
-	use php && \
-		dosed 's|#.*\(include.*fastcgi.*$\)|\1|' ${config}
-
-	# enable stat() caching
-	use fam && \
-		dosed 's|#\(.*stat-cache.*$\)|\1|' ${config}
-}
-
-# remove non-essential stuff (for USE=minimal)
-remove_non_essential() {
-	local libdir="${D}/usr/$(get_libdir)/${PN}"
-
-	# text docs
-	use doc || rm -fr ${D}/usr/share/doc/${PF}/txt
-
-	# non-essential modules
-	rm -f \
-		${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.*
-
-	# allow users to keep some based on USE flags
-	use pcre    || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
-	use webdav  || rm -f ${libdir}/mod_webdav.*
-	use mysql   || rm -f ${libdir}/mod_mysql_vhost.*
-	use lua     || rm -f ${libdir}/mod_{cml,magnet}.*
-	use rrdtool || rm -f ${libdir}/mod_rrdtool.*
-
-	if ! use fastcgi ; then
-		rm -f ${libdir}/mod_fastcgi.* ${D}/usr/bin/spawn-fcgi \
-			${D}/usr/share/man/man1/spawn-fcgi.*
-	fi
-}
-
-pkg_setup() {
-	if ! use pcre ; then
-		ewarn "It is highly recommended that you build ${PN}"
-		ewarn "with perl regular expressions support via USE=pcre."
-		ewarn "Otherwise you lose support for some core options such"
-		ewarn "as conditionals and modules such as mod_re{write,direct}"
-		ewarn "and mod_ssi."
-		ebeep 5
-	fi
-
-	use php && require_php_with_use cgi
-
-	enewgroup lighttpd
-	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	EPATCH_SUFFIX="diff" EPATCH_OPTS="-p1 -l -d ${S}" epatch ${FILESDIR}/${PV} || die "Patching failed!"
-
-	eautoreconf || die
-
-	# dev-python/docutils installs rst2html.py not rst2html
-	sed -i -e 's|\(rst2html\)|\1.py|g' doc/Makefile.in || \
-		die "sed doc/Makefile.in failed"
-
-	# fix typo
-	sed -i -e 's|\(output_content\)_\(type\)|\1\2|' doc/cml.txt || \
-		die "sed doc/cml.txt failed"
-}
-
-src_compile() {
-	econf --libdir=/usr/$(get_libdir)/${PN} \
-		--enable-lfs \
-		$(use_enable ipv6) \
-		$(use_with bzip2) \
-		$(use_with fam) \
-		$(use_with gdbm) \
-		$(use_with lua) \
-		$(use_with ldap) \
-		$(use_with memcache) \
-		$(use_with mysql) \
-		$(use_with pcre) \
-		$(use_with ssl openssl) \
-		$(use_with webdav webdav-props) \
-		$(use_with webdav webdav-locks) \
-		$(use_with xattr attr) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-
-	if use doc ; then
-		einfo "Building HTML documentation"
-		cd doc
-		emake html || die "failed to build HTML documentation"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# init script stuff
-	newinitd ${FILESDIR}/lighttpd.initd-1.4.13-r1 lighttpd || die
-	newconfd ${FILESDIR}/lighttpd.confd lighttpd || die
-	use fam && has_version app-admin/fam && \
-		sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd
-
-	if use php || use fastcgi ; then
-		newinitd ${FILESDIR}/spawn-fcgi.initd spawn-fcgi || die
-		newconfd ${FILESDIR}/spawn-fcgi.confd spawn-fcgi || die
-	fi
-
-	# configs
-	insinto /etc/lighttpd
-	doins ${FILESDIR}/conf/*.conf
-
-	# update lighttpd.conf directives based on conditionals
-	update_config
-
-	# docs
-	dodoc AUTHORS README NEWS ChangeLog doc/*.sh
-	newdoc doc/lighttpd.conf lighttpd.conf.distrib
-
-	use doc && dohtml -r doc/*
-
-	docinto txt
-	dodoc doc/*.txt
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins ${FILESDIR}/lighttpd.logrotate lighttpd || die
-
-	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
-	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
-	fperms 0750 /var/l{ib,og}/lighttpd
-
-	use minimal && remove_non_essential
-}
-
-pkg_postinst () {
-	echo
-	if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then
-		einfo "spawn-fcgi is now included with lighttpd"
-		einfo "spawn-fcgi's init script configuration is now located"
-		einfo "at /etc/conf.d/spawn-fcgi."
-		echo
-	fi
-
-	if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then
-		ewarn "As of lighttpd-1.4.1, Gentoo has a customized configuration,"
-		ewarn "which is now located in /etc/lighttpd.  Please migrate your"
-		ewarn "existing configuration."
-		ebeep 5
-	fi
-
-	if use fam ; then
-		einfo "Remember to re-emerge lighttpd should you switch from"
-		einfo "app-admin/famd to app-admin/gamin or vice versa."
-	fi
-	echo
-}
diff --git a/www-servers/lighttpd/lighttpd-1.4.13-r2.ebuild b/www-servers/lighttpd/lighttpd-1.4.13-r2.ebuild
deleted file mode 100644
index f44dcaf93964..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.13-r2.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.13-r2.ebuild,v 1.4 2007/04/10 10:34:20 robbat2 Exp $
-
-WANT_AUTOCONF=latest
-WANT_AUTOMAKE=latest
-inherit eutils autotools depend.php
-
-DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="http://www.lighttpd.net/"
-SRC_URI="http://www.lighttpd.net/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="bzip2 doc fam fastcgi gdbm ipv6 ldap lua minimal memcache mysql pcre php rrdtool ssl test webdav xattr"
-
-RDEPEND=">=sys-libs/zlib-1.1
-	bzip2?    ( app-arch/bzip2 )
-	fam?      ( virtual/fam )
-	gdbm?     ( sys-libs/gdbm )
-	ldap?     ( >=net-nds/openldap-2.1.26 )
-	lua?      ( >=dev-lang/lua-5.1 )
-	memcache? ( dev-libs/libmemcache )
-	mysql?    ( >=virtual/mysql-4.0 )
-	pcre?     ( >=dev-libs/libpcre-3.1 )
-	php?      (
-		virtual/httpd-php
-		!net-www/spawn-fcgi
-	)
-	rrdtool? ( net-analyzer/rrdtool )
-	ssl?    ( >=dev-libs/openssl-0.9.7 )
-	webdav? (
-		dev-libs/libxml2
-		>=dev-db/sqlite-3
-		sys-fs/e2fsprogs
-	)
-	xattr? ( kernel_linux? ( sys-apps/attr ) )"
-
-DEPEND="${RDEPEND}
-	doc?  ( dev-python/docutils )
-	test? (
-		virtual/perl-Test-Harness
-		dev-libs/fcgi
-	)"
-
-# update certain parts of lighttpd.conf based on conditionals
-update_config() {
-	local config="/etc/lighttpd/lighttpd.conf"
-
-	# enable php/mod_fastcgi settings
-	use php && \
-		dosed 's|#.*\(include.*fastcgi.*$\)|\1|' ${config}
-
-	# enable stat() caching
-	use fam && \
-		dosed 's|#\(.*stat-cache.*$\)|\1|' ${config}
-}
-
-# remove non-essential stuff (for USE=minimal)
-remove_non_essential() {
-	local libdir="${D}/usr/$(get_libdir)/${PN}"
-
-	# text docs
-	use doc || rm -fr ${D}/usr/share/doc/${PF}/txt
-
-	# non-essential modules
-	rm -f \
-		${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.*
-
-	# allow users to keep some based on USE flags
-	use pcre    || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
-	use webdav  || rm -f ${libdir}/mod_webdav.*
-	use mysql   || rm -f ${libdir}/mod_mysql_vhost.*
-	use lua     || rm -f ${libdir}/mod_{cml,magnet}.*
-	use rrdtool || rm -f ${libdir}/mod_rrdtool.*
-
-	if ! use fastcgi ; then
-		rm -f ${libdir}/mod_fastcgi.* ${D}/usr/bin/spawn-fcgi \
-			${D}/usr/share/man/man1/spawn-fcgi.*
-	fi
-}
-
-pkg_setup() {
-	if ! use pcre ; then
-		ewarn "It is highly recommended that you build ${PN}"
-		ewarn "with perl regular expressions support via USE=pcre."
-		ewarn "Otherwise you lose support for some core options such"
-		ewarn "as conditionals and modules such as mod_re{write,direct}"
-		ewarn "and mod_ssi."
-		ebeep 5
-	fi
-
-	use php && require_php_with_use cgi
-
-	enewgroup lighttpd
-	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	EPATCH_SUFFIX="diff" EPATCH_OPTS="-p1 -l -d ${S}" epatch ${FILESDIR}/${PV} || die "Patching failed!"
-
-	eautoreconf || die
-
-	# dev-python/docutils installs rst2html.py not rst2html
-	sed -i -e 's|\(rst2html\)|\1.py|g' doc/Makefile.in || \
-		die "sed doc/Makefile.in failed"
-
-	# fix typo
-	sed -i -e 's|\(output_content\)_\(type\)|\1\2|' doc/cml.txt || \
-		die "sed doc/cml.txt failed"
-}
-
-src_compile() {
-	econf --libdir=/usr/$(get_libdir)/${PN} \
-		--enable-lfs \
-		$(use_enable ipv6) \
-		$(use_with bzip2) \
-		$(use_with fam) \
-		$(use_with gdbm) \
-		$(use_with lua) \
-		$(use_with ldap) \
-		$(use_with memcache) \
-		$(use_with mysql) \
-		$(use_with pcre) \
-		$(use_with ssl openssl) \
-		$(use_with webdav webdav-props) \
-		$(use_with webdav webdav-locks) \
-		$(use_with xattr attr) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-
-	if use doc ; then
-		einfo "Building HTML documentation"
-		cd doc
-		emake html || die "failed to build HTML documentation"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# init script stuff
-	newinitd ${FILESDIR}/lighttpd.initd-1.4.13-r2 lighttpd || die
-	newconfd ${FILESDIR}/lighttpd.confd lighttpd || die
-	use fam && has_version app-admin/fam && \
-		sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd
-
-	if use php || use fastcgi ; then
-		newinitd ${FILESDIR}/spawn-fcgi.initd spawn-fcgi || die
-		newconfd ${FILESDIR}/spawn-fcgi.confd spawn-fcgi || die
-	fi
-
-	# configs
-	insinto /etc/lighttpd
-	doins ${FILESDIR}/conf/lighttpd.conf
-	doins ${FILESDIR}/conf/mime-types.conf
-	doins ${FILESDIR}/conf/mod_cgi.conf
-	newins ${FILESDIR}/conf/mod_fastcgi.conf-1.4.13-r2 mod_fastcgi.conf
-	# Secure directory for fastcgi sockets
-	keepdir /var/run/lighttpd/
-	fperms 0750 /var/run/lighttpd/
-	fowners lighttpd:lighttpd /var/run/lighttpd/
-
-	# update lighttpd.conf directives based on conditionals
-	update_config
-
-	# docs
-	dodoc AUTHORS README NEWS ChangeLog doc/*.sh
-	newdoc doc/lighttpd.conf lighttpd.conf.distrib
-
-	use doc && dohtml -r doc/*
-
-	docinto txt
-	dodoc doc/*.txt
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins ${FILESDIR}/lighttpd.logrotate lighttpd || die
-
-	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
-	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
-	fperms 0750 /var/l{ib,og}/lighttpd
-
-	use minimal && remove_non_essential
-}
-
-pkg_postinst () {
-	echo
-	if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then
-		einfo "spawn-fcgi is now included with lighttpd"
-		einfo "spawn-fcgi's init script configuration is now located"
-		einfo "at /etc/conf.d/spawn-fcgi."
-		echo
-	fi
-
-	if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then
-		ewarn "As of lighttpd-1.4.1, Gentoo has a customized configuration,"
-		ewarn "which is now located in /etc/lighttpd.  Please migrate your"
-		ewarn "existing configuration."
-		ebeep 5
-	fi
-
-	if use fam ; then
-		einfo "Remember to re-emerge lighttpd should you switch from"
-		einfo "app-admin/famd to app-admin/gamin or vice versa."
-	fi
-	echo
-}
diff --git a/www-servers/lighttpd/lighttpd-1.4.13-r3.ebuild b/www-servers/lighttpd/lighttpd-1.4.13-r3.ebuild
deleted file mode 100644
index 4d774a515113..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.13-r3.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.13-r3.ebuild,v 1.1 2007/04/10 10:34:20 robbat2 Exp $
-
-WANT_AUTOCONF=latest
-WANT_AUTOMAKE=latest
-inherit eutils autotools depend.php
-
-DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="http://www.lighttpd.net/"
-SRC_URI="http://www.lighttpd.net/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="bzip2 doc fam fastcgi gdbm ipv6 ldap lua minimal memcache mysql pcre php rrdtool ssl test webdav xattr"
-
-RDEPEND=">=sys-libs/zlib-1.1
-	bzip2?    ( app-arch/bzip2 )
-	fam?      ( virtual/fam )
-	gdbm?     ( sys-libs/gdbm )
-	ldap?     ( >=net-nds/openldap-2.1.26 )
-	lua?      ( >=dev-lang/lua-5.1 )
-	memcache? ( dev-libs/libmemcache )
-	mysql?    ( >=virtual/mysql-4.0 )
-	pcre?     ( >=dev-libs/libpcre-3.1 )
-	php?      (
-		virtual/httpd-php
-		!net-www/spawn-fcgi
-	)
-	rrdtool? ( net-analyzer/rrdtool )
-	ssl?    ( >=dev-libs/openssl-0.9.7 )
-	webdav? (
-		dev-libs/libxml2
-		>=dev-db/sqlite-3
-		sys-fs/e2fsprogs
-	)
-	xattr? ( kernel_linux? ( sys-apps/attr ) )"
-
-DEPEND="${RDEPEND}
-	doc?  ( dev-python/docutils )
-	test? (
-		virtual/perl-Test-Harness
-		dev-libs/fcgi
-	)"
-
-# update certain parts of lighttpd.conf based on conditionals
-update_config() {
-	local config="/etc/lighttpd/lighttpd.conf"
-
-	# enable php/mod_fastcgi settings
-	use php && \
-		dosed 's|#.*\(include.*fastcgi.*$\)|\1|' ${config}
-
-	# enable stat() caching
-	use fam && \
-		dosed 's|#\(.*stat-cache.*$\)|\1|' ${config}
-}
-
-# remove non-essential stuff (for USE=minimal)
-remove_non_essential() {
-	local libdir="${D}/usr/$(get_libdir)/${PN}"
-
-	# text docs
-	use doc || rm -fr ${D}/usr/share/doc/${PF}/txt
-
-	# non-essential modules
-	rm -f \
-		${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.*
-
-	# allow users to keep some based on USE flags
-	use pcre    || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
-	use webdav  || rm -f ${libdir}/mod_webdav.*
-	use mysql   || rm -f ${libdir}/mod_mysql_vhost.*
-	use lua     || rm -f ${libdir}/mod_{cml,magnet}.*
-	use rrdtool || rm -f ${libdir}/mod_rrdtool.*
-
-	if ! use fastcgi ; then
-		rm -f ${libdir}/mod_fastcgi.* ${D}/usr/bin/spawn-fcgi \
-			${D}/usr/share/man/man1/spawn-fcgi.*
-	fi
-}
-
-pkg_setup() {
-	if ! use pcre ; then
-		ewarn "It is highly recommended that you build ${PN}"
-		ewarn "with perl regular expressions support via USE=pcre."
-		ewarn "Otherwise you lose support for some core options such"
-		ewarn "as conditionals and modules such as mod_re{write,direct}"
-		ewarn "and mod_ssi."
-		ebeep 5
-	fi
-
-	use php && require_php_with_use cgi
-
-	enewgroup lighttpd
-	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	EPATCH_SUFFIX="diff" EPATCH_OPTS="-p1 -l -d ${S}" epatch ${FILESDIR}/${PV} || die "Patching failed!"
-
-	eautoreconf || die
-
-	# dev-python/docutils installs rst2html.py not rst2html
-	sed -i -e 's|\(rst2html\)|\1.py|g' doc/Makefile.in || \
-		die "sed doc/Makefile.in failed"
-
-	# fix typo
-	sed -i -e 's|\(output_content\)_\(type\)|\1\2|' doc/cml.txt || \
-		die "sed doc/cml.txt failed"
-}
-
-src_compile() {
-	econf --libdir=/usr/$(get_libdir)/${PN} \
-		--enable-lfs \
-		$(use_enable ipv6) \
-		$(use_with bzip2) \
-		$(use_with fam) \
-		$(use_with gdbm) \
-		$(use_with lua) \
-		$(use_with ldap) \
-		$(use_with memcache) \
-		$(use_with mysql) \
-		$(use_with pcre) \
-		$(use_with ssl openssl) \
-		$(use_with webdav webdav-props) \
-		$(use_with webdav webdav-locks) \
-		$(use_with xattr attr) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-
-	if use doc ; then
-		einfo "Building HTML documentation"
-		cd doc
-		emake html || die "failed to build HTML documentation"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# init script stuff
-	newinitd ${FILESDIR}/lighttpd.initd-1.4.13-r3 lighttpd || die
-	newconfd ${FILESDIR}/lighttpd.confd lighttpd || die
-	use fam && has_version app-admin/fam && \
-		sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd
-
-	if use php || use fastcgi ; then
-		newinitd ${FILESDIR}/spawn-fcgi.initd spawn-fcgi || die
-		newconfd ${FILESDIR}/spawn-fcgi.confd spawn-fcgi || die
-	fi
-
-	# configs
-	insinto /etc/lighttpd
-	doins ${FILESDIR}/conf/lighttpd.conf
-	doins ${FILESDIR}/conf/mime-types.conf
-	doins ${FILESDIR}/conf/mod_cgi.conf
-	newins ${FILESDIR}/conf/mod_fastcgi.conf-1.4.13-r2 mod_fastcgi.conf
-	# Secure directory for fastcgi sockets
-	keepdir /var/run/lighttpd/
-	fperms 0750 /var/run/lighttpd/
-	fowners lighttpd:lighttpd /var/run/lighttpd/
-
-	# update lighttpd.conf directives based on conditionals
-	update_config
-
-	# docs
-	dodoc AUTHORS README NEWS ChangeLog doc/*.sh
-	newdoc doc/lighttpd.conf lighttpd.conf.distrib
-
-	use doc && dohtml -r doc/*
-
-	docinto txt
-	dodoc doc/*.txt
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins ${FILESDIR}/lighttpd.logrotate lighttpd || die
-
-	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
-	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
-	fperms 0750 /var/l{ib,og}/lighttpd
-
-	use minimal && remove_non_essential
-}
-
-pkg_postinst () {
-	echo
-	if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then
-		einfo "spawn-fcgi is now included with lighttpd"
-		einfo "spawn-fcgi's init script configuration is now located"
-		einfo "at /etc/conf.d/spawn-fcgi."
-		echo
-	fi
-
-	if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then
-		ewarn "As of lighttpd-1.4.1, Gentoo has a customized configuration,"
-		ewarn "which is now located in /etc/lighttpd.  Please migrate your"
-		ewarn "existing configuration."
-		ebeep 5
-	fi
-
-	if use fam ; then
-		einfo "Remember to re-emerge lighttpd should you switch from"
-		einfo "app-admin/famd to app-admin/gamin or vice versa."
-	fi
-	echo
-}
diff --git a/www-servers/lighttpd/lighttpd-1.4.13.ebuild b/www-servers/lighttpd/lighttpd-1.4.13.ebuild
deleted file mode 100644
index 909a60592c4b..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.13.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.13.ebuild,v 1.3 2007/02/07 23:38:19 robbat2 Exp $
-
-WANT_AUTOCONF=latest
-WANT_AUTOMAKE=latest
-inherit eutils autotools depend.php
-
-DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="http://www.lighttpd.net/"
-SRC_URI="http://www.lighttpd.net/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="bzip2 doc fam fastcgi gdbm ipv6 ldap lua minimal memcache mysql pcre php rrdtool ssl test webdav xattr"
-
-RDEPEND=">=sys-libs/zlib-1.1
-	bzip2?    ( app-arch/bzip2 )
-	fam?      ( virtual/fam )
-	gdbm?     ( sys-libs/gdbm )
-	ldap?     ( >=net-nds/openldap-2.1.26 )
-	lua?      ( >=dev-lang/lua-5.1 )
-	memcache? ( dev-libs/libmemcache )
-	mysql?    ( >=virtual/mysql-4.0 )
-	pcre?     ( >=dev-libs/libpcre-3.1 )
-	php?      (
-		virtual/httpd-php
-		!net-www/spawn-fcgi
-	)
-	rrdtool? ( net-analyzer/rrdtool )
-	ssl?    ( >=dev-libs/openssl-0.9.7 )
-	webdav? (
-		dev-libs/libxml2
-		>=dev-db/sqlite-3
-	)
-	xattr? ( kernel_linux? ( sys-apps/attr ) )"
-
-DEPEND="${RDEPEND}
-	doc?  ( dev-python/docutils )
-	test? (
-		virtual/perl-Test-Harness
-		dev-libs/fcgi
-	)"
-
-# update certain parts of lighttpd.conf based on conditionals
-update_config() {
-	local config="/etc/lighttpd/lighttpd.conf"
-
-	# enable php/mod_fastcgi settings
-	use php && \
-		dosed 's|#.*\(include.*fastcgi.*$\)|\1|' ${config}
-
-	# enable stat() caching
-	use fam && \
-		dosed 's|#\(.*stat-cache.*$\)|\1|' ${config}
-}
-
-# remove non-essential stuff (for USE=minimal)
-remove_non_essential() {
-	local libdir="${D}/usr/$(get_libdir)/${PN}"
-
-	# text docs
-	use doc || rm -fr ${D}/usr/share/doc/${PF}/txt
-
-	# non-essential modules
-	rm -f \
-		${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.*
-
-	# allow users to keep some based on USE flags
-	use pcre    || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
-	use webdav  || rm -f ${libdir}/mod_webdav.*
-	use mysql   || rm -f ${libdir}/mod_mysql_vhost.*
-	use lua     || rm -f ${libdir}/mod_{cml,magnet}.*
-	use rrdtool || rm -f ${libdir}/mod_rrdtool.*
-
-	if ! use fastcgi ; then
-		rm -f ${libdir}/mod_fastcgi.* ${D}/usr/bin/spawn-fcgi \
-			${D}/usr/share/man/man1/spawn-fcgi.*
-	fi
-}
-
-pkg_setup() {
-	if ! use pcre ; then
-		ewarn "It is highly recommended that you build ${PN}"
-		ewarn "with perl regular expressions support via USE=pcre."
-		ewarn "Otherwise you lose support for some core options such"
-		ewarn "as conditionals and modules such as mod_re{write,direct}"
-		ewarn "and mod_ssi."
-		ebeep 5
-	fi
-
-	use php && require_php_with_use cgi
-
-	enewgroup lighttpd
-	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	EPATCH_SUFFIX="diff" epatch ${FILESDIR}/${PV} || die "Patching failed!"
-
-	eautoreconf || die
-
-	# dev-python/docutils installs rst2html.py not rst2html
-	sed -i -e 's|\(rst2html\)|\1.py|g' doc/Makefile.in || \
-		die "sed doc/Makefile.in failed"
-
-	# fix typo
-	sed -i -e 's|\(output_content\)_\(type\)|\1\2|' doc/cml.txt || \
-		die "sed doc/cml.txt failed"
-}
-
-src_compile() {
-	econf --libdir=/usr/$(get_libdir)/${PN} \
-		--enable-lfs \
-		$(use_enable ipv6) \
-		$(use_with bzip2) \
-		$(use_with fam) \
-		$(use_with gdbm) \
-		$(use_with lua) \
-		$(use_with ldap) \
-		$(use_with memcache) \
-		$(use_with mysql) \
-		$(use_with pcre) \
-		$(use_with ssl openssl) \
-		$(use_with webdav webdav-props) \
-		$(use_with xattr attr) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-
-	if use doc ; then
-		einfo "Building HTML documentation"
-		cd doc
-		emake html || die "failed to build HTML documentation"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# init script stuff
-	newinitd ${FILESDIR}/lighttpd.initd lighttpd || die
-	newconfd ${FILESDIR}/lighttpd.confd lighttpd || die
-	use fam && has_version app-admin/fam && \
-		sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd
-
-	if use php || use fastcgi ; then
-		newinitd ${FILESDIR}/spawn-fcgi.initd spawn-fcgi || die
-		newconfd ${FILESDIR}/spawn-fcgi.confd spawn-fcgi || die
-	fi
-
-	# configs
-	insinto /etc/lighttpd
-	doins ${FILESDIR}/conf/*.conf
-
-	# update lighttpd.conf directives based on conditionals
-	update_config
-
-	# docs
-	dodoc AUTHORS README NEWS ChangeLog doc/*.sh
-	newdoc doc/lighttpd.conf lighttpd.conf.distrib
-
-	use doc && dohtml -r doc/*
-
-	docinto txt
-	dodoc doc/*.txt
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins ${FILESDIR}/lighttpd.logrotate lighttpd || die
-
-	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
-	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
-	fperms 0750 /var/l{ib,og}/lighttpd
-
-	use minimal && remove_non_essential
-}
-
-pkg_postinst () {
-	echo
-	if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then
-		einfo "spawn-fcgi is now included with lighttpd"
-		einfo "spawn-fcgi's init script configuration is now located"
-		einfo "at /etc/conf.d/spawn-fcgi."
-		echo
-	fi
-
-	if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then
-		ewarn "As of lighttpd-1.4.1, Gentoo has a customized configuration,"
-		ewarn "which is now located in /etc/lighttpd.  Please migrate your"
-		ewarn "existing configuration."
-		ebeep 5
-	fi
-
-	if use fam ; then
-		einfo "Remember to re-emerge lighttpd should you switch from"
-		einfo "app-admin/famd to app-admin/gamin or vice versa."
-	fi
-	echo
-}
diff --git a/www-servers/lighttpd/lighttpd-1.4.15-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.15-r1.ebuild
deleted file mode 100644
index a32b58770f98..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.15-r1.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.15-r1.ebuild,v 1.11 2007/08/25 14:30:29 vapier Exp $
-
-WANT_AUTOCONF=latest
-WANT_AUTOMAKE=latest
-inherit eutils autotools depend.php
-
-DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="http://www.lighttpd.net/"
-SRC_URI="http://www.lighttpd.net/download/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="bzip2 doc fam fastcgi gdbm ipv6 ldap lua minimal memcache mysql pcre php rrdtool ssl test webdav xattr"
-
-RDEPEND=">=sys-libs/zlib-1.1
-	bzip2?    ( app-arch/bzip2 )
-	fam?      ( virtual/fam )
-	gdbm?     ( sys-libs/gdbm )
-	ldap?     ( >=net-nds/openldap-2.1.26 )
-	lua?      ( >=dev-lang/lua-5.1 )
-	memcache? ( dev-libs/libmemcache )
-	mysql?    ( >=virtual/mysql-4.0 )
-	pcre?     ( >=dev-libs/libpcre-3.1 )
-	php?      ( virtual/httpd-php )
-	rrdtool? ( net-analyzer/rrdtool )
-	ssl?    ( >=dev-libs/openssl-0.9.7 )
-	webdav? (
-		dev-libs/libxml2
-		>=dev-db/sqlite-3
-		sys-fs/e2fsprogs
-	)
-	xattr? ( kernel_linux? ( sys-apps/attr ) )"
-
-DEPEND="${RDEPEND}
-	doc?  ( dev-python/docutils )
-	test? (
-		virtual/perl-Test-Harness
-		dev-libs/fcgi
-	)"
-
-# update certain parts of lighttpd.conf based on conditionals
-update_config() {
-	local config="/etc/lighttpd/lighttpd.conf"
-
-	# enable php/mod_fastcgi settings
-	use php && \
-		dosed 's|#.*\(include.*fastcgi.*$\)|\1|' ${config}
-
-	# enable stat() caching
-	use fam && \
-		dosed 's|#\(.*stat-cache.*$\)|\1|' ${config}
-}
-
-# remove non-essential stuff (for USE=minimal)
-remove_non_essential() {
-	local libdir="${D}/usr/$(get_libdir)/${PN}"
-
-	# text docs
-	use doc || rm -fr ${D}/usr/share/doc/${PF}/txt
-
-	# non-essential modules
-	rm -f \
-		${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.*
-
-	# allow users to keep some based on USE flags
-	use pcre    || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
-	use webdav  || rm -f ${libdir}/mod_webdav.*
-	use mysql   || rm -f ${libdir}/mod_mysql_vhost.*
-	use lua     || rm -f ${libdir}/mod_{cml,magnet}.*
-	use rrdtool || rm -f ${libdir}/mod_rrdtool.*
-
-	if ! use fastcgi ; then
-		rm -f ${libdir}/mod_fastcgi.* ${D}/usr/bin/spawn-fcgi \
-			${D}/usr/share/man/man1/spawn-fcgi.*
-	fi
-}
-
-pkg_setup() {
-	if ! use pcre ; then
-		ewarn "It is highly recommended that you build ${PN}"
-		ewarn "with perl regular expressions support via USE=pcre."
-		ewarn "Otherwise you lose support for some core options such"
-		ewarn "as conditionals and modules such as mod_re{write,direct}"
-		ewarn "and mod_ssi."
-		ebeep 5
-	fi
-
-	use php && require_php_with_use cgi
-
-	enewgroup lighttpd
-	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	EPATCH_SUFFIX="diff" EPATCH_OPTS="-l" epatch ${FILESDIR}/${PVR} || die "Patching failed!"
-
-	eautoreconf || die
-
-	# dev-python/docutils installs rst2html.py not rst2html
-	sed -i -e 's|\(rst2html\)|\1.py|g' doc/Makefile.in || \
-		die "sed doc/Makefile.in failed"
-
-	# fix typo
-	sed -i -e 's|\(output_content\)_\(type\)|\1\2|' doc/cml.txt || \
-		die "sed doc/cml.txt failed"
-}
-
-src_compile() {
-	econf --libdir=/usr/$(get_libdir)/${PN} \
-		--enable-lfs \
-		$(use_enable ipv6) \
-		$(use_with bzip2) \
-		$(use_with fam) \
-		$(use_with gdbm) \
-		$(use_with lua) \
-		$(use_with ldap) \
-		$(use_with memcache) \
-		$(use_with mysql) \
-		$(use_with pcre) \
-		$(use_with ssl openssl) \
-		$(use_with webdav webdav-props) \
-		$(use_with webdav webdav-locks) \
-		$(use_with xattr attr) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-
-	if use doc ; then
-		einfo "Building HTML documentation"
-		cd doc
-		emake html || die "failed to build HTML documentation"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# init script stuff
-	newinitd ${FILESDIR}/lighttpd.initd-1.4.13-r2 lighttpd || die
-	newconfd ${FILESDIR}/lighttpd.confd lighttpd || die
-	use fam && has_version app-admin/fam && \
-		sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd
-
-	if use php || use fastcgi ; then
-		newinitd ${FILESDIR}/spawn-fcgi.initd spawn-fcgi || die
-		newconfd ${FILESDIR}/spawn-fcgi.confd spawn-fcgi || die
-	fi
-
-	# configs
-	insinto /etc/lighttpd
-	doins ${FILESDIR}/conf/lighttpd.conf
-	doins ${FILESDIR}/conf/mime-types.conf
-	doins ${FILESDIR}/conf/mod_cgi.conf
-	newins ${FILESDIR}/conf/mod_fastcgi.conf-1.4.13-r2 mod_fastcgi.conf
-	# Secure directory for fastcgi sockets
-	keepdir /var/run/lighttpd/
-	fperms 0750 /var/run/lighttpd/
-	fowners lighttpd:lighttpd /var/run/lighttpd/
-
-	# update lighttpd.conf directives based on conditionals
-	update_config
-
-	# docs
-	dodoc AUTHORS README NEWS ChangeLog doc/*.sh
-	newdoc doc/lighttpd.conf lighttpd.conf.distrib
-
-	use doc && dohtml -r doc/*
-
-	docinto txt
-	dodoc doc/*.txt
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins ${FILESDIR}/lighttpd.logrotate lighttpd || die
-
-	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
-	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
-	fperms 0750 /var/l{ib,og}/lighttpd
-
-	use minimal && remove_non_essential
-}
-
-pkg_postinst () {
-	echo
-	if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then
-		einfo "spawn-fcgi is now included with lighttpd"
-		einfo "spawn-fcgi's init script configuration is now located"
-		einfo "at /etc/conf.d/spawn-fcgi."
-		echo
-	fi
-
-	if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then
-		ewarn "As of lighttpd-1.4.1, Gentoo has a customized configuration,"
-		ewarn "which is now located in /etc/lighttpd.  Please migrate your"
-		ewarn "existing configuration."
-		ebeep 5
-	fi
-
-	if use fam ; then
-		einfo "Remember to re-emerge lighttpd should you switch from"
-		einfo "app-admin/famd to app-admin/gamin or vice versa."
-	fi
-	echo
-}
diff --git a/www-servers/lighttpd/lighttpd-1.4.15.ebuild b/www-servers/lighttpd/lighttpd-1.4.15.ebuild
deleted file mode 100644
index 641a67227c95..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.15.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.15.ebuild,v 1.12 2007/06/24 23:55:57 vapier Exp $
-
-WANT_AUTOCONF=latest
-WANT_AUTOMAKE=latest
-inherit eutils autotools depend.php
-
-DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="http://www.lighttpd.net/"
-SRC_URI="http://www.lighttpd.net/download/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="bzip2 doc fam fastcgi gdbm ipv6 ldap lua minimal memcache mysql pcre php rrdtool ssl test webdav xattr"
-
-RDEPEND=">=sys-libs/zlib-1.1
-	bzip2?    ( app-arch/bzip2 )
-	fam?      ( virtual/fam )
-	gdbm?     ( sys-libs/gdbm )
-	ldap?     ( >=net-nds/openldap-2.1.26 )
-	lua?      ( >=dev-lang/lua-5.1 )
-	memcache? ( dev-libs/libmemcache )
-	mysql?    ( >=virtual/mysql-4.0 )
-	pcre?     ( >=dev-libs/libpcre-3.1 )
-	php?      (
-		virtual/httpd-php
-		!net-www/spawn-fcgi
-	)
-	rrdtool? ( net-analyzer/rrdtool )
-	ssl?    ( >=dev-libs/openssl-0.9.7 )
-	webdav? (
-		dev-libs/libxml2
-		>=dev-db/sqlite-3
-		sys-fs/e2fsprogs
-	)
-	xattr? ( kernel_linux? ( sys-apps/attr ) )"
-
-DEPEND="${RDEPEND}
-	doc?  ( dev-python/docutils )
-	test? (
-		virtual/perl-Test-Harness
-		dev-libs/fcgi
-	)"
-
-# update certain parts of lighttpd.conf based on conditionals
-update_config() {
-	local config="/etc/lighttpd/lighttpd.conf"
-
-	# enable php/mod_fastcgi settings
-	use php && \
-		dosed 's|#.*\(include.*fastcgi.*$\)|\1|' ${config}
-
-	# enable stat() caching
-	use fam && \
-		dosed 's|#\(.*stat-cache.*$\)|\1|' ${config}
-}
-
-# remove non-essential stuff (for USE=minimal)
-remove_non_essential() {
-	local libdir="${D}/usr/$(get_libdir)/${PN}"
-
-	# text docs
-	use doc || rm -fr ${D}/usr/share/doc/${PF}/txt
-
-	# non-essential modules
-	rm -f \
-		${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.*
-
-	# allow users to keep some based on USE flags
-	use pcre    || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
-	use webdav  || rm -f ${libdir}/mod_webdav.*
-	use mysql   || rm -f ${libdir}/mod_mysql_vhost.*
-	use lua     || rm -f ${libdir}/mod_{cml,magnet}.*
-	use rrdtool || rm -f ${libdir}/mod_rrdtool.*
-
-	if ! use fastcgi ; then
-		rm -f ${libdir}/mod_fastcgi.* ${D}/usr/bin/spawn-fcgi \
-			${D}/usr/share/man/man1/spawn-fcgi.*
-	fi
-}
-
-pkg_setup() {
-	if ! use pcre ; then
-		ewarn "It is highly recommended that you build ${PN}"
-		ewarn "with perl regular expressions support via USE=pcre."
-		ewarn "Otherwise you lose support for some core options such"
-		ewarn "as conditionals and modules such as mod_re{write,direct}"
-		ewarn "and mod_ssi."
-		ebeep 5
-	fi
-
-	use php && require_php_with_use cgi
-
-	enewgroup lighttpd
-	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	EPATCH_SUFFIX="diff" EPATCH_OPTS="-p1 -l -d ${S}" epatch ${FILESDIR}/${PV} || die "Patching failed!"
-
-	eautoreconf || die
-
-	# dev-python/docutils installs rst2html.py not rst2html
-	sed -i -e 's|\(rst2html\)|\1.py|g' doc/Makefile.in || \
-		die "sed doc/Makefile.in failed"
-
-	# fix typo
-	sed -i -e 's|\(output_content\)_\(type\)|\1\2|' doc/cml.txt || \
-		die "sed doc/cml.txt failed"
-}
-
-src_compile() {
-	econf --libdir=/usr/$(get_libdir)/${PN} \
-		--enable-lfs \
-		$(use_enable ipv6) \
-		$(use_with bzip2) \
-		$(use_with fam) \
-		$(use_with gdbm) \
-		$(use_with lua) \
-		$(use_with ldap) \
-		$(use_with memcache) \
-		$(use_with mysql) \
-		$(use_with pcre) \
-		$(use_with ssl openssl) \
-		$(use_with webdav webdav-props) \
-		$(use_with webdav webdav-locks) \
-		$(use_with xattr attr) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-
-	if use doc ; then
-		einfo "Building HTML documentation"
-		cd doc
-		emake html || die "failed to build HTML documentation"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# init script stuff
-	newinitd ${FILESDIR}/lighttpd.initd-1.4.13-r2 lighttpd || die
-	newconfd ${FILESDIR}/lighttpd.confd lighttpd || die
-	use fam && has_version app-admin/fam && \
-		sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd
-
-	if use php || use fastcgi ; then
-		newinitd ${FILESDIR}/spawn-fcgi.initd spawn-fcgi || die
-		newconfd ${FILESDIR}/spawn-fcgi.confd spawn-fcgi || die
-	fi
-
-	# configs
-	insinto /etc/lighttpd
-	doins ${FILESDIR}/conf/lighttpd.conf
-	doins ${FILESDIR}/conf/mime-types.conf
-	doins ${FILESDIR}/conf/mod_cgi.conf
-	newins ${FILESDIR}/conf/mod_fastcgi.conf-1.4.13-r2 mod_fastcgi.conf
-	# Secure directory for fastcgi sockets
-	keepdir /var/run/lighttpd/
-	fperms 0750 /var/run/lighttpd/
-	fowners lighttpd:lighttpd /var/run/lighttpd/
-
-	# update lighttpd.conf directives based on conditionals
-	update_config
-
-	# docs
-	dodoc AUTHORS README NEWS ChangeLog doc/*.sh
-	newdoc doc/lighttpd.conf lighttpd.conf.distrib
-
-	use doc && dohtml -r doc/*
-
-	docinto txt
-	dodoc doc/*.txt
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins ${FILESDIR}/lighttpd.logrotate lighttpd || die
-
-	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
-	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
-	fperms 0750 /var/l{ib,og}/lighttpd
-
-	use minimal && remove_non_essential
-}
-
-pkg_postinst () {
-	echo
-	if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then
-		einfo "spawn-fcgi is now included with lighttpd"
-		einfo "spawn-fcgi's init script configuration is now located"
-		einfo "at /etc/conf.d/spawn-fcgi."
-		echo
-	fi
-
-	if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then
-		ewarn "As of lighttpd-1.4.1, Gentoo has a customized configuration,"
-		ewarn "which is now located in /etc/lighttpd.  Please migrate your"
-		ewarn "existing configuration."
-		ebeep 5
-	fi
-
-	if use fam ; then
-		einfo "Remember to re-emerge lighttpd should you switch from"
-		einfo "app-admin/famd to app-admin/gamin or vice versa."
-	fi
-	echo
-}