* bump, sub flag, cosmetics

Package-Manager: portage-2.1.3.11

5 files changed, 43 insertions, 35 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/Manifest b/www-servers/nginx/Manifest
index 686a3d1be23a..0d513cd5bb7b 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -31,7 +31,7 @@ DIST nginx-0.2.6.tar.gz 329236 RMD160 96387007cf325dd7fd78b020f4416431dccd50fa S
 DIST nginx-0.3.61.tar.gz 416967 RMD160 bf4d84d3cdfb6d8f767e75aa9ef69a2bca6c08a0 SHA1 a6202a19e82f8d1c82eec7c7ee754c61e450716b SHA256 19dbfb86c42e38c8ced641b6b8f808951a60003ff711c5f7cc68448a159df6b4
 DIST nginx-0.4.14.tar.gz 440675 RMD160 b46047cb5b39f7d8ac777f97f5e299231592f280 SHA1 b3a98211595dd6b0ee2b0fe7e5103e0cdf34bf08 SHA256 de916da2e01835cafe6fc90457ca14bcd065814b0f920d783aeb57efbbe4539e
 DIST nginx-0.5.26.tar.gz 471489 RMD160 ba8bc959709ae2ff7f02d9a46faaea70bbcd5922 SHA1 86b7ccc4bfbaa44bca979e23c4a5bbf0ef090ee3 SHA256 90f143b1e07af27cdceb60ed69b88cb6720d622ddc2ee93fd30c8a831441bb1d
-DIST nginx-0.5.31.tar.gz 475892 RMD160 02153a490c2b58dccf02d120da6c3fd7b26c5a61 SHA1 c58076b3e1f3f4cb59afe5143fc0a893d3a4f0ba SHA256 34cae92545e10c6b84708d058a4981f31b688ea5309f24c394b7422ae5d71042
+DIST nginx-0.5.32.tar.gz 479982 RMD160 67117b62e26bf0ff2843042867adf4388fa4d1a1 SHA1 3cb4bc097675e5c1a90e59bf51f4a24b985a6dfa SHA256 8cb95cc61bafec7b0fe3e91f06f2e7aee7b12f12a6af8200d60038f8d5e52cac
 DIST nginx-0.6.13.tar.gz 491109 RMD160 130850ff7cf419cd42497d13297ef8f1dd4a346f SHA1 6dc2bcacaef79acdd3e9b99719d253b3ecffc852 SHA256 211d315d2df8914ca4486486a99c8ec22dbbb19a2838242c290f3d59779c8be7
 EBUILD nginx-0.1.45.ebuild 1935 RMD160 ad7fba7daf610154845d2e6b96e27472d6d4b61f SHA1 bf8840d9be7e7f824d86bfca8846e227a40810ba SHA256 f81dfd0f45c9ba301b5f9ebffab11508d3dcdb468ab1b023270a74ee1a1c0217
 MD5 62f46895e63da25c83512f589b9e61cb nginx-0.1.45.ebuild 1935
@@ -53,18 +53,18 @@ EBUILD nginx-0.5.26.ebuild 2740 RMD160 a5f1845f92ee1dc7c1d89cf87ca7b1b7e647a8b6
 MD5 b43f99ae6899b9ba81acf505334b7fde nginx-0.5.26.ebuild 2740
 RMD160 a5f1845f92ee1dc7c1d89cf87ca7b1b7e647a8b6 nginx-0.5.26.ebuild 2740
 SHA256 1b3e5c2704f443f290c7a1364fc175248f0d16c2dd517f23215c6d446e5a8ccd nginx-0.5.26.ebuild 2740
-EBUILD nginx-0.5.31.ebuild 2801 RMD160 2cbead709c75e6ee571d0bf61e0db19922bb55e6 SHA1 8fcfd848158059fef6fbadccc34619f8f91cd4ef SHA256 83a43f72a2d62062bf35f5e7e8eadb15cd12b36b645150261433c9e3cb3d8b0f
-MD5 2ff0488f3a424899833b480e32823a69 nginx-0.5.31.ebuild 2801
-RMD160 2cbead709c75e6ee571d0bf61e0db19922bb55e6 nginx-0.5.31.ebuild 2801
-SHA256 83a43f72a2d62062bf35f5e7e8eadb15cd12b36b645150261433c9e3cb3d8b0f nginx-0.5.31.ebuild 2801
+EBUILD nginx-0.5.32.ebuild 2894 RMD160 fa8e9d7010b19bc09c16fbcc8776783d61d63420 SHA1 2a7895adfa5f868e2183b097e8151db2493faabd SHA256 f4dfd95dd33aa578f02b022ade868f1c4c0d571aa82598ec0d2a1e34f80cc8b7
+MD5 05a110676e0da587cd8ebd8ed59e60b9 nginx-0.5.32.ebuild 2894
+RMD160 fa8e9d7010b19bc09c16fbcc8776783d61d63420 nginx-0.5.32.ebuild 2894
+SHA256 f4dfd95dd33aa578f02b022ade868f1c4c0d571aa82598ec0d2a1e34f80cc8b7 nginx-0.5.32.ebuild 2894
 EBUILD nginx-0.6.13.ebuild 2801 RMD160 e113cd31f74d3d91737ccb4436390fdf90e7ec82 SHA1 3b0d3f323b76925d915314445a856850c9b343bc SHA256 699b83c76c58860f134b5d7a6b60810a5bcaa66aad9b92b21e562a0ba08c2b12
 MD5 c2fe4c830b2e0bac0a747dd1f6de7fd2 nginx-0.6.13.ebuild 2801
 RMD160 e113cd31f74d3d91737ccb4436390fdf90e7ec82 nginx-0.6.13.ebuild 2801
 SHA256 699b83c76c58860f134b5d7a6b60810a5bcaa66aad9b92b21e562a0ba08c2b12 nginx-0.6.13.ebuild 2801
