Clean up cruft in www-servers/nginx.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

10 files changed, 8 insertions, 651 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index 6a88ea415fe2..8d1fa65cd594 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/nginx
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.237 2010/01/03 19:51:40 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.238 2010/01/03 20:07:38 djc Exp $
+
+  03 Jan 2010; Dirkjan Ochtman <djc@gentoo.org> -nginx-0.7.64-r1.ebuild,
+  -nginx-0.8.17.ebuild, -files/nginx, -files/nginx.conf,
+  -files/nginx.conf-r1, -files/nginx.conf-r2, -files/nginx.conf-r3,
+  -files/nginx-secure-link-timeout.patch:
+  Clean up all kinds of old, unused cruft.
 
 *nginx-0.7.64-r2 (03 Jan 2010)
 
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 2ca7461c8c1b..81870ef2263d 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,25 +1,16 @@
-AUX nginx 994 RMD160 4b36e15714c84f8e8228d0ca6790c545736d74bb SHA1 de0a11802cc6f4a1111652416bce131a07ae008c SHA256 17a32f38e066ecc91ad91496e0ab8f0885e5550d42bf62dbecfdf2747a0fb1cd
 AUX nginx-r1 1645 RMD160 d032feec43e4ba31ac5b6fffec478ebbeb49db60 SHA1 49f0db3efaccd3cef545b8c68cfa557ca829352f SHA256 b263a663399d2897dfdf53226d45fc3707bc9230bd687b8003d075a48f60ecaf
-AUX nginx-secure-link-timeout.patch 3103 RMD160 51337d222001fb051d29feaac3f68ab8367357da SHA1 d9f831bc7c378e2c1893a5f9964400a49ecc4f4b SHA256 ff89688109e695c7e3c8dfd39fa7e1310984d790e59bbbf40f29987d3edfd0a5
-AUX nginx.conf 1400 RMD160 d982c853d9145643c4a885012a41fc4acd39080f SHA1 6974ab2214a11ad3e828861b47f9499c9481520d SHA256 11adbf9f0903f473b98474d460e41ec1161daa58d37e5c05019b03eae4d944f7
-AUX nginx.conf-r1 966 RMD160 b4b9e54860f14a106b186cfc02dbb00e15df694d SHA1 0bc417a8b7f736bcfba5330a48b7915ef344a7a2 SHA256 ef34ceb24bdd8aebf144b9583f457e3bfbbd96286acc4394c159a886990c29bf
-AUX nginx.conf-r2 1044 RMD160 5ddc034f31a54da00b57503cfc5a7e0be2189cef SHA1 988e59f8aeabb8b4b1e412f4dfc8ddfa96ee5da4 SHA256 722b5588c975c523caea14bd90866be5d260f7d0fcdf1af90d2110b2db7ee448
-AUX nginx.conf-r3 1039 RMD160 cc181fdfdbbd26eabfc60821d9bd92bc2632905c SHA1 5ddb38fd85e1a99f69b5efc62b22a4633c924f67 SHA256 93c926f698a21946687340d553d584c47408359d5bb64651fc967274659662fc
 AUX nginx.conf-r4 1410 RMD160 4b188bb03b12de3b38a82e13b1a2bb93848e8948 SHA1 e836c85e98e3b2c633818c286992d32a68c0b5ff SHA256 74d984512901fc9cfd13cac60df06cd468566aae367c35a3205e6daf7e7c32b6
 AUX nginx.init-r2 1657 RMD160 a42538ae12cccfad1108fe2fca387ec666f4fd85 SHA1 7a0706894bed322d8b5814de98bca56d48c458d0 SHA256 9fceee69794de55b6da24ff2d11c72f6bc86339e7088c644b165dc35a9d5afa1
 DIST nginx-0.5.38.tar.gz 490220 RMD160 95d39df12e4756d03844c68374ec7dd52659b48b SHA1 5636e2880a0baf7244befdb055e77c59f21f95c4 SHA256 d601e3b08c3f1fe4a64eac1b9fec876cbc57b99696d5a322c1d9d3ddb01713c9
 DIST nginx-0.6.39.tar.gz 529159 RMD160 b94c1fad3185a520ff7ebb40d17ac2bcbeb04ffb SHA1 ba31c5b64d5d394c788bc3255d93a796b5e0e87e SHA256 daf14292863966b75d0c606b7cd2fbb710d1a5a5e8808ab862205643cc83ff1d
 DIST nginx-0.7.62.tar.gz 595995 RMD160 d830ae34f5bac3c494744a8033f32fb7b3107c11 SHA1 6eeb30d3daf7abcca351d9eba78b5adedd6331c5 SHA256 60ee0e9f7f43a7387fec7752a47ff0d06166d2a37a6ad4cfe7aff77162378d2d
 DIST nginx-0.7.64.tar.gz 601601 RMD160 88c982dc88a91db3337c1ab74d7a41d503736366 SHA1 e4f71b9a908c23c3d7bfeb63e97c7f85c3d6eed7 SHA256 5705d08af78add2979f566981c86d59f854b0dd350ac09df87c1f55a6846fbcd
