Fix bug #514530.

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

4 files changed, 13 insertions, 29 deletions

diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index c6c9794b5f03..b80254a62aa8 100644
--- a/www-servers/cherokee/ChangeLog
+++ b/www-servers/cherokee/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/cherokee
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.105 2015/03/07 16:45:29 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.106 2015/03/07 17:29:35 blueness Exp $
+
+  07 Mar 2015; Anthony G. Basile <blueness@gentoo.org>
+  cherokee-1.2.103-r2.ebuild, cherokee-1.2.104.ebuild:
+  Fix bug #514530.
 
 *cherokee-1.2.104 (07 Mar 2015)
 
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index 4b3ee80daa2b..c8e47b56e269 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX cherokee-1.2.101-libav-9.patch 941 SHA256 59586d2a449f3803370cc8300a267607714fecfe6d197dcede87b14a22690f6d SHA512 fc3d307f25fd9dfa234706aeff6501f09d04b5c1a687cf309ace53c0dbccc038f46de0f6a17288a9ac8430ea6c21c500ff932c3bb98c39348622a36c1f8ab4de WHIRLPOOL d9c13fcb574a247b1173f6997cd3ee5928533c0ca14bf9fdd265b9e94523e7d535782f9978253e35e85e6f0960dc6584cab59116d258a9b7b039521ead86d37d
 AUX cherokee-1.2.103-linux3.patch 1663 SHA256 045f8298d1856bababfbc5e47398da1edff0a3ad00a05d6ee21ee65757688141 SHA512 7edf790a6b19cbb9049aa9394355adc61c116a69156b7390177a349ea0d8e2df93050897ea7683e854996ef225a10c6109bcadb3be241064ac111e45d9f00df1 WHIRLPOOL 5dedd16384e9e99870fbef1e9fafef33992cdfeff5b8834d7e1f2055878918bcdd65f347764bc09882c9446fd76bf4b690bc72711565d493313478d6b88c57f1
 AUX cherokee-1.2.98-linux3.patch 1914 SHA256 cc03fa321bb01cd4a7026685ef2e3fc606fd53da056f629307c6e1904987ad1b SHA512 558926386ad19df5f69fd445d6cf775fb0b8c4a78db4be49e2cd086dc95719f15b5ac97bb37c249ce3c4f27fcea922bbedb8a669f64972c55de7e91014bcd98c WHIRLPOOL 26362654752f75d2c286b89f05455f8884bb36b39d3c1bd384ed96d72022bd92b229f098e6c4cbd02a816216ccaeb9c5dba34944f5848b0dcde951eb10df1180
@@ -14,24 +11,7 @@ DIST cherokee-1.2.103.zip 5783906 SHA256 0e125cba2ad2d0dc48ecca3af4894b92ec5fab4
 DIST cherokee-1.2.104.zip 6200164 SHA256 1acc80de22ed0aa4a0d95aa643ac92a2cce435480258081213214bec05da4098 SHA512 9c9f44643d0d2636f2e3e61ef8e2918d91d9bb6099be761826c8ffad01d339739ed40984d01151044c2e536d4754b5157d6d20c37627ce49eecdb404a716cd9d WHIRLPOOL b0c13205014daee461538d0b7968bf255fd6633dbf3defeb2505ce463772c6f56b06ef91ff6b055bd589a15d19974d794fcbe039c1552b04a6bd1228a690f417
 DIST cherokee-ctk-master.zip 415092 SHA256 dede313f1d396f1deaf78d9fd9a1270820d2e91761efe827a207b46061f27993 SHA512 c933f15aa7197f5001b3120fd27898b2e97b78998e0bd0d68e7ced16a57950b7e85e4d731ca0420cd8a0fb292b4cd34b9497928183ccca22c9aa3a16285f9ef7 WHIRLPOOL 92453d3478ae238e5d9422fc2e8f0f1406576f9753ba0ed644ae8e093862b72c8c634bdaaeec4c0f725bdef8f4bc5c7113a916c2cdd8fbb0a14db61e54173c57
 EBUILD cherokee-1.2.101-r3.ebuild 5200 SHA256 cf6eea7ad0bdaa145bfab7bded3454a5bc77655b2d17a0732fe2d465a5ef709c SHA512 8546fee2e6be121f87845eb578da52debf233ac9482df96e2daa5433befc32849b253ad8386f22e4687f6ed43edde80d1dc62cb42ef627588b0b2e42d854e2e0 WHIRLPOOL 01ba897dc0cecff55144a42a25f2da7a552b7cb317f5925313ae43f4390741bef6e34ead33cf595b2bf455eb83ae2db0bb17b9d9833c50955b0732838419064c
