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

8 files changed, 61 insertions, 6 deletions

diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index b55d9d4eda2c..9bd242a8a037 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/containers-image/Manifest b/app-containers/containers-image/Manifest
index 021013713566..f180b84b69db 100644
--- a/app-containers/containers-image/Manifest
+++ b/app-containers/containers-image/Manifest
@@ -2,6 +2,6 @@ AUX fix-warnings.patch 397 BLAKE2B a5922e061c825e25398fc3fccdf683abf8331b065337f
 DIST containers-image-5.28.0.tar.gz 688100 BLAKE2B 0cee8be579bd11eb0524590d8afe16b6ef863d7adfd74db51b68385142804c8096fec3f2a492e0d5a5021eba9edc91219b327138635aaa329c6ef7d0c01129c8 SHA512 0b76539e04016f5f1067c576a877ace475f25d0f0840fc969606601105a8a7f0e242cc054b0a2cfb6f1b751d850734360a524c78563fdf2330c8ae8c11bba1cf
 DIST containers-image-5.29.0.tar.gz 706774 BLAKE2B 0af5c7c43e8b75df591cbd291d0865ac19322bf62ad98b4f36cfb51b006ced088f91f0b3f582ce29ae80582e72087467cfe589683216eeb50ad3762152853dc0 SHA512 5e670f85fe0b43769667f1a3e710434ab65c4ec2d8c60b0cad4b0ed41c35f84677528f9dfecb0b946de556ebbdd56f4949760432ec49b1b3c691120a323af869
 EBUILD containers-image-5.28.0.ebuild 806 BLAKE2B 0e8bc9c407a1d6951ccc8faa053a8c2634c013a3c556f970bb2d6e16e5dce371cdaf9c343c533c455ce856d25d50b8c48bbb3744c06ee326d92ba9049cb34b70 SHA512 cb5c1ab825791ed3e856c87394fbe827e3dec8c40857201a5f02f6d50a32859cceb18e073455670f28e2b5ad6b7c7fe966eec2c2166bbb516b15d3ac0f100281
-EBUILD containers-image-5.29.0.ebuild 741 BLAKE2B 890d94f4826979e37676faf2ffae72dfefe9da4eccca3d415b5006d4e7ddd6785f254a0bb4eee3fa4758c923a0721d0112977e7b1c77dcf0624592878721e44e SHA512 3d619ae2996253769c7cc46a6eae17027fab9e335f427f005a0e942af3c1a9e0e992023617b22e842123369bab9abc97ab6b34dadfd1d8b08c3464a7d0d09a79
+EBUILD containers-image-5.29.0.ebuild 755 BLAKE2B c6db87c8e66eb57b0820b92c25bb38cf3e14a4c91ca08b703fb09e9fbbc2457f87f3e032001f4ca26a81f49daa056cfecffa986ad1ba229e0774b5a9db8d83d8 SHA512 c59433f5c71dfeca32280916dc8f4849882e78160cf7a8aa642c2356936c9ff3476542551e132e92c754ee317534c77f4c374e8d0abc5675b9335a7a3f799091
 EBUILD containers-image-9999.ebuild 742 BLAKE2B 15567e62ad04fa2605ddef7edb2a4e356235ef664bced96eff5f6e8a90197e4678e2ed7fabf826bf0e56a6a85953484e76930c6b214d100b0c214de4343e59c8 SHA512 5eeb9b83dde0647458f5614c711fbb8865357a926a7527f31659d500af8152599989507f4a5a949e21f7ca261fb84c27768c993524156962f75868af000b1201
 MISC metadata.xml 627 BLAKE2B 3853a7a5cd67aa9162b4e6a198369680070780508e03dadd3e90e7551d94e1bcd1c1220281905f8fb99611ef55bc171eab5e8c15be89e26c553f1b3299bc9d1a SHA512 f1d276a06c7af474488bfa76cc2cab6fa96fa7f4d3938c3016d9b6692dfeb943e3fad8f29310de26d475077b73457739d84ff90eb61bf532abd5c330bf61b91c
