Bump www-servers/nginx to 0.8.31, add a requested use flag.

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

4 files changed, 142 insertions, 3 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index 399b968a0c13..f82371f49197 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.239 2010/01/03 20:29:40 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.240 2010/01/03 20:56:46 djc Exp $
+
+*nginx-0.8.31 (03 Jan 2010)
+
+  03 Jan 2010; Dirkjan Ochtman <djc@gentoo.org> +nginx-0.8.31.ebuild,
+  metadata.xml:
+  Bump to 0.8.31, adding the aio use flag.
 
 *nginx-0.7.64-r3 (03 Jan 2010)
 
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 49c5526d9d2a..f2e3edda57b8 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -7,6 +7,7 @@ DIST nginx-0.6.39.tar.gz 529159 RMD160 b94c1fad3185a520ff7ebb40d17ac2bcbeb04ffb
 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
 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
@@ -14,5 +15,6 @@ EBUILD nginx-0.7.64-r2.ebuild 3614 RMD160 49371d1b5d819f90bf38ff0a79bfb300b05769
 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
-MISC ChangeLog 38992 RMD160 c5f6b87dde16ef1023a357eccac9803474e3ddb4 SHA1 68aaba95199de757fa2c263126bf308eeef64df3 SHA256 207457267fe0fce356cb24b1de561925728b15d6f3b60fa64b9eb4e40cd2a55a
-MISC metadata.xml 978 RMD160 6cf33e104298aefacce82d8de174a85ab5fa118f SHA1 f4a37ad34cd72f5b96c0a110400f75f29c8a8352 SHA256 f6f378093aaa78b63ef1fdaf1cb2ffcb5d2186f59627466a17339eeb27bb92bb
+EBUILD nginx-0.8.31.ebuild 4152 RMD160 11c0d450ce2e991c18e7c23650c756c8d2a973cb SHA1 8cbedfe0fb850b0117b6885c237303a9971cff31 SHA256 733f23552748bd2b70d7d2ab0860db53c7d10ccf58ab1e41e5bd96bc97bcc402
+MISC ChangeLog 39151 RMD160 66b4da6e9a46d981a9d038b5f63972df31478847 SHA1 4a8c0bbf8502f168b9979e72a07180f7701b09b8 SHA256 bed0430b28b063da900b1eac534e9403e6eff1b6dc9c222f2184dc866cf97cdf
+MISC metadata.xml 1028 RMD160 53f0acbd2a955fe8cb53157c0b44a7a4a6409062 SHA1 fd7791d5169bfaddc3e9487159cc170592b3bd9a SHA256 153be3d632434f345117c327612ba32fd567d1f176e40cbeeef70ca4b876e7a0
diff --git a/www-servers/nginx/metadata.xml b/www-servers/nginx/metadata.xml
index 2e30f72531c9..1a83e5230ab1 100644
--- a/www-servers/nginx/metadata.xml
+++ b/www-servers/nginx/metadata.xml
@@ -10,6 +10,7 @@
   </maintainer>
   <use>
 	<flag name='addition'>Enables HTTP addition filter module</flag>
+	<flag name='aio'>Enables file AIO support</flag>
 	<flag name='flv'>Enables special processing module for flv files</flag>
 	<flag name='static-gzip'>Enables support for gzipping static content</flag>
 	<flag name='pop'>Enables POP3 proxy support</flag>
diff --git a/www-servers/nginx/nginx-0.8.31.ebuild b/www-servers/nginx/nginx-0.8.31.ebuild
new file mode 100644
index 000000000000..dc2fbd265756
--- /dev/null
+++ b/www-servers/nginx/nginx-0.8.31.ebuild
@@ -0,0 +1,130 @@
+# 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.31.ebuild,v 1.1 2010/01/03 20:56:46 djc Exp $
+
+inherit eutils ssl-cert toolchain-funcs perl-module
+
+DESCRIPTION="Robust, small and high performance http and reverse proxy server"
+
+HOMEPAGE="http://nginx.net/"
+SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+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
+	pcre? ( >=dev-libs/libpcre-4.2 )
+	zlib? ( sys-libs/zlib )
+	perl? ( >=dev-lang/perl-5.8 )"
+
+pkg_setup() {
+	ebegin "Creating nginx user and group"
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+	eend ${?}
+	if use ipv6; then
+		ewarn "Note that ipv6 support in nginx is still experimental."
+		ewarn "Be sure to read comments on gentoo bug #274614"
+		ewarn "http://bugs.gentoo.org/show_bug.cgi?id=274614"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make || die
+}
+
+src_compile() {
+	local myconf
+
+	# threads support is broken atm.
+	#
+	# if use threads; then
+	# 	einfo
+	# 	ewarn "threads support is experimental at the moment"
+	# 	ewarn "do not use it on production systems - you've been warned"
+	# 	einfo
+	# 	myconf="${myconf} --with-threads"
+	# 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"
+	use flv		&& myconf="${myconf} --with-http_flv_module"
+	use zlib	|| myconf="${myconf} --without-http_gzip_module"
+	use pcre	|| {
+		myconf="${myconf} --without-pcre --without-http_rewrite_module"
+	}
+	use debug	&& myconf="${myconf} --with-debug"
+	use ssl		&& myconf="${myconf} --with-http_ssl_module"
+	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"
+
+	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 \
+		--prefix=/usr \
+		--with-cc-opt="-I${ROOT}/usr/include" \
+		--with-ld-opt="-L${ROOT}/usr/lib" \
+		--conf-path=/etc/${PN}/${PN}.conf \
+		--http-log-path=/var/log/${PN}/access_log \
+		--error-log-path=/var/log/${PN}/error_log \
+		--pid-path=/var/run/${PN}.pid \
+		--http-client-body-temp-path=/var/tmp/${PN}/client \
+		--http-proxy-temp-path=/var/tmp/${PN}/proxy \
+		--http-fastcgi-temp-path=/var/tmp/${PN}/fastcgi \
+		${myconf} || die "configure failed"
+
+	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" || die "failed to compile"
+}
+
+src_install() {
+	keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi}
+
+	dosbin objs/nginx
+	newinitd "${FILESDIR}"/nginx.init-r2 nginx || die
+
+	cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf
+
+	dodir /etc/${PN}
+	insinto /etc/${PN}
+	doins conf/*
+
+	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}" INSTALLDIRS=vendor || die "failed to install perl stuff"
+		fixlocalpod
+	}
+}
+
+pkg_postinst() {
+	use ssl && {
+		if [ ! -f "${ROOT}"/etc/ssl/${PN}/${PN}.key ]; then
+			install_cert /etc/ssl/${PN}/${PN}
+			chown ${PN}:${PN} "${ROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
+		fi
+	}
+}