gentoo resync : 26.11.2017

2 files changed, 3 insertions, 78 deletions

diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
index 22bbe84de934..2905704e9e84 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1,7 +1,3 @@
-DIST docker-compose-1.16.1.tar.gz 212167 SHA256 fb46a6a2c4d193a3ff1e4d7208eea920b629c81dc92257c87f3f93095cfb0bdf SHA512 add6aa5647352b993e5eba81c41815467cea82d39643a755c9f24ffeeb482e2b22423a9e3facdd94f41b382b2726cb65433516881971a8f373c79bce44923c4a WHIRLPOOL 144c8905fc06d11a2ed9583acb8d2dbf739771f2b90f60b6d90bce64a27d705b449a9df9e79754be094e3d1fec15993f88eecebc3647af32b7e54050338e39ca
-DIST docker-compose-1.17.1.tar.gz 219947 SHA256 e29469dbd78457c82ddad674c0fa0b7afed065b2c73858d332dd6d20d92a8541 SHA512 711c0a73546f0b396a920d3310b92fc15e3c13f93439eeda363124c9bd971aa942395b2405ad7441df8982384be367c20a767fe5b9e3e150690b63deda58f553 WHIRLPOOL e4f6fc72ad186aff590e96a8205d519a92e4aa0e0672483b18aa1c65f9765ae553c59b8ab51334db0b937c23073096436ef2308ddab172b08ff75dc8b9c8e665
-EBUILD docker-compose-1.16.1-r1.ebuild 2423 SHA256 1e15f65aa047ab6b5128699ef337bfff123c6c9bd98a7bb556c95826cc668836 SHA512 0906703570ef80c4bf8283c3700ee63925a15d587b2f5fe67a09787dc4f2ff7727c5533c7a811843398e9dcc256da771e4958f7babc76b0e46b99c3d85fe3d25 WHIRLPOOL 182af342af3250bfa8d60c23967d595657ecdcbceee06e8ebbcee9ea1ccfddee2fb1d0fb57a5f7f6262b9c183f9aa15c7d388b85a117ea87a58af480b329f084
-EBUILD docker-compose-1.17.1.ebuild 2423 SHA256 1e15f65aa047ab6b5128699ef337bfff123c6c9bd98a7bb556c95826cc668836 SHA512 0906703570ef80c4bf8283c3700ee63925a15d587b2f5fe67a09787dc4f2ff7727c5533c7a811843398e9dcc256da771e4958f7babc76b0e46b99c3d85fe3d25 WHIRLPOOL 182af342af3250bfa8d60c23967d595657ecdcbceee06e8ebbcee9ea1ccfddee2fb1d0fb57a5f7f6262b9c183f9aa15c7d388b85a117ea87a58af480b329f084
-MISC ChangeLog 7390 SHA256 ae21930aa14aceeee5431fcc8a56fac3dee8669d40870ae270bbb0aee996a5c2 SHA512 a9b25e64464a89185b62acdd2de8dd1cb923734612ba9ce2c9fb67b8daea9a9cd31f84c1f963d4c7ceac39b16b19e32cd1b0e5792b94aab8e486c485d9818c05 WHIRLPOOL e51fcce39afe9e0e8837e6cf5ba5a37a2010dc99866e62a48c1abaa4e85a5219208d59497014bb30b6fc76b497910adad25060b3dd78194129e3f030e6e066f1
-MISC ChangeLog-2015 2025 SHA256 99d6e79498f6ded8f176505dc856af7ebdd6438420ba91eb9b5595c347c51660 SHA512 4a37f3d9387d314439e7a67b0faae778694b3acda4bf3dcdf62b2a46d71ef1f9391211c92e277188b5056504cf66fca6cc2c7b3d0ef119681485461dcec4e29a WHIRLPOOL 6151151ad2fde1389fbeeab773696918ed5957f015f7346a1a7c6547ced6423ecbe8494e48961c0dab905a63ad4b8801da0da8d8d84f9e0d679813f2d4ee495f
-MISC metadata.xml 429 SHA256 a7486939ab3ddff40707d3aac83cd7e7ac305b522fc690dace4ec981babf2e74 SHA512 f6a0d1a934d1f825144fadbee8ab0fccceaf40af59cc44a90caed059a503672b18a1c16fee9bb045a9ab272ad5553b1d49fff67d43c7a8ff97dc5c31cdea37b6 WHIRLPOOL 842336716a3ee12427d7fa33a3b38cffa9f25a7ee474d0587924e81dc7265115ced4c3338930e2199701058140bc46bc133caece3467678b92ecd81b5b9988e3
+DIST docker-compose-1.17.1.tar.gz 219947 BLAKE2B a5438e66f156b98ffc9ecf63a57443610f76713532369d519689b697dbc91bd196e24b831882a4c39a43c5b17640242d98f47a2c337832395dc48019d58e3e90 SHA512 711c0a73546f0b396a920d3310b92fc15e3c13f93439eeda363124c9bd971aa942395b2405ad7441df8982384be367c20a767fe5b9e3e150690b63deda58f553
+EBUILD docker-compose-1.17.1.ebuild 2423 BLAKE2B 7433d3916716bc54512a96f7f5c21bea1a9e4adf5c1ae4365c557ad947c9e6b589adc3282be61a7ffb69da539bda12a1ef86b927864e5e1d801e65a971680758 SHA512 0906703570ef80c4bf8283c3700ee63925a15d587b2f5fe67a09787dc4f2ff7727c5533c7a811843398e9dcc256da771e4958f7babc76b0e46b99c3d85fe3d25
+MISC metadata.xml 429 BLAKE2B 5fcdac021eec2c1a600a4aaaefde691120f47d20fe1d5b218153e933f92f42d1008fc832139100cde6267f41adc33944efc378fed4205fd68c9240a8bdb46a1c SHA512 f6a0d1a934d1f825144fadbee8ab0fccceaf40af59cc44a90caed059a503672b18a1c16fee9bb045a9ab272ad5553b1d49fff67d43c7a8ff97dc5c31cdea37b6
diff --git a/app-emulation/docker-compose/docker-compose-1.16.1-r1.ebuild b/app-emulation/docker-compose/docker-compose-1.16.1-r1.ebuild
deleted file mode 100644
index e3bff20d7e04..000000000000
--- a/app-emulation/docker-compose/docker-compose-1.16.1-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 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 bash-completion-r1 distutils-r1 vcs-snapshot
-
-MY_PV=${PV//_/}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://www.docker.com/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-CDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/cached-property-2[${PYTHON_USEDEP}]
-	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
-	<dev-python/dockerpty-0.5[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	<dev-python/docker-py-3.0[${PYTHON_USEDEP}]
-	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-	<dev-python/docopt-0.7[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3[${PYTHON_USEDEP}]
-	>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-	!~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	<dev-python/pyyaml-4[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.11.0[${PYTHON_USEDEP}]
-	<dev-python/requests-2.12[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/six-2[${PYTHON_USEDEP}]
-	>=dev-python/texttable-0.9[${PYTHON_USEDEP}]
-	<dev-python/texttable-0.10[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	<dev-python/websocket-client-1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '<dev-python/enum34-2[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
-	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
-"
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_test() {
-	${PYTHON} -m pytest tests/unit || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp contrib/completion/bash/docker-compose ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completion/zsh/*
-
-	distutils-r1_python_install_all
-}