fix naming of patches - remove 04_diff - change startup script to 'need famd' in cases where app-admin/fam

Package-Manager: portage-2.0.54-r2

11 files changed, 43 insertions, 186 deletions

diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index a72f2858b9d2..e9ce4058b773 100644
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for www-servers/lighttpd
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.73 2006/06/01 01:16:24 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.74 2006/06/01 21:56:36 bangert Exp $
+
+*lighttpd-1.4.11-r1 (01 Jun 2006)
+
+  01 Jun 2006; Thilo Bangert <bangert@gentoo.org>
+  +files/1.4.11/01_all_r1046.mod_compress.c-fixes.diff,
+  -files/1.4.11/01_r1046.diff_mod_compress.c-fixes.diff,
+  +files/1.4.11/02_all_r1057_fix_If-Modified-Since-ETag.diff,
+  -files/1.4.11/02_r1057_fix_If-Modified-Since-ETag.diff,
+  +files/1.4.11/03_all_r1095_fix_stalling_SSL_POST_requests.diff,
+  -files/1.4.11/03_r1095_fix_stalling_SSL_POST_requests.diff,
+  -files/1.4.11/04_r1116_fix_env_conf_segfault.diff,
+  +files/1.4.11/21_all_mod_scgi_segfault.diff,
+  -files/1.4.11/21_mod_scgi_segfault.diff,
+  +files/1.4.11/22_all_bug606_fix_SSI_echo.diff,
+  -files/1.4.11/22_bug606_fix_SSI_echo.diff, files/lighttpd.initd,
+  +lighttpd-1.4.11-r1.ebuild:
+  fix naming of patches - remove 04_diff
+  change startup script to 'need famd' in cases where app-admin/fam 
+  provides virtual/fam
 
   01 Jun 2006; Steev Klimaszewski <steev@gentoo.org>
   lighttpd-1.4.10-r2.ebuild, lighttpd-1.4.11.ebuild:
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index e869d02ebd62..970d73341b55 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1,207 +1,51 @@
-AUX 1.4.10/01_all_r990_mod_cgi_dont_reset_physical_path.diff 517 RMD160 b0e9a693102fb2ea4e6cf750cd4559f9c25a7834 SHA1 6546c3f6805cab0b5baeb7c6be134ff5f5469f27 SHA256 9f3d49f04b3b8423b06f0ddf35cce855c2187d3f0a84f22479aa5df871901144
+MD5 7e06a685a62170ea9ab4cfdeb5b020f0 ChangeLog 22155
 MD5 24669453e8f69faf4212dfa43e90e3dd files/1.4.10/01_all_r990_mod_cgi_dont_reset_physical_path.diff 517
-RMD160 b0e9a693102fb2ea4e6cf750cd4559f9c25a7834 files/1.4.10/01_all_r990_mod_cgi_dont_reset_physical_path.diff 517
-SHA256 9f3d49f04b3b8423b06f0ddf35cce855c2187d3f0a84f22479aa5df871901144 files/1.4.10/01_all_r990_mod_cgi_dont_reset_physical_path.diff 517
-AUX 1.4.10/02_all_r991_posix_fadvise.diff 805 RMD160 6f2ba5d23afdfa278a6ec4c029854f364ce4fcf6 SHA1 b11f08685cd5afb91840c775dcc3a25748cf6475 SHA256 9caad21c610639f126c254889385082ee6a29a2e7a18984c28a6e071c320743d
 MD5 8c00894c801011ca682400a243aa49cb files/1.4.10/02_all_r991_posix_fadvise.diff 805
-RMD160 6f2ba5d23afdfa278a6ec4c029854f364ce4fcf6 files/1.4.10/02_all_r991_posix_fadvise.diff 805
-SHA256 9caad21c610639f126c254889385082ee6a29a2e7a18984c28a6e071c320743d files/1.4.10/02_all_r991_posix_fadvise.diff 805
-AUX 1.4.10/03_all_r992_posix_fadvise_2.4.x.diff 638 RMD160 d2e6a53db17fd7c8cdafb663b393b89f2ecb1c58 SHA1 27294de5f3064f5b84ab10f94022c6a02837cd57 SHA256 638d717b103b310210c8b877659b9a56342b2270e34c8942fb305c1a2d273f08
 MD5 f9b6a2f0c377777945de48d3e7bdda40 files/1.4.10/03_all_r992_posix_fadvise_2.4.x.diff 638
-RMD160 d2e6a53db17fd7c8cdafb663b393b89f2ecb1c58 files/1.4.10/03_all_r992_posix_fadvise_2.4.x.diff 638
-SHA256 638d717b103b310210c8b877659b9a56342b2270e34c8942fb305c1a2d273f08 files/1.4.10/03_all_r992_posix_fadvise_2.4.x.diff 638
-AUX 1.4.10/04_all_r994_remove_xopen_and_bsd_source_defines.diff 624 RMD160 8e422d379c6ba14db1be2a49683b83bdd4c3e7d6 SHA1 dc9d52a0dc881204205dad867d473fc927a4287f SHA256 1482946f20939f617755ec027e289c911bc5d60fb3831dd2890a55bda181f7c0
 MD5 1ce159021271dc6c03e84e21032d15c9 files/1.4.10/04_all_r994_remove_xopen_and_bsd_source_defines.diff 624
-RMD160 8e422d379c6ba14db1be2a49683b83bdd4c3e7d6 files/1.4.10/04_all_r994_remove_xopen_and_bsd_source_defines.diff 624
-SHA256 1482946f20939f617755ec027e289c911bc5d60fb3831dd2890a55bda181f7c0 files/1.4.10/04_all_r994_remove_xopen_and_bsd_source_defines.diff 624
-AUX 1.4.10/05_all_r996_fallback_to_madvise.diff 908 RMD160 6e331a668217b8ed5d8172e24f1ecc9bb969fd45 SHA1 ed60118e3b7c0ab8e7fd6e686c37ecf263283821 SHA256 16d790a26eb45f77ef133ae4531b272b019dd43151e6286e9271dfbdb54705c0
 MD5 ef9e93d6cc81bf924c310a13ad50b502 files/1.4.10/05_all_r996_fallback_to_madvise.diff 908
