Drop obsolete ebuilds, enable python by default fix #422817.

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

12 files changed, 24 insertions, 391 deletions

diff --git a/www-servers/uwsgi/ChangeLog b/www-servers/uwsgi/ChangeLog
index c5c503a75b8a..b33ada52c1aa 100644
--- a/www-servers/uwsgi/ChangeLog
+++ b/www-servers/uwsgi/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-servers/uwsgi
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/ChangeLog,v 1.24 2012/07/09 10:37:22 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/ChangeLog,v 1.25 2012/07/11 09:57:46 ultrabug Exp $
+
+  11 Jul 2012; Ultrabug <ultrabug@gentoo.org>
+  -files/uwsgi-0.9.5-fix_uwsgiconfig.py_indentation.patch,
+  -files/uwsgi-0.9.5-respect_flags.patch,
+  -files/uwsgi-0.9.6.6-gentoo-gcc.patch, -uwsgi-0.9.7.2.ebuild,
+  -files/uwsgi-0.9.7.2-no-werror.patch, -uwsgi-0.9.8.ebuild,
+  -files/uwsgi-0.9.8-no-werror.patch, uwsgi-1.2.3-r3.ebuild,
+  uwsgi-1.2.3-r4.ebuild, uwsgi-1.2.4.ebuild:
+  Drop obsolete ebuilds, enable python by default fix #422817.
 
 *uwsgi-1.2.4 (09 Jul 2012)
 
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index f1d70ea56d92..e17f81dad497 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -5,33 +5,24 @@ AUX 1.1.2-threaded-php.patch 1098 SHA256 e5f03fcdf2ebf7d2867b21e640f2c44f23da169
 AUX 1.2.3-pyerl.patch 1015 SHA256 1da74cb8d108f46c4faa39548f73de2f74849dde81d1012b71c7c91ab939596b SHA512 b298feccb2604b9459a15699d786c26be9d830f88a4a00beca69fba3ff0d5d78cc239e6dcce51da32121c8bb4d72af41a6e57e5594a3005cfceb4feebbffaed2 WHIRLPOOL 60ff1374e1f13c9ffaa65996a24d87d86d64d7f4edb9d1378d0b7287bfeb285d5123da4532c6e0fb022ff78d80a6b5eba9d6bb8c36536145d4a11cbdecee23f6
 AUX 42_mod_uwsgi-r1.conf 248 SHA256 40ef0a3916eba8f1a87828911571e9d8bf838f38f050d67df1662aca11ba6c91 SHA512 84babaa9aa5cc1a52235f1b4febe3d9dd1a90e7e28c54499d78219727a222e2c2f4db001d898e0fdc46718ea582ce3fc98d0fbbf94b1730f4a139555225b4538 WHIRLPOOL d96ef19fce89fbb36e1bc7701b2fb7424945f5da9d7eee071de74c9975463da9ba5be0a1a855e75c39705317ce0eef5116e7733d74091bfd984d3c1f189edea3
 AUX 42_mod_uwsgi.conf 159 SHA256 b759712baa7b8abab2ffd56c3cbc970cb9189ef1efa3f3aa154a963dc67ba861 SHA512 14eb8d58f814657da9d28215d4096373a26e5bdd9e3953bd37dc6008f42b04ca99ac5aa552bec36d1d8503e7ae54c78fcc00c1f6fe9d6daf983764bae07b802f WHIRLPOOL ec352b176c89441532378446cb909b3383054afbbee5d4f24c801eb5716d1143737c098bd25be46aa4399e54937c6b786fdca3e0343b0b4c91442456ba565f79
