fixing requets deps for bug 550102

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x33ED3FD25AFC78BA

6 files changed, 33 insertions, 30 deletions

diff --git a/app-admin/glance/ChangeLog b/app-admin/glance/ChangeLog
index 493bf4c80231..f3ecf16ff8a2 100644
--- a/app-admin/glance/ChangeLog
+++ b/app-admin/glance/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/glance
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.69 2015/05/04 15:55:00 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.70 2015/05/22 06:08:33 prometheanfire Exp $
+
+  22 May 2015; Matthew Thode <prometheanfire@gentoo.org> glance-2014.2.3.ebuild,
+  glance-2014.2.9999.ebuild, glance-2015.1.0.ebuild, glance-2015.1.9999.ebuild:
+  fixing requests deps
 
   04 May 2015; Matthew Thode <prometheanfire@gentoo.org> glance-2015.1.0.ebuild,
   glance-2015.1.9999.ebuild:
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index 3ca4c9508322..a7d9e82d2f9c 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -7,26 +7,25 @@ AUX glance.confd 25 SHA256 5a53dcf1eece81a06a2dd0856b15f8abe20eb1072361b110f752e
 AUX glance.initd 651 SHA256 1b2fc0e11d572bfcc121cb995ea7b3cce63ee705a05d2fb34a9f99d655546553 SHA512 c0ed1cac2038dda8882d5ce013b948debf1e5e411a062d8c9cbfdb1e1683c94bfd78a3f3468de63e0cc28930c59c0ff323a3116ce6a74ccf5d8ad1d547805bad WHIRLPOOL b0b25f4e983bf9f46cb9dd5872d14b24dc90e3c383dc458c79d065e0855bbf838afc4a13f0c92db640cd64311e22985d0b92e1ca4d428ce8b1f08ff23b89cecf
 DIST glance-2014.2.3.tar.gz 783651 SHA256 e0c4eda2ec6a38a11129b45f6776dc32a763b1e234f0834d36d108690ce85be4 SHA512 c7e0365fec7553a12b3f326f3f7fe69323bc9c20653aa6a972226ffee48cd54f4850cb3ee591b78f6932c6f2808cc260b7bc336cdb2f0a80852a05bf56dd717a WHIRLPOOL 96d1e7e5fc5061b0b87bfeb5371788d79c860d69ae638d61a616f74e930492b4c6dfe2206d427462cffb4c537f6ba99ac8d4bd81907cebc400084918e8500efa
 DIST glance-2015.1.0.tar.gz 1100719 SHA256 0d8be9f28b1686de3d0d1037498eaaf717d39ad9fa85d2a07016131fff470009 SHA512 04f99eaf1043291eb5622c069d2a15d344d7d508740d7b738fce36e1373ec0df26172077b3bdf9f23cd8234d74a34995e3d66ac120430ff17017fe788eb3e9d6 WHIRLPOOL 862b2d89801f3a750434d50fafd75b8f22d031532910b7f63d6b8ca00546a19fa5a07dea1c286e4f5fea9b11614a4c25750a4b2ca5c429a03984a2972f681b40
