gentoo resync : 18.11.2018

3 files changed, 78 insertions, 2 deletions

diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
index fde387a6b502..a1b2fe032fe4 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -8,5 +8,6 @@ EBUILD docker-compose-1.19.0.ebuild 2421 BLAKE2B a65d845d78d53347d4c863d522f87a2
 EBUILD docker-compose-1.21.2-r1.ebuild 2425 BLAKE2B f843c549ec46b148b41640834e838f979fa6f3233ff0da9452bd1ff496802cbc42bd90fdb20dbf8a335505616e0f9fdd7358d34a056d3bfaf96caa1ac879dfb1 SHA512 6b252def3e8afc17d0e9d5a86a7afe118f58f3f207bcf194f2ecf1d91c00495f38b10808a2b538034f8be95944d8904894fdbe1976425ddeba6b26fe97c207ba
 EBUILD docker-compose-1.22.0-r1.ebuild 2239 BLAKE2B fb97dda41ee3054ff833db3cf44ed5ae59b89a5868e94d3648c9e960c2c0f912a2efa885ec7a002b50a7872df574a24c76feaa9057fb053e8c4e5c6a6e534650 SHA512 fb3e0dd948b90a94d86cbab84a69aae411ba28f7f716edca10ae3d798a38a4803b27e73e46899e02cdbf33b54745754dc9e091c6a5a3b6f4c3920409a6314454
 EBUILD docker-compose-1.22.0.ebuild 2663 BLAKE2B 9a248b369b945b8153cdf21d8eb4a1980dfed4e9575a688a5313436d21494efe5d03dc619cff66b5ca768d7177d6ce3f83dba349f80488c1685321111a35e90a SHA512 b295eb70ebe8f5f315426763baf7156866fbff61a23fbf22b0a9428f5020e9b0bf902596d74d6704489803c6e03b67e631fb0ad07bc03963fb04f9cc90ff1dfc
+EBUILD docker-compose-1.23.1-r1.ebuild 2242 BLAKE2B ae7b79572dc26ac32fa073ed4c6abec2aad688ce8505197c40a0aeecce1d145fa3414a6a61506b95270728c31bcb952a99b2f0fbe162bf78c9e75821cd661ede SHA512 628ebae7001febfe6f1d548897744aa965da9744a6ab5e29e6d503592d5f6018d337d7adb8994d47c000fc6cb8efa76108036040154d6f59f303462e0a4f03a9
 EBUILD docker-compose-1.23.1.ebuild 2287 BLAKE2B f8587452e6300356dad5f5776a7fd0cfb8eace7ca22f908e9636c0c798603b0241fe25184912f04121b0ae73b97dcc321f5fb447ef6965571b5764444215000f SHA512 ac5b509ef5d89bcb167db451380fe62cdcf66d1498b5ead7af89ff4c58eb84d52ff82185aada914c36f7e120a0e9685d7fba99c6e1cc2859e737ff28dee69e01
-MISC metadata.xml 244 BLAKE2B 53209cee097c735489cfd00cf11508c9c89872fa32e72c97913a05a07221167a2369f1e631c7d345ecebce3d8848382cc1fa72c9e06b014fa8684e8a7078e33a SHA512 20242e3498fac7637e5edd6a175e303579f6a20e250e0f0ae420a8dc38ba7caf3659407acd1ea9eee79d5d28aacab8def3bacc4f8f0c984916a21392b26c9dc9
+MISC metadata.xml 324 BLAKE2B 3ce39fdfe98f2c15cb17f46998dcf6a48a87368d0d71563ccd3325e305f88778531dcf21d0cbd335b1a9fc0e780d0ebcc5b51100b95a82223ee5436569753a8e SHA512 d8d5f8f462a459745a4b8a540b0fd648687b442df46c5f50413fa81df2a7d78ad27e7a615e2a77b96f5880840a942a69c350a375ed6ad4ea3a1f3fb4eb3ca7df
diff --git a/app-emulation/docker-compose/docker-compose-1.23.1-r1.ebuild b/app-emulation/docker-compose/docker-compose-1.23.1-r1.ebuild
new file mode 100644
index 000000000000..51f063dc06f6
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.23.1-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit bash-completion-r1 distutils-r1 vcs-snapshot
+
+MY_PV=${PV/_/}
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/${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/dockerpty-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
+	!~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.11.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/texttable-0.9[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${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}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.23.0-setup-py.patch
+)
+
+src_prepare() {
+	# Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
+	sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
+
+	default
+}
+
+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/metadata.xml b/app-emulation/docker-compose/metadata.xml
index 1dc063455da0..5098f7be1a77 100644
--- a/app-emulation/docker-compose/metadata.xml
+++ b/app-emulation/docker-compose/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="person">
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">docker-compose</remote-id>
 	</upstream>