* bump

(Portage version: 2.1.3.16)

4 files changed, 30 insertions, 23 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index a4a51500ca31..6031b2ecce8b 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.163 2007/10/27 19:48:40 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.164 2007/10/30 09:17:03 voxus Exp $
+
+*nginx-0.6.16 (30 Oct 2007)
+
+  30 Oct 2007; Konstantin V. Arkhipov <voxus@gentoo.org>
+  -nginx-0.6.15.ebuild, +nginx-0.6.16.ebuild:
+  Version bump.
 
 *nginx-0.6.15 (27 Oct 2007)
 
diff --git a/www-servers/nginx/files/digest-nginx-0.6.15 b/www-servers/nginx/files/digest-nginx-0.6.15
deleted file mode 100644
index a0884d06d8d1..000000000000
--- a/www-servers/nginx/files/digest-nginx-0.6.15
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a39d9899f5b62f7d123f975ac66b730f nginx-0.6.15.tar.gz 494260
-RMD160 a540b5a3fe1734fd98a16c591ce30d2652dfdd82 nginx-0.6.15.tar.gz 494260
-SHA256 38ef50f0ab34271e853984e14b7e1b6ea1296687d5dd80f409e82d2fd72a5fc5 nginx-0.6.15.tar.gz 494260
diff --git a/www-servers/nginx/files/digest-nginx-0.6.16 b/www-servers/nginx/files/digest-nginx-0.6.16
new file mode 100644
index 000000000000..de5ebb71bfde
--- /dev/null
+++ b/www-servers/nginx/files/digest-nginx-0.6.16
@@ -0,0 +1,3 @@
+MD5 4ee08aacd224db359f7f6dbcb2e91bd8 nginx-0.6.16.tar.gz 494363
+RMD160 80d76595769a91193292a3b959a1ceaa835d2531 nginx-0.6.16.tar.gz 494363
+SHA256 d3ecfa4bf2750053de2ace31dd0283b5dec1db7884ea2aaf290628ca516d29db nginx-0.6.16.tar.gz 494363
diff --git a/www-servers/nginx/nginx-0.6.15.ebuild b/www-servers/nginx/nginx-0.6.16.ebuild
index 450a7a015a30..fbbd18668e41 100644
--- a/www-servers/nginx/nginx-0.6.15.ebuild
+++ b/www-servers/nginx/nginx-0.6.16.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.6.15.ebuild,v 1.1 2007/10/27 19:48:40 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.6.16.ebuild,v 1.1 2007/10/30 09:17:03 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
 	}
 }