fix upstream archive mismatch, use github as SRC_URI

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB658FA13

4 files changed, 14 insertions, 50 deletions

diff --git a/www-servers/uwsgi/ChangeLog b/www-servers/uwsgi/ChangeLog
index 46515f0739c5..1500043e8612 100644
--- a/www-servers/uwsgi/ChangeLog
+++ b/www-servers/uwsgi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/uwsgi
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/ChangeLog,v 1.62 2014/10/27 16:40:14 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/ChangeLog,v 1.63 2014/10/28 13:43:14 ultrabug Exp $
+
+  28 Oct 2014; Ultrabug <ultrabug@gentoo.org> uwsgi-2.0.8.ebuild,
+  -files/2.0.8-threaded-php.patch:
+  fix upstream archive mismatch, use github as SRC_URI
 
 *uwsgi-2.0.8 (27 Oct 2014)
 
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 404b482541c8..9d80fb58e0dd 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -3,7 +3,6 @@ Hash: SHA256
 
 AUX 1.1.2-threaded-php.patch 1098 SHA256 e5f03fcdf2ebf7d2867b21e640f2c44f23da169108b2ea964e96fea44152d49b SHA512 d213c827710b75c1e4e1a1ad657515a7d2cacf02fa1f2f309d5cf986b3650ea20529077e2d2df5a22ed6edf60e43e755378ec6ea556c43c844cf534552239d75 WHIRLPOOL 1b0e42b83aa45a3bb17edaf4f9d7b260bc9dae8d7e8f06a38c97045361e64ddd9e774a1df1244e521c7973b27d27d40cbca4d8d2b16d0f9765ca2daa00cc3be8
 AUX 1.2.3-pyerl.patch 1015 SHA256 1da74cb8d108f46c4faa39548f73de2f74849dde81d1012b71c7c91ab939596b SHA512 b298feccb2604b9459a15699d786c26be9d830f88a4a00beca69fba3ff0d5d78cc239e6dcce51da32121c8bb4d72af41a6e57e5594a3005cfceb4feebbffaed2 WHIRLPOOL 60ff1374e1f13c9ffaa65996a24d87d86d64d7f4edb9d1378d0b7287bfeb285d5123da4532c6e0fb022ff78d80a6b5eba9d6bb8c36536145d4a11cbdecee23f6
-AUX 2.0.8-threaded-php.patch 1108 SHA256 f84950e4ba9921a33e43edd701c8315263b2358c3473ea944372bf2cf72d8eab SHA512 b207c422103270f79103285623aa9e7fa203c1f5fa9e106a1a8d44612f88072973474d58b01be29924f40f2e43016206a0bc49c914f4b51af927666b05ffd803 WHIRLPOOL 505d5734f0946bf770b69b6006b8235608f52b9b382a97715aabe1e8f667d79e60a57597ef68f6e4ecada059cec9d0f5981e3e827af741ead938d90ef076c416
 AUX 42_mod_uwsgi-r1.conf 248 SHA256 40ef0a3916eba8f1a87828911571e9d8bf838f38f050d67df1662aca11ba6c91 SHA512 84babaa9aa5cc1a52235f1b4febe3d9dd1a90e7e28c54499d78219727a222e2c2f4db001d898e0fdc46718ea582ce3fc98d0fbbf94b1730f4a139555225b4538 WHIRLPOOL d96ef19fce89fbb36e1bc7701b2fb7424945f5da9d7eee071de74c9975463da9ba5be0a1a855e75c39705317ce0eef5116e7733d74091bfd984d3c1f189edea3
 AUX 42_mod_uwsgi-r2.conf 254 SHA256 8b0775302d112a3f1959776e89a5cc13a325d80719281db8d3e896a95f5fb691 SHA512 de827913644ff8763d7e9f6907e5dd500bc7d25f861c9e8dd07d6f070e96b9eb39bdacc3a8e7ca0925f2a8ee1cd74bfe22da467bab39e319b7cabee36d31dc70 WHIRLPOOL 2c9238712c10e0e1b0b7fa1c7e802a5ce973d71fc5e2f8eb03831c9b49dce0e98a6ee3acf9d17fcc32de1914f4d9955a9c0a218cf24658d4df5d0449bb211744
 AUX 42_mod_uwsgi.conf 159 SHA256 b759712baa7b8abab2ffd56c3cbc970cb9189ef1efa3f3aa154a963dc67ba861 SHA512 14eb8d58f814657da9d28215d4096373a26e5bdd9e3953bd37dc6008f42b04ca99ac5aa552bec36d1d8503e7ae54c78fcc00c1f6fe9d6daf983764bae07b802f WHIRLPOOL ec352b176c89441532378446cb909b3383054afbbee5d4f24c801eb5716d1143737c098bd25be46aa4399e54937c6b786fdca3e0343b0b4c91442456ba565f79
