bump update test phase

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

3 files changed, 84 insertions, 6 deletions

diff --git a/dev-python/urllib3/ChangeLog b/dev-python/urllib3/ChangeLog
index 8d641f9cee8e..e5349199db9b 100644
--- a/dev-python/urllib3/ChangeLog
+++ b/dev-python/urllib3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/urllib3
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/urllib3/ChangeLog,v 1.40 2015/05/31 10:59:31 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urllib3/ChangeLog,v 1.41 2015/06/04 10:05:57 idella4 Exp $
+
+*urllib3-1.10.4 (04 Jun 2015)
+
+  04 Jun 2015; Ian Delaney <idella4@gentoo.org> +urllib3-1.10.4.ebuild:
+  bump update test phase
 
   31 May 2015; Markus Meier <maekke@gentoo.org> urllib3-1.10.3.ebuild:
   arm stable, bug #530622
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 602af376d5ae..99cfb534b164 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -2,17 +2,21 @@
 Hash: SHA256
 
 DIST urllib3-1.10.3.tar.gz 136894 SHA256 ce1bb9a3f103610a062ace3ae6e56ebf2fa0fbeb5c395d601c64d8a7e6df180b SHA512 d36280a29f1580565e79c58991d4ecf2cd69d2b262950bb90c1b0f89f225b6b3cee556914b6a7b3031dd074af8ae6187e6a3641ad8591c6b870203c33d40b113 WHIRLPOOL 5042b1c7e3c156d26c83a770636d9e7a9cf45b638f1b8733603afa255fe1a3ac03abb6447ba5e3f1ad98d7a449fe164c374ab5e131566b15e7c9281ba39677bc
+DIST urllib3-1.10.4.tar.gz 138538 SHA256 52131e6a561466f1206e1a648d9a73dda2a804d0f70e83782bd88494542ded09 SHA512 83118aa5bf23add5bb5dafd98d32459315d971246ac2a49f7f0d0fcad6414099885f6d4fc7847de17e983b949c8a21fa4ed71c0216e578bdfc8eb351672f7c09 WHIRLPOOL 03431b6c575f3399bf8876d7dfad126986864e3a3f09d05e7e682b5b374ed420854c776a3d7bac91538086e43a9b832975aaf0b1b2e3fcde1ba8cfe93417bdc3
 DIST urllib3-1.10.tar.gz 128200 SHA256 25b4a7fbbd9112e0190f31f8877aa0523caeab8630872ad1bbddaba01cdd6599 SHA512 32f9162f82a676146fae6bba462d21eb81635d8660ca4676b5e8dd3d18b68525a265695c646f06c099a78c24d9b108f0610d3e17f20578d473771bebd42cc52d WHIRLPOOL a8a84b79fd0edeecdd19eaef0ee809d1c5d842ff6bcf089df9a1111744a2f42bec1a366b76b6e7334a51cad83d42b166f133a4156bbbfb7be24518353ee71081
 DIST urllib3-1.9.1.tar.gz 171086 SHA256 d858379ef5988d4534bb8909432d697422100aaff272299d661339836b6dae9b SHA512 c972e4dc9dabf6378da75e0abce5e53bec29624f2dc0faff3c8ce762474d490da6aec7d2e374c57d0d18e640311845750eb257fc7829ac9d25a3d9c957c59c6f WHIRLPOOL 666b82e712939b3ff5dfe109ba0498c16dbea7f2c0f0c2e1c317cf7e6f03711ce4a9468bb72327abe7821aa75c0257d30dbce5c196ba59215df3dba4084c7360
 EBUILD urllib3-1.10.3.ebuild 2517 SHA256 cf33d6f5ae9abde0aecc95c7fe869e782e3816eccddbe4177991c25eca1ad1c3 SHA512 dc35920693e82950c846adf008042ffb76f0c316984687684f467ebb8f0fabf6b32568e3d4f0083e90aa8c2b12875a64616f3d79369e07fdcb02f50f7be464f6 WHIRLPOOL 59ec39b62893c97ff4d29666870165931cfe4704f6ba7ae1b5db6316384cd554de4380bb3457856d1268a05a9534c3683d7c2388c4d4df41b7de87defd6aff4f
