punt old / vulnerable / experimental versions

(Portage version: 2.0.54-r2)

29 files changed, 25 insertions, 1587 deletions

diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index e9ce4058b773..c17d8992d6c1 100644
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,29 @@
 # 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.74 2006/06/01 21:56:36 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.75 2006/06/03 12:33:17 bangert Exp $
+
+  03 Jun 2006; Thilo Bangert <bangert@gentoo.org>
+  -files/1.4.10/05_all_r996_fallback_to_madvise.diff,
+  -files/lighttpd-1.3.13-pam-name.diff,
+  -files/1.4.10/06_all_r997_fastcgi_fixes.diff,
+  -files/lighttpd-1.3.13-valid-user.diff,
+  -files/1.4.10/07_all_r998_sendfile_fixes.diff,
+  -files/1.4.10/01_all_r990_mod_cgi_dont_reset_physical_path.diff,
+  -files/1.4.10/08_all_r999_mod_cgi_terminate.diff,
+  -files/1.4.10/03_all_r992_posix_fadvise_2.4.x.diff,
+  -files/1.4.10/09_all_r1000_sendfile_compile_fix.diff,
+  -files/lighttpd-1.3.13-zope-deserves-lovins-too.diff,
+  -files/1.4.10/10_all_r1001_mod_auth_errormsg_fix.diff,
+  -files/1.4.10/11_all_r1002_var_and_env_docs.diff,
+  -files/1.4.10/02_all_r991_posix_fadvise.diff,
+  -files/1.4.10/04_all_r994_remove_xopen_and_bsd_source_defines.diff,
+  -files/1.4.10/12_all_r1003_mod_fastcgi_doc_fix.diff,
+  -files/1.4.10/13_all_r1006_mod_cgi_close_unused_pipe_fds.diff,
+  -files/1.4.10/14_all_r1007_mod_alias_lowercase_support.diff,
+  -lighttpd-1.3.13-r3.ebuild, -lighttpd-1.4.7.ebuild,
+  -lighttpd-1.4.8.ebuild, -lighttpd-1.4.10-r1.ebuild,
+  -lighttpd-1.4.10-r2.ebuild:
+  punt old / vulnerable / experimental versions
 
 *lighttpd-1.4.11-r1 (01 Jun 2006)
 
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 970d73341b55..e35723a631b9 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1,18 +1,4 @@
-MD5 7e06a685a62170ea9ab4cfdeb5b020f0 ChangeLog 22155
-MD5 24669453e8f69faf4212dfa43e90e3dd files/1.4.10/01_all_r990_mod_cgi_dont_reset_physical_path.diff 517
-MD5 8c00894c801011ca682400a243aa49cb files/1.4.10/02_all_r991_posix_fadvise.diff 805
-MD5 f9b6a2f0c377777945de48d3e7bdda40 files/1.4.10/03_all_r992_posix_fadvise_2.4.x.diff 638
-MD5 1ce159021271dc6c03e84e21032d15c9 files/1.4.10/04_all_r994_remove_xopen_and_bsd_source_defines.diff 624
-MD5 ef9e93d6cc81bf924c310a13ad50b502 files/1.4.10/05_all_r996_fallback_to_madvise.diff 908
-MD5 7560c24162dd46b8230920a083e9f0f6 files/1.4.10/06_all_r997_fastcgi_fixes.diff 1951
-MD5 120f0a70f526ae2194d51230616e1f25 files/1.4.10/07_all_r998_sendfile_fixes.diff 1833
-MD5 b415f237f75a8ccb090c9c574ede05fd files/1.4.10/08_all_r999_mod_cgi_terminate.diff 503
-MD5 335e847b375359b7fbc01bfbeddcdd87 files/1.4.10/09_all_r1000_sendfile_compile_fix.diff 528
-MD5 c41a7ca766ed3228360da359d913d137 files/1.4.10/10_all_r1001_mod_auth_errormsg_fix.diff 3305
-MD5 1df4960f248d3a9bdf8c0df9e870cf83 files/1.4.10/11_all_r1002_var_and_env_docs.diff 1389
-MD5 35434778a8946f35db7f1de508e9d671 files/1.4.10/12_all_r1003_mod_fastcgi_doc_fix.diff 543
-MD5 3ee9e11b239661b01e45c56381c49d7d files/1.4.10/13_all_r1006_mod_cgi_close_unused_pipe_fds.diff 1987
-MD5 81e540213c5ca381e6b82e51571c6874 files/1.4.10/14_all_r1007_mod_alias_lowercase_support.diff 695
+MD5 bdedd34cde16db24dba69c59458e24cb ChangeLog 23320
 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
@@ -22,30 +8,17 @@ MD5 df5b2360ea380d988bf16905ab214286 files/conf/lighttpd.conf 8182
 MD5 fef397e7bcf1b741dea211a555e1803c files/conf/mime-types.conf 3291
 MD5 9c1407e95f62ed22da66c4ef5f69c3b5 files/conf/mod_cgi.conf 869
 MD5 b4c80dba9c626d5f89d3c3797ac6670c files/conf/mod_fastcgi.conf 661
-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
 MD5 8648177a5f9a79cd4ba0eaaa4e769fdc files/lighttpd-1.3.11-gentoo.diff 1784
 MD5 f984dc26b2bc491272d302ab453f6e6b files/lighttpd-1.3.13-ldap-binddn.diff 3863
 MD5 0c57eeef1963af5add8b9608e0bc0d0f files/lighttpd-1.3.13-no-mysql-means-no-mysql.diff 1456
-MD5 44374d14af9b69b8f60f8d73f14c848d files/lighttpd-1.3.13-pam-name.diff 564
 MD5 f111e60bb593bffbdb01b9aece46ab20 files/lighttpd-1.3.13-php.diff 1399
-MD5 9cc5ffbffdd7554797c338c5972ed813 files/lighttpd-1.3.13-valid-user.diff 762
-MD5 5eb378dcd8905a09175df3e48953100c files/lighttpd-1.3.13-zope-deserves-lovins-too.diff 5970
 MD5 795944f04932a980650397d21a4264f9 files/lighttpd.initd 1232
 MD5 ad091c9157134890499f26d170352c9f files/lighttpd.logrotate 487
 MD5 1d925aed297ec4541fb230dd19e11bc1 files/spawn-fcgi.confd 1076
 MD5 e605a4ead0ce7b1e0788c0b0b1161871 files/spawn-fcgi.initd 1383
-MD5 f18029dea31126d04d7287f80610b2ca lighttpd-1.3.13-r3.ebuild 2649
 MD5 0df89754aec138ad20821ef93c45833b lighttpd-1.3.16.ebuild 2589
-MD5 051c33f9eaa96575c4e85ff92ee8b149 lighttpd-1.4.10-r1.ebuild 5028
-MD5 619f2f526d05f21e61a9d1a93dd194ed lighttpd-1.4.10-r2.ebuild 5047
 MD5 778d1ba0e24be3791d6c052d9d322956 lighttpd-1.4.11.ebuild 5208