-AUX uwsgi-0.9.5-fix_uwsgiconfig.py_indentation.patch 1202 SHA256 3903cf208ba14578aaf5cb95306191b97ed0b973047cad02321d4416d03a47f5 SHA512 33a04e612ac4a93213715c5fff90ca94a4190d6439fb1ef9a023ec8ace8e94d1d449751bc1a9f430dabd39d54a73b0b5fb1780139caf91fcf0e8f5d818763800 WHIRLPOOL 2aa8f3b7e1716cf845ed6f13df94e0d2639848ae0ad262ca47fa9f0252c1dc856d09c59917860e853bef96af93cc33003e278f92f1e6f25e1ff4d7c2c12ec9a8
-AUX uwsgi-0.9.5-respect_flags.patch 3985 SHA256 5af3f880b7104b5fb4c8612d92fab9074b1d5ecc556aeea0775a82a82c4be80e SHA512 b5156066fdfd564865bbaf4e11f7d1afa6f9c27fe05be842cf7de7eff7363f46f292115ef8a8e5a710cc9ce69b9759981a32cc16bc74ec9a4508ac051d93b07d WHIRLPOOL 5ac338daed156394c4881543fb234d4c688ab592eabb3534a2dc68574c1e583fdb1b364184b2a563bebdc7fb32ed0e42af59cd81e33dc154d18b48af396ee6e6
-AUX uwsgi-0.9.6.6-gentoo-gcc.patch 631 SHA256 2ded8ebdbdfa73e7498ab8704541c9207db30d67b7a1970bc87d7e7d5ce9fcc5 SHA512 81ce5949069aa23f66968ca25d9489c3555c87f57836024d7cce16553be98314c084a6d3ffd79fb7bd2cd08fddb9f4eb87b1936e491a16b450e0bcb22092c5a0 WHIRLPOOL 81e480478bf4ee760f84b992417b9017b0296cc1bcdd38df68ccfc1b2a82b1e92e91d5c8d294f58bc11fcf5876285933d4bd5e2626e8e9d0a98557114c65cb48
-AUX uwsgi-0.9.7.2-no-werror.patch 722 SHA256 918d89bc7f15e8efc437ef713c985da10dde912cdf64bf13d342e71a47f65e70 SHA512 b9a0bc9a17c1e9aa3a36f213c598e645d61b5b623751a12b2b48fe965395e412271922cc883eacd9375c4ac0e36c34e8de076c0e941ff6b9ccb521b5a310f3c0 WHIRLPOOL 55ae79cee9b3d1350844081968e1fd57b50e2f27ac2dd4cc280d5227684da97b426c0cba2ed1959a2dc4a5abf51ccd55af4964f3d4984a482c5418fb9a16d7b8
-AUX uwsgi-0.9.8-no-werror.patch 624 SHA256 8650fe560d25d9b6facf8034bb5edfedc8aa74f22a716da702d2b97a1d298998 SHA512 c391927ad44284cd77064c76f47973e0fc73e5e1d31418471872c0f4bb6ec9dfb7308b2f0cc4eb64c5702660634d51ee84426efa8dabc6bb501bef62133aa249 WHIRLPOOL d0725ee6618b89e453a48ec2acea1524bca6ce0324116956fe20426b86f25c3e59289149b82a007b555cdd573054e0d635b539c75c8581b9788817fb1089a669
 AUX uwsgi-1.0.2.1-no-werror.patch 567 SHA256 64ee1684a12ea64b6b6892209c77863061a54cc752156131c6fc55f7f8785153 SHA512 8ebd116d1fd75385f13cf072ac44dfb0055f789dd7fc1f37433b6dd98c62cb439b2fbf99fe891d919139f93404f5017e3600093d8dc21c8463f0f50e3bb72460 WHIRLPOOL 0de33344956bd2723f364da07ad6a48adca3ffc43e53cad9ee70c92707ea6f9b47004f1fdd8b14318ba39d0995085986a3d606e26d07fd293d71ebdab17eaf17
 AUX uwsgi.confd 1116 SHA256 3c238b934f8db9eae87f77dc3d131499e442526d5e45438b5461c0d7590b772f SHA512 888d174ed0c83e93724b473712288e42ce97e0b367b7aca3c707795e8bf4753a242982d8fa35274662851a6638eef3a55860982aae1d94fb234cd29ca4382bfd WHIRLPOOL a3708ed41de4e21562eca5ea89afed6e6cb234c0c37583b58ee346478de64569e68b8eed45ca0349222cb07ee8b85683ecebeea404c2f0ded1c91dff90cbfdbc
 AUX uwsgi.confd-r1 1438 SHA256 baa1522d488523daf67d3d480f9aa5076ae3252ab2731f4c25ef564caba8cfd2 SHA512 51e7154ced90a6a531944db8df7bdc2d502550501845ff153e05f94623d0d547180b78fe80203a272af60306b9d3d8575dc101e4069b655091a821929a6e4436 WHIRLPOOL cb12c57c5eb636941e429900ae8f932129ace89620d46d537108ba3aa15e694eb4038bca5739eefba544dc02c8ecefdb53419509ed542c40ec5803f4f0516ff5
 AUX uwsgi.initd 2861 SHA256 8891e4bebb324a1663aaf994715243346ea9ed2bf73a1296be5646542d77b10e SHA512 d2f8cb4f6f1b2c9ad5174d036934ff2988d45824a73553753278cc814c672c8af753514cfea6bcc9f6986bccbf86736b66362d59363628db3ef75276e4fc787e WHIRLPOOL 125d9ca06e2265d398d515c7c13dca7871f2554fb2cc44b64bdc67f4eba1b442c0ff852b8a9f7475bc2ca1a6ee7f6e5725290522c8227be8f7052a1c03b71ed2
 AUX uwsgi.initd-r1 3370 SHA256 8b429f67fe885a2a6314168cc8eef3acc065a3fccf02140e08c05e9c06be8741 SHA512 72452cc02d3ba6785280079f83cae2194b610838e21c048ee646a869ab2f29d0e9e746c5f38a734de7b24a7f1386407113cdc39e2a2e81fdd9faf653b3c16a37 WHIRLPOOL e115ca6bf49ee83cae339b058f3b45525f94380c341fd2d2abbf5526c7072de444065498c64e70ee78d8d7e2b03eb510d3d19c401891902c78bd06ef574d585a
