* double bump

(Portage version: 2.1.1)
 (Signed Manifest commit)

3 files changed, 23 insertions, 97 deletions

diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index c6c5f22d2a7f..ae6e75d29684 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -25,7 +25,8 @@ DIST nginx-0.1.45.tar.gz 322706 RMD160 625ba47cdcc8d15bdcfb195c3a96d40e13e48bb6
 DIST nginx-0.2.6.tar.gz 329236 RMD160 96387007cf325dd7fd78b020f4416431dccd50fa SHA1 0c12b23d201e621877a157960023e2c4db9aea9a SHA256 606e186ec7d6687a0c764ecea834bfeaa223066ed9774fd2f3819f942ec752a1
 DIST nginx-0.3.54.tar.gz 407906 RMD160 cd08c7e47ab8fb56099545c5c8dfac0e3f9e4fb7 SHA1 5592dbe57e622fa11ce47c86d1497957d81bcd5a SHA256 f2983cfc238925bbfcadc507f8795c9c013ec14e6ed90546a777683ab74afec4
 DIST nginx-0.3.57.tar.gz 415474 RMD160 74bf111d140df2ecccbeb9cd0f40862316de4406 SHA1 5c01786d12350447dd2653ada0dc7d175a274122 SHA256 97d8d2628ad9188409d703a23f3a208bf2187f7695211f3dee7b9e279db7a871
-DIST nginx-0.3.60.tar.gz 416307 RMD160 c6af53274fb0972eb8b2eaa16c9135be10d3f0cd SHA1 d2f24b9cdc59a99cacf3e15ea058b7728ad56f9c SHA256 d28ea75f38ec571432a31390404dfc74720904ea8943af0c579a040b8bbb9859
+DIST nginx-0.3.61.tar.gz 416967 RMD160 bf4d84d3cdfb6d8f767e75aa9ef69a2bca6c08a0 SHA1 a6202a19e82f8d1c82eec7c7ee754c61e450716b SHA256 19dbfb86c42e38c8ced641b6b8f808951a60003ff711c5f7cc68448a159df6b4
+DIST nginx-0.4.0.tar.gz 421031 RMD160 e168570b249e522d3a33a0a428ad3b3544374bf5 SHA1 34a8cd685b4b86e04fb15051d08d59530b3e82f4 SHA256 4bd30b1ae75f64553d03ce5f2657cb4f8685a272d02c1390e47a92c9d11d9b62
 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
@@ -42,14 +43,18 @@ EBUILD nginx-0.3.57.ebuild 2295 RMD160 3a0063b9bbd808c2f5f74cd1e7eef9fc298c6daa
 MD5 ba0d16e8f49d4021b7b87f917ca78ac2 nginx-0.3.57.ebuild 2295
 RMD160 3a0063b9bbd808c2f5f74cd1e7eef9fc298c6daa nginx-0.3.57.ebuild 2295
 SHA256 04abbc75f8a3e7ef4502330704d81cb23867fa1599825f9fea3ae7374d89d1e6 nginx-0.3.57.ebuild 2295
-EBUILD nginx-0.3.60.ebuild 2295 RMD160 ee52e697c3feb7ceeebab3695b98fb2a12bd6311 SHA1 480781749cee370b1a9b48da0af38d78546e7993 SHA256 1a04379417ddd2650f1f460f5d07b906988a6f0f1d7bb129942e661d93c455fe
-MD5 dc825dc6e4a46b1276b2cec2fb1f5ab5 nginx-0.3.60.ebuild 2295
-RMD160 ee52e697c3feb7ceeebab3695b98fb2a12bd6311 nginx-0.3.60.ebuild 2295
-SHA256 1a04379417ddd2650f1f460f5d07b906988a6f0f1d7bb129942e661d93c455fe nginx-0.3.60.ebuild 2295
-MISC ChangeLog 17667 RMD160 2f3f2f16cecf97be82d85e99e9ecb60907880d92 SHA1 f382675cca55368b15cceeae4f6314b9126b651b SHA256 90b8f474b8474ddf74aae4d00d7ad79b5cc2c7c37619fa4d908ddb0dafcfd082
-MD5 24237bb5712cec32c6d3b8226c12f8df ChangeLog 17667
-RMD160 2f3f2f16cecf97be82d85e99e9ecb60907880d92 ChangeLog 17667
-SHA256 90b8f474b8474ddf74aae4d00d7ad79b5cc2c7c37619fa4d908ddb0dafcfd082 ChangeLog 17667
+EBUILD nginx-0.3.61.ebuild 2295 RMD160 e644468da2e5344e9621833b0deb868945f8ac6f SHA1 3c2984c153e14d73b0655c05cfd86622815bc1ba SHA256 1dd311afba36da0686d5080d8fff7dd2cde69cd461200cd39afabea4c534c702
+MD5 a59245518f20a169b174ac40505c05c9 nginx-0.3.61.ebuild 2295
+RMD160 e644468da2e5344e9621833b0deb868945f8ac6f nginx-0.3.61.ebuild 2295
+SHA256 1dd311afba36da0686d5080d8fff7dd2cde69cd461200cd39afabea4c534c702 nginx-0.3.61.ebuild 2295
+EBUILD nginx-0.4.0.ebuild 2294 RMD160 096ff41a9aa9b04c53564025dd5a13a2305401d9 SHA1 7223ebdf313f9c93a1daf2d33749096534a2c0d2 SHA256 64ba5338f54de7e5a202cdfb0ca1f5a5c9fcad2584f408a0404769d8bdd6fd5e
+MD5 aa8842da5f8131e04779ab96b71f2985 nginx-0.4.0.ebuild 2294
+RMD160 096ff41a9aa9b04c53564025dd5a13a2305401d9 nginx-0.4.0.ebuild 2294
+SHA256 64ba5338f54de7e5a202cdfb0ca1f5a5c9fcad2584f408a0404769d8bdd6fd5e nginx-0.4.0.ebuild 2294
+MISC ChangeLog 17838 RMD160 a57b81df362f15908defc04d9b97fef07a6bc1e0 SHA1 e9f93f8d40a33f218a2e2d42f63bca3bbd40bbc3 SHA256 699a331119b0c427de2ff2bbd7e96039b1ba9f002cc26815b53447c95ecfb6de
+MD5 2a30945909b7fdb95558c8131f2bf3e9 ChangeLog 17838
+RMD160 a57b81df362f15908defc04d9b97fef07a6bc1e0 ChangeLog 17838
+SHA256 699a331119b0c427de2ff2bbd7e96039b1ba9f002cc26815b53447c95ecfb6de ChangeLog 17838
 MISC metadata.xml 220 RMD160 7b73eb49ba7071b35813559b0871b5ddb4bcbb32 SHA1 798994deb26bee08b8be0c1197762b4bae655d67 SHA256 82c6d8c120358d0322f44bde92698ac1664b9478ce19428fc50c7048a38b2d26
 MD5 822f3c821527e6a34f23a6a92a884766 metadata.xml 220
 RMD160 7b73eb49ba7071b35813559b0871b5ddb4bcbb32 metadata.xml 220
