gentoo resync : 16.04.2022

2 files changed, 53 insertions, 0 deletions

diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index 9f9f2d66874c..9ecbfa371609 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -2,6 +2,9 @@ AUX docker-compose-1.29.0-setup-py.patch 1858 BLAKE2B 9a53ffec0449fe1fa110b21617
 DIST docker-compose-1.29.2.tar.gz 320320 BLAKE2B 2d1a6375127fa09661822f7148665161b45bbd234c93444ae31c1d926513fcbc9fb845f8af01d8f11788f24b7517bff5f6cea2a5da9ade897891f2dd728f26bd SHA512 09f2ae2ae7a17ab5fb3e22580f7a80f1a8253f7ad9fc8f29aca432911bcde46ed22030ff3073cdd7eff3d55aaba17f56e628a178ec05c3a9b4f28495d6045111
 DIST docker-compose-2.3.3-deps.tar.xz 486283624 BLAKE2B 1bb2f743ff0ee46e4b5790bc53fadd03ff9cf177c4bd8f28f435eae7f00ceecf475d78cf0a80082066a62c4e97022afaad2b13ac3bb04893914f84b0a756a2b3 SHA512 9ca0dacabe66620108c8017d5ca2bb7fb568b4edb23460d528f81ad9491dd04efb192983a590db965c26781429cba5c6be6eaa91ac51e9a7d8e6ee4adb9b4c09
 DIST docker-compose-2.3.3.tar.gz 270143 BLAKE2B 9ab2863a37402ebcb881797e1d6a170dd9557d14a8174dec4049b55f6f3c106752423ac13d9e2ec1bb95dab83df83e53747519f4ceed91f7d9a5805c630e82e0 SHA512 5986f4f54302fd552c7aeb0cdfbe8d5185744bc2a2fe6f136e1a4009b3b9f68cf7578d3b6a2acb2067ef9a889eb33d159b2daf80140315a29412bda15d2a5446
+DIST docker-compose-2.4.1-deps.tar.xz 110605892 BLAKE2B 042d84818b963c23769e039a930076355cb2ebb2d86c5f8af56f240689012ae7aeff12cf366b46f2bf0fa0799d5f7b825f726686f54db218787e91a6c308ba5f SHA512 28bb292daac3ddf1055c4dd5f0b1920dc8145636e878beaac90863fec8b86e277f6906d82753b62fc7c9f755a9246c223307fad5fb412e41c0ca11b4d60e7e0e
+DIST docker-compose-2.4.1.tar.gz 274404 BLAKE2B 346c9c527630217fdeada28e7329400a910007c5296cf4b8b7f41d90049c51c54c518f82f602b71332d9ecd91eeb65e1135aa18c37fe98ee02b99238cf7dbadb SHA512 0c7611c95955b63a4cc77a4498393c52c7107a4a6fe950dbf2d1181df8f44f682337eb6cc7814e9902551b230507b12a05d1377acac7b2342f829401f1d24651
 EBUILD docker-compose-1.29.2-r1.ebuild 1915 BLAKE2B 45e984d2f7c8cf249187355bc2503a1b17642f1e87b0a308779ec027187ed9b700413f2c814880c6618607a3531c766086807b4a9a3021f6695453cc6074cb1b SHA512 37375b33f10219740a7f26b2af9f246635ac9196e17b1bd82337341afcdc21eebedceae1c32139f7c54eaf96b3cfa7a2f25c632a4d96b2a10708e80f5ec1cca1
 EBUILD docker-compose-2.3.3-r2.ebuild 1242 BLAKE2B 48e1062372861a1707356495b38ebdf3818a946538f1798016dd187969cac14c88a4c2e268f13f4178be10a65ef4d3cb1d2fbfb58e6d39ea6c4ed8bb03cf1727 SHA512 ba6439a3d2e6f62ae36a780a7c421d0316e2d70e0bf5327bbef4aa27ed9cdc0da0537b05416480fcce01dabf871245ef4f70176ef1503ccb20a4d4f791bb3cb9
+EBUILD docker-compose-2.4.1.ebuild 1242 BLAKE2B 48e1062372861a1707356495b38ebdf3818a946538f1798016dd187969cac14c88a4c2e268f13f4178be10a65ef4d3cb1d2fbfb58e6d39ea6c4ed8bb03cf1727 SHA512 ba6439a3d2e6f62ae36a780a7c421d0316e2d70e0bf5327bbef4aa27ed9cdc0da0537b05416480fcce01dabf871245ef4f70176ef1503ccb20a4d4f791bb3cb9
 MISC metadata.xml 544 BLAKE2B d515d07ee7d2045db1d4a2a0e8f0e797e23b01dea7ab164d9bffc85bc00ddc18a050f296db0a80df8a65c9c554d6e189218a1939b07b29ea823e5eea65d803e6 SHA512 17c3b4e7be1318a36aa744e185d7f7d5571107cecc98eed8fce07b4d905273409b95a202129440082f29be57d6a44eabda43730e8f47cc7c63c04d6d0ed05645
diff --git a/app-containers/docker-compose/docker-compose-2.4.1.ebuild b/app-containers/docker-compose/docker-compose-2.4.1.ebuild
new file mode 100644
index 000000000000..3946a436a4be
--- /dev/null
+++ b/app-containers/docker-compose/docker-compose-2.4.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2018-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND=">=app-containers/docker-cli-20.10.3"
+
+S="${WORKDIR}/compose-${MY_PV}"
+
+src_prepare() {
+	default
+	# do not strip
+	sed -i -e 's/-s -w//' builder.Makefile || die
+}
+
+src_compile() {
+	emake -f builder.Makefile GIT_TAG=v${PV}
+}
+
+src_test() {
+	emake -f builder.Makefile test
+}
+
+src_install() {
+	exeinto /usr/libexec/docker/cli-plugins
+	doexe bin/docker-compose
+	dodoc README.md
+}
+
+pkg_postinst() {
+	has_version =app-containers/docker-compose-1* || return
+	ewarn
+	ewarn "docker-compose 2.x is a sub command of docker"
+	ewarn "Use 'docker compose' from the command line instead of"
+	ewarn "'docker-compose'"
+	ewarn "If you need to keep 1.x around, please run the following"
+	ewarn "command before your next --depclean"
+	ewarn "# emerge --noreplace docker-compose:0"
+}