gentoo Easter resync : 12.04.2020

9 files changed, 125 insertions, 77 deletions

diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index d3c234e8b742..282ea0c92077 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -1,11 +1,11 @@
-DIST docker-py-2.7.0.tar.gz 196369 BLAKE2B dd181dbf32f5afda06e748cb49f15d5fc6ff4a579c64b505308ad0d96913ddc8065d165090ec2b20e1f17a4519988a5665dd7a8c7643ca53aaa4385ceecb1341 SHA512 15cf1d8949d71e472f7636ff975cbc4c5f3e18e2d193cb603ade1397a56d0c1ec239167b71be325af99105bc36590a0f0faa1ab010f36fe8baca7807ddfa191b
+AUX docker-py-4.2.0-fix_splitnport.patch 1662 BLAKE2B 3e29288b0cbe5c410ba8b9d338237d0b4cf54fd26524eb241b84806ae62ddf10d6d2f90872d949d4321d9b543575e5ac46df4faae54c561cf53724eeb5913e94 SHA512 ab9c780d7ed79370325e684c0358e196de72916605f343680398a9058ba115afb52ec6a69ad51da1b32389d2b90a7911b62097ca9523e946d671e82c8a799a91
 DIST docker-py-3.6.0.tar.gz 213435 BLAKE2B 28301a508ef346373f8ac4033b697a71092c4162ba1be81bc69c513d1de700326a4e8ffcb1c015e20516aa1a09d31162d54182985eea3dc1dc23d6e79ef28fea SHA512 b32acb2585995c3c5bdef95ea4bbb6bcadba3b9fca81a3e637dc294b5dbd3823ee6c98236c4bb197373a96feafcaae665b9c64b805abd52e1ae27aa42079278d
 DIST docker-py-3.7.1.tar.gz 220882 BLAKE2B a7547d2989b3fc2dfc38dfffb909508b7a5b3f8ee6b0fc874a73d0cdfaa17fe28c971f5a226893a41d893e75b1b2e4c74da806996e85b097b3a85b2d8dadcfcb SHA512 0a89c5fc05423d913b1029390318d9cd4ca54a3b4df1e9a9f459e27fa114fd7b03047ff95f3ea2ef6bb2cb48c5f6fe712da11c940249d3b253aa3fe74b8b1c98
-DIST docker-py-3.7.3.tar.gz 221311 BLAKE2B 6bdfc5cd53fccec6e060d08ebde845d373f961a8a418e3bfbeac79e736f64aa07807a4f2074d243765d10c0e4cc87c672d039cdefe4223ec1b33b56cf4ea31a9 SHA512 d3217361617f12e841bfa443c7ab4b44ca5f7ead8b40834919aad9043220efa7611a8bd18cbec6adc4d98f2551bfb169535e1eec904b90425648093c0d6a1722
 DIST docker-py-4.1.0.tar.gz 229336 BLAKE2B 8a2e0333e0e90399c0c4267c5b5205f3639077384e882e920a613e2d30d7ee915bdd549ec89a4c0e34646edbc6dea450ce63e45cf9cbc1efe0e26ff6ea5961db SHA512 25e236bd5b429846ed45f26a303af02bb679c526f45f188d8df74d79fcab116b41e52e3a85642babff94127ae977dab6cc93e53bb78aab7be038190e161d25be
