summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexys Jacob <ultrabug@gentoo.org>2014-01-22 17:07:15 +0000
committerAlexys Jacob <ultrabug@gentoo.org>2014-01-22 17:07:15 +0000
commit8c54e630fbb69d1a52565c526df3110f815677ba (patch)
tree6554f2e40149d9c995a13995161a922cbd2809f7 /www-servers/uwsgi
parentVersion bump and cleanup wrt bug 498464 (diff)
downloadhistorical-8c54e630fbb69d1a52565c526df3110f815677ba.tar.gz
historical-8c54e630fbb69d1a52565c526df3110f815677ba.tar.bz2
historical-8c54e630fbb69d1a52565c526df3110f815677ba.zip
fix #498738 thx to Zhixu Liu, rev bump
Package-Manager: portage-2.2.8/cvs/Linux x86_64 Manifest-Sign-Key: 0xB658FA13
Diffstat (limited to 'www-servers/uwsgi')
-rw-r--r--www-servers/uwsgi/ChangeLog8
-rw-r--r--www-servers/uwsgi/Manifest14
-rw-r--r--www-servers/uwsgi/uwsgi-2.0-r1.ebuild (renamed from www-servers/uwsgi/uwsgi-2.0.ebuild)10
3 files changed, 16 insertions, 16 deletions
diff --git a/www-servers/uwsgi/ChangeLog b/www-servers/uwsgi/ChangeLog
index 867007e9d88f..8b3fa1984baf 100644
--- a/www-servers/uwsgi/ChangeLog
+++ b/www-servers/uwsgi/ChangeLog
@@ -1,6 +1,12 @@
# 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.49 2014/01/21 15:40:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/ChangeLog,v 1.50 2014/01/22 17:07:11 ultrabug Exp $
+
+*uwsgi-2.0-r1 (22 Jan 2014)
+
+ 22 Jan 2014; Ultrabug <ultrabug@gentoo.org> -uwsgi-2.0.ebuild,
+ +uwsgi-2.0-r1.ebuild:
+ Fix #498738 wrt xml and json USE flag detection thx to Zhixu Liu, rev bump
21 Jan 2014; Jeroen Roovers <jer@gentoo.org> metadata.xml:
Whitespace.
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 04bce4e8c7a3..8435307b2b6d 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-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 42_mod_uwsgi-r1.conf 248 SHA256 40ef0a3916eba8f1a87828911571e9d8bf838f38f050d67df1662aca11ba6c91 SHA512 84babaa9aa5cc1a52235f1b4febe3d9dd1a90e7e28c54499d78219727a222e2c2f4db001d898e0fdc46718ea582ce3fc98d0fbbf94b1730f4a139555225b4538 WHIRLPOOL d96ef19fce89fbb36e1bc7701b2fb7424945f5da9d7eee071de74c9975463da9ba5be0a1a855e75c39705317ce0eef5116e7733d74091bfd984d3c1f189edea3
@@ -25,13 +22,6 @@ EBUILD uwsgi-1.4.6-r1.ebuild 9562 SHA256 64e5834cc5768cf2b8cc96f9e075e155bbbe192
EBUILD uwsgi-1.4.6.ebuild 9559 SHA256 d606c46c5d9c3d422faa13113138eaa84812e08dad807741261314887e75ac5a SHA512 2006048503b70e59d3a0515c889ad88fdab59af1a2ccbfa8eaddf5f926b164b9932c223d52f376cd57c1c068415daef1a2815f0dc2e736cab4224ad9209dc601 WHIRLPOOL 31ee2ae6954d97388c2681376e67431f00ef497c11892eb7b6938ca235811a42d1ee309619633836594c6729f2bbc6fdfb860d40047e618aed1983aac74e45d4
EBUILD uwsgi-1.4.8.ebuild 9559 SHA256 cc21690212eb37156b5c2449f8223de09807315719a0b03586385048db49d1b6 SHA512 c8e02803c97e39a63ee0383ad5a4a12211e8f8871a81d25993cebda38a30f6cdcc8bbed190033c409342148b2f8bd57997d6a007584ebcaf7cc9d81326b00b11 WHIRLPOOL 2405726642ddf2d7d98cc6d6eb5ddc5a7ade8671b0025e9b533a70692be6cdeaf9f6d53df04b995f73e5be87521f012139e3e5c03c3b7bd368a133d08b2ad489
EBUILD uwsgi-1.4.9.ebuild 9559 SHA256 d78fe36b66cfd7df05842bead1f516cd010f68f4ed1aa797ae0a20c1292ead83 SHA512 a93dac97f722c56ea8847d08932b98012a494eeccc9993f7cd07fcec4e53c2357d294e3da21633430ac629cfab0640a3f226e2ba7aeb989de904a375d17dd49d WHIRLPOOL f2f2fb3bb93f775db59751e6b7a580bf2ce0589f02c51b6cfe44db59f57febde7dc8749383990dde8a76f26cbd35b09e65f0e4533b71eb736bb3e84521555639
-EBUILD uwsgi-2.0.ebuild 10918 SHA256 c4013663cccbcd192932321a5e28e47a32af4bfe11a65a11be51d00869199fa6 SHA512 7914551dc22ceb0b92d54e42cf9a205ff9739d2244b2ad622103b47722f4f9ed7ffdffa905fa57e94df9343686401cdf4113b1a4882e90c054abfd571d0012b4 WHIRLPOOL 311513ff9abeae38ceca0173ae3b40ac880abe39dfd1a97f2f9da7f7fe41961b4b93b93f51436450ba1837eba814ed48d076c2ea0a1e77386a72e3a92e182437
-MISC ChangeLog 8778 SHA256 d663a58637aab757eac5cc3a81af8df5ad11413692131570e4446e8402c45c5d SHA512 8ef38779ece3cc71afbdebca75b3a13d4afa96baf5ead7499b7b50369eed71d3788bbfa67b36ea1234e545bb11b0d1959585d803da76afa436b409d1a0f2f0ed WHIRLPOOL 2d1d2d4018061c1f01ac681f9b7ddbcd7dfe36e03284a24bc4b58566ca81d05d030a2f6d91c148dee1293cd1574f12f25d1ad4276cfc8c17e76e06f64f3dbb78
+EBUILD uwsgi-2.0-r1.ebuild 10941 SHA256 553e50c2401f88e1f94c04ff5e3cff8f6ac9cedd4b73f29e892fe2947bb63af2 SHA512 7d6631f8127353872424ee672bfb096e4bfe33956a2d41a6178d847071ccfcf798e932b60ca3734328159e1d4c646aa44c6e4f2ef98c83db8460214ebdf5f903 WHIRLPOOL 1882a30b6f63d22a636c298d9bad3d7ddd562692d666b9393a602d695c4425bce86f5ce23cdb45ce1435c56bff5ef2f49c23903755467df558394d4416a59484
+MISC ChangeLog 8979 SHA256 c460794bcf6c98cbfab9189792a68df96e1e6824d0bfb3ffff5a014bb4e52a48 SHA512 9da05191256683c50ebee0f62d30eb967f29cc75a871bcdb1184259f474cd90c17a9be156a17fdcbaf887adc0f6d7e6ce87b857c22c5726195b0839cc9751701 WHIRLPOOL 6ad5435eb089c8fe3e1055c63754f3fa247463c6c0f5ad23e536d44513ac31829dc76a4d2ba531fd5c08f7838e9d95c2a4371279e073b49d625350809439111c
MISC metadata.xml 2398 SHA256 fcc2a39d1a01b6d2ff727aa61ef47a46270bfe563a5d56145077306f51acf956 SHA512 40eddbe1a633a5c018dd536ff03cc47df345c7f504b0371724bea99e9ae7dcd66dedfdcda3387ecb217c9f004668b435f878bb067354793b19ee74a44ce6d8a6 WHIRLPOOL e0e6583c809deb2ef33dc9c7d02a92dc33b0d1c0c6ac50d2d8d9a368e0bba96ce3a294bc397f596314135256b0121b12871437522485aa2bae9e5ac79dfc91ed
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iEYEAREIAAYFAlLelQoACgkQVWmRsqeSphNCrgCfT8/1WeEUv9F7APRlCNP4EZ6U
-K1QAnjeQRt+MgfsaUqe6wRl+o9YuLkHe
-=v7YA
------END PGP SIGNATURE-----
diff --git a/www-servers/uwsgi/uwsgi-2.0.ebuild b/www-servers/uwsgi/uwsgi-2.0-r1.ebuild
index e2bd273e25f4..1b183b573a42 100644
--- a/www-servers/uwsgi/uwsgi-2.0.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0-r1.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.ebuild,v 1.1 2014/01/16 13:40:41 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-2.0-r1.ebuild,v 1.1 2014/01/22 17:07:11 ultrabug Exp $
EAPI="5"
@@ -176,8 +176,12 @@ src_configure() {
embedded_plugins="${embedded_plugins/sqlite/sqlite3}"
# override defaults as requested by the user
- use xml && (use expat && xml="expat" || xml="libxml2" )
- use json && (use yajl && xml="yajl" || xml="jansson" )
+ if use xml; then
+ use expat && xml="expat" || xml="libxml2"
+ fi
+ if use json; then
+ use yajl && json="yajl" || json="jansson"
+ fi
use jemalloc && malloc_impl="jemalloc"
# prepare the buildconf for gentoo