dev-python/urllib3: Clean old up

diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 6c53f5a0983934cc1f6df3b107fb088f39cc7520..dda22c47eda2a774ce1c52ad662e7efd4ea39562 100644 (file)
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,5 +1,2 @@
-DIST urllib3-1.12.tar.gz 151072 BLAKE2B 28ea69d758103d82498f85dbc3ade097503445215c4be48d33ef5fcc3c432f25fc33b2aa6fe44ad052722be163a883253fc8585ed8f06e5bcec3b50ce9066f6e SHA512 44f1cf9c5d5538e35d026551a2d1dc7119786c1148b9a769fa9f652f0368e996512962c6245c92d1f4bb1d8e816e2fb0ffebeb0060b01f92b2a5d6e01d15426f
-DIST urllib3-1.16.tar.gz 179763 BLAKE2B 5dd8d988671c2d0ad64351da7f6824e2c87134694f973b8d970f09d18f7688150d1e29c61f679c1fa9cffb90f564a355bc0b4333f00b0e08866f4daa157a7c7f SHA512 646b35a9a4490b2d1f068883a29cbb5be5050a6eea7bb7842f77cd666b7f88101a7612e8eb45ae0eb900d914518db5202f548ab688b8db1c20ed248ba2edac66
-DIST urllib3-1.20.tar.gz 201873 BLAKE2B 5c08abee5353ad17efc3396418f2322d0841c972d7e0d749057dee9f7b3ec6c414692f892cac026edc98ffd5ded430bbdfbdeecbfa8cac413dc147a984f4aadb SHA512 5e2c960ad8641b7e7faf3df966ceb5a2fbb898d9fb4d4459ba607448bab096e3d5df6bc42fdf5fbc2ea58fb6199ba3eb16613b63fd109401d6a2b6e46aade6c3
 DIST urllib3-1.21.1.tar.gz 224266 BLAKE2B 35f521698c0b05fc9122650dde5ac00954eb2ad99ea3771d2a9e4fcb210b404a8173ee369f46b5e61ef7104621571386ad114c833522748b96294a87d0afa601 SHA512 0d2e9c2a0b895e4e232cad5ecc645ea9fd9b70191df045a220ee1f32e284c613c6790bcdfd9e40a22ea9d25ec397278fa700a3c3747e7b04222719d50df07859
 DIST urllib3-1.22.tar.gz 226083 BLAKE2B 6d3067ea1c9c90e2e759e6319115ed3d29ca1e31c4d1721d7e7aeed432ea4df22635d92fdb9ea91a411bbe67c72160abaa19e0d42870be0b0a866c003db6ec62 SHA512 132b69d7f390916bdcde66d46fbf0189d0c1f976f91778dcb0a9ef8174487b7bb4b37b9139e84f7c70234803be95284448aba0b820f3b54530c0c497ca7a1dc9

