version bump wrt #402957

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

9 files changed, 402 insertions, 46 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index 7482948959ff..a7d65422e37f 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-servers/nginx
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.305 2012/01/29 13:11:49 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.306 2012/02/11 10:17:30 hollow Exp $
+
+*nginx-1.1.14 (11 Feb 2012)
+*nginx-1.0.12 (11 Feb 2012)
+
+  11 Feb 2012; Benedikt Böhm <hollow@gentoo.org> nginx-1.0.10.ebuild,
+  nginx-1.0.11.ebuild, +nginx-1.0.12.ebuild, -nginx-1.1.12-r1.ebuild,
+  nginx-1.1.13.ebuild, +nginx-1.1.14.ebuild, +files/nginx.conf,
+  +files/nginx.initd, -files/nginx.conf-r4, -files/nginx.init-r2:
+  version bump wrt #402957
 
 *nginx-1.1.13 (29 Jan 2012)
 *nginx-1.0.11 (29 Jan 2012)
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 7a37c917ae9d..09d74cf4049b 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,10 +1,11 @@
-AUX nginx.conf-r4 1358 RMD160 a948df249a16be86c114d587cfa5ee570d84a356 SHA1 e9db0447a1beb326a0858cf8189328229d1d3edf SHA256 6ff6c9301ea2a4d74a335b9119d7f9dba87d4e83793cf22d837d49f061763096
-AUX nginx.init-r2 1867 RMD160 8e23982092f54d973c21519dea5b8c2300c0ba39 SHA1 80a1e9c7cc37dd8cdd1eda689d24b4b3ee19379c SHA256 fe2903b81be956d37feb09ee99ba0b9c952909d6b1165637c893621764bc40c5
+AUX nginx.conf 1358 RMD160 a948df249a16be86c114d587cfa5ee570d84a356 SHA1 e9db0447a1beb326a0858cf8189328229d1d3edf SHA256 6ff6c9301ea2a4d74a335b9119d7f9dba87d4e83793cf22d837d49f061763096
+AUX nginx.initd 1937 RMD160 3429c046fc3cc0505e2c7de26226120df3c8c865 SHA1 1674343b6bde753a8d49491e3c68ebaf9be19dcc SHA256 3bf11b5ab89eb933058b57f41058fed6a611f1e32b367f1606430b9337ba782d
 AUX nginx.logrotate 364 RMD160 9fdfd2ea2f49b8dba20a030d893e34779bb32364 SHA1 4ab07992fa5c64f753e3643e1b51fcab4dec6ccf SHA256 9e3e090dfd10861d5f9b279e19113ce8d05caf9f33d488f6aabf9f19ac0cf925
 DIST nginx-1.0.10.tar.gz 686011 RMD160 875082ff6e9197cc26adf4ee51eeda34b9531e29 SHA1 01304d44048aa57944e935dda8523afd5e5d1e23 SHA256 7221fdb0f2a94875252cb3c406a2cd5895d9bc57874fc1b4f588964fd3361e3c
 DIST nginx-1.0.11.tar.gz 691501 RMD160 49d8602cd5cb557fd5847fa8c1a9629f4e6d91ab SHA1 c06144214144b61358ccf785e99f751b8ca0a3bb SHA256 4a382de6b89ec7eae03bfc9f9716bca5567993d0ae90fbd5f75c1ea598f7d722
-DIST nginx-1.1.12.tar.gz 707120 RMD160 1d09c3b17ee27774657c5be32f7fdcc20252c0b0 SHA1 78e8de01206fa5a150c3494ed313ea1d6b74353a SHA256 0d00f0f928bc8637f200de7bc405ebb95730c923df208624ea56529be44c08f9
+DIST nginx-1.0.12.tar.gz 691002 RMD160 a6f424f5b9c74ba7d0d4dba4f0eee0931116a779 SHA1 74bf2377f976c3acb8bece56b3233e79b6e859d1 SHA256 ba98242ed35086aa0df95441a860353ec1ecb95cd112f248f9a8ef368262332b
 DIST nginx-1.1.13.tar.gz 707584 RMD160 21ca1a012d942038c29393acc292ef52cdb9a34e SHA1 81016f54214bd505ee97113304b803d477111a14 SHA256 2a444f173b186f60cb4047ddb713c4e023da13bad7b2e17f5b0fe1881214a479