-EBUILD cherokee-1.2.103-r2.ebuild 5151 SHA256 7b11263d7a591bd0a98845bbf308bb9cf4fcea5fae8f9789b100b881c705a9e7 SHA512 74f90c96d038b27ffe3bed035f6b0a408a361f2acc539573e6f05d2aac1a6a721c2a3d1b18c94082d1eb8e20a4fe53ed3d60f02de47a7e6453c8dc1ab7e11c83 WHIRLPOOL e4dc04929471db3c5a0716c2af8d582809f45f8831ddb75e48b4114074ae716b508f898c5ddac1896308d2afa50ee064f7c98171bc1bd0b4ff56ecfce1574c72
-EBUILD cherokee-1.2.104.ebuild 4951 SHA256 e046c7dbb10afc02cffa393bc6c9dd30c5e5d1c50b27b59da051f3b512fcf272 SHA512 93dd83b60d1421b33bc329d3d235225c779650965a25112e1e63fa94a693566cd0aa9f8ea7948781ee1bfd96db987374a37cf5fc00cc48d4ac0ccb45568fa36e WHIRLPOOL fd7a3e32b2aac567423bb5ff7cf04df60a1b11fcd475b8d489985e7e6078e2260e51099cca6a04ff3f65e3d6b23b1881eeb8ba5b13760f5184b31ed26b2da1bb
-MISC ChangeLog 23891 SHA256 9c0d6d50fedc7cc301382a19624272eb3273c0e53a6bc7bdbdab27725e2ce24e SHA512 1e631f8c655cf598d9bf26de398e2a64b788ced54946d2749635279b5040f897082a2c93e49c3b207d16152f0c65ba7b67a0cefeb8cf4d98d98f786b2778209e WHIRLPOOL 7182ead46b20f4a7a8c54283c7c1073c6b0eb4b23b7e2aa8e44f00c43305e71b14f7ae1a1809543e9f2802eed34fac97417861cb410c8165ac6909b6c5a7cb29
+EBUILD cherokee-1.2.103-r2.ebuild 5136 SHA256 d996c806a25f5f6c075c189e07b90cd6c13756b380fc80fc7d897a5c5e35691b SHA512 6e0505666b28f4470097f12d892b2dda3cf151bb92d31b79b191f084b75f33df4f424eebfdaee049cb58673d3bbe3c1ef3e89bd47ebaa115eb254484a5ef78ff WHIRLPOOL d9c67e7130ba2e94b9b080dcac6f7ee0083eaabad07ee842c73016290e3929928d2787cc3584b3870f3feb45804bbb8eb2d81a38095bc40a3662598d26a3aa53
+EBUILD cherokee-1.2.104.ebuild 4934 SHA256 acc894be6a2ede8c973c6a02e7646c308a16f1281ba5d012ac31dad329ae26e3 SHA512 8c9e44761bae6cbd4255b41080401233ce958b77d85a32ca4aab3f0ba99c35946aef259b87612e360c01deb5ba095654cfec62daa0e3abbe6beab668257a8894 WHIRLPOOL 0b6078c53630c9114aacfe9c932ea7ab5e70e9363edd9f2870edabb2cae8bfca4e0f680fbfa6f1e41dd6fc20d68f97e66762fc56a820bf69da13d777cece0407
+MISC ChangeLog 24021 SHA256 cd5ccae1c935501eba984a65a212eb8bf4ffb984698b2c1d654a1c67af410239 SHA512 28dfd4006e000b3fb9e6df57f03593a9b531aaf44faed03c1851106369c0b9a21ff8a49bfef0b68b99edfa4f838a8119b2e45a6ec86423e48a93173867448d57 WHIRLPOOL f68f2787c9d8ba686b832c9883b4e2d24f79a019bc58c168f73b13b522b0911aedc4d0b299b9ae02c573268f4f178887d2a6b1d3cc39814ce9fb128fee5e76a6
 MISC metadata.xml 440 SHA256 21e70301f21aa69d90ebede277859fcbdd5194528b4ff186610d0143408a0949 SHA512 74b1ea827c31205fe666c6be1475959857148eec167754f11dcccb5098daf3d64ad950793983d7920ea26fd8ac864c7da606c37ecff9841b714ba7b9ad24516d WHIRLPOOL 370deef54eaeaceec348852489cea16e24d9aa472bbbaf93ac18e6c08d160492e108145bfa8ef59636c85e0c2d3a1bd191a0e371ac2e66615fc3d9c34544d547
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJU+yu1AAoJEJOE+m71LUu6n6gQAIxnCsqc2rNugDEBncHPmnKu
-A3Mt0mamItGJc/My2gRZGfSMi7jEm2BjAR8K9Q92BH69Q9UDHlfKR86RzR6iolL/
-e1o24/IeutUC6UkuALWjyUSHBRM4J46fJRUjOuO55fZV45ZbZmLOnAEYfriO/cfv
-xSXPssg9vLLwirH4TgG8cXXod6PeslAwJ/GeXY48wftve9HlJUnlnUU1hybk7uhb
-3GPD4pr2KzaI5P5L0+CFELpxq5lE+TFvveAhfuzjs8KfJuAF2QVWri9P0bMqK0Uo
-9fS3OrDA/MC/1bm9ZcLdWMts6CwJK5crervRJJ3Ip4zkD4HDPxpGXbooE2D5SKVe
-+TtGC8esJ1j6vEu9sOSrfAttcrPSEajHXJayM4BydGkbLDDNAr1HTeLrRwf/9Iim
-2D2MFaqLqgNXDxanMoOpQSRqDYwXLxsoABZ8pUvsP490fTMweJmJWlIY/jK/hohS
-sX0pY2TlNNPG7HANkIyrb9oFk6HiJlAok0z0vkh6NI05THQQgnpvnvyaRT7WvzHG
-gRu+kAWxmICPHXrWi8O5Dwtlq8SopMLMBYarKbv57QG4OvJws/Y8RcvvMcxmnhx0
-KRTRdyti6BZfnSiwgJ2uR2Y1B8qDmvrUda+ocPTgCR+axdCZw32nbpjUDuG51KcA
-fp8LDClNK/BEMonKOM09
-=bV2O
------END PGP SIGNATURE-----
diff --git a/www-servers/cherokee/cherokee-1.2.103-r2.ebuild b/www-servers/cherokee/cherokee-1.2.103-r2.ebuild
index bdc5d20ed1a1..dfe9a3a9e49a 100644
--- a/www-servers/cherokee/cherokee-1.2.103-r2.ebuild
+++ b/www-servers/cherokee/cherokee-1.2.103-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.2.103-r2.ebuild,v 1.2 2014/08/10 20:08:32 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.2.103-r2.ebuild,v 1.3 2015/03/07 17:29:35 blueness Exp $
 
 EAPI="5"
 
