gentoo resync : 25.08.2020

5 files changed, 9 insertions, 76 deletions

diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index 566cc8417e03..f302b96f56ca 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -1,8 +1,7 @@
-AUX docker-py-4.2.0-fix_splitnport.patch 1662 BLAKE2B 3e29288b0cbe5c410ba8b9d338237d0b4cf54fd26524eb241b84806ae62ddf10d6d2f90872d949d4321d9b543575e5ac46df4faae54c561cf53724eeb5913e94 SHA512 ab9c780d7ed79370325e684c0358e196de72916605f343680398a9058ba115afb52ec6a69ad51da1b32389d2b90a7911b62097ca9523e946d671e82c8a799a91
-DIST docker-py-4.2.0.tar.gz 234304 BLAKE2B 385f7fbfaabd4732a2f3bb074094b9f286ee9c6a543432f9a15fc6a78a595f44e4ddebcb3037ff1df54cb4b8d6aec40d8961fb4f62710a0a3245eb886d830c80 SHA512 df5a450355f11d580568ebb0e80abc967df35f2ae10ce83c4ece85e4cf3e97d9cd15e5f14a2d9a43650a844d9402a8d97370f6e5f615c186b12968379e52fa38
-DIST docker-py-4.2.1.tar.gz 234562 BLAKE2B 4b554199f3675340602be27395e0194e827ad81dab48500bca0d4858c699e79ac5108f46eae09c3ac6ae1b580498fd5c78f026ecfd8549b938bb5c6e6cccbd94 SHA512 46ab02d4c247d41efa0ca75d3e13f8aef2d3fe4e6d8624c5a98a728f16c58d0dd8de742be710dc2b2f616dc2cc14a7a8796899e94a4b71a00554baeab105330f
 DIST docker-py-4.2.2.tar.gz 234729 BLAKE2B 06ebe27582ab6a8a61fdf655d01b01495724e03178c2b8291d38425f2678a3d1f826a836a5926ccf65b07c232fba38251cf8f0b1c644334d1b7611adb9d49e84 SHA512 d81f5a6d1cc15dd6d65e65c9e4f24fcae172ce41c8244e13c99adaad8627c9f0eece923d66108951b5e9aaa134e668f317481684b3c2bd51802321d1c4adbab1
