6 files changed, 4 insertions, 44 deletions
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 0ef6c4f0d63f..2346f07515d6 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/distrobuilder/Manifest b/app-containers/distrobuilder/Manifest
index cc6b202217df..1fe5b5ecc2c8 100644
--- a/app-containers/distrobuilder/Manifest
+++ b/app-containers/distrobuilder/Manifest
@@ -1,8 +1,5 @@
 AUX distrobuilder-2.1-glibc-2.36-fix.patch 1180 BLAKE2B 0ab58a2ac5f744b110a9ef414259a9e6f024915a6812e0dc9d64b554448817f3b2f6f58319d4bf63baa31de59b93a6202b0dafe658a4906f1b8f212739a4edc5 SHA512 b95e0920dba8366053b54c14b5bcb65e89ee3e381d22c2e3efe9d1962b05b3d4b2c0ee3b71b9acf67cae72166fe075264f1c560cc621e21088625013a4645895
-DIST distrobuilder-2.0-deps.tar.xz 368438228 BLAKE2B 511e57d20b6d7be469e005a97cca073dc2c6bd67da550c17adb8f37e40c4cf74357da48f73dcf081eee7530d10857c006b82f5444813044eee8ec60f72e61046 SHA512 d7bdaacf5e1d106f3beac4d338c587e48373dc0fc7926670699fc9ca7cd4bb2e102268988c506361bec57610b3e9d3a287a70168adf5bf9f62f797742cdeac27
-DIST distrobuilder-2.0.tar.gz 179411 BLAKE2B bc008edc05f3e89872de87711cb51dd0797e93c03cbd2a077f43d4f1c28a1f14984c42f7181fc9c5501d96667e159ef263a92f43e20484534d47c64af88e85fa SHA512 3b85a992893689232f55b7cedbf2617fde95cf0af053424a585040781df592cd1f34800fe43bc5eb37e3740fea921ca9893b749fd280132794dc77f0ca4d9934
 DIST distrobuilder-2.1.tar.gz 5599048 BLAKE2B 90e82a20a3ef61d13148951956bb1f74cc3494ca86e339c188a1c9009dcb27c0cb9a298c639c6de891df67915b48d107557f6b698a45cbe35c54d41a45bac1ab SHA512 80184d27305f5659f1367563161220b966b1957810da61e8f3b9f32cf408795319b43dd650bc9f867b3ac73ef2b3251972bb11999d92feb34bfd9cdae7ff7b7b
 DIST distrobuilder-2.1.tar.gz.asc 833 BLAKE2B fb3aadbc989438b0606c88e74fdd86e809b6373b907b37372cbbc0ca99415821f61772205967e0a7aa26b0bdaceb66df4ab39da1f08c339edeb84e66a04aab56 SHA512 0220fa34d966e2b3a244af21a894f5db7556b891ee3205b605ef633699553f0f53d876412c855010a0ef685fcfe376997790cf51d59fd46b7c9ba539507de4e3
-EBUILD distrobuilder-2.0.ebuild 741 BLAKE2B 3e7a66aad713d0272509c26a94ba7f8764c1ae434e15bb08db5386069c4225fef64eeaacc1bd85abc9f80b2d03606257b02fc38ba43f891fa8a52810ca843675 SHA512 febbf926fe3904caa603ec9108c9fdc9da39fa0fe50262324fa388b0eb1d2cf542f1d026d1687beef05f220139ad4a92fe0caef60b7bab82de44ce27bd08442a
-EBUILD distrobuilder-2.1.ebuild 1151 BLAKE2B c2d88d895d13778dd3135fd78049720d368f1c4ee65f03d152d9028ab3f22c77b36a510e59b2292a9aaf3779478881fe01b37f9d3773e2cb69b509b8d42eb8ff SHA512 070e2fd157bafa8d32fcf8e47aa98312ba39216754582de29862e74d2af3c71f0905b73f03e928b712c7ed529dea74907c8df0f4a502825069b6f945146d2e8d
+EBUILD distrobuilder-2.1.ebuild 1150 BLAKE2B f9d427a8f2a3202d80e81b13bc42cf2fbeac205884827a3743e615ce95338a61027459d82d39a87bf5da68d52301b50f2edc4f38942ea7923c13fe6e4451760a SHA512 60dfca65bbe883383d4744237ac341b9fec8dd96f5e766902ab8b32a2df5fc191400e6a0e0fcd0476d929a6d80b5a3f5cffc4bc84a7ae20c37f18582aed4ad27
 MISC metadata.xml 586 BLAKE2B d7fd625233c6bb5bafa2b0ee4ad9e45e39433fec0358fb8a0a2deaa117276e990a8795e6d5bd9e30402fa32c892bccc35f44b40ba95b4a8fc230d26afd88ea27 SHA512 42da39e6f8f2079cdda344216c9ba55a37198e8cbc8dfd45fcc50eb0833a55fa39807f17777b736f9d9cd2b8a1f340a24033fb0e494fdd28dd5661d041443e00
