* bump

Package-Manager: portage-2.1.3_rc6

9 files changed, 77 insertions, 46 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/Manifest b/www-servers/nginx/Manifest
index 1b778b01ae3a..e3e050a2ed7e 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX nginx 994 RMD160 4b36e15714c84f8e8228d0ca6790c545736d74bb SHA1 de0a11802cc6f4a1111652416bce131a07ae008c SHA256 17a32f38e066ecc91ad91496e0ab8f0885e5550d42bf62dbecfdf2747a0fb1cd
 MD5 d8f7e621e098b58848a6b5fb045c49c3 files/nginx 994
 RMD160 4b36e15714c84f8e8228d0ca6790c545736d74bb files/nginx 994
@@ -31,8 +34,8 @@ 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.26.tar.gz 471489 RMD160 ba8bc959709ae2ff7f02d9a46faaea70bbcd5922 SHA1 86b7ccc4bfbaa44bca979e23c4a5bbf0ef090ee3 SHA256 90f143b1e07af27cdceb60ed69b88cb6720d622ddc2ee93fd30c8a831441bb1d
-DIST nginx-0.5.5.tar.gz 443942 RMD160 09a917a6b1f124a2a48247838738c8c74c4466a8 SHA1 59f0e8b9f2a24f2482e36051b2990afcb879f394 SHA256 e02abc19b42c75e80f29933cc916a09e7ef0fe16b3fdcbae7414725f86e14f36
-DIST nginx-0.6.1.tar.gz 472353 RMD160 a6468795cedabaf0335f9e0a30b252d9c9460c83 SHA1 9c9f61e78d16e2a2228a37d3f59619aa3dc8afc8 SHA256 421cc9a0499fc221540c8f221b142cdc12e73d58655956a537e0f9c73b34084d
+DIST nginx-0.5.27.tar.gz 471771 RMD160 6881f088f368d852beda797cfcc54e6d1c6d5ad5 SHA1 e51c0f2b29d88a664ecf196b6c77badcfcc695e2 SHA256 b7ef422f801b4b5c242871317fbc72ae1c5912b703158e52f92e3d149287a558
+DIST nginx-0.6.2.tar.gz 472812 RMD160 575f73060ec5b45546c4e2cee583b0167b3dda98 SHA1 7ceb8b693389ebd1ac101142d829f3123571b516 SHA256 ea21dc779229a650cd3cb3b2e1f2810b39969a2fd88386e318a2d5d83b3cd8f9
 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
@@ -49,22 +52,22 @@ EBUILD nginx-0.4.14.ebuild 2293 RMD160 5acc8d582dbf5a6da3b8e92f25b127d99e163703
 MD5 3420562d63f00c3389f2c1d091fce90f nginx-0.4.14.ebuild 2293
 RMD160 5acc8d582dbf5a6da3b8e92f25b127d99e163703 nginx-0.4.14.ebuild 2293
 SHA256 9243dc8e002ad9a28887fcc98df088ba3bbb50f5e8d46c02005c335d5a0f7426 nginx-0.4.14.ebuild 2293