-EBUILD docker-py-2.7.0.ebuild 1529 BLAKE2B e2c4f8d5db8db774f02dada0bf12da1c54a2971f69915f7005080aff63dfd44a3902bf5e9e612e1e475aaf9657f925dfc186cd3b76c5fef635e3c49656f171e6 SHA512 0db637af52f78e3d996cd7d011b974824d5bb29d1bf96f0732487841335d1ed200b6e0050d50f0ebd2dd20f5af4f9bcb674c676ed710e781aa779302f5fe950d
-EBUILD docker-py-3.6.0.ebuild 1451 BLAKE2B 5fe2e7e0dc3133da39ac76cb326e10f1b5be49f7892fcb73220ebba02b0729717a00bff3fe9fb88a5818fc1e93b1fb5bcdd7c66a2a1e1d872e08c82ca4b6d8b9 SHA512 2d22695f5e70f9b9e61c9005991db9ce2ba820daf37844dea839bedf3be29580a44d91e64935a04ec28e9f3228d4f950f6a843ba3dcb3c75d6a72439a1d4983d
-EBUILD docker-py-3.7.1.ebuild 1452 BLAKE2B fa21dfbf846b63ba8a43550f10ccce57ed4a7eecf65a92ce553a8c5e04d5e1315232544b1400f8fe88edfb6834c03c21586e28b3fcca9a33d142e1a4020e083d SHA512 030cc3a8bd48ab86a2569bbe44c2cf3bc4b6988176e194a79dc9e7cc5972ac5e88501b71a8a5e9049dc5bfc0eee1d1936c4cabe8941cb2dc7dd47747429aa236
-EBUILD docker-py-3.7.3.ebuild 1453 BLAKE2B 331e97fddec844a42bfb8e2dfe77e42560c2ecb9500f53a5e2d7e4ae1e61882f891c100b9a178d88f4812e3661c2a0d50da8fe482b51c58308e5b9d17c3457cd SHA512 07d9138798045be28bb4233c0c64067a983494d65f17d3c47def3626e8cedd162c365eccac62fe65fc6eadeaff62c3bee63d4dc18564caa2ecceb490660c7aa6
-EBUILD docker-py-4.1.0.ebuild 1357 BLAKE2B 3cd61059961d1acba71cb3b4a5302212fb2c10c220e13ae949aee44b2625f470952981fe42e3b48def1ad84b9348f6f4a0ef139470c2ed668cda51c7088cc13d SHA512 76790a1fac37d9879717d0ba51b93b54df1d19452510ad9e8d61e6d67b29bc8cc90a3ea89fb07562f654e9e8e3824ff280b3bd3e4325fcbfa1136d495a13d433
-MISC metadata.xml 319 BLAKE2B 94c736dc4cced0c42b48683b887ca3bca96bee3a8bb847c0af93764abeb55a14d1f8f77eedad59f68612550dda67b4b6c227c61abd0c7155932f22f463194de7 SHA512 0e33a17e754e136b13dce5ad5fe93b159951c834e1140a176c25fc747aaf4eb4de18112c62a7bc7eab3fcf3f580583a335b88e6ab35c52c582f627d0b81c35e6
+DIST docker-py-4.2.0.tar.gz 234304 BLAKE2B 385f7fbfaabd4732a2f3bb074094b9f286ee9c6a543432f9a15fc6a78a595f44e4ddebcb3037ff1df54cb4b8d6aec40d8961fb4f62710a0a3245eb886d830c80 SHA512 df5a450355f11d580568ebb0e80abc967df35f2ae10ce83c4ece85e4cf3e97d9cd15e5f14a2d9a43650a844d9402a8d97370f6e5f615c186b12968379e52fa38
+EBUILD docker-py-3.6.0.ebuild 1261 BLAKE2B d9fa5649758514b448969f5d4c988ff8079813a8a02ed20f711821d3701e8e59bd0a1bc4af7d0d4774d7fd7697a32fc4d7528938e750d6245a289833dbacff16 SHA512 e07cf468f30a92db63c9c80ea38aaabfdbfe01e821f14e3746835a20523809ff99a48ee0b8265ea057361beb1353fb22a8f55919b48bee6ee0048ec3fa78cbab
+EBUILD docker-py-3.7.1.ebuild 1262 BLAKE2B 71cfee15d538fa641913e9c653516d09902d390ef50b82aba6fdf470f66df82e8b2537db0c3da6ba3b86c3268fa6056d7a34a3ba3961fe5af63c345f4ec82c6e SHA512 b52fdc99f13191ce72326ed666e8ac248c944c3d18fe168fa829fabf6340a01d3f68c7d0af323e8c1590a2492da766fcfec16c8da44d1c119c188ad4d2bc81bd
+EBUILD docker-py-4.1.0.ebuild 1167 BLAKE2B e55df7f5987a697fcfdb5d9ee1531ef36ace954d48433d77e0f727b1d30cdee5d4f7ef1f6057832a2a83d48b950b2dab58151cc3f06b78d5b66366f39101653c SHA512 de35cef9d293ec71726daaff623b2114a832be4cc9533fe0b2d594950ad14e08756cb35c27d3ec8f86549bb3c71dda9c1c45acb707cbe5ccfcb0c04c29939bfb
+EBUILD docker-py-4.2.0-r1.ebuild 1229 BLAKE2B aafe3ffa374b1a2e16e8ebfe5a31fdb07a08ed1dda1a4a5384cef0cd85dc372295230f17e5da5903ee5f514bae5a002cb73c54356c796eaa6358d706085c3a04 SHA512 cc70dda792a2949ccb342dd849964036556d76824b3e98ccaea209dede9c165656225a49cb58e3f547f73d1cb7b7fc8f15fdf50ed89835a9ac1a6e644628b34b
+EBUILD docker-py-4.2.0.ebuild 1167 BLAKE2B e55df7f5987a697fcfdb5d9ee1531ef36ace954d48433d77e0f727b1d30cdee5d4f7ef1f6057832a2a83d48b950b2dab58151cc3f06b78d5b66366f39101653c SHA512 de35cef9d293ec71726daaff623b2114a832be4cc9533fe0b2d594950ad14e08756cb35c27d3ec8f86549bb3c71dda9c1c45acb707cbe5ccfcb0c04c29939bfb
+MISC metadata.xml 398 BLAKE2B 40d5a5305a062cdb348ca447eb5f50ae9a0ca7a80c9460ac33af87bd78dcc552ba089f465294214cb4c0d9fcabed0f696875d47ba67e19ee14d3dbbc7c2e7dc5 SHA512 f991f94b167947549e0a2a152cd52e3fba6a95d54297559602b01a90e39ab6f675bba5d002994bd824cb6b284506aa3dad655461ef5f130f225ca13143e3eaa0
diff --git a/dev-python/docker-py/docker-py-2.7.0.ebuild b/dev-python/docker-py/docker-py-2.7.0.ebuild
deleted file mode 100644
index 4a2d63720f08..000000000000
--- a/dev-python/docker-py/docker-py-2.7.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Docker"
-HOMEPAGE="https://github.com/docker/docker-py"
-SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/docker-pycreds-0.2.1[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.9.1[${PYTHON_USEDEP}]
-	)
-	doc? (
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.4.6[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	sed -i -e "s/import pip//" -e "s/if 'docker-py'.*/if False:/" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs html || die "docs failed to build"
-		HTML_DOCS=( html/. )
-	fi
-}
-
-python_test() {
-	py.test tests/unit/ || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/docker-py/docker-py-3.6.0.ebuild b/dev-python/docker-py/docker-py-3.6.0.ebuild
index c212413c5cf5..e56430129585 100644
--- a/dev-python/docker-py/docker-py-3.6.0.ebuild
+++ b/dev-python/docker-py/docker-py-3.6.0.ebuild
@@ -22,8 +22,6 @@ RDEPEND="
 	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/docker-py/docker-py-3.7.1.ebuild b/dev-python/docker-py/docker-py-3.7.1.ebuild
index 6f39697f4480..33d3165689a1 100644
--- a/dev-python/docker-py/docker-py-3.7.1.ebuild
+++ b/dev-python/docker-py/docker-py-3.7.1.ebuild
@@ -22,8 +22,6 @@ RDEPEND="
 	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/docker-py/docker-py-4.1.0.ebuild b/dev-python/docker-py/docker-py-4.1.0.ebuild
index 995cf5ff9dab..c5a9478e00f5 100644
--- a/dev-python/docker-py/docker-py-4.1.0.ebuild
+++ b/dev-python/docker-py/docker-py-4.1.0.ebuild
@@ -21,8 +21,6 @@ RDEPEND="
 	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
 "
 DEPEND="
 	test? (
diff --git a/dev-python/docker-py/docker-py-4.2.0-r1.ebuild b/dev-python/docker-py/docker-py-4.2.0-r1.ebuild
new file mode 100644
index 000000000000..bbd3efde1731
--- /dev/null
+++ b/dev-python/docker-py/docker-py-4.2.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for Docker"
+HOMEPAGE="https://github.com/docker/docker-py"
+SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/paramiko-2.4.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.9.1[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix_splitnport.patch
+)
+
+distutils_enable_sphinx docs \
+	'dev-python/recommonmark' \
+	'>=dev-python/sphinx-1.4.6'
+
+src_prepare() {
+	# localhost has a better chance of being in /etc/hosts
+	sed -e 's:socket[.]gethostname():"localhost":' \
+		-i tests/unit/api_test.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	pytest -vv tests/unit/ || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/docker-py/docker-py-3.7.3.ebuild b/dev-python/docker-py/docker-py-4.2.0.ebuild
index b55a175d350d..c5a9478e00f5 100644
--- a/dev-python/docker-py/docker-py-3.7.3.ebuild
+++ b/dev-python/docker-py/docker-py-4.2.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{3_6,3_7} )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
@@ -17,16 +17,12 @@ IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-python/docker-pycreds-0.4.0[${PYTHON_USEDEP}]
 	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
 "
 DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
 		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
diff --git a/dev-python/docker-py/files/docker-py-4.2.0-fix_splitnport.patch b/dev-python/docker-py/files/docker-py-4.2.0-fix_splitnport.patch
new file mode 100644
index 000000000000..6eda63459dd9
--- /dev/null
+++ b/dev-python/docker-py/files/docker-py-4.2.0-fix_splitnport.patch
@@ -0,0 +1,59 @@
+diff --git a/docker/utils/utils.py b/docker/utils/utils.py
+index 447760b..3996d08 100644
+--- a/docker/utils/utils.py
++++ b/docker/utils/utils.py
+@@ -17,10 +17,9 @@ from ..constants import DEFAULT_NPIPE
+ from ..constants import BYTE_UNITS
+ 
+ if six.PY2:
+-    from urllib import splitnport
+     from urlparse import urlparse
+ else:
+-    from urllib.parse import splitnport, urlparse
++    from urllib.parse import urlparse
+ 
+ 
+ def create_ipam_pool(*args, **kwargs):
+@@ -278,7 +277,7 @@ def parse_host(addr, is_win32=False, tls=False):
+             if proto != 'ssh':
+                 raise errors.DockerException(
+                     'Invalid bind address format: port is required:'
+-                    ' {}'.format(addr)
++                    ' {}://{}'.format(proto, addr)
+                 )
+             port = 22
+ 
+@@ -295,6 +294,33 @@ def parse_host(addr, is_win32=False, tls=False):
+         return "{}://{}".format(proto, path).rstrip('/')
+     return '{0}://{1}:{2}{3}'.format(proto, host, port, path).rstrip('/')
+ 
++def splitnport(netloc):
++    import re
++
++    host_port_re1 = re.compile(r"^(.*):([0-9]*)$", re.DOTALL)
++    host_port_re2 = re.compile(r"^(.*)$", re.DOTALL)
++
++    host = None
++    port = None
++
++    match = host_port_re1.match(netloc)
++
++    if match:
++        host, port = match.groups()
++    else:
++        match = host_port_re2.match(netloc)
++        if match:
++            host = match.groups()[0]
++            port = None
++
++    if host == '':
++        host = None
++    if port == '':
++        port = None
++
++    port = int(port) if port else 0
++
++    return host, port or None
+ 
+ def parse_devices(devices):
+     device_list = []
diff --git a/dev-python/docker-py/metadata.xml b/dev-python/docker-py/metadata.xml
index ce48845f4613..9862fd2de429 100644
--- a/dev-python/docker-py/metadata.xml
+++ b/dev-python/docker-py/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+  </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">docker/docker-py</remote-id>
     <bugs-to>https://github.com/docker/docker-py/issues</bugs-to>