-DIST nginx-0.8.17.tar.gz 607192 RMD160 a2919c96a5b51be7d63cd28698ed4a7411a14ead SHA1 3c13e566884f314b29bdb9d90a4664ab0ab7df33 SHA256 229d47bee8c4bd5e6e4b5cb06810573340e17d620c00da618c330793281b473a
 DIST nginx-0.8.29.tar.gz 617202 RMD160 5960e7ec51261ec667f45722333971e26b759af4 SHA1 ff586e833688f1d72507091268e917c164784200 SHA256 64d96f6b37a1b38a21a819d28f7f57e9b1b5de319bc4d1f1907be8e5bdd1d631
 EBUILD nginx-0.5.38.ebuild 2953 RMD160 82f38767612e0fa42760435b044c0723645b5920 SHA1 4b6033ac8b4c63a5b207c9ce478a9bc820e4e18d SHA256 6fc8868965a6a1bca92fddf777f6bfdc6550ca0902cd47db895ab3dec5fa406a
 EBUILD nginx-0.6.39.ebuild 3065 RMD160 8d86dee4b70e98c62f1950d7fbc497335f6bd0c0 SHA1 ca5dc97e05ffe1f6d14cf973b3405a338c762d0c SHA256 c55e5dc81dd6f48513152a34f2c3feea6de495994ab8d8fb43ab9096b8ab563a
 EBUILD nginx-0.7.62.ebuild 3266 RMD160 c43344c6945dc7b0fe8b36054fda2e21b7a19b22 SHA1 26e76db9a98cbe052ceb4b9e3a4d63ab071f2df7 SHA256 dfb55c9fc3cddbf8f9166096795c9f190300aebb84a3314f13729ff07c4768e0
-EBUILD nginx-0.7.64-r1.ebuild 3542 RMD160 9373349928b03ae7e035a169f5c7784bb45758e6 SHA1 79187ed997e89393f6eed19e701e9c0e57a70671 SHA256 f8c17338271a239d67550e95b87b07d3f39cefe85c845c328992610e50ba7087
 EBUILD nginx-0.7.64-r2.ebuild 3614 RMD160 49371d1b5d819f90bf38ff0a79bfb300b057697c SHA1 9593bdc23d549e017963396c17480046a2aa619a SHA256 610b6415655954d217492e864a390ebedf5fffee31f8004d201e64d791164924
 EBUILD nginx-0.7.64.ebuild 3245 RMD160 8964b32796019ad4945313e91c15a8c920fb6054 SHA1 97405f6b86ea9fa946d28097ee8b1e74caf21da0 SHA256 4757d0cee3a57eeab65af6b737e1fabd8a77e6729e7791eb57cfa961b6377e7c
