* bump, new conf, perl use added

(Portage version: 2.1_pre3-r1)

8 files changed, 77 insertions, 86 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index 9afd89fadb88..c69525666afe 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.66 2006/01/16 15:14:56 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.67 2006/01/18 14:31:09 voxus Exp $
+
+*nginx-0.3.22 (18 Jan 2006)
+
+  18 Jan 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.22.ebuild,
+  +files/nginx.conf-r1, -nginx-0.3.20.ebuild, -nginx-0.3.21.ebuild:
+  Version bump, new use flag for perl, default configuration updated.
 
 *nginx-0.3.21 (16 Jan 2006)
 
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index b6844810ffd2..c4598898301e 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,16 +1,15 @@
-MD5 3a9732e017d47eff84e439c078162f74 ChangeLog 11202
+MD5 b4a27a98b1d27710a5bb9b50aa8c4337 ChangeLog 11446
 MD5 e8474104898712edc8575c940152bbd3 files/digest-nginx-0.1.45 64
 MD5 86fb37c347608004443f47aabae2fec7 files/digest-nginx-0.2.6 63
 MD5 1bb0edeb44d5da60091b0c0d24e87c4f files/digest-nginx-0.3.12 64
 MD5 676aa9e60aa117c23ab3a5af4c3c893b files/digest-nginx-0.3.15 64
-MD5 851322ed490dd8628af1fa6534e830b9 files/digest-nginx-0.3.20 64
-MD5 d457c419e0ca8d2c38ff10864ee559d3 files/digest-nginx-0.3.21 64
+MD5 bd14300806e989be2fcea34593a87eb2 files/digest-nginx-0.3.22 64
 MD5 d8f7e621e098b58848a6b5fb045c49c3 files/nginx 994
 MD5 fecedd05099122b1f8169152e5bc9462 files/nginx.conf 1400
+MD5 accbe26c88f0598f5559c4f00d226313 files/nginx.conf-r1 966
 MD5 822f3c821527e6a34f23a6a92a884766 metadata.xml 220
 MD5 62f46895e63da25c83512f589b9e61cb nginx-0.1.45.ebuild 1935
 MD5 6460bce607f17843cd0c22395e6122e0 nginx-0.2.6.ebuild 1934
 MD5 095ed1434baabf705fdbe6c4fbc92cf1 nginx-0.3.12.ebuild 1935
 MD5 b24f35c96ef3f22c3c1e523ac45da59b nginx-0.3.15.ebuild 1937
-MD5 23baa064d6664723ca1b47c6514ba268 nginx-0.3.20.ebuild 1937
-MD5 938ed5c82ff8c86b147c1bd4a3ac826c nginx-0.3.21.ebuild 1937
+MD5 a135df714099639a713132e2eeaf8d90 nginx-0.3.22.ebuild 2058
diff --git a/www-servers/nginx/files/digest-nginx-0.3.20 b/www-servers/nginx/files/digest-nginx-0.3.20
deleted file mode 100644
index d659c28765d3..000000000000
--- a/www-servers/nginx/files/digest-nginx-0.3.20
+++ /dev/null
@@ -1 +0,0 @@
-MD5 feda646943531cf4626437e3680b317b nginx-0.3.20.tar.gz 362757
diff --git a/www-servers/nginx/files/digest-nginx-0.3.21 b/www-servers/nginx/files/digest-nginx-0.3.21
deleted file mode 100644
index 55934d1d75ce..000000000000
--- a/www-servers/nginx/files/digest-nginx-0.3.21
+++ /dev/null
@@ -1 +0,0 @@
-MD5 57c7f77631913fdf768b772dc172835a nginx-0.3.21.tar.gz 371254
diff --git a/www-servers/nginx/files/digest-nginx-0.3.22 b/www-servers/nginx/files/digest-nginx-0.3.22
new file mode 100644
index 000000000000..1cb67b4a1f58
--- /dev/null
+++ b/www-servers/nginx/files/digest-nginx-0.3.22
@@ -0,0 +1 @@
+MD5 9590c9c82034b3f4890e91d45209218a nginx-0.3.22.tar.gz 371910
diff --git a/www-servers/nginx/files/nginx.conf-r1 b/www-servers/nginx/files/nginx.conf-r1
new file mode 100644
index 000000000000..4ad6a3c13387
--- /dev/null
+++ b/www-servers/nginx/files/nginx.conf-r1
@@ -0,0 +1,55 @@
+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/nginx-0.3.21.ebuild b/www-servers/nginx/nginx-0.3.21.ebuild
deleted file mode 100644
index 0ff84d054a5c..000000000000
--- a/www-servers/nginx/nginx-0.3.21.ebuild
+++ /dev/null
@@ -1,70 +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.21.ebuild,v 1.1 2006/01/16 15:14:56 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 threads ssl zlib"
-
-DEPEND="dev-lang/perl
-	pcre? ( >=dev-libs/libpcre-4.2 )
-	ssl? ( dev-libs/openssl )
-	zlib? ( sys-libs/zlib )"
-
-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
-
-	./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 \
-		${myconf} || die "configure failed"
-
-	emake || die "failed to compile"
-}
-
-src_install() {
-	keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi}
-
-	dodir /etc/${PN}
-
-	dosbin objs/nginx
-	doinitd ${FILESDIR}/nginx
-
-	insinto /etc/${PN}
-	rm conf/nginx.conf
-	doins -r conf/*
-	doins ${FILESDIR}/nginx.conf
-
-	dodoc CHANGES{,.ru} LICENSE README
-}
diff --git a/www-servers/nginx/nginx-0.3.20.ebuild b/www-servers/nginx/nginx-0.3.22.ebuild
index 20a5fe1a53fe..163d2b47567f 100644
--- a/www-servers/nginx/nginx-0.3.20.ebuild
+++ b/www-servers/nginx/nginx-0.3.22.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.20.ebuild,v 1.1 2006/01/12 14:59:37 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.3.22.ebuild,v 1.1 2006/01/18 14:31:09 voxus Exp $
 
 inherit eutils
 
@@ -11,12 +11,13 @@ SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug fastcgi imap pcre threads ssl zlib"
+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 )"
+	zlib? ( sys-libs/zlib )
+	perl? ( >=dev-lang/perl-5.8 )"
 
 src_compile() {
 	local myconf
@@ -37,6 +38,7 @@ src_compile() {
 	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 \
@@ -56,15 +58,15 @@ src_compile() {
 src_install() {
 	keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi}
 
-	dodir /etc/${PN}
-
 	dosbin objs/nginx
 	doinitd ${FILESDIR}/nginx
 
-	insinto /etc/${PN}
 	rm conf/nginx.conf
-	doins -r conf/*
-	doins ${FILESDIR}/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
 }