Version bump nginx to 0.8.32.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

3 files changed, 32 insertions, 12 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index 0898da004f97..2ec9be07dd64 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/nginx
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.241 2010/01/03 20:58:11 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.242 2010/01/24 15:50:21 djc Exp $
+
+*nginx-0.8.32 (24 Jan 2010)
+
+  24 Jan 2010; Dirkjan Ochtman <djc@gentoo.org> -nginx-0.8.29.ebuild,
+  +nginx-0.8.32.ebuild:
+  Simple version bump to 0.8.32, clean out 0.8.29 while we're at it.
 
   03 Jan 2010; Dirkjan Ochtman <djc@gentoo.org> -nginx-0.7.64-r2.ebuild:
   Remove superseded 0.7.64-r2.
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 54fe46c7722e..009f0276f369 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -6,14 +6,14 @@ DIST nginx-0.5.38.tar.gz 490220 RMD160 95d39df12e4756d03844c68374ec7dd52659b48b
 DIST nginx-0.6.39.tar.gz 529159 RMD160 b94c1fad3185a520ff7ebb40d17ac2bcbeb04ffb SHA1 ba31c5b64d5d394c788bc3255d93a796b5e0e87e SHA256 daf14292863966b75d0c606b7cd2fbb710d1a5a5e8808ab862205643cc83ff1d
 DIST nginx-0.7.62.tar.gz 595995 RMD160 d830ae34f5bac3c494744a8033f32fb7b3107c11 SHA1 6eeb30d3daf7abcca351d9eba78b5adedd6331c5 SHA256 60ee0e9f7f43a7387fec7752a47ff0d06166d2a37a6ad4cfe7aff77162378d2d
 DIST nginx-0.7.64.tar.gz 601601 RMD160 88c982dc88a91db3337c1ab74d7a41d503736366 SHA1 e4f71b9a908c23c3d7bfeb63e97c7f85c3d6eed7 SHA256 5705d08af78add2979f566981c86d59f854b0dd350ac09df87c1f55a6846fbcd
-DIST nginx-0.8.29.tar.gz 617202 RMD160 5960e7ec51261ec667f45722333971e26b759af4 SHA1 ff586e833688f1d72507091268e917c164784200 SHA256 64d96f6b37a1b38a21a819d28f7f57e9b1b5de319bc4d1f1907be8e5bdd1d631
 DIST nginx-0.8.31.tar.gz 619261 RMD160 2a453d5194316fd5374193c6effd768f3afaec1e SHA1 48c7dc662dc1388e1aa4f5cc9f620a3bd2f27a5b SHA256 a810044bd7768da89d794dea8d6fb8503c5c46b0cfc4221e5151e04c4b91904e
+DIST nginx-0.8.32.tar.gz 619865 RMD160 4abacc587bf5fb400933d48bbbd7e92283de8683 SHA1 03c8177ec4943a9f7c33dbd20b1ef5d8dd5a0f9b SHA256 31f70b30ad0838615acb580eef40576f59d96ef72a1e276af2049f6ed4da189a
 EBUILD nginx-0.5.38.ebuild 2953 RMD160 82f38767612e0fa42760435b044c0723645b5920 SHA1 4b6033ac8b4c63a5b207c9ce478a9bc820e4e18d SHA256 6fc8868965a6a1bca92fddf777f6bfdc6550ca0902cd47db895ab3dec5fa406a
 EBUILD nginx-0.6.39.ebuild 3065 RMD160 8d86dee4b70e98c62f1950d7fbc497335f6bd0c0 SHA1 ca5dc97e05ffe1f6d14cf973b3405a338c762d0c SHA256 c55e5dc81dd6f48513152a34f2c3feea6de495994ab8d8fb43ab9096b8ab563a
 EBUILD nginx-0.7.62.ebuild 3266 RMD160 c43344c6945dc7b0fe8b36054fda2e21b7a19b22 SHA1 26e76db9a98cbe052ceb4b9e3a4d63ab071f2df7 SHA256 dfb55c9fc3cddbf8f9166096795c9f190300aebb84a3314f13729ff07c4768e0
 EBUILD nginx-0.7.64-r3.ebuild 3772 RMD160 4127fbd10f4da093a2a76498b00e708316a9f468 SHA1 19f5b4a4c27f3fbd7de8b97164a0fe805ad4718a SHA256 5593770c57b6b0eb19db70d142a93008037f96a8088026fd0beccde83d789f49
 EBUILD nginx-0.7.64.ebuild 3245 RMD160 8964b32796019ad4945313e91c15a8c920fb6054 SHA1 97405f6b86ea9fa946d28097ee8b1e74caf21da0 SHA256 4757d0cee3a57eeab65af6b737e1fabd8a77e6729e7791eb57cfa961b6377e7c
-EBUILD nginx-0.8.29.ebuild 3576 RMD160 8fb6a6ce8003d6f55aa3124714caeca5ee13f4cb SHA1 6363469a2c9d9827a9c6ecc9693bb297594e7945 SHA256 8956bab291d6a3d64aa4e9181c5858c1bea59e4725ccf7efcd276d390d6a880f
 EBUILD nginx-0.8.31.ebuild 4152 RMD160 11c0d450ce2e991c18e7c23650c756c8d2a973cb SHA1 8cbedfe0fb850b0117b6885c237303a9971cff31 SHA256 733f23552748bd2b70d7d2ab0860db53c7d10ccf58ab1e41e5bd96bc97bcc402