-DIST uwsgi-0.9.7.2.tar.gz 306218 RMD160 a6f0a548d6db46230946ec0a33395d5f5b119a58 SHA1 e279c2c597d349d9cf463bc4d226db7123c43342 SHA256 6eccf3c7ead324c6af9a6196f0d4faf4c8472ca3b728a01a0070b472b0784bba
-DIST uwsgi-0.9.8.tar.gz 335000 RMD160 424e9ec7c4bd24e2db256c92f84c0a3881ec3aaa SHA1 2ab2fd822fc966efe32c6be5a97efd7299d0cd01 SHA256 63a33006ea93f87aa24aaffda9e8b3bfc2d598b1d7bc4d9cd13c587f25500899
-DIST uwsgi-1.0.2.1.tar.gz 465250 RMD160 e882e19ea072af06cb477c9fe5d580f3a5127d27 SHA1 b383b2d3d9d2b8fa3fef9d5449d151dde89e5ead SHA256 78280b57a970db7842e4481f8b00f13d011f27b340c869dc1ad28d564d716439
+DIST uwsgi-1.0.2.1.tar.gz 465250 SHA256 78280b57a970db7842e4481f8b00f13d011f27b340c869dc1ad28d564d716439 SHA512 de7761b24ae92aea62b4b5d4523d1b812dd5c25c09551baf7007a0e1a97461c62033762cb02e90a9bd85f2aef78477c5151c5a359c8b878150a0c926e3a759ee WHIRLPOOL 47ca0115d55a09b99006fff9c6fb6b5daa71b0b4ea64bbc65390ff64c05f62a661a17b1ec172e05f78f75dd9a36efad3d9dacb57c980639038be6f718480d7b6
 DIST uwsgi-1.2.3.tar.gz 512385 SHA256 1f9f6047468272708241780597014ed00d93919a384e81b30e65167fb2c2e129 SHA512 d6f673877cc5e6ae48effe2c3579ca59ef2579c57ed2d647513451b4411304a366ae81e5aae772014ca6b48da652a056ef7cb48576ad144f2e11bc6ca5fbef50 WHIRLPOOL 06dc820b60f837977d2c9a3689fa948cc14302f4c5cf78297c75bd358e888a98403c2d44ca4d3e4460853fa5496fe66295cb91d548b57dd29273b6843c5c965e
 DIST uwsgi-1.2.4.tar.gz 514048 SHA256 294306d249300b531bfc7abaa706926d0ed87ccc2e7248afec50b425aef39ebb SHA512 cf75b4da66fe44435d0f2bd8c7d959d30a9409c5dbf5136ec4b1805d368ff254dc22f8777affb88d1f0a63a98a34480ae0cdf25fbe0dd2419834cfc7c55692ae WHIRLPOOL cb9e70441323de5519643b91e2415fb72ab53cd8a0064792eca0ba9de05f55b9a7752244287ba5460adb18b20501aa38a0163a1320162d0a68d8b2ce42aa315f