-RMD160 6e331a668217b8ed5d8172e24f1ecc9bb969fd45 files/1.4.10/05_all_r996_fallback_to_madvise.diff 908
-SHA256 16d790a26eb45f77ef133ae4531b272b019dd43151e6286e9271dfbdb54705c0 files/1.4.10/05_all_r996_fallback_to_madvise.diff 908
-AUX 1.4.10/06_all_r997_fastcgi_fixes.diff 1951 RMD160 226f8cada01629b34757cd37c5f42c7600afb093 SHA1 208255309ab700b5ca8baf1aa5785b20025bf1ce SHA256 5160cfafb11ad3eb64d3187cd8910b3fc17543b9543d84fc7dc80f9b09f53053
 MD5 7560c24162dd46b8230920a083e9f0f6 files/1.4.10/06_all_r997_fastcgi_fixes.diff 1951
-RMD160 226f8cada01629b34757cd37c5f42c7600afb093 files/1.4.10/06_all_r997_fastcgi_fixes.diff 1951
-SHA256 5160cfafb11ad3eb64d3187cd8910b3fc17543b9543d84fc7dc80f9b09f53053 files/1.4.10/06_all_r997_fastcgi_fixes.diff 1951
-AUX 1.4.10/07_all_r998_sendfile_fixes.diff 1833 RMD160 db1fe250c625318ace5a261d33192708ca30f0dd SHA1 07496b0b0c6fe8908f3623143e353ed438398abf SHA256 3fb53ae049e299bfe949349c9ef4e0d45d0d9c3fe5073d978b6f76ed157256da
 MD5 120f0a70f526ae2194d51230616e1f25 files/1.4.10/07_all_r998_sendfile_fixes.diff 1833
-RMD160 db1fe250c625318ace5a261d33192708ca30f0dd files/1.4.10/07_all_r998_sendfile_fixes.diff 1833
-SHA256 3fb53ae049e299bfe949349c9ef4e0d45d0d9c3fe5073d978b6f76ed157256da files/1.4.10/07_all_r998_sendfile_fixes.diff 1833
-AUX 1.4.10/08_all_r999_mod_cgi_terminate.diff 503 RMD160 b33973b8be7040f40e01b0a58ff79dc80c3e3517 SHA1 d9b63f9ed8b1747d0a71f3d53e209149b045ce81 SHA256 14da226b0047a37a4916e74fa3f2ced12c9f6de58989be0173829e78cffcce47
 MD5 b415f237f75a8ccb090c9c574ede05fd files/1.4.10/08_all_r999_mod_cgi_terminate.diff 503
-RMD160 b33973b8be7040f40e01b0a58ff79dc80c3e3517 files/1.4.10/08_all_r999_mod_cgi_terminate.diff 503
-SHA256 14da226b0047a37a4916e74fa3f2ced12c9f6de58989be0173829e78cffcce47 files/1.4.10/08_all_r999_mod_cgi_terminate.diff 503
-AUX 1.4.10/09_all_r1000_sendfile_compile_fix.diff 528 RMD160 988329fcc0b05447c31082becdc8f5c2c4e2597f SHA1 dd4f4cd31fb7579c1920f2307564bb0fb35ae2c7 SHA256 dbc0710c111e5274300ed0ef3217324eb281c1433c9b70c8a1fec3737dcd5b9e
 MD5 335e847b375359b7fbc01bfbeddcdd87 files/1.4.10/09_all_r1000_sendfile_compile_fix.diff 528
-RMD160 988329fcc0b05447c31082becdc8f5c2c4e2597f files/1.4.10/09_all_r1000_sendfile_compile_fix.diff 528
-SHA256 dbc0710c111e5274300ed0ef3217324eb281c1433c9b70c8a1fec3737dcd5b9e files/1.4.10/09_all_r1000_sendfile_compile_fix.diff 528
-AUX 1.4.10/10_all_r1001_mod_auth_errormsg_fix.diff 3305 RMD160 d47c60dea227f037bc03ea0579fef2898cb77c3a SHA1 f378c94ed39e8092527ab7ffedb59f8ea3a32bd1 SHA256 29c7cc730123d8959761fcc08b53dd542e22d3e09b203512ad4af63ab98c3af0
 MD5 c41a7ca766ed3228360da359d913d137 files/1.4.10/10_all_r1001_mod_auth_errormsg_fix.diff 3305
-RMD160 d47c60dea227f037bc03ea0579fef2898cb77c3a files/1.4.10/10_all_r1001_mod_auth_errormsg_fix.diff 3305
-SHA256 29c7cc730123d8959761fcc08b53dd542e22d3e09b203512ad4af63ab98c3af0 files/1.4.10/10_all_r1001_mod_auth_errormsg_fix.diff 3305
-AUX 1.4.10/11_all_r1002_var_and_env_docs.diff 1389 RMD160 b0f26a7495ad602606da0e6f2b4cf07601679866 SHA1 87e7d28d6b896824722e198993324c28db00e72b SHA256 2b3169d46d2793061ce0451e18bd55e46c429f951b26d93a6ac973c2deb4f87f
 MD5 1df4960f248d3a9bdf8c0df9e870cf83 files/1.4.10/11_all_r1002_var_and_env_docs.diff 1389
-RMD160 b0f26a7495ad602606da0e6f2b4cf07601679866 files/1.4.10/11_all_r1002_var_and_env_docs.diff 1389
-SHA256 2b3169d46d2793061ce0451e18bd55e46c429f951b26d93a6ac973c2deb4f87f files/1.4.10/11_all_r1002_var_and_env_docs.diff 1389
-AUX 1.4.10/12_all_r1003_mod_fastcgi_doc_fix.diff 543 RMD160 9e592ae9127f61bd2d379463b846b12d41e48c87 SHA1 5d5e6511aeab8af2b58fdfea04f5694d56244f6c SHA256 203ef9efa0ae11226c871962eb0f7fc6b16d3789c1714accdda8197b8b9d39c6
 MD5 35434778a8946f35db7f1de508e9d671 files/1.4.10/12_all_r1003_mod_fastcgi_doc_fix.diff 543
