[gentoo-commits] dev/dev-zero:master commit in: www-servers/uwsgi/files/, www-servers/uwsgi/

["Tiziano Müller" <dev-zero@gentoo.org>]

commit:     57806610d17ef4ddeb092bf207fef5938510a329
Author:     Tiziano Mueller <dev-zero <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 31 12:14:53 2011 +0000
Commit:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Sun Jul 31 12:14:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=57806610

Added version bump.

---
 www-servers/uwsgi/Manifest                         |   11 +-
 www-servers/uwsgi/files/0.9.6.5-gentoo-gcc.patch   |   13 --
 www-servers/uwsgi/files/42_mod_uwsgi.conf          |    7 +
 ...wsgi-0.9.5-fix_uwsgiconfig.py_indentation.patch |   51 --------
 .../uwsgi/files/uwsgi-0.9.5-respect_flags.patch    |  127 --------------------
 .../uwsgi/files/uwsgi-0.9.8-no-werror.patch        |   11 ++
 www-servers/uwsgi/files/uwsgi.confd                |   47 +++++++
 www-servers/uwsgi/files/uwsgi.initd                |  101 ++++++++++++++++
 www-servers/uwsgi/uwsgi-0.9.6.5.ebuild             |   46 -------
 www-servers/uwsgi/uwsgi-0.9.8.3.ebuild             |   72 +++++++++++
 10 files changed, 244 insertions(+), 242 deletions(-)

diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 79e693c..e44697a 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -1,7 +1,8 @@
 MISC ChangeLog 533 RMD160 cef38aefe63bc7d5ad4a767bc34b7f57a1be9b5a SHA1 80e5cd4bd06fa22b86e439e7260064260df14d37 SHA256 418abb3d30490aae32336efcb4c27ee96af8a09f1f9bbfc629384efe8c2363a9
-AUX 0.9.6.5-gentoo-gcc.patch 408 RMD160 d437d759d571724da35e0010c7e18282469e9bff SHA1 dd32829dc95ca77bb00aaa542b979ec7df917487 SHA256 a4b91449527946744c30974bd2dad75c34030da71ecdf15d3486a89eb2617f51
-AUX uwsgi-0.9.5-fix_uwsgiconfig.py_indentation.patch 1202 RMD160 9c32ba693bd7bbdd6fae90c5b43118b8e0f882bc SHA1 cab74b61086c39e9f77e217b88361197c0069b98 SHA256 3903cf208ba14578aaf5cb95306191b97ed0b973047cad02321d4416d03a47f5
-AUX uwsgi-0.9.5-respect_flags.patch 3985 RMD160 1787075a4decad7376e1772231a65e0ef5737537 SHA1 456031bc53a80ca5423a149b7c8013c3bb9338fe SHA256 5af3f880b7104b5fb4c8612d92fab9074b1d5ecc556aeea0775a82a82c4be80e
+AUX 42_mod_uwsgi.conf 159 RMD160 d3de5b69a9e292c731508b13a0bdbe234fac9db7 SHA1 24624a805c16778aaa4e24b74d2e8230ee381aec SHA256 b759712baa7b8abab2ffd56c3cbc970cb9189ef1efa3f3aa154a963dc67ba861
+AUX uwsgi-0.9.8-no-werror.patch 624 RMD160 ef3ebbfff1c6b4a49297e780b5eb5545786f8173 SHA1 a4e0923cb5ebaab19cee5b4495b1625f54c7510b SHA256 8650fe560d25d9b6facf8034bb5edfedc8aa74f22a716da702d2b97a1d298998
+AUX uwsgi.confd 1116 RMD160 e13ddecb06cf4efaf75216ec657db99a4abbbddf SHA1 9df38c84bc2d612803629a6a2e6bd9a3a5568d33 SHA256 3c238b934f8db9eae87f77dc3d131499e442526d5e45438b5461c0d7590b772f
+AUX uwsgi.initd 2705 RMD160 96ee8102823eddfcfc17da14882aed17c7ca5249 SHA1 35365c5ca755cd650424c826488ac85b067e4575 SHA256 328087fe8a36e91155c1173cfddc257f4479b1588bc56689b42a0fc74707bed4
 MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35