-EBUILD uwsgi-0.9.7.2.ebuild 1888 SHA256 ce8aaddc6934c7a378c9489f22d57e56112d352f8eb4f2061c4317a8bcec9f8e SHA512 3e5d3e3a54011b17b177afcb7e08135c7e99210c971cfb5984a0fcb986c397e8da0fc595aa2d6a8618882067cfd52759ad2102d133a07e83d216a2f3de9a286e WHIRLPOOL e8800cbb2a0459a507adc8e2884156a66e10bd4ed9ce647330d730f3fbc9f07c72cee469bf5ff3007be1b2eb14f0eeca05085d4ef4c69e058e0ac1dddfad093d
-EBUILD uwsgi-0.9.8.ebuild 1886 SHA256 9ffd7fb4dc39ff59b1336c5e1a0f631b80c68401cff37bd368fdd3c93bd32581 SHA512 46af85e13ff2143063e495a781964bd89877d79cac5cb9af4582d90ecf2b362e2e26f9c390bf206efedfc51f1348cc53d64bbbd2c79bb025c7bd81f6c9f796b6 WHIRLPOOL ef4bf3fae9f0bcc8a40f151e0494e9eaa8da6d695405543780af24a4a677a901d336e8b2f85e71bc71314a8901b7fc98b4a140c71336037b9ae203627e822d2e
 EBUILD uwsgi-1.0.2.1.ebuild 1891 SHA256 1078d427a2cd4abe8a7ed4a5ec4a477fea989c2b75e20d5a27128032359c61d5 SHA512 857cd70e9002e7f1ebb521ced5453cffd43f4ff5805363ebfecd10d929ec6a4ab0283f51ceb5563e531d371a190a16b7d8ab162a56715c8aac5a0ee1e62dd5ee WHIRLPOOL 6fcf9f03d8325ddc061ac95970568a02d2d86d883b3b936acda41368c6b9d7b806f37c9701a10a70375cd577608fe444fb6405785a8dd9605fbaf72b03196b3c