-RMD160 9e592ae9127f61bd2d379463b846b12d41e48c87 files/1.4.10/12_all_r1003_mod_fastcgi_doc_fix.diff 543
-SHA256 203ef9efa0ae11226c871962eb0f7fc6b16d3789c1714accdda8197b8b9d39c6 files/1.4.10/12_all_r1003_mod_fastcgi_doc_fix.diff 543
-AUX 1.4.10/13_all_r1006_mod_cgi_close_unused_pipe_fds.diff 1987 RMD160 fa2e223ef49682a3c881e794e88169d416798dae SHA1 1fb38aa4119d0db2b0c984578ef87782b1c8a72a SHA256 996efc5821728c7d9da0f47fef64189bb1638f4ebac57e6f004e54dfbabab25d
 MD5 3ee9e11b239661b01e45c56381c49d7d files/1.4.10/13_all_r1006_mod_cgi_close_unused_pipe_fds.diff 1987
-RMD160 fa2e223ef49682a3c881e794e88169d416798dae files/1.4.10/13_all_r1006_mod_cgi_close_unused_pipe_fds.diff 1987
-SHA256 996efc5821728c7d9da0f47fef64189bb1638f4ebac57e6f004e54dfbabab25d files/1.4.10/13_all_r1006_mod_cgi_close_unused_pipe_fds.diff 1987
-AUX 1.4.10/14_all_r1007_mod_alias_lowercase_support.diff 695 RMD160 9b09acb448e2b7ac7150e624a636c2e9dda69530 SHA1 dc76eeabceb46dc8c2a8417660afbca930c51e2f SHA256 70a89b49903c43e8c010c48f5cdcb0827032d4b2c9b019d5dd59a475cb53e178
 MD5 81e540213c5ca381e6b82e51571c6874 files/1.4.10/14_all_r1007_mod_alias_lowercase_support.diff 695
-RMD160 9b09acb448e2b7ac7150e624a636c2e9dda69530 files/1.4.10/14_all_r1007_mod_alias_lowercase_support.diff 695
-SHA256 70a89b49903c43e8c010c48f5cdcb0827032d4b2c9b019d5dd59a475cb53e178 files/1.4.10/14_all_r1007_mod_alias_lowercase_support.diff 695
-AUX 1.4.11/01_r1046.diff_mod_compress.c-fixes.diff 5992 RMD160 1288d18449115f4a99307cb9a68786d34f867e36 SHA1 8785f13c4020493eb13842c9f09da109f862d8e4 SHA256 20818c8cca47ad3ab405ec3841d0077e3b478bf3115828e920b6c9486e6d3479
-MD5 1b3bebe51407cf5a2f406a53465d9901 files/1.4.11/01_r1046.diff_mod_compress.c-fixes.diff 5992
-RMD160 1288d18449115f4a99307cb9a68786d34f867e36 files/1.4.11/01_r1046.diff_mod_compress.c-fixes.diff 5992
-SHA256 20818c8cca47ad3ab405ec3841d0077e3b478bf3115828e920b6c9486e6d3479 files/1.4.11/01_r1046.diff_mod_compress.c-fixes.diff 5992
-AUX 1.4.11/02_r1057_fix_If-Modified-Since-ETag.diff 2464 RMD160 bea954532d057a3a12e2cd6b56710c2fdc611815 SHA1 a79e543f09608de521a1a153f07c88c511d86b1c SHA256 977abd3b59054c9afbb4e496e2c451d7e30bd0655d5cd8d4164ee42af1aa3db7
-MD5 322a27dd300158534f8cb65ffad9e03d files/1.4.11/02_r1057_fix_If-Modified-Since-ETag.diff 2464
-RMD160 bea954532d057a3a12e2cd6b56710c2fdc611815 files/1.4.11/02_r1057_fix_If-Modified-Since-ETag.diff 2464
-SHA256 977abd3b59054c9afbb4e496e2c451d7e30bd0655d5cd8d4164ee42af1aa3db7 files/1.4.11/02_r1057_fix_If-Modified-Since-ETag.diff 2464
-AUX 1.4.11/03_r1095_fix_stalling_SSL_POST_requests.diff 500 RMD160 f30b7af2d27740ba0e0df6993d816f813be24877 SHA1 1d4e63cae9cb5dbd4003ac47f61b54ba961b9e08 SHA256 d01e4f69bdfa18abc8dd14ae44e192b4b71d8299e8a0049e9fbf2e020d7097fa
-MD5 efe7fb8d01b34d2bef55f80b450f7a86 files/1.4.11/03_r1095_fix_stalling_SSL_POST_requests.diff 500
-RMD160 f30b7af2d27740ba0e0df6993d816f813be24877 files/1.4.11/03_r1095_fix_stalling_SSL_POST_requests.diff 500
-SHA256 d01e4f69bdfa18abc8dd14ae44e192b4b71d8299e8a0049e9fbf2e020d7097fa files/1.4.11/03_r1095_fix_stalling_SSL_POST_requests.diff 500
-AUX 1.4.11/04_r1116_fix_env_conf_segfault.diff 282 RMD160 b72b48c6914ccdcabbfdfe28ec2d71faa0787bd5 SHA1 4d1b9eddbcf5455cbd86128661a355c58afb5b73 SHA256 e12a6e16222263b56448976d96db1d3c88be7d3e8a625450bab999f153a22958
-MD5 bb877e9c7fb8d9b0ecc940207fb287e5 files/1.4.11/04_r1116_fix_env_conf_segfault.diff 282
-RMD160 b72b48c6914ccdcabbfdfe28ec2d71faa0787bd5 files/1.4.11/04_r1116_fix_env_conf_segfault.diff 282
-SHA256 e12a6e16222263b56448976d96db1d3c88be7d3e8a625450bab999f153a22958 files/1.4.11/04_r1116_fix_env_conf_segfault.diff 282
-AUX 1.4.11/21_mod_scgi_segfault.diff 458 RMD160 9cd971db1f8999b78031fb908092d509e11a52eb SHA1 3b99dfe080534c950258e734b01d545056cdcbcc SHA256 c319256b7cc14c609773dfae03e578f46a6994522dbacf966c6a88cf7eba6ea7
-MD5 560787bd4caa409af1cebdb03a76bebc files/1.4.11/21_mod_scgi_segfault.diff 458
-RMD160 9cd971db1f8999b78031fb908092d509e11a52eb files/1.4.11/21_mod_scgi_segfault.diff 458
-SHA256 c319256b7cc14c609773dfae03e578f46a6994522dbacf966c6a88cf7eba6ea7 files/1.4.11/21_mod_scgi_segfault.diff 458
-AUX 1.4.11/22_bug606_fix_SSI_echo.diff 4905 RMD160 c99c0130b1a039f5202e7388a31d2026e1f32a72 SHA1 4272f52032b0d09c11b1280e8dc76bdea3704abb SHA256 a3d8d47593b51e0b9f5f82cf7ca7baad785597aec824bfafe70190f835be879f
-MD5 d1027d3e457185a382d4f6457e95bb3b files/1.4.11/22_bug606_fix_SSI_echo.diff 4905
-RMD160 c99c0130b1a039f5202e7388a31d2026e1f32a72 files/1.4.11/22_bug606_fix_SSI_echo.diff 4905
-SHA256 a3d8d47593b51e0b9f5f82cf7ca7baad785597aec824bfafe70190f835be879f files/1.4.11/22_bug606_fix_SSI_echo.diff 4905
-AUX conf/lighttpd.conf 8182 RMD160 450cf40f4ec517331f8932618a3c492cb566e4f3 SHA1 16922786a79807fa3233d1af105a99582d3486a5 SHA256 c0f6951e00d4e8c928f1799a84976ab8bb536bd59a104c13ca9d1d3661d8cebd
+MD5 1b3bebe51407cf5a2f406a53465d9901 files/1.4.11/01_all_r1046.mod_compress.c-fixes.diff 5992
+MD5 322a27dd300158534f8cb65ffad9e03d files/1.4.11/02_all_r1057_fix_If-Modified-Since-ETag.diff 2464
+MD5 efe7fb8d01b34d2bef55f80b450f7a86 files/1.4.11/03_all_r1095_fix_stalling_SSL_POST_requests.diff 500
+MD5 560787bd4caa409af1cebdb03a76bebc files/1.4.11/21_all_mod_scgi_segfault.diff 458
+MD5 d1027d3e457185a382d4f6457e95bb3b files/1.4.11/22_all_bug606_fix_SSI_echo.diff 4905
 MD5 df5b2360ea380d988bf16905ab214286 files/conf/lighttpd.conf 8182
