version bump wrt #385965

Package-Manager: portage-2.2.0_alpha58/cvs/Linux x86_64

6 files changed, 84 insertions, 137 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index ab249b221812..8fc75557eb3c 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-servers/nginx
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.292 2011/10/04 21:32:48 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.293 2011/10/28 06:52:53 hollow Exp $
+
+*nginx-1.1.6 (28 Oct 2011)
+*nginx-1.0.8 (28 Oct 2011)
+
+  28 Oct 2011; Benedikt Böhm <hollow@gentoo.org>
+  -files/nginx-0.8.32-ey-balancer.patch, -nginx-1.0.4.ebuild,
+  +nginx-1.0.8.ebuild, -nginx-1.1.2.ebuild, +nginx-1.1.6.ebuild, metadata.xml:
+  version bump wrt #385965
 
   04 Oct 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> nginx-1.0.6.ebuild:
   x86 stable wrt bug #385035
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 55fea3870229..2bf38339296c 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,32 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-AUX nginx-0.8.32-ey-balancer.patch 1977 RMD160 fff19fd36b4f29c74b92bb55e6b1366163703b5f SHA1 844b771f567d4f0318977de904ed1559e88cc5c4 SHA256 2f254cdf0e95357226aed112d0798f2dac14b8a4f1392119aac95f75c00a3fac
 AUX nginx.conf-r4 1358 RMD160 a948df249a16be86c114d587cfa5ee570d84a356 SHA1 e9db0447a1beb326a0858cf8189328229d1d3edf SHA256 6ff6c9301ea2a4d74a335b9119d7f9dba87d4e83793cf22d837d49f061763096
 AUX nginx.init-r2 1827 RMD160 2ece9278fd4a3ca948106e024c2607fca02e2599 SHA1 76af70e8fcad8b298851382d18160d11dc3e2cca SHA256 89801c2e0ea3480380dedfbc84b0cc993ab6b93768886246a22e650ba0a61798
 AUX nginx.logrotate 364 RMD160 9fdfd2ea2f49b8dba20a030d893e34779bb32364 SHA1 4ab07992fa5c64f753e3643e1b51fcab4dec6ccf SHA256 9e3e090dfd10861d5f9b279e19113ce8d05caf9f33d488f6aabf9f19ac0cf925
-DIST nginx-1.0.4.tar.gz 661444 RMD160 378b303ed91dc76cda12f2984b26c3aae9337599 SHA1 0496b7377e583116497f18453003cba3269417e9 SHA256 ff54f7deea3dc69da467f3b4c2c8167d5967a096451148ed362e20fb0203f043
 DIST nginx-1.0.6.tar.gz 670835 RMD160 c0f81d1f15bccea44321c31e3f08e299e5e2e564 SHA1 e8b61da1aa5e53e0d298ec0159c4fca785dccd70 SHA256 2580c2d4cb56a70802702b81c0aea2e6b359a131c049a993b806f32791086cbe
-DIST nginx-1.1.2.tar.gz 674101 RMD160 54a1554a894cdd7e041da2a5cbf0876ee6092e88 SHA1 a8214bff7452c39c44f91853c104879b67849809 SHA256 cc64476ae800c45d2ba810274387139e5d8cbb8c1e45e8701416eea2a377151b
+DIST nginx-1.0.8.tar.gz 683559 RMD160 45d0e0d2c21a18fb2b0a69321e55526fb26ba22e SHA1 d0ab9329e6aa774f655bfa5ac0b30c840f1acd88 SHA256 9bde8d054dcdcc6aedcbd87b456049b39ba930bfee284edb15817ab64ec72ba7
 DIST nginx-1.1.4.tar.gz 692544 RMD160 8596855da55d5c601f81840d5bd983da27c8ce76 SHA1 748ecbab8dc614a0d7fe16a21dbcfe26b42ff970 SHA256 a5fc829bc4296ce49953a772c27891aa5be649a19f7f101221c684898fe75a63
