bump; added pypy support, fix to setup.cfg -> fixes testsuite, fixes Bug #468236

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

3 files changed, 53 insertions, 15 deletions

diff --git a/dev-python/urllib3/ChangeLog b/dev-python/urllib3/ChangeLog
index 92f221a2ee1d..f858bee1a7d1 100644
--- a/dev-python/urllib3/ChangeLog
+++ b/dev-python/urllib3/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/urllib3
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/urllib3/ChangeLog,v 1.5 2013/03/25 16:41:11 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urllib3/ChangeLog,v 1.6 2013/05/09 17:20:30 idella4 Exp $
+
+*urllib3-1.6 (09 May 2013)
+
+  09 May 2013; Ian Delaney <idella4@gentoo.org> +urllib3-1.6.ebuild:
+  bump; added pypy support, fix to setup.cfg -> fixes testsuite, fixes Bug
+  #468236
 
 *urllib3-1.5-r1 (25 Mar 2013)
 
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 85328e80556a..a3804fc527ba 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -2,24 +2,16 @@
 Hash: SHA256
 
 DIST urllib3-1.5.tar.gz 36783 SHA256 0fc8836c9f39091a07a612d9ee55fc6458d0309d8efebf835215936fc7ffc76c SHA512 a6afe4dee993eb02ca7ecbcec4a91f3c7f09a79cf4d53d4afab524a86e486f0d2219a0c4edce3f708e402f7c8dc0d46a136c61a78c6f960d9539a11368741764 WHIRLPOOL 1344609eacd53aad4f6579f4ca7a54f58a257eb1c4dd2d2c5853cadd86eb58408e9b5302ab123a27b74ddd0ae3a341ebe8e773fea41f8cad8bd8c94941af8d58
+DIST urllib3-1.6.tar.gz 44619 SHA256 df54bfde115c7358b0e30d892e23340502fe8f014dc43e05f1d240a75dab3be7 SHA512 9277d84f6d0d97857e9d398c5efdfe859f8b506c4021114ef88752af09a17390f4e2125cb63fc81122ff8f125af91a93eaff81d8014a38ed0bf3e3e96c5f8257 WHIRLPOOL 5855754c82535ce9a60a09f3317d71030bb5a2aa407ab3f15bb83631131a087911bfb01d66b5a18d375855360ebbe15437836ee1dad42f34bf132c10f93a9a9c
 EBUILD urllib3-1.5-r1.ebuild 1038 SHA256 a81a44aa7ec420cf7ba91ac858be242149f90b6cdfc767831d5468c640b0cd4f SHA512 ede892c3ac8c0d1ff390cd19bff5d1754219660716742e127817b07b45c9d48099649aa5139646d9aa7bbbcd9189b819481ea27c9a84de8a11cc966f649181b2 WHIRLPOOL b5f2481b5022a619be246e825102ed11b4f2cec5c610f5bd0298016718acc1cb4e39d6d1b0b630db1991ada149308406cd5b780736604b3fc7897e295a0e0387
 EBUILD urllib3-1.5.ebuild 977 SHA256 25ca6bdde022202986040d6ac129b5befaed4d6eb8a97aad9f0d614a7930563a SHA512 cb5ec045aab320f0589ab73dc0f35666fb8224dc8d9f8c9c5968bb15b15d1d6fa32ff91840081a73d7ceeec818884cb87472e0ccd82d5c6741261a7d3c745ff5 WHIRLPOOL 00c16a8c886ff36f3388702881b025f3aba39a11f1edd37b0f823474a8c10b178d3679a67f136d0a1e31bd260eee5e64d851249f922b4088227edf867010f273
