gentoo auto-resync : 12:01:2024 - 01:06:32

3 files changed, 57 insertions, 2 deletions

diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index a269cec27426..939ea6e6acd1 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -8,10 +8,13 @@ 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
+DIST docker-compose-2.24.0-deps.tar.xz 165907064 BLAKE2B 22b760393edc5a17bee52c6ccd5f227e724aaee32eb92113898e2f01727ff8913f98e2dba2f1f43277feffa9332888d64ef24b7fb9eb0f90f5038d711271b66a SHA512 2446cd56c69cc8cf1908ef2fd76e969bbd9a743f0b75d25e6c99304a203951a3196d8b8a9a4052560fb4923d20be8023452f051c3c3215e38007a7c6173489c9
+DIST docker-compose-2.24.0.gh.tar.gz 344571 BLAKE2B 4d79bf83b0584b8ed56c6f573798f8ed6fe264ffbfc870e9fbe6b79ba4c61248a6e139ebbbd0cd80b9ad607b5c71901ebb19b04e7b6c3e4cbbe8806d0a174eed SHA512 78e5d6ad6f00c4c4a5878b8231ab538bdc9a1d1df17fe1b5aca7bb3a4358897bd6742f8075c54fc00de8bccf5e9f6529acceb57ae221c0794b6c5b0e655b8771
 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
+EBUILD docker-compose-2.23.0.ebuild 1171 BLAKE2B 9e52b40f28afabdb00655bab29ec0449a77354b7d081869519043ee461c3d152b4af2e42a3e34d140a17db9b643b8b6ea99cf23d8ac1ee23be2062ddc1df5a57 SHA512 3a32f0abf566ac0e23caac66bd13b124cab25cdc35feabb95d9add2c45de6198ae79224af4bc805c2e01e1888412400958119c431cd7f7089ca2773e9c19845f
+EBUILD docker-compose-2.24.0.ebuild 1171 BLAKE2B 9e52b40f28afabdb00655bab29ec0449a77354b7d081869519043ee461c3d152b4af2e42a3e34d140a17db9b643b8b6ea99cf23d8ac1ee23be2062ddc1df5a57 SHA512 3a32f0abf566ac0e23caac66bd13b124cab25cdc35feabb95d9add2c45de6198ae79224af4bc805c2e01e1888412400958119c431cd7f7089ca2773e9c19845f
 MISC metadata.xml 689 BLAKE2B 99d0b18b036a6570a862e3d0f4401c00559256fe0b8f925085846297de55bce4a2b9fe1c5b0f535cd0d16dbe53897155911b8edd791b50e085a976eec4efd8b7 SHA512 565037e956a654d01ebe5a29d4995e7f3df916f2fce7e95d2d2a6dd200f5dab5b67f7d52d6aaa98353578fa3b8b20c865761c040fee538e780d690c45ecb728c
diff --git a/app-containers/docker-compose/docker-compose-2.23.0.ebuild b/app-containers/docker-compose/docker-compose-2.23.0.ebuild
index 21ce13765326..f306d5212cc7 100644
--- a/app-containers/docker-compose/docker-compose-2.23.0.ebuild
+++ b/app-containers/docker-compose/docker-compose-2.23.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2023 Gentoo Authors
+# Copyright 2018-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,6 +14,7 @@ LICENSE="Apache-2.0"
 SLOT="2"
 KEYWORDS="~amd64 ~arm64"
 
+BDEPEND=">=dev-lang/go-1.21"
 RDEPEND=">=app-containers/docker-cli-23.0.0"
 
 RESTRICT="test"
diff --git a/app-containers/docker-compose/docker-compose-2.24.0.ebuild b/app-containers/docker-compose/docker-compose-2.24.0.ebuild
new file mode 100644
index 000000000000..f306d5212cc7
--- /dev/null
+++ b/app-containers/docker-compose/docker-compose-2.24.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2018-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit 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}.gh.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm64"
+
+BDEPEND=">=dev-lang/go-1.21"
+RDEPEND=">=app-containers/docker-cli-23.0.0"
+
+RESTRICT="test"
+S="${WORKDIR}/compose-${MY_PV}"
+
+src_prepare() {
+	default
+	# do not strip
+	sed -i -e 's/-s -w//' Makefile || die
+}
+
+src_compile() {
+	emake VERSION=v${PV}
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	exeinto /usr/libexec/docker/cli-plugins
+	doexe bin/build/docker-compose
+	dodoc README.md
+}
+
+pkg_postinst() {
+	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"
+}