* stabilization

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

5 files changed, 15 insertions, 117 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index 9977a2ee24fd..95013ef5c188 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,10 @@
 # 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.218 2009/06/23 08:51:41 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.219 2009/07/09 13:44:57 voxus Exp $
+
+  09 Jul 2009; Konstantin V. Arkhipov <voxus@gentoo.org>
+  -nginx-0.6.32.ebuild, nginx-0.6.38.ebuild, nginx-0.7.61.ebuild:
+  Stabilization.
 
 *nginx-0.6.38 (23 Jun 2009)
 
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 2546374e0c26..76de3349f940 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -13,7 +13,6 @@ 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.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.38.tar.gz 528956 RMD160 9ecb90e31b9576b597786bfdfb8906a1a662ea9b SHA1 9857211846200b2edc3461f6621c659e249c7a7c SHA256 4e391b79021a94c9866c30601d8d4d3a4d86a937b5db806c20a412e09177a737
 DIST nginx-0.7.61.tar.gz 594817 RMD160 dfc1a8e03789cd85314ceacb1cd99f277b7ec0af SHA1 4d9b3ac6c108ab00723272dc455647c8c2486526 SHA256 60cb23f38bda93e3bdaa554826b06bc0abf807d2e4352d856c49bd802a3f05d1
 DIST nginx-0.8.4.tar.gz 595288 RMD160 0c2332c8d0680bd04b6af427e3cbccc42d1876d0 SHA1 828ebb4ef1e7f9b80cbe6a6a42adaf180cd777ec SHA256 ffabf25ac25f8d871c7d6034baad1e991a36223fd755436547e59239621732ed
@@ -22,16 +21,15 @@ EBUILD nginx-0.2.6.ebuild 1934 RMD160 72631cd248e54aec3dfb527bf024675703e1d1d5 S
 EBUILD nginx-0.3.61.ebuild 2293 RMD160 c69d8e9a62080102ba1de7c1118f19a7c7534085 SHA1 d8ae1bb493c0a5b985b2f182ccdec034483f6008 SHA256 3628f10c208261db081487f8e05442bba48feaaa0df2c15766bcd32148ff568c
 EBUILD nginx-0.4.14.ebuild 2293 RMD160 5acc8d582dbf5a6da3b8e92f25b127d99e163703 SHA1 7e5274dd028e88390a68da5548b92389465ce2ba SHA256 9243dc8e002ad9a28887fcc98df088ba3bbb50f5e8d46c02005c335d5a0f7426
 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.38.ebuild 3062 RMD160 d93c1b36be59d685db77a7e51e5f30f6a88f200a SHA1 1a31a1679ee4cb4c7d9604f7610a89106d59c1eb SHA256 f4764dcd58fdfe8dfc8efc33ca8e68f19b1c3ff1892a5445ba0081828789c469
-EBUILD nginx-0.7.61.ebuild 3263 RMD160 542e40cce2728e56883d97bb2a7918c84ea66ba7 SHA1 5c284c5f599ff216a6eb721384f9a9dcbd1ce849 SHA256 38b826deb2e11d2d31eb20c920b6a6b035a5a528f8b52f1220b12f11b48d29dc
+EBUILD nginx-0.6.38.ebuild 3060 RMD160 56a00c95e0b45093147d11e188fdc0c16b2f1ff2 SHA1 4b0dfd4f51969e48a6f93d8f9752e1a5e89aec52 SHA256 60d1d3188a3e2c508211bfe4fe34cc8f44e543e845fe1e6f481cc6051c9c54aa
+EBUILD nginx-0.7.61.ebuild 3261 RMD160 b12e46480f3a1fe714db5270a2a95376cb0684c3 SHA1 da46085272c864c2c23b7fda160033ddd4208d77 SHA256 429de38daad8cfcc32662e4737a481975ada406d8e628194e9f975ad4174b98e
 EBUILD nginx-0.8.4.ebuild 3262 RMD160 28ea88d2decadf55ffb12bf0a6688788f666dec4 SHA1 e9f51f17b406e3ae41cdae698c16b0a479071c77 SHA256 1efb4f0aa40c6d7c5b26efe165d16ff39f4692e7b762125375c8011211d8cf33