@@ -66,13 +71,16 @@ SHA256 2338353190154568a90e8d51134d174efc29d5173b376838432884366795a56a files/di
 MD5 2d767f63108562fb840ec9806ce7896d files/digest-nginx-0.3.57 238
 RMD160 c5e8574b32a8b5ab1a989e1d6a7c00da73429a32 files/digest-nginx-0.3.57 238
 SHA256 2b21e321e704c2c842fe50b88f2e77ed78b9c14e84a51b2547f90c2572445228 files/digest-nginx-0.3.57 238
-MD5 0917a528b787a2e784a316f3d961464c files/digest-nginx-0.3.60 238
-RMD160 d2534b215051b82bd0b16601cc2292b94b1a4232 files/digest-nginx-0.3.60 238
-SHA256 f388b467262744d8f561edd51d79432f0b1e8f39195b302dabde5ca7cd05c8f6 files/digest-nginx-0.3.60 238
+MD5 312c0b821aa8c11314c229b9fe1621ed files/digest-nginx-0.3.61 238
+RMD160 fc4ece249e6bab7273f48c8027e612ca532d20f9 files/digest-nginx-0.3.61 238
+SHA256 b9986770cfba3e18216bd9d8b27523acb6ecc9db6d0242ff9888d26cb1f6bbaf files/digest-nginx-0.3.61 238
+MD5 04baeae403858c19b90b7bb5181898d9 files/digest-nginx-0.4.0 235
+RMD160 5182610f836c92751dab4641c8fdbfb84c0d8e60 files/digest-nginx-0.4.0 235
+SHA256 f8bbb05c4f47c603055927e13c1baf57ecd86c72e73a0a26bb70f972a2344dda files/digest-nginx-0.4.0 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE5dQmbwxeDFj+ScoRArveAJwPh6Nh27ctQaMyD1PgWH+0Grp0LgCffuj1
-s5cDW24ZZH9Xy/GqyDkYvy0=
-=RuS4
+iD8DBQFFAvmVbwxeDFj+ScoRAljRAJkBR0zYaLfrzH4xgD0GfmS3EfOfngCeKYOt
+2LTMvqv6FK64Y0reVkdfBF8=
+=ruog
 -----END PGP SIGNATURE-----
diff --git a/www-servers/nginx/files/digest-nginx-0.3.60 b/www-servers/nginx/files/digest-nginx-0.3.60
deleted file mode 100644
index bdad32056685..000000000000
--- a/www-servers/nginx/files/digest-nginx-0.3.60
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 72cbceab5b42adc09af1dac037347cb0 nginx-0.3.60.tar.gz 416307
-RMD160 c6af53274fb0972eb8b2eaa16c9135be10d3f0cd nginx-0.3.60.tar.gz 416307
-SHA256 d28ea75f38ec571432a31390404dfc74720904ea8943af0c579a040b8bbb9859 nginx-0.3.60.tar.gz 416307
diff --git a/www-servers/nginx/nginx-0.3.60.ebuild b/www-servers/nginx/nginx-0.3.60.ebuild
deleted file mode 100644
index 40d4e481e5c9..000000000000
--- a/www-servers/nginx/nginx-0.3.60.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.3.60.ebuild,v 1.1 2006/08/18 14:52:07 voxus Exp $
-
-inherit eutils
-
-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 threads ssl 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 )"
-
-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
-
-	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"
-
-	./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
-
-	rm conf/nginx.conf
-	cp ${FILESDIR}/nginx.conf-r2 ${T}/nginx.conf
-
-	dodir /etc/${PN}
-	insinto /etc/${PN}
-	doins conf/* ${T}/nginx.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"
-	}
-}