* bump

Package-Manager: portage-2.1.2.9

4 files changed, 124 insertions, 8 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index 8b4065e5f406..274e630b7efb 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,12 @@
 # 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.148 2007/06/11 21:38:43 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.149 2007/06/14 07:42:32 voxus Exp $
+
+*nginx-0.6.0 (14 Jun 2007)
+
+  14 Jun 2007; Konstantin V. Arkhipov <voxus@gentoo.org>
+  +nginx-0.6.0.ebuild:
+  Version bump.
 
 *nginx-0.5.25 (11 Jun 2007)
 
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 42fb929c42e7..254f97a5019f 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -35,6 +35,7 @@ DIST nginx-0.3.61.tar.gz 416967 RMD160 bf4d84d3cdfb6d8f767e75aa9ef69a2bca6c08a0
 DIST nginx-0.4.14.tar.gz 440675 RMD160 b46047cb5b39f7d8ac777f97f5e299231592f280 SHA1 b3a98211595dd6b0ee2b0fe7e5103e0cdf34bf08 SHA256 de916da2e01835cafe6fc90457ca14bcd065814b0f920d783aeb57efbbe4539e
 DIST nginx-0.5.25.tar.gz 471439 RMD160 ffac7f6d95b4d8cb45d6bbc4ee01025d9a36210a SHA1 8504268049859eece70ca9c80f7b02337c74a539 SHA256 21aa716b0ed5d60ab7baa1475eda1f236d02b2cdac363f595b45cdf15a636c37
 DIST nginx-0.5.5.tar.gz 443942 RMD160 09a917a6b1f124a2a48247838738c8c74c4466a8 SHA1 59f0e8b9f2a24f2482e36051b2990afcb879f394 SHA256 e02abc19b42c75e80f29933cc916a09e7ef0fe16b3fdcbae7414725f86e14f36
+DIST nginx-0.6.0.tar.gz 471941 RMD160 1a0b59d9d04c3e187a3e28409d58ddfba0e8b5c3 SHA1 cae79095d768e89e4c7daf406232e2f4fd5fd38d SHA256 99d7042a66ddd842043beebbe0e09e3da5742f8f5120c91b2c67b42c6bd2b970
 EBUILD nginx-0.1.45.ebuild 1935 RMD160 ad7fba7daf610154845d2e6b96e27472d6d4b61f SHA1 bf8840d9be7e7f824d86bfca8846e227a40810ba SHA256 f81dfd0f45c9ba301b5f9ebffab11508d3dcdb468ab1b023270a74ee1a1c0217
 MD5 62f46895e63da25c83512f589b9e61cb nginx-0.1.45.ebuild 1935
 RMD160 ad7fba7daf610154845d2e6b96e27472d6d4b61f nginx-0.1.45.ebuild 1935
@@ -59,10 +60,14 @@ EBUILD nginx-0.5.5.ebuild 2451 RMD160 50b1acf44cc06acf63e34ee377040f9964d84f8b S
 MD5 e64bf71e0b65efa7b59db3599ab36cb8 nginx-0.5.5.ebuild 2451
 RMD160 50b1acf44cc06acf63e34ee377040f9964d84f8b nginx-0.5.5.ebuild 2451
 SHA256 3447da22b282d5e63bad691147fd3524d90d781eb374664b0d4bec9e64aa6a60 nginx-0.5.5.ebuild 2451