@@ -70,7 +70,7 @@ src_configure() {
 	if use admin ; then
 		myconf="${myconf} --enable-admin --with-python=/usr/bin/python"
 	else
-		myconf="${myconf} --disable-admin --without-python"
+		myconf="${myconf} --disable-admin"
 	fi
 
 	# Uses autodetect because --with-php requires path to php-{fpm,cgi}.
diff --git a/www-servers/cherokee/cherokee-1.2.104.ebuild b/www-servers/cherokee/cherokee-1.2.104.ebuild
index 984727a35219..e89099713146 100644
--- a/www-servers/cherokee/cherokee-1.2.104.ebuild
+++ b/www-servers/cherokee/cherokee-1.2.104.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.2.104.ebuild,v 1.1 2015/03/07 16:45:29 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.2.104.ebuild,v 1.2 2015/03/07 17:29:35 blueness Exp $
 
 EAPI="5"
 
@@ -66,7 +66,7 @@ src_configure() {
 	if use admin ; then
 		myconf="${myconf} --enable-admin --with-python=/usr/bin/python"
 	else
-		myconf="${myconf} --disable-admin --without-python"
+		myconf="${myconf} --disable-admin"
 	fi
 
 	# Uses autodetect because --with-php requires path to php-{fpm,cgi}.