* bump

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 126 insertions, 8 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index 1d8f15ac1a92..c6978ec713b6 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/nginx
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.215 2009/05/25 14:59:49 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.216 2009/06/16 11:38:46 voxus Exp $
+
+*nginx-0.8.2 (16 Jun 2009)
+*nginx-0.7.60 (16 Jun 2009)
+
+  16 Jun 2009; Konstantin V. Arkhipov <voxus@gentoo.org>
+  -nginx-0.7.59.ebuild, +nginx-0.7.60.ebuild, +nginx-0.8.2.ebuild:
+  Version bump.
 
 *nginx-0.7.59 (25 May 2009)
 
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 6427a0207dce..686f32fb354d 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -15,7 +15,8 @@ DIST nginx-0.4.14.tar.gz 440675 RMD160 b46047cb5b39f7d8ac777f97f5e299231592f280
 DIST nginx-0.5.37.tar.gz 490028 RMD160 7314477c63d8fecb0b81a97230afe0e47dde7978 SHA1 44d50e773254a196f8b0c895acba502d52b87550 SHA256 cc6d5b695fdaff1bbaed7019b7af82c0884df7d181f26cf8eeb01c915289e317
 DIST nginx-0.6.32.tar.gz 522183 RMD160 06749c5bf834a3f7e82ad3122a5db457c193d117 SHA1 346166171477c3e78759bdbbc8461107d8475269 SHA256 d74bbb9235e7beabf7be03a7dec99f0cab89fa4430a998a6a7151901ea141e9d
 DIST nginx-0.6.37.tar.gz 528754 RMD160 7c1437cb2f0ec11366b0abe9021155d30611ccfb SHA1 791c73fa6c84fb08f345e2338ab5e455fb552569 SHA256 6abbb2c0396630771b1b1514cf3c28f95e1cf811b4ff462f754d97818456d405
-DIST nginx-0.7.59.tar.gz 593586 RMD160 297aa1408cd89e78970a8e9c0bfdffc796155032 SHA1 3fb8d89420771106d04fb2f7dac2fcbe2e828be2 SHA256 e12f0ec0f97e635ec1a249719bbe23ca1c9d3809e4019dde404e72ccdf277d75
+DIST nginx-0.7.60.tar.gz 594505 RMD160 ec81b5f7d6c58b1d90edd416cb24f54c2b5c3121 SHA1 7f2db50a811390a58d3558156a23b8852b0cadbf SHA256 1278515d05080b62dec5b0c71ea4ba4ec0d7777b7d296e783443ca8e1c6d4668
+DIST nginx-0.8.2.tar.gz 594729 RMD160 e6f43976a121c31c84ee0192a05aba571d341996 SHA1 0fdfa2642d3ef0cad97114f6d43d68dff20038af SHA256 5b553ae18a8b4c80895538e8313729741d0ca004eb2beec48d51aff3c2c85c66
 EBUILD nginx-0.1.45.ebuild 1935 RMD160 ad7fba7daf610154845d2e6b96e27472d6d4b61f SHA1 bf8840d9be7e7f824d86bfca8846e227a40810ba SHA256 f81dfd0f45c9ba301b5f9ebffab11508d3dcdb468ab1b023270a74ee1a1c0217
 EBUILD nginx-0.2.6.ebuild 1934 RMD160 72631cd248e54aec3dfb527bf024675703e1d1d5 SHA1 ceb626e76f4af89bc6ffbe840f0ba21366274449 SHA256 ec4a8c3fa5f8917e96042d464ee1ed55420a78e69b0ee98f69e796712aadbc78
 EBUILD nginx-0.3.61.ebuild 2293 RMD160 c69d8e9a62080102ba1de7c1118f19a7c7534085 SHA1 d8ae1bb493c0a5b985b2f182ccdec034483f6008 SHA256 3628f10c208261db081487f8e05442bba48feaaa0df2c15766bcd32148ff568c
@@ -23,13 +24,14 @@ EBUILD nginx-0.4.14.ebuild 2293 RMD160 5acc8d582dbf5a6da3b8e92f25b127d99e163703
 EBUILD nginx-0.5.37.ebuild 2948 RMD160 78f82e5df19b6f087b004d4d67f8c45e6c2c7d1c SHA1 d2e73605cb7fe74858ee5a82e7bc3f43a28a7ccb SHA256 fb1f1a0d10d1f2ae43f57ec1182c54c2b9c356c145666b19a28cbd1c28ee3a4e
 EBUILD nginx-0.6.32.ebuild 3060 RMD160 919c8265b2abdb9b4ff63dfc939df30c56a698e3 SHA1 13282784a82670423f56d8d3463a3771c291d9fd SHA256 6bbcb10f4ec9657e94b4178065c073e829385f2b2c9d7e53a19fa0ba258255f1
 EBUILD nginx-0.6.37.ebuild 3062 RMD160 0f25492950c040622531c10a351a04654c3b39fa SHA1 ebc6e8df6d82776f6d041c9bca7c9e803edecd80 SHA256 b54abf02632da4dc94d9684db666a637692306fcdc39fdf7b4fa020715d9e2e3