diff --git a/app-containers/containers-image/containers-image-5.29.0.ebuild b/app-containers/containers-image/containers-image-5.29.0.ebuild
index 7117b7fef3cb..eb50b44f8f73 100644
--- a/app-containers/containers-image/containers-image-5.29.0.ebuild
+++ b/app-containers/containers-image/containers-image-5.29.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/containers/image/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${P#containers-}"
-	KEYWORDS="amd64"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-containers/containers-storage/Manifest b/app-containers/containers-storage/Manifest
index b1278c7587d2..2f77df73fc9e 100644
--- a/app-containers/containers-storage/Manifest
+++ b/app-containers/containers-storage/Manifest
@@ -2,6 +2,6 @@ AUX system-md2man-path.patch 169 BLAKE2B 707d7396af9c6a04a3a4860198acb927d6fbc68
 DIST containers-storage-1.50.2.tar.gz 4278269 BLAKE2B 3a2b08c710c043cfc130b9ffe39807e5ced8aa3cdb9805e9d9a4d0f60d8136f99e78ca03992c566b7c7d9aa1c25a2ab9da5e9edc4f1f841663302f5873dce419 SHA512 eb2ca9d243511abd5d6d1727c60166422dbfef4a3ddbb5062e58d915d0705afcd10ded8f1f79e897f9f5244fb6b6d349fbf3ed86ae57f41e31a1965c4e926941
 DIST containers-storage-1.51.0.tar.gz 4283732 BLAKE2B 108401d68e617e6237e68cf2147113680e0452a8d15ee099da9872508800f3e7b8f2c5508e17d9c5f3d58fec4efc1c20f23f1a567fe592533c0e63efd05ae5c8 SHA512 89916b49438bce8bb774b4aa799676d4b3a946a0b5207a1b5241b1a3ac0875b06b3cd8e81d7e23332ceae6010b693516fc31d8c7f75a37e7ad3056a83c75b6c1
 EBUILD containers-storage-1.50.2.ebuild 853 BLAKE2B e413f8bbf8749a42358829283362fa401ac5f0710588e71d9c44480137bf5219aed26adc5f946d5138c48463b4927853cf87df82e6a9048b7b41a1395576800a SHA512 1d969765c51ee6048e306f52e50120e88e473b4182e29e15129b1e3325827c9e7c21312b9481a6615167cb558c676f6ba5b012347d5fd21f5e7b66e44fdaa2db
-EBUILD containers-storage-1.51.0.ebuild 788 BLAKE2B 10489be025016821a6f6c9a42fb85f061727ab4b9b97178af46b394fffa72fab35c154e392c1a441e28754e9f3d68a139a42f230f704aea966eb7048e3f09f42 SHA512 e97567be7d50db5bff3ff77785b44c2f6779655e638131fa97393bba39001710f60ee376d137f085d0d74ee1406e59ae90248e71be08052adfa8b2e9f5170827
+EBUILD containers-storage-1.51.0.ebuild 802 BLAKE2B ba2749cc965ead069bd5752dd7acb524da74198ea952e8b1beecfefedd8df10b719ff2c761918bcd4b4aa277b7a663f124058d546bd5dc562083e2950d6a4d51 SHA512 c82bc954f05cc02b72b72bd82654eea412677019704a9ceb1fb55d4af2cfa93fd5c8f17ac23e03b9abfc1e46c29b3c5382823fc42bb8940a404af5c920336c6e
 EBUILD containers-storage-9999.ebuild 789 BLAKE2B 7044e44fa740a613702a4ccd4037e0095223334414a5d597cd976d43dbad533a5ca7b91117052c32fd0df9879618e55d51aa3db6b4a658240cccec2b94e16f8a SHA512 8cf77745e40e816f7092c0fdfa020b35e3b998ae81be87f2a78a54bf6f47e7348dc9bb66c29910e9c85b960def249c3ffdaeecfe83d29056bf4e6906d138722b
 MISC metadata.xml 744 BLAKE2B 7d5d87bb4b2ccb68bc4289bc7f3a0d92ff527133f3264baa124e77d5e4602ca7f656a5694d66356a0b4f705606d82f318f5e522e23d776e84e46b148d8e3e968 SHA512 025a1a5456b44aeb87cd5cb645917a779c5330b2ddad64bcd5eb8cf6d87807dd4319b503044d6417f1376eac3e159f3912df2cd15f1173f31b3f927c425791cc
diff --git a/app-containers/containers-storage/containers-storage-1.51.0.ebuild b/app-containers/containers-storage/containers-storage-1.51.0.ebuild
index 0e019f54142e..ebae81d127ca 100644
--- a/app-containers/containers-storage/containers-storage-1.51.0.ebuild
+++ b/app-containers/containers-storage/containers-storage-1.51.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/containers/storage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${P#containers-}"
-	KEYWORDS="amd64"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="Apache-2.0"
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"
+}