5 files changed, 10 insertions, 77 deletions
diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index 82e917bf2fa4..808ad43418d8 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,10 @@
 # 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.83 2006/04/08 11:05:56 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.84 2006/04/13 08:13:07 voxus Exp $
+
+  13 Apr 2006; Konstantin Arkhipov <voxus@gentoo.org> -nginx-0.3.12.ebuild,
+  nginx-0.3.35.ebuild:
+  Goes stable on amd64 and x86.
 
 *nginx-0.3.37 (08 Apr 2006)
 
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 7a0c087010c1..3c1c1fa9a0b1 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -40,9 +40,9 @@ 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 29eeccbf7428b49ac33f2837f44af70a nginx-0.3.35.ebuild 2082
-RMD160 139f38f68ff85cdd9865a02c4f838642f99086e9 nginx-0.3.35.ebuild 2082
-SHA256 70301b4c980453cbd32d86dbe95eeec2344115ee06d8bc5e073d985c067ee9f9 nginx-0.3.35.ebuild 2082
+MD5 a301fe6fac77bbdb09281e3dc4589bad nginx-0.3.35.ebuild 2080
+RMD160 34e812ef5bedfd80fc2f53f5c7cbabf4110812ef nginx-0.3.35.ebuild 2080
+SHA256 96b40a2072824743893517abacabf48f0e48bcb364938bed73f043263ed2d41a nginx-0.3.35.ebuild 2080
 MD5 d93b73d2b84dc38828e30423bf466937 nginx-0.3.37.ebuild 2082
 RMD160 2b76b2bc2c9c7d600d69c2b433f62e801187a9a7 nginx-0.3.37.ebuild 2082
 SHA256 a900d28838c90d12f20f87406d62ff1f8a6a8e53fc3cb286e0a08d611c7f2beb nginx-0.3.37.ebuild 2082
diff --git a/www-servers/nginx/files/digest-nginx-0.3.12 b/www-servers/nginx/files/digest-nginx-0.3.12
deleted file mode 100644
index fa36bff25e4f..000000000000
--- a/www-servers/nginx/files/digest-nginx-0.3.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 33a9ed3f232f22af5c8edd144b4549b3 nginx-0.3.12.tar.gz 350995
diff --git a/www-servers/nginx/nginx-0.3.12.ebuild b/www-servers/nginx/nginx-0.3.12.ebuild
deleted file mode 100644
index c419cf8d8181..000000000000
--- a/www-servers/nginx/nginx-0.3.12.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.3.12.ebuild,v 1.2 2005/12/05 15:43:32 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.35.ebuild b/www-servers/nginx/nginx-0.3.35.ebuild
index 62f35d2078d8..6b12fee29cd7 100644
--- a/www-servers/nginx/nginx-0.3.35.ebuild
+++ b/www-servers/nginx/nginx-0.3.35.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.35.ebuild,v 1.1 2006/03/23 09:51:28 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.3.35.ebuild,v 1.2 2006/04/13 08:13:07 voxus Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://sysoev.ru/nginx/"
 SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="debug fastcgi imap pcre perl threads ssl zlib"
 
 DEPEND="dev-lang/perl