Updated patch to use 'gcc -dumpversion' instead of 'gcc -v'.

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

4 files changed, 22 insertions, 10 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/Manifest b/www-servers/uwsgi/Manifest
index 5d2eac527ac0..b7f7fec0742a 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -1,10 +1,10 @@
 AUX 42_mod_uwsgi.conf 159 RMD160 d3de5b69a9e292c731508b13a0bdbe234fac9db7 SHA1 24624a805c16778aaa4e24b74d2e8230ee381aec SHA256 b759712baa7b8abab2ffd56c3cbc970cb9189ef1efa3f3aa154a963dc67ba861
 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
+AUX uwsgi-0.9.6.6-gentoo-gcc.patch 631 RMD160 2c9b6c7c8256fc61116a1c784a6b948345d5570d SHA1 37cb5960758265e4ef9502c7767c71c82828540e SHA256 2ded8ebdbdfa73e7498ab8704541c9207db30d67b7a1970bc87d7e7d5ce9fcc5
 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
-EBUILD uwsgi-0.9.6.6.ebuild 1773 RMD160 fc833c5320001d8fc6f712559cdaa49fe10c0868 SHA1 dbbe822cb2006688ccb80422a204c8d726446661 SHA256 7099df92909a8b3fc9a74dfb3882d97da668e6afb7c9b0b3277b8a8c60e98621
-MISC ChangeLog 893 RMD160 4f6ca131568c0d159853ec25d8707619eca50e72 SHA1 290d2747236155bc0e999b0505ac8ce2f2b6c528 SHA256 fa991abce8e6a80e78a188e522594f1917911840f9f5960a3f40b6ddb3aea326
+EBUILD uwsgi-0.9.6.6.ebuild 1751 RMD160 eca1e93b508c0654182a9ce6f3cf4a0bc03d4976 SHA1 9747ae415bdf71b1494d85db22cbd799df27ea2c SHA256 4d8b54aae0ccc3511bc8d7cf5314b939c1430441a60c5289fdd26c4b1de70a72
+MISC ChangeLog 1072 RMD160 54a71aeec4a52db00cbb21128e247e8a24908141 SHA1 5ab56b28f9057692075d7ffdfd305ac7544eed3d SHA256 4c646dd17c25477d2e2f8dc6264f2f97e713accb97de1a109903dd87e7a5a176
 MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35
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."