-RMD160 450cf40f4ec517331f8932618a3c492cb566e4f3 files/conf/lighttpd.conf 8182
-SHA256 c0f6951e00d4e8c928f1799a84976ab8bb536bd59a104c13ca9d1d3661d8cebd files/conf/lighttpd.conf 8182
-AUX conf/mime-types.conf 3291 RMD160 157c9a6f7d00e52c7d4118edcce8d1eb1e0a3c20 SHA1 3eec39060014e1498d3254919b10a64ca1e6ff00 SHA256 575231104d51fa1882c47021ab0aa00d615401059a6748d64453cb39aafba537
 MD5 fef397e7bcf1b741dea211a555e1803c files/conf/mime-types.conf 3291
-RMD160 157c9a6f7d00e52c7d4118edcce8d1eb1e0a3c20 files/conf/mime-types.conf 3291
-SHA256 575231104d51fa1882c47021ab0aa00d615401059a6748d64453cb39aafba537 files/conf/mime-types.conf 3291
-AUX conf/mod_cgi.conf 869 RMD160 1d447bad36822657d014990128891cbdb6169468 SHA1 30066f52e469339cc8a5df8864b4cc2d9c558c3d SHA256 322656b4cfd22ca9f1f8ab160e0b932f1646622422fd49c6fc82ab416223eecf
 MD5 9c1407e95f62ed22da66c4ef5f69c3b5 files/conf/mod_cgi.conf 869
-RMD160 1d447bad36822657d014990128891cbdb6169468 files/conf/mod_cgi.conf 869
-SHA256 322656b4cfd22ca9f1f8ab160e0b932f1646622422fd49c6fc82ab416223eecf files/conf/mod_cgi.conf 869
-AUX conf/mod_fastcgi.conf 661 RMD160 83b4126a4b0537fcd04db607a53e4742ceae039b SHA1 853a54799e9cd42ab9ff92bf0c07a0515ebe2d2a SHA256 61daa2ffac9e948d9d5130cc43f560a18c8dfb052cb7e3d4c6bd1decb6c9fd06
 MD5 b4c80dba9c626d5f89d3c3797ac6670c files/conf/mod_fastcgi.conf 661
-RMD160 83b4126a4b0537fcd04db607a53e4742ceae039b files/conf/mod_fastcgi.conf 661
-SHA256 61daa2ffac9e948d9d5130cc43f560a18c8dfb052cb7e3d4c6bd1decb6c9fd06 files/conf/mod_fastcgi.conf 661
-AUX lighttpd-1.3.10.initd 666 RMD160 b665f80ae5b58bd0c8d42793d28bc40443923605 SHA1 490cc2486fd68d78c81b0d0abf6ef79f9ee06270 SHA256 f4a3170795681ec8101d8048df1e5d23b690b6ca1a1e702722fa1f6c58c59731
+MD5 16c832beb1879cbc2cc6814d1a2786a1 files/digest-lighttpd-1.3.13-r3 247
+MD5 669eed61cca360d002ddb0c7efe0afe5 files/digest-lighttpd-1.3.16 247
+MD5 03f615e79bba7ff75a6ba9a3e486fec4 files/digest-lighttpd-1.4.10-r1 247
+MD5 03f615e79bba7ff75a6ba9a3e486fec4 files/digest-lighttpd-1.4.10-r2 247
+MD5 7b15f03282e2cab51e8e74bfa2eb12c5 files/digest-lighttpd-1.4.11 67
+MD5 485267c1ac751168ebdd83d45237cfa7 files/digest-lighttpd-1.4.7 244
+MD5 07e5b40d581e4881f7e8fbb6277b4ad3 files/digest-lighttpd-1.4.8 244
 MD5 7fdb430fc7240e6e6a9078e4e57f6322 files/lighttpd-1.3.10.initd 666
-RMD160 b665f80ae5b58bd0c8d42793d28bc40443923605 files/lighttpd-1.3.10.initd 666
-SHA256 f4a3170795681ec8101d8048df1e5d23b690b6ca1a1e702722fa1f6c58c59731 files/lighttpd-1.3.10.initd 666
-AUX lighttpd-1.3.11-gentoo.diff 1784 RMD160 562fa1c98657afebbdededa9071aabbbc7ce973e SHA1 5540a55a5ff0c4414e7067bd1f62d45d082bfa1f SHA256 e383430afcd4bc2b055a395664e78428320d2b2d8069f0e5f65c1bef1034417f
 MD5 8648177a5f9a79cd4ba0eaaa4e769fdc files/lighttpd-1.3.11-gentoo.diff 1784