-DIST nginx-ey-balancer-0.0.6.tar.gz 13192 RMD160 0e1dee4034023fd83639f1cc8333e05736b40a5c SHA1 2a4a97f7e6253b406775f29cff7b0b6b450563e2 SHA256 0b4728cfba04a452a5b9ebc3e304a6724ea914122d56edf0ff7c3b783205a905
+DIST nginx-1.1.6.tar.gz 692871 RMD160 71f29cf2a8d61e5bed47a3b444ba33069f12e102 SHA1 e6da84f7e3fd19ad2d29acaeb68676c349a8d3d4 SHA256 a8a45769f454f7720ce1f8d0e46900009b9cbb4cd49d539541a49e466ff9b11f
 DIST nginx_http_push_module-0.692.tar.gz 29119 RMD160 9d2be16074cf28115af0f1d8f3646937cda649ad SHA1 72103084cad8f4d3d9a49a6b04cf780e4541605d SHA256 64868708071aa21dbc4c7a07d149dd6ec9108fb7eaf2aad5ad069406151f17fe
 DIST nginx_upload_module-2.2.0.tar.gz 25796 RMD160 5734af837be3fe8ec444a7e5e7f6707118594098 SHA1 93d6e83e613a0ce2ed057a434b344fa1b6609b47 SHA256 b1c26abe0427180602e257627b4ed21848c93cc20cefc33af084983767d65805
-DIST ngx-http-headers-more-0.13.tar.gz 76271 RMD160 b11fbdf8e6fba5327fedd22e517da36340ec2473 SHA1 29def6aa44faf906d3c400b6379d6dd65d959590 SHA256 52e2cb3b81327e9225cfa87291b93dd96b798702f8e3b0f20f06d38850fc2629
 DIST ngx_cache_purge-1.3.tar.gz 6434 RMD160 d9f5d225b99f3164e80a85b7c7b4bee8bb16ea0e SHA1 ec52989ed545ef2be58414e747e592004794eba6 SHA256 256eec780f0f8f09ed10d5b0e4c3c32883a55d96e814fa0390b880d20745fcdb
+DIST ngx_cache_purge-1.4.tar.gz 6899 RMD160 b851f9d7c829152a6675d7e83df372e4bd894170 SHA1 35c45729183daa66b60741828a42492e06597da3 SHA256 4764e3d565445644f4a6b183cb9e987fce535396b00d68dc923bb35731a88886
 DIST ngx_http_headers_more-0.15.tar.gz 22738 RMD160 2200ab529a086dd6bcf11a9a0470a4d05de7c824 SHA1 12bab1bbcecf57c410a812f5a7eebac49ff317f8 SHA256 d5ada29c15ff112c39599e3b245450ef785bb096c6724ecd8eaf1699b06e10e2
 DIST ngx_slowfs_cache-1.6.tar.gz 10972 RMD160 e1d10851db4a55fc465665caa3f6989d142af2d3 SHA1 072d06b7547629b244bebeef7df7425567f264c9 SHA256 cc0505dbba30153691ff7b3a7353804d5ceb9a519a407b938cae49e9913a7bcc
 DIST ngx_upload_progress-0.8.2.tar.gz 16559 RMD160 3aadb9bf9b15b3810d1acb466d331ea5bdae6062 SHA1 cbff2734cccc3ac93b3422a9a01547af29f9c11d SHA256 cab70d2e300cfa0d9d7d3b34bf27810533ecbf11dddcd5078a4754cfab337c95
-EBUILD nginx-1.0.4.ebuild 11019 RMD160 d1aa3ca9459cab677790986c92c48b75589736c8 SHA1 f773210ae817cb8340704c5844922602636fd363 SHA256 363b15c8dd8be0827dfcf30692212a70dffd525842949a5ee9a129eb7ba62cd8
+DIST ngx_upload_progress-0.8.3.tar.gz 16694 RMD160 b3c8835a270cda2224f5be35f1afb818821609b3 SHA1 0edae535d1efd50524d9947acaebe3979b06fcfb SHA256 f391da7fd1a89bd65e852182b6cbc746289cd10c83b211be18e703ff3e3986ae
 EBUILD nginx-1.0.6.ebuild 11057 RMD160 54e943fdd65866305a45e3e2d570b7fcba6852cd SHA1 b477ebeeff4d5cf59477439b9fec861e0e1c8028 SHA256 1f17304ec81efab1194aaa91ae6bbd3b0cf3d98537f5514a3ccb24404c727822