-MISC ChangeLog 26080 RMD160 969de96f4de8d7cb647c387e1469b1415a10a4a6 SHA1 a755ddaab670a0b7a00ad00636f8615e09f13767 SHA256 d4fda49044395a2fed9be9fd4abf4d73858ff6c39f998245c72282df0fe592b3
-MD5 e4e40454a76b12495f77373fa8e76ef1 ChangeLog 26080
-RMD160 969de96f4de8d7cb647c387e1469b1415a10a4a6 ChangeLog 26080
-SHA256 d4fda49044395a2fed9be9fd4abf4d73858ff6c39f998245c72282df0fe592b3 ChangeLog 26080
+MISC ChangeLog 26298 RMD160 48f59a909a658ea235cd0eb3d4c840bb980d8e28 SHA1 038a8d4210828463256eed1904ad5d51de20831f SHA256 f35dab641ddd75b8d3dba0a04731fc5ddcade2ef7185b8235da0401300e63f5b
+MD5 1fc4f531efccb6c4505c3ee30f15ae4e ChangeLog 26298
+RMD160 48f59a909a658ea235cd0eb3d4c840bb980d8e28 ChangeLog 26298
+SHA256 f35dab641ddd75b8d3dba0a04731fc5ddcade2ef7185b8235da0401300e63f5b ChangeLog 26298
 MISC metadata.xml 220 RMD160 7b73eb49ba7071b35813559b0871b5ddb4bcbb32 SHA1 798994deb26bee08b8be0c1197762b4bae655d67 SHA256 82c6d8c120358d0322f44bde92698ac1664b9478ce19428fc50c7048a38b2d26
 MD5 822f3c821527e6a34f23a6a92a884766 metadata.xml 220
 RMD160 7b73eb49ba7071b35813559b0871b5ddb4bcbb32 metadata.xml 220
@@ -84,9 +84,9 @@ SHA256 152d5b60ad4a168b813e02f5a6b2453aa7d232e3d3976ee706ea684bc26acc98 files/di
 MD5 c8aec7fcd76e9d521d709496a7121e22 files/digest-nginx-0.5.26 238
 RMD160 d9e6c8a372ddeb93fb3c521e52a24d5439c5c926 files/digest-nginx-0.5.26 238
 SHA256 ca405c75de6cbd653fd9612456337a3631a48acc8b0fd41e283ae7273c15946b files/digest-nginx-0.5.26 238
-MD5 d14cb3899b667bd3e4d1d6a424c609f6 files/digest-nginx-0.5.31 238
-RMD160 cb6c1ff07fefea7aba5131028c45f3c63758c591 files/digest-nginx-0.5.31 238
-SHA256 a646b0f4660856fc1f9aa424ba219270a4c8d345c727797868ee67efeddcccbc files/digest-nginx-0.5.31 238
+MD5 edaad72af751775f4131ad3e953c65a6 files/digest-nginx-0.5.32 238
+RMD160 e134985cb154ad08ba9f5575187bcb52d63a5aa8 files/digest-nginx-0.5.32 238
+SHA256 db2c91b997c418b85cdf0d8a15ccb9537e015ff2a57f86e63ed775930fc914ba files/digest-nginx-0.5.32 238
 MD5 10a78030c52324e8f8fd1300c13a751d files/digest-nginx-0.6.13 238
 RMD160 a53bdb3d33c2d7782c6733e5994b1aa3e4d44aad files/digest-nginx-0.6.13 238
 SHA256 3c74f7b2621293d3f40e29d5b1d9879183bce43f20f29282dc807cc8eeeffab2 files/digest-nginx-0.6.13 238
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
 	}
 }