-EBUILD uwsgi-0.9.6.5.ebuild 1090 RMD160 4010f9f335772176930bd82297ffdcd8843368e9 SHA1 1c3fd2eadfcd1e0f14e2dd97c4cd0eb4020caaca SHA256 25598b27206aaef170e4adcdab1040493a93bb2f945fbe7a3d45cf5994afd1b2
-DIST uwsgi-0.9.6.5.tar.gz 152165 RMD160 0c33445aec79778bf663e3cead7c574956032c43 SHA1 ba05b3f6fa5019253ad4d09dae04654e8e36205d SHA256 8f4099be19c36ed484a4f1508e83e4170ce3ca1c32f3dd5591cd191223904bca
+EBUILD uwsgi-0.9.8.3.ebuild 1870 RMD160 53ae8621ac13e000fc29e1ab6e37fcfab87f8434 SHA1 a1a3ad0e9cd8db43aae9f07ee2077b3c3e9cab56 SHA256 08a663229cd0510fa3eb4ccc16aa68343b7097f7436c7c37e4f6880b4b00c698
+DIST uwsgi-0.9.8.3.tar.gz 351168 RMD160 8bfdaa9a503516378e834bca60dfa828b7bee9d2 SHA1 780a96a2c32a0f7bb7f5a63353acca2fbd23a8e6 SHA256 2b529a8408bb4938ebccd3c4264af5af4f17ee5bd6043376ef3909c2411f611f

diff --git a/www-servers/uwsgi/files/0.9.6.5-gentoo-gcc.patch b/www-servers/uwsgi/files/0.9.6.5-gentoo-gcc.patch
deleted file mode 100644
index ae196b1..0000000
--- a/www-servers/uwsgi/files/0.9.6.5-gentoo-gcc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/uwsgiconfig.py b/uwsgiconfig.py
-index c06882c..2efc46c 100644
---- a/uwsgiconfig.py
-+++ b/uwsgiconfig.py
-@@ -84,7 +84,7 @@ def spcall2(cmd):
- 	else:
- 		return None
- 
--gcc_version = str(spcall2("%s -v" % GCC)).split('\n')[-1].split()[2]
-+gcc_version = str(spcall2("%s -v" % GCC)).split('\n')[-1].split()[4]
- 
- gcc_major = int(gcc_version.split('.')[0])
- gcc_minor = int(gcc_version.split('.')[1])

diff --git a/www-servers/uwsgi/files/42_mod_uwsgi.conf b/www-servers/uwsgi/files/42_mod_uwsgi.conf
new file mode 100644
index 0000000..a619bae
--- /dev/null
+++ b/www-servers/uwsgi/files/42_mod_uwsgi.conf
@@ -0,0 +1,7 @@
+<IfDefine UWSGI>
+    LoadModule uwsgi_module modules/mod_uwsgi.so
+</IfDefine>
+<IfDefine RUWSGI>
+    LoadModule uwsgi_module modules/mod_Ruwsgi.so
+</IfDefine>
+

diff --git a/www-servers/uwsgi/files/uwsgi-0.9.5-fix_uwsgiconfig.py_indentation.patch b/www-servers/uwsgi/files/uwsgi-0.9.5-fix_uwsgiconfig.py_indentation.patch
deleted file mode 100644
index e02f497..0000000
--- a/www-servers/uwsgi/files/uwsgi-0.9.5-fix_uwsgiconfig.py_indentation.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- uwsgiconfig.py
-+++ uwsgiconfig.py
-@@ -68,9 +68,9 @@
- 	p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE)
- 
- 	if p.wait() == 0:
--        	return p.stdout.read().rstrip().decode()
-+		return p.stdout.read().rstrip().decode()
- 	else:
--        	return None
-+		return None
- 
- def add_o(x):
- 	if x == 'uwsgi':
-@@ -149,11 +149,11 @@
- 	kvm_list = ['FreeBSD', 'OpenBSD', 'NetBSD', 'DragonFly']
- 
- 	if uwsgi_os == 'SunOS':
--        	ldflags.append('-lsendfile')
-+		ldflags.append('-lsendfile')
- 		ldflags.remove('-rdynamic')
- 
- 	if uwsgi_os in kvm_list:
--        	ldflags.append('-lkvm')
-+		ldflags.append('-lkvm')
- 
- 	if uwsgi_os == 'OpenBSD':
- 		UGREEN = False
-@@ -245,8 +245,8 @@
- 		gcc_list.append('erlang')
- 
- 	if SCTP:
--        	ldflags.append("-lsctp")
--        	cflags.append("-DUWSGI_SCTP")
-+		ldflags.append("-lsctp")
-+		cflags.append("-DUWSGI_SCTP")
- 
- 	if SPOOLER:
- 		depends_on("SPOOLER", ['EMBEDDED'])
-@@ -294,9 +294,9 @@
- 		sys.exit(1)
- 
- 	if cmd == '--cflags':
--        	print(' '.join(cflags))
-+		print(' '.join(cflags))
- 	if cmd == '--ldflags':
--        	print(' '.join(ldflags))
-+		print(' '.join(ldflags))
- 	elif cmd == '--build':
- 		parse_vars()
- 		build_uwsgi(UWSGI_BIN_NAME)