-EBUILD glance-2014.2.3.ebuild 6038 SHA256 e7ee0d58799a7aa1693dfeb1fef22fde87472ffd9c52971b54b760aa75f5cf4e SHA512 9a8728458833616bea0b31004e2ffc4492837b92972b72d4d4b766def8c892f13c3be5b6ab6a89edf6500604f3899cb34eca3faf07a93b0bf34694b4cc754ebc WHIRLPOOL e128f5beb5143134645bbbd8b54dde48ae3f46ed6e320d7f44157dbc72e5e2c4a9f428dcf6646a3cfb75109be1f43fb58e9eefedea56271f01f8e2c8c18cfef5
-EBUILD glance-2014.2.9999.ebuild 6048 SHA256 a3967e4b9f55d8a6d656bdaa811fca1c56005795598ef4d190e49ef3ecff5359 SHA512 50a27b93d296528974a41c11db2b948d66aab8aa5d4c9cf2480eca5632f67efeb666341b6416d166300e6b76ab380956d51a931011d4ee6d04277b88e976f9a0 WHIRLPOOL 5757379469b4104a5d31453702c7aff0ea5bde32de446114d89fce09bdda971636b195a0ee953615dbd31b137f68c1d7464855f6bf2f73d2564d40e2156c14d9
-EBUILD glance-2015.1.0.ebuild 6612 SHA256 2003dbc6da7cd559a460c7dec6df780a8a6b2cc58b0fd5f76e8d9aaec2169472 SHA512 97eddc58b6125bdf9988addd0003853b6538e789be3126f108a1d427a7241cd647e18884515390abfb50d0b4b6540d2c9ba201e95b1fca4e0702d24bf75fa5cd WHIRLPOOL 3138ae97d7c0ae4db151b8eb1455071a3f994d7b765d6eef6dc94463c04f4dc32dd8aeef510186eb20c5f5a219839d17aacbfc1854ade34c3587f9d87ab716bc
-EBUILD glance-2015.1.9999.ebuild 6622 SHA256 e0b4fb82ec6fda0989a61ca77e1a91f5149f7cab07cd443688c0e75e2f60abe4 SHA512 dcee5ad3ae03d49695c7ad31a7c18b35c3b36757f42f3bc1313bc12761f07bda74fbf0de0cb86285a9e9af730db8b1f9697abe4033f04575993ca63d12d755e0 WHIRLPOOL 6af92086877fd58f24d3f9a75d960a54c048d752a7e6f794b1d4c2d0ec2310ea47e525e9e3fd8eb4fb1a57b1aca95cd87f05374e241f51581c613637b776b0e0
-MISC ChangeLog 13735 SHA256 b7af6d0af0e343f36684ba498735b459229a86cfcac12dcbb7634aeb5fc00ea4 SHA512 bc5230e3d13ea69d601931632d59aa0abf25cf580542b2e6ca4502424e969e64fe5ad348beeaf066983b54db8976dc378f56eb9e031f9b89e702c8579e5d1ad6 WHIRLPOOL 25b37346d79a87b9db8f117f57c17ea9d52cdadecac70a920e2350e4c9fbb8161e9f258f64f053f005d0de8e763bfd79954afc3281be7fc591aeb5b369cd9272
+EBUILD glance-2014.2.3.ebuild 6039 SHA256 f24748da45ad30a8ae2476580de57211a6cfd3b3ec61131747db520d985eacec SHA512 a3a0331cd798bebdd268084700569823d1c15e7128a5ba3f512b642fe8f95c6abc553aaaf65a4dfe3b160109b09dd8c0ce1673a3992691600a2f2706530befa0 WHIRLPOOL b598821a118da0159ec0c5b8644e71d609902b1725011c9024412d7f20e5257639992f6641dd3440f645777749c53bc1bd8076abd791140d1cbc3e30750e3973
+EBUILD glance-2014.2.9999.ebuild 6050 SHA256 4d635412e9e750e9746d976b2ae7f678b4ec364a9485a54d461faefc3255b297 SHA512 cfa163e1ab038507021c72d73a3a9a6fae11a54cf1d52799b3696fd437848b83a934f1760efb2a1143484fa53c295818648b5a664a471bd546eb5be2ffda3577 WHIRLPOOL 6149a9f2070d9ad8d82f7044ee1e5b7c5456a707ff279cb1cb50da39aed4eb6c3a3b2a6fb56797bdf03baf28ef335fb15352c76f6194c369101e45a005976217
+EBUILD glance-2015.1.0.ebuild 6613 SHA256 1395563532bde37c07d946c815939f36d15511c4d49f55fe700250f238255b89 SHA512 04720b02aad43228507ea9a436b141eace4b6a4bf4d375c619e53e9bd8aa44701609b317ee8f67d8a20813fe64d6e938ac4e0b201328bc365c2f1c6c67b538e3 WHIRLPOOL 7629c82a821eede4c4a567eb7b5fb53c59599318123aa814a16bc6a42cbb89af1a84bdb28e673cbeb90b32ccddd31933672c1160e9a7e09ab49e9e68138a6517
+EBUILD glance-2015.1.9999.ebuild 6623 SHA256 6a1a2199bd94ed97dab93cbe4043bad04e2cb6d5f9e4b7175641b8bbddb053c3 SHA512 28311194982c85dd14f2ebc4a90c53dd1fc2840c061439e7bded0eba1ccad66c449a1838d52adc481714be282f3b6b66954b3131e263e4a4c97c976a4223a420 WHIRLPOOL df1d27ec0579fc20773f3bdd223fb3efbf4a78af5f1395db983775c0fed668670fa8276ba98fbcac9ac530f98d11898683e0eebda315e03427a4196d92cba6b9
+MISC ChangeLog 13920 SHA256 8516f448b9fc7afd705681a29faa170bc607d072345e0cf370317b2357cb9f47 SHA512 2770dc175f34e7e1e6951c212fe88007a6619721a0da654cd9c7ef4cfd8e1edd9f0b80383652de55c8f3bb3696ca9aee1660d8ec4cb6cfe1672011998737f76c WHIRLPOOL 70f7ac17f5d9a73ed23a5ade886ecc96aa533169dd38eae1cc39691ad5a4fb7afd9f1807fb36be46e65581c87965acde3c248a063db30cceae174b1e662ec797
 MISC metadata.xml 607 SHA256 b74d960c096528dbb7c9be6b0da777e10abe32928459f045e7c58b0156e22d95 SHA512 e38e4dd740fe55d73d6d97fd9ffa3aec5466fbb5f8e6484b125560313245ae697a0dcf612fb065125c6737a8254b6218c0703f7de79437bb2799c6c67f386e45 WHIRLPOOL 445bf712fd733fa90c395cc24fd02155bed15b092713d502b54331da9237f397877c2328adbf4049ee64ae163713ce031ebe5048c8826ed1a011d4ebcdbb681d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVR5ZvAAoJEGSje+quGaToNEcP/AzG8a7EIRjguL7uzfH/quF2