-MISC ChangeLog 39256 RMD160 7e414cce45d96a153efa69ca1bb375e2a64209b7 SHA1 51be955c06fc6cdad9196214a1ae1640090860ae SHA256 0849998cd0ce11d3dec5d58a4e5e1545840d28ca6bbd37a54e3cefb8cbb8825b
+EBUILD nginx-0.8.32.ebuild 4152 RMD160 f1270265c4c0eb3209eea0b676e7cb215e270be2 SHA1 8ae55d0ba5984a32622db9d55349255a8b136b29 SHA256 e42bdfa5ed447ceea3698b4cd55efa49da56ec808df4ec7c66733c7e644cb0f2
+MISC ChangeLog 39449 RMD160 23e2191223229e14e7df742874064f0f99e59aa4 SHA1 5603fa8fd653563c2fe5bbb4a888d5453a6106eb SHA256 5f34712cfea3d852d5b148a6b21366ef59d29d2ee0e10d05339f62589422c87e
 MISC metadata.xml 1051 RMD160 8b26725dc2963f93521b4250ee0a0b5f53e65dc7 SHA1 9d27e68ea1b064e244d9468b5ed1177f57a6595d SHA256 a179c21f4f703f739dc3fea2bf1cb647f9be12d68faad93a178579aa5c0b24b9
diff --git a/www-servers/nginx/nginx-0.8.29.ebuild b/www-servers/nginx/nginx-0.8.32.ebuild
index 6012f3984b71..5ccb3eea38f6 100644
--- a/www-servers/nginx/nginx-0.8.29.ebuild
+++ b/www-servers/nginx/nginx-0.8.32.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.8.29.ebuild,v 1.4 2010/01/03 11:32:08 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.8.32.ebuild,v 1.1 2010/01/24 15:50:21 djc Exp $
 
-inherit eutils ssl-cert toolchain-funcs
+inherit eutils ssl-cert toolchain-funcs perl-module
 
 DESCRIPTION="Robust, small and high performance http and reverse proxy server"
 
@@ -11,7 +11,7 @@ SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="addition debug fastcgi flv imap ipv6 pcre perl random-index securelink ssl status sub webdav zlib"
+IUSE="addition aio debug fastcgi flv imap ipv6 pcre perl pop random-index realip securelink smtp ssl static-gzip status sub webdav zlib"
 
 DEPEND="dev-lang/perl
 	dev-libs/openssl
@@ -50,6 +50,7 @@ src_compile() {
 	# fi
 
 	use addition && myconf="${myconf} --with-http_addition_module"
+	use aio		&& myconf="${myconf} --with-file-aio"
 	use ipv6	&& myconf="${myconf} --with-ipv6"
 	use fastcgi	|| myconf="${myconf} --without-http_fastcgi_module"
 	use fastcgi	&& myconf="${myconf} --with-http_realip_module"
@@ -60,13 +61,22 @@ src_compile() {
 	}
 	use debug	&& myconf="${myconf} --with-debug"
 	use ssl		&& myconf="${myconf} --with-http_ssl_module"
-	use imap	&& myconf="${myconf} --with-imap" # pop3/imap4 proxy support
 	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"
+	use realip	&& myconf="${myconf} --with-http_realip_module"
+	use static-gzip		&& myconf="${myconf} --with-http_gzip_static_module"
 	use random-index	&& myconf="${myconf} --with-http_random_index_module"
-	use securelink && myconf="${myconf} --with-http_secure_link_module"
+	use securelink		&& myconf="${myconf} --with-http_secure_link_module"
+
+	if use smtp || use pop || use imap; then
+		myconf="${myconf} --with-mail"
+		use ssl && myconf="${myconf} --with-mail_ssl_module"
+	fi
+	use imap || myconf="${myconf} --without-mail_imap_module"
+	use pop || myconf="${myconf} --without-mail_pop3_module"
+	use smtp || myconf="${myconf} --without-mail_smtp_module"
 
 	tc-export CC
 	./configure \
@@ -89,8 +99,7 @@ src_install() {
 	keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi}
 
 	dosbin objs/nginx
-	cp "${FILESDIR}"/nginx-r1 "${T}"/nginx
-	doinitd "${T}"/nginx
+	newinitd "${FILESDIR}"/nginx.init-r2 nginx || die
 
 	cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf
 
@@ -100,9 +109,14 @@ src_install() {
 
 	dodoc CHANGES{,.ru} README
 
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/nginx.logrotate nginx || die
+
 	use perl && {
 		cd "${S}"/objs/src/http/modules/perl/
-		einstall DESTDIR="${D}"|| die "failed to install perl stuff"
+		einstall DESTDIR="${D}" INSTALLDIRS=vendor || die "failed to install perl stuff"
+		fixlocalpod
 	}
 }