remove old 0.7 series, version bump to 0.9.7: drops passenger support, adds http_upload module, fixes logrotate when not running

(Portage version: 2.2.0_alpha23/cvs/Linux x86_64)

6 files changed, 81 insertions, 466 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index 4036536c8fe3..6ab4f76b1ee4 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.274 2011/03/05 00:59:49 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.275 2011/04/08 08:32:19 hollow Exp $
+
+*nginx-0.9.7 (08 Apr 2011)
+
+  08 Apr 2011; Benedikt Böhm <hollow@gentoo.org> -nginx-0.7.65.ebuild,
+  -nginx-0.7.65-r1.ebuild, -nginx-0.8.52.ebuild, +nginx-0.9.7.ebuild,
+  files/nginx.logrotate, metadata.xml:
+  remove old 0.7 series, version bump to 0.9.7: drops passenger support,
+  adds http_upload module, fixes logrotate when not running
 
   05 Mar 2011; Brent Baude <ranger@gentoo.org> nginx-0.8.53.ebuild:
   stable ppc, bug 349223
diff --git a/www-servers/nginx/files/nginx.logrotate b/www-servers/nginx/files/nginx.logrotate
index b8e3b02150cb..c9d4c5aed2ce 100644
--- a/www-servers/nginx/files/nginx.logrotate
+++ b/www-servers/nginx/files/nginx.logrotate
@@ -1,12 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx.logrotate,v 1.1 2010/01/03 20:29:40 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx.logrotate,v 1.2 2011/04/08 08:32:20 hollow Exp $
 
 /var/log/nginx/*_log {
 	missingok
 	sharedscripts
 	postrotate
-		kill -USR1 `cat /var/run/nginx.pid`
+		test -r /var/run/nginx.pid && kill -USR1 `cat /var/run/nginx.pid`
 	endscript
 }
-
diff --git a/www-servers/nginx/metadata.xml b/www-servers/nginx/metadata.xml
index 04cf7a747706..50149c6c55ec 100644
--- a/www-servers/nginx/metadata.xml
+++ b/www-servers/nginx/metadata.xml
@@ -11,20 +11,33 @@
 		<name>Tiziano Müller</name>
 	</maintainer>
 	<use>
-		<flag name='addition'>Enables HTTP addition filter module</flag>
 		<flag name='aio'>Enables file AIO support</flag>
-		<flag name='flv'>Enables special processing module for flv files</flag>
 		<flag name='http'>Enable HTTP core support</flag>
 		<flag name='http-cache'>Enable HTTP cache support</flag>
 		<flag name='libatomic'>Use libatomic instead of builtin atomic operations</flag>
-		<flag name='pop'>Enables POP3 proxy support</flag>
-		<flag name='random-index'>Enables HTTP random index module</flag>
-		<flag name='realip'>Enables realip module</flag>
-		<flag name='smtp'>Enables SMTP proxy support</flag>
-		<flag name='static-gzip'>Enables support for gzipping static content</flag>
-		<flag name='status'>Enables stub_status module</flag>
-		<flag name='sub'>Enables sub_filter module</flag>
-		<flag name='webdav'>Enable webdav support</flag>
+		<flag name='nginx_modules_http_addition'>This module adds contents of
+			other locations before and after the current location's
+			content.</flag>
+		<flag name='nginx_modules_http_dav'>This module adds the HTTP and WebDAV
+			methods PUT, DELETE, MKCOL, COPY and MOVE.</flag>
+		<flag name='nginx_modules_http_flv'>This module provides the ability to
+			seek within FLV (Flash) files using time-based offsets.</flag>
+		<flag name='nginx_modules_http_random_index'>Pick a random directory
+			index from a directory.</flag>
+		<flag name='nginx_modules_http_realip'>This module allows to change the
+			client's IP address to value from request header (e. g. X-Real-IP or
+			X-Forwarded-For).</flag>
+		<flag name='nginx_modules_http_gzip_static'>Enables support for gzipping
+			static content on disk</flag>
+		<flag name='nginx_modules_http_stub_status'>This module provides the
+			ability to get some status from nginx</flag>
+		<flag name='nginx_modules_http_sub'>Enable support for search and
+			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_mail_imap'>Enables IMAP proxy support</flag>
+		<flag name='nginx_modules_mail_pop3'>Enables POP3 proxy support</flag>
+		<flag name='nginx_modules_mail_smtp'>Enables SMTP proxy support</flag>
 	</use>
 	<upstream>
 		<changelog>http://nginx.org/en/CHANGES</changelog>
diff --git a/www-servers/nginx/nginx-0.7.65-r1.ebuild b/www-servers/nginx/nginx-0.7.65-r1.ebuild
deleted file mode 100644
index 4168c3459fa7..000000000000
--- a/www-servers/nginx/nginx-0.7.65-r1.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.7.65-r1.ebuild,v 1.4 2010/05/29 06:35:55 hollow Exp $
-
-EAPI="2"
-
-USE_RUBY="ruby18"
-RUBY_OPTIONAL="yes"
-PASSENGER_PV="2.2.11"
-
-inherit eutils ssl-cert toolchain-funcs perl-module ruby-ng flag-o-matic
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="http://nginx.net/"
-SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz
-	nginx_modules_http_passenger? ( mirror://rubyforge/passenger/passenger-${PASSENGER_PV}.tar.gz )"
-
-LICENSE="BSD"
-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 ssi
-upstream_ip_hash userid"
-NGINX_MODULES_OPT="addition dav degradation flv geoip gzip_static image_filter
-perl random_index realip secure_link stub_status sub xslt"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="http_passenger"
-
-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="
-	arm? ( dev-libs/libatomic_ops )
-	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 )
-	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 )
-	nginx_modules_http_passenger? (
-		$(ruby_implementation_depend ruby18)
-		>=dev-ruby/rubygems-0.9.0
-		>=dev-ruby/rake-0.8.1
-		>=dev-ruby/fastthread-1.0.1
-		>=dev-ruby/rack-1.0.0
-	)
-"
-RDEPEND="${RDEPEND} ${CDEPEND}"
-DEPEND="${DEPEND} ${CDEPEND}
-	libatomic? ( dev-libs/libatomic_ops )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-pkg_setup() {
-	ebegin "Creating nginx user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-	eend ${?}
-
-	if use ipv6; then
-		ewarn "Note that ipv6 support in nginx is still experimental."
-		ewarn "Be sure to read comments on gentoo bug #274614"
-		ewarn "http://bugs.gentoo.org/show_bug.cgi?id=274614"
-	fi
-
-	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 "Please do not file bug reports!"
-	fi
-
-	if use nginx_modules_http_passenger; then
-		ruby-ng_pkg_setup
-		use debug && append-flags -DPASSENGER_DEBUG
-	fi
-}
-
-src_unpack() {
-	# prevent ruby-ng.eclass from messing with src_unpack
-	default
-}
-
-src_prepare() {
-	sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make
-
-	if use nginx_modules_http_passenger; then
-		cd "${WORKDIR}"/passenger-${PASSENGER_PV}
-		epatch "${FILESDIR}"/passenger-CFLAGS.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"
-
-	# 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"
-		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"
-		fi
-	done
-
-	if use nginx_modules_http_fastcgi; then
-		myconf="${myconf} --with-http_realip_module"
-	fi
-
-	if use nginx_modules_http_passenger; then
-		http_enabled=1
-		myconf="${myconf} --add-module=${WORKDIR}/passenger-${PASSENGER_PV}/ext/nginx"
-	fi
-
-	if use http || use http-cache; then
-		http_enabled=1
-	fi
-
-	if [ $http_enabled ]; then
-		use http-cache || myconf="${myconf} --without-http-cache"
-		use ssl && myconf="${myconf} --with-http_ssl_module"
-	else
-		myconf="${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="${myconf} --without-mail_${mod}_module"
-		fi
-	done
-
-	if [ $mail_enabled ]; then
-		myconf="${myconf} --with-mail"
-		use ssl && myconf="${myconf} --with-mail_ssl_module"
-	fi
-
-	# custom modules
-	for mod in $NGINX_ADD_MODULES; do
-		myconf="${myconf} --add-module=${mod}"
-	done
-
-	# http://bugs.gentoo.org/show_bug.cgi?id=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 \
-		${myconf} || die "configure failed"
-}
-
-src_compile() {
-	# http://bugs.gentoo.org/show_bug.cgi?id=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}
-
-	dosbin objs/nginx
-	newinitd "${FILESDIR}"/nginx.init-r2 nginx
-
-	cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf
-	rm conf/win-utf conf/koi-win conf/koi-utf
-
-	dodir /etc/${PN}
-	insinto /etc/${PN}
-	doins conf/*
-
-	dodoc CHANGES{,.ru} 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_passenger; then
-		# passengers Rakefile is so horribly broken that we have to do it
-		# manually
-		cd "${WORKDIR}"/passenger-${PASSENGER_PV}
-
-		export RUBY="ruby18"
-
-		insinto $(${RUBY} -rrbconfig -e 'print Config::CONFIG["archdir"]')/phusion_passenger
-		insopts -m 0755
-		doins ext/phusion_passenger/*.so
-		doruby -r lib/phusion_passenger
-
-		exeinto /usr/bin
-		doexe bin/passenger-memory-stats bin/passenger-status
-
-		exeinto /usr/libexec/passenger/bin
-		doexe bin/passenger-spawn-server
-
-		exeinto /usr/libexec/passenger/ext/nginx
-		doexe ext/nginx/HelperServer
-	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-0.7.65.ebuild b/www-servers/nginx/nginx-0.7.65.ebuild
deleted file mode 100644
index 812b9f0c5eb2..000000000000
--- a/www-servers/nginx/nginx-0.7.65.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.7.65.ebuild,v 1.4 2010/03/25 09:13:20 hollow Exp $
-
-inherit eutils ssl-cert toolchain-funcs perl-module
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-
-HOMEPAGE="http://nginx.net/"
-SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE="addition debug fastcgi flv imap pcre perl pop random-index realip smtp ssl static-gzip status sub webdav zlib"
-
-DEPEND="dev-lang/perl
-	dev-libs/openssl
-	pcre? ( >=dev-libs/libpcre-4.2 )
-	zlib? ( sys-libs/zlib )
-	perl? ( >=dev-lang/perl-5.8 )"
-
-pkg_setup() {
-	ebegin "Creating nginx user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-	eend ${?}
-}
-
-src_unpack() {
-	unpack ${A}
-	sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make || die
-}
-
-src_compile() {
-	local myconf
-
-	# 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 addition && myconf="${myconf} --with-http_addition_module"
-	use fastcgi	|| myconf="${myconf} --without-http_fastcgi_module"
-	use fastcgi	&& myconf="${myconf} --with-http_realip_module"
-	use flv		&& myconf="${myconf} --with-http_flv_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 perl	&& myconf="${myconf} --with-http_perl_module"
-	use status	&& myconf="${myconf} --with-http_stub_status_module"
-	use webdav	&& myconf="${myconf} --with-http_dav_module"
-	use sub		&& myconf="${myconf} --with-http_sub_module"
-	use realip	&& myconf="${myconf} --with-http_realip_module"
-	use static-gzip		&& myconf="${myconf} --with-http_gzip_static_module"
-	use random-index	&& myconf="${myconf} --with-http_random_index_module"
-
-	if use smtp || use pop || use imap; then
-		myconf="${myconf} --with-mail"
-		use ssl && myconf="${myconf} --with-mail_ssl_module"
-	fi
-	use imap || myconf="${myconf} --without-mail_imap_module"
-	use pop || myconf="${myconf} --without-mail_pop3_module"
-	use smtp || myconf="${myconf} --without-mail_smtp_module"
-
-	tc-export CC
-	./configure \
-		--prefix=/usr \
-		--with-cc-opt="-I${ROOT}/usr/include" \
-		--with-ld-opt="-L${ROOT}/usr/lib" \
-		--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 \
-		${myconf} || die "configure failed"
-
-	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" || die "failed to compile"
-}
-
-src_install() {
-	keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi}
-
-	dosbin objs/nginx
-	newinitd "${FILESDIR}"/nginx.init-r2 nginx || die
-
-	cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf
-
-	dodir /etc/${PN}
-	insinto /etc/${PN}
-	doins conf/*
-
-	dodoc CHANGES{,.ru} README
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/nginx.logrotate nginx || die
-
-	use perl && {
-		cd "${S}"/objs/src/http/modules/perl/
-		einstall DESTDIR="${D}" INSTALLDIRS=vendor || die "failed to install perl stuff"
-		fixlocalpod
-	}
-}
-
-pkg_postinst() {
-	use ssl && {
-		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
-	}
-}
diff --git a/www-servers/nginx/nginx-0.8.52.ebuild b/www-servers/nginx/nginx-0.9.7.ebuild
index f8f0352c23d6..44f79d5b1dcc 100644
--- a/www-servers/nginx/nginx-0.8.52.ebuild
+++ b/www-servers/nginx/nginx-0.9.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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-0.8.52.ebuild,v 1.1 2010/09/30 12:43:03 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.9.7.ebuild,v 1.1 2011/04/08 08:32:19 hollow Exp $
 
 EAPI="2"
 
@@ -21,30 +21,30 @@ 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_passenger (http://www.modrails.com/, MIT license)
-# TODO: currently builds some stuff in src_configure
-PASSENGER_PV="2.2.15"
-USE_RUBY="ruby18"
-RUBY_OPTIONAL="yes"
-
 # http_push (http://pushmodule.slact.net/, MIT license)
-HTTP_PUSH_MODULE_P="nginx_http_push_module-0.692"
+HTTP_PUSH_MODULE_PV="0.692"
+HTTP_PUSH_MODULE_P="nginx_http_push_module-${HTTP_PUSH_MODULE_PV}"
 
 # http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_P="ngx_cache_purge-1.2"
+HTTP_CACHE_PURGE_MODULE_PV="1.2"
+HTTP_CACHE_PURGE_MODULE_P="ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+
+# 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}"
 
-inherit eutils ssl-cert toolchain-funcs perl-module ruby-ng flag-o-matic
+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://www.modrails.com/
 	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_passenger? ( mirror://rubyforge/passenger/passenger-${PASSENGER_PV}.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_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 )"
 
 LICENSE="BSD BSD-2 GPL-2 MIT"
 SLOT="0"
@@ -56,7 +56,8 @@ 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"
 NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="http_cache_purge http_headers_more http_passenger http_push"
+NGINX_MODULES_3RD="http_cache_purge http_headers_more http_passenger http_push
+http_upload"
 
 IUSE="aio debug +http +http-cache ipv6 libatomic +pcre ssl vim-syntax"
 
@@ -87,14 +88,7 @@ CDEPEND="
 	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 )
-	nginx_modules_http_passenger? (
-		$(ruby_implementation_depend ruby18)
-		>=dev-ruby/rubygems-0.9.0
-		>=dev-ruby/rake-0.8.1
-		>=dev-ruby/fastthread-1.0.1
-		>=dev-ruby/rack-1.0.0
-	)"
+	nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )"
 RDEPEND="${CDEPEND}"
 DEPEND="${CDEPEND}
 	arm? ( dev-libs/libatomic_ops )
@@ -102,6 +96,24 @@ DEPEND="${CDEPEND}
 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}
@@ -126,29 +138,14 @@ pkg_setup() {
 		ewarn "_before_ reporting bugs."
 	fi
 
-	if use nginx_modules_http_passenger; then
-		ruby-ng_pkg_setup
-		use debug && append-flags -DPASSENGER_DEBUG
-	fi
-
 	if use !http; then
 		ewarn "To actually disable all http-functionality you also have to disable"
 		ewarn "all nginx http modules."
 	fi
 }
 
-src_unpack() {
-	# prevent ruby-ng.eclass from messing with src_unpack
-	default
-}
-
 src_prepare() {
 	sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make
-
-	if use nginx_modules_http_passenger; then
-		cd "${WORKDIR}"/passenger-${PASSENGER_PV}
-		epatch "${FILESDIR}"/passenger-CFLAGS.patch
-	fi
 }
 
 src_configure() {
@@ -186,11 +183,6 @@ src_configure() {
 		myconf="${myconf} --add-module=${WORKDIR}/agentzh-headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_SHA1}"
 	fi
 
-	if use nginx_modules_http_passenger; then
-		http_enabled=1
-		myconf="${myconf} --add-module=${WORKDIR}/passenger-${PASSENGER_PV}/ext/nginx"
-	fi
-
 	if use nginx_modules_http_push; then
 		http_enabled=1
 		myconf="${myconf} --add-module=${WORKDIR}/${HTTP_PUSH_MODULE_P}"
@@ -201,6 +193,11 @@ src_configure() {
 		myconf="${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 http || use http-cache; then
 		http_enabled=1
 	fi
@@ -231,7 +228,7 @@ src_configure() {
 		myconf="${myconf} --add-module=${mod}"
 	done
 
-	# http://bugs.gentoo.org/show_bug.cgi?id=286772
+	# https://bugs.gentoo.org/286772
 	export LANG=C LC_ALL=C
 	tc-export CC
 
@@ -255,7 +252,7 @@ src_configure() {
 }
 
 src_compile() {
-	# http://bugs.gentoo.org/show_bug.cgi?id=286772
+	# https://bugs.gentoo.org/286772
 	export LANG=C LC_ALL=C
 	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" || die "emake failed"
 }
@@ -273,6 +270,7 @@ src_install() {
 	insinto /etc/${PN}
 	doins conf/*
 
+	doman man/nginx.8
 	dodoc CHANGES* README
 
 	# logrotate
@@ -295,26 +293,9 @@ src_install() {
 		dodoc "${WORKDIR}"/${HTTP_CACHE_PURGE_MODULE_P}/{CHANGES,README}
 	fi
 
-	if use nginx_modules_http_passenger; then
-		# passengers Rakefile is so horribly broken that we have to do it
-		# manually
-		cd "${WORKDIR}"/passenger-${PASSENGER_PV}
-
-		export RUBY="ruby18"
-
-		insinto $(${RUBY} -rrbconfig -e 'print Config::CONFIG["archdir"]')/phusion_passenger
-		insopts -m 0755
-		doins ext/phusion_passenger/*.so
-		doruby -r lib/phusion_passenger
-
-		exeinto /usr/bin
-		doexe bin/passenger-memory-stats bin/passenger-status
-
-		exeinto /usr/libexec/passenger/bin
-		doexe bin/passenger-spawn-server
-
-		exeinto /usr/libexec/passenger/ext/nginx
-		doexe ext/nginx/HelperServer
+	if use nginx_modules_http_upload; then
+		docinto ${HTTP_UPLOAD_MODULE_P}
+		dodoc "${WORKDIR}"/${HTTP_UPLOAD_MODULE_P}/{Changelog,README}
 	fi
 }