+EBUILD urllib3-1.10.4.ebuild 2096 SHA256 95412df88e9a6d785baca3bcf3a26c5af5518354b86efddef56475a2d722276d SHA512 2fbc81d8540954bca6829772a598afe9c7a9c6539e15c20965ba71080631cd11daa0ade3ba87daf000bce661d8cdfb0292631abe566cc472d95c1ff89ae596d1 WHIRLPOOL 16078d511436698ad487eeffdaa3e2214e453d06a884047cc6665cb82751e17fde95206e77838a7c5dee622fa28309058203f642179336166c0f6d5adff123ca
 EBUILD urllib3-1.10.ebuild 2210 SHA256 59c5e1fc9ccf863ad2eca9a9d7f63fe7df01510a5a9486b3b0831c28a7382426 SHA512 394576c86d943b89a54dc48b646bb5f4ca62dac655c56ae13dfb9b15f8e92f4771efbd9dcfb4bc8b5a52ceab71297983792a5ad3814a6ee21ceb223262d2969e WHIRLPOOL d94d73b9b10d06e691a2ee0d8e6e7e0437959b63b23f0b8b2d20f6dde322451bb774a65d6631e9654dc383d874f84f36520d5f7cded8fb125731f0f6a78bf3d8
 EBUILD urllib3-1.9.1.ebuild 2234 SHA256 4f49aaaa62d15bcc2696cf3fcdd1f6aac7eb44402d9debe587be122934f3c91a SHA512 4f34454a037e65ccdc565de5ef9aa1e57a1c8d4f20a47604dee5934febb0ac6e864a7db9b520cdabec7c242d4b9d91dc363fadeb454c108cd1bff4c0b6a41b13 WHIRLPOOL 02617fa493db37998febefecfd3e355ed0fb528b5705ebe4fe8ad5b9b60932b84c992f71f62df9bbaec6cf093410a4b36477b12c0e320b343a7f2917d5ff4112
-MISC ChangeLog 5763 SHA256 e25e591f5e234e6f2131a439d042f1b459f62a484432d7a478d74dada44497e1 SHA512 ed537aa2d2c420cba8c1883031d88c41cfc88e59c25eb78fa1a53854ada63903f03d3f669d63ea84d7f1ca2b244478de7eacec66a4f6ec29ac4378ec86ba2077 WHIRLPOOL c6951860863d8bf8499a1975d903f348abbd7ac1ed2e5bf4fe0fba6bd30635c59fcceabf1a00cdcede050e94e732968319331b85cf2110e51f93d2cf58fc6594
+MISC ChangeLog 5893 SHA256 ad181086bc413ee9eafa566a8afa2094fc92bb583bb98ea3291d0479e929e7a3 SHA512 1873aa7c2b36fcbc96f5e615815edb7cee19b51e8b4a5adf15b95634a3767c7b7e7967e94318b88d09397d5d4182a3178476ad093396400c5e7c62bb9c7c07a8 WHIRLPOOL 7ec69de732a70d4df68f1b494b0db1d90f26f5eba8829804edcf749358fc01e32e0d6092923e8e10d0bace06d7221c00b38f393bb807304a9c6be5ac339c8a6c
 MISC metadata.xml 230 SHA256 783d7ab5ebaca687ef2ba45f8c567e93e45eb308a515f0d5ec28afc1e0fe652b SHA512 9f624d4ed6ed478e14955782355c19c0f92198d23bf9c4422e11d38b978f062f781a125883b43ea4c5fc7a1002e08db61cdb59bfc5e7e40c50361869913abf87 WHIRLPOOL 183ead4fc7c1b5dd984879f30ed2fcf7ed855a38edb1747b4000dc1dbe17fc19cf101345c60ed85d996102879ed4a786d8f5227436b978cc910edd3b2727cf89
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVq6ZQACgkQkKaRLQcq0GLzAQCffNyZcQm+OFaLUg8NOTHx4PRB
-BBsAn3Ooc00VSn2Ykky0KP54TKjoe4vj
-=tJZj
+iKYEAREIAGYFAlVwIwdfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldDdDQUM1OUY0ODkzMERBREU1NUQ1RjJBRkIy
+OEVDMjEzQjgwNzJCMEQACgkQso7CE7gHKw2gMQCfUMu+G8+cL3IY4lZu3Grgmdk0
+A2oAn1f42gW8XXGwo9DLqtNbdce6n32x
+=/neM
 -----END PGP SIGNATURE-----
diff --git a/dev-python/urllib3/urllib3-1.10.4.ebuild b/dev-python/urllib3/urllib3-1.10.4.ebuild
new file mode 100644
index 000000000000..1adfa4710c75
--- /dev/null
+++ b/dev-python/urllib3/urllib3-1.10.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urllib3/urllib3-1.10.4.ebuild,v 1.1 2015/06/04 10:05:57 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+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 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="doc test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep \
+		'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy)"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=www-servers/tornado-4.1[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+# Testsuite written requiring mock to be installed under all Cpythons
+
+python_prepare_all() {
+	# Replace bundled copy of dev-python/six
+	cat > urllib3/packages/six.py <<-EOF
+		from __future__ import absolute_import
+		from six import *
+	EOF
+
+	sed -i 's:cover-min-percentage = 100::' setup.cfg || die
+	# Fix tests
+	sed -i 's/urllib3.packages.six/six/' test/test_retry.py || die
+
+	# Reset source of objects.inv
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed -i "s|'python': ('http://docs.python.org/2.7', None|'${PYTHON_DOC}': ('${PYTHON_DOC_INVENTORY}'|" docs/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Failures still occur under py2.7.
+	# https://github.com/shazow/urllib3/issues/621
+
+	nosetests test || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}