gentoo auto-resync : 15:12:2022 - 21:34:37

4 files changed, 110 insertions, 3 deletions

diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index d109225f7164..50092c7752e2 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -1,7 +1,9 @@
 AUX docker-compose-1.29.0-setup-py.patch 1858 BLAKE2B 9a53ffec0449fe1fa110b21617bc3e804829625abc6205f10962f568acbdfa7c38ffeec7e7feb0fe585b95555ff786223b3a7c24e960738cea0dfa7803be3f59 SHA512 66a25230e8d7f294c7baa3053cee508623d85e8453eb758f7f80aed9416aef9018c8878e9c0db6b96e657bb450508d442d6b055e11e80996ef3aba276d98fe63
-DIST docker-compose-1.29.2.tar.gz 320320 BLAKE2B 2d1a6375127fa09661822f7148665161b45bbd234c93444ae31c1d926513fcbc9fb845f8af01d8f11788f24b7517bff5f6cea2a5da9ade897891f2dd728f26bd SHA512 09f2ae2ae7a17ab5fb3e22580f7a80f1a8253f7ad9fc8f29aca432911bcde46ed22030ff3073cdd7eff3d55aaba17f56e628a178ec05c3a9b4f28495d6045111
+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.12.2-deps.tar.xz 139592724 BLAKE2B fd0e375e9cefe802d6d557763838959712f31391c2ac4e5e41d37ce2b6df209c35e86f255197ccb39ca04dc9ea9b04de29347570d0d1b0ed5a0b2d094c5e24a7 SHA512 af4e431dbb4735fa1a2aff2271e052479b4e4dac83f2d7a733aac9aab0ac33e00499d81b6c8a6a36aa330618a89c44993c5b27349752678ce1ac41921f12dfbe
 DIST docker-compose-2.12.2.tar.gz 305198 BLAKE2B a39a0c2266abc442f1c65ac00da9dd380df85d2aaa9429898461f12138fe64a7a6c74a45b3bb734419b7093ec69a44b49dfc57ff264a2d3cb576a78a0720db03 SHA512 dfb82ecc5a984d7193da164924c1e430d07b6378028dac7264b8084da2e315e5c5091803a5db79fe27ed06b002c62b295d873b9371bd19d4550a37a28f8ec952
-EBUILD docker-compose-1.29.2-r1.ebuild 1915 BLAKE2B 45e984d2f7c8cf249187355bc2503a1b17642f1e87b0a308779ec027187ed9b700413f2c814880c6618607a3531c766086807b4a9a3021f6695453cc6074cb1b SHA512 37375b33f10219740a7f26b2af9f246635ac9196e17b1bd82337341afcdc21eebedceae1c32139f7c54eaf96b3cfa7a2f25c632a4d96b2a10708e80f5ec1cca1
+EBUILD docker-compose-1.29.2-r1.ebuild 1918 BLAKE2B 745c174850bde3eb2a4770652110875e2db46be1489e0885b7210608c3386673398d74b03cb7eae2cdef116e526aaf781225abdca8c3e581ab0a4db926a9f6d5 SHA512 15e876fb8b89eb5a7b13162ad9435356d274037552d3f9b4b1a0b398097bc2fd0f6044992f48e687985467406cd5b980ac04cbbc9d7d067d151dc626720f55f9
+EBUILD docker-compose-1.29.2-r2.ebuild 1969 BLAKE2B 5507c79ccf9b632c58e2723304f3f8cb661206e1e1d6ea874979448b426056b40bcca3039ca11894f012a6505cfe5cff22091cf5c074e3a7b080bb9d4432deb3 SHA512 0b0f96ada68e17cab24e6e8ba760c17e3f2cc51f9029050a533bc1e9f507252eb9e18d1a95796806e2f4484aff0433115d0d1cfdbdea3b67d186e0accc40f629
 EBUILD docker-compose-2.12.2.ebuild 1143 BLAKE2B 65406f19f5454c903ac34ce63653083ec4533707c5e507e56c767f8529b1fdf397573cac69efef2981c77314feced2b5a7723cd6ded71ecd422787b5ad0347ed SHA512 5ba4e727da997ecc072a8ee09b60d5986f7313c8b6c097680c07b67c156cc59f912256b99075de1c0b91f66e81ded4a0411099f89585a7f3c4f26bd0a2a6aa4f
 MISC metadata.xml 544 BLAKE2B d515d07ee7d2045db1d4a2a0e8f0e797e23b01dea7ab164d9bffc85bc00ddc18a050f296db0a80df8a65c9c554d6e189218a1939b07b29ea823e5eea65d803e6 SHA512 17c3b4e7be1318a36aa744e185d7f7d5571107cecc98eed8fce07b4d905273409b95a202129440082f29be57d6a44eabda43730e8f47cc7c63c04d6d0ed05645
diff --git a/app-containers/docker-compose/docker-compose-1.29.2-r1.ebuild b/app-containers/docker-compose/docker-compose-1.29.2-r1.ebuild
index 81541d84c81a..fe80850192d1 100644
--- a/app-containers/docker-compose/docker-compose-1.29.2-r1.ebuild
+++ b/app-containers/docker-compose/docker-compose-1.29.2-r1.ebuild
@@ -10,7 +10,7 @@ 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}.tar.gz"
+SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/app-containers/docker-compose/docker-compose-1.29.2-r2.ebuild b/app-containers/docker-compose/docker-compose-1.29.2-r2.ebuild
new file mode 100644
index 000000000000..fc63be54e95e
--- /dev/null
+++ b/app-containers/docker-compose/docker-compose-1.29.2-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 2018-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+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-py-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}]
+	)"
+
+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() {
+	distutils_install_for_testing
+	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-tests-unit-cli-test-py.patch b/app-containers/docker-compose/files/docker-compose-1.29.2-tests-unit-cli-test-py.patch
new file mode 100644
index 000000000000..0d6cf44c1887
--- /dev/null
+++ b/app-containers/docker-compose/files/docker-compose-1.29.2-tests-unit-cli-test-py.patch
@@ -0,0 +1,33 @@
+From 988f954a7e185c521e7c0f720684e8a53068b136 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Thu, 15 Dec 2022 18:11:03 +0100
+Subject: [PATCH] tests/unit/cli_test.py: Fix access to
+ py._path.local.LocalPath
+
+.. for test CLITestCase.test_default_project_name:
+
+> class CLITestCase(unittest.TestCase):
+>
+>     def test_default_project_name(self):
+>         test_dir = py._path.local.LocalPath('tests/fixtures/simple-composefile')
+>         [..]
+---
+ tests/unit/cli_test.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
+index fa6e767..83ecef8 100644
+--- a/tests/unit/cli_test.py
++++ b/tests/unit/cli_test.py
+@@ -4,7 +4,7 @@ import tempfile
+ from io import StringIO
+ 
+ import docker
+-import py
++import py._path.local
+ import pytest
+ from docker.constants import DEFAULT_DOCKER_API_VERSION
+ 
+-- 
+2.39.0
+