[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/files/, app-emulation/docker-compose/

2020-09-18 Thread Sebastian Pipping
commit: 59ca47f4381864c5a850d7beae2c8ba55852ed00
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Fri Sep 18 10:57:51 2020 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Fri Sep 18 10:59:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59ca47f4

app-emulation/docker-compose: Drop old

Signed-off-by: Sebastian Pipping  gentoo.org>
Package-Manager: Portage-3.0.0, Repoman-2.3.23

 app-emulation/docker-compose/Manifest  |  6 --
 .../docker-compose/docker-compose-1.26.0.ebuild| 72 
 .../docker-compose/docker-compose-1.26.1.ebuild| 72 
 .../docker-compose/docker-compose-1.27.0.ebuild| 73 
 .../docker-compose-1.27.0_rc1.ebuild   | 73 
 .../docker-compose-1.27.0_rc2.ebuild   | 73 
 .../docker-compose-1.27.0_rc3.ebuild   | 73 
 .../files/docker-compose-1.26.0-setup-py.patch | 77 --
 .../files/docker-compose-1.26.1-setup-py.patch | 77 --
 .../files/docker-compose-1.27.0_rc1-setup-py.patch | 67 ---
 10 files changed, 663 deletions(-)

diff --git a/app-emulation/docker-compose/Manifest 
b/app-emulation/docker-compose/Manifest
index bed816d7277..a3fcf072505 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1,10 +1,4 @@
 DIST docker-compose-1.25.5.tar.gz 308569 BLAKE2B 
5d5d1fd60f9bcb87f7e9628dbe10b275996f9af38fb8488a547f4cb5427e6f7aaac09a98a421a0c35a7c2c863713e5de9a490ad21adf080f74a7c3bc4336559b
 SHA512 
efe59bd5e82e12e63c82341ccf5ca11eaebd47c8154a50b40d39bc98ec48c37532919335172a5667f036bab4e884df950ebc4b4ccab8174200cc7ea6683bbbd7
-DIST docker-compose-1.26.0.tar.gz 313311 BLAKE2B 
dc70b7557ce0c51beb177a842f11e16b0e1c4f5ab31f03159b1ffb6f712b884f41bce651e673db63bda4908fd9e7d2c497da3c7568bf038471bad81626e28f25
 SHA512 
b388f8041b921a0d53d15a8fffb9a1f4d79f40e3eaae073fc043ae74189256a5a24eee9a3c63641e3bfbf43d484da806c2a7d732aad38966ba9fb60d8990f512
-DIST docker-compose-1.26.1.tar.gz 313459 BLAKE2B 
8320842047700bf5d38f48c21efeafc294f76505ee33c76fbcc0aba78156699bc2d6ec9cb9e52f99125c3eea0f6c4226eaccf850345cfcdc84327c582408e82a
 SHA512 
e655e4930991f0fa3dca07b6b314442dba11ad4203f0eb8ab7175cb25d6cb16aa846198a2e17d4efea5718e184f7d6b6558d5260a86f07855ff4f7791fe8a3b3
 DIST docker-compose-1.26.2.tar.gz 313494 BLAKE2B 
656bac181547a3484c45d0ede7111384007db8109aaf3673a06b848bb9b27059cfb8b2cd583e6bc7acd0ebbd90d40e485251d473eefe56a6493abe187132e520
 SHA512 
4cb8a2f5e25f17eb842e36dea96fae8862df099d706ec590e6fc0790c7a814bed3bb60ec00207e4afc15bf8ad4ca37075320fd28ee0bea5bbec1646f3aed681f
-DIST docker-compose-1.27.0.tar.gz 308734 BLAKE2B 
c54906a4e895bbd038819cb5a4ed60cf0a3e077df037a4dac257b18f0b6ff37baafd6b4cf4e5c020db4b5f5a548b90e59568d628c9eb8461027a9fa202602ffa
 SHA512 
5c3742afcb97b3aa46f53d29cdc8b6534aa83c63131bd1f404153029fdb2ccfabeedff75b28267518efc13127225af991fe82d599195a6195256bf7658d3bc89
-DIST docker-compose-1.27.0_rc1.tar.gz 308050 BLAKE2B 
347dc4b38feae1d045770ff981a289d9919d47cf7ecf3b46e0c7b996bb3ef6d50a7e36751ca5f996dbe8afbeb0d6fc0967945c3abda05b71024a15efae35fb6c
 SHA512 
ae952d7c20f4f506c2f0126e504c2cff432056ac45547c40273d6113fe2c51d87c363f0943247989db3dcb20059c7a7839b2c5328d71a41a15cf12db6062
-DIST docker-compose-1.27.0_rc2.tar.gz 308129 BLAKE2B 
f057d9754040375f71810bbf09cd6a88c9ff05665b4629e0cf45c457b10ff9c4bde1b7a608addb160bcc183d8559a8cb2397f7a2215c1b14ae39577bdb67826b
 SHA512 
556a3b10144ff37996c6e3cd1562ba3fdde2618757d305ead4f861c6614f27bad0cf539885535ca61abaf9e9739bbb1c2b41c489ba87ad75f947213d4cdace19
-DIST docker-compose-1.27.0_rc3.tar.gz 308370 BLAKE2B 
094a28a4de8f32dfd82e0720a68cdae1493f63dc553e663081df3b9edf89593c76fba6b67eddcd1d1cd22966345e7d9a535e8603ed3a8f619fda41a1a8b1db9f
 SHA512 
ad996f0df612741ce36e3549d846d3fc507f687e41ed4fb5bd694faa48906da7ca4054d56ab90fe2e64d4548955ec366867be29a449044c357e45b147e475fd9
 DIST docker-compose-1.27.2.tar.gz 309004 BLAKE2B 
1017016989b25afa812d2e7251c6dbf45922867d66ef0c69292889a5de8f31908c8d2f418b2c29c319fbd7d0ba4e213d932665e7128b61164295105f35b23579
 SHA512 
2156a2b283d0ace6a8bfb0d6bbe93bfca7cd651c30fdeea4e1fa2acc6a85790d34a869d4625ef83ad11e9ecc1fbc1e9acac6f40eb8ef5225ccc36bab2ddcf847
 DIST docker-compose-1.27.3.tar.gz 309220 BLAKE2B 
eaf066f24bfff893e515a460be9abba79a59e5112a3a34a9002870babefd93950cf92ef66db469102c37e781d7fb986de069eef3fa09e4041b3a43d8bf1a3d30
 SHA512 
43e34760574d1ec009faa7a1fa09d621a2708f01f05819b46c67fe7ebf280807f97d9a5867cbfe75e9af6f097cd3f7c8c8fee66aa5392a4c62cdf44c7fb38075

diff --git a/app-emulation/docker-compose/docker-compose-1.26.0.ebuild 
b/app-emulation/docker-compose/docker-compose-1.26.0.ebuild
deleted file mode 100644
index 15370a280e3..000
--- a/app-emulation/docker-compose/docker-compose-1.26.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2018-2020 Gentoo Authors
-# 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/files/, app-emulation/docker-compose/

2020-07-02 Thread Sebastian Pipping
commit: e020c002dd8839c478164f03858740d7566ce342
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Thu Jul  2 18:07:58 2020 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Thu Jul  2 18:08:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e020c002

app-emulation/docker-compose: 1.26.2

Signed-off-by: Sebastian Pipping  gentoo.org>
Package-Manager: Portage-2.3.99, Repoman-2.3.22

 app-emulation/docker-compose/Manifest  |  1 +
 .../docker-compose/docker-compose-1.26.2.ebuild| 72 
 .../files/docker-compose-1.26.2-setup-py.patch | 77 ++
 3 files changed, 150 insertions(+)

diff --git a/app-emulation/docker-compose/Manifest 
b/app-emulation/docker-compose/Manifest
index b4f1b066cab..9746dd3c415 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -2,3 +2,4 @@ DIST docker-compose-1.25.4.tar.gz 306513 BLAKE2B 
86c779d794deca7ede0adc80041b17a
 DIST docker-compose-1.25.5.tar.gz 308569 BLAKE2B 
5d5d1fd60f9bcb87f7e9628dbe10b275996f9af38fb8488a547f4cb5427e6f7aaac09a98a421a0c35a7c2c863713e5de9a490ad21adf080f74a7c3bc4336559b
 SHA512 
efe59bd5e82e12e63c82341ccf5ca11eaebd47c8154a50b40d39bc98ec48c37532919335172a5667f036bab4e884df950ebc4b4ccab8174200cc7ea6683bbbd7
 DIST docker-compose-1.26.0.tar.gz 313311 BLAKE2B 
dc70b7557ce0c51beb177a842f11e16b0e1c4f5ab31f03159b1ffb6f712b884f41bce651e673db63bda4908fd9e7d2c497da3c7568bf038471bad81626e28f25
 SHA512 
b388f8041b921a0d53d15a8fffb9a1f4d79f40e3eaae073fc043ae74189256a5a24eee9a3c63641e3bfbf43d484da806c2a7d732aad38966ba9fb60d8990f512
 DIST docker-compose-1.26.1.tar.gz 313459 BLAKE2B 
8320842047700bf5d38f48c21efeafc294f76505ee33c76fbcc0aba78156699bc2d6ec9cb9e52f99125c3eea0f6c4226eaccf850345cfcdc84327c582408e82a
 SHA512 
e655e4930991f0fa3dca07b6b314442dba11ad4203f0eb8ab7175cb25d6cb16aa846198a2e17d4efea5718e184f7d6b6558d5260a86f07855ff4f7791fe8a3b3
+DIST docker-compose-1.26.2.tar.gz 313494 BLAKE2B 
656bac181547a3484c45d0ede7111384007db8109aaf3673a06b848bb9b27059cfb8b2cd583e6bc7acd0ebbd90d40e485251d473eefe56a6493abe187132e520
 SHA512 
4cb8a2f5e25f17eb842e36dea96fae8862df099d706ec590e6fc0790c7a814bed3bb60ec00207e4afc15bf8ad4ca37075320fd28ee0bea5bbec1646f3aed681f

diff --git a/app-emulation/docker-compose/docker-compose-1.26.2.ebuild 
b/app-emulation/docker-compose/docker-compose-1.26.2.ebuild
new file mode 100644
index 000..352afa3a5dc
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.26.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 2018-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit bash-completion-r1 distutils-r1
+
+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"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+   >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+   >=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
+   >=dev-python/docker-py-4.2.2[${PYTHON_USEDEP}]
+   >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+   >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+   >=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
+   >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+   dev-python/paramiko[${PYTHON_USEDEP}]
+   >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
+   >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+   >=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+   >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+   >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
+   >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+   test? (
+   >=dev-python/pytest-5[${PYTHON_USEDEP}]
+   >=dev-python/ddt-1.2.2[${PYTHON_USEDEP}]
+   )"
+
+S="${WORKDIR}/compose-${PV}"
+
+PATCHES=(
+   # Bug #679968 -- https://bugs.gentoo.org/679968
+   # Bug #681002 -- https://bugs.gentoo.org/681002
+   "${FILESDIR}"/${PN}-1.26.2-setup-py.patch
+)
+
+DOCS=( CHANGELOG.md README.md )
+
+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() {
+   distutils_install_for_testing
+   ${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/files/docker-compose-1.26.2-setup-py.patch 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/files/, app-emulation/docker-compose/

2020-06-30 Thread Sebastian Pipping
commit: bba3aa9acf5b9af1a3b05d75535214218dc0c2c7
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Tue Jun 30 22:23:17 2020 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Tue Jun 30 22:27:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bba3aa9a

app-emulation/docker-compose: 1.26.1

Signed-off-by: Sebastian Pipping  gentoo.org>
Package-Manager: Portage-2.3.99, Repoman-2.3.22

 app-emulation/docker-compose/Manifest  |  1 +
 .../docker-compose/docker-compose-1.26.1.ebuild| 72 
 .../files/docker-compose-1.26.1-setup-py.patch | 77 ++
 3 files changed, 150 insertions(+)

diff --git a/app-emulation/docker-compose/Manifest 
b/app-emulation/docker-compose/Manifest
index fdae55e9579..b4f1b066cab 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1,3 +1,4 @@
 DIST docker-compose-1.25.4.tar.gz 306513 BLAKE2B 
86c779d794deca7ede0adc80041b17a96b21798d2807065e2c9ea804a95fcaf24a8b92fbcad6c7ce4d1b9d1fb3c9ad348b630e3f10bfd032202995a4c34ab019
 SHA512 
860153fb603d7efcc76535c9997446a2e6fe18f61769d4f05f51b531902a66072be11e3cff012ba80240b0a7802a032495a2a55e053a9784df92b82e5351b72e
 DIST docker-compose-1.25.5.tar.gz 308569 BLAKE2B 
5d5d1fd60f9bcb87f7e9628dbe10b275996f9af38fb8488a547f4cb5427e6f7aaac09a98a421a0c35a7c2c863713e5de9a490ad21adf080f74a7c3bc4336559b
 SHA512 
efe59bd5e82e12e63c82341ccf5ca11eaebd47c8154a50b40d39bc98ec48c37532919335172a5667f036bab4e884df950ebc4b4ccab8174200cc7ea6683bbbd7
 DIST docker-compose-1.26.0.tar.gz 313311 BLAKE2B 
dc70b7557ce0c51beb177a842f11e16b0e1c4f5ab31f03159b1ffb6f712b884f41bce651e673db63bda4908fd9e7d2c497da3c7568bf038471bad81626e28f25
 SHA512 
b388f8041b921a0d53d15a8fffb9a1f4d79f40e3eaae073fc043ae74189256a5a24eee9a3c63641e3bfbf43d484da806c2a7d732aad38966ba9fb60d8990f512
+DIST docker-compose-1.26.1.tar.gz 313459 BLAKE2B 
8320842047700bf5d38f48c21efeafc294f76505ee33c76fbcc0aba78156699bc2d6ec9cb9e52f99125c3eea0f6c4226eaccf850345cfcdc84327c582408e82a
 SHA512 
e655e4930991f0fa3dca07b6b314442dba11ad4203f0eb8ab7175cb25d6cb16aa846198a2e17d4efea5718e184f7d6b6558d5260a86f07855ff4f7791fe8a3b3

diff --git a/app-emulation/docker-compose/docker-compose-1.26.1.ebuild 
b/app-emulation/docker-compose/docker-compose-1.26.1.ebuild
new file mode 100644
index 000..51d5c59583d
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.26.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 2018-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit bash-completion-r1 distutils-r1
+
+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"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+   >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+   >=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
+   >=dev-python/docker-py-4.2.2[${PYTHON_USEDEP}]
+   >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+   >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+   >=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
+   >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+   dev-python/paramiko[${PYTHON_USEDEP}]
+   >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
+   >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+   >=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+   >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+   >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
+   >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+   test? (
+   >=dev-python/pytest-5[${PYTHON_USEDEP}]
+   >=dev-python/ddt-1.2.2[${PYTHON_USEDEP}]
+   )"
+
+S="${WORKDIR}/compose-${PV}"
+
+PATCHES=(
+   # Bug #679968 -- https://bugs.gentoo.org/679968
+   # Bug #681002 -- https://bugs.gentoo.org/681002
+   "${FILESDIR}"/${PN}-1.26.1-setup-py.patch
+)
+
+DOCS=( CHANGELOG.md README.md )
+
+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() {
+   distutils_install_for_testing
+   ${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/files/docker-compose-1.26.1-setup-py.patch 
b/app-emulation/docker-compose/files/docker-compose-1.26.1-setup-py.patch
new file mode 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/files/, app-emulation/docker-compose/

2020-03-20 Thread Michał Górny
commit: 342923070719e0757a2193519b566acff6faede4
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Mar 20 09:03:41 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Mar 20 09:03:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34292307

app-emulation/docker-compose: Remove old (vuln. pyyaml)

Signed-off-by: Michał Górny  gentoo.org>

 app-emulation/docker-compose/Manifest  |  1 -
 .../docker-compose/docker-compose-1.24.0.ebuild| 65 -
 .../docker-compose/docker-compose-1.25.4.ebuild| 68 --
 .../files/docker-compose-1.24.0-setup-py.patch | 58 --
 4 files changed, 192 deletions(-)

diff --git a/app-emulation/docker-compose/Manifest 
b/app-emulation/docker-compose/Manifest
index 619bd7b61cb..27ce8954a3c 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1,2 +1 @@
-DIST docker-compose-1.24.0.tar.gz 307601 BLAKE2B 
cb2a6f96e14c04d0279b25c075182d8f09e5a622e4cee2ce74995224e3a8634cc5f22ccc548b7754bbeb11630c1e638386cb1a6df927b3619cb6e7e3595aac6c
 SHA512 
318c6bf9877147de09526b4d49c3fd86012d85626e7a9a15863ca55a60e10fa85b27429605045d0aaa9933bc2e5f23cbb76856276a874e84793b878a3e86
 DIST docker-compose-1.25.4.tar.gz 306513 BLAKE2B 
86c779d794deca7ede0adc80041b17a96b21798d2807065e2c9ea804a95fcaf24a8b92fbcad6c7ce4d1b9d1fb3c9ad348b630e3f10bfd032202995a4c34ab019
 SHA512 
860153fb603d7efcc76535c9997446a2e6fe18f61769d4f05f51b531902a66072be11e3cff012ba80240b0a7802a032495a2a55e053a9784df92b82e5351b72e

diff --git a/app-emulation/docker-compose/docker-compose-1.24.0.ebuild 
b/app-emulation/docker-compose/docker-compose-1.24.0.ebuild
deleted file mode 100644
index 96eaada3ce3..000
--- a/app-emulation/docker-compose/docker-compose-1.24.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2018-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit bash-completion-r1 distutils-r1
-
-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"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-   >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
-   >=dev-python/docker-py-3.7.0[${PYTHON_USEDEP}]
-   >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
-   >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-   >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
-   dev-python/paramiko[${PYTHON_USEDEP}]
-   >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
-   >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-   >=dev-python/requests-2.18.1[${PYTHON_USEDEP}]
-   >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-   >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
-   >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-   test? ( https://bugs.gentoo.org/679968
-   # Bug #681002 -- https://bugs.gentoo.org/681002
-   "${FILESDIR}"/${PN}-1.24.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() {
-   distutils_install_for_testing
-   ${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.25.4.ebuild 
b/app-emulation/docker-compose/docker-compose-1.25.4.ebuild
deleted file mode 100644
index 7fd5d941ab5..000
--- a/app-emulation/docker-compose/docker-compose-1.25.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2018-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit bash-completion-r1 distutils-r1
-
-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"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-   >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
-   >=dev-python/docker-py-3.7.0[${PYTHON_USEDEP}]
-   >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
-   >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-   >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
-   

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/files/, app-emulation/docker-compose/

2019-11-28 Thread Sebastian Pipping
commit: 0dff3c31f19740553c5a8f8675e11853bd398496
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Thu Nov 28 20:53:26 2019 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Thu Nov 28 20:55:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dff3c31

app-emulation/docker-compose: Fix 1.25.0 for py27

Closes: https://bugs.gentoo.org/701394
Signed-off-by: Sebastian Pipping  gentoo.org>
Package-Manager: Portage-2.3.78, Repoman-2.3.16

 ...se-1.25.0.ebuild => docker-compose-1.25.0-r1.ebuild} |  4 +++-
 .../files/docker-compose-1.25.0-setup-py.patch  | 17 +
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app-emulation/docker-compose/docker-compose-1.25.0.ebuild 
b/app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild
similarity index 90%
rename from app-emulation/docker-compose/docker-compose-1.25.0.ebuild
rename to app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild
index b90ebe18f8e..a6f8868eab7 100644
--- a/app-emulation/docker-compose/docker-compose-1.25.0.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild
@@ -30,9 +30,11 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep 
'>=dev-python/backports-shutil_get_terminal_size-1.0.0[${PYTHON_USEDEP}]' 
'python2_7' )
+   $(python_gen_cond_dep 
'>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' )
$(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' )"
+   $(python_gen_cond_dep 
'>=dev-python/subprocess32-3.5.4[${PYTHON_USEDEP}]' 'python2_7' )"
 
 DEPEND="${RDEPEND}
test? ( 
 Date: Mon, 18 Nov 2019 23:34:51 +0100
 Subject: [PATCH] setup.py: Drop generic upper version boundaries
 
 ---
- setup.py | 36 ++--
- 1 file changed, 18 insertions(+), 18 deletions(-)
+ setup.py | 38 +++---
+ 1 file changed, 19 insertions(+), 19 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 23ae08a..97a8fbe 100644
+index 23ae08a..3f6a46f 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -30,35 +30,35 @@ def find_version(*file_paths):
@@ -52,13 +52,14 @@ index 23ae08a..97a8fbe 100644
 -':python_version < "3.2"': ['subprocess32 >= 3.5.4, < 4'],
 -':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'],
 -':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'],
-+':python_version < "3.2"': ['subprocess32 >= 3.5.4'],
-+':python_version < "3.4"': ['enum34 >= 1.0.4'],
-+':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
- ':python_version < "3.3"': ['backports.shutil_get_terminal_size == 1.0.0',
+-':python_version < "3.3"': ['backports.shutil_get_terminal_size == 1.0.0',
 -'ipaddress >= 1.0.16, < 2'],
 -':sys_platform == "win32"': ['colorama >= 0.4, < 1'],
 -'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
++':python_version < "3.2"': ['subprocess32 >= 3.5.4'],
++':python_version < "3.4"': ['enum34 >= 1.0.4'],
++':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
++':python_version < "3.3"': ['backports.shutil_get_terminal_size >= 1.0.0',
 +'ipaddress >= 1.0.16'],
 +':sys_platform == "win32"': ['colorama >= 0.4'],
 +'socks': ['PySocks >= 1.5.6, != 1.5.7'],



[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/files/, app-emulation/docker-compose/

2019-07-07 Thread Sebastian Pipping
commit: 6fd9b25683c4fd0c40e6aa2b37d57f9733ed239d
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Sun Jul  7 14:21:43 2019 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Sun Jul  7 14:22:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fd9b256

app-emulation/docker-compose: Remove old

Signed-off-by: Sebastian Pipping  gentoo.org>
Package-Manager: Portage-2.3.67, Repoman-2.3.12

 app-emulation/docker-compose/Manifest  |  1 -
 .../docker-compose/docker-compose-1.23.2-r1.ebuild | 67 ---
 .../docker-compose/docker-compose-1.23.2.ebuild| 75 --
 .../files/docker-compose-1.23.2-setup-py.patch | 58 -
 4 files changed, 201 deletions(-)

diff --git a/app-emulation/docker-compose/Manifest 
b/app-emulation/docker-compose/Manifest
index ffe2528f81e..677fb229edc 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1,3 +1,2 @@
-DIST docker-compose-1.23.2.tar.gz 302950 BLAKE2B 
b96db2e718bd6b05f6a35829749570320209def17b7536e402b9991b56e05a2d8da97fbd8d79d8125d9df6ff361a181fbfd71346a33a68704db0327a92757f66
 SHA512 
baa233c84ac770798ba3d8d256687630b331d774a8d60f3c0d5046aa0a74c8c3b8b0b8bc4431f3bc7d5b7a54f0646f5e2fd14d5af31db37cb546e86c96c8c1db
 DIST docker-compose-1.24.0.tar.gz 307601 BLAKE2B 
cb2a6f96e14c04d0279b25c075182d8f09e5a622e4cee2ce74995224e3a8634cc5f22ccc548b7754bbeb11630c1e638386cb1a6df927b3619cb6e7e3595aac6c
 SHA512 
318c6bf9877147de09526b4d49c3fd86012d85626e7a9a15863ca55a60e10fa85b27429605045d0aaa9933bc2e5f23cbb76856276a874e84793b878a3e86
 DIST docker-compose-1.24.1.tar.gz 307749 BLAKE2B 
7ded0a4b82a7a9beb9de38752f38998ca4ea9421e5ed5630627820ec7e250ad6f03f6788bcbebe8bc0dd4c064d275bb4ca5a6055a95b6a0f72d7ae9038ec7f22
 SHA512 
9b8632ef263b8dfa678e8b99b46e00441f779716a524280ce25f62fcd2605f400723b7790c466338374c34653946dc2c5d7f09593ddd892fee3409c2a2fd1a5f

diff --git a/app-emulation/docker-compose/docker-compose-1.23.2-r1.ebuild 
b/app-emulation/docker-compose/docker-compose-1.23.2-r1.ebuild
deleted file mode 100644
index 15e7493fe93..000
--- a/app-emulation/docker-compose/docker-compose-1.23.2-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2018-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit bash-completion-r1 distutils-r1
-
-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"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-   >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
-   >=dev-python/docker-py-3.6.0[${PYTHON_USEDEP}]
-   >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
-   >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-   >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
-   >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
-   >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-   >=dev-python/requests-2.18.1[${PYTHON_USEDEP}]
-   >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-   >=dev-python/texttable-0.9.0[${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="${RDEPEND}
-   test? ( =dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 
'python2_7' ) )"
-
-S="${WORKDIR}/compose-${PV}"
-
-PATCHES=(
-   # Bug #679968 -- https://bugs.gentoo.org/679968
-   # Bug #681002 -- https://bugs.gentoo.org/681002
-   "${FILESDIR}"/${PN}-1.23.2-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() {
-   distutils_install_for_testing
-   ${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.23.2.ebuild 
b/app-emulation/docker-compose/docker-compose-1.23.2.ebuild
deleted file mode 100644
index c9a313c7e29..000
--- a/app-emulation/docker-compose/docker-compose-1.23.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2018-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/files/, app-emulation/docker-compose/

2019-05-10 Thread Sebastian Pipping
commit: f2777951efa218a63fadb93dd78e33fedac5d157
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Fri May 10 22:41:18 2019 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Fri May 10 22:41:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2777951

app-emulation/docker-compose: 1.24.0

Closes: https://bugs.gentoo.org/682148
Signed-off-by: Sebastian Pipping  gentoo.org>
Package-Manager: Portage-2.3.65, Repoman-2.3.12

 app-emulation/docker-compose/Manifest  |  1 +
 .../docker-compose/docker-compose-1.24.0.ebuild| 67 ++
 .../files/docker-compose-1.24.0-setup-py.patch | 58 +++
 3 files changed, 126 insertions(+)

diff --git a/app-emulation/docker-compose/Manifest 
b/app-emulation/docker-compose/Manifest
index 6c1ed1c4939..fdfb476798a 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1 +1,2 @@
 DIST docker-compose-1.23.2.tar.gz 302950 BLAKE2B 
b96db2e718bd6b05f6a35829749570320209def17b7536e402b9991b56e05a2d8da97fbd8d79d8125d9df6ff361a181fbfd71346a33a68704db0327a92757f66
 SHA512 
baa233c84ac770798ba3d8d256687630b331d774a8d60f3c0d5046aa0a74c8c3b8b0b8bc4431f3bc7d5b7a54f0646f5e2fd14d5af31db37cb546e86c96c8c1db
+DIST docker-compose-1.24.0.tar.gz 307601 BLAKE2B 
cb2a6f96e14c04d0279b25c075182d8f09e5a622e4cee2ce74995224e3a8634cc5f22ccc548b7754bbeb11630c1e638386cb1a6df927b3619cb6e7e3595aac6c
 SHA512 
318c6bf9877147de09526b4d49c3fd86012d85626e7a9a15863ca55a60e10fa85b27429605045d0aaa9933bc2e5f23cbb76856276a874e84793b878a3e86

diff --git a/app-emulation/docker-compose/docker-compose-1.24.0.ebuild 
b/app-emulation/docker-compose/docker-compose-1.24.0.ebuild
new file mode 100644
index 000..1efb5d463ed
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.24.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_6} )
+
+inherit bash-completion-r1 distutils-r1
+
+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"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+   >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+   >=dev-python/docker-py-3.7.0[${PYTHON_USEDEP}]
+   >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+   >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+   >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+   dev-python/paramiko[${PYTHON_USEDEP}]
+   >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
+   >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+   >=dev-python/requests-2.18.1[${PYTHON_USEDEP}]
+   >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+   >=dev-python/texttable-0.9.0[${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="${RDEPEND}
+   test? ( dev-python/pytest[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 
'python2_7' ) )"
+
+S="${WORKDIR}/compose-${PV}"
+
+PATCHES=(
+   # Bug #679968 -- https://bugs.gentoo.org/679968
+   # Bug #681002 -- https://bugs.gentoo.org/681002
+   "${FILESDIR}"/${PN}-1.24.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() {
+   distutils_install_for_testing
+   ${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/files/docker-compose-1.24.0-setup-py.patch 
b/app-emulation/docker-compose/files/docker-compose-1.24.0-setup-py.patch
new file mode 100644
index 000..1632a018bd4
--- /dev/null
+++ b/app-emulation/docker-compose/files/docker-compose-1.24.0-setup-py.patch
@@ -0,0 +1,58 @@
+From 981faad5f67a843f2b6c44f40be4dc8d2c5156c7 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping 
+Date: Sat, 11 May 2019 00:32:22 +0200
+Subject: [PATCH] setup.py: Drop generic upper version boundaries
+
+---
+ setup.py | 26 +-
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/files/, app-emulation/docker-compose/

2019-05-10 Thread Sebastian Pipping
commit: da5c9b70bf178b68f852270718ef67dcbbfcb0c7
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Fri May 10 22:08:44 2019 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Fri May 10 22:26:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da5c9b70

app-emulation/docker-compose: Fix dependencies

This unblocks system-wide updates of e.g.
- dev-python/jsonschema-3.0.1
- dev-python/pyyaml-5.1
- dev-python/texttable-1.6.1
Closes: https://bugs.gentoo.org/681002
Bug: https://bugs.gentoo.org/679968

Signed-off-by: Sebastian Pipping  gentoo.org>
Package-Manager: Portage-2.3.65, Repoman-2.3.12

 .../docker-compose/docker-compose-1.23.2-r1.ebuild | 66 ++
 .../files/docker-compose-1.23.2-setup-py.patch | 58 +++
 2 files changed, 124 insertions(+)

diff --git a/app-emulation/docker-compose/docker-compose-1.23.2-r1.ebuild 
b/app-emulation/docker-compose/docker-compose-1.23.2-r1.ebuild
new file mode 100644
index 000..df1a0e87a65
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.23.2-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_6} )
+
+inherit bash-completion-r1 distutils-r1
+
+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"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+   >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+   >=dev-python/docker-py-3.6.0[${PYTHON_USEDEP}]
+   >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+   >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+   >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+   >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
+   >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+   >=dev-python/requests-2.18.1[${PYTHON_USEDEP}]
+   >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+   >=dev-python/texttable-0.9.0[${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="${RDEPEND}
+   test? ( dev-python/pytest[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 
'python2_7' ) )"
+
+S="${WORKDIR}/compose-${PV}"
+
+PATCHES=(
+   # Bug #679968 -- https://bugs.gentoo.org/679968
+   # Bug #681002 -- https://bugs.gentoo.org/681002
+   "${FILESDIR}"/${PN}-1.23.2-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() {
+   distutils_install_for_testing
+   ${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/files/docker-compose-1.23.2-setup-py.patch 
b/app-emulation/docker-compose/files/docker-compose-1.23.2-setup-py.patch
new file mode 100644
index 000..193ece1c09f
--- /dev/null
+++ b/app-emulation/docker-compose/files/docker-compose-1.23.2-setup-py.patch
@@ -0,0 +1,58 @@
+From 15b1ac5bfeb0ca2a8524dae10db7573b4efacba9 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping 
+Date: Fri, 10 May 2019 23:54:14 +0200
+Subject: [PATCH] setup.py: Drop generic upper version boundaries
+
+---
+ setup.py | 26 +-
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 22dafdb..00167ce 100644
+--- a/setup.py
 b/setup.py
+@@ -30,16 +30,16 @@ def find_version(*file_paths):
+ 
+ 
+ install_requires = [
+-'cached-property >= 1.2.0, < 2',
+-'docopt >= 0.6.1, < 0.7',
+-'PyYAML >= 3.10, < 4',
+-'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.21',
+-'texttable >= 0.9.0, < 0.10',
+-'websocket-client >= 0.32.0, < 1.0',
+-'docker >= 3.6.0, < 4.0',
+-'dockerpty >= 0.4.1, < 0.5',
+-'six >= 1.3.0, < 2',
+-'jsonschema >= 2.5.1, < 3',
++'cached-property >= 1.2.0',
++'docopt >= 0.6.1',
++'PyYAML >= 3.10',
++'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0',
++'texttable >= 0.9.0',
++'websocket-client >= 0.32.0',
++'docker >= 3.6.0',
++'dockerpty >= 0.4.1',
++'six >= 1.3.0',
++

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/files/, app-emulation/docker-compose/

2018-10-31 Thread Sebastian Pipping
commit: 53e4fdb64cdd2662c153d0f3769e402f8996ee3b
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Wed Oct 31 17:57:07 2018 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Wed Oct 31 17:58:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53e4fdb6

app-emulation/docker-compose: 1.23.0

Signed-off-by: Sebastian Pipping  gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11

 app-emulation/docker-compose/Manifest  |  1 +
 .../docker-compose/docker-compose-1.23.0.ebuild| 73 ++
 .../files/docker-compose-1.23.0-setup-py.patch | 59 +
 3 files changed, 133 insertions(+)

diff --git a/app-emulation/docker-compose/Manifest 
b/app-emulation/docker-compose/Manifest
index 25a210d5bfc..bc123b2ca6d 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1,3 +1,4 @@
 DIST docker-compose-1.19.0.tar.gz 238307 BLAKE2B 
2a7bbcf50c2cc591eba1d59db30cb0341e33e3f1ebe948e0b6762d9bffcdcc72d98e2da19fc549c5fabda192fca69a9d54e016601ddb4f4a94f0dc1c93f99a29
 SHA512 
f1d522621580a5130378508e6b15ad2e4708e9c5ff713627ca54308ab3e6bf000e21c55bbdf9585b2116e73648fdc773500a5415ab81a72dd2c69c9c07e71581
 DIST docker-compose-1.21.2.tar.gz 294070 BLAKE2B 
c27ce8708f20385ee3f072c4aa832a42dc975d08d71d9e61ce3a822055d606db7e1e7b6e182523e64115922416d5c1baeca14897a241e84873a97aa755bce539
 SHA512 
6392582d8c6c321458b1163336f1c902548cc250f9ab5b765d144287b006ef6dacdc47199fafbb6efe426e382325b94986aa159df08dec4974a71968862a8435
 DIST docker-compose-1.22.0.tar.gz 296747 BLAKE2B 
9dfd25fb186436801d9c12900c4103c1c0d83bee3b424b3f2373247aeeb8261fed04cf9be9cee230a48e1c19523b48d5618a18f322c236bac1d769036f9ac979
 SHA512 
eccef2165221fcfdac089ffd3bd0795d08d8c6f7158709dbc2fc83a6d6e9466af4b73c0c7d24a751c6b546b4219e10dfc96cd41e13e7ebc676da603c97b7620e
+DIST docker-compose-1.23.0.tar.gz 302110 BLAKE2B 
0239d787a383c983d9965cecb087ff8d3050cd98bba0c324ea8f12f062f1b582fcfb20498d0cd0e323fe0912439f6ba288798f5c3d83e3c6a77fb298225fdf3a
 SHA512 
b22f4c76e4187e9a01186516bbfaf988e9fc3e74e7a8455b6424cec61572a621d82f7bec9e23188fa297da26b0777c83d01374a628575d73fbb95502fb27d2db

diff --git a/app-emulation/docker-compose/docker-compose-1.23.0.ebuild 
b/app-emulation/docker-compose/docker-compose-1.23.0.ebuild
new file mode 100644
index 000..504a8d4449a
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.23.0.ebuild
@@ -0,0 +1,73 @@
+# 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/colorama-0.4[${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}"/${P}-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 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-compose/files/, app-emulation/docker-compose/

2015-08-29 Thread Alex Brandt
commit: 6772acaf064fb55b2b3d827ce4e733b59d383b4a
Author: Alex Brandt alunduil AT gentoo DOT org
AuthorDate: Sat Aug 29 20:51:32 2015 +
Commit: Alex Brandt alunduil AT gentoo DOT org
CommitDate: Sat Aug 29 20:51:32 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6772acaf

app-emulation/docker-compose: add version 1.4.0

Package-Manager: portage-2.2.20.1

 app-emulation/docker-compose/Manifest  |  1 +
 .../docker-compose/docker-compose-1.4.0.ebuild | 65 ++
 .../files/expand-request-versions.patch| 13 +
 3 files changed, 79 insertions(+)

diff --git a/app-emulation/docker-compose/Manifest 
b/app-emulation/docker-compose/Manifest
index fe0f618..a2bae4a 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1 +1,2 @@
 DIST docker-compose-1.2.0.tar.gz 57150 SHA256 
46ef3c5cb7dd79fa7fd1d5fc5ec5be6a5c634192bc09c604c0ea75adb89cb652 SHA512 
d13f6d6d22979dbc4554c003e611097627e2273f06dd13a1c666c1ba138288597ebef08f1beaf6d342721391cb49ad5ce9ae2ff03367a041fc0c53fbb62c9ac4
 WHIRLPOOL 
c7bb3e14a4c2788eb49241ce02dcaed5e49fe60652ca1a51d13e1712f946046415f5397d5bf892b5e0451059a4aee1b156ee7bdfdf64a22d000caae7b17254c0
+DIST docker-compose-1.4.0.tar.gz 79532 SHA256 
2748cc8dd0829b44f0f686e36683cab58e1a4bc869442a04508504d2f62d0337 SHA512 
470442aa78ddb24e8b9287953031e17a96a89780edd3a85955c923ffe00f4bfe655412dc15422437121593d7e2899f0847813d3716fc9ed576f93e6455cb868b
 WHIRLPOOL 
9dc6731dad3df6422ec1e1b66049c8e9f04068b2fc2c8180da44220c1fbedc4919dfe17475cd539c3f33a079f3d04f875baaf769a7bc0875de48cf622670dc4b

diff --git a/app-emulation/docker-compose/docker-compose-1.4.0.ebuild 
b/app-emulation/docker-compose/docker-compose-1.4.0.ebuild
new file mode 100644
index 000..9727762
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.4.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: 
/var/cvsroot/gentoo-x86/app-emulation/docker-compose/docker-compose-1.2.0-r1.ebuild,v
 1.1 2015/05/02 15:59:55 alunduil Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION=Multi-container orchestration for Docker
+HOMEPAGE=https://www.docker.com/;
+SRC_URI=mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+
+LICENSE=Apache-2.0
+SLOT=0
+KEYWORDS=~amd64
+IUSE=test
+
+CDEPEND=
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   =dev-python/dockerpty-0.3.4[${PYTHON_USEDEP}]
+   dev-python/dockerpty-0.4[${PYTHON_USEDEP}]
+   =dev-python/docker-py-1.3.1[${PYTHON_USEDEP}]
+   dev-python/docker-py-1.4[${PYTHON_USEDEP}]
+   =dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+   dev-python/docopt-0.7[${PYTHON_USEDEP}]
+   =dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+   dev-python/pyyaml-4[${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.8.1[${PYTHON_USEDEP}]
+   dev-python/texttable-0.9[${PYTHON_USEDEP}]
+   =dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+   dev-python/websocket-client-1.0[${PYTHON_USEDEP}]
+
+DEPEND=
+   test? (
+   ${CDEPEND}
+   =dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+   dev-python/nose[${PYTHON_USEDEP}]
+   )
+
+RDEPEND=${CDEPEND}
+
+python_prepare_all() {
+   local PATCHES=(
+   ${FILESDIR}/expand-request-versions.patch
+   )
+
+   distutils-r1_python_prepare_all
+}
+
+python_test() {
+   nosetests 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/files/expand-request-versions.patch 
b/app-emulation/docker-compose/files/expand-request-versions.patch
new file mode 100644
index 000..a1c9bb5
--- /dev/null
+++ b/app-emulation/docker-compose/files/expand-request-versions.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index 9bca475..5ea5e73 100644
+--- a/setup.py
 b/setup.py
+@@ -27,7 +27,7 @@ def find_version(*file_paths):
+ install_requires = [
+ 'docopt = 0.6.1,  0.7',
+ 'PyYAML = 3.10,  4',
+-'requests = 2.6.1,  2.7',
++'requests = 2.6.1',
+ 'texttable = 0.8.1,  0.9',
+ 'websocket-client = 0.32.0,  1.0',
+ 'docker-py = 1.3.1,  1.4',