@@ -15,16 +14,16 @@ AUX uwsgi.initd-r2 3436 SHA256 1983e7346e50996ea9a34ac8f399b965596232bf7b9b38a98
 AUX uwsgi.initd-r3 3614 SHA256 58b998b025e4a9df20ca917bc93e287f9a8cf02d278d513fa461f70e1d08f799 SHA512 ab9dc6277bd05821287f6f8beb3ac2504f0e41db38e11b4d2884ac026f14ac7bfaaca138f045afa712d4f2843f94de105bf0d43fad35d18679ac33b507cd187e WHIRLPOOL 7bf4b1d5263ddb3ea0e3c81fe4906debaa3a3ee0a59a177b4f12a24d883bcb2049dffa4b11d9564c1ce4324a23a67cd4e8110f1955c05287f53cbd4b4e75e7cc
 DIST uwsgi-1.4.10.tar.gz 590892 SHA256 d4c30a6496d7d7be59f0264393649b9bd5ec58f72c4c3b79b8160b25c193c512 SHA512 26eb3e34595f0e85ae8f217ace8d326f966c605e00974621aa8b94fd83ef9fd711bdfa262c609a62a7f8d82a04431876769b546a1d1a0929de50ccd877a13e22 WHIRLPOOL 77d1a556c8af59a95eea75e8ae0af524c9aa768c1ecb7a396d43ca9cd6d215a96b83626882f8ab47cdc181ad1c5e62f18e508f43e97e8feb39bb5659fc6b2f37
 DIST uwsgi-2.0.7.tar.gz 772385 SHA256 2938464d0277909854f55951cf7d114e0616efbd8dd0295da7da99e944cbc72a SHA512 5494fb03057aac57029b428f5a3b67cbdef2dc126cc8b6bb476c21a01afc3fb4c1f03af607aba7fc6dd49996373b8d01a79c34c2f2e763dc604961d265e58d4d WHIRLPOOL aeb33f94d0fe8c9db04074ffaada1aa304657080aa953b52d26349c6f7cdd7d5a9441ce11b37a74c26925db2f9d18ecda96a98789ed6a50d7f0d93b66bf6ecdf