-6a2CuTla2xFrbpLptkLgf8/7eTIx9mZ41SWsB/M/yGrDd1cJsb7/UPM9VqF9+jDx
-kEA/wGEJUkrBcH+5qhpWzfE6T+iQ97QhzSAwOe4+5TWANUgoh6zKvYZWE8cb9/uW
-l2rOZgCF7WOxROrY2ST1UxHOmldbKHUcpH4pfN3Vt/izXLTI7cmIzNnZDTmJ/rY/
-0tc2LBNPy4Qn3xXz6qPLS+32aXHbs2lsOlfOEbNV4H1echR2Eic6vV91T4VGyVb1
-C8/+0fnp1UDFWK564R0gi2F68zF6Uj5VXn0H4mJFqjYOKgrYbmEQ8NBR3rUHKMCP
-6S5RXiVgDlh9PByfT98hdvibNBo5AJZFK6pcukYDwt1cJNAfZClTq8RjUCUZY7zG
-vfUgjAGbzOjTLIplIIKUTZ3Nn1bbyVArvkC6aPMo8Ru+AeeoFjbKrdwW1hAaIHCt
-I7p26VinNefW8JVneVslpzAQFg6tlHXLayqUBPGLXDCIY7ZX8q03IR4PSWaGY4l/
-kVYcjXBbNxzNGwbEz/bVDvBQoRz0uGY0o5xJf8ifChxeCuMhmszOfP0+cdfsrTfy
-Int530s2J/ahgvJdrdrFfocLq0J6Cu29cZ49/ExVEUsDVjs3kbC0Du1RBJJcPGz+
-cqNb+99zaqwl8IZ4HkpQ
-=XY8P
+iQIcBAEBCAAGBQJVXsfuAAoJEGSje+quGaTocI4P/AinlrjIFmciAJhCuJ8QgG7b
+fCcl8dKKI7kv0lGmU03GnHr5b4ZGt/Lqi8klOVhzXxfBHpfT9YNDspAt2qKnlCxh
+6OZBq5IhpfgYt6tLM58YlUNnwcytX6LGNH+c9L+jzZX8XhwPDsF7j/qjX6VEkmSz
+ZfV5QFdaa/yyHf/JKXM/cUMlcuek4tJPzIBSzXCQur6AUCizJYQRuYmTEtdAyDUQ
+qtquEFZ/VqJgDHwDfR75UNVZG/vq9s/83hbC3G9yXylN2240TzC3REB2cohYrB/t
+73nMJxPZ0DjIlUrvhipMlbPkKTdL6MfXtomUejkuCCkTQdxcfWpKXHA6dqjGR/G+
+0JQlo3OJmM+klK0oTeo8kcWLw/mRETIwOqZVPGCvV4ZoV5u8sIwtWGKTwJkm9UEi
+huEfnx2Zm1bmwzwBCKfHjK8F93oIHgpw+WODkCSj4zvVYad7s7Ezu93ylByZAvLi
+/ZiwNYbRla4MiKMoNFyB+BvG/SBsQ17HKoD7nwP4+Zy5fymtByWsoCgWox2HdIWc
+OT/zfpMP0T0E2XmCCMH066v3jkVYuEkqknUxm7dGw+F3UJpdgx+ABWuMgY44vMPU
+wAZlYV4OvzuZxOpW+3XClrrOwr6MJjcqQf0YuKXhLfejGGxoQEYmgul0qDFhlff6
+cilRcATwn4s6y66kJRch
+=Lw00
 -----END PGP SIGNATURE-----