-EBUILD nginx-1.1.2.ebuild 11055 RMD160 fa120aacd731f0e64bb48be2528d61fd3756cdac SHA1 d30f6c4855eebaeaa52522615b314c4bc88bcbee SHA256 a06baef7980fd34875562880169f62dee7dc11f951ed3006ac65e57ed020616b
+EBUILD nginx-1.0.8.ebuild 11055 RMD160 ed95013ebadf2948fc1e2bacfd9934ef79a39e1e SHA1 49218020315cff63ec38daf04ee5d353adf67956 SHA256 4877b8b15cbea120d352ef7adeabc8b7110e73173135aed5fd0e30d21af4af1a
 EBUILD nginx-1.1.4.ebuild 11059 RMD160 8216fe64c66067856221321a612ed3cdc595ba54 SHA1 54f030096326d90e02345dc65539a30bc5f69d6c SHA256 fc987cb555ce33b35d082773828e076d0598a9fc2c62fc504c1e485cdf66ca00
-MISC ChangeLog 47875 RMD160 66058e23dcfb9ddc141b6a2c91b3d29924dba26b SHA1 79a254849abde58beb760ff70a36591d0680aadf SHA256 92d73b242118133d5b8d51dd9fd5062272e0f84beb57332f4ddc074cdb1a3198
-MISC metadata.xml 2525 RMD160 df285e1bcb9533d4fa1deb6bd89dd8c6475f019f SHA1 9c022f0dbb97b54595d0b888e1b4efa0a3786733 SHA256 b3376e545c4be7ac09cf010e595c375ec15324b2b6d59678f5c7cead6a99a8be
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREKAAYFAk6Le4cACgkQuUQtlDBCeQLdhgCfSWXPbOxuFzek7OtNo6vDTX9Z
-qFMAoIUNy8jyNKNaYWt58NJb3hJgJYjB
-=ifrU
------END PGP SIGNATURE-----
+EBUILD nginx-1.1.6.ebuild 11059 RMD160 9390bdea835f42fd785a1974431820ed6de445da SHA1 a11739534b638e2b771fda64165064f5dccb9d45 SHA256 3e390c087936f7480658d5254c0671bc59979853c7b7bd20aec6c74c712a468a
+MISC ChangeLog 48145 RMD160 9cc7e1b07cfb773e69fc7cc5d5735c4ac7b2bc1a SHA1 43ae9481f542c3ed61ed35fbe1abc46c4370e870 SHA256 747394cff27d99d50b305bf4de091235aa141f96dbb9a9ea7a69f8c9b194ddbd
+MISC metadata.xml 2414 RMD160 79f17ab5f66a0359b96d06f7d600252cefbd6309 SHA1 f96287af3c58618b5a6ba2bd9ee9eb5c9a6ce2ee SHA256 3302551fe00b56bee7bd6ce07c241a47dee4592b4501de002db85669f219c756
diff --git a/www-servers/nginx/files/nginx-0.8.32-ey-balancer.patch b/www-servers/nginx/files/nginx-0.8.32-ey-balancer.patch
deleted file mode 100644
index 2a58e877d012..000000000000
--- a/www-servers/nginx/files/nginx-0.8.32-ey-balancer.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Naur a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
---- a/src/http/ngx_http_upstream.c	2009-12-23 10:31:16.000000000 -0500
-+++ b/src/http/ngx_http_upstream.c	2010-01-20 15:26:24.000000000 -0500
-@@ -24,8 +24,6 @@
- static void ngx_http_upstream_wr_check_broken_connection(ngx_http_request_t *r);
- static void ngx_http_upstream_check_broken_connection(ngx_http_request_t *r,
-     ngx_event_t *ev);
--static void ngx_http_upstream_connect(ngx_http_request_t *r,
--    ngx_http_upstream_t *u);
- static ngx_int_t ngx_http_upstream_reinit(ngx_http_request_t *r,
-     ngx_http_upstream_t *u);
- static void ngx_http_upstream_send_request(ngx_http_request_t *r,
-@@ -600,13 +598,12 @@
- 
- found:
- 
--    if (uscf->peer.init(r, uscf) != NGX_OK) {
--        ngx_http_upstream_finalize_request(r, u,
--                                           NGX_HTTP_INTERNAL_SERVER_ERROR);
--        return;
-+    switch(uscf->peer.init(r, uscf)) {
-+        case NGX_OK:   ngx_http_upstream_connect(r, u);
-+        case NGX_BUSY: return;
-     }
- 
--    ngx_http_upstream_connect(r, u);
-+    ngx_http_upstream_finalize_request(r, u, NGX_HTTP_INTERNAL_SERVER_ERROR);
- }
- 
- 
-@@ -1030,7 +1027,7 @@
- }
- 
- 
--static void
-+void
- ngx_http_upstream_connect(ngx_http_request_t *r, ngx_http_upstream_t *u)
- {
-     ngx_int_t          rc;
-diff -Naur a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h
---- a/src/http/ngx_http_upstream.h	2009-12-23 09:22:17.000000000 -0500
-+++ b/src/http/ngx_http_upstream.h	2010-01-20 15:24:36.000000000 -0500
-@@ -321,6 +321,8 @@
- 
- ngx_int_t ngx_http_upstream_create(ngx_http_request_t *r);
- void ngx_http_upstream_init(ngx_http_request_t *r);
-+#define NGX_HTTP_UPSTREAM_INIT_BUSY_PATCH_VERSION  1
-+void ngx_http_upstream_connect(ngx_http_request_t *r, ngx_http_upstream_t *u);
- ngx_http_upstream_srv_conf_t *ngx_http_upstream_add(ngx_conf_t *cf,
-     ngx_url_t *u, ngx_uint_t flags);
- char *ngx_http_upstream_bind_set_slot(ngx_conf_t *cf, ngx_command_t *cmd,
diff --git a/www-servers/nginx/metadata.xml b/www-servers/nginx/metadata.xml
index a8693e07c4b7..dd7abd7b5984 100644
--- a/www-servers/nginx/metadata.xml
+++ b/www-servers/nginx/metadata.xml
@@ -34,8 +34,6 @@
 			replace text in the nginx response</flag>
 		<flag name='nginx_modules_http_upload'>Enable support for handling file
 			uploads using multipart/form-data encoding</flag>
-		<flag name='nginx_modules_http_ey_balancer'>This module adds an upstream
-			connection queue to nginx</flag>
 		<flag name='nginx_modules_http_slowfs_cache'>This module adds the
 			ability to cache static files</flag>
 		<flag name='nginx_modules_http_upload_progress'>This module adds the
diff --git a/www-servers/nginx/nginx-1.1.2.ebuild b/www-servers/nginx/nginx-1.0.8.ebuild
index 447ff14c1d54..8339ab82c6ad 100644
--- a/www-servers/nginx/nginx-1.1.2.ebuild
+++ b/www-servers/nginx/nginx-1.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.1.2.ebuild,v 1.2 2011/09/09 16:44:14 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.0.8.ebuild,v 1.1 2011/10/28 06:52:53 hollow Exp $
 
 EAPI="4"
 
@@ -18,7 +18,7 @@ EAPI="4"
 GENTOO_DEPEND_ON_PERL="no"
 
 # http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
-HTTP_UPLOAD_PROGRESS_MODULE_PV="0.8.2"
+HTTP_UPLOAD_PROGRESS_MODULE_PV="0.8.3"
 HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
 HTTP_UPLOAD_PROGRESS_MODULE_SHA1="8b55a34"
 HTTP_UPLOAD_PROGRESS_MODULE_URI="http://github.com/masterzen/nginx-upload-progress-module/tarball/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
@@ -35,7 +35,7 @@ HTTP_PUSH_MODULE_P="nginx_http_push_module-${HTTP_PUSH_MODULE_PV}"
 HTTP_PUSH_MODULE_URI="http://pushmodule.slact.net/downloads/${HTTP_PUSH_MODULE_P}.tar.gz"
 
 # http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="1.3"
+HTTP_CACHE_PURGE_MODULE_PV="1.4"
 HTTP_CACHE_PURGE_MODULE_P="ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
 HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/${HTTP_CACHE_PURGE_MODULE_P}.tar.gz"
 
diff --git a/www-servers/nginx/nginx-1.0.4.ebuild b/www-servers/nginx/nginx-1.1.6.ebuild
index 3c67ae1b3c4a..46462af12935 100644
--- a/www-servers/nginx/nginx-1.0.4.ebuild
+++ b/www-servers/nginx/nginx-1.1.6.ebuild
@@ -1,74 +1,85 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.0.4.ebuild,v 1.4 2011/09/09 16:44:14 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.1.6.ebuild,v 1.1 2011/10/28 06:52:53 hollow Exp $
 
-EAPI="2"
+EAPI="4"
 
 # Maintainer notes:
 # - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
 # - any http-module activates the main http-functionality and overrides USE=-http
-# - keep the following 3 requirements in mind before adding external modules:
+# - keep the following requirements in mind before adding external modules:
 #   * alive upstream
 #   * sane packaging
 #   * builds cleanly
+#   * does not need a patch for nginx core
 # - TODO: test the google-perftools module (included in vanilla tarball)
 
 # prevent perl-module from adding automagic perl DEPENDs
 GENTOO_DEPEND_ON_PERL="no"
 
+# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
+HTTP_UPLOAD_PROGRESS_MODULE_PV="0.8.3"
+HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
+HTTP_UPLOAD_PROGRESS_MODULE_SHA1="8b55a34"
+HTTP_UPLOAD_PROGRESS_MODULE_URI="http://github.com/masterzen/nginx-upload-progress-module/tarball/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
+
 # http_headers_more (http://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.13"
-HTTP_HEADERS_MORE_MODULE_P="ngx-http-headers-more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_SHA1="9508330"
+HTTP_HEADERS_MORE_MODULE_PV="0.15"
+HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
+HTTP_HEADERS_MORE_MODULE_SHA1="137855d"
+HTTP_HEADERS_MORE_MODULE_URI="http://github.com/agentzh/headers-more-nginx-module/tarball/v${HTTP_HEADERS_MORE_MODULE_PV}"
 
 # http_push (http://pushmodule.slact.net/, MIT license)
 HTTP_PUSH_MODULE_PV="0.692"
 HTTP_PUSH_MODULE_P="nginx_http_push_module-${HTTP_PUSH_MODULE_PV}"
+HTTP_PUSH_MODULE_URI="http://pushmodule.slact.net/downloads/${HTTP_PUSH_MODULE_P}.tar.gz"
 
 # http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="1.3"
+HTTP_CACHE_PURGE_MODULE_PV="1.4"
 HTTP_CACHE_PURGE_MODULE_P="ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/${HTTP_CACHE_PURGE_MODULE_P}.tar.gz"
 
 # HTTP Upload module from Valery Kholodkov
 # (http://www.grid.net.ru/nginx/upload.en.html, BSD license)
 HTTP_UPLOAD_MODULE_PV="2.2.0"
 HTTP_UPLOAD_MODULE_P="nginx_upload_module-${HTTP_UPLOAD_MODULE_PV}"
-
-# ey-balancer/maxconn module (https://github.com/ry/nginx-ey-balancer, as-is)
-HTTP_EY_BALANCER_MODULE_PV="0.0.6"
-HTTP_EY_BALANCER_MODULE_P="nginx-ey-balancer-${HTTP_EY_BALANCER_MODULE_PV}"
-HTTP_EY_BALANCER_MODULE_SHA1="d373670"
+HTTP_UPLOAD_MODULE_URI="http://www.grid.net.ru/nginx/download/${HTTP_UPLOAD_MODULE_P}.tar.gz"
 
 # http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
 HTTP_SLOWFS_CACHE_MODULE_PV="1.6"
 HTTP_SLOWFS_CACHE_MODULE_P="ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz"
 
 inherit eutils ssl-cert toolchain-funcs perl-module flag-o-matic
 
 DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="http://nginx.net/
-	http://pushmodule.slact.net/
-	http://labs.frickle.com/nginx_ngx_cache_purge/"
-SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz
-	nginx_modules_http_headers_more? ( http://github.com/agentzh/headers-more-nginx-module/tarball/v${HTTP_HEADERS_MORE_MODULE_PV} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
-	nginx_modules_http_push? ( http://pushmodule.slact.net/downloads/${HTTP_PUSH_MODULE_P}.tar.gz )
-	nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
-	nginx_modules_http_upload? ( http://www.grid.net.ru/nginx/download/${HTTP_UPLOAD_MODULE_P}.tar.gz )
-	nginx_modules_http_ey_balancer? ( https://github.com/ry/nginx-ey-balancer/tarball/v${HTTP_EY_BALANCER_MODULE_PV} -> ${HTTP_EY_BALANCER_MODULE_P}.tar.gz )
-	nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )"
+HOMEPAGE="http://nginx.org"
+SRC_URI="http://nginx.org/download/${P}.tar.gz
+	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
+	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
+	nginx_modules_http_push? ( ${HTTP_PUSH_MODULE_URI} )
+	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} )
+	nginx_modules_http_upload? ( ${HTTP_UPLOAD_MODULE_URI} )
+	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} )"
 
 LICENSE="as-is BSD BSD-2 GPL-2 MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 
 NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif fastcgi
 geo gzip limit_req limit_zone map memcached proxy referer rewrite scgi ssi
 split_clients upstream_ip_hash userid uwsgi"
 NGINX_MODULES_OPT="addition dav degradation flv geoip gzip_static image_filter
-perl random_index realip secure_link stub_status sub xslt"
+mp4 perl random_index realip secure_link stub_status sub xslt"
 NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="http_cache_purge http_headers_more http_passenger http_push
-http_upload http_ey_balancer http_slowfs_cache"
+NGINX_MODULES_3RD="
+	http_upload_progress
+	http_headers_more
+	http_passenger
+	http_push
+	http_cache_purge
+	http_upload
+	http_slowfs_cache"
 
 IUSE="aio debug +http +http-cache ipv6 libatomic +pcre ssl vim-syntax"
 
@@ -128,7 +139,7 @@ pkg_setup() {
 	ebegin "Creating nginx user and group"
 	enewgroup ${PN}
 	enewuser ${PN} -1 -1 -1 ${PN}
-	eend ${?}
+	eend $?
 
 	if use libatomic; then
 		ewarn "GCC 4.1+ features built-in atomic operations."
@@ -151,70 +162,66 @@ pkg_setup() {
 
 src_prepare() {
 	sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make
-
-	if use nginx_modules_http_ey_balancer; then
-		epatch "${FILESDIR}"/nginx-0.8.32-ey-balancer.patch
-	fi
 }
 
 src_configure() {
 	local myconf= http_enabled= mail_enabled=
 
-	use aio && myconf="${myconf} --with-file-aio --with-aio_module"
-	use debug && myconf="${myconf} --with-debug"
-	use ipv6 && myconf="${myconf} --with-ipv6"
-	use libatomic && myconf="${myconf} --with-libatomic"
-	use pcre && myconf="${myconf} --with-pcre"
+	use aio       && myconf+=" --with-file-aio --with-aio_module"
+	use debug     && myconf+=" --with-debug"
+	use ipv6      && myconf+=" --with-ipv6"
+	use libatomic && myconf+=" --with-libatomic"
+	use pcre      && myconf+=" --with-pcre"
 
 	# HTTP modules
 	for mod in $NGINX_MODULES_STD; do
 		if use nginx_modules_http_${mod}; then
 			http_enabled=1
 		else
-			myconf="${myconf} --without-http_${mod}_module"
+			myconf+=" --without-http_${mod}_module"
 		fi
 	done
 
 	for mod in $NGINX_MODULES_OPT; do
 		if use nginx_modules_http_${mod}; then
 			http_enabled=1
-			myconf="${myconf} --with-http_${mod}_module"
+			myconf+=" --with-http_${mod}_module"
 		fi
 	done
 
 	if use nginx_modules_http_fastcgi; then
-		myconf="${myconf} --with-http_realip_module"
+		myconf+=" --with-http_realip_module"
 	fi
 
 	# third-party modules
+	if use nginx_modules_http_upload_progress; then
+		http_enabled=1
+		myconf+=" --add-module=${WORKDIR}/masterzen-nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_SHA1}"
+	fi
+
 	if use nginx_modules_http_headers_more; then
 		http_enabled=1
-		myconf="${myconf} --add-module=${WORKDIR}/agentzh-headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_SHA1}"
+		myconf+=" --add-module=${WORKDIR}/agentzh-headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_SHA1}"
 	fi
 
 	if use nginx_modules_http_push; then
 		http_enabled=1
-		myconf="${myconf} --add-module=${WORKDIR}/${HTTP_PUSH_MODULE_P}"
+		myconf+=" --add-module=${WORKDIR}/${HTTP_PUSH_MODULE_P}"
 	fi
 
 	if use nginx_modules_http_cache_purge; then
 		http_enabled=1
-		myconf="${myconf} --add-module=${WORKDIR}/${HTTP_CACHE_PURGE_MODULE_P}"
+		myconf+=" --add-module=${WORKDIR}/${HTTP_CACHE_PURGE_MODULE_P}"
 	fi
 
 	if use nginx_modules_http_upload; then
 		http_enabled=1
-		myconf="${myconf} --add-module=${WORKDIR}/${HTTP_UPLOAD_MODULE_P}"
-	fi
-
-	if use nginx_modules_http_ey_balancer; then
-		http_enabled=1
-		myconf="${myconf} --add-module=${WORKDIR}/ry-nginx-ey-balancer-${HTTP_EY_BALANCER_MODULE_SHA1}"
+		myconf+=" --add-module=${WORKDIR}/${HTTP_UPLOAD_MODULE_P}"
 	fi
 
 	if use nginx_modules_http_slowfs_cache; then
 		http_enabled=1
-		myconf="${myconf} --add-module=${WORKDIR}/${HTTP_SLOWFS_CACHE_MODULE_P}"
+		myconf+=" --add-module=${WORKDIR}/${HTTP_SLOWFS_CACHE_MODULE_P}"
 	fi
 
 	if use http || use http-cache; then
@@ -222,10 +229,10 @@ src_configure() {
 	fi
 
 	if [ $http_enabled ]; then
-		use http-cache || myconf="${myconf} --without-http-cache"
-		use ssl && myconf="${myconf} --with-http_ssl_module"
+		use http-cache || myconf+=" --without-http-cache"
+		use ssl && myconf+=" --with-http_ssl_module"
 	else
-		myconf="${myconf} --without-http --without-http-cache"
+		myconf+=" --without-http --without-http-cache"
 	fi
 
 	# MAIL modules
@@ -233,18 +240,18 @@ src_configure() {
 		if use nginx_modules_mail_${mod}; then
 			mail_enabled=1
 		else
-			myconf="${myconf} --without-mail_${mod}_module"
+			myconf+=" --without-mail_${mod}_module"
 		fi
 	done
 
 	if [ $mail_enabled ]; then
-		myconf="${myconf} --with-mail"
-		use ssl && myconf="${myconf} --with-mail_ssl_module"
+		myconf+=" --with-mail"
+		use ssl && myconf+=" --with-mail_ssl_module"
 	fi
 
 	# custom modules
 	for mod in $NGINX_ADD_MODULES; do
-		myconf="${myconf} --add-module=${mod}"
+		myconf+=" --add-module=${mod}"
 	done
 
 	# https://bugs.gentoo.org/286772
@@ -278,6 +285,7 @@ src_compile() {
 
 src_install() {
 	keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi,scgi,uwsgi}
+	keepdir /var/www/localhost/htdocs
 
 	dosbin objs/nginx
 	newinitd "${FILESDIR}"/nginx.init-r2 nginx
@@ -317,11 +325,6 @@ src_install() {
 		dodoc "${WORKDIR}"/${HTTP_UPLOAD_MODULE_P}/{Changelog,README}
 	fi
 
-	if use nginx_modules_http_ey_balancer; then
-		docinto ${HTTP_EY_BALANCER_MODULE_P}
-		dodoc "${WORKDIR}"/ry-nginx-ey-balancer-${HTTP_EY_BALANCER_MODULE_SHA1}/README
-	fi
-
 	if use nginx_modules_http_slowfs_cache; then
 		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
 		dodoc "${WORKDIR}"/${HTTP_SLOWFS_CACHE_MODULE_P}/{CHANGES,README}