+DIST nginx-1.1.14.tar.gz 706894 RMD160 5d79a56e5ef49a2652573ff964e0e51a9a698d1e SHA1 f5fd32cf421fb2540f474facf18d2f6093c9c224 SHA256 3eac154d98e1d5c7d7549449c986a4647f1898fd7ca516700d04121b2700d187
 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_cache_purge-1.4.tar.gz 6899 RMD160 b851f9d7c829152a6675d7e83df372e4bd894170 SHA1 35c45729183daa66b60741828a42492e06597da3 SHA256 4764e3d565445644f4a6b183cb9e987fce535396b00d68dc923bb35731a88886
@@ -12,9 +13,10 @@ DIST ngx_cache_purge-1.5.tar.gz 7149 RMD160 7b7d351ea91ff3d4161296625a5a4992eee8
 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.3.tar.gz 16694 RMD160 b3c8835a270cda2224f5be35f1afb818821609b3 SHA1 0edae535d1efd50524d9947acaebe3979b06fcfb SHA256 f391da7fd1a89bd65e852182b6cbc746289cd10c83b211be18e703ff3e3986ae
-EBUILD nginx-1.0.10.ebuild 11069 RMD160 e4309920e0541ffffe5b74708e212d7aeb076bf5 SHA1 6272bc96ad05d277565c96db01e2f98152c2a794 SHA256 1d6ebdf3d1fc4d056adcb8181bb9acd5a43d89f5f7c7f3f7b336c42d0559231e
-EBUILD nginx-1.0.11.ebuild 11071 RMD160 e55f15341c8121880961edf70e04d1171d4d5a18 SHA1 2c3cce45877b1622003266e5ef836f13f3651985 SHA256 d927e5b976b6eec9f6feb2945c56c7750c799f59f601c90af16f0c0287616ca3
-EBUILD nginx-1.1.12-r1.ebuild 11163 RMD160 9d4cf8f51bc375ca730359f6fa8aabd5af388d79 SHA1 1cec7c47048f043a603011c5e6ab11d3d4f3c701 SHA256 0aa0bba8491947fae265a8d1eca717571cd171a475c284b9be00b5ba8085b48f
-EBUILD nginx-1.1.13.ebuild 11159 RMD160 93b55adcbe2a77979a0cd81bac2593e62ef8dc4a SHA1 a07b3054c9808e76f849307152c77534695fdcfb SHA256 1d799f55b653f5f15642aacbd335d20bc05aab4ae1e0005fa6a7b9bf02f4cad6
-MISC ChangeLog 49975 RMD160 91362348c3b975f34ecd27577cea40e07cf2d0e1 SHA1 bd8a75238e6e626ad0be028e643e4ca03742c2fb SHA256 c707d7c7825d941157950292f686f5b7f8d045479c7293619055a10443b1e236
+EBUILD nginx-1.0.10.ebuild 11064 RMD160 911919138c01903776c6b2a599cf8c573ca4e3b5 SHA1 d19bd5d607483fcf7763e58cbeaef6a6757f99ea SHA256 b17684768ffc8b0d4c4040a8c4a522612ec0c66b2deac9420dc98c3379710f93
+EBUILD nginx-1.0.11.ebuild 11066 RMD160 e2d849ff7ff833e66e40dbccb5c2798c1b73ede7 SHA1 a6bb3dcdf90da8daa0c77586079ca5e151b49943 SHA256 b7dbb49554695f0791904228592385aae9bcb1921389a6491d571d330cab8384
+EBUILD nginx-1.0.12.ebuild 11066 RMD160 08c1b3969aceee33b5db64af87793466b51d84e0 SHA1 29a8668bff0db1438beed3897320160c5ce9377b SHA256 0419672a089213b8a8a21ec4017382493ef1b284513f4b921fdfba78da97a6f5
+EBUILD nginx-1.1.13.ebuild 11154 RMD160 166b78d9e5ef21bbbab1a77808722693aa1172ea SHA1 178b283bb7fbed69782eda49d76e89e5b896accd SHA256 b415ec86de53bd49e49e72431f84a2f05f5ca9ace2b6206ecc90810de500ff32
+EBUILD nginx-1.1.14.ebuild 11154 RMD160 edb7c56218d862f5821ec38b04a8c39968dd62d9 SHA1 238d9c8e18e277b313da692a092491500a95d4b6 SHA256 9a7cd4b509446757c5ee1acf4cc482d30c309dd2f03efa95048c545fe06bc988
+MISC ChangeLog 50331 RMD160 837c73e65368056c9ac4720b1111ab758246e6dc SHA1 c6c2a10e3ff47befe0a9c3590d4505ed6d2e4bcb SHA256 b0a6c0095e45f9865fafd31e44485368c3de2909966480b4a763bc65872f8fe8
 MISC metadata.xml 2465 RMD160 0997961bf70f680aedae4dbca6d77fbc4ef0a8d3 SHA1 f3722efd8f9faea7aaa16cba3ee8a5e195845aca SHA256 803c729fd73dee3a1db72b9130c44d4fed071480206180b2f01e420a03ce0fa8
