* bump, sub flag, cosmetics

(Portage version: 2.1.3.11)

4 files changed, 31 insertions, 23 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index 0f462049e756..a91e3eb0b12f 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,13 @@
 # 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.161 2007/09/25 07:16:42 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.162 2007/10/01 10:41:42 voxus Exp $
+
+*nginx-0.5.32 (01 Oct 2007)
+
+  01 Oct 2007; Konstantin V. Arkhipov <voxus@gentoo.org>
+  -nginx-0.5.31.ebuild, +nginx-0.5.32.ebuild:
+  Version bump. sub useflag added. Certificate generation moved to
+  pkg_postinst().
 
 *nginx-0.6.13 (25 Sep 2007)
 
diff --git a/www-servers/nginx/files/digest-nginx-0.5.31 b/www-servers/nginx/files/digest-nginx-0.5.31
deleted file mode 100644
index f1dd6879cb23..000000000000
--- a/www-servers/nginx/files/digest-nginx-0.5.31
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d84ef8e624b8953faf9cee2b5da535c1 nginx-0.5.31.tar.gz 475892
-RMD160 02153a490c2b58dccf02d120da6c3fd7b26c5a61 nginx-0.5.31.tar.gz 475892
-SHA256 34cae92545e10c6b84708d058a4981f31b688ea5309f24c394b7422ae5d71042 nginx-0.5.31.tar.gz 475892
diff --git a/www-servers/nginx/files/digest-nginx-0.5.32 b/www-servers/nginx/files/digest-nginx-0.5.32
new file mode 100644
index 000000000000..41f9cc8498b8
--- /dev/null
+++ b/www-servers/nginx/files/digest-nginx-0.5.32
@@ -0,0 +1,3 @@
+MD5 0088269b8a59a146b0ba9c9ee29853bb nginx-0.5.32.tar.gz 479982
+RMD160 67117b62e26bf0ff2843042867adf4388fa4d1a1 nginx-0.5.32.tar.gz 479982
+SHA256 8cb95cc61bafec7b0fe3e91f06f2e7aee7b12f12a6af8200d60038f8d5e52cac nginx-0.5.32.tar.gz 479982
diff --git a/www-servers/nginx/nginx-0.5.31.ebuild b/www-servers/nginx/nginx-0.5.32.ebuild
index 81c73cfbfa44..06214a36716f 100644
--- a/www-servers/nginx/nginx-0.5.31.ebuild
+++ b/www-servers/nginx/nginx-0.5.32.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.31.ebuild,v 1.1 2007/08/20 17:36:31 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.5.32.ebuild,v 1.1 2007/10/01 10:41:42 voxus Exp $
 
 inherit eutils ssl-cert
 
@@ -11,7 +11,7 @@ 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 webdav zlib"
+IUSE="debug fastcgi flv imap pcre perl ssl status sub webdav zlib"
 
 DEPEND="dev-lang/perl
 	pcre? ( >=dev-libs/libpcre-4.2 )
@@ -52,6 +52,7 @@ src_compile() {
 	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"
 
 	./configure \
 		--prefix=/usr \
@@ -72,29 +73,29 @@ 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-r1 "${T}"/nginx
+	doinitd "${T}"/nginx
 
-	cp ${FILESDIR}/nginx.conf-r4 conf/nginx.conf
+	cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf
 
-	use ssl && {
-		if [ ! -f /etc/ssl/${PN}/${PN}.key ]; then
-			dodir /etc/ssl/${PN}
-			insinto /etc/ssl/${PN}
-			docert ${PN}
-		fi
-
-		sed -e 's:# ::' -i conf/nginx.conf
-	}
-
-	dodir /etc/${PN}
-	insinto /etc/${PN}
+	dodir "${ROOT}"/etc/${PN}
+	insinto "${ROOT}"/etc/${PN}
 	doins conf/*
 
 	dodoc CHANGES{,.ru} LICENSE README
 
 	use perl && {
-		cd ${S}/objs/src/http/modules/perl/
-		make DESTDIR=${D} install || die "failed to install perl stuff"
+		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
+			insinto "${ROOT}"etc/ssl/${PN}
+			insopts -m0644 -o nginx -g nginx
+			docert nginx
+		fi
 	}
 }