-EBUILD nginx-0.8.17.ebuild 3593 RMD160 1661c53de84e5ab9fc18876615bd7b1051b1e2d8 SHA1 e67a2904063912468c82fcdb181507b6528e449d SHA256 025508e9313338b9727fc1e509eec8f5132dc03fabb2783245673312ce81c7e1
 EBUILD nginx-0.8.29.ebuild 3576 RMD160 8fb6a6ce8003d6f55aa3124714caeca5ee13f4cb SHA1 6363469a2c9d9827a9c6ecc9693bb297594e7945 SHA256 8956bab291d6a3d64aa4e9181c5858c1bea59e4725ccf7efcd276d390d6a880f
-MISC ChangeLog 38503 RMD160 fffdb8139647e00f3ef2899e6bc8c786a683da64 SHA1 a572506f28fa9f126467b248d757d47b8789d464 SHA256 a6a7362fd5006f63e508d956e51179eea02fe9eadbd0f1c1e3c37248404d773a
+MISC ChangeLog 38787 RMD160 2a3dc945c8daff1654b389d4d0afd20558f43dbc SHA1 7849934ce111e981d9c3f9a02c6281b74bfffd4b SHA256 9903b60bfa35e0544f9fdb52cd6db6dfeb60825ef3ba8efdec60e0f7199c780f
 MISC metadata.xml 928 RMD160 fd890dc533e983fdd0e4fea0477bffba8b55b5cc SHA1 216bc16ba507719e7c09d664ae29b9424c65035e SHA256 61fd512d4084b45de4d573b73de49f779e5748747d96ff3d34ecc635998cd624