-EBUILD uwsgi-1.2.3-r3.ebuild 8579 SHA256 0b00d145c0b95d451b6a90aa82a8cbfeaa6d2c813fc88e5b48046aab20c62067 SHA512 2552ca366b42d96551b481625e3e3741e22c198060bc402833a1830bb7bdd8c9f5d59d56e64c26240ec4a7f96774ac545bed0adad2a73eb7e22e9d01db57ca4f WHIRLPOOL efd7484b6fa55098c16e0981adf722de9db9bcdd4c3fa11a29e9856e7f3fa2f41412fe276c2df927be7d35a5825b9692ae2a0af869c040bddbb31e0de5cd8893
-EBUILD uwsgi-1.2.3-r4.ebuild 8579 SHA256 1c8035f8fb2865d134c06c784afbc208be969aff6d0d2740d69dca5801a8e10b SHA512 057234bee56d778e074728cccdd4b202b96ebfaa0ac964257815ba99bf90cfc4db73540593fcdcb83164994ebc991518160107bc1c9582892772e9be1bbfe762 WHIRLPOOL d697389fcfdabcbd829e42657dfe90d2efcb26a6c4fbe341d73b1bb3b8d4f4cf9a578a8a99d4da0069fd14d4b77aaa4c3168219c6798476b56c841a418da4535
-EBUILD uwsgi-1.2.4.ebuild 8576 SHA256 9c393fb04917bc3d3c45bda1c905167b3f2ae25eab37fcb8c9debe3dbf53c264 SHA512 2913b7a3e9016e5713b194d171a41863e4605da914469c8146f6e329c4364ea5ee25c5cfa6ed4c3a9562d986f5b3ceec781d062e57180c1421fefbf2a42fd9ce WHIRLPOOL 284a779603c0a18ad65c1a3a228de8ccfd4f53758462764b0fb18576adb6e902844c5101a3229df6cf1ca79bc36c7edb298aa9f7063a7056ba1da20ab31d58c5
-MISC ChangeLog 4532 SHA256 e16e0c00414b190dd3fa6fa90f3ec0e73204d7b51c620e1e9578725dd5541d98 SHA512 4a71ac96f87664605a55f00c230d9f8256014492c3721d2d7f1955f9249656203440cfb0c184a5513fc223dd8c9624b0b8bf46eea0b7f1dfc7929e127faab8d7 WHIRLPOOL 43247fc7f2d3e03995d8efee88b349611879b145d30ec28c245bf0828a14bcc3d3c09bbf964a13ce31d20dbfde049c4bb8fa2216abee452f9b8c07a41145d1eb
+EBUILD uwsgi-1.2.3-r3.ebuild 8580 SHA256 0c7876499d197a9292dfa05420f27a2d418bf1b1e19e310ef0d2933b99330e9e SHA512 f6e60800fac1d372632db72e8aa969148cecd05055d220a02b655360fab1395b5cb6bc21c1cb4402cbb3832de4d35cff493716a7cf28c8e40015c74bde69e071 WHIRLPOOL 8b6cf524f3c540ca5abdb944e89049294247b1e9019fb285eefb00cce1f49a85190ff419b7124bfc56dedd1276f673187504e0969df8a4b26dfc2bd9c8244e76
+EBUILD uwsgi-1.2.3-r4.ebuild 8580 SHA256 b639a675168ac9dae4179914ef46106f0c39a15884811ed1f0451c29e7ba1208 SHA512 0e5e7735e15d3168dfe79d3ec1538f7714885c7c13e5361724f94a7d4a5e8fa76eb3bb55c37d3fc9a62606d7724e5defd4df1a3edc5b7db4f049b93de1ecc1fe WHIRLPOOL 353344467d34eb7f7c3cb02e4ad5f98c3a3d543025615d7d894146401c47e8e3052aaa62ae16708591c157e008914932bc49b451e7494b659b99e341b556cadd
+EBUILD uwsgi-1.2.4.ebuild 8577 SHA256 88bcfb8ecf1c866a6b3ca4e88019a8cdb348fa8a5311f92563ffb0f8232ba227 SHA512 fc464cdc3f0d1bd64af6401aeb893c6e248ac02b9ad88dd4c28d64b89c660e25417a7c6b30cd3f782c0e4083d52e8c3aa89ee50e8cf786d6c0a86e2abcfc4353 WHIRLPOOL f230d2502f301a9e285effd02c374941163441b9028b618f4fdbc83e105d241e7d035da916dbe5549082b122252189256c7668488b7be25b215b4c2cd402fb85
+MISC ChangeLog 4974 SHA256 5d083a8b520cef5d6e5659a412280f8f0196afa13e50d63da4b809868ef4308c SHA512 a85f2053a5fa00d608b28164b3ff943ad7ef15606e26dd65c26b6b4c39be6f71ebef1d160ad401445c4114f62c65528f3fa95b60231f94376f70182d7af1e0a9 WHIRLPOOL f43abae4bd1e6372bdb86cdd7b7003a4b179dc584612c10981363673766f5b1b56e8af159032f964eed3b0098cfe9a8b7321f184447049c99fbe2efb5a96d64b
 MISC metadata.xml 1695 SHA256 2c176c7490bc3b284157056a10608475377c1528bfedb7488c5caf65e9112fd8 SHA512 5f14196d9997554978b3fde33519c1930268ecc8e63505b4d382086c01040369afc1403ffb9966e177651d64a415780768b06e9afa696647c421cd953f8c323c WHIRLPOOL 2e0a3ccceb5a94b1f0fe67a881b8d11bd22aebcd2ab0d60441708b7f48b9d35cfd0485824720c43a16d297fe69353064a8c097292530657d0e4c6f27c0a77e87
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk/6tGwACgkQKiQSS7ZY+hOjUQD+Ig6ygLuSDwNf3c/19SKC2j1P
-MhHbQEStO+VNRpaaUWYBAJgAal90x3Bh/W+m4QpXhflC0KQyvUIeT9f5z1GXWgFA
-=Bypf
+iF4EAREIAAYFAk/9TiUACgkQKiQSS7ZY+hN1vwEAyiRj4/CoabNxfNDDvZL1PH5H
+7Bbo/Udi+msVRl3egu8BAMV6V9cq8WlU+n0AtMXXkpUOBAKBDzO54GJ5irKnQ3qx
+=zWhF
 -----END PGP SIGNATURE-----
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 e02f497c0eab..000000000000
--- 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 c3f740d5aa7f..000000000000
--- 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.6.6-gentoo-gcc.patch b/www-servers/uwsgi/files/uwsgi-0.9.6.6-gentoo-gcc.patch
deleted file mode 100644
index 98298a6b50e1..000000000000
--- a/www-servers/uwsgi/files/uwsgi-0.9.6.6-gentoo-gcc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/uwsgiconfig.py b/uwsgiconfig.py
-index 5025b51..d817ae1 100644
---- a/uwsgiconfig.py
-+++ b/uwsgiconfig.py
-@@ -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(spcall("%s -dumpversion" % GCC))
- 
- gcc_major = int(gcc_version.split('.')[0])
- gcc_minor = int(gcc_version.split('.')[1])
diff --git a/www-servers/uwsgi/files/uwsgi-0.9.7.2-no-werror.patch b/www-servers/uwsgi/files/uwsgi-0.9.7.2-no-werror.patch
deleted file mode 100644
index 96c502e2bf1f..000000000000
--- a/www-servers/uwsgi/files/uwsgi-0.9.7.2-no-werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- uwsgiconfig.pyold	2011-06-05 13:47:50.000000000 +0400
-+++ uwsgiconfig.py	2011-06-05 13:47:57.000000000 +0400
-@@ -160,7 +160,7 @@
-             'plugins', 'lock', 'cache', 'queue', 'event', 'signal', 'rpc', 'gateway', 'loop', 'lib/rbtree', 'lib/amqp', 'rb_timers', 'uwsgi']
-         #if uwsgi_os == 'Linux':
-         #    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-0.9.8-no-werror.patch b/www-servers/uwsgi/files/uwsgi-0.9.8-no-werror.patch
deleted file mode 100644
index f55d6bbe81bd..000000000000
--- a/www-servers/uwsgi/files/uwsgi-0.9.8-no-werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/uwsgi-0.9.7.2.ebuild b/www-servers/uwsgi/uwsgi-0.9.7.2.ebuild
deleted file mode 100644
index 7d6f0906c57f..000000000000
--- a/www-servers/uwsgi/uwsgi-0.9.7.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-0.9.7.2.ebuild,v 1.3 2012/02/25 04:26:07 patrick Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
-
-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}-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
-}
diff --git a/www-servers/uwsgi/uwsgi-0.9.8.ebuild b/www-servers/uwsgi/uwsgi-0.9.8.ebuild
deleted file mode 100644
index e8a16591e8da..000000000000
--- a/www-servers/uwsgi/uwsgi-0.9.8.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2012 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.2 2012/02/25 04:26:07 patrick Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
-
-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}-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
-}
diff --git a/www-servers/uwsgi/uwsgi-1.2.3-r3.ebuild b/www-servers/uwsgi/uwsgi-1.2.3-r3.ebuild
index f389debe6bf4..9123359416f4 100644
--- a/www-servers/uwsgi/uwsgi-1.2.3-r3.ebuild
+++ b/www-servers/uwsgi/uwsgi-1.2.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-1.2.3-r3.ebuild,v 1.2 2012/05/24 21:26:52 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-1.2.3-r3.ebuild,v 1.3 2012/07/11 09:57:46 ultrabug Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? *"
@@ -25,7 +25,7 @@ SRC_URI="http://projects.unbit.it/downloads/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="apache2 +caps +carbon cgi debug erlang gevent graylog2 json ldap lua +nagios perl +pcre php python rrdtool rsyslog ruby spooler sqlite syslog +xml yaml zeromq"
+IUSE="apache2 +caps +carbon cgi debug erlang gevent graylog2 json ldap lua +nagios perl +pcre php +python rrdtool rsyslog ruby spooler sqlite syslog +xml yaml zeromq"
 REQUIRED_USE="|| ( cgi erlang lua perl php python ruby )"
 
 # util-linux is required for libuuid when requesting zeromq support
