gentoo resync : 09.06.2018

5 files changed, 5 insertions, 151 deletions

diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
index d51945cef578..2a631ffae35f 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1,9 +1,5 @@
-DIST docker-compose-1.18.0.tar.gz 231256 BLAKE2B be9b57dd89a81734b850f61622a924a3ace5ace907c4d1365a18315ddfbe3f1a9a56b222766980d16d5eddbe6818caf94a5833c5cddac082fa230bf290977ee3 SHA512 9cf29d892f6419e9ef639e1b9edddecb47ddb5ba7f97830f732e463ee510ac5464d6d81f58a2bf4ae5e7aee78b3d2d4afd59e6e1b53974899edb3e090bcb991f
 DIST docker-compose-1.19.0.tar.gz 238307 BLAKE2B 2a7bbcf50c2cc591eba1d59db30cb0341e33e3f1ebe948e0b6762d9bffcdcc72d98e2da19fc549c5fabda192fca69a9d54e016601ddb4f4a94f0dc1c93f99a29 SHA512 f1d522621580a5130378508e6b15ad2e4708e9c5ff713627ca54308ab3e6bf000e21c55bbdf9585b2116e73648fdc773500a5415ab81a72dd2c69c9c07e71581
-DIST docker-compose-1.20.1.tar.gz 246159 BLAKE2B 32836f06239d6f1506ecebac48c8b56c58620d0ba309b8469c073ec3b048bf3743afb1ff6f63d2031df4bb316191d9cd32d5cf85a2cb86544254c6054a7dd502 SHA512 faba24ea501c4e4aaf04bddf1d498eaa7702385458ac7a41f6054e9153f9e03e1e6f50aebc5156d6a814d567aedea1d16ff532872a1765bbabbd3c8da47e36e0
-DIST docker-compose-1.21.0.tar.gz 250262 BLAKE2B e27c6a24d9f02a6746e53d42845424d3c2eef0a816106a988a1eb7dfdc7ea39b1025afb6a4bc361bc97af501af554cb4b34ab62c150e500620c3256074d69a44 SHA512 1926abbb67508216312880f3f0ad7a752760f324a0d17548ecefa924f571896a55a7fc5d174f6ef3ede314c488dec8a7edbccdc399eea6d34459cb812cf103ac
-EBUILD docker-compose-1.18.0.ebuild 2421 BLAKE2B 070e116b0354b3965202ea93698a8846c032b774b2a16154d1be5ced36e963780675cad11fdb43b01baf6997b35b85b87907f32fc56ee5daa1191c1c7265eca0 SHA512 988e42951a910fbd70f9605483240ee7fca1c003adde6b1cb7aeb21cd70ef074b5a919db8bd4a8bd89c6dd158041ece024fcc8dc46e1e2c5d69e1de56d27acc7
-EBUILD docker-compose-1.19.0.ebuild 2422 BLAKE2B e1ae8b4b44640361fdc8fca0cdda1ce95340b3cfa564b2d6cf3e0785bf65057ea53e14b773204d1d7c93c142394b3800e78364eaa6cd0ce9372d24135ab73bff SHA512 1b283b87382f6cd0402dfdc4c97cbb16e1c2eb7da645b50bdcadd048054c769ddcf742b7067b686ab1d8288256e713f277d1e97b32c27821bd3c9ce507e4b7ee
-EBUILD docker-compose-1.20.1.ebuild 2422 BLAKE2B 5f465712c50acb6a47baa4ed2c306a418084f3bd761d5f48e085587610769c15b2c61190693c7ac9e50bef6e3aff7a1cbbfc0311c6090fe50992fc4cb7922a82 SHA512 f6a848ea0ea2cb4ef7d9c1715d6d2b4e4f9fe81af1ea79d3f151d00b00b9d3166f55720257c75138d9f80ea27e6a35fa49c6f26e09461c7c5861fcb2d1f9c52c
-EBUILD docker-compose-1.21.0.ebuild 2422 BLAKE2B d63ab5a26c436f3d25d04fd35a94c492392be0a5339197c11c7f163fb1cecea8da010491de89a0902365afdae76160e9a39c37849c0aa38eb29eb8365cc82588 SHA512 ab2fd63ceaf81a4e507bbe6e3552d97bdda89428d3212d915ecd829e10dbe4723a8d2f85954000f48f8a32e2e05e43c4cfeef8688e6b3ae3bbd47ed9f96ec40d
+DIST docker-compose-1.21.2.tar.gz 294070 BLAKE2B c27ce8708f20385ee3f072c4aa832a42dc975d08d71d9e61ce3a822055d606db7e1e7b6e182523e64115922416d5c1baeca14897a241e84873a97aa755bce539 SHA512 6392582d8c6c321458b1163336f1c902548cc250f9ab5b765d144287b006ef6dacdc47199fafbb6efe426e382325b94986aa159df08dec4974a71968862a8435
+EBUILD docker-compose-1.19.0.ebuild 2421 BLAKE2B a65d845d78d53347d4c863d522f87a29b2e26bd8309c2f5e10d4e1c119aba85e92a63dfd3340183509046822d28e70c45e0e2d7f284fd4e9d12ba89847f7284a SHA512 5e993e855076b450709e1c30958b2cb7710624b880e6b0d86d38c5de14a216cf9960f883c6c1ccab7c892d503b2ee9fac58a1c17e754e4ee55e167f8efb76771
+EBUILD docker-compose-1.21.2.ebuild 2425 BLAKE2B 2e2de9361b045256109f654352aa57ef894aff5525341e2f014ac517d036d0c5b1525cc65fb6dc151aee9e791535a9261fef67ad5806df2c5cae8e97078c0695 SHA512 c2b463b2dedd822c04ca93b5463b66342f8676cc59a9a55bb9d685ed67408574a0bf691549a9106218aa4a5f429a5b1af47eb3b85465f0cb475d37e59047494f
 MISC metadata.xml 322 BLAKE2B 4d738cf090acd0f720b7805c8dd1a2288a1779dcf4af21ab5aeb4cf81b609d0bd2a18cbe79c165f9c9e60b993a8b864e1e5c61cfa773c57b08aef468d93a0391 SHA512 6ecf808eb20a0f475101524b1f4b29db49d4fce9bc3408b3e806e225e4de7b5f0c7af019809c329969f25dd050ba164a09effccefea0d2ada8e8bcf9790d39f2
