From 22b4e2ee9c8011b75d7c030d6129a7487494aeba Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 13 Dec 2023 05:39:05 +0000 Subject: gentoo auto-resync : 13:12:2023 - 05:39:04 --- app-containers/Manifest.gz | Bin 8894 -> 8892 bytes app-containers/docker-compose/Manifest | 4 +- .../docker-compose/docker-compose-1.29.2-r3.ebuild | 2 +- .../docker-compose/docker-compose-1.29.2-r4.ebuild | 73 --------------------- .../docker-compose/docker-compose-1.29.2-r5.ebuild | 73 +++++++++++++++++++++ 5 files changed, 76 insertions(+), 76 deletions(-) delete mode 100644 app-containers/docker-compose/docker-compose-1.29.2-r4.ebuild create mode 100644 app-containers/docker-compose/docker-compose-1.29.2-r5.ebuild (limited to 'app-containers') diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz index 219400b54476..ed9b9d8766ef 100644 Binary files a/app-containers/Manifest.gz and b/app-containers/Manifest.gz differ diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest index 4349de276f2d..c2172cf80218 100644 --- a/app-containers/docker-compose/Manifest +++ b/app-containers/docker-compose/Manifest @@ -7,8 +7,8 @@ DIST docker-compose-2.20.3-deps.tar.xz 182138348 BLAKE2B db61f405421b609ef68a667 DIST docker-compose-2.20.3.gh.tar.gz 336432 BLAKE2B c4c5c26e722b081363d0c28cb49483393ad3c8abdfddab6f3054997bd3389c4db92aa6698f205b990d976759f14143706a949db9ee69dc20953e1270525d3eb9 SHA512 d533318bbe550568a2c5bd43c6fa6d1d9b3887f09b6d75f278687dc28d23c4863c618599a816b7789a19182acaf869b6785c4bfc3a9b26d6329f1ac97b8059cf DIST docker-compose-2.23.0-deps.tar.xz 163606408 BLAKE2B 56c60b81d7efd273309b71359f6286a546054db7d56851ba2a6b48c201e32c32fc596ec9e2f31f33988a45190f19a871fd28d3c639a35d1489511a7dda39984c SHA512 a1ed81259df7d84cb5fcb377ac7cd8d8f4b1b56b9c5006c1aa257d6f7834efc1fa69dfc6b50d4813dc89439d308573271d7c5c4115761d13083164080fae49b8 DIST docker-compose-2.23.0.gh.tar.gz 343649 BLAKE2B 687f4aed8a4fa4edfb92b36a21210fec29d95fc441d5aee93f47b3f42b883f84b929fc72e0243e7816292ff51354aaa543069628de1a369d7f9832d64a0a1e73 SHA512 c6bb3041f8bc23ecf9932fdc1d0c88283848026083b1854770506fee7f1dbec2f605e6eaf159705ab8ed3f1b9669b8474addac61564b37aff84ea994abb88f4e -EBUILD docker-compose-1.29.2-r3.ebuild 1998 BLAKE2B 827dde967df73cb92a2802109d59ef1441fbc0b1733b52fddbb35fbcd4b3b88d4340bb5c334f3825ad99a574985c245af068396ad28931e591e670096459c47e SHA512 487f142c244752570686c0d3d31edd16ac5a4a80fb55e4cf2982d8b7f168d5b1e833a492d658a073ad36613cd1df894d8c5e829bd34470067e9b007b58708cfe -EBUILD docker-compose-1.29.2-r4.ebuild 2001 BLAKE2B c66cb21498292ba2bbfc9e5d11a711f25018061df11fa170655b7255749396881b831ce164862fa3007f5e7ad94b644561e5e182606de7c99c795be92f8ab405 SHA512 5614a0f06be12e11bb41002c7043a1bcf976612e58b1c4534b17a5c37543ba923ec2fa1aabad282e80ddcccd2950d5c74e3da5719dbb1296a20d6e4040b6ee0c +EBUILD docker-compose-1.29.2-r3.ebuild 1997 BLAKE2B 82626f2fcf36ca840de6eba7243dd0aa22380fcf79e9efbe821fc392f748bfa1dbf45633c9d5e306db0e0878a2487376aab3d18a8466280894e079931c4b4f28 SHA512 1b617b6f8d5c07a30b30e1c4b0c23b1b5c32654fbeeb7b2b4f979b01ae50983cc2bdfb6e2d4c899813e04a64f6ccec1d19d8c5e0629fed8ca5658c9d93373e4c +EBUILD docker-compose-1.29.2-r5.ebuild 2000 BLAKE2B 658f405b7440c30aae9769814f64f01c3a5ae143fd759dca323edc507e5288b231dc514b5558b8a997b335c0dfff384babd590a09fb36fcd1e92e830f2a5aa8d SHA512 586e236f97df9c67b877c6e7df9a5c79e39ec843670c0ea1e769c964bcdb48b6a185a5eec61be911e97af4541b790f3fa3189e9ff42b71d864f316e4ee3d85de EBUILD docker-compose-2.17.2.ebuild 1140 BLAKE2B d149d01b8ac507dd2d1d1fc1c86ffe0deb16c2046bb91266b65703088e81d7b5f913e71b0e23e701ae27cde3f47123c6c6de4084a3fc2c833e6eec5e2ed982f6 SHA512 14892858782082ad3468b8288bb4c498ef09689b425cc413c0b2da623bea022eea267dabafb9bafcdc0dbd92addb30efdd7e7141099c7fc757a661bbaa4cfa2a EBUILD docker-compose-2.20.3.ebuild 1140 BLAKE2B d149d01b8ac507dd2d1d1fc1c86ffe0deb16c2046bb91266b65703088e81d7b5f913e71b0e23e701ae27cde3f47123c6c6de4084a3fc2c833e6eec5e2ed982f6 SHA512 14892858782082ad3468b8288bb4c498ef09689b425cc413c0b2da623bea022eea267dabafb9bafcdc0dbd92addb30efdd7e7141099c7fc757a661bbaa4cfa2a EBUILD docker-compose-2.23.0.ebuild 1142 BLAKE2B f61b8ce63357b43af16897cad70cd2d2de5eb493cb138728d86211b745a0898daa16fc1176d12d1ceb64c44348c430c68f2500d39e5d842805dabdd7bde9909f SHA512 48039fb898de14543421e8637707ff0ffaa6597424f2f6ae8ca8515e28809af12d97402ce95fb85d2420526238938b9a844bae9cbb6cf1aea9d7a29e1e142aaf diff --git a/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild b/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild index 39eb140045cd..ee0767eba707 100644 --- a/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild +++ b/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild @@ -18,7 +18,7 @@ KEYWORDS="amd64 arm64" RDEPEND=" >=dev-python/distro-1.5.0[${PYTHON_USEDEP}] - >=dev-python/docker-5[${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}] diff --git a/app-containers/docker-compose/docker-compose-1.29.2-r4.ebuild b/app-containers/docker-compose/docker-compose-1.29.2-r4.ebuild deleted file mode 100644 index 6512e3b8ce7f..000000000000 --- a/app-containers/docker-compose/docker-compose-1.29.2-r4.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 2018-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) - -inherit bash-completion-r1 distutils-r1 - -MY_PV=${PV/_/-} -DESCRIPTION="Multi-container orchestration for Docker" -HOMEPAGE="https://github.com/docker/compose" -SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64" - -RDEPEND=" - >=dev-python/distro-1.5.0[${PYTHON_USEDEP}] - >=dev-python/docker-5[${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}] - dev-python/py[${PYTHON_USEDEP}] - )" - -S="${WORKDIR}/compose-${MY_PV}" - -distutils_enable_tests pytest - -PATCHES=( - # Bug #679968 -- https://bugs.gentoo.org/679968 - # Bug #681002 -- https://bugs.gentoo.org/681002 - "${FILESDIR}"/${PN}-1.29.0-setup-py.patch - "${FILESDIR}"/${P}-tests-unit-cli-test-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() { - epytest tests/unit/ -} - -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-containers/docker-compose/docker-compose-1.29.2-r5.ebuild b/app-containers/docker-compose/docker-compose-1.29.2-r5.ebuild new file mode 100644 index 000000000000..65f0ca25d5a4 --- /dev/null +++ b/app-containers/docker-compose/docker-compose-1.29.2-r5.ebuild @@ -0,0 +1,73 @@ +# Copyright 2018-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} ) + +inherit bash-completion-r1 distutils-r1 + +MY_PV=${PV/_/-} +DESCRIPTION="Multi-container orchestration for Docker" +HOMEPAGE="https://github.com/docker/compose" +SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64" + +RDEPEND=" + >=dev-python/distro-1.5.0[${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}] + dev-python/py[${PYTHON_USEDEP}] + )" + +S="${WORKDIR}/compose-${MY_PV}" + +distutils_enable_tests pytest + +PATCHES=( + # Bug #679968 -- https://bugs.gentoo.org/679968 + # Bug #681002 -- https://bugs.gentoo.org/681002 + "${FILESDIR}"/${PN}-1.29.0-setup-py.patch + "${FILESDIR}"/${P}-tests-unit-cli-test-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() { + epytest tests/unit/ +} + +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 +} -- cgit v1.2.3