-EBUILD docker-py-4.2.0-r1.ebuild 1228 BLAKE2B 074d94d5cb6378ca1d202286eca77dd0732a3e30cd41d667ecadd78468127ea9d78e77d1e32d09ad1825e54c3f3c3d023d09289315e20e576434600bee71dcdc SHA512 aeeee6eea4871077688298dbbd76a9fc92ada64fcb6f39eaea7de8d3b3e58526d0cc39cf5fe8c301ce31e40518f7feda618f2c70949c60b7c90dca14af4143a4
-EBUILD docker-py-4.2.1.ebuild 1111 BLAKE2B 524ab20e9b5e7e915a8735bce04b3b2bd89b8d60bcec67cbc808b2f4bb72bcc95a2546850fa70e0d2d1fd15bac1dd933f69488f0f52c9790cdf1ce84ac0a90ee SHA512 dbb866c7604480bde41981675fe1da3f3896b01d6d5928af923d84d7155245c785da4da45dd2607bc10c7389cf95ca0dd2f0079d44c4ce067feeeb8291a99f80
-EBUILD docker-py-4.2.2.ebuild 1111 BLAKE2B 524ab20e9b5e7e915a8735bce04b3b2bd89b8d60bcec67cbc808b2f4bb72bcc95a2546850fa70e0d2d1fd15bac1dd933f69488f0f52c9790cdf1ce84ac0a90ee SHA512 dbb866c7604480bde41981675fe1da3f3896b01d6d5928af923d84d7155245c785da4da45dd2607bc10c7389cf95ca0dd2f0079d44c4ce067feeeb8291a99f80
+DIST docker-py-4.3.0.tar.gz 236399 BLAKE2B fd9cb6426697a105f58c1199809adb009943761fc17a9b1c0a0c091d0950faf15d6e097aeddc7012b4d39770a66fcdcde73de6874a081e2a2172acd6b5c6e816 SHA512 c790563c6a3a5042f5a0d602c22b2b2838ad6f54df3bc1691e32da06336d6b651d7560ca77677ae1cb3f4d4aab721f98984e0479f7fed25deafceb1dc1c24a7c
+DIST docker-py-4.3.1.tar.gz 236548 BLAKE2B 2934410e9360ac0a0ea4a038fe75728252804c3ffc2dfb614d217a1771d6c61b50c93b1848df5c34f3bf6b6ad2fb98fc5295165c6a482895b6e7c8ef29bc658a SHA512 f82d8681edc866e73dcc0557a2be7ccfcb68e6add3cfd034d62f9639646c5d396e8e2b29df2b42006ee92adc8b432ca6a80bf2a10b54af42f33fe5ea8ed4a912
+EBUILD docker-py-4.2.2.ebuild 1109 BLAKE2B a3e6db6747ece73ec890d8948e06c3fe58899bb9163c4ecbb383f72c080b6a6263663fea3245a2741f4589813ae1c72aa198b0533a7ab207df6107245fd69742 SHA512 593fc77f439693e8aa7619ae30d590fb584fb369a48aa05fed15bb1e2610d9e1efa600d75e9d59d7867a09e8c1b14c9db19c13c996b3db91c00ccb266562ad06
+EBUILD docker-py-4.3.0.ebuild 1116 BLAKE2B 1c4acd03d9f127b01a144f99c98f3b309308ecc582543556a7c9273a072a9053cad2477a07265cdcecfebec43f86c511ff4c5557b48e4f73ad3d36bb5a20bbea SHA512 267f8cad01e4bcea796f2c0d2ef9d2aac4180f2a2a78025662946f8da706c0a37f1a03893a58744b346abfb510fd5c72b4e7ed4f617dd79c4d57ff160687496c
+EBUILD docker-py-4.3.1.ebuild 1116 BLAKE2B 1c4acd03d9f127b01a144f99c98f3b309308ecc582543556a7c9273a072a9053cad2477a07265cdcecfebec43f86c511ff4c5557b48e4f73ad3d36bb5a20bbea SHA512 267f8cad01e4bcea796f2c0d2ef9d2aac4180f2a2a78025662946f8da706c0a37f1a03893a58744b346abfb510fd5c72b4e7ed4f617dd79c4d57ff160687496c
 MISC metadata.xml 398 BLAKE2B 40d5a5305a062cdb348ca447eb5f50ae9a0ca7a80c9460ac33af87bd78dcc552ba089f465294214cb4c0d9fcabed0f696875d47ba67e19ee14d3dbbc7c2e7dc5 SHA512 f991f94b167947549e0a2a152cd52e3fba6a95d54297559602b01a90e39ab6f675bba5d002994bd824cb6b284506aa3dad655461ef5f130f225ca13143e3eaa0
diff --git a/dev-python/docker-py/docker-py-4.2.2.ebuild b/dev-python/docker-py/docker-py-4.2.2.ebuild
index ec7b5cd81787..956546a35843 100644
--- a/dev-python/docker-py/docker-py-4.2.2.ebuild
+++ b/dev-python/docker-py/docker-py-4.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
diff --git a/dev-python/docker-py/docker-py-4.2.1.ebuild b/dev-python/docker-py/docker-py-4.3.0.ebuild
index ec7b5cd81787..530692235251 100644
--- a/dev-python/docker-py/docker-py-4.2.1.ebuild
+++ b/dev-python/docker-py/docker-py-4.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 RDEPEND="
 	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
diff --git a/dev-python/docker-py/docker-py-4.2.0-r1.ebuild b/dev-python/docker-py/docker-py-4.3.1.ebuild
index b730b40c98f2..530692235251 100644
--- a/dev-python/docker-py/docker-py-4.2.0-r1.ebuild
+++ b/dev-python/docker-py/docker-py-4.3.1.ebuild
@@ -12,9 +12,7 @@ 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 )"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 RDEPEND="
 	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
@@ -24,20 +22,15 @@ RDEPEND="
 "
 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'
+distutils_enable_tests pytest
 
 src_prepare() {
 	# localhost has a better chance of being in /etc/hosts
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
deleted file mode 100644
index 6eda63459dd9..000000000000
--- a/dev-python/docker-py/files/docker-py-4.2.0-fix_splitnport.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-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 = []