* bump and bugs #199375, #200240 and #201691

(Portage version: 2.1.4_rc9)

5 files changed, 24 insertions, 14 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index 1a935e876b82..3cc981572061 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/nginx
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.166 2007/11/29 12:14:29 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.167 2007/12/09 14:27:35 voxus Exp $
+
+*nginx-0.6.21 (09 Dec 2007)
+
+  09 Dec 2007; Konstantin V. Arkhipov <voxus@gentoo.org>
+  nginx-0.5.33.ebuild, -nginx-0.6.20.ebuild, +nginx-0.6.21.ebuild:
+  Version bump, also closes bugs #199375, #200240 and #201691.
 
 *nginx-0.6.20 (29 Nov 2007)
 
diff --git a/www-servers/nginx/files/digest-nginx-0.6.20 b/www-servers/nginx/files/digest-nginx-0.6.20
deleted file mode 100644
index b2540a012cce..000000000000
--- a/www-servers/nginx/files/digest-nginx-0.6.20
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 85299a2d133329402df07fa166edec4b nginx-0.6.20.tar.gz 507118
-RMD160 286646d2e38b627472b4262c3067057b5cb34881 nginx-0.6.20.tar.gz 507118
-SHA256 748c04b74f11822a23fa435a3fc42a61ddc49d7847879b04669a7fbe9a29693b nginx-0.6.20.tar.gz 507118
diff --git a/www-servers/nginx/files/digest-nginx-0.6.21 b/www-servers/nginx/files/digest-nginx-0.6.21
new file mode 100644
index 000000000000..c41785879801
--- /dev/null
+++ b/www-servers/nginx/files/digest-nginx-0.6.21
@@ -0,0 +1,3 @@
+MD5 1dcd5f1390db3d2b63ab670b9d44cc80 nginx-0.6.21.tar.gz 507780
+RMD160 d0c6e86f6553e364def3c2ef06ec4d7d0bb2fe97 nginx-0.6.21.tar.gz 507780
+SHA256 59c7785f6c58377c178792d2ffc908ab42b6d3f1a2c2bac1e01ca51fa0ad5872 nginx-0.6.21.tar.gz 507780
diff --git a/www-servers/nginx/nginx-0.5.33.ebuild b/www-servers/nginx/nginx-0.5.33.ebuild
index 8d84efc45273..241603beb251 100644
--- a/www-servers/nginx/nginx-0.5.33.ebuild
+++ b/www-servers/nginx/nginx-0.5.33.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.5.33.ebuild,v 1.1 2007/11/08 13:28:59 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.5.33.ebuild,v 1.2 2007/12/09 14:27:35 voxus Exp $
 
 inherit eutils ssl-cert
 
@@ -92,10 +92,11 @@ src_install() {
 
 pkg_postinst() {
 	use ssl && {
-		if [ ! -f "${ROOT}"etc/ssl/${PN}/${PN}.key ]; then
-			insinto "${ROOT}"etc/ssl/${PN}
+		if [ ! -f "${ROOT}"/etc/ssl/${PN}/${PN}.key ]; then
+			dodir "${ROOT}"/etc/ssl/${PN}
+			insinto "${ROOT}"etc/ssl/${PN}/
 			insopts -m0644 -o nginx -g nginx
-			docert nginx
+			install_cert /etc/ssl/nginx/nginx
 		fi
 	}
 }
diff --git a/www-servers/nginx/nginx-0.6.20.ebuild b/www-servers/nginx/nginx-0.6.21.ebuild
index c801f26a6bd3..f90b4ac55e39 100644
--- a/www-servers/nginx/nginx-0.6.20.ebuild
+++ b/www-servers/nginx/nginx-0.6.21.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.6.20.ebuild,v 1.1 2007/11/29 12:14:29 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.6.21.ebuild,v 1.1 2007/12/09 14:27:35 voxus Exp $
 
 inherit eutils ssl-cert
 
 DESCRIPTION="Robust, small and high performance http and reverse proxy server"
 
-HOMEPAGE="http://sysoev.ru/nginx/"
+HOMEPAGE="http://nginx.net/"
 SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug fastcgi flv imap pcre perl ssl status sub webdav zlib"
+IUSE="addition debug fastcgi flv imap pcre perl ssl status sub webdav zlib"
 
 DEPEND="dev-lang/perl
 	pcre? ( >=dev-libs/libpcre-4.2 )
@@ -39,6 +39,7 @@ src_compile() {
 	# 	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"
@@ -64,6 +65,7 @@ src_compile() {
 		--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 || die "failed to compile"
@@ -92,10 +94,11 @@ src_install() {
 
 pkg_postinst() {
 	use ssl && {
-		if [ ! -f "${ROOT}"etc/ssl/${PN}/${PN}.key ]; then
-			insinto "${ROOT}"etc/ssl/${PN}
+		if [ ! -f "${ROOT}"/etc/ssl/${PN}/${PN}.key ]; then
+			dodir "${ROOT}"/etc/ssl/${PN}
+			insinto "${ROOT}"etc/ssl/${PN}/
 			insopts -m0644 -o nginx -g nginx
-			docert nginx
+			install_cert /etc/ssl/nginx/nginx
 		fi
 	}
 }