gentoo auto-resync : 09:01:2024 - 01:01:10

3 files changed, 118 insertions, 0 deletions

diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index c2172cf80218..a269cec27426 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -1,4 +1,5 @@
 AUX docker-compose-1.29.0-setup-py.patch 1858 BLAKE2B 9a53ffec0449fe1fa110b21617bc3e804829625abc6205f10962f568acbdfa7c38ffeec7e7feb0fe585b95555ff786223b3a7c24e960738cea0dfa7803be3f59 SHA512 66a25230e8d7f294c7baa3053cee508623d85e8453eb758f7f80aed9416aef9018c8878e9c0db6b96e657bb450508d442d6b055e11e80996ef3aba276d98fe63
+AUX docker-compose-1.29.2-docker-7.patch 1453 BLAKE2B ec9faf576c90002bfa1e44e04b48a2fe10f7b16a3f169b091e83b059292cd5dc8d84bf98732a1e7ab8e3ade7fcb2b9b8fbaad8113d25920803b3c3080a6ac3d9 SHA512 c463ec01fd75201fc632c11cfef2034d9f82ad250a26c04e9d4eaf71ec8bc93d6adb9391626e00161b418fc09599d2a1eef991f21165dc2f010f36011b4886b9
 AUX docker-compose-1.29.2-tests-unit-cli-test-py.patch 900 BLAKE2B 400b1fac44687d05a10543519e0829ab4534342b3f39f9a0e2ac2e42ae7bc4e46f1d432734069e7097d2c18767144ab8e40af6b0ac8fe7984f2cc7fc822276f0 SHA512 e64e1c5b4e90b3a7b04a5dc52ac2e77545a5ce70128b6780d3e6fa6724877359a488ddf75c375db21f8382881779d20a4d58e5a1a927008c26bf8601e5fcf3ef
 DIST docker-compose-1.29.2.gh.tar.gz 320320 BLAKE2B 2d1a6375127fa09661822f7148665161b45bbd234c93444ae31c1d926513fcbc9fb845f8af01d8f11788f24b7517bff5f6cea2a5da9ade897891f2dd728f26bd SHA512 09f2ae2ae7a17ab5fb3e22580f7a80f1a8253f7ad9fc8f29aca432911bcde46ed22030ff3073cdd7eff3d55aaba17f56e628a178ec05c3a9b4f28495d6045111
 DIST docker-compose-2.17.2-deps.tar.xz 194695756 BLAKE2B 2a0ce1c41d09186f36ea4a935977a35edd80d013b6face813ac9622345ffa1ed8e090537ad990c4ee488ecccfe0575f92bb17f8baa0b8dc2104f75d18fac3877 SHA512 4649405eb0e49641265e514ef89cdae47806958611014ab9a9479848e857d85a5c3352ab44ff9ec39af1ca6fab67b6a2ae6c457d44690c1c1bcc3824aeb6fc07
@@ -9,6 +10,7 @@ DIST docker-compose-2.23.0-deps.tar.xz 163606408 BLAKE2B 56c60b81d7efd273309b713
 DIST docker-compose-2.23.0.gh.tar.gz 343649 BLAKE2B 687f4aed8a4fa4edfb92b36a21210fec29d95fc441d5aee93f47b3f42b883f84b929fc72e0243e7816292ff51354aaa543069628de1a369d7f9832d64a0a1e73 SHA512 c6bb3041f8bc23ecf9932fdc1d0c88283848026083b1854770506fee7f1dbec2f605e6eaf159705ab8ed3f1b9669b8474addac61564b37aff84ea994abb88f4e
 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-1.29.2-r6.ebuild 2215 BLAKE2B a53e560c53731c0f894fad102a704815da8a75b301671d7657ce6464e92be6f5e0d8a405edb62531b3ba59c77a5790664a041430efaed63b5fc01dae7f1b96ee SHA512 0dce9b5403cc3a6e4ca49277d8c0ee47987376c7135f84a0478dca02a813f418bfc7539a95eb6120207c40fe77a5e4d2220e1ae59ba1f6944a55dbf2718e2fa0
 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-r6.ebuild b/app-containers/docker-compose/docker-compose-1.29.2-r6.ebuild
new file mode 100644
index 000000000000..091c48dd7db2
--- /dev/null
+++ b/app-containers/docker-compose/docker-compose-1.29.2-r6.ebuild
@@ -0,0 +1,80 @@
+# Copyright 2018-2024 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-7[${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}"
+
+EPYTEST_DESELECT=(
+	# These are not ready for >=dev-python/docker-7
+	tests/unit/cli/docker_client_test.py::TLSConfigTestCase::
+)
+
+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
+	# Bug #920631 -- https://bugs.gentoo.org/920631
+	"${FILESDIR}"/${P}-docker-7.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/files/docker-compose-1.29.2-docker-7.patch b/app-containers/docker-compose/files/docker-compose-1.29.2-docker-7.patch
new file mode 100644
index 000000000000..aafa7a7dddde
--- /dev/null
+++ b/app-containers/docker-compose/files/docker-compose-1.29.2-docker-7.patch
@@ -0,0 +1,36 @@
+From 1e838052b7ccc2a5bb6b674154450a4411de9e15 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Mon, 8 Jan 2024 21:28:27 +0100
+Subject: [PATCH] compose/cli/docker_client.py: Quickfix for
+ >=dev-python/docker-7
+
+Symptom was:
+> # docker-compose build
+> Traceback (most recent call last):
+> [..]
+>   File "[..]/python3.12/site-packages/compose/cli/docker_client.py", line 124, in docker_client
+>     kwargs = kwargs_from_env(environment=environment, ssl_version=tls_version)
+>              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+> TypeError: kwargs_from_env() got an unexpected keyword argument 'ssl_version'
+
+Related: https://stackoverflow.com/a/77638834/11626624
+---
+ compose/cli/docker_client.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py
+index e4a0fea..f550e20 100644
+--- a/compose/cli/docker_client.py
++++ b/compose/cli/docker_client.py
+@@ -121,7 +121,7 @@ def docker_client(environment, version=None, context=None, tls_version=None):
+     according to the same logic as the official Docker client.
+     """
+     try:
+-        kwargs = kwargs_from_env(environment=environment, ssl_version=tls_version)
++        kwargs = kwargs_from_env(environment=environment)
+     except TLSParameterError:
+         raise UserError(
+             "TLS configuration is invalid - make sure your DOCKER_TLS_VERIFY "
+-- 
+2.43.0
+