-EBUILD nginx-0.7.59.ebuild 3263 RMD160 5029a76f77802dafc0f553f684fc5a56397ef5a3 SHA1 170036d1553285b7dcb30fa70b5484056a3d7f27 SHA256 3669f21c7b9577597d1a6245f14d761d3ad93fd2ad91739a088e069463d7412f
-MISC ChangeLog 34648 RMD160 17c8708a122835935bdaee6db164f3d944a7e3ed SHA1 063270752a5a7d2cd4b3ed3d8cc815cbbc05cb67 SHA256 12a2d80cb2f96367386d7ffc0fc7ef90fdfa035d6c797ef968aa2b216c84d833
+EBUILD nginx-0.7.60.ebuild 3263 RMD160 379f577f8ca632254915b15b21910c371439bd81 SHA1 036beb386fb9fbf7d9c85b6183c612cb4b280282 SHA256 5edb66f877afd168cf1c746abaec2249c1286c8f8b0512d1bf5eb72b288e3c42
+EBUILD nginx-0.8.2.ebuild 3262 RMD160 0331d6ef5161d6232369b2b0054ec3717b30d54a SHA1 57ddb6989953df33dfd89bac1f80b39dc06a7904 SHA256 7d3c6fe252be82cc52d6742a84281c6cbb4420f80444cf3b45d6380ac022283b
+MISC ChangeLog 34845 RMD160 46af02538f699e774e2d6eb56af2c9905e4feac0 SHA1 1b80a0dba246bfe56ba36e1bb990af6c4f83d952 SHA256 be6737c26806574624aa2ac4d6422ce57b0c927aaefe044be0d79f65e63e2095
 MISC metadata.xml 595 RMD160 e06fbe391f9ab0805dbe68043559994afd17ec97 SHA1 5c4b053e47410ee159081ace8ca01952a2c23b95 SHA256 f957e3933c4e5b8fb9c97519c4a0d6d30063c076051e285640a24a3d8512dfe6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoasm8ACgkQbwxeDFj+ScroFACeJShO1ZuoJMRBuOJtyi52NxpU
-wrEAniDPnHioxAQ8ZJgWaEIJjoc+HOKp
-=AVSw
+iEYEARECAAYFAko3hE8ACgkQbwxeDFj+Scr3eQCdHRH+sBqx27poogE4jpBTM0+L
+B6UAniqU4UJRSiiqEyihNGVlj8rvtzQp
+=zgfi
 -----END PGP SIGNATURE-----
diff --git a/www-servers/nginx/nginx-0.7.59.ebuild b/www-servers/nginx/nginx-0.7.60.ebuild
index f16c5ecb0b61..df6353114fb4 100644
--- a/www-servers/nginx/nginx-0.7.59.ebuild
+++ b/www-servers/nginx/nginx-0.7.60.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.7.59.ebuild,v 1.1 2009/05/25 14:59:49 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.7.60.ebuild,v 1.1 2009/06/16 11:38:46 voxus Exp $
 
 inherit eutils ssl-cert toolchain-funcs
 
diff --git a/www-servers/nginx/nginx-0.8.2.ebuild b/www-servers/nginx/nginx-0.8.2.ebuild
new file mode 100644
index 000000000000..c42f918c6ce6
--- /dev/null
+++ b/www-servers/nginx/nginx-0.8.2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.8.2.ebuild,v 1.1 2009/06/16 11:38:46 voxus Exp $
+
+inherit eutils ssl-cert toolchain-funcs
+
+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 debug fastcgi flv imap pcre perl random-index ssl status sub webdav zlib"
+
+DEPEND="dev-lang/perl
+	pcre? ( >=dev-libs/libpcre-4.2 )
+	ssl? ( dev-libs/openssl )
+	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 ${?}
+}
+
+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 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 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 random-index	&& myconf="${myconf} --with-http_random_index_module"
+
+	tc-export CC
+	./configure \
+		--prefix=/usr \
+		--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 \
+		--with-md5-asm --with-md5=/usr/include \
+		--with-sha1-asm --with-sha1=/usr/include \
+		${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
+	cp "${FILESDIR}"/nginx-r1 "${T}"/nginx
+	doinitd "${T}"/nginx
+
+	cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf
+
+	dodir /etc/${PN}
+	insinto /etc/${PN}
+	doins conf/*
+
+	dodoc CHANGES{,.ru} README
+
+	use perl && {
+		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
+			install_cert /etc/ssl/${PN}/${PN}
+			chown ${PN}:${PN} "${ROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
+		fi
+	}
+}