-DIST uwsgi-2.0.8.tar.gz 797205 SHA256 d130e9e3a3db24ab5f5302d98aea246239d17429db86f3a8818d1ed2bd4f4225 SHA512 2fa5f8445876d064866475f57cef899cfc2ab122f1648d447de637be500cbcd006c34b4859d7caceb252ed52dcad292194acb501e416934569f76b83888e5d6d WHIRLPOOL d8bffb5bfbf786b6570a51cab4866003760e6b953afb2a53452a9fc97cf5db373a99344a12e6b1c1ba97bf8ce2c6a155ad440a149d8d6f1b7dd560ec2ba8b7b9
+DIST uwsgi-2.0.8.tar.gz 775959 SHA256 ada2268480ef6a91e1aa18102344c6d5a409fe1672da9e835a0f213e2dd5bcbb SHA512 c68a23e6d5a427175a8defb17b8aae5720b5cdc8678253e03aa64e83dbe7b1731f16be328f5d8090f4ab500280d70808a0ccf23c5735a2f8086384c0f8128408 WHIRLPOOL 50147bccf83f965577d2739f4827146737f89ee4904be7ec23257cad196da6af48b9bed626010c290ffe6242922cf137e528377be4ea7e5944a198d305ffdbef
 EBUILD uwsgi-1.4.10-r1.ebuild 9550 SHA256 5b2b700edb34dc1a22c4291b3c8ea1810899d9f918196a3572cd3a0337f448a8 SHA512 568bbed2cdf3833e4e5c89dd3989810f00e444e60096448c987050d4af27c1d0e946fcf5f19ffd0399823e6f4ffcc3e58c3110527d76d41aa6e5023a9a6b79be WHIRLPOOL f0749f218fc498f259ba00399ca4883341d336a4f7d6e5f620fc060045baa73918827693420a17f3e4419a55cbe389bfc7795f352ecf269fb7909011cee5046d
 EBUILD uwsgi-2.0.7-r1.ebuild 11843 SHA256 d970827f878d2de04a7a58cbdab2f7f2c46401d23cfc8d1f129ce846ea4eed84 SHA512 df69e06783cce02e66120af5072abba0ee992e772ce0f329bdd0ec56f33090a57c32b1cb7be430810b9b4ee8abd6f648620d572de700c527b507952e5ea5d917 WHIRLPOOL 94b6557013609de4c884d997b8141ca1e02716a7bc8f48394dee3b9ad3b66d7f9d3f7185c43ee363762d007de9c5f665bb170ed97e7c94776831572539416acc
-EBUILD uwsgi-2.0.8.ebuild 11840 SHA256 2e604e66ec348b1f4ebd29c1bf1518ff457551106e295285fec14d2b236e5ab7 SHA512 ba678de2b4e0c16e74aa259175010beccfd279ae39133cf43499778e4c4b88ebd9734e9e3fffb0cb2fa1e9cb27862eb6791939245fbcd59f29749ef341a8574a WHIRLPOOL 38f7d319a57dad1d37dbea20c8f43c3f23e9596e592bb9b5dbdcebe63e0292473c9dffe8362339be28c48caa8f56e59f7b69f936d6e9e561167566efdc23ec49
-MISC ChangeLog 11432 SHA256 82cb9cca5039392abeea423393bde0fbca406b2817bf8d48ce374b45c4d54e4a SHA512 992e4d0d841c3e3d451590b36ade93d1103f1b1b4e856ce4a5984190963586f949ec7e2eeb50a4986e5ad0c29084aba330ebc95637d8b9de34f61b79774e1186 WHIRLPOOL 8c363bfdd39a3e33fa1b43cca361a6e40557a20a716a6cf0a617a7cc2f3629e85a38e55647ade9ece8feec8aa0e931098f35b81c249c10c0e37b7e429487a81a
+EBUILD uwsgi-2.0.8.ebuild 11844 SHA256 7fba94e6816a3b279829fe2bc0cc53afc84060e47babb5abd917921e67885fe0 SHA512 9bea689fb530468d4807fb1ebc63099a6f40201460af902536052fcfc0cc879854638b1eaccf9e0a1293cf5209936e0bd8087b210242c01ee94ff22f597cd84f WHIRLPOOL 9494ea702cf1076526bc08ebc4410f46b2c2b1d42cde3b3cd3c00e1d63e53ed77fe5a8e2899453aa75079b6b67d7272cdafd985618db538d7c966d22e758f4ee
+MISC ChangeLog 11589 SHA256 d85d98556d8d36f23e9950f6d26eac24ec139437dcdf5c9d6156e34c109a0834 SHA512 f899e6f3dc90ae3635641b035e48ae315e9042059eeffc1d44e363013b529a8eb74325c80a2285a5d10debcfa1762432dcbe44ed3f34ed234ae2387ad9b4c3c6 WHIRLPOOL 606074e6635b49d960f2d879c218c1d5c8da4a5f66a449d6264e21ffa9daf6a9f695cb0d525b73411f7d4a546328aba357230f5f1faaa40b8e97b10780a489ae
 MISC metadata.xml 2594 SHA256 6e77fb15045b2feda8587315d54f7791c9c9af4b0e0f13d72a371646e32216e3 SHA512 89ac61cbfc089ff5452bc909f429431377c67aedc828098ffb33463a90f4a66524729a41fb83460df772218354d564529b7c3c206d3262c1025da1a6b1dd038a WHIRLPOOL 53c09c69fdc10762171891aeff5b731471cdd135ddb90896bfb2a2b1a0e1b841d6db97f9c217c44aed5c4e56d50f6eaff540646a2d05a7e8ce5f20bef9b326dd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlROdXMACgkQKiQSS7ZY+hMk2QD/cnuSWoRSBSaRfXiGrQh8hUYs