diff --git a/www-servers/uwsgi/files/uwsgi-0.9.5-respect_flags.patch b/www-servers/uwsgi/files/uwsgi-0.9.5-respect_flags.patch
deleted file mode 100644
index c3f740d..0000000
--- a/www-servers/uwsgi/files/uwsgi-0.9.5-respect_flags.patch
+++ /dev/null
@@ -1,127 +0,0 @@
---- uwsgiconfig.py
-+++ uwsgiconfig.py
-@@ -20,7 +20,6 @@
- PLUGINS = []
- UNBIT=False
- UWSGI_BIN_NAME = 'uwsgi'
--GCC='gcc'
- 
- # specific compilation flags
- # libxml2 or expat
-@@ -46,17 +45,22 @@
- 
- from distutils import sysconfig
- 
-+GCC = os.environ.get('CC', sysconfig.get_config_var('CC'))
-+if not GCC:
-+	GCC = 'gcc'
-+
- gcc_list = ['utils', 'pyutils', 'protocol', 'socket', 'logging', 'wsgi_handlers', 'wsgi_headers', 'uwsgi_handlers', 'uwsgi']
- 
- # large file support
- try:
--	cflags = ['-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64'] + sysconfig.get_config_var('CFLAGS').split()
-+	cflags = ['-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64'] + os.environ.get("CFLAGS", "").split()
- except:
- 	print("You need python headers to build uWSGI.")
- 	sys.exit(1)
- 
- cflags = cflags + ['-I' + sysconfig.get_python_inc(), '-I' + sysconfig.get_python_inc(plat_specific=True) ]
--ldflags = ['-lpthread', '-rdynamic'] + sysconfig.get_config_var('LIBS').split() + sysconfig.get_config_var('SYSLIBS').split()
-+ldflags = os.environ.get("LDFLAGS", "").split()
-+libs = ['-lpthread', '-rdynamic'] + sysconfig.get_config_var('LIBS').split() + sysconfig.get_config_var('SYSLIBS').split()
- 
- def depends_on(what, dep):
- 	for d in dep:
-@@ -97,7 +101,7 @@
- 			print(plugin)
- 
- 	print("*** uWSGI linking ***")
--	ldline = "%s -o %s %s %s" % (GCC, bin_name, ' '.join(map(add_o, gcc_list)), ' '.join(ldflags))
-+	ldline = "%s -o %s %s %s %s" % (GCC, bin_name, ' '.join(ldflags), ' '.join(map(add_o, gcc_list)), ' '.join(libs))
- 	print(ldline)
- 	ret = os.system(ldline)
- 	if ret != 0:
-@@ -141,19 +145,19 @@
- 	version = sys.version_info
- 	uver = "%d.%d" % (version[0], version[1])
- 
--	ldflags.append('-lpython' + uver)
-+	libs.append('-lpython' + uver)
- 
- 	if str(PYLIB_PATH) != '':
--		ldflags.insert(0,'-L' + PYLIB_PATH)
-+		libs.insert(0,'-L' + PYLIB_PATH)
- 
- 	kvm_list = ['FreeBSD', 'OpenBSD', 'NetBSD', 'DragonFly']
- 
- 	if uwsgi_os == 'SunOS':
--		ldflags.append('-lsendfile')
--		ldflags.remove('-rdynamic')
-+		libs.append('-lsendfile')
-+		libs.remove('-rdynamic')
- 
- 	if uwsgi_os in kvm_list:
--		ldflags.append('-lkvm')
-+		libs.append('-lkvm')
- 
- 	if uwsgi_os == 'OpenBSD':
- 		UGREEN = False
-@@ -221,7 +225,7 @@
- 				print("*** libxml2 headers unavailable. uWSGI build is interrupted. You have to install libxml2 development package or use libexpat or disable XML")
- 				sys.exit(1)
- 			else:
--				ldflags.append(xmlconf)
-+				libs.append(xmlconf)
- 				xmlconf = spcall("xml2-config --cflags")
- 				if xmlconf is None:
- 					print("*** libxml2 headers unavailable. uWSGI build is interrupted. You have to install libxml2 development package or use libexpat or disable XML")
-@@ -232,20 +236,20 @@
- 					gcc_list.append('xmlconf')
- 		elif XML_IMPLEMENTATION == 'expat':
- 			cflags.append("-DUWSGI_XML -DUWSGI_XML_EXPAT")
--			ldflags.append('-lexpat')
-+			libs.append('-lexpat')
- 			gcc_list.append('xmlconf')
- 			
- 
- 	if ERLANG:
- 		depends_on("ERLANG", ['EMBEDDED'])
- 		cflags.append("-DUWSGI_ERLANG")
--		ldflags.append(ERLANG_LDFLAGS)
-+		libs.append(ERLANG_LDFLAGS)
- 		if str(ERLANG_CFLAGS) != '':
- 			cflags.append(ERLANG_CFLAGS)
- 		gcc_list.append('erlang')
- 
- 	if SCTP:
--		ldflags.append("-lsctp")
-+		libs.append("-lsctp")
- 		cflags.append("-DUWSGI_SCTP")
- 
- 	if SPOOLER:
-@@ -263,13 +267,13 @@
- 	import uwsgiplugin as up
- 
- 	cflags.append(up.CFLAGS)
--	ldflags.append(up.LDFLAGS)
-+	libs.append(up.LDFLAGS)
- 
- 	cflags.insert(0, '-I.')
- 
- 	plugin_base = path + '/' + up.NAME + '_plugin'
- 
--	gccline = "%s -fPIC -shared -o %s.so %s %s.c %s" % (GCC, plugin_base, ' '.join(cflags), plugin_base, ' '.join(ldflags))
-+	gccline = "%s -fPIC -shared -o %s.so %s %s %s.c %s" % (GCC, plugin_base, ' '.join(cflags), ' '.join(ldflags), plugin_base, ' '.join(libs))
- 	print(gccline)
- 
- 	ret = os.system(gccline)
-@@ -297,6 +301,8 @@
- 		print(' '.join(cflags))
- 	if cmd == '--ldflags':
- 		print(' '.join(ldflags))
-+	if cmd == '--libs':
-+		print(' '.join(libs))
- 	elif cmd == '--build':
- 		parse_vars()
- 		build_uwsgi(UWSGI_BIN_NAME)

