Version bump (bug #346941).

(Portage version: 2.1.9.26/cvs/Linux x86_64)

4 files changed, 85 insertions, 2 deletions

diff --git a/www-servers/uwsgi/ChangeLog b/www-servers/uwsgi/ChangeLog
index 893166c9982e..26de4c5cb821 100644
--- a/www-servers/uwsgi/ChangeLog
+++ b/www-servers/uwsgi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/uwsgi
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/ChangeLog,v 1.1 2010/05/03 19:24:28 hollow Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/ChangeLog,v 1.2 2011/01/07 14:22:20 dev-zero Exp $
+
+*uwsgi-0.9.6.6 (07 Jan 2011)
+
+  07 Jan 2011; Tiziano Müller <dev-zero@gentoo.org> +files/42_mod_uwsgi.conf,
+  +uwsgi-0.9.6.6.ebuild, +files/uwsgi-0.9.6.6-gentoo-gcc.patch:
+  Version bump (bug #346941).
 
 *uwsgi-0.9.5 (03 May 2010)
 
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 000000000000..236bf564cdd4
--- /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 Ruwsgi_module modules/mod_Ruwsgi.so
+</IfDefine>
+
diff --git a/www-servers/uwsgi/files/uwsgi-0.9.6.6-gentoo-gcc.patch b/www-servers/uwsgi/files/uwsgi-0.9.6.6-gentoo-gcc.patch
new file mode 100644
index 000000000000..ae196b1f67e9
--- /dev/null
+++ b/www-servers/uwsgi/files/uwsgi-0.9.6.6-gentoo-gcc.patch
@@ -0,0 +1,13 @@
+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/uwsgi-0.9.6.6.ebuild b/www-servers/uwsgi/uwsgi-0.9.6.6.ebuild
new file mode 100644
index 000000000000..8887b03a4899
--- /dev/null
+++ b/www-servers/uwsgi/uwsgi-0.9.6.6.ebuild
@@ -0,0 +1,57 @@
+# 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.6.6.ebuild,v 1.1 2011/01/07 14:22:20 dev-zero 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}/${P}-gentoo-gcc.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
+}