Remove sandbox workaround.

Package-Manager: portage-2.2.0_alpha169/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 11 insertions, 36 deletions

diff --git a/dev-python/requests/ChangeLog b/dev-python/requests/ChangeLog
index 157ed0bab5d5..cd0f50b83b7d 100644
--- a/dev-python/requests/ChangeLog
+++ b/dev-python/requests/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/requests
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/ChangeLog,v 1.32 2013/01/11 18:13:15 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/ChangeLog,v 1.33 2013/03/24 01:45:45 floppym Exp $
+
+  24 Mar 2013; Mike Gilbert <floppym@gentoo.org>
+  -files/requests-1.1.0-workaround-sandbox-bug.patch, requests-1.1.0.ebuild:
+  Remove sandbox workaround.
 
   11 Jan 2013; Tim Harder <radhermit@gentoo.org> requests-1.1.0.ebuild,
   +files/requests-1.1.0-workaround-sandbox-bug.patch:
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 4696b73d7381..5b7862127bdd 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -8,7 +8,6 @@ AUX requests-0.14.1-system-libs.patch 3118 SHA256 4627bf7611e7758397308e1a89e3db
 AUX requests-1.0.4-system-libs.patch 2283 SHA256 ecccda46907b13fca1080ce89c19a6db418c0f3b0b221dc35091d2a8e8ad42f2 SHA512 922b6e01e5dbfe508dc1fc0a6f62d41634b6e01f52b9244dc80892e972c861a5c107b33e5a3744ab10919f98dd604334220bb2e033728e405d4d4ce9547caaf5 WHIRLPOOL 263bbb58feb713deb473d61b2aa9833c09f951922d9d42314e779ac7ef9d12ec49f3a2016029eedd30f60f5965602d4ad52f5acd86a4cea0dc45c0b669cb8eaf
 AUX requests-1.1.0-system-cacerts.patch 388 SHA256 51159bb886ee91ba5de425cdf0362e55a177afa7574f03c55967469c369beb1d SHA512 6356a6dd7b4dd21ad90fefa2c0ed7de6449389cae5e12ca308dab29f6a84944d6075937499ef26721fa9e0b66bd2852f60039e087e5662f97bf3bc0d0b4cca2b WHIRLPOOL c544bb923c429076a6680cafd61da96f07d2b373af5194d1cc93a1edac48364b0be0c0b9bb8d9dc66ff2410151d68d64bbdaa7dd966d6ac61882e50b0f78668e
 AUX requests-1.1.0-system-libs.patch 498 SHA256 0e379ff9a6047b31638f0e57d30ae988476fe375a8a4378763e9058481b078b8 SHA512 5472bf1b349ea0097700034a465e612b8a8a81af328891b622db861845a1ab2521d78d76d6c8a003ae55b85d426c7e6cdd1afc1c9bf7c49a1847b69d3cbdc8b0 WHIRLPOOL c98ab35b8d1c1dab4e2fa7e272567aecfdc8923da063b34303b8b8143dcb26534f7d30eda881a70a7488f22afcf82be1057adfb25044cf3caf7bb94a71d104f2
-AUX requests-1.1.0-workaround-sandbox-bug.patch 648 SHA256 b2acce063acccfb724403483a72c15becb62e9fd1ff0c4823ee401147f8ef464 SHA512 e76cd528ff5497456174fe6ee8f755510ff6831138aabd5163c4444c393048e6963194a61218957afd6ea73c9cf6dc20af27300316f3c1861c588cec84a77472 WHIRLPOOL c10b90bcb5e373a671f088876ec1cd7b71ba775416de34bd91755c24c7a8d922843d41ed911d2c25db3eaa637c2b4fee6433cbce2fe50aa141455ca254a53ff9
 DIST requests-0.13.1.tar.gz 68474 SHA256 31f3ae96787fe74a78c7dd9626bf997fd4eabacc040b7b33fbd8632d2c2a97f6 SHA512 97472d56a2da10216e735b575610d9aa7f97f1d4705fb20e72a79f520090dec59b91d5b5059e9966bc2fd05982b6b8f3e2a1c794e9cf9042713ae8d481162df8 WHIRLPOOL f50251d2d71262118f208da14c4f3067ff904893416e22a8b3cbc1817d53709efef79e23a6c05b63b497f0cd105f1e106fa8eb751a4cd78d4733be027a663966
 DIST requests-0.14.2.tar.gz 361488 SHA256 0e3345a8ac0d712bf17bd9d3276415050c5f972265ab62993cd4540a3a1aaaef SHA512 d791f68b2fdc46ad6abaf2bcd49a038a335fddb476f89c6b7023370c716f0165a8ad09e8d0d1f3d145255d604c2d10f810e4090facd2381515b43f2306ca0365 WHIRLPOOL ed71a4a4db8279e1587d32dfb3dc2c219a87267e484bf23915db158c8843eea4d396d439e12919c29cb37677bb0b2615c87cabbd602a7de25a0273aca302c6ba
 DIST requests-1.0.4.tar.gz 336280 SHA256 f363690a47dd4d6d6e7605fc686b668097a114cd946dffdf21fe0c6a6a46f9e6 SHA512 90adf87f46a65eca0fc539a56eeda38f40c4b5743091eaaf5829de5c50c67d6bfa28a8e548a0e12cc3d38bf2af65d2b23096659438bb4fde2742fb0db70960c9 WHIRLPOOL 3effdd4c971daf2ccf7d8dd1613dd43e4684cfa14a931d3ffdbd040e471df00350ae7e39766389a0eda20fbe73dab5625271b1aad20936ee933e127d17d0054e