diff --git a/www-servers/uwsgi/files/uwsgi-0.9.8-no-werror.patch b/www-servers/uwsgi/files/uwsgi-0.9.8-no-werror.patch
new file mode 100644
index 0000000..f55d6bb
--- /dev/null
+++ b/www-servers/uwsgi/files/uwsgi-0.9.8-no-werror.patch
@@ -0,0 +1,11 @@
+--- uwsgiconfig.py	2011-06-07 18:38:50.000000000 +0400
++++ uwsgiconfig.py	2011-06-05 10:28:03.000000000 +0400
+@@ -176,7 +176,7 @@
+         if uwsgi_os == 'Linux':
+             self.gcc_list.append('lib/linux_ns')
+             self.gcc_list.append('lib/netlink')
+-        self.cflags = ['-O2', '-Wall', '-Werror', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64'] + os.environ.get("CFLAGS", "").split()
++        self.cflags = ['-O2', '-Wall', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64'] + os.environ.get("CFLAGS", "").split()
+         try:
+             gcc_version = str(spcall("%s -dumpversion" % GCC))
+         except:

diff --git a/www-servers/uwsgi/files/uwsgi.confd b/www-servers/uwsgi/files/uwsgi.confd
new file mode 100644
index 0000000..11152da
--- /dev/null
+++ b/www-servers/uwsgi/files/uwsgi.confd
@@ -0,0 +1,47 @@
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/files/uwsgi.confd,v 1.1 2011/05/31 19:49:07 maksbotan Exp $
+
+# DO NOT MODIFY THIS FILE DIRECTLY! CREATE A COPY AND MODIFY THAT INSTEAD!
+
+# Path (or name) of UNIX/TCP socket to bind to
+#
+UWSGI_SOCKET=127.0.0.1:1234
+
+# Enable threads?
+#
+UWSGI_THREADS=1
+
+# The path to your uWSGI application.
+#
+UWSGI_PROGRAM=
+
+# The path to your uWSGI xml config file.
+#
+UWSGI_XML_CONFIG=
+
+# The number of child processes to spawn. The default is 1.
+#
+UWSGI_CHILDREN=1
+
+# The log file path. If empty logging is disabled
+#
+UWSGI_LOG_FILE=
+
+# If you want to run your application inside a chroot then specify the
+# directory here. Leave this blank otherwise.
+#
+UWSGI_CHROOT=
+
+# If you want to run your application from a specific directiory specify
+# it here. Leave this blank otherwise.
+#
+# UWSGI_DIR=
+
+# The user and group to run your application as. If you do not specify these,
+# the application will be run as root:root.
+#
+UWSGI_USER=
+
+# Additional options you might want to pass to uWSGI
+#
+#UWSGI_EXTRA_OPTIONS=

diff --git a/www-servers/uwsgi/files/uwsgi.initd b/www-servers/uwsgi/files/uwsgi.initd
new file mode 100644
index 0000000..3fedecc
--- /dev/null
+++ b/www-servers/uwsgi/files/uwsgi.initd
@@ -0,0 +1,101 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/files/uwsgi.initd,v 1.1 2011/05/31 19:49:07 maksbotan Exp $
+
+PROGNAME=${SVCNAME#*.}
+
+UWSGI_EXEC=/usr/bin/uwsgi
+PIDPATH=/var/run/uwsgi
+PIDFILE="${PIDPATH}/${PROGNAME}.pid"
+
+depend() {
+	need net
+}
+
+start() {
+	local OPTIONS
+
+	if [ "${SVCNAME}" = "uwsgi" ]; then
+		eerror "You are not supposed to run this script directly. Create a symlink"
+		eerror "for the FastCGI application you want to run as well as a copy of the"
+		eerror "configuration file and modify it appropriately like so..."
+		eerror
+		eerror "  ln -s uwsgi /etc/init.d/uwsgi.trac"
+		eerror "  cp /etc/conf.d/uwsgi /etc/conf.d/uwsgi.trac"
+		eerror "  `basename "${EDITOR}"` /etc/conf.d/uwsgi.trac"
+		eerror
+		return 1
+	fi
+
+	if [ -z "${UWSGI_SOCKET}" ]; then
+		eerror "You need to specify path (or name) of UNIX/TCP socket to bind to"
+		eerror "in UWSGI_SOCKET"
+		return 1
+	fi
+
+	if [ -z "${UWSGI_PROGRAM}" ] && [ -z "${UWSGI_XML_CONFIG}" ]; then
+		eerror "You need to specify which \$UWSGI_PROGRAM or \$UWSGI_XML_CONFIG"
+		eerror "you want to start."
+		eerror "Please adjust /etc/conf.d/uwsgi.${PROGNAME}"
+		return 1
+	fi
+
+	if [ -n "${UWSGI_PROGRAM}" ] && [ -n "${UWSGI_XML_CONFIG}" ]; then
+		eerror "Only one of the two may be defined:"
+		eerror "  UWSGI_PROGRAM=${UWSGI_PROGRAM}"
+		eerror "  UWSGI_XML_CONFIG=${UWSGI_XML_CONFIG}"
+		return 1
+	fi
+
+
+	OPTIONS="--master --daemonize"
+
+	if [ -n "$UWSGI_LOG_FILE" ]; then
+		OPTIONS="${OPTIONS} $UWSGI_LOG_FILE"
+	else
+		OPTIONS="${OPTIONS} /dev/null --disable-logging"
+	fi
+
+	if [ "${UWSGI_THREADS}" = "1" ]; then
+		OPTIONS="${OPTIONS} --enable-threads"
+	fi
+
+	if [ -n "${UWSGI_SOCKET}" ]; then
+		OPTIONS="${OPTIONS} --socket ${UWSGI_SOCKET}"
+	fi
+
+	if [ -n "${UWSGI_CHILDREN}" ]; then
+		OPTIONS="${OPTIONS} --processes ${UWSGI_CHILDREN}"
+	fi
+
+	if [ -n "${UWSGI_CHROOT}" ]; then
+		OPTIONS="${OPTIONS} --chroot ${UWSGI_CHROOT}"
+	fi
+
+	[ -z "${UWSGI_DIR}" ] && UWSGI_DIR="/"
+	[ -z "${UWSGI_USER}" ] && UWSGI_USER="root"
+
+	if [ -n "${UWSGI_EXTRA_OPTIONS}" ]; then
+		OPTIONS="${OPTIONS} ${UWSGI_EXTRA_OPTIONS}"
+	fi
+
+	if [ -n "${UWSGI_PROGRAM}" ]; then
+		OPTIONS="${OPTIONS} --wsgi-file ${UWSGI_PROGRAM}"
+	fi
+
+	if [ -n "${UWSGI_XML_CONFIG}" ]; then
+		OPTIONS="${OPTIONS} --xmlconfig ${UWSGI_XML_CONFIG}"
+	fi
+
+	ebegin "Starting uWSGI application ${PROGNAME}"
+	cd "${UWSGI_DIR}" && \
+	start-stop-daemon --start --user "${UWSGI_USER}" --exec "${UWSGI_EXEC}" -- ${OPTIONS} --pidfile "${PIDFILE}"
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping uWSGI application ${PROGNAME}"
+	start-stop-daemon --stop --pidfile "${PIDFILE}" --signal 3
+	eend $?
+}

diff --git a/www-servers/uwsgi/uwsgi-0.9.6.5.ebuild b/www-servers/uwsgi/uwsgi-0.9.6.5.ebuild
deleted file mode 100644
index 951eb8a..0000000
--- a/www-servers/uwsgi/uwsgi-0.9.6.5.ebuild
+++ /dev/null
@@ -1,46 +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/uwsgi/uwsgi-0.9.5.ebuild,v 1.1 2010/05/03 19:24:28 hollow Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit eutils python toolchain-funcs
-
-DESCRIPTION="uWSGI server for Python web applications"
-HOMEPAGE="http://projects.unbit.it/uwsgi/"
-SRC_URI="http://projects.unbit.it/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/libxml2"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# Python 3 requires constant indentation.
-#	epatch "${FILESDIR}/${PN}-0.9.5-fix_uwsgiconfig.py_indentation.patch"
-
-	# Respect CC, CFLAGS and LDFLAGS.
-#	epatch "${FILESDIR}/${PN}-0.9.5-respect_flags.patch"
-
-	epatch "${FILESDIR}/${PV}-gentoo-gcc.patch"
-
-	python_copy_sources
-}
-
-src_compile() {
-	python_src_compile CC="$(tc-getCC)"
-}
-
-src_install() {
-	installation() {
-		newbin uwsgi uwsgi-${PYTHON_ABI}
-	}
-	python_execute_function -s installation
-
-	python_generate_wrapper_scripts "${ED}usr/bin/uwsgi"
-}

diff --git a/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild b/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild
new file mode 100644
index 0000000..10c82a8
--- /dev/null
+++ b/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-0.9.8.ebuild,v 1.1 2011/06/08 18:00:13 maksbotan Exp $
+
+EAPI="3"
+PYTHON_DEPEND="*"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit eutils python toolchain-funcs apache-module
+
+DESCRIPTION="uWSGI server for Python web applications"
+HOMEPAGE="http://projects.unbit.it/uwsgi/"
+SRC_URI="http://projects.unbit.it/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/libxml2"
+DEPEND="${RDEPEND}"
+
+APXS2_S="${S}/apache2"
+APACHE2_MOD_CONF="42_mod_${PN}"
+want_apache2_2
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.9.8-no-werror.patch
+	python_copy_sources
+}
+
+src_compile() {
+	python_src_compile CC="$(tc-getCC)"
+
+	if use apache2 ; then
+		for m in Ruwsgi uwsgi ; do
+			APXS2_ARGS="-c mod_${m}.c"
+			apache-module_src_compile
+		done
+	fi
+}
+
+src_install() {
+	installation() {
+		newbin uwsgi uwsgi-${PYTHON_ABI}
+	}
+	python_execute_function -s installation
+
+	python_generate_wrapper_scripts "${ED}usr/bin/uwsgi"
+
+	if use apache2; then
+		for m in Ruwsgi uwsgi ; do
+			APACHE2_MOD_FILE="${APXS2_S}/.libs/mod_${m}.so"
+			apache-module_src_install
+		done
+	fi
+
+	newinitd "${FILESDIR}"/uwsgi.initd uwsgi
+	newconfd "${FILESDIR}"/uwsgi.confd uwsgi
+	mkdir "${ED}"/var/run/uwsgi
+}
+
+pkg_postinst() {
+	if use apache2 ; then
+		elog "Two Apache modules have been installed: mod_uwsgi and mod_Ruwsgi."
+		elog "You can enable them with -DUWSGI or -DRUWSGI in /etc/conf.d/apache2."
+		elog "Both have the same configuration interface and define the same symbols."
+		elog "Therefore you can enable only one of them at a time."
+		elog "mod_uwsgi is commercially supported by Unbit and stable but a bit hacky."
+		elog "mod_Ruwsgi is newer and more Apache-API friendly but not commercially supported."
+	fi
+}