diff --git a/www-servers/uwsgi/uwsgi-1.2.3-r4.ebuild b/www-servers/uwsgi/uwsgi-1.2.3-r4.ebuild
index 8ea62ee2211f..0ac17c955b2f 100644
--- a/www-servers/uwsgi/uwsgi-1.2.3-r4.ebuild
+++ b/www-servers/uwsgi/uwsgi-1.2.3-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-1.2.3-r4.ebuild,v 1.1 2012/06/27 16:44:43 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-1.2.3-r4.ebuild,v 1.2 2012/07/11 09:57:46 ultrabug Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? *"
@@ -25,7 +25,7 @@ SRC_URI="http://projects.unbit.it/downloads/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="apache2 +caps +carbon cgi debug erlang gevent graylog2 json ldap lua +nagios perl +pcre php python rrdtool rsyslog ruby spooler sqlite syslog +xml yaml zeromq"
+IUSE="apache2 +caps +carbon cgi debug erlang gevent graylog2 json ldap lua +nagios perl +pcre php +python rrdtool rsyslog ruby spooler sqlite syslog +xml yaml zeromq"
 REQUIRED_USE="|| ( cgi erlang lua perl php python ruby )"
 
 # util-linux is required for libuuid when requesting zeromq support
diff --git a/www-servers/uwsgi/uwsgi-1.2.4.ebuild b/www-servers/uwsgi/uwsgi-1.2.4.ebuild
index a23a17f43caf..1209dd52fa7b 100644
--- a/www-servers/uwsgi/uwsgi-1.2.4.ebuild
+++ b/www-servers/uwsgi/uwsgi-1.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-1.2.4.ebuild,v 1.1 2012/07/09 10:37:22 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-1.2.4.ebuild,v 1.2 2012/07/11 09:57:46 ultrabug Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? *"
@@ -25,7 +25,7 @@ SRC_URI="http://projects.unbit.it/downloads/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="apache2 +caps +carbon cgi debug erlang gevent graylog2 json ldap lua +nagios perl +pcre php python rrdtool rsyslog ruby spooler sqlite syslog +xml yaml zeromq"
+IUSE="apache2 +caps +carbon cgi debug erlang gevent graylog2 json ldap lua +nagios perl +pcre php +python rrdtool rsyslog ruby spooler sqlite syslog +xml yaml zeromq"
 REQUIRED_USE="|| ( cgi erlang lua perl php python ruby )"
 
 # util-linux is required for libuuid when requesting zeromq support