-MD5 409c3573899a53281837a5bcb1bb1813 lighttpd-1.4.7.ebuild 5153
-MD5 9a318d179b54cb88bd1c8ac45a1e643b lighttpd-1.4.8.ebuild 5156
 MD5 6a9d4814404d8d51327e5b8306ee3d7e metadata.xml 726
diff --git a/www-servers/lighttpd/files/1.4.10/01_all_r990_mod_cgi_dont_reset_physical_path.diff b/www-servers/lighttpd/files/1.4.10/01_all_r990_mod_cgi_dont_reset_physical_path.diff
deleted file mode 100644
index 4a704d1f7067..000000000000
--- a/www-servers/lighttpd/files/1.4.10/01_all_r990_mod_cgi_dont_reset_physical_path.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Modified: branches/lighttpd-merge-1.4.x/src/mod_fastcgi.c
-===================================================================
---- branches/lighttpd-merge-1.4.x/src/mod_fastcgi.c	2006-02-08 13:40:25 UTC (rev 989)
-+++ branches/lighttpd-merge-1.4.x/src/mod_fastcgi.c	2006-02-08 23:10:03 UTC (rev 990)
-@@ -3425,9 +3425,7 @@
- 
- 	fn = uri_path_handler ? con->uri.path : con->physical.path;
- 
--	if (fn->used == 0) {
--		return HANDLER_ERROR;
--	}
-+	if (buffer_is_empty(fn)) return HANDLER_GO_ON;
- 	
- 	s_len = fn->used - 1;
- 	
diff --git a/www-servers/lighttpd/files/1.4.10/02_all_r991_posix_fadvise.diff b/www-servers/lighttpd/files/1.4.10/02_all_r991_posix_fadvise.diff
deleted file mode 100644
index c0b4c5b6be5c..000000000000
--- a/www-servers/lighttpd/files/1.4.10/02_all_r991_posix_fadvise.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Modified: branches/lighttpd-merge-1.4.x/src/network_linux_sendfile.c
-===================================================================
---- branches/lighttpd-merge-1.4.x/src/network_linux_sendfile.c	2006-02-08 23:10:03 UTC (rev 990)
-+++ branches/lighttpd-merge-1.4.x/src/network_linux_sendfile.c	2006-02-09 14:37:48 UTC (rev 991)
-@@ -159,8 +159,10 @@
- #ifdef HAVE_POSIX_FADVISE
- 				/* tell the kernel that we want to stream the file */
- 				if (-1 == posix_fadvise(c->file.fd, 0, 0, POSIX_FADV_SEQUENTIAL)) {
--					log_error_write(srv, __FILE__, __LINE__, "ssd", 
--						"posix_fadvise failed:", strerror(errno), c->file.fd);
-+					if (ENOSYS != errno) {
-+						log_error_write(srv, __FILE__, __LINE__, "ssd", 
-+							"posix_fadvise failed:", strerror(errno), c->file.fd);
-+					}
- 				}
- #endif
- 			}
diff --git a/www-servers/lighttpd/files/1.4.10/03_all_r992_posix_fadvise_2.4.x.diff b/www-servers/lighttpd/files/1.4.10/03_all_r992_posix_fadvise_2.4.x.diff
deleted file mode 100644
index 66474c3df269..000000000000
--- a/www-servers/lighttpd/files/1.4.10/03_all_r992_posix_fadvise_2.4.x.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Modified: branches/lighttpd-merge-1.4.x/src/network_linux_sendfile.c
-===================================================================
---- branches/lighttpd-merge-1.4.x/src/network_linux_sendfile.c	2006-02-09 14:37:48 UTC (rev 991)
-+++ branches/lighttpd-merge-1.4.x/src/network_linux_sendfile.c	2006-02-13 19:22:00 UTC (rev 992)
-@@ -23,6 +23,9 @@
- #include "log.h"
- #include "stat_cache.h"
- 
-+/* on linux 2.4.29 + debian/ubuntu we have crashes if this is enabled */
-+#undef HAVE_POSIX_FADVISE
-+
- int network_write_chunkqueue_linuxsendfile(server *srv, connection *con, int fd, chunkqueue *cq) {
- 	chunk *c;
- 	size_t chunks_written = 0;
diff --git a/www-servers/lighttpd/files/1.4.10/04_all_r994_remove_xopen_and_bsd_source_defines.diff b/www-servers/lighttpd/files/1.4.10/04_all_r994_remove_xopen_and_bsd_source_defines.diff
deleted file mode 100644
index 91716734aba8..000000000000
--- a/www-servers/lighttpd/files/1.4.10/04_all_r994_remove_xopen_and_bsd_source_defines.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Modified: branches/lighttpd-merge-1.4.x/configure.in
-===================================================================
---- branches/lighttpd-merge-1.4.x/configure.in	2006-02-14 16:09:23 UTC (rev 993)
-+++ branches/lighttpd-merge-1.4.x/configure.in	2006-02-14 16:10:14 UTC (rev 994)
-@@ -439,9 +439,6 @@
-         * ) ;;
- esac
- 
--dnl posix_* needs _XOPEN_SOURCE=600
--CFLAGS="${CFLAGS} -D_XOPEN_SOURCE=600 -D_BSD_SOURCE"
--
- AC_CHECK_FUNCS([dup2 getcwd inet_ntoa inet_ntop memset mmap munmap strchr \
- 		  strdup strerror strstr strtol sendfile  getopt socket \
- 		  gethostbyname poll sigtimedwait epoll_ctl getrlimit chroot \
diff --git a/www-servers/lighttpd/files/1.4.10/05_all_r996_fallback_to_madvise.diff b/www-servers/lighttpd/files/1.4.10/05_all_r996_fallback_to_madvise.diff
deleted file mode 100644
index de347aa6e2e7..000000000000
--- a/www-servers/lighttpd/files/1.4.10/05_all_r996_fallback_to_madvise.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-Modified: branches/lighttpd-merge-1.4.x/src/network_writev.c
-===================================================================
---- branches/lighttpd-merge-1.4.x/src/network_writev.c	2006-02-14 16:10:54 UTC (rev 995)
-+++ branches/lighttpd-merge-1.4.x/src/network_writev.c	2006-02-14 23:49:38 UTC (rev 996)
-@@ -255,14 +255,14 @@
- #ifdef LOCAL_BUFFERING
- 				buffer_copy_string_len(c->mem, c->file.mmap.start, c->file.mmap.length);
- #else
--#ifdef HAVE_POSIX_MADVISE
-+#ifdef HAVE_MADVISE
- 				/* don't advise files < 64Kb */
- 				if (c->file.mmap.length > (64 KByte)) {
- 					/* darwin 7 is returning EINVAL all the time and I don't know how to 
- 					 * detect this at runtime.i
- 					 *
- 					 * ignore the return value for now */
--					posix_madvise(c->file.mmap.start, c->file.mmap.length, POSIX_MADV_WILLNEED);
-+					madvise(c->file.mmap.start, c->file.mmap.length, MADV_WILLNEED);
- 				}
- #endif
- #endif
diff --git a/www-servers/lighttpd/files/1.4.10/06_all_r997_fastcgi_fixes.diff b/www-servers/lighttpd/files/1.4.10/06_all_r997_fastcgi_fixes.diff
deleted file mode 100644
index 9031600ba5cc..000000000000
--- a/www-servers/lighttpd/files/1.4.10/06_all_r997_fastcgi_fixes.diff
+++ /dev/null
@@ -1,71 +0,0 @@
-Modified: branches/lighttpd-merge-1.4.x/src/mod_fastcgi.c
-===================================================================
---- branches/lighttpd-merge-1.4.x/src/mod_fastcgi.c	2006-02-14 23:49:38 UTC (rev 996)
-+++ branches/lighttpd-merge-1.4.x/src/mod_fastcgi.c	2006-02-14 23:51:52 UTC (rev 997)
-@@ -406,8 +406,10 @@
- int fastcgi_status_copy_procname(buffer *b, fcgi_extension_host *host, fcgi_proc *proc) {
- 	buffer_copy_string(b, "fastcgi.backend.");
- 	buffer_append_string_buffer(b, host->id);
--	buffer_append_string(b, ".");
--	buffer_append_long(b, proc->id);
-+	if (proc) {
-+		buffer_append_string(b, ".");
-+		buffer_append_long(b, proc->id);
-+	}
- 
- 	return 0;
- }
-@@ -426,6 +428,15 @@
- 
- #undef CLEAN	
- 
-+#define CLEAN(x) \
-+	fastcgi_status_copy_procname(b, host, NULL); \
-+	buffer_append_string(b, x); \
-+	status_counter_set(srv, CONST_BUF_LEN(b), 0);
-+
-+	CLEAN(".load");
-+
-+#undef CLEAN	
-+
- 	return 0;
- }
- 
-@@ -872,7 +883,8 @@
- 		pid_t child;
- 		int val;
- 		
--		if (!buffer_is_empty(proc->socket)) {
-+		if (errno != ENOENT && 
-+		    !buffer_is_empty(proc->socket)) {
- 			unlink(proc->socket->ptr);
- 		}
- 		
-@@ -1535,7 +1547,7 @@
- 				hctx->proc->pid, hctx->proc->socket);
- 	}
- 
--	if (hctx->proc) {	
-+	if (hctx->proc && hctx->got_proc) {	
- 		hctx->proc->load--;
- 		fcgi_proclist_sort_down(srv, hctx->host, hctx->proc);
- 	}
-@@ -2919,11 +2931,18 @@
- 
- 		status_counter_inc(srv, CONST_BUF_LEN(p->statuskey));
- 
-+		/* the proc-load */
- 		fastcgi_status_copy_procname(p->statuskey, hctx->host, hctx->proc);
- 		buffer_append_string(p->statuskey, ".load");
- 
- 		status_counter_set(srv, CONST_BUF_LEN(p->statuskey), hctx->proc->load);
- 
-+		/* the host-load */
-+		fastcgi_status_copy_procname(p->statuskey, hctx->host, NULL);
-+		buffer_append_string(p->statuskey, ".load");
-+
-+		status_counter_set(srv, CONST_BUF_LEN(p->statuskey), hctx->host->load);
-+
- 		if (p->conf.debug) {
- 			log_error_write(srv, __FILE__, __LINE__, "sddbdd",
- 					"got proc:", 
diff --git a/www-servers/lighttpd/files/1.4.10/07_all_r998_sendfile_fixes.diff b/www-servers/lighttpd/files/1.4.10/07_all_r998_sendfile_fixes.diff
deleted file mode 100644
index 625fd8e331c8..000000000000
--- a/www-servers/lighttpd/files/1.4.10/07_all_r998_sendfile_fixes.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN lighttpd-1.4.10.orig/src/network_linux_sendfile.c lighttpd-1.4.10/src/network_linux_sendfile.c
---- lighttpd-1.4.10.orig/src/network_linux_sendfile.c	2006-02-25 01:07:01.000000000 -0500
-+++ lighttpd-1.4.10/src/network_linux_sendfile.c	2006-02-25 01:08:55.000000000 -0500
-@@ -132,23 +132,11 @@
- 			size_t toSend;
- 			stat_cache_entry *sce = NULL;
- 			
--			if (HANDLER_ERROR == stat_cache_get_entry(srv, con, c->file.name, &sce)) {
--				log_error_write(srv, __FILE__, __LINE__, "sb",
--						strerror(errno), c->file.name);
--				return -1;
--			}
--			
- 			offset = c->file.start + c->offset;
- 			/* limit the toSend to 2^31-1 bytes in a chunk */
- 			toSend = c->file.length - c->offset > ((1 << 30) - 1) ? 
- 				((1 << 30) - 1) : c->file.length - c->offset;
- 				
--			if (offset > sce->st.st_size) {
--				log_error_write(srv, __FILE__, __LINE__, "sb", "file was shrinked:", c->file.name);
--				
--				return -1;
--			}
--		
- 			/* open file if not already opened */	
- 			if (-1 == c->file.fd) {
- 				if (-1 == (c->file.fd = open(c->file.name->ptr, O_RDONLY))) {
-@@ -170,8 +158,6 @@
- #endif
- 			}
- 
--			
--			/* Linux sendfile() */
- 			if (-1 == (r = sendfile(fd, c->file.fd, &offset, toSend))) {
- 				switch (errno) {
- 				case EAGAIN:
-@@ -189,7 +175,21 @@
- 			}
- 
- 			if (r == 0) {
--				/* we got a event to write put we couldn't. remote side closed ? */
-+				/* We got an event to write but we wrote nothing
-+				 *
-+				 * - the file shrinked -> error
-+				 * - the remote side closed inbetween -> remote-close */
-+	
-+				if (HANDLER_ERROR == stat_cache_get_entry(srv, con, c->file.name, &sce)) {
-+					/* file is gone ? */
-+					return -1;
-+				}
-+
-+				if (abs_offset > sce->st.st_size) {
-+					/* file shrinked, close the connection */
-+					return -1;
-+				}
-+
- 				return -2;
- 			}
- 
diff --git a/www-servers/lighttpd/files/1.4.10/08_all_r999_mod_cgi_terminate.diff b/www-servers/lighttpd/files/1.4.10/08_all_r999_mod_cgi_terminate.diff
deleted file mode 100644
index efd42dbe7f70..000000000000
--- a/www-servers/lighttpd/files/1.4.10/08_all_r999_mod_cgi_terminate.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Modified: branches/lighttpd-merge-1.4.x/src/mod_cgi.c
-===================================================================
---- branches/lighttpd-merge-1.4.x/src/mod_cgi.c	2006-02-15 10:46:17 UTC (rev 998)
-+++ branches/lighttpd-merge-1.4.x/src/mod_cgi.c	2006-02-15 15:19:10 UTC (rev 999)
-@@ -1128,7 +1128,7 @@
- 	plugin_data *p = p_d;
- 	buffer *fn = con->physical.path;
- 	
--	if (fn->used == 0) return HANDLER_ERROR;
-+	if (fn->used == 0) return HANDLER_GO_ON;
- 	
- 	mod_cgi_patch_connection(srv, con, p);
- 	
diff --git a/www-servers/lighttpd/files/1.4.10/09_all_r1000_sendfile_compile_fix.diff b/www-servers/lighttpd/files/1.4.10/09_all_r1000_sendfile_compile_fix.diff
deleted file mode 100644
index c4437947aa8f..000000000000
--- a/www-servers/lighttpd/files/1.4.10/09_all_r1000_sendfile_compile_fix.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Modified: branches/lighttpd-merge-1.4.x/src/network_linux_sendfile.c
-===================================================================
---- branches/lighttpd-merge-1.4.x/src/network_linux_sendfile.c	2006-02-15 15:19:10 UTC (rev 999)
-+++ branches/lighttpd-merge-1.4.x/src/network_linux_sendfile.c	2006-02-15 18:09:01 UTC (rev 1000)
-@@ -185,7 +185,7 @@
- 					return -1;
- 				}
- 
--				if (abs_offset > sce->st.st_size) {
-+				if (offset > sce->st.st_size) {
- 					/* file shrinked, close the connection */
- 					return -1;
- 				}
diff --git a/www-servers/lighttpd/files/1.4.10/10_all_r1001_mod_auth_errormsg_fix.diff b/www-servers/lighttpd/files/1.4.10/10_all_r1001_mod_auth_errormsg_fix.diff
deleted file mode 100644
index 5a129519830c..000000000000
--- a/www-servers/lighttpd/files/1.4.10/10_all_r1001_mod_auth_errormsg_fix.diff
+++ /dev/null
@@ -1,75 +0,0 @@
-Modified: branches/lighttpd-merge-1.4.x/src/mod_auth.c
-===================================================================
---- branches/lighttpd-merge-1.4.x/src/mod_auth.c	2006-02-15 18:09:01 UTC (rev 1000)
-+++ branches/lighttpd-merge-1.4.x/src/mod_auth.c	2006-02-15 18:10:05 UTC (rev 1001)
-@@ -399,9 +399,10 @@
- 			const char *method, *realm, *require;
- 			
- 			if (da->value->data[n]->type != TYPE_ARRAY) {
--				log_error_write(srv, __FILE__, __LINE__, "sssbs", 
--						"unexpected type for key: ", "auth.require", "[", da->value->data[n]->key, "](string)");
--				
-+				log_error_write(srv, __FILE__, __LINE__, "ss", 
-+						"auth.require should contain an array as in:", 
-+						"auth.require = ( \"...\" => ( ..., ...) )");
-+
- 				return HANDLER_ERROR;
- 			}
- 					
-@@ -416,34 +417,51 @@
- 					} else if (0 == strcmp(da_file->value->data[m]->key->ptr, "require")) {
- 						require = ((data_string *)(da_file->value->data[m]))->value->ptr;
- 					} else {
--						log_error_write(srv, __FILE__, __LINE__, "sssbs", "unexpected type for key: ", "auth.require", "[", da_file->value->data[m]->key, "](string)");
-+						log_error_write(srv, __FILE__, __LINE__, "ssbs", 
-+							"the field is unknown in:", 
-+							"auth.require = ( \"...\" => ( ..., -> \"",
-+							da_file->value->data[m]->key,
-+							"\" <- => \"...\" ) )");
-+
- 						return HANDLER_ERROR;
- 					}
- 				} else {
--					log_error_write(srv, __FILE__, __LINE__, "sssbs", "unexpected type for key: ", "auth.require", "[", da_file->value->data[m]->key, "](string)");
-+					log_error_write(srv, __FILE__, __LINE__, "ssbs", 
-+						"a string was expected for:", 
-+						"auth.require = ( \"...\" => ( ..., -> \"",
-+						da_file->value->data[m]->key,
-+						"\" <- => \"...\" ) )");
- 					
- 					return HANDLER_ERROR;
- 				}
- 			}
- 					
- 			if (method == NULL) {
--				log_error_write(srv, __FILE__, __LINE__, "sssss", "missing entry for key: ", "auth.require", "[", "method", "](string)");
-+				log_error_write(srv, __FILE__, __LINE__, "ss", 
-+						"the require field is missing in:", 
-+						"auth.require = ( \"...\" => ( ..., \"method\" => \"...\" ) )");
- 				return HANDLER_ERROR;
- 			} else {
- 				if (0 != strcmp(method, "basic") &&
- 				    0 != strcmp(method, "digest")) {
--					log_error_write(srv, __FILE__, __LINE__, "s", "auth.require->method has to be either 'basic' or 'digest'");
-+					log_error_write(srv, __FILE__, __LINE__, "ss",
-+							"method has to be either \"basic\" or \"digest\" in",
-+							"auth.require = ( \"...\" => ( ..., \"method\" => \"...\") )");
- 					return HANDLER_ERROR;
- 				}
- 			}
- 			
- 			if (realm == NULL) {
--				log_error_write(srv, __FILE__, __LINE__, "sssss", "missing entry for key: ", "auth.require", "[", "realm", "](string)");
-+				log_error_write(srv, __FILE__, __LINE__, "ss", 
-+						"the require field is missing in:", 
-+						"auth.require = ( \"...\" => ( ..., \"realm\" => \"...\" ) )");
- 				return HANDLER_ERROR;
- 			}
- 			
- 			if (require == NULL) {
--				log_error_write(srv, __FILE__, __LINE__, "sssss", "missing entry for key: ", "auth.require", "[", "require", "](string)");
-+				log_error_write(srv, __FILE__, __LINE__, "ss", 
-+						"the require field is missing in:", 
-+						"auth.require = ( \"...\" => ( ..., \"require\" => \"...\" ) )");
- 				return HANDLER_ERROR;
- 			}
diff --git a/www-servers/lighttpd/files/1.4.10/11_all_r1002_var_and_env_docs.diff b/www-servers/lighttpd/files/1.4.10/11_all_r1002_var_and_env_docs.diff
deleted file mode 100644
index dba023cf2f49..000000000000
--- a/www-servers/lighttpd/files/1.4.10/11_all_r1002_var_and_env_docs.diff
+++ /dev/null
@@ -1,52 +0,0 @@
-Modified: branches/lighttpd-merge-1.4.x/doc/configuration.txt
-===================================================================
---- branches/lighttpd-merge-1.4.x/doc/configuration.txt	2006-02-15 18:10:05 UTC (rev 1001)
-+++ branches/lighttpd-merge-1.4.x/doc/configuration.txt	2006-02-16 11:17:39 UTC (rev 1002)
-@@ -162,8 +162,46 @@
-     }
-   }  
- 
-+Using variables
-+===============
-+
-+You can set your own variables in the configuration to simplify your config.
-+::
-+
-+  var.basedir = "/home/www/servers/"
-+  $HTTP["host"] == "www.example.org" {
-+     server.name = "www.example.org"
-+     include "incl-base.conf"
-+  }
-+
-+  in incl-base.conf:
-+  server.document-root = basedir + server.name + "/pages/"
-+  accesslog.filename   = basedir + server.name + "/logs/access.log"
-+   
-+You can also use environement variables or the default variables var.PID and
-+var.CWD: ::
-+
-+  var.basedir = env.LIGHTTPDBASE
-+
-+  $HTTP["host"] == "www.example.org" {
-+     server.name = "www.example.org"
-+     include "incl-base.conf"
-+     include "incl-fastcgi.conf"
-+  }
-+
-+  in incl-fastcgi.conf:
-+  fastcgi.server = ( ... => ((
-+     "socket" => basedir + server.name + "/tmp/fastcgi-" + PID + ".sock"
-+  )) )
-+
-+Or like the lighttpd script for rails does:
-+
-+  var.basedir = var.CWD
-+
-+  server.document-root = basedir + "/public/"
-+
- Global context
--=========================
-+==============
- 
- ::
- 
diff --git a/www-servers/lighttpd/files/1.4.10/12_all_r1003_mod_fastcgi_doc_fix.diff b/www-servers/lighttpd/files/1.4.10/12_all_r1003_mod_fastcgi_doc_fix.diff
deleted file mode 100644
index 790716173c06..000000000000
--- a/www-servers/lighttpd/files/1.4.10/12_all_r1003_mod_fastcgi_doc_fix.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Modified: branches/lighttpd-merge-1.4.x/doc/fastcgi.txt
-===================================================================
---- branches/lighttpd-merge-1.4.x/doc/fastcgi.txt	2006-02-16 11:17:39 UTC (rev 1002)
-+++ branches/lighttpd-merge-1.4.x/doc/fastcgi.txt	2006-02-16 15:04:09 UTC (rev 1003)
-@@ -77,7 +77,7 @@
-   FastCGI module. Currently only 0 and 1 are used. Use 1 to 
-   enable some debug output, 0 to disable it.
- 
--fastcgi.max-extensions 
-+fastcgi.map-extensions 
-   map multiple extensions to the same fastcgi server
- 
-   Example: ::
diff --git a/www-servers/lighttpd/files/1.4.10/13_all_r1006_mod_cgi_close_unused_pipe_fds.diff b/www-servers/lighttpd/files/1.4.10/13_all_r1006_mod_cgi_close_unused_pipe_fds.diff
deleted file mode 100644
index f6f397774b23..000000000000
--- a/www-servers/lighttpd/files/1.4.10/13_all_r1006_mod_cgi_close_unused_pipe_fds.diff
+++ /dev/null
@@ -1,62 +0,0 @@
-Modified: branches/lighttpd-merge-1.4.x/src/mod_cgi.c
-===================================================================
---- branches/lighttpd-merge-1.4.x/src/mod_cgi.c	2006-02-22 12:50:56 UTC (rev 1005)
-+++ branches/lighttpd-merge-1.4.x/src/mod_cgi.c	2006-02-22 13:16:47 UTC (rev 1006)
-@@ -809,8 +809,12 @@
- 			cgi_env_add(&env, CONST_STR_LEN("PATH_INFO"), CONST_BUF_LEN(con->request.pathinfo));
- 		}
- 		cgi_env_add(&env, CONST_STR_LEN("REDIRECT_STATUS"), CONST_STR_LEN("200"));
--		cgi_env_add(&env, CONST_STR_LEN("QUERY_STRING"), CONST_BUF_LEN(con->uri.query));
--		cgi_env_add(&env, CONST_STR_LEN("REQUEST_URI"), CONST_BUF_LEN(con->request.orig_uri));
-+		if (!buffer_is_empty(con->uri.query)) {
-+			cgi_env_add(&env, CONST_STR_LEN("QUERY_STRING"), CONST_BUF_LEN(con->uri.query));
-+		}
-+		if (!buffer_is_empty(con->request.orig_uri)) {
-+			cgi_env_add(&env, CONST_STR_LEN("REQUEST_URI"), CONST_BUF_LEN(con->request.orig_uri));
-+		}
- 		
- 		
- #ifdef HAVE_IPV6
-@@ -967,6 +971,9 @@
- 	default: {
- 		handler_ctx *hctx;
- 		/* father */
-+
-+		close(from_cgi_fds[1]);
-+		close(to_cgi_fds[0]);
- 		
- 		if (con->request.content_length) {
- 			chunkqueue *cq = con->request_content_queue;
-@@ -987,6 +994,8 @@
- 						    -1 == (c->file.fd = open(c->file.name->ptr, O_RDONLY))) {
- 							log_error_write(srv, __FILE__, __LINE__, "ss", "open failed: ", strerror(errno));
- 					
-+							close(from_cgi_fds[0]);
-+							close(to_cgi_fds[1]);
- 							return -1;
- 						}
- 
-@@ -996,6 +1005,8 @@
- 							log_error_write(srv, __FILE__, __LINE__, "ssbd", "mmap failed: ", 
- 									strerror(errno), c->file.name,  c->file.fd);
- 
-+							close(from_cgi_fds[0]);
-+							close(to_cgi_fds[1]);
- 							return -1;
- 						}
- 
-@@ -1043,12 +1054,9 @@
- 				chunkqueue_remove_finished_chunks(cq);
- 			}
- 		}
--		
--		close(from_cgi_fds[1]);
--		
--		close(to_cgi_fds[0]);
-+
- 		close(to_cgi_fds[1]);
--		
-+				
- 		/* register PID and wait for them asyncronously */
- 		con->mode = p->id;
- 		buffer_reset(con->physical.path);
diff --git a/www-servers/lighttpd/files/1.4.10/14_all_r1007_mod_alias_lowercase_support.diff b/www-servers/lighttpd/files/1.4.10/14_all_r1007_mod_alias_lowercase_support.diff
deleted file mode 100644
index c382e1b899f2..000000000000
--- a/www-servers/lighttpd/files/1.4.10/14_all_r1007_mod_alias_lowercase_support.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Modified: branches/lighttpd-merge-1.4.x/src/mod_alias.c
-===================================================================
---- branches/lighttpd-merge-1.4.x/src/mod_alias.c	2006-02-22 13:16:47 UTC (rev 1006)
-+++ branches/lighttpd-merge-1.4.x/src/mod_alias.c	2006-02-24 11:57:26 UTC (rev 1007)
-@@ -166,7 +166,9 @@
- 		if (alias_len > uri_len) continue;
- 		if (ds->key->used == 0) continue;
- 		
--		if (0 == strncmp(uri_ptr, ds->key->ptr, alias_len)) {
-+		if (0 == (con->conf.force_lowercase_filenames ?
-+					strncasecmp(uri_ptr, ds->key->ptr, alias_len) :
-+					strncmp(uri_ptr, ds->key->ptr, alias_len))) {
- 			/* matched */
- 			
- 			buffer_copy_string_buffer(con->physical.basedir, ds->value);
diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.3.13-r3 b/www-servers/lighttpd/files/digest-lighttpd-1.3.13-r3
deleted file mode 100644
index 0d3d9a53d059..000000000000
--- a/www-servers/lighttpd/files/digest-lighttpd-1.3.13-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2f017b936be376ad6f6c2ee26db93467 lighttpd-1.3.13.tar.gz 680068
-RMD160 f70e11933f324447232ef9aaf3d905ba85e47e91 lighttpd-1.3.13.tar.gz 680068
-SHA256 74a93e37cd6c3e9a931dba8fc038e26e1d01c752896233a1bf728a9f6e011c03 lighttpd-1.3.13.tar.gz 680068
diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.4.10-r1 b/www-servers/lighttpd/files/digest-lighttpd-1.4.10-r1
deleted file mode 100644
index a30cb8a2393a..000000000000
--- a/www-servers/lighttpd/files/digest-lighttpd-1.4.10-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 51e42c2cc98a1f9986b9f232ff5a01f2 lighttpd-1.4.10.tar.gz 777853
-RMD160 e7d1eeab33a0cb47eeed7f9499c894fd2aea5445 lighttpd-1.4.10.tar.gz 777853
-SHA256 fdde0c08d3e1883c04ddc97a22916b063b2679f5fcfbda81436ff4e85db18160 lighttpd-1.4.10.tar.gz 777853
diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.4.10-r2 b/www-servers/lighttpd/files/digest-lighttpd-1.4.10-r2
deleted file mode 100644
index a30cb8a2393a..000000000000
--- a/www-servers/lighttpd/files/digest-lighttpd-1.4.10-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 51e42c2cc98a1f9986b9f232ff5a01f2 lighttpd-1.4.10.tar.gz 777853
-RMD160 e7d1eeab33a0cb47eeed7f9499c894fd2aea5445 lighttpd-1.4.10.tar.gz 777853
-SHA256 fdde0c08d3e1883c04ddc97a22916b063b2679f5fcfbda81436ff4e85db18160 lighttpd-1.4.10.tar.gz 777853
diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.4.7 b/www-servers/lighttpd/files/digest-lighttpd-1.4.7
deleted file mode 100644
index bc028499de64..000000000000
--- a/www-servers/lighttpd/files/digest-lighttpd-1.4.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4d1b02e2008e5f35e4df7defee186fdd lighttpd-1.4.7.tar.gz 778982
-RMD160 fdbd3b215845570374bea0533971558c9d113df0 lighttpd-1.4.7.tar.gz 778982
-SHA256 b1d2793d1dc15c6176b3b666e7617f841e06005528223d56d5171a99294df199 lighttpd-1.4.7.tar.gz 778982
diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.4.8 b/www-servers/lighttpd/files/digest-lighttpd-1.4.8
deleted file mode 100644
index 63ecb3a836ec..000000000000
--- a/www-servers/lighttpd/files/digest-lighttpd-1.4.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7d7790ef95ff5755f73bfcda4f13696d lighttpd-1.4.8.tar.gz 769111
-RMD160 3998bbc4565ca3dc59a3be1abaf7a98623dc52ae lighttpd-1.4.8.tar.gz 769111
-SHA256 f3115cb4b9f9805c9a9e7d6cdc97512adaaebde01a84122fcbd1c0ca16bc2d69 lighttpd-1.4.8.tar.gz 769111
diff --git a/www-servers/lighttpd/files/lighttpd-1.3.13-pam-name.diff b/www-servers/lighttpd/files/lighttpd-1.3.13-pam-name.diff
deleted file mode 100644
index e29f15d5b764..000000000000
--- a/www-servers/lighttpd/files/lighttpd-1.3.13-pam-name.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN lighttpd-1.3.13.orig/src/http_auth.c lighttpd-1.3.13/src/http_auth.c
---- lighttpd-1.3.13.orig/src/http_auth.c	2005-06-05 13:54:29.000000000 -0400
-+++ lighttpd-1.3.13/src/http_auth.c	2005-06-05 13:56:20.000000000 -0400
-@@ -457,7 +457,7 @@
- 		pam_handle_t *pamh=NULL;
- 		int retval;
- 		
--		retval = pam_start("login", username->ptr, &conv, &pamh);
-+		retval = pam_start("lighttpd", username->ptr, &conv, &pamh);
- 		
- 		if (retval == PAM_SUCCESS)
- 			retval = pam_authenticate(pamh, 0);    /* is user really user? */
diff --git a/www-servers/lighttpd/files/lighttpd-1.3.13-valid-user.diff b/www-servers/lighttpd/files/lighttpd-1.3.13-valid-user.diff
deleted file mode 100644
index 48ba54535de9..000000000000
--- a/www-servers/lighttpd/files/lighttpd-1.3.13-valid-user.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- lighttpd-1.3.13.orig/src/http_auth.c	2005-06-06 14:10:02.000000000 +0100
-+++ lighttpd-1.3.13/src/http_auth.c	2005-06-06 14:12:52.000000000 +0100
-@@ -313,6 +313,11 @@
- 	req = ((data_array *)(p->conf.auth_require->data[i]))->value;
- 
- 	require = (data_string *)array_get_element(req, "require");
-+
-+	/* valid-user */
-+
-+	if (0 == strcmp(require->value->ptr, "valid-user"))
-+		return 0;
- 	
- 	/* user=name1|group=name3|host=name4 */
- 	
-@@ -339,6 +344,11 @@
- 		}
- 		
- 		/* from r to r + r_len is a rule */
-+
-+		if (0 == strncmp(r, "valid-user", r_len)) {
-+			log_error_write(srv, __FILE__, __LINE__, "s", "valid-user cannot be combined with other require rules");
-+			return -1;
-+		}
- 		
- 		/* search for = in the rules */
- 		if (NULL == (eq = strchr(r, '='))) {
diff --git a/www-servers/lighttpd/files/lighttpd-1.3.13-zope-deserves-lovins-too.diff b/www-servers/lighttpd/files/lighttpd-1.3.13-zope-deserves-lovins-too.diff
deleted file mode 100644
index d09b4e5dad3e..000000000000
--- a/www-servers/lighttpd/files/lighttpd-1.3.13-zope-deserves-lovins-too.diff
+++ /dev/null
@@ -1,169 +0,0 @@
---- src/mod_fastcgi.c	(revision 102)
-+++ src/mod_fastcgi.c	(working copy)
-@@ -329,10 +329,10 @@
- 	int       fd;        /* fd to the fastcgi process */
- 	int       fde_ndx;   /* index into the fd-event buffer */
-
--	size_t    path_info_offset; /* start of path_info in uri.path */
--	
- 	pid_t     pid;
- 	int       got_proc;
-+
-+	buffer   *extension; /* used extension, used for SCRIPT_NAME/PATH_INFO of check-local=0 */
- 	
- 	plugin_config conf;
- 	
-@@ -359,6 +359,7 @@
- 	hctx->response = buffer_init();
- 	hctx->response_header = buffer_init();
- 	hctx->write_buffer = buffer_init();
-+	hctx->extension = buffer_init();
- 	
- 	hctx->request_id = 0;
- 	hctx->state = FCGI_STATE_INIT;
-@@ -379,6 +380,7 @@
- 	buffer_free(hctx->response);
- 	buffer_free(hctx->response_header);
- 	buffer_free(hctx->write_buffer);
-+	buffer_free(hctx->extension);
- 	
- 	if (hctx->rb) {
- 		if (hctx->rb->ptr) free(hctx->rb->ptr);
-@@ -1650,22 +1652,74 @@
- 		 * For AUTHORIZER mode these headers should be omitted.
- 		 */
-
--		fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SCRIPT_NAME"), CONST_BUF_LEN(con->uri.path));
-+		if (host->check_local == 0 && 
-+		    !buffer_is_empty(hctx->extension) &&
-+		    hctx->extension->ptr[0] == '/') {
-+			char *sl;
-+			/* no local check and path-prefix /fcgi_pattern 
-+			 *
-+			 * zope needs this 
-+			 *
-+			 * SCRIPT_NAME => /fcgi_pattern
-+			 * PATH_INFO => uri.path - /fcgi_pattern
-+			 * 
-+			 */
-+
-+			/* search for / in uri.path after /fcgi_pattern
-+			 * 
-+			 * uri.path = /zope/abc
-+			 * 
-+			 * pattern    SCRIPT_NAME     PATH_INFO
-+			 * /zop       /zope           /abc
-+			 * /zope/     /zope           /abc
-+			 * /zope/abc  /zope/abc       (empty)
-+			 * /          /zope/abc       (empty)
-+			 * 
-+			 */
-+			if (hctx->extension->used == 2) {
-+				/* ext is / only */
-+				fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SCRIPT_NAME"), CONST_STR_LEN(""));
-+				fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_INFO"), CONST_BUF_LEN(con->uri.path));
-+
-+			} else if (hctx->extension->ptr[hctx->extension->used - 2] == '/') {
-+				/* last character is a / */
-+
-+				fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SCRIPT_NAME"), con->uri.path->ptr, hctx->extension->used - 2);
-+				if (con->uri.path->used > hctx->extension->used) {
-+					fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_INFO"), 
-+							con->uri.path->ptr + hctx->extension->used - 2, 
-+							con->uri.path->used - hctx->extension->used + 1);
-+				} else {
-+					fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_INFO"), CONST_STR_LEN(""));
-+				}
-+
-+			} else if (NULL != (sl = strchr(con->uri.path->ptr + hctx->extension->used - 1, '/'))) {
-+				/* a trailing slash was found */
-+				fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SCRIPT_NAME"), con->uri.path->ptr, sl - con->uri.path->ptr - 1);
-+				fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_INFO"), sl, strlen(sl));
-+			} else {
-+				fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SCRIPT_NAME"), CONST_BUF_LEN(con->uri.path));
-+				fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_INFO"), CONST_STR_LEN(""));
-+			}
-+
-+		} else {
-+			fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SCRIPT_NAME"), CONST_BUF_LEN(con->uri.path));
- 		
--		if (!buffer_is_empty(con->request.pathinfo)) {
--			fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_INFO"), CONST_BUF_LEN(con->request.pathinfo));
-+			if (!buffer_is_empty(con->request.pathinfo)) {
-+				fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_INFO"), CONST_BUF_LEN(con->request.pathinfo));
-+				
-+				/* PATH_TRANSLATED is only defined if PATH_INFO is set */
- 			
--			/* PATH_TRANSLATED is only defined if PATH_INFO is set */
--			
--			if (!buffer_is_empty(host->docroot)) {
--				buffer_copy_string_buffer(p->path, host->docroot);
-+				if (!buffer_is_empty(host->docroot)) {
-+					buffer_copy_string_buffer(p->path, host->docroot);
-+				} else {
-+					buffer_copy_string_buffer(p->path, con->physical.doc_root);
-+				}
-+				buffer_append_string_buffer(p->path, con->request.pathinfo);
-+				fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_TRANSLATED"), CONST_BUF_LEN(p->path));
- 			} else {
--				buffer_copy_string_buffer(p->path, con->physical.doc_root);
-+				fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_INFO"), CONST_STR_LEN(""));
- 			}
--			buffer_append_string_buffer(p->path, con->request.pathinfo);
--			fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_TRANSLATED"), CONST_BUF_LEN(p->path));
--		} else {
--			fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_INFO"), CONST_STR_LEN(""));
- 		}
- 	}
-
-@@ -2923,7 +2977,6 @@
- 	size_t k, i;
- 	buffer *fn;
- 	fcgi_extension *extension = NULL;
--	size_t path_info_offset;
- 	
- 	/* Possibly, we processed already this request */
- 	if (con->file_started == 1) return HANDLER_GO_ON;
-@@ -2944,8 +2997,6 @@
- 		fcgi_patch_connection(srv, con, p, CONST_BUF_LEN(patch));
- 	}
- 	
--	path_info_offset = 0;
--	
- 	/* check if extension matches */
- 	for (k = 0; k < p->conf.exts->used; k++) {
- 		size_t ct_len;
-@@ -2958,15 +3009,8 @@
- 		
- 		if (s_len < ct_len) continue;
- 		
--		/* check extension in the form "/fcgi_pattern" */
- 		if (*(extension->key->ptr) == '/' && strncmp(fn->ptr, extension->key->ptr, ct_len) == 0) {
--			if (s_len > ct_len + 1) {
--				char *pi_offset;
--				
--				if (0 != (pi_offset = strchr(fn->ptr + ct_len + 1, '/'))) {
--					path_info_offset = pi_offset - fn->ptr;
--				}
--			}
-+			/* check extension in the form "/fcgi_pattern" */
- 			break;
- 		} else if (0 == strncmp(fn->ptr + s_len - ct_len, extension->key->ptr, ct_len)) {
- 			/* check extension in the form ".fcg" */
-@@ -3008,7 +3052,7 @@
- 				handler_ctx *hctx;
- 				hctx = handler_ctx_init();
- 				
--				hctx->path_info_offset = path_info_offset;
-+				buffer_copy_string_buffer(hctx->extension, extension->key);
- 				hctx->remote_conn      = con;
- 				hctx->plugin_data      = p;
- 				hctx->host             = host;
-@@ -3028,7 +3072,6 @@
- 			handler_ctx *hctx;
- 			hctx = handler_ctx_init();
- 			
--			hctx->path_info_offset = path_info_offset;
- 			hctx->remote_conn      = con;
- 			hctx->plugin_data      = p;
- 			hctx->host             = host;
diff --git a/www-servers/lighttpd/lighttpd-1.3.13-r3.ebuild b/www-servers/lighttpd/lighttpd-1.3.13-r3.ebuild
deleted file mode 100644
index 98a36c25be70..000000000000
--- a/www-servers/lighttpd/lighttpd-1.3.13-r3.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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.3.13-r3.ebuild,v 1.11 2006/04/27 18:35:39 chtekk Exp $
-
-inherit eutils depend.php
-
-RESTRICT="test"
-
-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 ~ppc x86"
-IUSE="mysql ssl php xattr ldap"
-
-RDEPEND="app-arch/bzip2
-		>=dev-libs/libpcre-3.1
-		>=sys-libs/zlib-1.1
-		xattr? ( sys-apps/attr )
-		ldap? ( >=net-nds/openldap-2.1.26 )
-		mysql? ( >=dev-db/mysql-4.0.0 )
-		ssl? ( >=dev-libs/openssl-0.9.7 )
-		php? (
-			virtual/httpd-php
-			!net-www/spawn-fcgi
-		)"
-
-LIGHTTPD_DIR="/var/www/localhost/htdocs/"
-LOG_DIR="/var/log/lighttpd/"
-
-pkg_setup() {
-	enewgroup lighttpd
-	enewuser lighttpd -1 -1 "${LIGHTTPD_DIR}" lighttpd
-
-	use php && require_php_with_use cgi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.3.11-gentoo.diff
-	epatch ${FILESDIR}/${P}-no-mysql-means-no-mysql.diff
-	epatch ${FILESDIR}/${P}-zope-deserves-lovins-too.diff
-	epatch ${FILESDIR}/${P}-pam-name.diff
-	epatch ${FILESDIR}/${P}-valid-user.diff
-	epatch ${FILESDIR}/${P}-ldap-binddn.diff
-	use php && epatch ${FILESDIR}/${P}-php.diff
-}
-
-src_compile() {
-	local my_conf="--libdir=/usr/$(get_libdir)/${PN}"
-
-	# somehow during the process the BSD COPYING gets
-	# overwritten with a GPL one
-	mv COPYING{,.orig}
-	einfo "Regenerating automake/autoconf files"
-	autoreconf -f -i || die "autoreconf failed"
-	mv COPYING{.orig,}
-
-	econf ${my_conf} \
-		$(use_with mysql) \
-		$(use_with ldap) \
-		$(use_with xattr attr) \
-		$(use_with ssl openssl) || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc
-	doins doc/lighttpd.conf || die "doins failed"
-
-	newinitd ${FILESDIR}/${PN}-1.3.10.initd ${PN}
-
-	if use php ; then
-		newinitd ${FILESDIR}/spawn-fcgi.initd spawn-fcgi
-		newconfd ${FILESDIR}/spawn-fcgi.confd spawn-fcgi
-	fi
-
-	keepdir ${LIGHTTPD_DIR} ${LOG_DIR} || die "keepdir failed"
-	fowners lighttpd:lighttpd ${LOG_DIR} || die "fowners failed"
-
-	dodoc README COPYING
-	cd doc
-	dodoc *.txt *.sh *.ps.gz
-	newdoc lighttpd.conf lighttpd.conf.example || die "newdoc failed"
-}
-
-pkg_postinst () {
-	echo
-	einfo "lighttpd.conf has moved from /etc/conf.d to /etc"
-	if [[ -f ${ROOT}/etc/conf.d/spawn-fcgi.conf ]] ; then
-		einfo
-		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."
-	fi
-	echo
-}
diff --git a/www-servers/lighttpd/lighttpd-1.4.10-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.10-r1.ebuild
deleted file mode 100644
index a513f7c1c847..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.10-r1.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# 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.10-r1.ebuild,v 1.5 2006/04/15 00:42:39 flameeyes Exp $
-
-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 ~mips ~ppc ~ppc64 ~sparc ~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?    ( >=dev-db/mysql-4.0.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
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	EPATCH_SUFFIX="diff" epatch ${FILESDIR}/${PV}
-
-	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
-
-	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 COPYING INSTALL 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
-
-	use minimal && remove_non_essential
-}
-
-pkg_postinst () {
-	enewgroup lighttpd
-	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
-	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
-
-	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
-	echo
-}
diff --git a/www-servers/lighttpd/lighttpd-1.4.10-r2.ebuild b/www-servers/lighttpd/lighttpd-1.4.10-r2.ebuild
deleted file mode 100644
index 92c078034205..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.10-r2.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# 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.10-r2.ebuild,v 1.3 2006/06/01 01:16:24 steev Exp $
-
-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 ~mips ~ppc ~ppc64 ~sparc ~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?      ( app-admin/gamin )
-	gdbm?     ( sys-libs/gdbm )
-	ldap?     ( >=net-nds/openldap-2.1.26 )
-	lua?      ( dev-lang/lua )
-	memcache? ( dev-libs/libmemcache )
-	mysql?    ( >=dev-db/mysql-4.0.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?  ( 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}
-
-	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
-
-	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 COPYING INSTALL 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
-	echo
-}
diff --git a/www-servers/lighttpd/lighttpd-1.4.7.ebuild b/www-servers/lighttpd/lighttpd-1.4.7.ebuild
deleted file mode 100644
index c05ad2fcefe2..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.7.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# 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.7.ebuild,v 1.3 2006/02/13 15:24:48 mcummings Exp $
-
-inherit eutils 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 ~mips ~ppc ~sparc ~x86"
-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?    ( >=dev-db/mysql-4.0.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?  ( 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
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-#    EPATCH_SUFFIX="diff" epatch ${FILESDIR}/${PV}
-
-#    einfo "Regenerating autoconf/automake files"
-#    libtoolize --copy --force || die "libtoolize failed"
-#    aclocal || die "aclocal failed"
-#    autoheader || die "autoheader failed"
-#    automake --add-missing --copy || die "automake failed"
-#    autoconf || die "autoconf failed"
-
-	# 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"
-}
-
-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
-
-	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 COPYING INSTALL 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
-
-	use minimal && remove_non_essential
-}
-
-pkg_preinst() {
-	enewgroup lighttpd
-	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
-	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
-}
-
-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
-	echo
-}
diff --git a/www-servers/lighttpd/lighttpd-1.4.8.ebuild b/www-servers/lighttpd/lighttpd-1.4.8.ebuild
deleted file mode 100644
index 2556afb29a4c..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.8.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# 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.8.ebuild,v 1.4 2006/05/24 16:57:24 ranger Exp $
-
-inherit eutils 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 ~mips ~ppc ppc64 ~sparc ~x86"
-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?    ( >=dev-db/mysql-4.0.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?  ( 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
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-#    EPATCH_SUFFIX="diff" epatch ${FILESDIR}/${PV}
-
-#    einfo "Regenerating autoconf/automake files"
-#    libtoolize --copy --force || die "libtoolize failed"
-#    aclocal || die "aclocal failed"
-#    autoheader || die "autoheader failed"
-#    automake --add-missing --copy || die "automake failed"
-#    autoconf || die "autoconf failed"
-
-	# 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"
-}
-
-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
-
-	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 COPYING INSTALL 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
-
-	use minimal && remove_non_essential
-}
-
-pkg_preinst() {
-	enewgroup lighttpd
-	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
-	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
-}
-
-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
-	echo
-}