-MISC ChangeLog 23709 RMD160 5946ed78283f0f215d1fdb06fea77a45f6ca2c5f SHA1 bea3770390074cfb0badae277c68d26b98505e7b SHA256 d17233e2aeef14533ea5a7e536bddf290a75a96038c423095eb68cdc9ba58353
-MD5 d2ba53166fcf01c7b879eb1d861915e6 ChangeLog 23709
-RMD160 5946ed78283f0f215d1fdb06fea77a45f6ca2c5f ChangeLog 23709
-SHA256 d17233e2aeef14533ea5a7e536bddf290a75a96038c423095eb68cdc9ba58353 ChangeLog 23709
+EBUILD nginx-0.6.0.ebuild 2742 RMD160 4660e319f995c5ee55a5145299bd5ec39d5d2781 SHA1 94c149d199e0c04abc41ff2f86285e8c7b9928dd SHA256 65fa56073262ff39e09de445752128d1387653b9313c24ca1ce0b6029e3b1e2f
+MD5 45a1aca2958dc48244257f22bfd54294 nginx-0.6.0.ebuild 2742
+RMD160 4660e319f995c5ee55a5145299bd5ec39d5d2781 nginx-0.6.0.ebuild 2742
+SHA256 65fa56073262ff39e09de445752128d1387653b9313c24ca1ce0b6029e3b1e2f nginx-0.6.0.ebuild 2742
+MISC ChangeLog 23834 RMD160 109d22fae66026a5475d81adf9a94d1257f34a1f SHA1 208e67d2e373060ae736cb80959a32b419ff66b1 SHA256 9ff92ba39617babd04cec6e018077fafb7a687c092e657e5829bf0975703121d
+MD5 071439d9a6120ecc17d9d461aa6da56b ChangeLog 23834
+RMD160 109d22fae66026a5475d81adf9a94d1257f34a1f ChangeLog 23834
+SHA256 9ff92ba39617babd04cec6e018077fafb7a687c092e657e5829bf0975703121d ChangeLog 23834
 MISC metadata.xml 220 RMD160 7b73eb49ba7071b35813559b0871b5ddb4bcbb32 SHA1 798994deb26bee08b8be0c1197762b4bae655d67 SHA256 82c6d8c120358d0322f44bde92698ac1664b9478ce19428fc50c7048a38b2d26
 MD5 822f3c821527e6a34f23a6a92a884766 metadata.xml 220
 RMD160 7b73eb49ba7071b35813559b0871b5ddb4bcbb32 metadata.xml 220
@@ -85,10 +90,13 @@ SHA256 40687ceb2babbdbfd6548791626cdff38470ed3dcf7e184ec6b5a054229d531e files/di
 MD5 eced758d053c61df9be4d7fe48c5b679 files/digest-nginx-0.5.5 235
 RMD160 e8586ad773d219495442fdbebe794c2cbbe52008 files/digest-nginx-0.5.5 235
 SHA256 844d9a773d7139ecbc674b5603f900234227b658b928527e1e010effe5bb6b1c files/digest-nginx-0.5.5 235
+MD5 2c51252ee0ee42369e69941ded7e8d8c files/digest-nginx-0.6.0 235
+RMD160 2b434e7a7a7bf08c70a6fbfd3185eb4fb88387b1 files/digest-nginx-0.6.0 235
+SHA256 22606f7c6d6a4f2c4ac4cffad3c70348f7bae9b3690e3d42b6fa2093d26443f3 files/digest-nginx-0.6.0 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGbcDqbwxeDFj+ScoRAj/KAJ9Lf8cXvmdhUm40VaLg9Wq2ULlEagCgjaND
-OnUWIH5MOQY3VincWT7qFHo=
-=qrms
+iD8DBQFGcPFybwxeDFj+ScoRArncAKC/MlGCh1h1pjk+H6i+shvvagqOxACeOhJ9
+jLE019myoeh7Hq8Kaa0xZRk=
+=nEuX
 -----END PGP SIGNATURE-----
diff --git a/www-servers/nginx/files/digest-nginx-0.6.0 b/www-servers/nginx/files/digest-nginx-0.6.0
new file mode 100644
index 000000000000..8c2aeb8e3cfa
--- /dev/null
+++ b/www-servers/nginx/files/digest-nginx-0.6.0
@@ -0,0 +1,3 @@
+MD5 8397d953f4718a78d465de1e5f333c35 nginx-0.6.0.tar.gz 471941
+RMD160 1a0b59d9d04c3e187a3e28409d58ddfba0e8b5c3 nginx-0.6.0.tar.gz 471941
+SHA256 99d7042a66ddd842043beebbe0e09e3da5742f8f5120c91b2c67b42c6bd2b970 nginx-0.6.0.tar.gz 471941
diff --git a/www-servers/nginx/nginx-0.6.0.ebuild b/www-servers/nginx/nginx-0.6.0.ebuild
new file mode 100644
index 000000000000..d7e3188c1948
--- /dev/null
+++ b/www-servers/nginx/nginx-0.6.0.ebuild
@@ -0,0 +1,99 @@
+# 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.6.0.ebuild,v 1.1 2007/06/14 07:42:32 voxus Exp $
+
+inherit eutils ssl-cert
+
+DESCRIPTION="Robust, small and high performance http and reverse proxy server"
+
+HOMEPAGE="http://sysoev.ru/nginx/"
+SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug fastcgi imap pcre perl ssl status 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 fastcgi	|| myconf="${myconf} --without-http_fastcgi_module"
+	use fastcgi	&& myconf="${myconf} --with-http_realip_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"
+
+	./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 \
+		${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
+
+	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}
+	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"
+	}
+}