-RMD160 562fa1c98657afebbdededa9071aabbbc7ce973e files/lighttpd-1.3.11-gentoo.diff 1784
-SHA256 e383430afcd4bc2b055a395664e78428320d2b2d8069f0e5f65c1bef1034417f files/lighttpd-1.3.11-gentoo.diff 1784
-AUX lighttpd-1.3.13-ldap-binddn.diff 3863 RMD160 622033a88ca606872d68bfedb31a251b8655e7e1 SHA1 0d03b43f248d597209c5204f17cb03ef6798c651 SHA256 bce55b1d770f1f9002019257a941bd6dabf1f1fb002d9e686b1bbecffaaf2066
 MD5 f984dc26b2bc491272d302ab453f6e6b files/lighttpd-1.3.13-ldap-binddn.diff 3863
-RMD160 622033a88ca606872d68bfedb31a251b8655e7e1 files/lighttpd-1.3.13-ldap-binddn.diff 3863
-SHA256 bce55b1d770f1f9002019257a941bd6dabf1f1fb002d9e686b1bbecffaaf2066 files/lighttpd-1.3.13-ldap-binddn.diff 3863
-AUX lighttpd-1.3.13-no-mysql-means-no-mysql.diff 1456 RMD160 976b9081a6eae177cf5db7f2856d589100bb2206 SHA1 e22cc8995f1bdcca816ed5707e9e69da9ad78b91 SHA256 d3930366baef28f58907aced7568e795e0ac89d6da0311dbb090b9c80da046ca
 MD5 0c57eeef1963af5add8b9608e0bc0d0f files/lighttpd-1.3.13-no-mysql-means-no-mysql.diff 1456
-RMD160 976b9081a6eae177cf5db7f2856d589100bb2206 files/lighttpd-1.3.13-no-mysql-means-no-mysql.diff 1456
-SHA256 d3930366baef28f58907aced7568e795e0ac89d6da0311dbb090b9c80da046ca files/lighttpd-1.3.13-no-mysql-means-no-mysql.diff 1456
-AUX lighttpd-1.3.13-pam-name.diff 564 RMD160 7a6fcef66f998299ffaedc07a3f21bbf34ec11a1 SHA1 856362f42ffa2c4ed95b5161a02d9053dc56469a SHA256 c48a0181245099d7ade669a6abe3f4d3b1397a030778e30ad925c6621ab78b10
 MD5 44374d14af9b69b8f60f8d73f14c848d files/lighttpd-1.3.13-pam-name.diff 564
-RMD160 7a6fcef66f998299ffaedc07a3f21bbf34ec11a1 files/lighttpd-1.3.13-pam-name.diff 564
-SHA256 c48a0181245099d7ade669a6abe3f4d3b1397a030778e30ad925c6621ab78b10 files/lighttpd-1.3.13-pam-name.diff 564
-AUX lighttpd-1.3.13-php.diff 1399 RMD160 521ac2e131f1c68c69e717902ef2f161d4f24f99 SHA1 6b16aae46bd11972b147d6423503f79703654a0d SHA256 dcf102367a768f8d6b1273327e5299a17f597ea4f7939b485c30a71bee8143ef
 MD5 f111e60bb593bffbdb01b9aece46ab20 files/lighttpd-1.3.13-php.diff 1399
-RMD160 521ac2e131f1c68c69e717902ef2f161d4f24f99 files/lighttpd-1.3.13-php.diff 1399
-SHA256 dcf102367a768f8d6b1273327e5299a17f597ea4f7939b485c30a71bee8143ef files/lighttpd-1.3.13-php.diff 1399
-AUX lighttpd-1.3.13-valid-user.diff 762 RMD160 7292b2a76b80e45e7a03e6be3a34e9c7e4a2a4bc SHA1 198f172ea84b1d02286d3b5eb62c30b35b5fd73d SHA256 f4d7215ed521ac64bb4f9ff38e015ae95a0e7a1b0065016298f19998b03bd386
 MD5 9cc5ffbffdd7554797c338c5972ed813 files/lighttpd-1.3.13-valid-user.diff 762
-RMD160 7292b2a76b80e45e7a03e6be3a34e9c7e4a2a4bc files/lighttpd-1.3.13-valid-user.diff 762
-SHA256 f4d7215ed521ac64bb4f9ff38e015ae95a0e7a1b0065016298f19998b03bd386 files/lighttpd-1.3.13-valid-user.diff 762
-AUX lighttpd-1.3.13-zope-deserves-lovins-too.diff 5970 RMD160 a5aa32b80a01a8fd84aaf46430c7e9a79e7548cd SHA1 be73604cf3b977918bc97ffdfd32f227d6b44a5e SHA256 74922ac4a490b53f362e662f190c6e7338424265d9900e15592a5aabbdfd988c
 MD5 5eb378dcd8905a09175df3e48953100c files/lighttpd-1.3.13-zope-deserves-lovins-too.diff 5970
-RMD160 a5aa32b80a01a8fd84aaf46430c7e9a79e7548cd files/lighttpd-1.3.13-zope-deserves-lovins-too.diff 5970
-SHA256 74922ac4a490b53f362e662f190c6e7338424265d9900e15592a5aabbdfd988c files/lighttpd-1.3.13-zope-deserves-lovins-too.diff 5970
-AUX lighttpd.initd 1225 RMD160 ce7f02b9cce14c003ecb7eaac76129916a7f1717 SHA1 511233688c6e99026c8a52f0cece009dc8111940 SHA256 ef8efadc31218d757f7c3798f141f5e8a27b01763266b982042ff302a432e55c
-MD5 e3ca8b6beac6189cf0de070b260e3571 files/lighttpd.initd 1225
-RMD160 ce7f02b9cce14c003ecb7eaac76129916a7f1717 files/lighttpd.initd 1225
-SHA256 ef8efadc31218d757f7c3798f141f5e8a27b01763266b982042ff302a432e55c files/lighttpd.initd 1225
-AUX lighttpd.logrotate 487 RMD160 2edb8b4abf75031af0a3b4182efb5b589dfa0d3c SHA1 24e1b048d7be5520ca5ef8ce31b55df13cc8d72b SHA256 503ee1cd454e2c0f9a212ef60dc8321893eda06ccf721ecbe94d189a09e0bc6c
+MD5 795944f04932a980650397d21a4264f9 files/lighttpd.initd 1232
 MD5 ad091c9157134890499f26d170352c9f files/lighttpd.logrotate 487