diff --git a/app-containers/distrobuilder/distrobuilder-2.0.ebuild b/app-containers/distrobuilder/distrobuilder-2.0.ebuild
deleted file mode 100644
index d7993fc843dc..000000000000
--- a/app-containers/distrobuilder/distrobuilder-2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module linux-info
-
-DESCRIPTION="System container image builder for LXC and LXD"
-HOMEPAGE="https://linuxcontainers.org/distrobuilder/introduction/"
-
-SRC_URI="https://github.com/lxc/distrobuilder/archive/${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-
-RDEPEND="
-	dev-util/debootstrap
-	app-crypt/gnupg
-	sys-fs/squashfs-tools
-	dev-vcs/git
-	net-misc/rsync
-	"
-
-CONFIG_CHECK="~OVERLAY_FS"
-RESTRICT=" test"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_compile() {
-	GOBIN="${S}/bin" ego install ./...
-}
-
-src_install() {
-	dobin bin/*
-	dodoc -r doc/*
-}
diff --git a/app-containers/distrobuilder/distrobuilder-2.1.ebuild b/app-containers/distrobuilder/distrobuilder-2.1.ebuild
index 88ab03786eb3..b13cbcec5a6c 100644
--- a/app-containers/distrobuilder/distrobuilder-2.1.ebuild
+++ b/app-containers/distrobuilder/distrobuilder-2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://linuxcontainers.org/downloads/distrobuilder/distrobuilder-${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="verify-sig"
 
 RDEPEND="app-crypt/gnupg
diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index 0cd9d37f2dad..c7b9f6bc7483 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -10,5 +10,5 @@ EBUILD docker-compose-1.29.2-r2.ebuild 1966 BLAKE2B de7b9af9de6ab0e79dc05f4c6346
 EBUILD docker-compose-1.29.2-r3.ebuild 1998 BLAKE2B 827dde967df73cb92a2802109d59ef1441fbc0b1733b52fddbb35fbcd4b3b88d4340bb5c334f3825ad99a574985c245af068396ad28931e591e670096459c47e SHA512 487f142c244752570686c0d3d31edd16ac5a4a80fb55e4cf2982d8b7f168d5b1e833a492d658a073ad36613cd1df894d8c5e829bd34470067e9b007b58708cfe
 EBUILD docker-compose-1.29.2-r4.ebuild 2001 BLAKE2B c66cb21498292ba2bbfc9e5d11a711f25018061df11fa170655b7255749396881b831ce164862fa3007f5e7ad94b644561e5e182606de7c99c795be92f8ab405 SHA512 5614a0f06be12e11bb41002c7043a1bcf976612e58b1c4534b17a5c37543ba923ec2fa1aabad282e80ddcccd2950d5c74e3da5719dbb1296a20d6e4040b6ee0c
 EBUILD docker-compose-2.17.2.ebuild 1156 BLAKE2B 9a6d68382e2d6912a77001c9da0bea27548c0cab28e233455b91cf9cba65cb137ba5990d1f38ff164d466bf2dadf8534487867f5f1b3a23624878f37b008122b SHA512 a74a21c6fc62fdb791909958c2967f77235458db9b1a6489b5dec0fc712bc9b2a6a7c7814464d52be0c0e7ced3e275718de076f48cec497635cb22cb14c95dd7
-EBUILD docker-compose-2.20.3.ebuild 1157 BLAKE2B 9624f46dc3c03c886852468e8f9ed608f45d97888b15deff9d07f3e0919a96064ff29779167a88e9d4d1cdf9fa1324de6f9a8551cbc7a62305c695c9f44bae82 SHA512 79f4a00fece2c170919b75972a3da6a613ed84c49f95b1b53e278c0995c322c187df59bc9c097b71838718b3ca2dd003efba1b2ac4ac7a4c6f4ae3b0af3001b3
+EBUILD docker-compose-2.20.3.ebuild 1156 BLAKE2B 9a6d68382e2d6912a77001c9da0bea27548c0cab28e233455b91cf9cba65cb137ba5990d1f38ff164d466bf2dadf8534487867f5f1b3a23624878f37b008122b SHA512 a74a21c6fc62fdb791909958c2967f77235458db9b1a6489b5dec0fc712bc9b2a6a7c7814464d52be0c0e7ced3e275718de076f48cec497635cb22cb14c95dd7
 MISC metadata.xml 689 BLAKE2B 99d0b18b036a6570a862e3d0f4401c00559256fe0b8f925085846297de55bce4a2b9fe1c5b0f535cd0d16dbe53897155911b8edd791b50e085a976eec4efd8b7 SHA512 565037e956a654d01ebe5a29d4995e7f3df916f2fce7e95d2d2a6dd200f5dab5b67f7d52d6aaa98353578fa3b8b20c865761c040fee538e780d690c45ecb728c
diff --git a/app-containers/docker-compose/docker-compose-2.20.3.ebuild b/app-containers/docker-compose/docker-compose-2.20.3.ebuild
index 771a864f5643..d2cc28a60ea6 100644
--- a/app-containers/docker-compose/docker-compose-2.20.3.ebuild
+++ b/app-containers/docker-compose/docker-compose-2.20.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 
 RDEPEND=">=app-containers/docker-cli-23.0.0"