-31BbzwZzewPg8WVRLt4A/3+88rHr/MFyBnWAendfI3vZna7SzlVYMXgsn3Q2xwfj
-=3t5/
+iF4EAREIAAYFAlRPnXgACgkQKiQSS7ZY+hOAZgEAwJ0JFsFPsCubiE7ZKsVHxewy
+8dx/JutpNS5aBmwBk/4BAMXWujwHMHENBgTsMiq2IeHtkV7fZzzIkR4r3IzzLb02
+=WoOm
 -----END PGP SIGNATURE-----
diff --git a/www-servers/uwsgi/files/2.0.8-threaded-php.patch b/www-servers/uwsgi/files/2.0.8-threaded-php.patch
deleted file mode 100644
index 10bd5189ad6f..000000000000
--- a/www-servers/uwsgi/files/2.0.8-threaded-php.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/plugins/php/php_plugin.c	2014-10-27 17:23:50.909755436 +0100
-+++ b/plugins/php/php_plugin.c	2014-10-27 17:25:24.970534680 +0100
-@@ -88,7 +88,7 @@
- 	return str_length;
- }
- 
--static int sapi_uwsgi_send_headers(sapi_headers_struct *sapi_headers)
-+static int sapi_uwsgi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
- {
- 	sapi_header_struct *h;
- 	zend_llist_position pos;
-@@ -146,7 +146,7 @@
- }
- 
- 
--static char *sapi_uwsgi_read_cookies(void)
-+static char *sapi_uwsgi_read_cookies(TSRMLS_D)
- {
- 	uint16_t len = 0;
- 	struct wsgi_request *wsgi_req = (struct wsgi_request *) SG(server_context);
-@@ -570,6 +570,10 @@
- 	struct uwsgi_string_list *pset = uphp.set;
- 	struct uwsgi_string_list *append_config = uphp.append_config;
- 
-+#ifdef ZTS
-+	tsrm_startup(1, 1, 0, NULL);
-+#endif
-+
- 	if (!uphp.sapi_initialized) {
- 		sapi_startup(&uwsgi_sapi_module);
- 		uphp.sapi_initialized = 1;
-@@ -678,6 +682,7 @@
- 
- 	zend_file_handle file_handle;
- 
-+	TSRMLS_FETCH(); // fetch the threading state in case PHP is built with threading
- 	SG(server_context) = (void *) wsgi_req;
- 
- 	if (uwsgi_parse_vars(wsgi_req)) {
diff --git a/www-servers/uwsgi/uwsgi-2.0.8.ebuild b/www-servers/uwsgi/uwsgi-2.0.8.ebuild
index ad69372e9b4d..c5fb93cfdf47 100644
--- a/www-servers/uwsgi/uwsgi-2.0.8.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-2.0.8.ebuild,v 1.1 2014/10/27 16:40:14 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-2.0.8.ebuild,v 1.2 2014/10/28 13:43:14 ultrabug Exp $
 
 EAPI="5"
 
@@ -20,7 +20,7 @@ inherit apache-module distutils-r1 eutils multilib pax-utils php-ext-source-r2 p
 
 DESCRIPTION="uWSGI server for Python web applications"
 HOMEPAGE="http://projects.unbit.it/uwsgi/"
-SRC_URI="http://projects.unbit.it/downloads/${MY_P}.tar.gz"
+SRC_URI="https://github.com/unbit/uwsgi/archive/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -137,7 +137,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}/2.0.8-threaded-php.patch"
+		"${FILESDIR}/1.1.2-threaded-php.patch"
 
 	sed -i \
 		-e "s|'-O2', ||" \