diff --git a/www-servers/nginx/files/nginx.conf-r4 b/www-servers/nginx/files/nginx.conf
index 74c015f708ca..74c015f708ca 100644
--- a/www-servers/nginx/files/nginx.conf-r4
+++ b/www-servers/nginx/files/nginx.conf
diff --git a/www-servers/nginx/files/nginx.init-r2 b/www-servers/nginx/files/nginx.initd
index 9032fec2d0bf..ea11e08497b5 100644
--- a/www-servers/nginx/files/nginx.init-r2
+++ b/www-servers/nginx/files/nginx.initd
@@ -1,43 +1,47 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx.init-r2,v 1.3 2011/12/06 21:13:29 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx.initd,v 1.1 2012/02/11 10:17:30 hollow Exp $
 
 extra_commands="configtest"
-extra_started_commands="upgrade reload configtest"
+extra_started_commands="upgrade reload"
+
+description="Robust, small and high performance http and reverse proxy server"
+description_configtest="Run nginx' internal config check."
+description_upgrade="Upgrade the nginx binary without losing connections."
+description_reload="Reload the nginx configuration without losing connections."
+
+nginx_config="/etc/nginx/nginx.conf"
+
+command="/usr/sbin/nginx"
+command_args="-c ${nginx_config}"
+pidfile="/var/run/nginx.pid"
 
 depend() {
 	need net
 	use dns logger netmount
 }
 
