diff options
| author |   Tiziano Müller <dev-zero@gentoo.org> | 2011-01-12 07:23:56 +0000 |
|---|---|---|
| committer | Tiziano Müller <dev-zero@gentoo.org> | 2011-01-12 07:23:56 +0000 |
| commit | 190d07db8751eadf3e817aed6206b092ae57ecba (patch) | |
| tree | 55569343d7a7f5a5c17db2a9311f3a457eb44162 /www-servers | |
| parent | Removed old (diff) | |
| download | gentoo-2-190d07db8751eadf3e817aed6206b092ae57ecba.tar.gz gentoo-2-190d07db8751eadf3e817aed6206b092ae57ecba.tar.bz2 gentoo-2-190d07db8751eadf3e817aed6206b092ae57ecba.zip | |
Updated patch to use 'gcc -dumpversion' instead of 'gcc -v'.
(Portage version: 2.1.9.30/cvs/Linux x86_64)
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/uwsgi/ChangeLog | 6 | ||||
| -rw-r--r-- | www-servers/uwsgi/files/uwsgi-0.9.6.6-gentoo-gcc.patch | 16 | ||||
| -rw-r--r-- | www-servers/uwsgi/uwsgi-0.9.6.6.ebuild | 4 |
3 files changed, 19 insertions, 7 deletions
diff --git a/www-servers/uwsgi/ChangeLog b/www-servers/uwsgi/ChangeLog index 023b2877c6b4..351d0baf06d1 100644 --- a/www-servers/uwsgi/ChangeLog +++ b/www-servers/uwsgi/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-servers/uwsgi # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/ChangeLog,v 1.3 2011/01/10 10:54:39 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/ChangeLog,v 1.4 2011/01/12 07:23:56 dev-zero Exp $ + + 12 Jan 2011; Tiziano Müller <dev-zero@gentoo.org> uwsgi-0.9.6.6.ebuild, + files/uwsgi-0.9.6.6-gentoo-gcc.patch: + Updated patch to use 'gcc -dumpversion' instead of 'gcc -v'. 10 Jan 2011; Tiziano Müller <dev-zero@gentoo.org> files/42_mod_uwsgi.conf, uwsgi-0.9.6.6.ebuild: 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 index ae196b1f67e9..98298a6b50e1 100644 --- 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 @@ -1,13 +1,23 @@ diff --git a/uwsgiconfig.py b/uwsgiconfig.py -index c06882c..2efc46c 100644 +index 5025b51..d817ae1 100644 --- a/uwsgiconfig.py +++ b/uwsgiconfig.py -@@ -84,7 +84,7 @@ def spcall2(cmd): +@@ -75,17 +75,7 @@ def spcall(cmd): else: return None +-def spcall2(cmd): +- p = subprocess.Popen(cmd, shell=True, stderr=subprocess.PIPE) +- +- if p.wait() == 0: +- if sys.version_info[0] > 2: +- return p.stderr.read().rstrip().decode() +- return p.stderr.read().rstrip() +- 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_version = str(spcall("%s -dumpversion" % GCC)) 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 index fc3da5e8165a..2b5e0e4084a1 100644 --- a/www-servers/uwsgi/uwsgi-0.9.6.6.ebuild +++ b/www-servers/uwsgi/uwsgi-0.9.6.6.ebuild @@ -1,6 +1,6 @@ # 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.2 2011/01/10 10:54:39 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-0.9.6.6.ebuild,v 1.3 2011/01/12 07:23:56 dev-zero Exp $ EAPI="3" PYTHON_DEPEND="*" @@ -57,8 +57,6 @@ src_install() { } pkg_postinst() { - python_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." |