-RMD160 2edb8b4abf75031af0a3b4182efb5b589dfa0d3c files/lighttpd.logrotate 487
-SHA256 503ee1cd454e2c0f9a212ef60dc8321893eda06ccf721ecbe94d189a09e0bc6c files/lighttpd.logrotate 487
-AUX spawn-fcgi.confd 1076 RMD160 9468249fdedc39fa762a569622bae93f8b3481f9 SHA1 81bad945fc016275873e01e5f69838f73b275a3a SHA256 bfa452a849165f921a2febf0b06879db18c4c921f156b1452d06bb821063f768
 MD5 1d925aed297ec4541fb230dd19e11bc1 files/spawn-fcgi.confd 1076
-RMD160 9468249fdedc39fa762a569622bae93f8b3481f9 files/spawn-fcgi.confd 1076
-SHA256 bfa452a849165f921a2febf0b06879db18c4c921f156b1452d06bb821063f768 files/spawn-fcgi.confd 1076
-AUX spawn-fcgi.initd 1383 RMD160 4f604c9c54aca1bc58b171121e8ce823561e6694 SHA1 fec5bd3a132b2a1c664a84bd3be76f386046e7ce SHA256 ad2582f8b05523a13c147d57b948e58ba31758cd8af0a45cbf39964ac094a2f6
 MD5 e605a4ead0ce7b1e0788c0b0b1161871 files/spawn-fcgi.initd 1383
-RMD160 4f604c9c54aca1bc58b171121e8ce823561e6694 files/spawn-fcgi.initd 1383
-SHA256 ad2582f8b05523a13c147d57b948e58ba31758cd8af0a45cbf39964ac094a2f6 files/spawn-fcgi.initd 1383
-DIST lighttpd-1.3.13.tar.gz 680068 RMD160 f70e11933f324447232ef9aaf3d905ba85e47e91 SHA256 74a93e37cd6c3e9a931dba8fc038e26e1d01c752896233a1bf728a9f6e011c03
-DIST lighttpd-1.3.16.tar.gz 706362 RMD160 3bf9b50be2e2d9b83f6fe4fe1b8bf5d8dca417d9 SHA256 92f90ef3db84c4ebaf8f1fecc82547c2e99c95b3f4cce429e07a58d7440c2369
-DIST lighttpd-1.4.10.tar.gz 777853 RMD160 e7d1eeab33a0cb47eeed7f9499c894fd2aea5445 SHA1 0e2beb257423c1003267d7b9b36db65a361fd300 SHA256 fdde0c08d3e1883c04ddc97a22916b063b2679f5fcfbda81436ff4e85db18160
-DIST lighttpd-1.4.11.tar.gz 781656 RMD160 0434e6c09383f1ad443d985fd168a29f6f132d1f SHA1 ca904d3d4d9dde76f85156f2c709a394f30e28c8 SHA256 7782ac82af8ea8d14df5d35b6668c0d45c00f3ba43a6203c29c7fe7dfe98999c
-DIST lighttpd-1.4.7.tar.gz 778982 RMD160 fdbd3b215845570374bea0533971558c9d113df0 SHA256 b1d2793d1dc15c6176b3b666e7617f841e06005528223d56d5171a99294df199
-DIST lighttpd-1.4.8.tar.gz 769111 RMD160 3998bbc4565ca3dc59a3be1abaf7a98623dc52ae SHA256 f3115cb4b9f9805c9a9e7d6cdc97512adaaebde01a84122fcbd1c0ca16bc2d69
-EBUILD lighttpd-1.3.13-r3.ebuild 2649 RMD160 e730704a620f2aedfb9ad9afedfed2584553a11e SHA1 65d37f845712df89a10ab35e9aaea9d5000d1ad3 SHA256 2e06d17378daad7baac91efd04e8fa2f2b581fb39a532c92eeb75d2b11ea5c26
 MD5 f18029dea31126d04d7287f80610b2ca lighttpd-1.3.13-r3.ebuild 2649
-RMD160 e730704a620f2aedfb9ad9afedfed2584553a11e lighttpd-1.3.13-r3.ebuild 2649
-SHA256 2e06d17378daad7baac91efd04e8fa2f2b581fb39a532c92eeb75d2b11ea5c26 lighttpd-1.3.13-r3.ebuild 2649
-EBUILD lighttpd-1.3.16.ebuild 2589 RMD160 3ff48e9342813af77cc82ff0c6b4dad51dc6ab2e SHA1 bd057c55921e6f3c4fd1bfe3735df6db000fa3b3 SHA256 1e35432b058eb98b7344d34bcef5272a85ba761afb7d9d10fdf57ec56a03a9b4
 MD5 0df89754aec138ad20821ef93c45833b lighttpd-1.3.16.ebuild 2589
-RMD160 3ff48e9342813af77cc82ff0c6b4dad51dc6ab2e lighttpd-1.3.16.ebuild 2589
-SHA256 1e35432b058eb98b7344d34bcef5272a85ba761afb7d9d10fdf57ec56a03a9b4 lighttpd-1.3.16.ebuild 2589
-EBUILD lighttpd-1.4.10-r1.ebuild 5028 RMD160 73d2e847140af489ff7cc9d772e876bf53dfc5a9 SHA1 e50b2511d846c99ae4ecd33881be8d4787b33a7b SHA256 c9a032ba5cb1c36866810130bfe4d6a084ebbf18518fcd9a92499d48286d3067
 MD5 051c33f9eaa96575c4e85ff92ee8b149 lighttpd-1.4.10-r1.ebuild 5028
