Version bump (bug #346941).

Package-Manager: portage-2.1.9.26/cvs/Linux x86_64

5 files changed, 90 insertions, 3 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/Manifest b/www-servers/uwsgi/Manifest
index f59695c0f92d..9bf7523bf6a1 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -1,6 +1,10 @@
+AUX 42_mod_uwsgi.conf 160 RMD160 c3b0b430f21b6ce2924803842b3f89eae5ce01f6 SHA1 516694983d95464e15f40d1deedef650713b4916 SHA256 9afc91eb82efe216ba741204be1f8fd02625a99692765052d900f8d0b5af940b
 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 uwsgi-0.9.6.6-gentoo-gcc.patch 408 RMD160 d437d759d571724da35e0010c7e18282469e9bff SHA1 dd32829dc95ca77bb00aaa542b979ec7df917487 SHA256 a4b91449527946744c30974bd2dad75c34030da71ecdf15d3486a89eb2617f51
 DIST uwsgi-0.9.5.tar.gz 118203 RMD160 c6ffd2661dd623e848002604798e4a18402f7d76 SHA1 264572059254e2cca771908050d7534aaafff1a8 SHA256 49e88485b9f91693409c255738bc6a6f2a6f856a8a0f04b07dccf5ab7e3de0bd
+DIST uwsgi-0.9.6.6.tar.gz 185172 RMD160 f8799e96cf342bd0b6566a273e36f24ca8f2c4b9 SHA1 6e43f45c79ad1ea874d98f9c72d11b33ac66f6bd SHA256 6388c21104f87310377d814b6e4fe3cbc5ddf222458e17f62825e04b9a6cd9c2
 EBUILD uwsgi-0.9.5.ebuild 1042 RMD160 bf01c6661a01766604693af418d1b30e61cb5f54 SHA1 e1ed54cb4c9fbcdca388d0cf2ba7304e4dc0658d SHA256 8a6444418fffc1787f1a0105b5443e4a2ec5ac5668ea22f1237d5dfb2d693157
-MISC ChangeLog 533 RMD160 cef38aefe63bc7d5ad4a767bc34b7f57a1be9b5a SHA1 80e5cd4bd06fa22b86e439e7260064260df14d37 SHA256 418abb3d30490aae32336efcb4c27ee96af8a09f1f9bbfc629384efe8c2363a9
+EBUILD uwsgi-0.9.6.6.ebuild 1236 RMD160 06e7cfb7ba844ea0f8d63cc992120bc82d93009e SHA1 22815b1ef73e6fa3601f660c059d8927fa45396e SHA256 f277d9e09556080a33fddde9393a2f428e0ace13f7972418480c60df481fa25d
+MISC ChangeLog 739 RMD160 60c6e6bd6a6ac35787cb78b4d595c66dbe8e45a5 SHA1 9f810e80cc0c7d7f2171ccdfa1e4d3ca5179b6ae SHA256 3e41ea1f829e98f660d8b58a9b2a3ed35cea3d89f1bdecc203be61d44f6100ff
 MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35
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
+}