diff --git a/dev-python/urllib3/files/urllib3-1.16.0-unbundle.patch b/dev-python/urllib3/files/urllib3-1.16.0-unbundle.patch
deleted file mode 100644 (file)
index 9a8a11e..0000000
--- a/dev-python/urllib3/files/urllib3-1.16.0-unbundle.patch
+++ /dev/null
@@ -1,17 +0,0 @@
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 0a2dac3..b7ad412 100644
---- a/setup.py
-+++ b/setup.py
-@@ -42,7 +42,7 @@ setup(name='urllib3',
-       url='http://urllib3.readthedocs.org/',
-       license='MIT',
-       packages=['urllib3',
--                'urllib3.packages', 'urllib3.packages.ssl_match_hostname',
-+                'urllib3.packages',
-                 'urllib3.packages.backports', 'urllib3.contrib',
-                 'urllib3.util',
-                 ],
-       requires=[],

diff --git a/dev-python/urllib3/urllib3-1.12.ebuild b/dev-python/urllib3/urllib3-1.12.ebuild
deleted file mode 100644 (file)
index be217fa..0000000
--- a/dev-python/urllib3/urllib3-1.12.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} 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="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86"
-IUSE="doc test"
-
-RDEPEND="
-       dev-python/certifi[${PYTHON_USEDEP}]
-       dev-python/six[${PYTHON_USEDEP}]
-       $(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy)
-       $(python_gen_cond_dep 'dev-python/pyopenssl[${PYTHON_USEDEP}]' python2_7 pypy)
-       $(python_gen_cond_dep 'dev-python/ndg-httpsclient[${PYTHON_USEDEP}]' python2_7 pypy)
-       $(python_gen_cond_dep 'dev-python/pyasn1[${PYTHON_USEDEP}]' python2_7 pypy)
-       "
-DEPEND="
-       dev-python/setuptools[${PYTHON_USEDEP}]
-       test? (
-               ${RDEPEND}
-               >=www-servers/tornado-4.2.1[$(python_gen_usedep 'python*')]
-               >=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-               >=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
-               >=dev-python/nose-exclude-0.4.1[${PYTHON_USEDEP}]
-       )
-       doc? ( dev-python/sphinx[${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 \
-               -e 's:\.packages\.six:six:g' \
-               -e 's:\.six:six:g' \
-               -i urllib3/util/response.py urllib3/response.py || die
-
-       sed -i '/cover-min-percentage/d' 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 \
-                       -e "s|'python': ('http://docs.python.org/2.7', None|'${PYTHON_DOC}': ('${PYTHON_DOC_INVENTORY}'|" \
-                       -i 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
-
-       [[ "${EPYTHON}" == pypy ]] && return
-
-       nosetests -v test || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-       use doc && local HTML_DOCS=( docs/_build/html/. )
-
-       distutils-r1_python_install_all
-}

diff --git a/dev-python/urllib3/urllib3-1.16.ebuild b/dev-python/urllib3/urllib3-1.16.ebuild
deleted file mode 100644 (file)
index cc6e64f..0000000
--- a/dev-python/urllib3/urllib3-1.16.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-PYTHON_REQ_USE="ssl(+)"
-
-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="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-RDEPEND="
-       dev-python/PySocks[${PYTHON_USEDEP}]
-       dev-python/certifi[${PYTHON_USEDEP}]
-       dev-python/six[${PYTHON_USEDEP}]
-       >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-       $(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy)
-       $(python_gen_cond_dep 'dev-python/ndg-httpsclient[${PYTHON_USEDEP}]' python2_7 pypy)
-       $(python_gen_cond_dep 'dev-python/pyasn1[${PYTHON_USEDEP}]' python2_7 pypy)
-       "
-DEPEND="
-       dev-python/setuptools[${PYTHON_USEDEP}]
-       test? (
-               ${RDEPEND}
-               >=www-servers/tornado-4.2.1[$(python_gen_usedep 'python*')]
-               >=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-               >=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
-               >=dev-python/nose-exclude-0.4.1[${PYTHON_USEDEP}]
-       )
-       doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-       "
-
-# Testsuite written requiring mock to be installed under all Cpythons
-
-PATCHES=( "${FILESDIR}"/${PN}-1.16.0-unbundle.patch )
-
-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
-
-       rm -r urllib3/packages/ssl_match_hostname || die
-       cat > urllib3/packages/ssl_match_hostname.py <<- EOF
-               from __future__ import absolute_import
-               try:
-                   from backports.ssl_match_hostname import CertificateError, match_hostname
-               except ImportError:
-                   from ssl import CertificateError, match_hostname
-       EOF
-
-       cat > urllib3/packages/ordered_dict.py <<- EOF
-               from __future__ import absolute_import
-               from collections import OrderedDict
-       EOF
-
-       sed \
-               -e 's:\.packages\.six:six:g' \
-               -e 's:\.six:six:g' \
-               -i urllib3/util/response.py urllib3/response.py || die
-
-       sed -i '/cover-min-percentage/d' 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 \
-                       -e "s|'python': ('http://docs.python.org/2.7', None|'${PYTHON_DOC}': ('${PYTHON_DOC_INVENTORY}'|" \
-                       -i 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
-
-       [[ "${EPYTHON}" == pypy ]] && return
-
-       nosetests -v \
-               --exclude test_headerdict \
-               --exclude test_headers \
-               --exclude test_source_address_error \
-               --exclude test_no_ssl \
-               --exclude test_ca_dir_verified \
-               --exclude test_verified \
-               test || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-       use doc && local HTML_DOCS=( docs/_build/html/. )
-
-       distutils-r1_python_install_all
-}

diff --git a/dev-python/urllib3/urllib3-1.20.ebuild b/dev-python/urllib3/urllib3-1.20.ebuild
deleted file mode 100644 (file)
index 7ccaed3..0000000
--- a/dev-python/urllib3/urllib3-1.20.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="ssl(+)"
-
-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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="test"
-
-RDEPEND="
-       >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-       dev-python/certifi[${PYTHON_USEDEP}]
-       >=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
-       >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-       >=dev-python/idna-2.0[${PYTHON_USEDEP}]
-       virtual/python-ipaddress[${PYTHON_USEDEP}]
-"
-DEPEND="
-       dev-python/setuptools[${PYTHON_USEDEP}]
-       test? (
-               ${RDEPEND}
-               >=www-servers/tornado-4.2.1[$(python_gen_usedep 'python*')]
-               >=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-               >=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
-               >=dev-python/nose-exclude-0.4.1[${PYTHON_USEDEP}]
-       )
-       doc? (
-               dev-python/mock[${PYTHON_USEDEP}]
-               dev-python/sphinx[${PYTHON_USEDEP}]
-       )
-"
-
-# Testsuite written requiring mock to be installed under all Cpythons
-
-python_compile_all() {
-       use doc && emake -C docs SPHINXOPTS= html
-}
-
-python_test() {
-       # FIXME: get tornado ported
-       if [[ ${EPYTHON} == python* ]]; then
-               nosetests -v test || die "Testing failed with ${EPYTHON}"
-       fi
-}
-
-python_install_all() {
-       use doc && local HTML_DOCS=( docs/_build/html/. )
-
-       distutils-r1_python_install_all
-}