--- /usr/portage/www-servers/nginx/nginx-0.8.38-r1.ebuild	2010-06-04 15:25:50.000000000 +0200
+++ /usr/portage/www-servers/nginx/nginx-0.8.38-r1.ebuild	2010-06-21 12:26:51.000000000 +0200
@@ -30,33 +30,28 @@ 
 # http_push (http://pushmodule.slact.net/, MIT license)
 HTTP_PUSH_MODULE_P="nginx_http_push_module-0.692"
 
-# http_uwsgi (http://projects.unbit.it/uwsgi/, GPL-2 license)
-HTTP_UWSGI_MODULE_PV="0.9.5.1"
-
 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/
 	http://www.modrails.com/
-	http://pushmodule.slact.net/
-	http://projects.unbit.it/uwsgi/"
+	http://pushmodule.slact.net/"
 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_uwsgi? ( http://projects.unbit.it/downloads/uwsgi-${HTTP_UWSGI_MODULE_PV}.tar.gz )"
+	nginx_modules_http_push? ( http://pushmodule.slact.net/downloads/${HTTP_PUSH_MODULE_P}.tar.gz )"
 
 LICENSE="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 ssi
-split_clients upstream_ip_hash userid"
+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"
 NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="http_headers_more http_passenger http_push http_uwsgi"
+NGINX_MODULES_3RD="http_headers_more http_passenger http_push"
 
 IUSE="aio debug +http +http-cache ipv6 libatomic +pcre ssl vim-syntax"
 
@@ -196,11 +191,6 @@ 
 		myconf="${myconf} --add-module=${WORKDIR}/${HTTP_PUSH_MODULE_P}"
 	fi
 
-	if use nginx_modules_http_uwsgi; then
-		http_enabled=1
-		myconf="${myconf} --add-module=${WORKDIR}/uwsgi-${HTTP_UWSGI_MODULE_PV}/nginx"
-	fi
-
 	if use http || use http-cache; then
 		http_enabled=1
 	fi
@@ -249,6 +239,8 @@ 
 		--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"
 }
 
@@ -259,7 +251,7 @@ 
 }
 
 src_install() {
-	keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi}
+	keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi,uwsgi,scgi}
 
 	dosbin objs/nginx
 	newinitd "${FILESDIR}"/nginx.init-r2 nginx
@@ -288,11 +280,6 @@ 
 		dodoc "${WORKDIR}"/${HTTP_PUSH_MODULE_P}/{changelog.txt,protocol.txt,README}
 	fi
 
-	if use nginx_modules_http_uwsgi; then
-		insinto /etc/nginx
-		doins "${WORKDIR}"/uwsgi-${HTTP_UWSGI_MODULE_PV}/nginx/uwsgi_params
-	fi
-
 	if use nginx_modules_http_passenger; then
 		# passengers Rakefile is so horribly broken that we have to do it
 		# manually