-RMD160 73d2e847140af489ff7cc9d772e876bf53dfc5a9 lighttpd-1.4.10-r1.ebuild 5028
-SHA256 c9a032ba5cb1c36866810130bfe4d6a084ebbf18518fcd9a92499d48286d3067 lighttpd-1.4.10-r1.ebuild 5028
-EBUILD lighttpd-1.4.10-r2.ebuild 5047 RMD160 c00f5eec6b3135be2cd2d818f24d63b36f0e7ea8 SHA1 25953ec55762821c433cbbe2126e2628f02e4620 SHA256 125ec8b8c913bc78d81c726659fd6dba151b91a44a0519acfde00dcdd38c9e57
 MD5 619f2f526d05f21e61a9d1a93dd194ed lighttpd-1.4.10-r2.ebuild 5047
-RMD160 c00f5eec6b3135be2cd2d818f24d63b36f0e7ea8 lighttpd-1.4.10-r2.ebuild 5047
-SHA256 125ec8b8c913bc78d81c726659fd6dba151b91a44a0519acfde00dcdd38c9e57 lighttpd-1.4.10-r2.ebuild 5047
-EBUILD lighttpd-1.4.11.ebuild 5086 RMD160 ec7d9034251eddd8e22d79f1e76557aede7137ba SHA1 e498711191eab6aba4d757740f37b34e98c7b777 SHA256 6dc771c4b897f4952f3479dbdfad9a37f6a482fe0d30f0cd40e244c3460700ca
-MD5 c699977d157f977885542f4df6b6e06a lighttpd-1.4.11.ebuild 5086
-RMD160 ec7d9034251eddd8e22d79f1e76557aede7137ba lighttpd-1.4.11.ebuild 5086
-SHA256 6dc771c4b897f4952f3479dbdfad9a37f6a482fe0d30f0cd40e244c3460700ca lighttpd-1.4.11.ebuild 5086
-EBUILD lighttpd-1.4.7.ebuild 5153 RMD160 605b1403f4d5f6fe1ce708837a81a0a890a79aeb SHA1 8dc6c9b40b0199421e36b5ca49c4ed0cd2c8b4c4 SHA256 e6a228737feaca20eefa06f147d59cea5f9935f54790af3dfe7d09a4264cfdac
+MD5 778d1ba0e24be3791d6c052d9d322956 lighttpd-1.4.11.ebuild 5208
 MD5 409c3573899a53281837a5bcb1bb1813 lighttpd-1.4.7.ebuild 5153
-RMD160 605b1403f4d5f6fe1ce708837a81a0a890a79aeb lighttpd-1.4.7.ebuild 5153
-SHA256 e6a228737feaca20eefa06f147d59cea5f9935f54790af3dfe7d09a4264cfdac lighttpd-1.4.7.ebuild 5153
-EBUILD lighttpd-1.4.8.ebuild 5156 RMD160 f7e4ed3b381a4494ecd844e561d4ddc2fb275c7e SHA1 779cc05dc364afd9154e726661fff2bfabaf6cd4 SHA256 d75a6587feed84950ac6e5ac77d0d4f257c48ac189c505bbfa3a9c7cb3e0081b
 MD5 9a318d179b54cb88bd1c8ac45a1e643b lighttpd-1.4.8.ebuild 5156
-RMD160 f7e4ed3b381a4494ecd844e561d4ddc2fb275c7e lighttpd-1.4.8.ebuild 5156
-SHA256 d75a6587feed84950ac6e5ac77d0d4f257c48ac189c505bbfa3a9c7cb3e0081b lighttpd-1.4.8.ebuild 5156
-MISC ChangeLog 21284 RMD160 1ddd163d8a93d8ad9dd0e8d530a176a1d1c75529 SHA1 5725a4ab8253ff44316ae50651cac8c127b9162e SHA256 0811d47f3fd388dbde9611ab70d86492915169b4787253c3a8198ca7124eed64
-MD5 adf7f11d36b3755006f2e48178778812 ChangeLog 21284
-RMD160 1ddd163d8a93d8ad9dd0e8d530a176a1d1c75529 ChangeLog 21284
-SHA256 0811d47f3fd388dbde9611ab70d86492915169b4787253c3a8198ca7124eed64 ChangeLog 21284
-MISC metadata.xml 726 RMD160 a4e58899dbe2a328fe699a564a67666809b385fc SHA1 1d02ea35425790ffcdcfb83813123af4c50be5d8 SHA256 c99edd41b36c5354a29c2fa2e37fccd83568d306d1531f0ce7bbaebf703f2a56
 MD5 6a9d4814404d8d51327e5b8306ee3d7e metadata.xml 726
