Clean up global vars in the ebuild. Sync the -r1 backport to the fresh ebuild. Fix byte-compiling being explicitly disabled by the old version (bug #463574).

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0x9627F456F9DA7643!

4 files changed, 47 insertions, 38 deletions

diff --git a/dev-python/requests/ChangeLog b/dev-python/requests/ChangeLog
index 0f5328efd3d6..6cd4bdfba369 100644
--- a/dev-python/requests/ChangeLog
+++ b/dev-python/requests/ChangeLog
@@ -1,6 +1,11 @@
 # 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.34 2013/03/25 16:43:01 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/ChangeLog,v 1.35 2013/03/28 10:18:18 mgorny Exp $
+
+  28 Mar 2013; Michał Górny <mgorny@gentoo.org> requests-0.14.2-r1.ebuild,
+  requests-1.1.0.ebuild:
+  Clean up global vars in the ebuild. Sync the -r1 backport to the fresh ebuild.
+  Fix byte-compiling being explicitly disabled by the old version (bug #463574).
 
 *requests-0.14.2-r1 (25 Mar 2013)
 
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index ff5e9e3f5357..f216a044bc30 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -13,26 +13,28 @@ DIST requests-0.14.2.tar.gz 361488 SHA256 0e3345a8ac0d712bf17bd9d3276415050c5f97
 DIST requests-1.0.4.tar.gz 336280 SHA256 f363690a47dd4d6d6e7605fc686b668097a114cd946dffdf21fe0c6a6a46f9e6 SHA512 90adf87f46a65eca0fc539a56eeda38f40c4b5743091eaaf5829de5c50c67d6bfa28a8e548a0e12cc3d38bf2af65d2b23096659438bb4fde2742fb0db70960c9 WHIRLPOOL 3effdd4c971daf2ccf7d8dd1613dd43e4684cfa14a931d3ffdbd040e471df00350ae7e39766389a0eda20fbe73dab5625271b1aad20936ee933e127d17d0054e
 DIST requests-1.1.0.tar.gz 337229 SHA256 21a81ddf1a3c2f956524538966ae19c38cae251f5629821588cdc8246a1335f7 SHA512 5ab10ba43d492ab227d88b90c7b6db7840232fd7fe4638642f994e1721576bbcf7276515a918a059edf5ded14456eb57e06b76eec9d7f4b95b5489d498de52d4 WHIRLPOOL d7e26094c58b530afd5ef8a2fb127bc3fa69d73f48fb0f57815993a76626ec5d14aee9056056454fa1deace9b7c3a23642ac4723f4d10b0d77c81ac89307bcd9
 EBUILD requests-0.13.1.ebuild 929 SHA256 2142584f7fa5de965950846c32a8e233935af2bf3ef15cd9ddaf3536f027925b SHA512 e05e8a54c0e4bed7e6c40d0b6fb3738e5b01cdebedba3260cb4bf4b91e467f860ce2c2a77f0fd888d4cfffa46fb7f901c01e55fb53e4bd7470bf7ce1820fbf4a WHIRLPOOL c5fe749d6c1f97ab40e5b918d35143abb97d78b2892d92f06b792cf2ed0f2e379965d3fe4ac0e9c36b5f59bdbee7cf41b64f6072fc95e8c95d63958fd180bc24
-EBUILD requests-0.14.2-r1.ebuild 1399 SHA256 9d8cd7ab4fbc229381900c728f9cb173c990b34c95501e6ca94d16b6f4f69390 SHA512 a1be12c55ceb2e9f2db839c3b005f3edb4978b213903865d213b547086b4964a3a8bb75836b54d88c3f363f986278ce8bf44c89aa3374a3c789a2cda8af8d22f WHIRLPOOL b3cef8f89596f4a2b3cc622f246d255a7bc7433880af63cf2dd556ebbbd5db0735c5a575d0d307654cc3e2fa11dea36283ba4c83c3e9f4e2791f505339035255
+EBUILD requests-0.14.2-r1.ebuild 1471 SHA256 fbc99b24874ca7f775d70df0e92b936e19e607d901219bb5425dfb94cf8aae3f SHA512 2a7f4b4b37cb78bec4d6412f69ef28c29c5a321f7cd6ea9e6c1ac9b84bb75bf236274738b9b05d7b5a3e74be5e52ea8884637288f223d3a1d06979bb9561d611 WHIRLPOOL 9e5f265bcd70ef907a4318e8e2bcfeed750eb42886ad09bb3d76a813acb3804f107d919da15e3744765e364c5a27dbb0eaafb438832101e95a049761f22301b9
 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 1097 SHA256 e3ebf195beeaa553674043ee55aeea9a01a03a684d9301735cc863f0e25b1b9c SHA512 91dfb82d5085c25e75a5d75eadaad5df30f7e7955afd2d67ee939c00b7758fa5acdf1a7c15f9f50a0ea80a6fdb8a9d055a1af853ebed85cf11a64a96b49869fb WHIRLPOOL 97bb7de80932374e74f0c54ce848fed2c5882cdde501db9bf6e1fa610f79f9f6bf7bae8654a99cb8d1c4e5cc2ce04c926debaef8d9a852bb4fdd93b290741877
-MISC ChangeLog 5855 SHA256 646990acde205372d57fa1aa8d4b59cd40cb07a7b30e7fc4b3413262f547c84e SHA512 2f7923334edd23ddc18ec44d1031a583a064e79085ffad4aaa19fe16dc31762d91e0dfb6d1aa862ada6f07759f9bfaf313626465f23a408536c8349b64d0ed98 WHIRLPOOL eed131ebec792ed2611155b52f266f7e28527e8a3c5a0ed6445b9b24495a09f840615322d4e5a9df68a4bc3b192d985dc4a1b235b772bae3d4c2c9d78a92d615
+EBUILD requests-1.1.0.ebuild 1135 SHA256 f5e5c0093b8d99553371488f94ca2ee0466bb373e9920413f46708d38319edce SHA512 8abcea70b27e7ec6c6676ac0efa88bc26828a3f76810b68fe0094d9d6c424dd89d9410539c58c78145bf4026e14b7bd07251a85b84c8cfdf1fabf6217f6eb299 WHIRLPOOL f9e6e22ac4d71774918a781770fafa61d3506d7fe15c611e1f8cbf340e573eac1556ad799429856a37af522a2fae7e92e886d4109a3b1299325142c32040446b
+MISC ChangeLog 6112 SHA256 050ebf16eb70980d224b0e3c9de7310ae5ff78068a432dbd307ce58841bf061f SHA512 5bc4e94f80743966e319a9457e524cf0703e04f3f5f547687f7360175be6d5f290a415492afa2db26da0f68fa76611b87c228b3c76cc104479ec051c182f3406 WHIRLPOOL 0385ba58f02dce8e2c4c8d9630d21691d2474dd704d165db2172a231c7f3438a043d90978d1539fb9fab2adf600b3505052db8eb87121d231fcc987c294529ed
 MISC metadata.xml 231 SHA256 7bbca8901dd0afb4da18f659567071156f1efea52100213d20d43e53721a0ff9 SHA512 dce3df6bc1c4fc9517e39c41e0c904f39fd092cd63024f03ee5c15aef5b4840dfb265ebe565a5e5a8da9a8805d58b3ec3f772429bf00b125c3172f2f79e089bb WHIRLPOOL 2f6573a3f74f88a549a3344deeea5cdd4f27a310b59d466684902f009c7b404c0557f26f416b450f1f7bdce133c3d52897c5169fce01707233630ddfa783d9c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRUH6zAAoJECRx6z5ArFrDwEoQAJ1O1l8maL3s9RBVI9Yc6lfs
-rYxxgzDofzH4PstYKRtxxbzaSbuN6QG2P+MM9M2r4PaovizR/0PwOIgeqE2oYeoO
-xXgvg/cINdzaXSHaQOsznnRvOw5uy8/wHHuUU+xOvGGh2Cjoc73vJ7dVSkts/za4
-BWyJOkuvkyAu7lzdt1e2sNHnW1PSPSGAeqqblhIAFim0dwwTDzcnPPiOH3gvFi4P
-73pI1hpZhljunyL/HnroVk4VjTSbsnOCAImR0TlQuqkUI3Tl/bFVYOlhbZtqyz66
-Dj6D3k+iKtZR+yNCkDNp6xH6ZCgKj2SDYWLyaRLGg1L1oWw9Qf5InzqrNauph3zQ
-0WY1TLt610KhWb7ZaSGMIi6a5nFtNWjVv65vvBbLRbJR0dE1TrCTnHgqynNbXzTk
-giSYZKDenQ+9MYgHE5PshB5mbQURGnPBGayH9gerEWa0JM9GWqd3kGtTUPfL7wm7
-FMHqgatuMCVvDtcnGOz041dEptQuZyv8RKkA54Rjwuxfch186AJ9g5vm0lusokVy
-+st8Z8Bq+YoHb7CVVUVpCURlAKOjPZreiq72C4EA8gf1XHfWTgbvUqfIVDt+vqaN
-U5YBsap5uyxSE1s6oBfwZr3vFKoFCdJb4vQ66Kqpl47W6y42C5rHSuDt+k1PUnw/
-ze2RJxZX3LSywCmCVKwA
-=0UEy
+iQJ8BAEBCABmBQJRVBknXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDE8MQALTGIIpo8owlvG0YK8wPLE1J
+rKrFtCdcQUatSukCtIwq8pk5gzeAh+EiCrwLswvCOh8XJurn2DFZia9cDZER3RNi
+IxHdmC+LlcXthrKkmx3u5WgPeWm9YUSrXqOCYTbvyl66/HueCRrLs4CsLhVmE4Xx
+OqO3mN+N/mRP8QAUc84DmnEY1yHf8y9csRJGHZGHh3EV8ACBctohWr8zfVADcmoi
+fCR7IW+ThEXIr5XpRFK3Xip4vWWa9ZYYjemU13iPj+7G2oFHVS5HDqgJMQYKw8EG
++4j0C7hwvpNVfqzZQaXptIaxUhUL1m8hl6HhQWHdcHXHd3jqxIdRiSBIKYIXQzyO
+jHAil6mUyGbHsK6tRuTWqhoyWHI+aRjbQ9qQYolesXA+wY71WQLIHqUdBjeUWmHI
+Hqok7sip0B1fcUOD1uO/SpN1mjn+S+qYny9Gmg4jePyaVqHiIPSaqBoS+vCKiJvv
+rBQ1ne1C4K6XWnJT71u32jhjhCNRjDVVExvoEl+PQgipUk4O3cA/VFiBzmU4E5Or
+GrdIZygPgo53vRMZ7+d/n7OZ0abwvlVmf+pmHucsIG0dm2DX3OZxnHauuCdTOr7q
+mPVmmB7OIQMW2BM9QJuCWtADHX8VbwhyWZe9OGVQcJOa/o0wuqbuodJ6IquQj1C1
+BnZBaW89Mq//jzzEC+k5
+=BzRZ
 -----END PGP SIGNATURE-----
diff --git a/dev-python/requests/requests-0.14.2-r1.ebuild b/dev-python/requests/requests-0.14.2-r1.ebuild
index fb312382028d..4d26abd1e694 100644
--- a/dev-python/requests/requests-0.14.2-r1.ebuild
+++ b/dev-python/requests/requests-0.14.2-r1.ebuild
@@ -1,11 +1,11 @@
 # 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-0.14.2-r1.ebuild,v 1.1 2013/03/25 16:43:01 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-0.14.2-r1.ebuild,v 1.2 2013/03/28 10:18:18 mgorny Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_{6,7} )
 
-inherit distutils-r1 eutils
+inherit distutils-r1
 
 DESCRIPTION="HTTP library for human beings"
 HOMEPAGE="http://python-requests.org/ http://pypi.python.org/pypi/requests"
@@ -14,34 +14,36 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
+IUSE="test"
 
 RDEPEND="app-misc/ca-certificates
 	dev-python/chardet[${PYTHON_USEDEP}]
 	dev-python/oauthlib[${PYTHON_USEDEP}]
 	dev-python/urllib3[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES=1
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
 # tests connect to various remote sites
 RESTRICT="test"
 
-src_prepare() {
-	# use system libs for chardet, oauthlib, and urllib3
-	rm -r requests/packages || die
-	epatch "${FILESDIR}"/${PN}-0.14.1-system-libs.patch
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/${PN}-0.14.1-system-cacerts.patch
+		"${FILESDIR}"/${PN}-0.14.1-system-libs.patch
+	)
 
-	# use system ca-certificates
-	rm requests/cacert.pem || die
-	epatch "${FILESDIR}"/${PN}-0.14.1-system-cacerts.patch
+	# use system libs for chardet, oauthlib, and urllib3
+	rm -r requests/packages requests/cacert.pem || die
 
 	# Different packages are installed depending on the python version.
 	# Need to remove stale egg-info data and build in separate directories.
 	rm -r requests.egg-info || die
 
-	distutils-r1_python_prepare
+	# lolwut? they explicitly cause 'install' to fail...
+	sed -i -e '/DONTWRITEBYTECODE/d' setup.py || die
+
+	distutils-r1_python_prepare_all
 }
 
 python_test() {
diff --git a/dev-python/requests/requests-1.1.0.ebuild b/dev-python/requests/requests-1.1.0.ebuild
index baa2469dbe01..53ce3ab525ea 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.3 2013/03/24 01:45:45 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-1.1.0.ebuild,v 1.4 2013/03/28 10:18:18 mgorny Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
@@ -26,14 +26,14 @@ DEPEND="${RDEPEND}
 # tests connect to various remote sites
 RESTRICT="test"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-system-cacerts.patch
-	"${FILESDIR}"/${P}-system-libs.patch
-)
-
 DOCS=( README.rst HISTORY.rst )
 
 python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/${P}-system-cacerts.patch
+		"${FILESDIR}"/${P}-system-libs.patch
+	)
+
 	# use system charade
 	rm -r requests/packages/charade || die
 
@@ -41,5 +41,5 @@ python_prepare_all() {
 }
 
 python_test() {
-	nosetests || die
+	nosetests || die "Tests fail with ${EPYTHON}"
 }