gentoo resync : 24.03.2018

3 files changed, 2 insertions, 59 deletions

diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index 2d56829003f7..9f5415eef68e 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -1,9 +1,7 @@
 DIST docker-py-2.4.2.tar.gz 180890 BLAKE2B 57518a0c8481fde0198100354225cd8a2908af6d3ca2690d98ad80b386ca4c688c7ccd6a34634ce04fb5ab1553b6c0dfbc75d28333a10f28de7188fe2ee7ffde SHA512 3367066b2acd96b85bef28aef00c91d752dc25b3055575b4f2f9c0b981eb4bca81a742bc6da5f97cf039cd9c7d818e3f80101997fe3a2e2c6f3a9c42fd3111c2
 DIST docker-py-2.7.0.tar.gz 196369 BLAKE2B dd181dbf32f5afda06e748cb49f15d5fc6ff4a579c64b505308ad0d96913ddc8065d165090ec2b20e1f17a4519988a5665dd7a8c7643ca53aaa4385ceecb1341 SHA512 15cf1d8949d71e472f7636ff975cbc4c5f3e18e2d193cb603ade1397a56d0c1ec239167b71be325af99105bc36590a0f0faa1ab010f36fe8baca7807ddfa191b
-DIST docker-py-3.1.0.tar.gz 201288 BLAKE2B 0aa7f712952aac86df37f4eb8f9c60c71199454472ac14d50ee2fd5acdf1980adea6b9f065fdb920999e8d657ae37028e0aff90dd82c3e8b3b13850d748c0e97 SHA512 7f69e6095f36b7a526367bf2762704f5dc5337ba81b2733ad0b683edc271ab17f548da4398176f2e1ffaad41f8f445e1c790af14d815404ad4df7a25d0ff0b7b
-DIST docker-py-3.1.1.tar.gz 201637 BLAKE2B f94ba89922eb62891113bef2b5f3d034eba0f6e91aeb657c265aa72e3b66ad5f6eba6430faae99485236689ef22e09eed3461126d84b51f369ef3004179e89c5 SHA512 139967232d687af9379e18abd1fd133fa655b6247055ae24fe9c8be02a1900d3af0bfcf0d994b7807c3623a3d1fd57e80ca18ce882855bae593321f0a85432f6
+DIST docker-py-3.1.4.tar.gz 202064 BLAKE2B 6ee3672cd1f62cd570d3939805465698879d747215b8424bc4edd79253c5bc25d193582dbfa6aa423f9b183d477486d6347f65ac7245d601d3f1fe2a1fd124ed SHA512 78081010ce4027156d3b4ebafee6023f387ee8e7ee4d77ee671a16a3fcb646fca91c5c36cfbaf94157f8a524a3e1a09b9cbfabf304e278a3c1e0132df5d13d13
 EBUILD docker-py-2.4.2.ebuild 1578 BLAKE2B f09a649f8ef49dbecddfdc8fa74dcb2e03bbb1aa72ec90488ec0da4f5c320c2872dda32838ba237e9c5df52cd8384a51b8f20286929b9a76511a09fdd9de3615 SHA512 98bdc785eac2b65557f3079c51d46d44ac47e1d3007bca99b4fd26d7d03b8e7826fa49646039cf659c75b7c660922af290def904bedc554b485471e78eded83e
 EBUILD docker-py-2.7.0.ebuild 1531 BLAKE2B d2d1ae4449c2379b07a0e3dd6eaee69f303d035a9d1b234359eff53bcd4ad2a40f271aff3e7e13e7e66ad49b8f7d6bd788076ece3896a8b06f5580af1f82554f SHA512 807b2a01920c4efc9ca29699ed05cc4018bc76faa343d729f627886412248e702c48e630a0fcca134f0c3c1a7b7eeb61ef8b132f920bc8260702c2ac40b7aca6
-EBUILD docker-py-3.1.0.ebuild 1539 BLAKE2B 711aee78353725adadbb797ae28c378df1b29df40282807cee4881fb408bfcb38aa473e37331f0471a0144e2d0b8daa2c64f2a057118769840377d1f94f18872 SHA512 41314274e0d6c3348f5682d148fca5a4c4b2f3d493e0c135f57bf769231128436f7e8a6d2cc822c1ff88c6e768cf1f7de1e2b021a6682d899482478df5ceb61a
-EBUILD docker-py-3.1.1.ebuild 1539 BLAKE2B 711aee78353725adadbb797ae28c378df1b29df40282807cee4881fb408bfcb38aa473e37331f0471a0144e2d0b8daa2c64f2a057118769840377d1f94f18872 SHA512 41314274e0d6c3348f5682d148fca5a4c4b2f3d493e0c135f57bf769231128436f7e8a6d2cc822c1ff88c6e768cf1f7de1e2b021a6682d899482478df5ceb61a
+EBUILD docker-py-3.1.4.ebuild 1539 BLAKE2B 711aee78353725adadbb797ae28c378df1b29df40282807cee4881fb408bfcb38aa473e37331f0471a0144e2d0b8daa2c64f2a057118769840377d1f94f18872 SHA512 41314274e0d6c3348f5682d148fca5a4c4b2f3d493e0c135f57bf769231128436f7e8a6d2cc822c1ff88c6e768cf1f7de1e2b021a6682d899482478df5ceb61a
 MISC metadata.xml 402 BLAKE2B 449733b9057dfcde3dd0ff82df6a9cf870d1138d3c721a39174a71f54a359422cb3411f513f68662b1c840480c4aa253f8fe77a2afe1020e82c4e7c81dc4d691 SHA512 13bee9843188ebf018e25e2a738fd0ecc10ddb3508bbbe3e47048a9ec714196498ea71044a57a20b4c649eacd0672b956d20a3e5487047723cbda9047ca214cd
diff --git a/dev-python/docker-py/docker-py-3.1.1.ebuild b/dev-python/docker-py/docker-py-3.1.1.ebuild
deleted file mode 100644
index 8108a4abde8e..000000000000
--- a/dev-python/docker-py/docker-py-3.1.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_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 ~arm64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	>=dev-python/docker-pycreds-0.2.2[${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' 'python3_4' )
-	$(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.1.0.ebuild b/dev-python/docker-py/docker-py-3.1.4.ebuild
index 8108a4abde8e..8108a4abde8e 100644
--- a/dev-python/docker-py/docker-py-3.1.0.ebuild
+++ b/dev-python/docker-py/docker-py-3.1.4.ebuild