diff --git a/www-servers/nginx/files/nginx b/www-servers/nginx/files/nginx
deleted file mode 100644
index 7cafac89fb76..000000000000
--- a/www-servers/nginx/files/nginx
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx,v 1.3 2005/05/29 14:30:28 voxus Exp $
-
-opts="${opts} reload configtest"
-
-depend() {
-	need net
-	use dns logger
-}
-
-start() {
-	configtest || return 1
-	ebegin "Starting nginx"
-	start-stop-daemon --start --pidfile /var/run/nginx.pid \
-		--exec /usr/sbin/nginx -- -c /etc/nginx/nginx.conf
-	eend $? "Failed to start nginx"
-}
-
-stop() {
-	configtest || return 1
-	ebegin "Stopping nginx"
-	start-stop-daemon --stop --pidfile /var/run/nginx.pid
-	eend $? "Failed to stop nginx"
-	rm -f /var/run/nginx.pid
-}
-
-reload() {
-	configtest || return 1
-	ebegin "Refreshing nginx' configuration"
-	kill -HUP `cat /var/run/nginx.pid` &>/dev/null
-	eend $? "Failed to reload nginx"
-}
-
-configtest() {
-	ebegin "Checking nginx' configuration"
-	/usr/sbin/nginx -c /etc/nginx/nginx.conf -t
-	eend $? "failed, please correct errors above"
-}
diff --git a/www-servers/nginx/files/nginx-secure-link-timeout.patch b/www-servers/nginx/files/nginx-secure-link-timeout.patch
deleted file mode 100644
index e178cfffd861..000000000000
--- a/www-servers/nginx/files/nginx-secure-link-timeout.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-diff -Naur nginx-0.8.4.orig/src/http/modules/ngx_http_secure_link_module.c nginx-0.8.4/src/http/modules/ngx_http_secure_link_module.c
---- nginx-0.8.4.orig/src/http/modules/ngx_http_secure_link_module.c	2009-05-13 14:44:15.000000000 +0200
-+++ nginx-0.8.4/src/http/modules/ngx_http_secure_link_module.c	2009-05-13 15:00:49.000000000 +0200
-@@ -12,6 +12,7 @@
- 
- typedef struct {
-     ngx_str_t  secret;
-+		time_t timeout;
- } ngx_http_secure_link_conf_t;
- 
- 
-@@ -30,6 +31,12 @@
-       offsetof(ngx_http_secure_link_conf_t, secret),
-       NULL },
- 
-+			{ ngx_string("secure_link_timeout"),
-+			NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-+			ngx_conf_set_sec_slot,
-+			NGX_HTTP_LOC_CONF_OFFSET,
-+			offsetof(ngx_http_secure_link_conf_t, timeout),
-+			NULL },
-       ngx_null_command
- };
- 
-@@ -67,22 +74,36 @@
- 
- static ngx_str_t  ngx_http_secure_link = ngx_string("secure_link");
- 
-+static u_char
-+ngx_hex2int(u_char hex)
-+{
-+	hex = hex - '0';
-+	if (hex > 9) {
-+	hex = (hex + '0' - 1) | 0x20;
-+	hex = hex - 'a' + 11;
-+	}
-+	if (hex > 15)
-+	hex = 0xFF;
-+
-+	return hex;
-+}
- 
- static ngx_int_t
- ngx_http_secure_link_variable(ngx_http_request_t *r,
-      ngx_http_variable_value_t *v, uintptr_t data)
- {
--    u_char                        *p, *start, *end, *last;
--    size_t                         len;
-+		u_char *p, *start, *end, *last, *tss, *tse;
-+		size_t                         len, tslen;
-     ngx_int_t                      n;
-     ngx_uint_t                     i;
-     ngx_md5_t                      md5;
-+		time_t 												 ts;
-     ngx_http_secure_link_conf_t  *conf;
-     u_char                         hash[16];
- 
-     conf = ngx_http_get_module_loc_conf(r, ngx_http_secure_link_module);
- 
--    if (conf->secret.len == 0) {
-+		if (conf->secret.len == 0 || conf->timeout == 0) {
-         goto not_found;
-     }
- 
-@@ -103,22 +124,46 @@
-     while (p < last) {
-         if (*p++ == '/') {
-             end = p - 1;
--            goto url_start;
-+						goto tstamp_start;
-         }
-     }
- 
-     goto not_found;
- 
-+		tstamp_start:
-+
-+		tss = p;
-+
-+		while (p < last) {
-+			if (*p++ == '/') {
-+			tse = p - 1;
-+			goto url_start;
-+		}
-+	}
-+
-+	goto not_found;
-+
- url_start:
- 
-+		tslen = tse - tss;
-     len = last - p;
- 
--    if (end - start != 32 || len == 0) {
-+		if (end - start != 32 || len == 0 || tslen != 8) {
-         goto not_found;
-     }
- 
-+		ts = 0;
-+		for (i = 0; i < 8; i++) {
-+		ts = (ts << 4) + ngx_hex2int(tss[i]);
-+		}
-+
-+		if (ts < r->start_sec - conf->timeout) {
-+			goto not_found;
-+		}
-+
-     ngx_md5_init(&md5);
-     ngx_md5_update(&md5, p, len);
-+		ngx_md5_update(&md5, tss, tslen);
-     ngx_md5_update(&md5, conf->secret.data, conf->secret.len);
-     ngx_md5_final(hash, &md5);
- 
-@@ -160,7 +205,8 @@
-      *
-      *     conf->secret = { 0, NULL }
-      */
--
-+		
-+		conf->timeout = NGX_CONF_UNSET;
-     return conf;
- }
- 
-@@ -172,6 +218,7 @@
-     ngx_http_secure_link_conf_t *conf = child;
- 
-     ngx_conf_merge_str_value(conf->secret, prev->secret, "");
-+		ngx_conf_merge_sec_value(conf->timeout, prev->timeout, 3600);
- 
-     return NGX_CONF_OK;
- }
diff --git a/www-servers/nginx/files/nginx.conf b/www-servers/nginx/files/nginx.conf
deleted file mode 100644
index 526dd2ef3ca1..000000000000
--- a/www-servers/nginx/files/nginx.conf
+++ /dev/null
@@ -1,66 +0,0 @@
-user  apache apache;
-
-worker_processes  5;
-
-error_log /var/log/nginx/error_log warn;
-
-events {
-	connections  2048;
-}
-
-http {
-	include       /etc/nginx/mime.types;
-	default_type  application/octet-stream;
-
-	log_format main  '%addr - - [%time] "%request" %status '
-                         '%length "%{Referer}i" "%{User-Agent}i" ';
-
-	log_format download  '%addr - - [%time] "%request" %status '
-                             '%length "%{Referer}i" "%{User-Agent}i" '
-                             '"%{Range}i" "%{Content-Range}o"';
-
-	post_accept_timeout    60;
-	client_header_timeout  3m;
-	client_body_timeout    3m;
-	send_timeout           3m;
-
-	connection_pool_size         256;
-	client_header_buffer_size    1k;
-	large_client_header_buffers  4 2k;
-	request_pool_size            4k;
-
-	gzip on;
-	gzip_min_length  1100;
-	gzip_buffers     4 8k;
-	gzip_types       text/plain;
-
-	output_buffers   1 32k;
-	postpone_output  1460;
-
-	sendfile         on;
-	tcp_nopush       on;
-	tcp_nodelay      on;
-
-	keepalive_timeout  75 20;
-	
-	server {
-		listen  80;
-
-	        charset         on;
-        	source_charset  koi8-r;
-
-		access_log   /var/log/nginx/access_log  main;
-
-	        location / {
-        		root   /var/www/localhost/htdocs;
-			index  index.html;
-			allow all;
-	        }
-
-		location ~* ^.+\.(jpg|jpeg|gif)$ {
-			root         /var/www/localhost/htdocs;
-			access_log   off;
-			expires      30d;
-		}
-	}
-}
diff --git a/www-servers/nginx/files/nginx.conf-r1 b/www-servers/nginx/files/nginx.conf-r1
deleted file mode 100644
index 4ad6a3c13387..000000000000
--- a/www-servers/nginx/files/nginx.conf-r1
+++ /dev/null
@@ -1,55 +0,0 @@
-user  apache apache;
-
-worker_processes  1;
-
-error_log /var/log/nginx/error_log info;
-
-events {
-	worker_connections  8192;
-	use epoll;
-}
-
-http {
-	include		/etc/nginx/mime.types;
-	default_type	application/octet-stream;
-
-	log_format main
-		'$remote_addr - $remote_user [$time_local] '
-        	'"$request" $status $bytes_sent '
-		'"$http_referer" "$http_user_agent" '
-		'"$gzip_ratio"';
-									       
-	client_header_timeout	10m;
-	client_body_timeout	10m;
-	send_timeout		10m;
-
-	connection_pool_size		256;
-	client_header_buffer_size	1k;
-	large_client_header_buffers	4 2k;
-	request_pool_size		4k;
-
-	gzip on;
-	gzip_min_length	1100;
-	gzip_buffers	4 8k;
-	gzip_types	text/plain;
-
-	output_buffers	1 32k;
-	postpone_output	1460;
-
-	sendfile	on;
-	tcp_nopush	on;
-	tcp_nodelay	on;
-
-	keepalive_timeout	75 20;
-
-	ignore_invalid_headers	on;
-
-	server {
-		listen		127.0.0.1;
-		server_name	localhost;
-
-		access_log	/var/log/nginx/access_log info;
-
-		root /var/www/localhost/htdocs;
-	}
-}
diff --git a/www-servers/nginx/files/nginx.conf-r2 b/www-servers/nginx/files/nginx.conf-r2
deleted file mode 100644
index 913e98f35fdc..000000000000
--- a/www-servers/nginx/files/nginx.conf-r2
+++ /dev/null
@@ -1,58 +0,0 @@
-user  apache apache;
-
-worker_processes  1;
-
-error_log /var/log/nginx/error_log info;
-
-events {
-	worker_connections  8192;
-	use epoll;
-}
-
-http {
-	include		/etc/nginx/mime.types;
-	default_type	application/octet-stream;
-
-	log_format main
-		'$remote_addr - $remote_user [$time_local] '
-        	'"$request" $status $bytes_sent '
-		'"$http_referer" "$http_user_agent" '
-		'"$gzip_ratio"';
-									       
-	client_header_timeout	10m;
-	client_body_timeout	10m;
-	send_timeout		10m;
-
-	connection_pool_size		256;
-	client_header_buffer_size	1k;
-	large_client_header_buffers	4 2k;
-	request_pool_size		4k;
-
-	gzip on;
-	gzip_min_length	1100;
-	gzip_buffers	4 8k;
-	gzip_types	text/plain;
-
-	output_buffers	1 32k;
-	postpone_output	1460;
-
-	sendfile	on;
-	tcp_nopush	on;
-	tcp_nodelay	on;
-
-	keepalive_timeout	75 20;
-
-	ignore_invalid_headers	on;
-
-	index index.html;
-
-	server {
-		listen		127.0.0.1;
-		server_name	localhost;
-
-		access_log	/var/log/nginx/localhost.access_log main;
-		error_log	/var/log/nginx/localhost.error_log;
-
-		root /var/www/localhost/htdocs;
-	}
-}
diff --git a/www-servers/nginx/files/nginx.conf-r3 b/www-servers/nginx/files/nginx.conf-r3
deleted file mode 100644
index a924424b77a2..000000000000
--- a/www-servers/nginx/files/nginx.conf-r3
+++ /dev/null
@@ -1,57 +0,0 @@
-user nginx nginx;
-worker_processes 1;
-
-error_log /var/log/nginx/error_log info;
-
-events {
-	worker_connections  8192;
-	use epoll;
-}
-
-http {
-	include		/etc/nginx/mime.types;
-	default_type	application/octet-stream;
-
-	log_format main
-		'$remote_addr - $remote_user [$time_local] '
-        	'"$request" $status $bytes_sent '
-		'"$http_referer" "$http_user_agent" '
-		'"$gzip_ratio"';
-									       
-	client_header_timeout	10m;
-	client_body_timeout	10m;
-	send_timeout		10m;
-
-	connection_pool_size		256;
-	client_header_buffer_size	1k;
-	large_client_header_buffers	4 2k;
-	request_pool_size		4k;
-
-	gzip on;
-	gzip_min_length	1100;
-	gzip_buffers	4 8k;
-	gzip_types	text/plain;
-
-	output_buffers	1 32k;
-	postpone_output	1460;
-
-	sendfile	on;
-	tcp_nopush	on;
-	tcp_nodelay	on;
-
-	keepalive_timeout	75 20;
-
-	ignore_invalid_headers	on;
-
-	index index.html;
-
-	server {
-		listen		127.0.0.1;
-		server_name	localhost;
-
-		access_log	/var/log/nginx/localhost.access_log main;
-		error_log	/var/log/nginx/localhost.error_log;
-
-		root /var/www/localhost/htdocs;
-	}
-}
diff --git a/www-servers/nginx/nginx-0.7.64-r1.ebuild b/www-servers/nginx/nginx-0.7.64-r1.ebuild
deleted file mode 100644
index 63774aeb2ebf..000000000000
--- a/www-servers/nginx/nginx-0.7.64-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.7.64-r1.ebuild,v 1.1 2010/01/03 19:05:39 djc Exp $
-
-inherit eutils ssl-cert toolchain-funcs perl-module
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-
-HOMEPAGE="http://nginx.net/"
-SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="addition debug fastcgi flv imap pcre perl pop random-index smtp ssl status sub webdav zlib"
-
-DEPEND="dev-lang/perl
-	dev-libs/openssl
-	pcre? ( >=dev-libs/libpcre-4.2 )
-	zlib? ( sys-libs/zlib )
-	perl? ( >=dev-lang/perl-5.8 )"
-
-pkg_setup() {
-	ebegin "Creating nginx user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-	eend ${?}
-}
-
-src_unpack() {
-	unpack ${A}
-	sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make || die
-}
-
-src_compile() {
-	local myconf
-
-	# threads support is broken atm.
-	#
-	# if use threads; then
-	# 	einfo
-	# 	ewarn "threads support is experimental at the moment"
-	# 	ewarn "do not use it on production systems - you've been warned"
-	# 	einfo
-	# 	myconf="${myconf} --with-threads"
-	# fi
-
-	use addition && myconf="${myconf} --with-http_addition_module"
-	use fastcgi	|| myconf="${myconf} --without-http_fastcgi_module"
-	use fastcgi	&& myconf="${myconf} --with-http_realip_module"
-	use flv		&& myconf="${myconf} --with-http_flv_module"
-	use zlib	|| myconf="${myconf} --without-http_gzip_module"
-	use pcre	|| {
-		myconf="${myconf} --without-pcre --without-http_rewrite_module"
-	}
-	use debug	&& myconf="${myconf} --with-debug"
-	use ssl		&& myconf="${myconf} --with-http_ssl_module"
-	use perl	&& myconf="${myconf} --with-http_perl_module"
-	use status	&& myconf="${myconf} --with-http_stub_status_module"
-	use webdav	&& myconf="${myconf} --with-http_dav_module"
-	use sub		&& myconf="${myconf} --with-http_sub_module"
-	use random-index	&& myconf="${myconf} --with-http_random_index_module"
-
-	if use smtp || use pop || use imap; then
-		myconf="${myconf} --with-mail"
-		use ssl && myconf="${myconf} --with-mail_ssl_module"
-	fi
-	use imap || myconf="${myconf} --without-mail_imap_module"
-	use pop || myconf="${myconf} --without-mail_pop3_module"
-	use smtp || myconf="${myconf} --without-mail_smtp_module"
-
-	tc-export CC
-	./configure \
-		--prefix=/usr \
-		--with-cc-opt="-I${ROOT}/usr/include" \
-		--with-ld-opt="-L${ROOT}/usr/lib" \
-		--conf-path=/etc/${PN}/${PN}.conf \
-		--http-log-path=/var/log/${PN}/access_log \
-		--error-log-path=/var/log/${PN}/error_log \
-		--pid-path=/var/run/${PN}.pid \
-		--http-client-body-temp-path=/var/tmp/${PN}/client \
-		--http-proxy-temp-path=/var/tmp/${PN}/proxy \
-		--http-fastcgi-temp-path=/var/tmp/${PN}/fastcgi \
-		${myconf} || die "configure failed"
-
-	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" || die "failed to compile"
-}
-
-src_install() {
-	keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi}
-
-	dosbin objs/nginx
-	cp "${FILESDIR}"/nginx-r1 "${T}"/nginx
-	doinitd "${T}"/nginx
-
-	cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf
-
-	dodir /etc/${PN}
-	insinto /etc/${PN}
-	doins conf/*
-
-	dodoc CHANGES{,.ru} README
-
-	use perl && {
-		cd "${S}"/objs/src/http/modules/perl/
-		einstall DESTDIR="${D}" INSTALLDIRS=vendor || die "failed to install perl stuff"
-		fixlocalpod
-	}
-}
-
-pkg_postinst() {
-	use ssl && {
-		if [ ! -f "${ROOT}"/etc/ssl/${PN}/${PN}.key ]; then
-			install_cert /etc/ssl/${PN}/${PN}
-			chown ${PN}:${PN} "${ROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
-		fi
-	}
-}
diff --git a/www-servers/nginx/nginx-0.8.17.ebuild b/www-servers/nginx/nginx-0.8.17.ebuild
deleted file mode 100644
index b7e8ab6b44ac..000000000000
--- a/www-servers/nginx/nginx-0.8.17.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.8.17.ebuild,v 1.1 2009/09/28 15:37:52 voxus Exp $
-
-inherit eutils ssl-cert toolchain-funcs
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-
-HOMEPAGE="http://nginx.net/"
-SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="addition debug fastcgi flv imap ipv6 pcre perl random-index securelink ssl status sub webdav zlib"
-
-DEPEND="dev-lang/perl
-	pcre? ( >=dev-libs/libpcre-4.2 )
-	ssl? ( dev-libs/openssl )
-	zlib? ( sys-libs/zlib )
-	perl? ( >=dev-lang/perl-5.8 )"
-
-pkg_setup() {
-	ebegin "Creating nginx user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-	eend ${?}
-	if use ipv6; then
-		ewarn "Note that ipv6 support in nginx is still experimental."
-		ewarn "Be sure to read comments on gentoo bug #274614"
-		ewarn "http://bugs.gentoo.org/show_bug.cgi?id=274614"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make || die
-}
-
-src_compile() {
-	local myconf
-
-	# threads support is broken atm.
-	#
-	# if use threads; then
-	# 	einfo
-	# 	ewarn "threads support is experimental at the moment"
-	# 	ewarn "do not use it on production systems - you've been warned"
-	# 	einfo
-	# 	myconf="${myconf} --with-threads"
-	# fi
-
-	use addition && myconf="${myconf} --with-http_addition_module"
-	use ipv6	&& myconf="${myconf} --with-ipv6"
-	use fastcgi	|| myconf="${myconf} --without-http_fastcgi_module"
-	use fastcgi	&& myconf="${myconf} --with-http_realip_module"
-	use flv		&& myconf="${myconf} --with-http_flv_module"
-	use zlib	|| myconf="${myconf} --without-http_gzip_module"
-	use pcre	|| {
-		myconf="${myconf} --without-pcre --without-http_rewrite_module"
-	}
-	use debug	&& myconf="${myconf} --with-debug"
-	use ssl		&& myconf="${myconf} --with-http_ssl_module"
-	use imap	&& myconf="${myconf} --with-imap" # pop3/imap4 proxy support
-	use perl	&& myconf="${myconf} --with-http_perl_module"
-	use status	&& myconf="${myconf} --with-http_stub_status_module"
-	use webdav	&& myconf="${myconf} --with-http_dav_module"
-	use sub		&& myconf="${myconf} --with-http_sub_module"
-	use random-index	&& myconf="${myconf} --with-http_random_index_module"
-	use securelink && myconf="${myconf} --with-http_secure_link_module"
-
-	tc-export CC
-	./configure \
-		--prefix=/usr \
-		--conf-path=/etc/${PN}/${PN}.conf \
-		--http-log-path=/var/log/${PN}/access_log \
-		--error-log-path=/var/log/${PN}/error_log \
-		--pid-path=/var/run/${PN}.pid \
-		--http-client-body-temp-path=/var/tmp/${PN}/client \
-		--http-proxy-temp-path=/var/tmp/${PN}/proxy \
-		--http-fastcgi-temp-path=/var/tmp/${PN}/fastcgi \
-		--with-md5-asm --with-md5=/usr/include \
-		--with-sha1-asm --with-sha1=/usr/include \
-		${myconf} || die "configure failed"
-
-	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" || die "failed to compile"
-}
-
-src_install() {
-	keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi}
-
-	dosbin objs/nginx
-	cp "${FILESDIR}"/nginx-r1 "${T}"/nginx
-	doinitd "${T}"/nginx
-
-	cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf
-
-	dodir /etc/${PN}
-	insinto /etc/${PN}
-	doins conf/*
-
-	dodoc CHANGES{,.ru} README
-
-	use perl && {
-		cd "${S}"/objs/src/http/modules/perl/
-		einstall DESTDIR="${D}"|| die "failed to install perl stuff"
-	}
-}
-
-pkg_postinst() {
-	use ssl && {
-		if [ ! -f "${ROOT}"/etc/ssl/${PN}/${PN}.key ]; then
-			install_cert /etc/ssl/${PN}/${PN}
-			chown ${PN}:${PN} "${ROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
-		fi
-	}
-}