diff --git a/app-admin/glance/glance-2014.2.3.ebuild b/app-admin/glance/glance-2014.2.3.ebuild
index dd602a50674f..cfed4605b2de 100644
--- a/app-admin/glance/glance-2014.2.3.ebuild
+++ b/app-admin/glance/glance-2014.2.3.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/app-admin/glance/glance-2014.2.3.ebuild,v 1.3 2015/04/13 03:02:24 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2014.2.3.ebuild,v 1.4 2015/05/22 06:08:33 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -38,7 +38,7 @@ DEPEND="
 			!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
 			<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
 			>=dev-python/requests-2.1.0[${PYTHON_USEDEP}]
-			<dev-python/requests-2.4.0[${PYTHON_USEDEP}]
+			!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
 			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
 		  <dev-python/testrepository-0.0.21[${PYTHON_USEDEP}]
 		  >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
diff --git a/app-admin/glance/glance-2014.2.9999.ebuild b/app-admin/glance/glance-2014.2.9999.ebuild
index 14f9b96f86d7..6c68bba0385a 100644
--- a/app-admin/glance/glance-2014.2.9999.ebuild
+++ b/app-admin/glance/glance-2014.2.9999.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/app-admin/glance/glance-2014.2.9999.ebuild,v 1.9 2015/04/13 03:02:24 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2014.2.9999.ebuild,v 1.10 2015/05/22 06:08:33 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -39,7 +39,7 @@ DEPEND="
 			!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
 			<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
 			>=dev-python/requests-2.1.0[${PYTHON_USEDEP}]
-			<dev-python/requests-2.4.0[${PYTHON_USEDEP}]
+			!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
 			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
 		  <dev-python/testrepository-0.0.21[${PYTHON_USEDEP}]
 		  >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
diff --git a/app-admin/glance/glance-2015.1.0.ebuild b/app-admin/glance/glance-2015.1.0.ebuild
index e26ef69c3779..a0d172c2fbf6 100644
--- a/app-admin/glance/glance-2015.1.0.ebuild
+++ b/app-admin/glance/glance-2015.1.0.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/app-admin/glance/glance-2015.1.0.ebuild,v 1.4 2015/05/04 15:55:00 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2015.1.0.ebuild,v 1.5 2015/05/22 06:08:33 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -33,8 +33,8 @@ DEPEND="
 			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
 			!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
 			<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-			>=dev-python/requests-2.1.0[${PYTHON_USEDEP}]
-			<dev-python/requests-2.4.0[${PYTHON_USEDEP}]
+			>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+			!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
 			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
 			>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
 			!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
diff --git a/app-admin/glance/glance-2015.1.9999.ebuild b/app-admin/glance/glance-2015.1.9999.ebuild
index cd77d4efa4f3..d0f149250302 100644
--- a/app-admin/glance/glance-2015.1.9999.ebuild
+++ b/app-admin/glance/glance-2015.1.9999.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/app-admin/glance/glance-2015.1.9999.ebuild,v 1.3 2015/05/04 15:55:00 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2015.1.9999.ebuild,v 1.4 2015/05/22 06:08:33 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -34,8 +34,8 @@ DEPEND="
 			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
 			!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
 			<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-			>=dev-python/requests-2.1.0[${PYTHON_USEDEP}]
-			<dev-python/requests-2.4.0[${PYTHON_USEDEP}]
+			>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+			!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
 			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
 			>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
 			!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]