@@ -16,17 +15,13 @@ DIST requests-1.1.0.tar.gz 337229 SHA256 21a81ddf1a3c2f956524538966ae19c38cae251
 EBUILD requests-0.13.1.ebuild 929 SHA256 2142584f7fa5de965950846c32a8e233935af2bf3ef15cd9ddaf3536f027925b SHA512 e05e8a54c0e4bed7e6c40d0b6fb3738e5b01cdebedba3260cb4bf4b91e467f860ce2c2a77f0fd888d4cfffa46fb7f901c01e55fb53e4bd7470bf7ce1820fbf4a WHIRLPOOL c5fe749d6c1f97ab40e5b918d35143abb97d78b2892d92f06b792cf2ed0f2e379965d3fe4ac0e9c36b5f59bdbee7cf41b64f6072fc95e8c95d63958fd180bc24
 EBUILD requests-0.14.2.ebuild 1458 SHA256 ea85de3f5ce68574ba9db938951956c7d6d4b880234020eec80a68a386e76d7a SHA512 248f9be799422649b0ce06c3ea3414ceef73722d095e118672d24f9a6090c5b2ddab4be10db1fb71f417a8b2f2096458f8fbefbdd2249df9c67f8f70512c62ec WHIRLPOOL 7aa3b26ff4fdbacf141e28c4e9394a3dadba13deb1dca49d1f1b49090c4d64cbf59aa165aa88d92729eebfa87fd7752071f11715a2939a457c00bffcc72943ae
 EBUILD requests-1.0.4.ebuild 1114 SHA256 4e7e1a66805a44c4880ff626e1491efcadc32c518a8d6fc0d5ac6da14bcd1bfb SHA512 d9587b67e6b13b723cc872ca63dba3221e6e45828cb87b34e8db0c262a7ad3098b0541b85267990292d4887385debed8bfc133d32de40087ac119eb1b95bbc3c WHIRLPOOL 5ca29229f9383fe14eb4fda4109f11c0dc0d9ffe0a1f1671549bcbd28d35a17d8697995779e90a4de6857e4395a66f855463a4438ef92830aff79b33496aecf4
-EBUILD requests-1.1.0.ebuild 1148 SHA256 4452077a43c22d77b06f307f80b306105b515f6b96fe82a6b262cc80dc170559 SHA512 8d775403a729c52115ad584a68e2bcfa8e49b02825906193ff0adfd984a4b5affc67c91ecf9c3fc8261924233f127bd6e609cb5102e0457f598c1bf75a213f75 WHIRLPOOL 1aa1e92360389543fc5f32a8d3ae5215a501fbd9ff18707590934a1670faf701b0a2bc9b69ab9eb97bccb50a401b80625fa140219b92da627de73636a8ebccd8
-MISC ChangeLog 5520 SHA256 7781efca2320a823cf178c794ab7597b52966e7fef1daf20c8eaccd1e10110b7 SHA512 40691b1c5957d514a5ec42fdeb2f93bc415df073166f51914f53d13b9cea756de287c1c7729cfeb6c1e8c502950908aa0344ed5572c29d763f131c8d3bf85022 WHIRLPOOL 1ede0e54577dd52139ac3cb14bfa635ed887569d07b9728adff0e4bae5de66275f130f3ec151f680cf430dc154a2738e9e2c1bfd6918877d6ff7c2c7bfd1bf94
+EBUILD requests-1.1.0.ebuild 1097 SHA256 e3ebf195beeaa553674043ee55aeea9a01a03a684d9301735cc863f0e25b1b9c SHA512 91dfb82d5085c25e75a5d75eadaad5df30f7e7955afd2d67ee939c00b7758fa5acdf1a7c15f9f50a0ea80a6fdb8a9d055a1af853ebed85cf11a64a96b49869fb WHIRLPOOL 97bb7de80932374e74f0c54ce848fed2c5882cdde501db9bf6e1fa610f79f9f6bf7bae8654a99cb8d1c4e5cc2ce04c926debaef8d9a852bb4fdd93b290741877
+MISC ChangeLog 5674 SHA256 513d5902e1d67b4832fb91946e55c7e6519502879f9a4d12385242b1e94cde9f SHA512 971f6320dde1fd4d8dfd4bebbb88f3616928b676a83611e6ede4bcb164462034eed10bde1d57cca9b30ad36a9378ea586313be9f8241d047fb6133387792bfed WHIRLPOOL 5f07ac4b1bd638a97db07abe732c9569586af35242968466f92e4add06e99797b67ddb2aab208966557e963e28adb4c011dbe11d4155733942011f45afdbb3b7
 MISC metadata.xml 231 SHA256 7bbca8901dd0afb4da18f659567071156f1efea52100213d20d43e53721a0ff9 SHA512 dce3df6bc1c4fc9517e39c41e0c904f39fd092cd63024f03ee5c15aef5b4840dfb265ebe565a5e5a8da9a8805d58b3ec3f772429bf00b125c3172f2f79e089bb WHIRLPOOL 2f6573a3f74f88a549a3344deeea5cdd4f27a310b59d466684902f009c7b404c0557f26f416b450f1f7bdce133c3d52897c5169fce01707233630ddfa783d9c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ8FY+AAoJEEqz6FtPBkyjw+YH/0meolb4WZtUGDFGVZXfiKMU