diff --git a/app-emulation/docker-compose/docker-compose-1.18.0.ebuild b/app-emulation/docker-compose/docker-compose-1.18.0.ebuild
deleted file mode 100644
index d2e564ff337a..000000000000
--- a/app-emulation/docker-compose/docker-compose-1.18.0.ebuild
+++ /dev/null
@@ -1,71 +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 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.6.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.19[${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
-}
diff --git a/app-emulation/docker-compose/docker-compose-1.19.0.ebuild b/app-emulation/docker-compose/docker-compose-1.19.0.ebuild
index c457bb00d6d2..a5225f60246c 100644
--- a/app-emulation/docker-compose/docker-compose-1.19.0.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.19.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 
 CDEPEND="
diff --git a/app-emulation/docker-compose/docker-compose-1.20.1.ebuild b/app-emulation/docker-compose/docker-compose-1.20.1.ebuild
deleted file mode 100644
index 9e085b82c016..000000000000
--- a/app-emulation/docker-compose/docker-compose-1.20.1.ebuild
+++ /dev/null
@@ -1,71 +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 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-3.1.4[${PYTHON_USEDEP}]
-	<dev-python/docker-py-4.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.19[${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
-}
diff --git a/app-emulation/docker-compose/docker-compose-1.21.0.ebuild b/app-emulation/docker-compose/docker-compose-1.21.2.ebuild
index 5b03868dc924..2e64dd53e966 100644
--- a/app-emulation/docker-compose/docker-compose-1.21.0.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.21.2.ebuild
@@ -10,7 +10,7 @@ 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"
+SRC_URI="https://github.com/docker/compose/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"