* bump

(Portage version: 2.1_pre6-r5)

8 files changed, 82 insertions, 96 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index 4db59c2de017..5d7d0e2398ca 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/nginx
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.79 2006/03/16 10:39:28 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.80 2006/03/22 19:40:26 voxus Exp $
+
+*nginx-0.3.34 (22 Mar 2006)
+
+  22 Mar 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.34.ebuild,
+  +filles/nginx.conf-r2, -nginx-0.3.33.ebuild, -nginx-0.3.30.ebuild:
+  Version bump. Default nginx.conf polished a bit.
 
 *nginx-0.3.33 (16 Mar 2006)
 
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index d42b22d2679b..d47e116b2c38 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,6 +1,6 @@
-MD5 a7af4d928a6a59304e580b457078d0d2 ChangeLog 13305
-RMD160 9c1c5f99e7883d96da2279768069cd8c28ed1e12 ChangeLog 13305
-SHA256 9174c86dae8983b7c37484f719da0fdc32fcdb4543bf0bf5b4cf2bedac4b3e59 ChangeLog 13305
+MD5 2b01829b343c2aaba542a9f33adf880a ChangeLog 13531
+RMD160 12a63b22f3d34302d0013fa07e51599c40d25b95 ChangeLog 13531
+SHA256 6ee78e8d8e10367bf27f3255f19f9276b2b81668ac73b5742242942adb062b6b ChangeLog 13531
 MD5 e8474104898712edc8575c940152bbd3 files/digest-nginx-0.1.45 64
 RMD160 f4b7c978be013c433ef925f9e60356e5f8a8ace2 files/digest-nginx-0.1.45 64
 SHA256 bae972cd23cee46342e98d7d5e52cb116190d8f8a95c4c9555887ce57ea1899c files/digest-nginx-0.1.45 64
@@ -10,12 +10,9 @@ SHA256 1bbef0ef32b6b28c9855ba547045686bc463957528b2ec34021e85b0b6aee37b files/di
 MD5 1bb0edeb44d5da60091b0c0d24e87c4f files/digest-nginx-0.3.12 64
 RMD160 3d102341963489f826f01e0d7382c799aa3032d0 files/digest-nginx-0.3.12 64
 SHA256 7a964f8c05d49c4b8c87fb941579122794d754b1855e9abf66120c577327a95a files/digest-nginx-0.3.12 64
-MD5 9d0f4f987c6e9b1753c602fa9973065a files/digest-nginx-0.3.30 238
-RMD160 032bd90090b0d9193677c435f731055d822139b6 files/digest-nginx-0.3.30 238
-SHA256 510f07984d8b619e4f4a23a600e7b93fd6a390788474ba484fcf7cfe40fef126 files/digest-nginx-0.3.30 238
-MD5 16eb09e1b2d42c3bd58c2b9d84cae2bf files/digest-nginx-0.3.33 238
-RMD160 9ea01f689170487a3386053a499433192a283389 files/digest-nginx-0.3.33 238
-SHA256 312ca57da98d6de5cde1967db817e61288a622d14ad8007c68eed06ce9fb6acf files/digest-nginx-0.3.33 238
+MD5 eb7a85cf7dfc05b268b5f10f0f94ac39 files/digest-nginx-0.3.34 238
+RMD160 faa18b6c11d51b9892d3abcfb435a080d106bd75 files/digest-nginx-0.3.34 238
+SHA256 a7288ae7149016aa36ac10418b09875f545a8798e014e28dfdf2428d84f5d656 files/digest-nginx-0.3.34 238
 MD5 d8f7e621e098b58848a6b5fb045c49c3 files/nginx 994
 RMD160 4b36e15714c84f8e8228d0ca6790c545736d74bb files/nginx 994
 SHA256 17a32f38e066ecc91ad91496e0ab8f0885e5550d42bf62dbecfdf2747a0fb1cd files/nginx 994