-MISC ChangeLog 35214 RMD160 5efe7f1621405797bedd88e97ed762147d3ceca5 SHA1 006bd128327c880b7689c4c82ebd41bd9418ce98 SHA256 d694f2513fb9cb4dec3e20eaf681c5fc7b57ca2bccc51f9f0c7829684e7b4320
+MISC ChangeLog 35355 RMD160 4220bf5670543c533a767e76702bca36a7e61b15 SHA1 8da09d2b941e3f8018cfc7794c576d7d12634af8 SHA256 fbf3f1e77544974a12474ad4b5a1f782b56600673b2d1319d9e58d545f5de226
 MISC metadata.xml 595 RMD160 e06fbe391f9ab0805dbe68043559994afd17ec97 SHA1 5c4b053e47410ee159081ace8ca01952a2c23b95 SHA256 f957e3933c4e5b8fb9c97519c4a0d6d30063c076051e285640a24a3d8512dfe6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.12 (GNU/Linux)
 
-iEYEARECAAYFAkpAl6cACgkQbwxeDFj+ScoexgCfX9fhn/mWFpq86tOXQOxbt4kw
-WP8AoMA6sAoCTaaxpcvMjoX+4xVJrwlw
-=ybDt
+iEYEARECAAYFAkpV9GMACgkQbwxeDFj+ScrMOQCfZHAEOBE1J/rIHV/3SQHar4FV
+MoAAn0AIOS9ktjdUj7V6BjjA6Lj0TrXw
+=SoWC
 -----END PGP SIGNATURE-----
diff --git a/www-servers/nginx/nginx-0.6.32.ebuild b/www-servers/nginx/nginx-0.6.32.ebuild
deleted file mode 100644
index 4bfdfa599dd0..000000000000
--- a/www-servers/nginx/nginx-0.6.32.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.6.32.ebuild,v 1.2 2008/10/25 17:36:52 voxus Exp $
-
-inherit eutils ssl-cert
-
-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"
-IUSE="addition debug fastcgi flv imap pcre perl 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 nginx
-	enewuser nginx -1 -1 /dev/null nginx
-	eend ${?}
-}
-
-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"
-
-	./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 || 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 "${ROOT}"/etc/${PN}
-	insinto "${ROOT}"/etc/${PN}
-	doins conf/*
-
-	dodoc CHANGES{,.ru} LICENSE 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
-			dodir "${ROOT}"/etc/ssl/${PN}
-			insinto "${ROOT}"etc/ssl/${PN}/
-			insopts -m0644 -o nginx -g nginx
-			install_cert /etc/ssl/nginx/nginx
-		fi
-	}
-}
diff --git a/www-servers/nginx/nginx-0.6.38.ebuild b/www-servers/nginx/nginx-0.6.38.ebuild
index 33333a0e73e5..e35c319d5bf4 100644
--- a/www-servers/nginx/nginx-0.6.38.ebuild
+++ b/www-servers/nginx/nginx-0.6.38.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.6.38.ebuild,v 1.1 2009/06/23 08:51:41 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.6.38.ebuild,v 1.2 2009/07/09 13:44:57 voxus Exp $
 
 inherit eutils ssl-cert
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://nginx.net/"
 SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="addition debug fastcgi flv imap pcre perl ssl status sub webdav zlib"
 
 DEPEND="dev-lang/perl
diff --git a/www-servers/nginx/nginx-0.7.61.ebuild b/www-servers/nginx/nginx-0.7.61.ebuild
index a0f924c21168..7ba7f77c7725 100644
--- a/www-servers/nginx/nginx-0.7.61.ebuild
+++ b/www-servers/nginx/nginx-0.7.61.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.61.ebuild,v 1.1 2009/06/22 10:06:39 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.7.61.ebuild,v 1.2 2009/07/09 13:44:57 voxus Exp $
 
 inherit eutils ssl-cert toolchain-funcs
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://nginx.net/"
 SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+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