-EoVBiSs6gtZxARGDa0aoNwUgVqXl56Q9Ux13hNJv3QU4iVPk39sjjq48VMfsShbi
-F3zLJ7pvkCWxGDZJzppxXJPKnpbqkyNoaMvxQiMjOiQEIJpI2v6grorXf+Vl9xqW
-HcGBCof5d/pE8hjM8ep5v6MR5m6bJlXBUvv8S4lagT0M4DAimA+Oni0qczeJVRF1
-FhyOhEZQV2cXnfZoTVW8Ut21FEuwTNqfay8O/awLBpr4/w7bPqr6s3I7mBNahrsN
-wYc8Bc51d7KGrBblad9801P5P4ux9dYWWCHGZIk4hRDbtSgAV7zUDVRwz/36r2M=
-=4aa7
+iF4EAREIAAYFAlFOWssACgkQC77qH+pIQ6TNEQD8DeXVcG4ngL1J3GhFu4C1wTsk
+w3PWIEsO7GJcYLtIvpEA/j1qH27+5s8LzqLbKMZtoBOzZhUXbfX54G4DbHWPcTRp
+=rsMz
 -----END PGP SIGNATURE-----
diff --git a/dev-python/requests/files/requests-1.1.0-workaround-sandbox-bug.patch b/dev-python/requests/files/requests-1.1.0-workaround-sandbox-bug.patch
deleted file mode 100644
index d8d895a67025..000000000000
--- a/dev-python/requests/files/requests-1.1.0-workaround-sandbox-bug.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/requests/packages/urllib3/filepost.py b/requests/packages/urllib3/filepost.py
-index 8d900bd..5febf44 100644
---- a/requests/packages/urllib3/filepost.py
-+++ b/requests/packages/urllib3/filepost.py
-@@ -7,7 +7,17 @@
- import codecs
- import mimetypes
- 
--from uuid import uuid4
-+from os import getenv
-+from sys import hexversion
-+
-+# this is needed to work around Gentoo bug #364877
-+if hexversion >= 0x03030000 and getenv('SANDBOX_ON') == '1':
-+    from unittest.mock import patch
-+    with patch('subprocess.Popen'):
-+        from uuid import uuid4
-+else:
-+    from uuid import uuid4
-+
- from io import BytesIO
- 
- from .packages import six
diff --git a/dev-python/requests/requests-1.1.0.ebuild b/dev-python/requests/requests-1.1.0.ebuild
index dbdd89c876e5..baa2469dbe01 100644
--- a/dev-python/requests/requests-1.1.0.ebuild
+++ b/dev-python/requests/requests-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-1.1.0.ebuild,v 1.2 2013/01/11 18:13:15 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-1.1.0.ebuild,v 1.3 2013/03/24 01:45:45 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
@@ -29,7 +29,6 @@ RESTRICT="test"
 PATCHES=(
 	"${FILESDIR}"/${P}-system-cacerts.patch
 	"${FILESDIR}"/${P}-system-libs.patch
-	"${FILESDIR}"/${P}-workaround-sandbox-bug.patch
 )
 
 DOCS=( README.rst HISTORY.rst )