-start() {
+start_pre() {
 	if [ "${RC_CMD}" != "restart" ]; then
 		configtest || return 1
 	fi
-
-	ebegin "Starting nginx"
-	start-stop-daemon --start --pidfile /var/run/nginx.pid \
-		--exec /usr/sbin/nginx -- -c /etc/nginx/nginx.conf
-	eend $? "Failed to start nginx"
 }
 
-stop() {
+stop_pre() {
 	if [ "${RC_CMD}" = "restart" ]; then
 		configtest || return 1
 	fi
+}
 
-	ebegin "Stopping nginx"
-	start-stop-daemon --stop --pidfile /var/run/nginx.pid
-	eend $? "Failed to stop nginx"
-
-	rm -f /var/run/nginx.pid
+stop_post() {
+	rm -f ${pidfile}
 }
 
 reload() {
 	configtest || return 1
 	ebegin "Refreshing nginx' configuration"
-	kill -HUP `cat /var/run/nginx.pid` &>/dev/null
+	kill -HUP `cat ${pidfile}` &>/dev/null
 	eend $? "Failed to reload nginx"
 }
 
@@ -46,26 +50,26 @@ upgrade() {
 	ebegin "Upgrading nginx"
 
 	einfo "Sending USR2 to old binary"
-	kill -USR2 `cat /var/run/nginx.pid` &>/dev/null
+	kill -USR2 `cat ${pidfile}` &>/dev/null
 
 	einfo "Sleeping 3 seconds before pid-files checking"
 	sleep 3
 
-	if [ ! -f /var/run/nginx.pid.oldbin ]; then
+	if [ ! -f ${pidfile}.oldbin ]; then
 		eerror "File with old pid not found"
 		return 1
 	fi
 
-	if [ ! -f /var/run/nginx.pid ]; then
+	if [ ! -f ${pidfile} ]; then
 		eerror "New binary failed to start"
 		return 1
 	fi
 
 	einfo "Sleeping 3 seconds before WINCH"
-	sleep 3 ; kill -WINCH `cat /var/run/nginx.pid.oldbin`
+	sleep 3 ; kill -WINCH `cat ${pidfile}.oldbin`
 
 	einfo "Sending QUIT to old binary"
-	kill -QUIT `cat /var/run/nginx.pid.oldbin`
+	kill -QUIT `cat ${pidfile}.oldbin`
 
 	einfo "Upgrade completed"
 	eend $? "Upgrade failed"
@@ -73,10 +77,10 @@ upgrade() {
 
 configtest() {
 	ebegin "Checking nginx' configuration"
-	/usr/sbin/nginx -c /etc/nginx/nginx.conf -t -q
+	${command} -c ${nginx_config} -t -q
 
 	if [ $? -ne 0 ]; then
-		/usr/sbin/nginx -c /etc/nginx/nginx.conf -t
+		${command} -c ${nginx_config} -t
 	fi
 
 	eend $? "failed, please correct errors above"
diff --git a/www-servers/nginx/nginx-1.0.10.ebuild b/www-servers/nginx/nginx-1.0.10.ebuild
index e4b66a307c50..25069f4275bb 100644
--- a/www-servers/nginx/nginx-1.0.10.ebuild
+++ b/www-servers/nginx/nginx-1.0.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.0.10.ebuild,v 1.4 2011/11/24 07:14:31 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.0.10.ebuild,v 1.5 2012/02/11 10:17:30 hollow Exp $
 
 EAPI="4"
 
@@ -288,9 +288,9 @@ src_install() {
 	keepdir /var/www/localhost/htdocs
 
 	dosbin objs/nginx
-	newinitd "${FILESDIR}"/nginx.init-r2 nginx
+	newinitd "${FILESDIR}"/nginx.initd nginx
 
-	cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf
+	cp "${FILESDIR}"/nginx.conf conf/nginx.conf
 	rm conf/win-utf conf/koi-win conf/koi-utf
 
 	dodir /etc/${PN}
diff --git a/www-servers/nginx/nginx-1.0.11.ebuild b/www-servers/nginx/nginx-1.0.11.ebuild
index 49d41baea140..983e3f53732f 100644
--- a/www-servers/nginx/nginx-1.0.11.ebuild
+++ b/www-servers/nginx/nginx-1.0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.0.11.ebuild,v 1.1 2012/01/29 13:11:49 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.0.11.ebuild,v 1.2 2012/02/11 10:17:30 hollow Exp $
 
 EAPI="4"
 
@@ -288,9 +288,9 @@ src_install() {
 	keepdir /var/www/localhost/htdocs
 
 	dosbin objs/nginx
-	newinitd "${FILESDIR}"/nginx.init-r2 nginx
+	newinitd "${FILESDIR}"/nginx.initd nginx
 
-	cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf
+	cp "${FILESDIR}"/nginx.conf conf/nginx.conf
 	rm conf/win-utf conf/koi-win conf/koi-utf
 
 	dodir /etc/${PN}
diff --git a/www-servers/nginx/nginx-1.0.12.ebuild b/www-servers/nginx/nginx-1.0.12.ebuild
new file mode 100644
index 000000000000..bf85b1a765b4
--- /dev/null
+++ b/www-servers/nginx/nginx-1.0.12.ebuild
@@ -0,0 +1,341 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.0.12.ebuild,v 1.1 2012/02/11 10:17:30 hollow Exp $
+
+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 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="c7c663f"
+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.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.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}"
+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.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"
+
+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
+mp4 perl random_index realip secure_link stub_status sub xslt"
+NGINX_MODULES_MAIL="imap pop3 smtp"
+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"
+
+for mod in $NGINX_MODULES_STD; do
+	IUSE="${IUSE} +nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_OPT; do
+	IUSE="${IUSE} nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_MAIL; do
+	IUSE="${IUSE} nginx_modules_mail_${mod}"
+done
+
+for mod in $NGINX_MODULES_3RD; do
+	IUSE="${IUSE} nginx_modules_${mod}"
+done
+
+CDEPEND="
+	pcre? ( >=dev-libs/libpcre-4.2 )
+	ssl? ( dev-libs/openssl )
+	http-cache? ( userland_GNU? ( dev-libs/openssl ) )
+	nginx_modules_http_geo? ( dev-libs/geoip )
+	nginx_modules_http_gzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip_static? ( sys-libs/zlib )
+	nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] )
+	nginx_modules_http_perl? ( >=dev-lang/perl-5.8 )
+	nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 )
+	nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) )
+	nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}
+	arm? ( dev-libs/libatomic_ops )
+	libatomic? ( dev-libs/libatomic_ops )"
+PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
+
+pkg_setup() {
+	if use nginx_modules_http_passenger; then
+		einfo
+		einfo "Passenger support has been removed from the nginx ebuild to"
+		einfo "get rid of file collisions, its broken build system and"
+		einfo "incompatibilities between passenger 2 and 3."
+		einfo
+		einfo "Please switch to passenger-3 standalone or use the"
+		einfo "unicorn gem which provides a sane nginx-like architecture"
+		einfo "out of the box."
+		einfo
+		einfo "For more information on sane ruby deployments with"
+		einfo "passenger-3/unicorn go to:"
+		einfo
+		einfo "https://rvm.beginrescueend.com"
+		einfo
+		die "nginx_modules_http_passenger still in IUSE"
+	fi
+
+	ebegin "Creating nginx user and group"
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+	eend $?
+
+	if use libatomic; then
+		ewarn "GCC 4.1+ features built-in atomic operations."
+		ewarn "Using libatomic_ops is only needed if using"
+		ewarn "a different compiler or a GCC prior to 4.1"
+	fi
+
+	if [[ -n $NGINX_ADD_MODULES ]]; then
+		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
+		ewarn "This nginx installation is not supported!"
+		ewarn "Make sure you can reproduce the bug without those modules"
+		ewarn "_before_ reporting bugs."
+	fi
+
+	if use !http; then
+		ewarn "To actually disable all http-functionality you also have to disable"
+		ewarn "all nginx http modules."
+	fi
+}
+
+src_prepare() {
+	sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make
+}
+
+src_configure() {
+	local myconf= http_enabled= mail_enabled=
+
+	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+=" --without-http_${mod}_module"
+		fi
+	done
+
+	for mod in $NGINX_MODULES_OPT; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+			myconf+=" --with-http_${mod}_module"
+		fi
+	done
+
+	if use nginx_modules_http_fastcgi; then
+		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+=" --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+=" --add-module=${WORKDIR}/${HTTP_PUSH_MODULE_P}"
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		http_enabled=1
+		myconf+=" --add-module=${WORKDIR}/${HTTP_CACHE_PURGE_MODULE_P}"
+	fi
+
+	if use nginx_modules_http_upload; then
+		http_enabled=1
+		myconf+=" --add-module=${WORKDIR}/${HTTP_UPLOAD_MODULE_P}"
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		http_enabled=1
+		myconf+=" --add-module=${WORKDIR}/${HTTP_SLOWFS_CACHE_MODULE_P}"
+	fi
+
+	if use http || use http-cache; then
+		http_enabled=1
+	fi
+
+	if [ $http_enabled ]; then
+		use http-cache || myconf+=" --without-http-cache"
+		use ssl && myconf+=" --with-http_ssl_module"
+	else
+		myconf+=" --without-http --without-http-cache"
+	fi
+
+	# MAIL modules
+	for mod in $NGINX_MODULES_MAIL; do
+		if use nginx_modules_mail_${mod}; then
+			mail_enabled=1
+		else
+			myconf+=" --without-mail_${mod}_module"
+		fi
+	done
+
+	if [ $mail_enabled ]; then
+		myconf+=" --with-mail"
+		use ssl && myconf+=" --with-mail_ssl_module"
+	fi
+
+	# custom modules
+	for mod in $NGINX_ADD_MODULES; do
+		myconf+=" --add-module=${mod}"
+	done
+
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	tc-export CC
+
+	./configure \
+		--prefix=/usr \
+		--sbin-path=/usr/sbin/nginx \
+		--conf-path=/etc/${PN}/${PN}.conf \
+		--error-log-path=/var/log/${PN}/error_log \
+		--pid-path=/var/run/${PN}.pid \
+		--lock-path=/var/lock/nginx.lock \
+		--user=${PN} --group=${PN} \
+		--with-cc-opt="-I${ROOT}usr/include" \
+		--with-ld-opt="-L${ROOT}usr/lib" \
+		--http-log-path=/var/log/${PN}/access_log \
+		--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 \
+		--http-scgi-temp-path=/var/tmp/${PN}/scgi \
+		--http-uwsgi-temp-path=/var/tmp/${PN}/uwsgi \
+		${myconf} || die "configure failed"
+}
+
+src_compile() {
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+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.initd nginx
+
+	cp "${FILESDIR}"/nginx.conf conf/nginx.conf
+	rm conf/win-utf conf/koi-win conf/koi-utf
+
+	dodir /etc/${PN}
+	insinto /etc/${PN}
+	doins conf/*
+
+	doman man/nginx.8
+	dodoc CHANGES* README
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/nginx.logrotate nginx
+
+	if use nginx_modules_http_perl; then
+		cd "${S}"/objs/src/http/modules/perl/
+		einstall DESTDIR="${D}" INSTALLDIRS=vendor || die "failed to install perl stuff"
+		fixlocalpod
+	fi
+
+	if use nginx_modules_http_push; then
+		docinto ${HTTP_PUSH_MODULE_P}
+		dodoc "${WORKDIR}"/${HTTP_PUSH_MODULE_P}/{changelog.txt,protocol.txt,README}
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		docinto ${HTTP_CACHE_PURGE_MODULE_P}
+		dodoc "${WORKDIR}"/${HTTP_CACHE_PURGE_MODULE_P}/{CHANGES,README.md,TODO.md}
+	fi
+
+	if use nginx_modules_http_upload; then
+		docinto ${HTTP_UPLOAD_MODULE_P}
+		dodoc "${WORKDIR}"/${HTTP_UPLOAD_MODULE_P}/{Changelog,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}
+	fi
+}
+
+pkg_postinst() {
+	if use ssl; then
+		if [ ! -f "${ROOT}"/etc/ssl/${PN}/${PN}.key ]; then
+			install_cert /etc/ssl/${PN}/${PN}
+			chown ${PN}:${PN} "${ROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
+		fi
+	fi
+}
diff --git a/www-servers/nginx/nginx-1.1.13.ebuild b/www-servers/nginx/nginx-1.1.13.ebuild
index f4bd5d1927a0..27c9200ced5f 100644
--- a/www-servers/nginx/nginx-1.1.13.ebuild
+++ b/www-servers/nginx/nginx-1.1.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.1.13.ebuild,v 1.1 2012/01/29 13:11:49 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.1.13.ebuild,v 1.2 2012/02/11 10:17:30 hollow Exp $
 
 EAPI="4"
 
@@ -290,9 +290,9 @@ src_install() {
 	keepdir /var/www/localhost/htdocs
 
 	dosbin objs/nginx
-	newinitd "${FILESDIR}"/nginx.init-r2 nginx
+	newinitd "${FILESDIR}"/nginx.initd nginx
 
-	cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf
+	cp "${FILESDIR}"/nginx.conf conf/nginx.conf
 	rm conf/win-utf conf/koi-win conf/koi-utf
 
 	dodir /etc/${PN}
diff --git a/www-servers/nginx/nginx-1.1.12-r1.ebuild b/www-servers/nginx/nginx-1.1.14.ebuild
index cef3c217fdca..c193e6fd8d2d 100644
--- a/www-servers/nginx/nginx-1.1.12-r1.ebuild
+++ b/www-servers/nginx/nginx-1.1.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.1.12-r1.ebuild,v 1.1 2011/12/28 05:49:12 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.1.14.ebuild,v 1.1 2012/02/11 10:17:30 hollow Exp $
 
 EAPI="4"
 
@@ -290,9 +290,9 @@ src_install() {
 	keepdir /var/www/localhost/htdocs
 
 	dosbin objs/nginx
-	newinitd "${FILESDIR}"/nginx.init-r2 nginx
+	newinitd "${FILESDIR}"/nginx.initd nginx
 
-	cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf
+	cp "${FILESDIR}"/nginx.conf conf/nginx.conf
 	rm conf/win-utf conf/koi-win conf/koi-utf
 
 	dodir /etc/${PN}