-MISC ChangeLog 884 SHA256 1b94eb4d6c17f40f58042286fcb9a7ae2c65348017f10917a43db079600c557e SHA512 55742d04de677464542afe9b3c62003252ea2c86285a5909f98c4554976cb0b7990705a4b23bcb6e039a246002270210275dfa2436cbe84663e745c0f58679b1 WHIRLPOOL 77fb199aa4de6826fa806360262d4b97c1e73c29f625ae7f223e09e62843bdbb111f73eb5d8bbb5e18bde05be98e91e04a438b29ab683b11bdcadf7f9b814fe6
+EBUILD urllib3-1.6.ebuild 1122 SHA256 f073752e0badecf2558a718b223bf14ecbddc7310943779da1323d97d046185d SHA512 43f197ff9e2c5b8440de83300ca12e6a36857fab39e227f1d8512f83905878222dd38f86811da396d3dcbd7d9ed99754fbf5634a0acb40e6283dde6d26e75b1f WHIRLPOOL 585e731c86f8085f93657b77f9dc67474bb84807cb29c73760fe7de3dc05bee22a15f2b291de22406fead56ed34bfa5407809ce32d19709fc7197da1b4ad3b18
+MISC ChangeLog 1060 SHA256 bea87cb0bf0a5d7efe17be753acb336eb5b790899db49d09f16b2d58c8e84273 SHA512 5edc3062debbd3a9597cb2ef783c1ee3cfebd70d10a5f83256a5f83d9b323b3151266ad9f4b519f6344717ca3a6f35152ed55f32a07111af030ed6873eb25cdc WHIRLPOOL 96340a7868fe2b2de47783fcf1e538746798ba6e2cb84495f20ee017fde88cf1dbf996e1349b624cabe4a4a572b98926d630390c6d9ea977dff4339eaa8845f4
 MISC metadata.xml 230 SHA256 783d7ab5ebaca687ef2ba45f8c567e93e45eb308a515f0d5ec28afc1e0fe652b SHA512 9f624d4ed6ed478e14955782355c19c0f92198d23bf9c4422e11d38b978f062f781a125883b43ea4c5fc7a1002e08db61cdb59bfc5e7e40c50361869913abf87 WHIRLPOOL 183ead4fc7c1b5dd984879f30ed2fcf7ed855a38edb1747b4000dc1dbe17fc19cf101345c60ed85d996102879ed4a786d8f5227436b978cc910edd3b2727cf89
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRUH46AAoJECRx6z5ArFrDAOYQAICJ47jNPhFMDjwNnGSATRcr
-TedjmqlUnI8odlxsq8Rra/XuOk8ZtlMDcfHvjny7an2Rh2iWKW/9wGWtXuy7DVV7
-NCe8ngFiUw87IU/RzjGchkB0t76A9D/QX21JDUUakOnmxE3hPI4aFphZMC5gzlT8
-CoIWt60cHjLyIAAJ8LhaPHydxl4BYdcdEQR4AlgOgA2S4+08ZxvCv92hd1CHbgxL
-QaOYD/kqhKf+/qke6m6EMzYHQ31eaH++EOQmZeZaS1FQZSHOaamtfhRWD42HmcgP
-Ekawi0yYgfB40U3E6iYMJAagXIE37VeD2bVfbe0QP8kwwOTljmmjTVt5O8Ot5DB6
-lbk5haJJ62vW7PVn3e8yw2gP1qjIthynyodRVI1F8EOFxW/pjFNGexKIOHxR17ql
-lkxCg0NJ9iGyMN51fQNl5/MbslrxWyzQ/bBtD32T0J1zw/Ho5wfFNk4xDfTZS/1a
-yVRMmRsojBnSHf8XayHHkZ6DA8N0IEfsFxJfcIySYU6+Ocl4DASUrexe3Fqd3mQs
-gKe6qagpM+vvkcgRUrSdXomuAQL2JTsha5OEL3uVQIaCj35NY2ad8EapVyKodTyB
-4X0g8ARV+bmz3gC9PLQ0cyvuWeCrQ2l+061L28t5040DyFSQV4+wzNjARWeY1GbE
-gOe2fFpHmyv/n+mekjzc
-=61j0
+iEYEAREIAAYFAlGL2v4ACgkQso7CE7gHKw3V9gCeJUUg9fDXphhEcZfdBPmtM15X
+FBwAoMH6ZnJGGiIQgTb8K2oH68NKja4+
+=j58f
 -----END PGP SIGNATURE-----
diff --git a/dev-python/urllib3/urllib3-1.6.ebuild b/dev-python/urllib3/urllib3-1.6.ebuild
new file mode 100644
index 000000000000..d9566d65c8bf
--- /dev/null
+++ b/dev-python/urllib3/urllib3-1.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urllib3/urllib3-1.6.ebuild,v 1.1 2013/05/09 17:20:30 idella4 Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
+HOMEPAGE="https://github.com/shazow/urllib3"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( >=www-servers/tornado-2.4.1[${PYTHON_USEDEP}]
+				dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_prepare() {
+	# Replace bundled copy of dev-python/six
+	cat > urllib3/packages/six.py <<-EOF
+	from __future__ import absolute_import
+	from six import *
+	EOF
+
+	sed -i -e "s/'dummyserver',//" setup.py || die
+	sed -e 's:cover-min-percentage = 100::' -i setup.cfg || die
+
+	distutils-r1_python_prepare
+}
+
+python_test() {
+	local test
+	nosetests -v || die "Tests fail with ${EPYTHON}"
+}