-RMD160 a4e58899dbe2a328fe699a564a67666809b385fc metadata.xml 726
-SHA256 c99edd41b36c5354a29c2fa2e37fccd83568d306d1531f0ce7bbaebf703f2a56 metadata.xml 726
-MD5 16c832beb1879cbc2cc6814d1a2786a1 files/digest-lighttpd-1.3.13-r3 247
-RMD160 265939f5e40f16a2e7d54416ea77b423dce564e7 files/digest-lighttpd-1.3.13-r3 247
-SHA256 90d4b6fea5c4135a980905810bd433bc594cf342d074fa59cbafe910ff8dccef files/digest-lighttpd-1.3.13-r3 247
-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 03f615e79bba7ff75a6ba9a3e486fec4 files/digest-lighttpd-1.4.10-r1 247
-RMD160 29eb75dc48a62eaaebe7eaa6552e779f19386b1f files/digest-lighttpd-1.4.10-r1 247
-SHA256 47939db370d7f1354b68c111141c58e6ee843de062b94a53b2898e2f2824415a files/digest-lighttpd-1.4.10-r1 247
-MD5 03f615e79bba7ff75a6ba9a3e486fec4 files/digest-lighttpd-1.4.10-r2 247
-RMD160 29eb75dc48a62eaaebe7eaa6552e779f19386b1f files/digest-lighttpd-1.4.10-r2 247
-SHA256 47939db370d7f1354b68c111141c58e6ee843de062b94a53b2898e2f2824415a files/digest-lighttpd-1.4.10-r2 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 485267c1ac751168ebdd83d45237cfa7 files/digest-lighttpd-1.4.7 244
-RMD160 d4724987691a1932e72fcde598bc07572f2d3062 files/digest-lighttpd-1.4.7 244
-SHA256 3be8309f81c257309efc4e6b2fce741cad8b6e4a4871b8a314d5d9bdbe661c57 files/digest-lighttpd-1.4.7 244
-MD5 07e5b40d581e4881f7e8fbb6277b4ad3 files/digest-lighttpd-1.4.8 244
-RMD160 a3bb226209fad4615bd999bcc4b443b36c3a6bf7 files/digest-lighttpd-1.4.8 244
-SHA256 c47016ee385d1a94c3bcad00b949430691d4506bd013361f39c686774580b536 files/digest-lighttpd-1.4.8 244
diff --git a/www-servers/lighttpd/files/1.4.11/01_r1046.diff_mod_compress.c-fixes.diff b/www-servers/lighttpd/files/1.4.11/01_all_r1046.mod_compress.c-fixes.diff
index fdb419913939..fdb419913939 100644
--- a/www-servers/lighttpd/files/1.4.11/01_r1046.diff_mod_compress.c-fixes.diff
+++ b/www-servers/lighttpd/files/1.4.11/01_all_r1046.mod_compress.c-fixes.diff
diff --git a/www-servers/lighttpd/files/1.4.11/02_r1057_fix_If-Modified-Since-ETag.diff b/www-servers/lighttpd/files/1.4.11/02_all_r1057_fix_If-Modified-Since-ETag.diff
index b1fc8340fcba..b1fc8340fcba 100644
--- a/www-servers/lighttpd/files/1.4.11/02_r1057_fix_If-Modified-Since-ETag.diff
+++ b/www-servers/lighttpd/files/1.4.11/02_all_r1057_fix_If-Modified-Since-ETag.diff
diff --git a/www-servers/lighttpd/files/1.4.11/03_r1095_fix_stalling_SSL_POST_requests.diff b/www-servers/lighttpd/files/1.4.11/03_all_r1095_fix_stalling_SSL_POST_requests.diff
index 672dc950b9bc..672dc950b9bc 100644
--- a/www-servers/lighttpd/files/1.4.11/03_r1095_fix_stalling_SSL_POST_requests.diff
+++ b/www-servers/lighttpd/files/1.4.11/03_all_r1095_fix_stalling_SSL_POST_requests.diff
diff --git a/www-servers/lighttpd/files/1.4.11/04_r1116_fix_env_conf_segfault.diff b/www-servers/lighttpd/files/1.4.11/04_r1116_fix_env_conf_segfault.diff
deleted file mode 100644
index f79a1d10b5e9..000000000000
--- a/www-servers/lighttpd/files/1.4.11/04_r1116_fix_env_conf_segfault.diff
+++ /dev/null
@@ -1,8 +0,0 @@
---- branches/lighttpd-merge-1.4.x/src/configparser.y (revision 1078)
-+++ branches/lighttpd-merge-1.4.x/src/configparser.y (revision 1116)
-@@ -241,4 +241,5 @@
-     }
-     else {
-+      A = NULL;
-       fprintf(stderr, "Undefined env variable: %s\n", B->ptr + 4);
-       ctx->ok = 0;
diff --git a/www-servers/lighttpd/files/1.4.11/21_mod_scgi_segfault.diff b/www-servers/lighttpd/files/1.4.11/21_all_mod_scgi_segfault.diff
index 6455c569231c..6455c569231c 100644
--- a/www-servers/lighttpd/files/1.4.11/21_mod_scgi_segfault.diff
+++ b/www-servers/lighttpd/files/1.4.11/21_all_mod_scgi_segfault.diff
diff --git a/www-servers/lighttpd/files/1.4.11/22_bug606_fix_SSI_echo.diff b/www-servers/lighttpd/files/1.4.11/22_all_bug606_fix_SSI_echo.diff
index 6af338d91dd9..6af338d91dd9 100644
--- a/www-servers/lighttpd/files/1.4.11/22_bug606_fix_SSI_echo.diff
+++ b/www-servers/lighttpd/files/1.4.11/22_all_bug606_fix_SSI_echo.diff
diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.4.11 b/www-servers/lighttpd/files/digest-lighttpd-1.4.11
index 313e29e22093..f33ab3decf32 100644
--- a/www-servers/lighttpd/files/digest-lighttpd-1.4.11
+++ b/www-servers/lighttpd/files/digest-lighttpd-1.4.11
@@ -1,3 +1 @@
 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/lighttpd.initd b/www-servers/lighttpd/files/lighttpd.initd
index 81420e4460ac..201fc85f1eb4 100644
--- a/www-servers/lighttpd/files/lighttpd.initd
+++ b/www-servers/lighttpd/files/lighttpd.initd
@@ -1,7 +1,7 @@
 #!/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,v 1.8 2006/05/30 19:49:29 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/lighttpd.initd,v 1.9 2006/06/01 21:56:36 bangert Exp $
 
 opts="depend checkconfig start stop reload"
 
@@ -10,7 +10,8 @@ LIGHTTPD_PID="/var/run/lighttpd.pid"
 
 depend() {
 	need net
-	use mysql logger spawn-fcgi ldap famd slapd
+	use mysql logger spawn-fcgi ldap slapd
+	after famd
 	after sshd
 }
 
diff --git a/www-servers/lighttpd/lighttpd-1.4.11.ebuild b/www-servers/lighttpd/lighttpd-1.4.11.ebuild
index 9b46f07621bf..7e481d4878b7 100644
--- a/www-servers/lighttpd/lighttpd-1.4.11.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.3 2006/06/01 01:16:24 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.11.ebuild,v 1.4 2006/06/01 21:56:36 bangert Exp $
 
 inherit eutils autotools depend.php
 
@@ -15,7 +15,7 @@ IUSE="bzip2 doc fam fastcgi gdbm ipv6 ldap lua minimal memcache mysql pcre php r
 
 RDEPEND=">=sys-libs/zlib-1.1
 	bzip2?    ( app-arch/bzip2 )
-	fam?      ( app-admin/gamin )
+	fam?      ( virtual/fam )
 	gdbm?     ( sys-libs/gdbm )
 	ldap?     ( >=net-nds/openldap-2.1.26 )
 	lua?      ( dev-lang/lua )
@@ -35,6 +35,7 @@ RDEPEND=">=sys-libs/zlib-1.1
 	xattr? ( kernel_linux? ( sys-apps/attr ) )"
 
 DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
 	doc?  ( dev-python/docutils )
 	test? (
 		virtual/perl-Test-Harness
@@ -142,6 +143,8 @@ src_install() {
 
 	# init script stuff
 	newinitd ${FILESDIR}/lighttpd.initd 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