@@ -25,6 +22,9 @@ SHA256 11adbf9f0903f473b98474d460e41ec1161daa58d37e5c05019b03eae4d944f7 files/ng
 MD5 accbe26c88f0598f5559c4f00d226313 files/nginx.conf-r1 966
 RMD160 b4b9e54860f14a106b186cfc02dbb00e15df694d files/nginx.conf-r1 966
 SHA256 ef34ceb24bdd8aebf144b9583f457e3bfbbd96286acc4394c159a886990c29bf files/nginx.conf-r1 966
+MD5 a3565ae3a6d86ee206f2d5dd318092f2 files/nginx.conf-r2 1044
+RMD160 5ddc034f31a54da00b57503cfc5a7e0be2189cef files/nginx.conf-r2 1044
+SHA256 722b5588c975c523caea14bd90866be5d260f7d0fcdf1af90d2110b2db7ee448 files/nginx.conf-r2 1044
 MD5 822f3c821527e6a34f23a6a92a884766 metadata.xml 220
 RMD160 7b73eb49ba7071b35813559b0871b5ddb4bcbb32 metadata.xml 220
 SHA256 82c6d8c120358d0322f44bde92698ac1664b9478ce19428fc50c7048a38b2d26 metadata.xml 220
@@ -37,9 +37,6 @@ SHA256 ec4a8c3fa5f8917e96042d464ee1ed55420a78e69b0ee98f69e796712aadbc78 nginx-0.
 MD5 095ed1434baabf705fdbe6c4fbc92cf1 nginx-0.3.12.ebuild 1935
 RMD160 949a3e1f7336513591f4e68713c883940347a700 nginx-0.3.12.ebuild 1935
 SHA256 4b886077a85f3753f21909c2f0f1aac8744d9c8b9816198c37f5ca4f89bc40f4 nginx-0.3.12.ebuild 1935