-EBUILD nginx-0.5.26.ebuild 2746 RMD160 42a54e0d22f1a0b5c45167c0cdb3330e59061c28 SHA1 a5321f7266c4ad646e667979ac66edb18236c5f0 SHA256 91ae70b923971914a444c2d2d24259bf3f5efd5d59245755e15acdaa7d009a06
-MD5 b38582637ee66a8136168dbedba05641 nginx-0.5.26.ebuild 2746
-RMD160 42a54e0d22f1a0b5c45167c0cdb3330e59061c28 nginx-0.5.26.ebuild 2746
-SHA256 91ae70b923971914a444c2d2d24259bf3f5efd5d59245755e15acdaa7d009a06 nginx-0.5.26.ebuild 2746
-EBUILD nginx-0.5.5.ebuild 2451 RMD160 50b1acf44cc06acf63e34ee377040f9964d84f8b SHA1 183a223b6e1a7a234a60683fd88eafbdeef737ef SHA256 3447da22b282d5e63bad691147fd3524d90d781eb374664b0d4bec9e64aa6a60
-MD5 e64bf71e0b65efa7b59db3599ab36cb8 nginx-0.5.5.ebuild 2451
-RMD160 50b1acf44cc06acf63e34ee377040f9964d84f8b nginx-0.5.5.ebuild 2451
-SHA256 3447da22b282d5e63bad691147fd3524d90d781eb374664b0d4bec9e64aa6a60 nginx-0.5.5.ebuild 2451
-EBUILD nginx-0.6.1.ebuild 2745 RMD160 5b8b4d7bfbcabd966adee9011dac333f431a2988 SHA1 7bf2dce5dd560b771fbfb27ad1f48f694ba3777c SHA256 03bddc4fdf9794d8fd31748a966f481447ab2bd762cc6d92bda744b17159dcf1
-MD5 db8d57152222a7967d87cacc9c7d0481 nginx-0.6.1.ebuild 2745
-RMD160 5b8b4d7bfbcabd966adee9011dac333f431a2988 nginx-0.6.1.ebuild 2745
-SHA256 03bddc4fdf9794d8fd31748a966f481447ab2bd762cc6d92bda744b17159dcf1 nginx-0.6.1.ebuild 2745
-MISC ChangeLog 24053 RMD160 1f73aeaf6fdabadfc3e1e27380f40081ee6c0507 SHA1 97dc60df85f0666b597c22287373215ecac90023 SHA256 c3f28f4c90213f8d8f51b71fb14b85343e7ddd397013c39362c87b7bcb6f5bca
-MD5 d6b536783cc4f69f8a7161e3b2848865 ChangeLog 24053
-RMD160 1f73aeaf6fdabadfc3e1e27380f40081ee6c0507 ChangeLog 24053
-SHA256 c3f28f4c90213f8d8f51b71fb14b85343e7ddd397013c39362c87b7bcb6f5bca ChangeLog 24053
+EBUILD nginx-0.5.26.ebuild 2740 RMD160 a5f1845f92ee1dc7c1d89cf87ca7b1b7e647a8b6 SHA1 30b40b05f999d683424f442500c554397607e139 SHA256 1b3e5c2704f443f290c7a1364fc175248f0d16c2dd517f23215c6d446e5a8ccd
+MD5 b43f99ae6899b9ba81acf505334b7fde nginx-0.5.26.ebuild 2740
+RMD160 a5f1845f92ee1dc7c1d89cf87ca7b1b7e647a8b6 nginx-0.5.26.ebuild 2740
+SHA256 1b3e5c2704f443f290c7a1364fc175248f0d16c2dd517f23215c6d446e5a8ccd nginx-0.5.26.ebuild 2740
+EBUILD nginx-0.5.27.ebuild 2742 RMD160 863e25e45e492239a489935fb4b6c24b63e0a8aa SHA1 c67307f792cc2fb566d272f35cddfea975b070c9 SHA256 41a334a3d0fd0aecaedf194b058304f6c6d31f1019390de31c6c84d63d867ded
+MD5 297e5b6b33d4bc0ba0814fb69422ef9a nginx-0.5.27.ebuild 2742
+RMD160 863e25e45e492239a489935fb4b6c24b63e0a8aa nginx-0.5.27.ebuild 2742
+SHA256 41a334a3d0fd0aecaedf194b058304f6c6d31f1019390de31c6c84d63d867ded nginx-0.5.27.ebuild 2742
+EBUILD nginx-0.6.2.ebuild 2741 RMD160 0ed845cb900e54c43145296dd106437fd94f8c6b SHA1 a9315fc0878080e2855395e7bf4efe3208e1c2dc SHA256 e49a2c91d22abc05420ae1a2b2a9547f63ab805ad7d295dd08b1b51c7eeb70ee
+MD5 78145d50ca8ae9cf9ac69fc521fefd57 nginx-0.6.2.ebuild 2741
+RMD160 0ed845cb900e54c43145296dd106437fd94f8c6b nginx-0.6.2.ebuild 2741
+SHA256 e49a2c91d22abc05420ae1a2b2a9547f63ab805ad7d295dd08b1b51c7eeb70ee nginx-0.6.2.ebuild 2741
+MISC ChangeLog 24293 RMD160 1e4b045b5d1ebd7e816e4bf577d87e45a286d017 SHA1 72c423f600f897d7db74eb47f1153e4ac8e71062 SHA256 ae2163817cf81b2e86470792f9123fb90b72f1dd587453e39c22b0df3214717c
+MD5 f56ec4d722dd9bfd49e8781a2461f0d6 ChangeLog 24293
+RMD160 1e4b045b5d1ebd7e816e4bf577d87e45a286d017 ChangeLog 24293
+SHA256 ae2163817cf81b2e86470792f9123fb90b72f1dd587453e39c22b0df3214717c ChangeLog 24293
 MISC metadata.xml 220 RMD160 7b73eb49ba7071b35813559b0871b5ddb4bcbb32 SHA1 798994deb26bee08b8be0c1197762b4bae655d67 SHA256 82c6d8c120358d0322f44bde92698ac1664b9478ce19428fc50c7048a38b2d26
 MD5 822f3c821527e6a34f23a6a92a884766 metadata.xml 220
 RMD160 7b73eb49ba7071b35813559b0871b5ddb4bcbb32 metadata.xml 220
@@ -84,9 +87,16 @@ SHA256 152d5b60ad4a168b813e02f5a6b2453aa7d232e3d3976ee706ea684bc26acc98 files/di
 MD5 c8aec7fcd76e9d521d709496a7121e22 files/digest-nginx-0.5.26 238
 RMD160 d9e6c8a372ddeb93fb3c521e52a24d5439c5c926 files/digest-nginx-0.5.26 238
 SHA256 ca405c75de6cbd653fd9612456337a3631a48acc8b0fd41e283ae7273c15946b files/digest-nginx-0.5.26 238
-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 561e3e47fc80159de6821a8637936ee1 files/digest-nginx-0.6.1 235
-RMD160 f8b3103c010b377236b37db8c5d61e4864fae768 files/digest-nginx-0.6.1 235
-SHA256 531995fa007f7f3644301c4473c712d50c76b2e77c63f196080b3c6f8b07c422 files/digest-nginx-0.6.1 235
+MD5 7e1ff3b1eebeb0d94fccb323aa2b6725 files/digest-nginx-0.5.27 238
+RMD160 d410dc9989797cb97b14f563242f69d3bb9bfb66 files/digest-nginx-0.5.27 238
+SHA256 ccd5338dbf0bf4feaad317aac469c842f20113e8a0ccf646a8f1667b7f4bb7f7 files/digest-nginx-0.5.27 238
+MD5 835e57c7a31d6ef484f51de334e48e14 files/digest-nginx-0.6.2 235
+RMD160 93cc7ecec3686307d75b9518ad1552eab825c966 files/digest-nginx-0.6.2 235
+SHA256 6386af06f76885d03bfef9718c8fe5bbe3d3a41aefd6069bdb257eeb96d40bf3 files/digest-nginx-0.6.2 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFGkehxbwxeDFj+ScoRAoG3AJ0dgJVYYgEuW4X7gfHICTdn+HYkCQCaA3t4
+iNjRw25VjYRRO6HylXqByjE=
+=XifR
+-----END PGP SIGNATURE-----
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}