* bump

(Portage version: 2.1.3_rc6)

8 files changed, 43 insertions, 22 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index cff436a85d7e..bcbc6223a437 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,14 @@
 # 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.150 2007/06/17 21:52:21 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.151 2007/07/09 07:48:48 voxus Exp $
+
+*nginx-0.6.2 (09 Jul 2007)
+*nginx-0.5.27 (09 Jul 2007)
+
+  09 Jul 2007; Konstantin V. Arkhipov <voxus@gentoo.org>
+  -nginx-0.5.5.ebuild, nginx-0.5.26.ebuild, +nginx-0.5.27.ebuild,
+  -nginx-0.6.1.ebuild, +nginx-0.6.2.ebuild:
+  Version bump.
 
 *nginx-0.6.1 (17 Jun 2007)
 *nginx-0.5.26 (17 Jun 2007)
diff --git a/www-servers/nginx/files/digest-nginx-0.5.27 b/www-servers/nginx/files/digest-nginx-0.5.27
new file mode 100644
index 000000000000..30406ea251c9
--- /dev/null
+++ b/www-servers/nginx/files/digest-nginx-0.5.27
@@ -0,0 +1,3 @@
+MD5 8f8595a2bcf0c490b353b18d7d04e885 nginx-0.5.27.tar.gz 471771
+RMD160 6881f088f368d852beda797cfcc54e6d1c6d5ad5 nginx-0.5.27.tar.gz 471771
+SHA256 b7ef422f801b4b5c242871317fbc72ae1c5912b703158e52f92e3d149287a558 nginx-0.5.27.tar.gz 471771
diff --git a/www-servers/nginx/files/digest-nginx-0.5.5 b/www-servers/nginx/files/digest-nginx-0.5.5
deleted file mode 100644
index 77a2fc4470b3..000000000000
--- a/www-servers/nginx/files/digest-nginx-0.5.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7a09077dae1700eb8f3717211b95318d nginx-0.5.5.tar.gz 443942
-RMD160 09a917a6b1f124a2a48247838738c8c74c4466a8 nginx-0.5.5.tar.gz 443942
-SHA256 e02abc19b42c75e80f29933cc916a09e7ef0fe16b3fdcbae7414725f86e14f36 nginx-0.5.5.tar.gz 443942
diff --git a/www-servers/nginx/files/digest-nginx-0.6.1 b/www-servers/nginx/files/digest-nginx-0.6.1
deleted file mode 100644
index bb67a55a297d..000000000000
--- a/www-servers/nginx/files/digest-nginx-0.6.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0c89f15d2d555c968249aa84758c8c45 nginx-0.6.1.tar.gz 472353
-RMD160 a6468795cedabaf0335f9e0a30b252d9c9460c83 nginx-0.6.1.tar.gz 472353
-SHA256 421cc9a0499fc221540c8f221b142cdc12e73d58655956a537e0f9c73b34084d nginx-0.6.1.tar.gz 472353
diff --git a/www-servers/nginx/files/digest-nginx-0.6.2 b/www-servers/nginx/files/digest-nginx-0.6.2
new file mode 100644
index 000000000000..0b35ed93ee3a
--- /dev/null
+++ b/www-servers/nginx/files/digest-nginx-0.6.2
@@ -0,0 +1,3 @@
+MD5 5bb1d4b8ed5faa714b67d0ec14bb45e8 nginx-0.6.2.tar.gz 472812
+RMD160 575f73060ec5b45546c4e2cee583b0167b3dda98 nginx-0.6.2.tar.gz 472812
+SHA256 ea21dc779229a650cd3cb3b2e1f2810b39969a2fd88386e318a2d5d83b3cd8f9 nginx-0.6.2.tar.gz 472812
diff --git a/www-servers/nginx/nginx-0.5.26.ebuild b/www-servers/nginx/nginx-0.5.26.ebuild
index d5222ca260ca..3a32ee9087c2 100644
--- a/www-servers/nginx/nginx-0.5.26.ebuild
+++ b/www-servers/nginx/nginx-0.5.26.ebuild
@@ -1,6 +1,6 @@
 # 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.5.26.ebuild,v 1.2 2007/06/26 02:57:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.5.26.ebuild,v 1.3 2007/07/09 07:48:48 voxus Exp $
 
 inherit eutils ssl-cert
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://sysoev.ru/nginx/"
 SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="debug fastcgi imap pcre perl ssl status webdav zlib"
 
 DEPEND="dev-lang/perl
diff --git a/www-servers/nginx/nginx-0.6.1.ebuild b/www-servers/nginx/nginx-0.5.27.ebuild
index f8deaf8017da..3dd8fbe728ae 100644
--- a/www-servers/nginx/nginx-0.6.1.ebuild
+++ b/www-servers/nginx/nginx-0.5.27.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.2 2007/06/26 02:57:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.5.27.ebuild,v 1.1 2007/07/09 07:48:48 voxus Exp $
 
 inherit eutils ssl-cert
 
diff --git a/www-servers/nginx/nginx-0.5.5.ebuild b/www-servers/nginx/nginx-0.6.2.ebuild
index f8595f08a1b1..6e96f7081517 100644
--- a/www-servers/nginx/nginx-0.5.5.ebuild
+++ b/www-servers/nginx/nginx-0.6.2.ebuild
@@ -1,8 +1,8 @@
 # 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.5.5.ebuild,v 1.2 2007/02/13 14:23:31 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.6.2.ebuild,v 1.1 2007/07/09 07:48:48 voxus Exp $
 
-inherit eutils
+inherit eutils ssl-cert
 
 DESCRIPTION="Robust, small and high performance http and reverse proxy server"
 
@@ -10,8 +10,8 @@ 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 threads ssl status zlib"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug fastcgi imap pcre perl ssl status webdav zlib"
 
 DEPEND="dev-lang/perl
 	pcre? ( >=dev-libs/libpcre-4.2 )
@@ -29,13 +29,15 @@ pkg_setup() {
 src_compile() {
 	local myconf
 
-	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
+	# 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"
@@ -48,6 +50,7 @@ src_compile() {
 	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 \
@@ -71,7 +74,17 @@ src_install() {
 	cp ${FILESDIR}/nginx-r1 ${T}/nginx
 	doinitd ${T}/nginx
 
-	cp ${FILESDIR}/nginx.conf-r3 conf/nginx.conf
+	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}