* bump

Package-Manager: portage-2.1.2_pre2-r5

4 files changed, 111 insertions, 13 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index 3f4861fa827b..3d6e02f4d5b2 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/nginx
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.112 2006/10/03 08:51:46 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.113 2006/10/06 15:00:12 voxus Exp $
+
+*nginx-0.4.6 (06 Oct 2006)
+
+  06 Oct 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.4.6.ebuild,
+  -nginx-0.4.5.ebuild:
+  Bump.
 
 *nginx-0.4.5 (02 Oct 2006)
 
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 8fee491b707f..902e4c2496b2 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
@@ -23,7 +26,7 @@ DIST nginx-0.2.6.tar.gz 329236 RMD160 96387007cf325dd7fd78b020f4416431dccd50fa S
 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.61.tar.gz 416967 RMD160 bf4d84d3cdfb6d8f767e75aa9ef69a2bca6c08a0 SHA1 a6202a19e82f8d1c82eec7c7ee754c61e450716b SHA256 19dbfb86c42e38c8ced641b6b8f808951a60003ff711c5f7cc68448a159df6b4
-DIST nginx-0.4.5.tar.gz 427266 RMD160 7f08934b26de98e627515873e3ab387ae99c8b5c SHA1 b6a62c994577ddcace75931dbc1c8f379e10707a SHA256 c3daa81302fbf2d0484592fb1a7239c0fd20b9788766d0aa838da2b76fa2c51a
+DIST nginx-0.4.6.tar.gz 427563 RMD160 e111670259254ba3b62cfb55ce96f4b9e1c48f0c SHA1 49571fb2978bf97faa451952c079d75d4305be3d SHA256 01a96000e1396d4033075da6eb274d5e6bf625abc853131f4e633fe22329d9d3
 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
@@ -44,14 +47,14 @@ EBUILD nginx-0.3.61.ebuild 2295 RMD160 e644468da2e5344e9621833b0deb868945f8ac6f
 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.5.ebuild 2294 RMD160 92d39d9d755e6669ee70b54abe2328f41690943e SHA1 edb91260171eecddd8e5843afdad59c5b1f12ca3 SHA256 6f0a0932132b0fecb3cf92453513738558b37f6d4ca7186688773ec6fea42504
-MD5 ee76f0d4288e4f41c806aa3175c0de36 nginx-0.4.5.ebuild 2294
-RMD160 92d39d9d755e6669ee70b54abe2328f41690943e nginx-0.4.5.ebuild 2294
-SHA256 6f0a0932132b0fecb3cf92453513738558b37f6d4ca7186688773ec6fea42504 nginx-0.4.5.ebuild 2294
-MISC ChangeLog 18378 RMD160 2d4bb0b172163ac5f0c06264eb04bac2f8439926 SHA1 cb7014a378d3ef2a49c3188c033abb0b4f1d338d SHA256 db755cf3bf7673a490eadd5c9867436a843e4afba3103d3563eeab98a1a792e0
-MD5 42baea93b1e234029c69be10468ac4fe ChangeLog 18378
-RMD160 2d4bb0b172163ac5f0c06264eb04bac2f8439926 ChangeLog 18378
-SHA256 db755cf3bf7673a490eadd5c9867436a843e4afba3103d3563eeab98a1a792e0 ChangeLog 18378
+EBUILD nginx-0.4.6.ebuild 2294 RMD160 c9f8deda072d9f43409ea0cb7ced2fff2aeecbfc SHA1 f31af6fe84159795ad1d6e2f1ce05237a0d6ca8c SHA256 5106cfbfbc588bc4fc8b50bf792378d3c9ba6b29890816b9cbb387c6b0f09a47
+MD5 e54bc746b880fa1f83e0c45e1346e237 nginx-0.4.6.ebuild 2294
+RMD160 c9f8deda072d9f43409ea0cb7ced2fff2aeecbfc nginx-0.4.6.ebuild 2294
+SHA256 5106cfbfbc588bc4fc8b50bf792378d3c9ba6b29890816b9cbb387c6b0f09a47 nginx-0.4.6.ebuild 2294
+MISC ChangeLog 18513 RMD160 d2a1ac8487f4daefea851196abb77621692a60f5 SHA1 a856cf1169255d497a0053f4590116c4d082082d SHA256 fe129c9039e417a727be33e6ee3aba8ddbc1d37f6c1e274aa4d9a329c85ce8c8
+MD5 3caa1c288cbea23a4094ce6786ae51e4 ChangeLog 18513
+RMD160 d2a1ac8487f4daefea851196abb77621692a60f5 ChangeLog 18513
+SHA256 fe129c9039e417a727be33e6ee3aba8ddbc1d37f6c1e274aa4d9a329c85ce8c8 ChangeLog 18513
 MISC metadata.xml 220 RMD160 7b73eb49ba7071b35813559b0871b5ddb4bcbb32 SHA1 798994deb26bee08b8be0c1197762b4bae655d67 SHA256 82c6d8c120358d0322f44bde92698ac1664b9478ce19428fc50c7048a38b2d26
 MD5 822f3c821527e6a34f23a6a92a884766 metadata.xml 220
 RMD160 7b73eb49ba7071b35813559b0871b5ddb4bcbb32 metadata.xml 220
@@ -71,6 +74,13 @@ SHA256 2b21e321e704c2c842fe50b88f2e77ed78b9c14e84a51b2547f90c2572445228 files/di
 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 41947daba57fa910bfecc57f5585591a files/digest-nginx-0.4.5 235
-RMD160 8a0f91b998e13f12c081df514289afc56198ab85 files/digest-nginx-0.4.5 235
-SHA256 c4edf5296f44e44f9f53779e1940fcd3b2f5c195af9882e4611e3d584b24467d files/digest-nginx-0.4.5 235
+MD5 9c9e6c03ec0119762342cbc8f2eb8638 files/digest-nginx-0.4.6 235
+RMD160 f17a51930503652b7fb238e33c3ba73b4c00eb9a files/digest-nginx-0.4.6 235
+SHA256 461de5254f9ce0eaa9a864c4333298b3b2fadec5b073c8a76c71a8cee2ba512b files/digest-nginx-0.4.6 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFJm+HbwxeDFj+ScoRAkfaAJ9Kfocc9p5wk4iX4PNS6sbtc9QbuACgqZlG
+Lf74frfP3jo3rchSuILuIfk=
+=XJXC
+-----END PGP SIGNATURE-----
diff --git a/www-servers/nginx/files/digest-nginx-0.4.6 b/www-servers/nginx/files/digest-nginx-0.4.6
new file mode 100644
index 000000000000..0dd4183e0e07
--- /dev/null
+++ b/www-servers/nginx/files/digest-nginx-0.4.6
@@ -0,0 +1,3 @@
+MD5 05d5681588f5bf9bda0203d76ffb031e nginx-0.4.6.tar.gz 427563
+RMD160 e111670259254ba3b62cfb55ce96f4b9e1c48f0c nginx-0.4.6.tar.gz 427563
+SHA256 01a96000e1396d4033075da6eb274d5e6bf625abc853131f4e633fe22329d9d3 nginx-0.4.6.tar.gz 427563
diff --git a/www-servers/nginx/nginx-0.4.6.ebuild b/www-servers/nginx/nginx-0.4.6.ebuild
new file mode 100644
index 000000000000..a43bb5cdf279
--- /dev/null
+++ b/www-servers/nginx/nginx-0.4.6.ebuild
@@ -0,0 +1,79 @@
+# 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.4.6.ebuild,v 1.1 2006/10/06 15:00:12 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"
+	}
+}