-MD5 b20ca9e00e7f2b2e38c73be826de8d71 nginx-0.3.30.ebuild 2082
-RMD160 1357ca4e6bd16e332e52e674a312e71e41a0262d nginx-0.3.30.ebuild 2082
-SHA256 c3ba26c766997a33376dfb5ec20f3c5b6568e79e8b96654362f043fec2a6d6c9 nginx-0.3.30.ebuild 2082
-MD5 585259c126209d88dfaffb49d187ac40 nginx-0.3.33.ebuild 2082
-RMD160 63c9600e7f3521185cf27d27c221f1953907cf17 nginx-0.3.33.ebuild 2082
-SHA256 24ae235feaa9b80046bf7bf1cb6d432460448eb67775850e6dc2983fe944a924 nginx-0.3.33.ebuild 2082
+MD5 4b0dd89ce43f9904e66eb21e637a90bd nginx-0.3.34.ebuild 2082
+RMD160 a1386eb0b50bb1b24fba0e2441daecb3eb5e78ec nginx-0.3.34.ebuild 2082
+SHA256 9ece7d7e07a4f17d9b1199325457789d7266a415974ab2e5ef8b9fcfe43efe2e nginx-0.3.34.ebuild 2082
diff --git a/www-servers/nginx/files/digest-nginx-0.3.30 b/www-servers/nginx/files/digest-nginx-0.3.30
deleted file mode 100644
index 22ba3dedeb6f..000000000000
--- a/www-servers/nginx/files/digest-nginx-0.3.30
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3bb44aaac2b89d096ac157b03e2f2017 nginx-0.3.30.tar.gz 386163
-RMD160 32c4af1c05c421a7b4ab0aca76588b382e543bc8 nginx-0.3.30.tar.gz 386163
-SHA256 32dd362f732630767207308ec2f9b78344ee43fc457cde142dd6c0dea3476060 nginx-0.3.30.tar.gz 386163
diff --git a/www-servers/nginx/files/digest-nginx-0.3.33 b/www-servers/nginx/files/digest-nginx-0.3.33
deleted file mode 100644
index 90f23b585485..000000000000
--- a/www-servers/nginx/files/digest-nginx-0.3.33
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 dcc66abc6192df1b95c34226d87d3868 nginx-0.3.33.tar.gz 377812
-RMD160 61b98becf984a355356b42e442468d8be9e23f0f nginx-0.3.33.tar.gz 377812
-SHA256 3f1600a284834825e84b4fbf9d658840dc22f25c78e29239d6edb62ef29ed9a0 nginx-0.3.33.tar.gz 377812
diff --git a/www-servers/nginx/files/digest-nginx-0.3.34 b/www-servers/nginx/files/digest-nginx-0.3.34
new file mode 100644
index 000000000000..b7f5d0dc968d
--- /dev/null
+++ b/www-servers/nginx/files/digest-nginx-0.3.34
@@ -0,0 +1,3 @@
+MD5 888b1d12a4292a1b32080f7957165e0b nginx-0.3.34.tar.gz 382521
+RMD160 1b4b4f1956d07ccef2868316ef244401f5944dad nginx-0.3.34.tar.gz 382521
+SHA256 2ec4424d3ea28968d728891dec8416b5ab67bddd340a3fd8be8a4dbd625e52d0 nginx-0.3.34.tar.gz 382521
diff --git a/www-servers/nginx/files/nginx.conf-r2 b/www-servers/nginx/files/nginx.conf-r2
new file mode 100644
index 000000000000..913e98f35fdc
--- /dev/null
+++ b/www-servers/nginx/files/nginx.conf-r2
@@ -0,0 +1,58 @@
+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/nginx-0.3.33.ebuild b/www-servers/nginx/nginx-0.3.33.ebuild
deleted file mode 100644
index 88ecab95ca47..000000000000
--- a/www-servers/nginx/nginx-0.3.33.ebuild
+++ /dev/null
@@ -1,72 +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/nginx/nginx-0.3.33.ebuild,v 1.1 2006/03/16 10:39:29 voxus Exp $
-
-inherit eutils
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-
-HOMEPAGE="http://sysoev.ru/nginx/"
-SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug fastcgi imap pcre perl threads ssl 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 )"
-
-src_compile() {
-	local myconf
-
-	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 fastcgi	|| myconf="${myconf} --without-http_fastcgi_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"
-
-	./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 \
-		${myconf} || die "configure failed"
-
-	emake || die "failed to compile"
-}
-
-src_install() {
-	keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi}
-
-	dosbin objs/nginx
-	doinitd ${FILESDIR}/nginx
-
-	rm conf/nginx.conf
-	cp ${FILESDIR}/nginx.conf-r1 ${T}/nginx.conf
-
-	dodir /etc/${PN}
-	insinto /etc/${PN}
-	doins conf/* ${T}/nginx.conf
-
-	dodoc CHANGES{,.ru} LICENSE README
-}
diff --git a/www-servers/nginx/nginx-0.3.30.ebuild b/www-servers/nginx/nginx-0.3.34.ebuild
index bd2d39933ffd..7f95ea90e006 100644
--- a/www-servers/nginx/nginx-0.3.30.ebuild
+++ b/www-servers/nginx/nginx-0.3.34.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/nginx/nginx-0.3.30.ebuild,v 1.1 2006/02/22 19:46:11 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.3.34.ebuild,v 1.1 2006/03/22 19:40:26 voxus Exp $
 
 inherit eutils
 
@@ -62,7 +62,7 @@ src_install() {
 	doinitd ${FILESDIR}/nginx
 
 	rm conf/nginx.conf
-	cp ${FILESDIR}/nginx.conf-r1 ${T}/nginx.conf
+	cp ${FILESDIR}/nginx.conf-r2 ${T}/nginx.conf
 
 	dodir /etc/${PN}
 	insinto /etc/${PN}