gentoo auto-resync : 11:01:2025 - 06:41:28

author: V3n3RiX <venerix@koprulu.sector> 2025-01-11 06:41:28 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2025-01-11 06:41:28 +0000
commit: f1634517e73f2faf342a366354c3e0f2edb45952 (patch)
tree: ae3c632ec3576f8d57b3acd5e1aba5643f0f6d9b /app-containers
parent: f9d8ddaae80afb8fa0924cd3f769f9b37dd373e1 (diff)
41 files changed, 181 insertions, 704 deletions
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 466b3d6f85da..809bcd5ca928 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/aardvark-dns/Manifest b/app-containers/aardvark-dns/Manifest
index 0e49318ecdda..96b47c553568 100644
--- a/app-containers/aardvark-dns/Manifest
+++ b/app-containers/aardvark-dns/Manifest
@@ -8,7 +8,7 @@ DIST aardvark-dns-v1.12.2-vendor.tar.gz 6919039 BLAKE2B 5edc43d9e7044da6e3a1694a
 DIST aardvark-dns-v1.9.0-vendor.tar.gz 8085548 BLAKE2B 487f69a9c34832d74783b66c565a7c2f67f101527e8a44c215f167e4ea80f069846b25decbb423972cd42cd9ee7717efc21c3d1b0885a7d87c0fbdb9cfb9d26f SHA512 f7174f1c4275991a6a2655046697f32511586f53fb343efa25f995cc07663091a634e8a82395840b022b6b3c8363863cdf8c9b6d4e38984fb841978eef0b1f22
 EBUILD aardvark-dns-1.10.0-r1.ebuild 1097 BLAKE2B 67f4643151ce9f5efc4bf6f6415cd3ae6224c55fbc66dadc2a5155211556928a2373bd55abce93212bc04fcffd7a239ccb76777e35439a949f364743564e965f SHA512 a851974effdc3a66e426cab4bfdd2cc0c35f7e56ee2f136fbb96d32e55b86458f49ed8fbba14ed37ce94b04bf99c053d9373ece0a982b5f974296cfb1af9b54f
 EBUILD aardvark-dns-1.11.0-r1.ebuild 1104 BLAKE2B f8ccaa04f8c584e0a1759c39663d2183b320c918ba9e5c8b51caffd073f2c79adb5dbcf848cd27b519501175d411e7005f594071b007dd757869affc402852dc SHA512 4fffbef119250bbacbb63da0420c6efe4c838f74401e836a2dd785c762ee405598221d5b423a9dc1a1f35dd832844e7f9031ce8a854162d2270a4be037c43bf3
-EBUILD aardvark-dns-1.12.2-r1.ebuild 1106 BLAKE2B d6007c1ec8a83890386aa0663384c74aa6c92870071af2fbb8e6fd66e4cd63a607a8ce27022a5825ca2d9d5877c88bc219d49019dda3b1ab8017fdb21b8e6aeb SHA512 feafdda46634663ba10496e6fa6f4be35d2ca7bc7bed4a60e895298692e942ce17eaecce58f1d81fd05eed358ce075dea53d2e35b3fe82e830bb318a4656f52c
+EBUILD aardvark-dns-1.12.2-r1.ebuild 1104 BLAKE2B 03b101208772c826ade53ce0954ff7629789c3d56dd1c85c0d1bbea45b8389653075905e69fe1c7e3fd6d14e2175ed18188ea989bc91dd88e7c97a524aa95f88 SHA512 483d3be92bdadc8b56f931c39e43baf5a3f75ed1387608b958a908cd297a873275eb06114195f10aafc5f57099babff5deedb71b76131f23347d7ba7f6e795c3
 EBUILD aardvark-dns-1.9.0-r1.ebuild 1097 BLAKE2B 67f4643151ce9f5efc4bf6f6415cd3ae6224c55fbc66dadc2a5155211556928a2373bd55abce93212bc04fcffd7a239ccb76777e35439a949f364743564e965f SHA512 a851974effdc3a66e426cab4bfdd2cc0c35f7e56ee2f136fbb96d32e55b86458f49ed8fbba14ed37ce94b04bf99c053d9373ece0a982b5f974296cfb1af9b54f
 EBUILD aardvark-dns-9999.ebuild 1106 BLAKE2B d6007c1ec8a83890386aa0663384c74aa6c92870071af2fbb8e6fd66e4cd63a607a8ce27022a5825ca2d9d5877c88bc219d49019dda3b1ab8017fdb21b8e6aeb SHA512 feafdda46634663ba10496e6fa6f4be35d2ca7bc7bed4a60e895298692e942ce17eaecce58f1d81fd05eed358ce075dea53d2e35b3fe82e830bb318a4656f52c
 MISC metadata.xml 915 BLAKE2B 7ae712b0f52e804cb23911533c31bd5520bd76e1371e07625f7054fcb4ad8fd432476556ade943d9f8700d91ad7f081fed9856c553c9db97125d0c7d20ac8d5d SHA512 b9b1b3ac577f60c233559abf0286e4c5ca7d25e825faf74aa962867189c3dd2fbb968b791dae0fb565786446ad8495973e5ffa1f36a5193d349dd44846395fac
diff --git a/app-containers/aardvark-dns/aardvark-dns-1.12.2-r1.ebuild b/app-containers/aardvark-dns/aardvark-dns-1.12.2-r1.ebuild
index 6eb7550f45c2..bdd917d608eb 100644
--- a/app-containers/aardvark-dns/aardvark-dns-1.12.2-r1.ebuild
+++ b/app-containers/aardvark-dns/aardvark-dns-1.12.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="${CARGO_CRATE_URIS}"
 	SRC_URI+="https://github.com/containers/aardvark-dns/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv"
+	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv"
 fi
 
 # main
diff --git a/app-containers/buildah/Manifest b/app-containers/buildah/Manifest
index bc9e0a9271a1..e2bf378b5718 100644
--- a/app-containers/buildah/Manifest
+++ b/app-containers/buildah/Manifest
@@ -1,6 +1,6 @@
 DIST buildah-1.37.5.tar.gz 19323742 BLAKE2B 1c03cc201f10f4d3645ecd3dac9ae97b3fe585b63ca8980e22e8b13d6dab05842c47e694b45c13875f03dadf0a656177445b0f3835a8a6faca63b288ff136013 SHA512 ee33d85ea3aa9ec423b4e48e19db69359e3fc480a61abd511fa473257aa326e9a9c4dafc985afb83f7caa9a7a5ba6a89b2a1c028fe6ef7bd4ef382ec8591331d
 DIST buildah-1.38.0.tar.gz 18547712 BLAKE2B a7c8df00ecc570d44173318adf68036389ce27bad5c10c7ba2bf7a728c29647186fcf0bfb9d0949e7947aff1e64cb2683b69ea0b4cb3d4181697813de8a5870f SHA512 c9f31693043e348c2bee6219f5a42738d93aa690a81f6bb283bd4d93ea6fe0cbde50754f7ee1a7e690853b7cfb934ce60e35ceb029180f41a95192773023c243
 EBUILD buildah-1.37.5.ebuild 3088 BLAKE2B 67e0f9d958907dc416e19f657a8a3f68022ac5214613716a23ace88d814c2433741f465756d718425817a3fabe61d0c39e2a8f46eb0535130acf83338b6f062e SHA512 1f341865dd92b2ebbcd1bca2a6ce9ee68778127514e81440edd97994971d05fc9af5b5f23717a36470afaeff485808cce9de0b8bba21359efa31baa9ca5c55c2
-EBUILD buildah-1.38.0.ebuild 3099 BLAKE2B bb155ae447ceab425ed02f802e0b734d52e71bd7a6d2900de3f72d657159c086ff2bf7d2cd28f747c34e4db95d0bdcdb2522701a7b90655000b7dd160bf8f17d SHA512 8d2f3c3b591f4af7b3ea09d82e74b7ec12d653ef771b25fb24c25cb0114660922b35c85f910511a5464f914c4785f6f74600cd1af77a7cf572047b71d89ca61b
+EBUILD buildah-1.38.0.ebuild 3097 BLAKE2B 1456523de66a5e6782c7114d519e69ca8bc9ff3853f0c915ec200d89e41166f7b7cc19dee0b894605589846aa5a5943736e1fa15686c4bc1e5ea74db05e9e336 SHA512 fb00ae023de7a3ae3a7f81cab73eda6f06701d36636fab7fae8263949a132c57466f27ba5d5cae0250503aceff8e40835e888d95182b90762947b0d7b52d7169
 EBUILD buildah-9999.ebuild 3099 BLAKE2B bb155ae447ceab425ed02f802e0b734d52e71bd7a6d2900de3f72d657159c086ff2bf7d2cd28f747c34e4db95d0bdcdb2522701a7b90655000b7dd160bf8f17d SHA512 8d2f3c3b591f4af7b3ea09d82e74b7ec12d653ef771b25fb24c25cb0114660922b35c85f910511a5464f914c4785f6f74600cd1af77a7cf572047b71d89ca61b
 MISC metadata.xml 716 BLAKE2B 8d1868e48306b5ded8700bcfde93d2a0d1a4afedc5440781355f0645b5f71e5a80569be4b14ab459033c5ec7cf5f02eb49e3948154274ad09b088e09d8ac5069 SHA512 b8a7e951a5342ad1a32f650ab21d373c3afa86d482463d87dad5db0e6e715e3d4bde7642b75f68da7f5b4a7e935953ce2ac41affb66724e7882f75f97dfde023
diff --git a/app-containers/buildah/buildah-1.38.0.ebuild b/app-containers/buildah/buildah-1.38.0.ebuild
index 846ea4c76856..9ec7c2ddf698 100644
--- a/app-containers/buildah/buildah-1.38.0.ebuild
+++ b/app-containers/buildah/buildah-1.38.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,7 +27,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/containers/buildah.git"
 else
 	SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="amd64 arm64"
 fi
 
 RDEPEND="
diff --git a/app-containers/cadvisor/Manifest b/app-containers/cadvisor/Manifest
index 89bad664d8e6..80cf7737b708 100644
--- a/app-containers/cadvisor/Manifest
+++ b/app-containers/cadvisor/Manifest
@@ -1,5 +1,9 @@
 AUX cadvisor.initd-r1 564 BLAKE2B 5bc982674aca7c3cfd248ee92a0db91d919d26ad67a078a63b99842a629c35dac5b01ef97b36ce28681ffa69c5c7225b2facfdf8c973b975084fb07870237410 SHA512 b0fc7160a2c2515038a4661f847fcb9f63cd39bb5d65ad28b371d0cff0d680c2a8dbbf289b2db2eaefed50e601525da19e233c365251e52d6e72df92694a318b
+AUX cadvisor.service 328 BLAKE2B ff02b27b998b832ebe84ddef57993bebc4831e3e82e1475279aedfe35ccb15c05ee300573fede489d73e8bf82b511971e9485d2b395026defcadd74ecc8d92b7 SHA512 8558a8a781395f57daa5ddc39fbcbda3ad1b366764b0986428f1bdf38d9935af3b09ad2f6d539ebe6fc33a21edf2ac68caaf5f697c926933bcde19c3e38a181f
 DIST cadvisor-0.36.0-deps.tar.xz 149740960 BLAKE2B cff89f7661ed78addd1551b4353a93183c0fc317add01756a250429ad27a1b7c1c92fa6c1f0a129337204f89e85b1bfe16b1e17ff2ef7587f921ce1c9aaffdee SHA512 3e159c38fde84cb513bac3e2c3abce6ee1d4a60a2e77ba6a2c55e1abffde7df56c34b60e9b22379681d4d98575e4099f295735418bac8e960932183b9561c82a
 DIST cadvisor-0.36.0.tar.gz 6182273 BLAKE2B 0406bd88c6595f23de06be1e63e7c0affda7f94a3bbbb1b9e390f2747fdd3ef3199622a5003b79ed083a0cd80e6c013d7776e18269044150dafb98341c54425b SHA512 2da8a2e81d33b97e6f7c5ba3982e51b6d87748b138345ff94eb7671df851f0a535ceeef61358b0ee43bc161a88becdb153065bd7ff8fc9d7c390a4629ad10f02
+DIST cadvisor-0.49.2-deps.tar.xz 101993792 BLAKE2B c76a951b0741b513b7a700d9a31b6a0c49d0ae747375e9e968e77035d119a9351ba09e83c7d5d34bd081924e1fdccfd8851c9c7215d049c27da7469c63aab578 SHA512 2a104a236749bfcc1b785bf13352d217633c835beddf0c98219dd7dad602a36a934a2acf21975db06e72456ba15a01a5b685b9019f05f0d19e4eb562861478aa
+DIST cadvisor-0.49.2.tar.gz 1198084 BLAKE2B 7d4a28a22404f324c8cc0d956959bd397426b4fef8462d85bfd3cd5a1f9ec6f5add26c996cce9fb7e2edc382b592ca4cf1ff984371e32ad4fbc3daab050bfc67 SHA512 b789ab9d1b96b63edeeba2b474e9d6fb23bfb3c7e4778811fc92cc9b39084a70aaea991aa859b863a44d57934d0231c8ff5c48abfa6dce4b020827f6db3b5cb4
 EBUILD cadvisor-0.36.0.ebuild 1123 BLAKE2B b368640282276ece5f8319a6321ce202e8570d1498e068ef6303cfd8a43c3036c2bfec7610943e508fc3e03046b58e89added1ba9ca1800ae4e48fcfcbd8c598 SHA512 d26b2b4bdc29c546d64185d1a45150d890a1956103daca01d86a3c9fb56d483110c6028211e17fc44a6a63ec5f6e49bc89cc674961f9886b81995ff6bd0165c0
+EBUILD cadvisor-0.49.2.ebuild 1219 BLAKE2B e4be82c52c3bae3b065e5e6a318af12b319d4c99570ab94425b199b3ce4eeea37e7b024af7f1ec3daab974ddec5b1e27cf04f2ffc75f551930efdabb9c9f8b6d SHA512 9fa3c30f488a39fd12c8114af822e9d99ae6dd9f0c4b8b8c26a767334f7ad1c42884d40f2997ebd090aadd0b9d6ed3e5f99d56c8a02bda3148407442dc7733fa
 MISC metadata.xml 329 BLAKE2B f14c3fca64a9e6e381808d48c6ee9adec6fe9bd3c3265b54377297c25558e88a8826b8f269c66b691763a97319a7a39ef73754231de7080a0767754055705b77 SHA512 5764fe83933901049ae724c8ebf3dbc7f11221515228486c17c67aae96983f8248f47ef2a1842c9551e2bea4b4808a7899f6855c341418d6d9c6ec7d02f35fe2
diff --git a/app-containers/cadvisor/cadvisor-0.49.2.ebuild b/app-containers/cadvisor/cadvisor-0.49.2.ebuild
new file mode 100644
index 000000000000..93c595db33e9
--- /dev/null
+++ b/app-containers/cadvisor/cadvisor-0.49.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd
+
+COMMIT=6876475afe3755d62b65df0d32b005047fc69377
+
+DESCRIPTION="Analyzes resource usage and performance characteristics of running containers"
+HOMEPAGE="https://github.com/google/cadvisor"
+SRC_URI="https://github.com/google/cadvisor/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~arthurzam/distfiles/app-containers/${PN}/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON_DEPEND="acct-group/cadvisor
+	acct-user/cadvisor"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+	default
+	sed -i build/assets.sh -e "/go install/d"  || die
+	sed -i build/build.sh \
+		-e "/^version=/s/=.*/=${PV}/" \
+		-e "/^revision=/s/=.*/=${COMMIT}/" \
+		-e "/^branch=/s/=.*/=v${PV}/" || die
+}
+
+src_compile() {
+	GO_FLAGS="${GOFLAGS}" VERBOSE="true" emake build
+}
+
+src_test() {
+	GO_FLAGS="${GOFLAGS}" VERBOSE="true" emake test
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	dobin _output/${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/app-containers/cadvisor/files/cadvisor.service b/app-containers/cadvisor/files/cadvisor.service
new file mode 100644
index 000000000000..13966305156f
--- /dev/null
+++ b/app-containers/cadvisor/files/cadvisor.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=cAdvisor - Analyzes resource usage and performance characteristics of running containers
+Documentation=https://github.com/google/cadvisor
+After=network-online.target docker.socket
+
+[Service]
+User=cadvisor
+Restart=on-failure
+ExecStart=/usr/bin/cadvisor
+TimeoutStopSec=20s
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-containers/containerd/Manifest b/app-containers/containerd/Manifest
index c0e341ac22e6..5bc4bb270fd6 100644
--- a/app-containers/containerd/Manifest
+++ b/app-containers/containerd/Manifest
@@ -16,5 +16,5 @@ EBUILD containerd-1.7.23.ebuild 2022 BLAKE2B 6d9195dff277519a734b1959a304fe01d6e
 EBUILD containerd-1.7.24.ebuild 2021 BLAKE2B 8d1f30c5e2d88874e63aaf2452c1f594379587506f0dd5c4cad2531f4ced6f9a341ee0a4800c68b828b133312637767f6d2aab5f52dbc46a7c391448c6b3d50e SHA512 668630c48fbe40f7c658a3170d45ac0242bfda54aeef324db896e1c769f5891503368533ca630af0afd7217040f00edd9bfc27e30636bc625666c9e5bb8219d6
 EBUILD containerd-2.0.0-r1.ebuild 2030 BLAKE2B f10ec799e3834c40608ee0d2bd3daaedca88fc4467ccd8b95093bf33b8acc6f33275348899beb1d4b5cce1e94da33b25dd1e4b892879aec3a01fc5f0d9bb4e50 SHA512 326ce0123977ca3a3892b8a49a395e64d945ea36f39fff9114855040690cfa2280a3191e0e8dfab28cc82ea10365749c2fc2f732a709db60a75cd5bf51208a15
 EBUILD containerd-2.0.0.ebuild 2021 BLAKE2B b4a80a24a5eb0d90c8c89ee5f9104de363a77d8031968f595faf6fddc426a7b73eeb9e89a6b381eb3c4b09c20c991c60228c79f22c3a6f80261456d944e43940 SHA512 1d6bb45bc502c62c18a24af6981ffbe6c4086502c6e7d24495b278bd241b6dee1dc5ee3dc3857da1a5ed8ebe2226a52b48c7ff521b55462605de297cb38e29d6
-EBUILD containerd-2.0.1.ebuild 2030 BLAKE2B cfd9cd409b2ad20f890534b37fcac556a68d586fc4bd5e2740697d98a3c92c3407a569a5431ba674e52a553b5730d4673ad82f120ae74af01b42093353dbf05a SHA512 4a857cec9b3683fbd7dc657830d7375d20ce1ed8bd3c5b987fc964f0db928afe957fb7ed7bcc43ccef8798b2c0b60661d6bd3129361bd29e3b23d0c9d92fc883
+EBUILD containerd-2.0.1.ebuild 2027 BLAKE2B a0a02d7e60d5673d03eac7eada811b7434e2ce58455b138e4cf6071a1d27681c0f1ae466d0eed112e97ba5f952dc5c4cda6e3cb4c471a2f6b42889b9695a85d4 SHA512 2e5806f163bdf790306dada370ce3d493a3dc62de3c72259b22fb07b6d9d9c4fa2a3301e0557b57fb04ba4927b936a75c7022f77d70ea133fa3d9778dac51c3b
 MISC metadata.xml 981 BLAKE2B 78f44dd46331f9159931ff289a5adfdc177cb5e0c1d12cf717fad4f227b15ae40f479f40554dc4855009342cb7d699aaa543a0fbcc962789fe100a1cc9b350c5 SHA512 a171a3fcd67d8b410148d3e99477ea69be7e84ba2a2d24739343bfde29b88f8f799530c3b1107829ebd52eb847b4f5c25e4d4701ea9a2bc196c761b0768906d1
diff --git a/app-containers/containerd/containerd-2.0.1.ebuild b/app-containers/containerd/containerd-2.0.1.ebuild
index b375d170ea25..82e4dbe7a8d6 100644
--- a/app-containers/containerd/containerd-2.0.1.ebuild
+++ b/app-containers/containerd/containerd-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
 IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
 
 COMMON_DEPEND="
diff --git a/app-containers/containers-common/Manifest b/app-containers/containers-common/Manifest
index c63b2f9db8cb..bc7b8e6a7367 100644
--- a/app-containers/containers-common/Manifest
+++ b/app-containers/containers-common/Manifest
@@ -1,11 +1,7 @@
 AUX examplify-mounts-conf.patch 214 BLAKE2B 3e72e91ce65190acb437a1ec5e0cbbb27b46b8581a062729bd90792bea8ea3a9549c4cc4d445198eda05ef4673391aa8bff6616918fab427fb2c9973e81484e1 SHA512 2f1aaadca8644c6e7062ac7d79864297b3bcd34c4c84a6d2651ac24e159fae8773cc240d0916f27354e394ab701a4339c15d5dde6957d61f5b153677a5bebca1
-DIST containers-common-0.57.0.tar.gz 12700958 BLAKE2B 8432a7d839b94b59eabd75d4978a4d0c1340a64ed626db74e74a8318e08c61172bfba5e4f4c4b0dfffec302c5a310bb5be8fad3ab4d91a6d89ced373a0a6f297 SHA512 b993821040788085ff44e48023a64cea4e3e7e50731c359087bd287168e6849a543d930acbdaff2437fc7951acc46f7183f337dd977215eca814332e6869d1e3
-DIST containers-common-0.58.0.tar.gz 13164567 BLAKE2B 17795eec2d38b4d8b9d6afeb20e249208c5ae2ac767a365ef7313d1e7c36eadb9a9eb284a657dfe3f4fcb0577448d4883fabbad76e0318425fdc03809e27cd7c SHA512 6f569d68d3b0e5ead304c7f23341808d66a47b6352c772d353d50c5f4777cd8a5a5b85d6faaf2887f828c17ec49b9c5f929177a67294b5bbb69baa80656982a8
 DIST containers-common-0.59.1.tar.gz 13131960 BLAKE2B 5b3b947789f889955716816fa15a84eb2f398d6cfb59c85bd969442fb8f55715f2c17c78d963ae913d96e6a109f69da745cfc7db8d23e2ed6516f992b982dda0 SHA512 452c9b84f7631afdf39b7b1fcaf2f721bede312d8fb55b89a953f16ca3546c0df11bb23c99588a592b6375275516d1364570261fbc15301ca3ad486ee66eae32
 DIST containers-common-0.60.4.tar.gz 13106900 BLAKE2B 1afb428044bc8eebd002b884f2a2072971cd83fca561fd509b83088ccdf82b3a62d63ff32ec5ef856c3d0ee0ffac316201fa8f1d7956153ce30e2244cc860f02 SHA512 5d61415d4959486223a36ff98304363a558e6da9ccbdca94f976649a37d404ac00c8454019f60a79360029c91c9565d22868b109dbb84c19f13377e0e23dcc4d
-EBUILD containers-common-0.57.0-r1.ebuild 1469 BLAKE2B f83e531ffd457701110bac047423efc64de104efb3fe8343bd572f7742b2c340a2c11528ddadca19da6e98dcc4549ad458be3e76a587f46efede14b199c5af54 SHA512 4c7edd8ea8580e080ab96e8a833f37be236db8d7fb6370e0a8b205daac659947d27d549f0038ee7908cdbd8bcdc0e91f93ee7338d85a396d38b2e0dc1bfd1e53
-EBUILD containers-common-0.58.0-r1.ebuild 1831 BLAKE2B 5d4f98e52111ff64943128235fed05377c04d2a5e2b8d7610c23f1be32551e56327e7e78bbb8bca243beefa843b33cea4584fa6436738534be2065110ed04217 SHA512 a91a4d3d2e4375bf93a5a733c358b3da601b088933746b7bb683390d0da20a9218eb98c938944741c5357c887c19e9417b02a0660eebe57d12e38070151d6560
 EBUILD containers-common-0.59.1.ebuild 1836 BLAKE2B 0b728de99ccc6f80ae8f2709d3a3362faa39467023e87b552a020f42efac3a8c7dc36d408df091eed96655ad50fcd84afe53be3525a53e92065b2f0825542152 SHA512 f2c79608f8737cfdfd76aa6607feffada0db5dfd208218aca536d6789e456ed420a71a4a72a2b9383a782b22276c0a5c89b00cb6ca40132005ece4a9abcc4532
-EBUILD containers-common-0.60.4.ebuild 1836 BLAKE2B 516b4d6ff4f0a8235206f28f6a254527b21cbff2db55e438a6ecc515bcd4b34d983fea7a13c0bf7b233ac3b68c2e61ed1d1e383e73cfeca3b0e30e44cfe58fcc SHA512 954b99a77dcfe272bf02fdfdf1a85862575d94b81b152273f5e6b10d95cef838a9a88fb6a24b7cd5ce33435bbeb4fb21fe498b1fe71978659ae0d80b41eed498
+EBUILD containers-common-0.60.4.ebuild 1834 BLAKE2B 38d6daf2a46fefc269d628f513cdd4348363e1057523475882178f190c809b433979ee8d07e5bc456dc08e8ab983556f72becbe58d7bd83b85cde60c67b95be7 SHA512 05bbbc3bac7a418e4127fe72899337386721902500e8efdeab155d87022362bb811ad481947aa5b1004d6b0c34f9c45b8ecab7b9718a1840f74536fc6f36fe41
 EBUILD containers-common-9999.ebuild 1836 BLAKE2B 516b4d6ff4f0a8235206f28f6a254527b21cbff2db55e438a6ecc515bcd4b34d983fea7a13c0bf7b233ac3b68c2e61ed1d1e383e73cfeca3b0e30e44cfe58fcc SHA512 954b99a77dcfe272bf02fdfdf1a85862575d94b81b152273f5e6b10d95cef838a9a88fb6a24b7cd5ce33435bbeb4fb21fe498b1fe71978659ae0d80b41eed498
 MISC metadata.xml 741 BLAKE2B 727dfc3215f6fb9155105aad6b83e4cff72d8f484e2abaf267a299c07777490abb657a6d0eb349587bae53ad614a6137bd6a205252c835d8141925698cdc2464 SHA512 d014e28716c2b2fd1926a5d7612437cf7553a62fcd26ede88dd180eeb8cfa52f0bfc0c61f539b05dcc7a7faf7c1f17a99e20cbf3743044c1aad1478fbfb11316
diff --git a/app-containers/containers-common/containers-common-0.57.0-r1.ebuild b/app-containers/containers-common/containers-common-0.57.0-r1.ebuild
deleted file mode 100644
index 3cb764cb31ce..000000000000
--- a/app-containers/containers-common/containers-common-0.57.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Common config files and docs for Containers stack"
-HOMEPAGE="https://github.com/containers/common"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/common.git"
-else
-	SRC_URI="https://github.com/containers/common/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P#containers-}"
-	KEYWORDS="amd64 arm64 ~riscv"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-RESTRICT="test"
-RDEPEND="
-	>=app-containers/containers-image-5.29.2
-	app-containers/containers-storage
-	app-containers/containers-shortnames
-	!<app-containers/podman-4.5.0-r1
-	net-firewall/nftables
-	net-firewall/iptables[nftables]
-	|| ( app-containers/crun app-containers/runc )
-	|| (
-		( >=app-containers/netavark-1.6.0 >=app-containers/aardvark-dns-1.6.0 )
-		>=app-containers/cni-plugins-0.9.1
-	)
-"
-
-BDEPEND="
-	>=dev-go/go-md2man-2.0.2
-"
-
-src_prepare() {
-	default
-
-	[[ -f docs/Makefile && -f Makefile ]] || die
-	sed -i -e 's|/usr/local|/usr|g;' docs/Makefile Makefile || die
-
-	# add comments to mounts.conf
-	eapply "${FILESDIR}/examplify-mounts-conf.patch"
-}
-
-src_compile() {
-	emake docs
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	insinto /usr/share/containers
-	doins pkg/seccomp/seccomp.json pkg/subscriptions/mounts.conf
-
-	keepdir /etc/containers/certs.d /etc/containers/oci/hooks.d /etc/containers/systemd /var/lib/containers/sigstore
-}
diff --git a/app-containers/containers-common/containers-common-0.58.0-r1.ebuild b/app-containers/containers-common/containers-common-0.58.0-r1.ebuild
deleted file mode 100644
index 4a0427e20df7..000000000000
--- a/app-containers/containers-common/containers-common-0.58.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit readme.gentoo-r1
-
-DESCRIPTION="Common config files and docs for Containers stack"
-HOMEPAGE="https://github.com/containers/common"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/common.git"
-else
-	SRC_URI="https://github.com/containers/common/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P#containers-}"
-	KEYWORDS="~amd64 ~arm64 ~riscv"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-RESTRICT="test"
-RDEPEND="
-	>=app-containers/aardvark-dns-1.10.0
-	>=app-containers/crun-1.14.3
-	>=app-containers/containers-image-5.30.0
-	>=app-containers/containers-storage-1.53.0
-	app-containers/containers-shortnames
-	>=app-containers/netavark-1.10.3
-	net-firewall/nftables
-	net-firewall/iptables[nftables]
-	>=net-misc/passt-2024.03.20
-	>=sys-fs/fuse-overlayfs-1.13
-"
-
-BDEPEND="
-	>=dev-go/go-md2man-2.0.3
-"
-
-PATCHES=(
-	"${FILESDIR}/examplify-mounts-conf.patch"
-)
-
-DOC_CONTENTS="\n
-For rootless operations, one needs to configure subuid(5) and subgid(5)\n
-See /etc/sub{uid,gid} to check whether rootless user is already configured\n
-If not, quickly configure it with:\n
-usermod --add-subuids 1065536-1131071 <rootless user>\n
-usermod --add-subgids 1065536-1131071 <rootless user>\n
-"
-
-src_prepare() {
-	default
-
-	[[ -f docs/Makefile && -f Makefile ]] || die
-	sed -i -e 's|/usr/local|/usr|g;' docs/Makefile Makefile || die
-}
-
-src_compile() {
-	emake docs
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-	readme.gentoo_create_doc
-
-	insinto /usr/share/containers
-	doins pkg/seccomp/seccomp.json pkg/subscriptions/mounts.conf
-
-	keepdir /etc/containers/certs.d /etc/containers/oci/hooks.d /etc/containers/systemd /var/lib/containers/sigstore
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-containers/containers-common/containers-common-0.60.4.ebuild b/app-containers/containers-common/containers-common-0.60.4.ebuild
index 985ebb5c0ca4..d49ffa4b4dad 100644
--- a/app-containers/containers-common/containers-common-0.60.4.ebuild
+++ b/app-containers/containers-common/containers-common-0.60.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/containers/common/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${P#containers-}"
-	KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
+	KEYWORDS="amd64 arm64 ~loong ~riscv"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-containers/containers-image/Manifest b/app-containers/containers-image/Manifest
index 497875f21442..29b8da3ec8c9 100644
--- a/app-containers/containers-image/Manifest
+++ b/app-containers/containers-image/Manifest
@@ -1,11 +1,9 @@
 AUX fix-warnings.patch 397 BLAKE2B a5922e061c825e25398fc3fccdf683abf8331b065337ff240227478d7d3ef5398957d56a430c0b04aa823033b56653e87c8186065e5898818e75310451b347e0 SHA512 a96ab3fea76be4751d6dc3893b4272b063c854503e1a65b4501819a5925f3911c285fbfb4ee6827795a41c696015cc06f446e4ddb1318e21cf0141e15804833e
 AUX moving-policy-json-default-yaml.patch 3285 BLAKE2B c0c9dd1380b6edec05162df127085ba74b7f426b00f7565bf4f14a2fe1809fe66fa13b19a84d84ae32dc3179ea0967aff8d8e24875ae706906f2427120fad801 SHA512 a3e8d2cbf3797e998636feaf963968b1e382ab1376b4d6a42bfa7187359e04d782aa043debd20f4ea2b1e4280d049029a71d8525a3fd2a87c780523eedcaf04f
 AUX prevent-downloading-mods-5.29.2.patch 322 BLAKE2B b3358abc9a9850a24153d188289068e3a8482a7b30e56b9440694ab78c04c37f10f5e3f31a24e82cbbe2f4c365d0df3dc5ccea1778df6dc9fe3dc12977169bf6 SHA512 1c78ae9dd35c7e8546984b32e149f29beaf955fe673264c0a3ea45b86046fa1628b5f74696f7224fcffbf54fc642d696848d0530beadf41be0084e4d77992a04
-DIST containers-image-5.29.2.tar.gz 707618 BLAKE2B f1556cbb26ceedd74a338355caf8b557c43286726f4be63544cebc9a8f4b92be78d7a0cddbedaba7352d13e9fc399f62ee114caba6c8b1ecc334dab1379e523b SHA512 f3f6e09670dc393067992a78303f01e2584dabe79ba156973a50d7a460c011e5a27d0ccdf0ff6b399099a9a3a4c57f3badf24fb5d0704efd645ab7196a544d8f
 DIST containers-image-5.30.0.tar.gz 719070 BLAKE2B 5952ab703b6df793f326dd4fc82f50c5f672e2b9d142e0bc706014092420e3563599d9f1c1f65f743e1a8144b91f92b2326d7bf4c3024b5efb466d777a8ad613 SHA512 89cd0d482bb5d70037ff51413b7abca01d36bc7f39e9dc130c78462e501dae32193137a367d81532afd216a7432e127728147e6e839d5d99eeb6b6680f31d4dc
 DIST containers-image-5.32.2.tar.gz 735422 BLAKE2B a0585c877b4679226d1760bf873ceeb5cba7f5177ab83fa6f8a161b1f3958f3d660445556b13b4221712c241cee94429cabdb1fd4186d4dc6edba7b032fce2bc SHA512 7498f9e446b2c205b033703641f7cfcb6c8bd8f097b12ef3f734c94772d63fc7b9b40a6700d53d93919d2c34772f079aa3cb7d9f9e5a130b6587f4fe2a558df6
-EBUILD containers-image-5.29.2-r1.ebuild 941 BLAKE2B fc67e64e032fdeabffe229307966f71732fd8de208e2059c866da21f246a0f356122f40bc3b2cdee53dfb4bf5c4dcd054e8bb844cee7e01835239ad4aeaf4c40 SHA512 f912c9f49786be67573ade0cbd1c7676fa4e13d054d44c947b55b7dd4e7faa5a98f5813e261d029666bd7d302452c63ee84fd1e734e2cbbe67dcbf2b098eff38
 EBUILD containers-image-5.30.0.ebuild 876 BLAKE2B 33c68c540357f5741622eadc8d6052a9fe916aebc4b490048eb0fe567f339534e3c4905b6a0549a3a24c2ac84438e9f80fff77d185846489df015e8ac58b7433 SHA512 0cda4908a4dd9e1c369053bd62cd78cf06b9e3e3286d4935e1359e2688b3428bd278961a54a09ad0584e565764a95f4cf0ce9b3d3baf8ed66ff0405c8cf059a2
-EBUILD containers-image-5.32.2.ebuild 832 BLAKE2B 28111e291882afa8f49ce40664039869a01a1514e3937c272002bc44d1497290bec6b45ac7f017fe9b7c04be1b7d0b52da385fa67183569236a128c22258de5b SHA512 4f6c5d60b4a9995a9c9c994cdf69af9d573a40548df9fbcedcdbabe63ca18398c4caf240f27f68ead4608928f9bc87060c517e25bfeb0070da26d167e25cb957
+EBUILD containers-image-5.32.2.ebuild 830 BLAKE2B d07749947955ddf185306dfafed5b9113d9fd2b5b16f4688190295484df35f32cd19f0ffdf033b24bc6097ce36f8f39e1311c9a56c1f53f1d65713a167ad6bfa SHA512 5e3bd2e474da6f104fb29e9ce72a858bed0a3ac84bcf0b7789a91d75ffd04e3aaeae3dcc0e311736f9cd4963c36337a56145d372f0bf787fc58d386244021cab
 EBUILD containers-image-9999.ebuild 832 BLAKE2B 28111e291882afa8f49ce40664039869a01a1514e3937c272002bc44d1497290bec6b45ac7f017fe9b7c04be1b7d0b52da385fa67183569236a128c22258de5b SHA512 4f6c5d60b4a9995a9c9c994cdf69af9d573a40548df9fbcedcdbabe63ca18398c4caf240f27f68ead4608928f9bc87060c517e25bfeb0070da26d167e25cb957
 MISC metadata.xml 738 BLAKE2B ce4b4915d322a13866596221e70f6d19fecf6835cc7d56cdf58d8fbb640aeeb68c03cc0e97a77db270879fd2fdd6751157d932afd69aa31256200ffecf7993e9 SHA512 19f3c8bc2109b189cf6bc8f37fedf7426d0a8c76efc3862d23a10a233cd9bbad20d0798601f999a60c86856d8825b5d4f91931388aded6185144399731fd09c7
diff --git a/app-containers/containers-image/containers-image-5.29.2-r1.ebuild b/app-containers/containers-image/containers-image-5.29.2-r1.ebuild
deleted file mode 100644
index 5a0b9d37566c..000000000000
--- a/app-containers/containers-image/containers-image-5.29.2-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Default config and docs related to Containers' images"
-HOMEPAGE="https://github.com/containers/image"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/image.git"
-else
-	SRC_URI="https://github.com/containers/image/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P#containers-}"
-	KEYWORDS="amd64 arm64 ~riscv"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-# https://github.com/gentoo/gentoo/pull/35012#discussion_r1473740969
-RESTRICT='test'
-BDEPEND=">=dev-go/go-md2man-2.0.3"
-RDEPEND="!<=app-containers/containers-common-0.57.0"
-PATCHES=(
-	"${FILESDIR}"/moving-policy-json-default-yaml.patch
-	"${FILESDIR}"/prevent-downloading-mods-5.29.2.patch
-)
-
-src_compile() {
-	emake docs
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	insinto /etc/containers
-	doins registries.conf
-}
diff --git a/app-containers/containers-image/containers-image-5.32.2.ebuild b/app-containers/containers-image/containers-image-5.32.2.ebuild
index 2b3c1bcb8666..4226aabc608e 100644
--- a/app-containers/containers-image/containers-image-5.32.2.ebuild
+++ b/app-containers/containers-image/containers-image-5.32.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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 ~arm64 ~loong ~riscv"
+	KEYWORDS="amd64 arm64 ~loong ~riscv"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-containers/cosign/Manifest b/app-containers/cosign/Manifest
index fc6abb12be86..4d66da415a47 100644
--- a/app-containers/cosign/Manifest
+++ b/app-containers/cosign/Manifest
@@ -3,5 +3,5 @@ DIST cosign-2.2.4.tar.gz 840586 BLAKE2B 22522fc70ff6b01957af2e294b7fdad740d55cc9
 DIST cosign-2.4.0-deps.tar.xz 153232112 BLAKE2B 9aa2da10bb063a554c4722ed3523ab1ec332209eec3d1adffa53d22ddec4296b834a2c9194323684ef27d738439818ba9e6e8539ca10e17eb40a835178eaf7fb SHA512 ff3a16420d2e0291bb67f856cd21ad519fcdbd08489cfd9dfe29aa816d077f6fc32ec1d314291f4811ae717270448b92c000e1a0d115a9b5f1346f17567e78a5
 DIST cosign-2.4.0.tar.gz 864498 BLAKE2B 7154e8b1b171e2491f68a000925b9ad2e59dd8eae8fa5431e482dfdb1b9e04dd42b59c988d765eae615dedc95b35d34d82b3adb9ae7a0bf4bd0a5fefde7a39c5 SHA512 35a57a0cd627d470c957da972e9acbc415a4b7ab0d9ead7e3d3499ecac5a167d93026f886d1c686882a97daac75944d326b06b292cb614ce8e727c81be04fdcb
 EBUILD cosign-2.2.4.ebuild 703 BLAKE2B a830cb2aba41a92b233d974d5e59afd9875294cb30a89b04e76e291c984fa6bb3b96aa41dabb0622f7f4698e217615d537dca63dc4b96d1b9e378aab7b4e315d SHA512 e4d4eaa34d4aec98826561b71556bfe7150cafa8038c3a4cc12e82b0faf5302db94d9cb2d47672a1715dec2710bde9b4db466107e07cfcfbd39edbdbbc6fe7af
-EBUILD cosign-2.4.0.ebuild 704 BLAKE2B 2f79e335838812ea613f027e83948d6fdb6249809445156075828749edee26bac6019432aa2b0fb5946d7473966c807f19a41ba197438ffbd9f680d7fb48b0fd SHA512 b01877a57fbcdbb548cfae98c13c8d339171b6093b612a49ae9a4b22b9d3ef6e53c7cb5c00ac0c1d9e0bb40199755016ea6ccfaeb7a7e8f54d78f79fde02e9ca
-MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
+EBUILD cosign-2.4.0.ebuild 703 BLAKE2B 26549a648fe180aad109bcd92fcc2ded75a9ad8b2d6e122c60ba256b9491d1a2cbf2944113dc4879dfdd3aeb6e7748d614adf63ab80f2dca461c7d86d367f823 SHA512 c12f806d03ff4419adad7c70d2504229d83b505409a329e12499d8f772bb9ce62588dd62e800952ffc109358b193d9e49a4d406ea7cb562ae548d4c7cf4ac7b8
+MISC metadata.xml 329 BLAKE2B a1b89f50ed29e79c0f10c026f4f4d2b13c98678b264dfa815f4e5bcb902334dfaf7e0e05d5ff53a1cda89437eff8fd9abd07e2c9ff72108c83b0b911a6f5fa18 SHA512 1b4fc909c896266714fec030cff768dbc7466470e0ad0e90e03a1f1dd139f846b221a90dac2e5c56ce4404e6b5f4addaac980fd29efcfd223dfdd982bf643876
diff --git a/app-containers/cosign/cosign-2.4.0.ebuild b/app-containers/cosign/cosign-2.4.0.ebuild
index de622f965ee3..70638b1898d9 100644
--- a/app-containers/cosign/cosign-2.4.0.ebuild
+++ b/app-containers/cosign/cosign-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RESTRICT="test"
 
diff --git a/app-containers/cosign/metadata.xml b/app-containers/cosign/metadata.xml
index db463f3eeb66..dfccbfcf246c 100644
--- a/app-containers/cosign/metadata.xml
+++ b/app-containers/cosign/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">sigstore/cosign</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-containers/crun/Manifest b/app-containers/crun/Manifest
index aa78bf0dd1bd..cf7630ad7745 100644
--- a/app-containers/crun/Manifest
+++ b/app-containers/crun/Manifest
@@ -1,12 +1,10 @@
 AUX crun-1.11.2-caps.patch 1149 BLAKE2B 241d7b26555d32d082e3c770a61b6c01285b4e3dcd9f54922c2fb38cc14581cf08c7b53f96d9e61b5a8f436725473df26008d04890c698cf23edbb60ae57d937 SHA512 73477342c4de8b28c02c7c2c57940e3800662a90d43849aeea90562582deccf06f2860cd41ba8ff9a45a0c68ce9aa751a9f19ad239b5d5f8009c0bf7e38b4d53
-DIST crun-1.11.2.tar.xz 738176 BLAKE2B ef13475089c87599159ce00dd26fbb19c7f2bb9564352c1f8040925e521bb924cf28a8d1f37cc95ce7d1b2797b8654740e9ad08352e357c8c9e2d176466101e0 SHA512 ae35ffb9bd1c7acebfd7f6236fa6a7ad524593d8f2cea1203f0e89023e9791d2d5bbc5c5cfc32ee5f18ad80662a1659076ab5f4d5ff74c6026842f2dd12be977
 DIST crun-1.14.3.tar.xz 750456 BLAKE2B 5a63b5da2f85ff1a83d4589be224c5b7a1123b6d7714b90a63c1907b78d42392aff25ffe5d9a4127173ac47026d57e9c93a39f5ba4b07de7f9f3722c14e6d203 SHA512 d6645c519ff00dda5def6d58240600d15e76969489918d51c0def2fee7dbad6374f83e5afc14a998d176aa2944765df5cd84c3031b265a1931ab23f2fc965fc1
 DIST crun-1.16.tar.gz 1759549 BLAKE2B 1dfdf9177ae52e627c92e70e48a558bb355c87f629e95f1debaf6b7d8c38802110bd796545d5b2dbe3cac7f8de1f9c94e9b5f046cc618e73afd4c434188d585c SHA512 718e17abdb8c2a9e1fdd39f09e7e3e435d88c5785cc13c1e67f492847d7d938cf399aecc055ecf88720fa8f73b8539f057e3b0e53f10f4e382f5664a2243b959
 DIST crun-1.17.tar.gz 1773153 BLAKE2B 9f75cb6879e0b8cd47bb8939c1cf6f88d5e13e6d8932c652ea20c64501bc69fbda84dd061866a9c08e353848f39d1022bf67fbc0d160d5ef7fdc08c1edec03f9 SHA512 7556467c5e0e93bb7321e2e88de8a2f537340e3e0acaa5501eab8deb0f4bb93c4561f8d063156789d3ee98fdd49069fc52c0ed0c773bd44db476eeeccc16aa1a
-DIST crun-1.8.4.tar.xz 729552 BLAKE2B 8169518a0ddd8deb3820f7030d03dec6941d5d34fb73a036b82f15b0d8f2f702e117de00b829a16cb9976e118f5a5ca732b1cd572708f664cfeafc564f883824 SHA512 2ed80db2e7ddd1438bbe33e99ec2cdbcc55c4869504f719ff9302e834929752af09a59cd905accb37ee5f6cae3b9b16fd4f4c3fdab31db5fc38b007c1505bfa0
-EBUILD crun-1.11.2.ebuild 1829 BLAKE2B 7de0ec9104725bee5336c6e766077e87cbf7ab89ad9363ad409c4ba3df2f52b04294828fd4573cde35f740b0ef17f534b72b5d532321a98764f376daabc3fd9d SHA512 77c44e288c714be902a8714b9cbdf23245c24790a7df1766add33516b380083a2ad1034f19f38a95e135a692d6d92318d4ba9cfd23a644ec1eb476b2e59e3edd
+DIST crun-1.19.1.tar.gz 1786019 BLAKE2B 555f7c917c9e9ed80919b708cd711890d47c395b5b6fa1c2b542d311176941c5ece23bd7ff0cb4c3dcf81be4f46fec21fa8127da57092657157707537771dfe1 SHA512 6cb6148a3b6e18b4dbb0178ea23eaaa57c040781a34b5c5c5dac71be513941717011fe996a7400b9dee0a73f7f0dd2fc36544fe72382a3f2543e4de90589fe6a
 EBUILD crun-1.14.3.ebuild 1625 BLAKE2B c405ac2c2fce7b8167e8b8df618ab54bcd5d0b009ba88f94cd8d54e429387a5748e76d26e889a9791a331b8814a242fe89958cef8d0592ab8c17dbbd9bd3b042 SHA512 ed5b0d330c516edba0fed743d04c12cbdabd4ca6adc8704068d5af6f26a5e949181cadd13cd5072af09b54e92fc5df2c7a27fb7c0babed7837f5b0aa9d63b9f5
 EBUILD crun-1.16.ebuild 1817 BLAKE2B 969247d6c41416dd213e6b1a1bcb5683cad0c6009397a0207c358db8a470c5e33c5bdf89d317afe68a0db9e61897b102f322e94e592b7a8da97c5adbeb366230 SHA512 221aeb2a020ecc7a5d1ad8e1f1d7302b431518a1b89e795b6067fbda06e578b47d3240c690b93c5e9347142dd4835303cd4639d7252c687fa0a3acb2f4141507
-EBUILD crun-1.17.ebuild 1852 BLAKE2B 77d29f930d2430fb9760c01e142830678e5d4544a41aaafec7686ccd3b223760874cb468ed071d1ebc567c98121a043b213155ce5c0bff5c4f2081c6fa3473de SHA512 c0fb9413e80c04ac45d86252b6a8481d9aaa5d182eed7b4f2aa726219df8f811f86a797fd9c3ef9582d26d32c38faffa0cf1a4d167b7db23aea135709eb3e65d
-EBUILD crun-1.8.4.ebuild 1672 BLAKE2B 388b4daf7cc6fb32e33e9114253cab94281abff7a17d260dcfa255042ba57489e2dff0b95bfa6f5d700fac01066c9d2cb282becc8ac90458ed7c10d5f967aa90 SHA512 69077ea7f94586489abf3b16d0cef1f793569ab2db7a3334c89c7af7e2d4561479de456838da9f5aa1a9eaa5c3f51471436aa66a8595f643ed8a60eda7f8a0eb
+EBUILD crun-1.17.ebuild 1849 BLAKE2B dfff255620040bfe53c24ff39784f52b7947f9393f74db88daba0c970803c25f7ec5819e0189798d803b28a13cb7b2287b2486779ec2e5f98c13726def762926 SHA512 d13f581e27957dc38748cf1e74efeb00ce9db6cd0de2ca8b131422c551ff51960ab21f90f6a41198a8467e2982be4e4b339ac036a50957e0deaa79907c67cee0
+EBUILD crun-1.19.1.ebuild 1852 BLAKE2B 8dceb6234c9152ae25c6e06bfa4ed08ed57b09883bd5d1891a6994d0f02782c4a3c2f0e6306f440dd8c93fc47763301f6f575b98819ee7400113eac526c7be5d SHA512 5dec9758446959db62978c0810226bdba46d2febde6d7c671f8f34b4f3405720174e79291f2d5cc194a7f4c6934b9edc9fc43196bb0e6289a485b50c411b6a8a
 MISC metadata.xml 1300 BLAKE2B a0ae27420fca097e4e7b5e983de3b76fef43bf13887bd5fe903da14e20c2f0ebd2fc273dae74e32e28c2768b5f8d6e5e6c8b4c9f07ca6d47e41902621173a167 SHA512 1699a89a01de32b580bc74bc747430ef7b1a6284b2f459b4041b22de0efbebda45778803deb512a61806ed8e2998b141caefb7830acafc68d42ce4343b193dd6
diff --git a/app-containers/crun/crun-1.17.ebuild b/app-containers/crun/crun-1.17.ebuild
index fb6ca32f1cad..b54381361852 100644
--- a/app-containers/crun/crun-1.17.ebuild
+++ b/app-containers/crun/crun-1.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2024 Gentoo Authors
+# Copyright 2019-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ if [[ "$PV" == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/containers/${PN}.git"
 else
 	SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv"
+	KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv"
 fi
 
 LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/app-containers/crun/crun-1.11.2.ebuild b/app-containers/crun/crun-1.19.1.ebuild
index 029066f58826..f1b4ab06660e 100644
--- a/app-containers/crun/crun-1.11.2.ebuild
+++ b/app-containers/crun/crun-1.19.1.ebuild
@@ -1,23 +1,28 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit python-any-r1
 
 DESCRIPTION="A fast and low-memory footprint OCI Container Runtime fully written in C"
 HOMEPAGE="https://github.com/containers/crun"
-SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+if [[ "$PV" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/containers/${PN}.git"
+else
+	SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv"
+fi
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
 IUSE="+bpf +caps criu +seccomp selinux systemd static-libs"
 
 DEPEND="
-	dev-libs/libgcrypt:=
 	dev-libs/yajl:=
 	sys-kernel/linux-headers
 	caps? ( sys-libs/libcap )
@@ -32,12 +37,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	# merged upstream: https://github.com/containers/crun/pull/1345
-	# drop when we get 1.11.3
-	"${FILESDIR}/${P}-caps.patch"
-)
-
 src_configure() {
 	local myeconfargs=(
 		--cache-file="${S}"/config.cache
@@ -52,18 +51,19 @@ src_configure() {
 	econf "${myeconfargs[@]}"
 }
 
-src_compile() {
-	emake git-version.h
-	emake -C libocispec
-	emake crun
-}
-
-# the crun test suite is comprehensive to the extent that tests will fail
-# within a sandbox environment, due to the nature of the privileges
-# required to create linux "containers".
-# due to this we disable most of the core test suite by unsetting PYTHON_TESTS
 src_test() {
-	emake check PYTHON_TESTS=
+	emake check-TESTS -C ./libocispec
+
+	# the crun test suite is comprehensive to the extent that tests will fail
+	# within a sandbox environment, due to the nature of the privileges
+	# required to create linux "containers".
+	local supported_tests=(
+		"tests/tests_libcrun_utils"
+		"tests/tests_libcrun_errors"
+		"tests/tests_libcrun_intelrdt"
+		"tests/test_oci_features"
+	)
+	emake check-TESTS TESTS="${supported_tests[*]}"
 }
 
 src_install() {
diff --git a/app-containers/crun/crun-1.8.4.ebuild b/app-containers/crun/crun-1.8.4.ebuild
deleted file mode 100644
index c0e0200e403c..000000000000
--- a/app-containers/crun/crun-1.8.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-# Can drop autotools/eautoreconf after next release & glibc patch gone
-inherit autotools python-any-r1
-
-DESCRIPTION="A fast and low-memory footprint OCI Container Runtime fully written in C"
-HOMEPAGE="https://github.com/containers/crun"
-SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv"
-IUSE="+bpf +caps criu +seccomp selinux systemd static-libs"
-
-DEPEND="
-	dev-libs/libgcrypt:=
-	dev-libs/yajl:=
-	sys-kernel/linux-headers
-	caps? ( sys-libs/libcap )
-	criu? ( >=sys-process/criu-3.15 )
-	seccomp? ( sys-libs/libseccomp )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-container )"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-
-# the crun test suite is comprehensive to the extent that tests will fail
-# within a sandbox environment, due to the nature of the privileges
-# required to create linux "containers".
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable bpf)
-		$(use_enable caps)
-		$(use_enable criu)
-		$(use_enable seccomp)
-		$(use_enable systemd)
-		$(usex static-libs '--enable-shared --enable-static' '--enable-shared --disable-static' '' '')
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake git-version.h
-	emake -C libocispec
-	emake crun
-}
-
-src_install() {
-	emake "DESTDIR=${D}" install-exec
-	doman crun.1
-	einstalldocs
-
-	einfo "Cleaning up .la files"
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-containers/docker-credential-helpers/Manifest b/app-containers/docker-credential-helpers/Manifest
index 286bf0eef433..2d2742800c94 100644
--- a/app-containers/docker-credential-helpers/Manifest
+++ b/app-containers/docker-credential-helpers/Manifest
@@ -1,3 +1,5 @@
 DIST docker-credential-helpers-0.6.3.tar.gz 28971 BLAKE2B b50e4de0f3b126e0118f24f845a94be5e932975ab54ad6e0a52129a56109ecafb021f14986569295242cb0af4ea109d8786b8a5ca8481cc48daad14671841432 SHA512 2d15be8df134bff08eef9461348f07cd57c70c15a0ab044de2e69296c400b8c0e16198c90fd064d5ce83037d0bad57520e7524b0832b7a00e69397203dc90d10
+DIST docker-credential-helpers-0.8.2.tar.gz 283816 BLAKE2B 334ca059b619e5e3528864a99b07eea61b98083989aa8e8b619c83d781caad97fbf5f3ed60879adacf27d81e0b991a38567e1fa2bc27b9a772d86b51437a6e03 SHA512 ca04b7fe78871389c9f968b730c18e2aca2d2a818ce87c1f138efb7dafbfdea7b83c2c16504131d04c295428debee2187036e603dba711369b5de1a3993c2e8c
 EBUILD docker-credential-helpers-0.6.3.ebuild 1199 BLAKE2B 3514e6402ebac85acbe88f0be29923cf223cef79180604945d1c139381ebb3e4039e82f8aff82090c8fe914588b4c4ae0a286d60c344326fef202b22a750fec6 SHA512 0b126b657a1360c159d651e66893cb2333b0fc936c0419e0f04e2c4557d96db40544f54ddd414c6254371267dae269049369e67d5767d08f2793e2576b0b40f0
-MISC metadata.xml 750 BLAKE2B 9f67dda7b4912528fab57c111696db0e367a6a3c0b71042a57ec3ddffd251abdfc0f16568d7bac6607aeaff51835379e59cc6cc9e3ad21ca97cb46e656fd38d3 SHA512 232528d0a1c72e068737267af9ccd1a1ffd4c807dc662092499a53bf33b693b401abae1d25503e68fa3e5e74a18384060a776a6f61e57e1ba83d3c7f4d460ce3
+EBUILD docker-credential-helpers-0.8.2.ebuild 1100 BLAKE2B cbdbc59f41f3def7980f55d27e4505ed8f75913b43e1577c6c499d691f0086b10b62ab3d708ed12c5deec452dc98cca0acf002b4aa349a28539486f648bc0144 SHA512 2f0d391140b4661160af58a0b14b934afd7ebdec0ba48f239ad9cbdc1d5529b1ff273cd6d2904caa2ab09f7cda35fb74db5b30e352249b42a83414bcc8d53c7d
+MISC metadata.xml 847 BLAKE2B daa036739753388691baec54b1c47810a14858ba2dfeae12673abf0dc7ad16d8c956b9e134c6618782fb94e45408746a1e52f81102690b1d4a8cabc57d9a9934 SHA512 3fe3ed079e79e0bc7ee744f1ffcb2f4eaec1f966ee897c9bae75d5f5465cff1f8b75d59b42f1aad69475a452c502f0244fec0a5bda585a78968b77c6ae791bd8
diff --git a/app-containers/docker-credential-helpers/docker-credential-helpers-0.8.2.ebuild b/app-containers/docker-credential-helpers/docker-credential-helpers-0.8.2.ebuild
new file mode 100644
index 000000000000..d49feeba1dbc
--- /dev/null
+++ b/app-containers/docker-credential-helpers/docker-credential-helpers-0.8.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Suite of programs to use native stores to keep Docker credentials safe"
+HOMEPAGE="https://github.com/docker/docker-credential-helpers"
+SRC_URI="https://github.com/docker/docker-credential-helpers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+IUSE="keyring pass"
+REQUIRED_USE="|| ( keyring pass )"
+RESTRICT="test"
+
+DEPEND="keyring? ( app-crypt/libsecret )"
+RDEPEND="${DEPEND}
+	pass? ( app-admin/pass )
+"
+
+src_compile() {
+	local mymakeflags=(
+		VERSION="${PV}"
+		REVISION="v${PV}"
+	)
+	use keyring && mymakeflags+=( secretservice )
+	use pass && mymakeflags+=( pass )
+	emake -j1 "${mymakeflags[@]}"
+}
+
+src_install() {
+	dobin bin/build/*
+	dodoc MAINTAINERS README.md
+}
+
+pkg_postinst() {
+	if use keyring; then
+		elog "For keyring/kwallet add:\n"
+		elog '		"credStore": "secretservice"'"\n"
+	fi
+	if use pass; then
+		elog "For 'pass' add:\n"
+		elog '		"credStore": "pass"'"\n"
+	fi
+	elog "to your ~/.docker/config.json"
+}
diff --git a/app-containers/docker-credential-helpers/metadata.xml b/app-containers/docker-credential-helpers/metadata.xml
index 2f589c3c8517..238401d193a9 100644
--- a/app-containers/docker-credential-helpers/metadata.xml
+++ b/app-containers/docker-credential-helpers/metadata.xml
@@ -20,4 +20,7 @@
 			Build pass helper for the pass utility.
 		</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">docker/docker-credential-helpers</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-containers/netavark/Manifest b/app-containers/netavark/Manifest
index 9a07035b396a..0eef770c9361 100644
--- a/app-containers/netavark/Manifest
+++ b/app-containers/netavark/Manifest
@@ -1,17 +1,5 @@
-DIST netavark-1.10.2.crate 154261 BLAKE2B 2da5b12917f5db01d82c47808f403e06d6abbcbad0b777d1871de73d52d25219e3d6f8db48feb862aff8a20ed2184c728e813871aa1acc1d02e3997987a932b6 SHA512 362dd2652b3a9d9d1dec99cd85bc6e74b323d86b79ded742e68472e0b58881a5306d7217218d88e27d5e1c4094f2d67c9cb766d4b4c1ee2185c8b4fcbd299e3d
-DIST netavark-1.10.3.crate 154416 BLAKE2B a7750304484ae820eb3bb1bc4de8c2ad22d95494fe10471014e0eb999fb7578c5e9c2ab352fe357d964d701206ee7016f87134a62afe0a03cd1b574cae1264ca SHA512 6ed9cd5a69a6eacc4ad839a82680c7b98d453564aadee41eb6ea632223fba7fbdb20f11e4146dc74b6c6d3695ac50624424b3260dbb7769a4100a918e4328dbf
-DIST netavark-1.11.0.crate 155698 BLAKE2B df460f6a2e5ce82645dccf6ca487724da2abc6f3f2c90f56d935d691ddd9a4229b785177a4e6360f75aa13ee7cdb29a2794c0b7360ef9d40ea3f946771d3ab73 SHA512 e25b075f98cb2aa55cf0e8d8868aac3b6ff0b390f4f0632d6ee2f431cede144948ed98015576cf8a64fcc1a2c33c454415159951aacbdf0611613da867db9a13
 DIST netavark-1.12.2.crate 156878 BLAKE2B 787fd23e3fa233a18a753aa55a43413aafff47b4d0733a9f2250d3f2159c1a3d0dd20272997701b3bc39a6a042060e3d2edad2418326873111d8183f0060560c SHA512 45e423e15945ce63e1bb5d2364377de65efd2f2edfeb0fd3522d2d8afb5cb60e1951b5810ac1dbdbbdf77176885b738ad864132daa8d7de858fb4edce340d7ea
-DIST netavark-1.9.0.crate 139321 BLAKE2B c0c40c5b109544c094bf83ba9c73f829472c7703a72e25ec3dcb9b62b926f404618b2cb143fcc944f2240db074de14e711115d6f51d722125e152eea0ac0a631 SHA512 7a5fb4a856b5815c141ad63abbe0f122d762a411b86189add76cfff99adfdb066e24a7b577683950efdc39f2b7955bbdfb31f2c1c41037702fb732916e8aeebe
-DIST netavark-v1.10.2-vendor.tar.gz 16135498 BLAKE2B 607cad9d80067d579adaafdea22b238f5e2f6f92a3c6aed530c8e97bce2f7f869adeabbc7b7d1c04f7c517459112c42b5588aa3ccbf04d5205d2b8212c1e7a42 SHA512 a5079b724d25af60cc094dd5c0bc9e01d503f64bee7ef1c8e616e79793726d848a5e000d951f02d2516f10feea23e30ab637b37ae09da5580f4edb1e783240c0
-DIST netavark-v1.10.3-vendor.tar.gz 16135507 BLAKE2B 114519b76d932c5918fd91cea73e8bc9f5aa3a63275f9218e667e400c3e2512e5db29ce806b5e5b509b043c04a3436344a27cf170e203d4360d00247e48b5ca9 SHA512 b8a99f45ba4ebb20414fe052ff08b1e7a7a86994c7dfa2f36d0500d52bcbd2d279aeff19fb0844a65e2375e86da33af735851f038f598771d2dac96ff7e032a5
-DIST netavark-v1.11.0-vendor.tar.gz 17751524 BLAKE2B b466b27674e6944b2de8a684ee3e14f26775b6065f0f1e82987a0c240725c01f88d2138641b768b5e03fce5b26908d0281b1983b8c1844af4999064bf24d8f15 SHA512 d858bddaaf41b284af9ede84a4d3aab5b5935ea83df5261dfa58e2b7d14962dd55983b1a95b2692e323ea40fc2dc4d9b1bdf2aed90644739e6333c794a7915cb
 DIST netavark-v1.12.2-vendor.tar.gz 18364290 BLAKE2B e2f09d53ac8106196aa873732df66f0357a5e26488cc1b8f1d10f5f5d650d471272efca7f33860afe6242500d934ee22d9ea58c256e47e296ed57d8d563f1f27 SHA512 1396eb4e41282745949a7a511c6c44e703c810624e56b8ca9455fec52c59d4ec4333103e00188b2b8c08a60bb9e8a8eca6ed995103c0dc20b3b91c1e0a1d0dfb
-DIST netavark-v1.9.0-vendor.tar.gz 16032862 BLAKE2B 313bcde75f2355dab3fa4fdc82881109924c07408aa352e92b590356cf292cd60ad39d8ef31687935e3fed6f22ec8c3b8f26e6eae21fdf211c29c83b745c8a84 SHA512 a5c11dd47122490579a260b6ac3b1c8f01d1c2881e58dbcc5bece398c7d6ef01f376f8c342df4ef619b135cc92a95c48741c8098413c33ede696c87a9cdcc96c
-EBUILD netavark-1.10.2-r1.ebuild 1352 BLAKE2B 7faefe36bd5adf3a4142bee1f8efe913645e57a6f10f7f81eb20f090e58fceb2ed4357e3793822b40fb2a7214adb854378223d2886cc03e2a3ca593895b9b845 SHA512 58f4239d9d399ae8c9d784659053587cb88e32487508ee2c4847d862f7a417c25637118b34a10b48f54de709e1f7d797d40126b17101da3c8b04e03384a8093c
-EBUILD netavark-1.10.3-r1.ebuild 1350 BLAKE2B 14ca0aaf558e59252f15cd3403307d480318889e44a6b2bc1fe12350e1a52f92c94f89cd73cc45d0e94cf993278e57a46937e26e99133805a05db15d36eed8d0 SHA512 6ee734ef88f5c1a72fa670ec2c4f8269c9254af2048a3103d883d34d2ed077ac53cc290a26eb099117990d3f97bce3231482a26ceda2c3bdc2678c66b6c76eec
-EBUILD netavark-1.11.0-r1.ebuild 1357 BLAKE2B 76c7fae7837e14bd3a60c99c41770a86445e91f50deaf1245ea35ae00f1620aaa897c9326ff13fff5aef009e161997af513f32f6d7a65e61b35d0b2b6ba45367 SHA512 1511fa42ed7f99bcec52c0e58ec0fc4092cb823cdd221b248822b58332f96cd2f7e2f7cf9c9365ec92289e5b6ca1f5da73ccacb0703564a9507f230f25037e46
-EBUILD netavark-1.12.2-r1.ebuild 1359 BLAKE2B 021487ea8354717f18cf89fa031293a61871ff6857f4e66e36297b12a120fbab747a790f1bac6a58be8afa004af6cfc1bb5d416955e10a517003a630da7b0b78 SHA512 7f5e44fc774b3315a728a6c2f609de311c0e084e5da2a74a38f7b1458ace4c414077212a69943923620c778241863830d0074d6098fb93e189455c728da714ea
-EBUILD netavark-1.9.0-r1.ebuild 1350 BLAKE2B 14ca0aaf558e59252f15cd3403307d480318889e44a6b2bc1fe12350e1a52f92c94f89cd73cc45d0e94cf993278e57a46937e26e99133805a05db15d36eed8d0 SHA512 6ee734ef88f5c1a72fa670ec2c4f8269c9254af2048a3103d883d34d2ed077ac53cc290a26eb099117990d3f97bce3231482a26ceda2c3bdc2678c66b6c76eec
+EBUILD netavark-1.12.2-r1.ebuild 1357 BLAKE2B 51569d3fa5de47f4ccf70ccd828111c1942c4082804610582752c3d3c6d1600bc05ec1e1ab720ef44fba94502571d9a0d7e4f72abdc85051c3e35531675c97ca SHA512 4dfeaeb7279e9b669c88788f52a77e540ea5239085f481317a650d7be7384c74494e3ea0a81aafe6cca4c2dfd19519bdb580961c85c295a2adb0cdba7f91bf03
 EBUILD netavark-9999.ebuild 1359 BLAKE2B 021487ea8354717f18cf89fa031293a61871ff6857f4e66e36297b12a120fbab747a790f1bac6a58be8afa004af6cfc1bb5d416955e10a517003a630da7b0b78 SHA512 7f5e44fc774b3315a728a6c2f609de311c0e084e5da2a74a38f7b1458ace4c414077212a69943923620c778241863830d0074d6098fb93e189455c728da714ea
 MISC metadata.xml 944 BLAKE2B 072bce0ea9bd5b8e5647c64b79ff77d29099607b9c67f5add104daad074a510a1aabbc8a02e5587ade6363519f13ceb07019302dd8c5e627c271b61faf468d49 SHA512 538b0be977375a193dfc889a6ab77b5ea8fd0d26fc6479b146829cb98333dcf8f1b0d030e75970ec90b01a8cc8a5e35f21857bdbbb111a0fc278f7df3aeb6eda
diff --git a/app-containers/netavark/netavark-1.10.2-r1.ebuild b/app-containers/netavark/netavark-1.10.2-r1.ebuild
deleted file mode 100644
index 42ba29c8332d..000000000000
--- a/app-containers/netavark/netavark-1.10.2-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-[[ ${PV} == 9999* ]] || CRATES="${PN}@${PV}"
-
-inherit cargo systemd
-
-DESCRIPTION="A container network stack"
-HOMEPAGE="https://github.com/containers/netavark"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/netavark.git"
-else
-	SRC_URI="${CARGO_CRATE_URIS} https://github.com/containers/netavark/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
-fi
-
-# main
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 MIT Unicode-DFS-2016 Unlicense ZLIB"
-SLOT="0"
-BDEPEND="dev-go/go-md2man
-	dev-libs/protobuf"
-
-QA_FLAGS_IGNORED="
-	usr/libexec/podman/${PN}"
-QA_PRESTRIPPED="
-	usr/libexec/podman/${PN}"
-
-ECARGO_VENDOR="${WORKDIR}/vendor"
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-		cargo_live_src_unpack
-	else
-		cargo_src_unpack
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die
-}
-
-src_compile() {
-	cargo_src_compile
-	export PREFIX="${EPREFIX}"/usr SYSTEMDDIR="$(systemd_get_systemunitdir)"
-	emake docs
-}
-
-# Following is needed because we want to use `make install` instead of `cargo install` (exported by cargo.eclass)
-src_install() {
-	default
-}
diff --git a/app-containers/netavark/netavark-1.10.3-r1.ebuild b/app-containers/netavark/netavark-1.10.3-r1.ebuild
deleted file mode 100644
index 499417f28d96..000000000000
--- a/app-containers/netavark/netavark-1.10.3-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-[[ ${PV} == 9999* ]] || CRATES="${PN}@${PV}"
-
-inherit cargo systemd
-
-DESCRIPTION="A container network stack"
-HOMEPAGE="https://github.com/containers/netavark"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/netavark.git"
-else
-	SRC_URI="${CARGO_CRATE_URIS} https://github.com/containers/netavark/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz"
-	KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
-fi
-
-# main
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 MIT Unicode-DFS-2016 Unlicense ZLIB"
-SLOT="0"
-BDEPEND="dev-go/go-md2man
-	dev-libs/protobuf"
-
-QA_FLAGS_IGNORED="
-	usr/libexec/podman/${PN}"
-QA_PRESTRIPPED="
-	usr/libexec/podman/${PN}"
-
-ECARGO_VENDOR="${WORKDIR}/vendor"
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-		cargo_live_src_unpack
-	else
-		cargo_src_unpack
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die
-}
-
-src_compile() {
-	cargo_src_compile
-	export PREFIX="${EPREFIX}"/usr SYSTEMDDIR="$(systemd_get_systemunitdir)"
-	emake docs
-}
-
-# Following is needed because we want to use `make install` instead of `cargo install` (exported by cargo.eclass)
-src_install() {
-	default
-}
diff --git a/app-containers/netavark/netavark-1.11.0-r1.ebuild b/app-containers/netavark/netavark-1.11.0-r1.ebuild
deleted file mode 100644
index 35792c7d1868..000000000000
--- a/app-containers/netavark/netavark-1.11.0-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-[[ ${PV} == 9999* ]] || CRATES="${PN}@${PV}"
-
-inherit cargo systemd
-
-DESCRIPTION="A container network stack"
-HOMEPAGE="https://github.com/containers/netavark"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/netavark.git"
-else
-	SRC_URI="${CARGO_CRATE_URIS} https://github.com/containers/netavark/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz"
-	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv"
-fi
-
-# main
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 MIT Unicode-DFS-2016 Unlicense ZLIB"
-SLOT="0"
-BDEPEND="dev-go/go-md2man
-	dev-libs/protobuf"
-
-QA_FLAGS_IGNORED="
-	usr/libexec/podman/${PN}"
-QA_PRESTRIPPED="
-	usr/libexec/podman/${PN}"
-
-ECARGO_VENDOR="${WORKDIR}/vendor"
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-		cargo_live_src_unpack
-	else
-		cargo_src_unpack
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die
-}
-
-src_compile() {
-	cargo_src_compile
-	export PREFIX="${EPREFIX}"/usr SYSTEMDDIR="$(systemd_get_systemunitdir)"
-	emake docs
-}
-
-# Following is needed because we want to use `make install` instead of `cargo install` (exported by cargo.eclass)
-src_install() {
-	default
-}
diff --git a/app-containers/netavark/netavark-1.12.2-r1.ebuild b/app-containers/netavark/netavark-1.12.2-r1.ebuild
index 81168b09df45..c5c7836b91e1 100644
--- a/app-containers/netavark/netavark-1.12.2-r1.ebuild
+++ b/app-containers/netavark/netavark-1.12.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/containers/netavark.git"
 else
 	SRC_URI="${CARGO_CRATE_URIS} https://github.com/containers/netavark/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv"
+	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv"
 fi
 
 # main
diff --git a/app-containers/netavark/netavark-1.9.0-r1.ebuild b/app-containers/netavark/netavark-1.9.0-r1.ebuild
deleted file mode 100644
index 499417f28d96..000000000000
--- a/app-containers/netavark/netavark-1.9.0-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-[[ ${PV} == 9999* ]] || CRATES="${PN}@${PV}"
-
-inherit cargo systemd
-
-DESCRIPTION="A container network stack"
-HOMEPAGE="https://github.com/containers/netavark"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/netavark.git"
-else
-	SRC_URI="${CARGO_CRATE_URIS} https://github.com/containers/netavark/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz"
-	KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
-fi
-
-# main
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 MIT Unicode-DFS-2016 Unlicense ZLIB"
-SLOT="0"
-BDEPEND="dev-go/go-md2man
-	dev-libs/protobuf"
-
-QA_FLAGS_IGNORED="
-	usr/libexec/podman/${PN}"
-QA_PRESTRIPPED="
-	usr/libexec/podman/${PN}"
-
-ECARGO_VENDOR="${WORKDIR}/vendor"
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-		cargo_live_src_unpack
-	else
-		cargo_src_unpack
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s|m0755 bin|m0755 $(cargo_target_dir)|g;" Makefile || die
-}
-
-src_compile() {
-	cargo_src_compile
-	export PREFIX="${EPREFIX}"/usr SYSTEMDDIR="$(systemd_get_systemunitdir)"
-	emake docs
-}
-
-# Following is needed because we want to use `make install` instead of `cargo install` (exported by cargo.eclass)
-src_install() {
-	default
-}
diff --git a/app-containers/podman/Manifest b/app-containers/podman/Manifest
index f0170c9d2384..38eebd1b8c03 100644
--- a/app-containers/podman/Manifest
+++ b/app-containers/podman/Manifest
@@ -9,6 +9,6 @@ AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690ca
 DIST podman-5.2.5.tar.gz 23834863 BLAKE2B 2264c9b19e621a1269ae5baee6fee148e6f1b9cacbdd83fdbecf671f87855d0ae566e41e4e8cbffe57662b7e9a3d653d57a7d2acb8f30b869b8af1bd7473a617 SHA512 29f71c67a5700e8dffe45e6e91acab509d8c8924a5f3cf9b4eee95f665a9ed19333285df89da892699ee314cee27c0c8a4a62d29e4205198781f5d5f585135a9
 DIST podman-5.3.0.tar.gz 24194165 BLAKE2B fb2da37e4f97d69997b9518425bb1ec74846e4e26855bf9ece0eeefb723f603051d4d4a1b3320cdba5c97595db12e1948f280776429819d10bfe83a57f349c78 SHA512 3f1ab7e792850e2e21823c59ca9e03d348e78267e3ec5344a04c38e51466159717944c318cf5e61ad9a785d9112b468b9fc37f3b60a40e8764d5cac9f58e7d16
 EBUILD podman-5.2.5.ebuild 3947 BLAKE2B c6439cddb0133031ae6a2140f465bf51909373f71c7236b9c54661b1e31ed4fc56c7aaee7f45cc1a38d6fabb7fd7c1d115440d3ed7bf5aa93fdafbeae6a4dbc6 SHA512 89d4201f8816dd44ee6403aee597c625322b5d33db4e4e634d79b0b21a46b73ac10aad40b42f90117509cef078f3dfb44eb6f72d42dbce27321d9c46129c8373
-EBUILD podman-5.3.0.ebuild 3949 BLAKE2B e1647b3dd3bdbcfa45a631423b4212e6a13465585e5af8df125e34379a3c8ecb75ca5630d09895dde421c560a002624de8a5cc7056493ae71f7a5fe0c67ede8e SHA512 e637d4db374768263ecd90ae3556028f48f8361355d5fe1fc45fe694eadbf582900107ffd3eb69b9389f6a412be563a07bf86418695c82d5d2f54f673658be3c
+EBUILD podman-5.3.0.ebuild 3947 BLAKE2B 463dd9f1aa3eeb437fd8fd3e935cde3889679e658315cb484ac810b0c6c8a7867ab72cf7385cf03bff8e4c78e215a75c13b16a331209b061b2e601b046fa7b58 SHA512 01d3d4c29b2aeec7726f6a5b255101a296e5e55cd5988130783c17df143b37196291bb20533092211d33ef5ea616bf9425dd4cf67b6ebf92a6a1b77e7b7799c9
 EBUILD podman-9999.ebuild 3949 BLAKE2B e1647b3dd3bdbcfa45a631423b4212e6a13465585e5af8df125e34379a3c8ecb75ca5630d09895dde421c560a002624de8a5cc7056493ae71f7a5fe0c67ede8e SHA512 e637d4db374768263ecd90ae3556028f48f8361355d5fe1fc45fe694eadbf582900107ffd3eb69b9389f6a412be563a07bf86418695c82d5d2f54f673658be3c
 MISC metadata.xml 1298 BLAKE2B d34dbc318614b35f5d05995e758cdbf4e173c73544fec41f7f726cc0ffb21257e90723fba092b6e33d3c15e437e2e4e4d207517703ca85bae4968b3b9e7cb4a5 SHA512 0451f166c722c3ea93a57df1059b083a5c8e484baf7a55421b5a82babf51959d1036ab3d179146c63b5ae00aefe2980caffb650dcc72a162537bd307d9e03b60
diff --git a/app-containers/podman/podman-5.3.0.ebuild b/app-containers/podman/podman-5.3.0.ebuild
index 1deb45b19629..365a368d763d 100644
--- a/app-containers/podman/podman-5.3.0.ebuild
+++ b/app-containers/podman/podman-5.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/containers/podman/archive/v${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${P/_rc/-rc}"
 	[[ ${PV} != *rc* ]] && \
-		KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
+		KEYWORDS="amd64 arm64 ~loong ~riscv"
 fi
 
 # main pkg
diff --git a/app-containers/runc/Manifest b/app-containers/runc/Manifest
index 78edf9330790..a3af6c45a2b1 100644
--- a/app-containers/runc/Manifest
+++ b/app-containers/runc/Manifest
@@ -11,5 +11,5 @@ EBUILD runc-1.1.14.ebuild 1779 BLAKE2B fbcdf8db2d3ee3a18f322e618f607fcac9203be3a
 EBUILD runc-1.2.0.ebuild 1816 BLAKE2B ccc31c5c48d4ebfde40e43ca043c296b5f1b51881114cbf7a0d8cd447a6d0cf412d377b2845a91881fb4779c433b5aa1984174e20f62a3650eb67a70cc749bf6 SHA512 fc450b70c64f03e4641941b84386e2d9eb8e7d7282127fa0f0f87d1e47b60b17f05cc3e7e1e12aa16b2ef0a32d9db6e60ffa9f7b4e4ea756a0ed6213e101579a
 EBUILD runc-1.2.1.ebuild 1816 BLAKE2B 1937aea831725622ee8efabc29b334e55d87649425f3d14438c29b1ac61e6808a5d9bf701cf0f7d879a88e8767c927e57823f4aa1955541278567ebe78a78a2c SHA512 ff0dc3bad2a63454676c89c8e706cef722d7a4a1594c9c18dcd25af08ba8e1ed05d9435f3c4c2260eb17b697f2f16df4e93a6cc8b15d3c7f0390417cb3429c78
 EBUILD runc-1.2.2.ebuild 1816 BLAKE2B 1937aea831725622ee8efabc29b334e55d87649425f3d14438c29b1ac61e6808a5d9bf701cf0f7d879a88e8767c927e57823f4aa1955541278567ebe78a78a2c SHA512 ff0dc3bad2a63454676c89c8e706cef722d7a4a1594c9c18dcd25af08ba8e1ed05d9435f3c4c2260eb17b697f2f16df4e93a6cc8b15d3c7f0390417cb3429c78
-EBUILD runc-1.2.3.ebuild 1816 BLAKE2B 05455a7ebfa645d2f076528a8a461ab99a7594b14c24f5f26ce9d6ac93a8c2506621bfd4eef6dafd0ebb615882ea22bdb6aa8f0ccaaadddcc7cfa282efbc63fd SHA512 83a31b5277bd6792d2dd4ca2035c2d1da8ea602a1e2c20e0b4c5449894f62d685db2130e6b30299ed3684029d05ea7be3517be5f1cdb700b904f4581c081ecaa
+EBUILD runc-1.2.3.ebuild 1813 BLAKE2B b4c377056ff2ccf5c18175c43e92b13668c11ff2f4799b745d2b2192a4950b48ba58aae1b7c4138e39b016bfbda4b8985ce40ec957b36a1b65d027d54996502e SHA512 8b6795fc1be10ec915f3a9d4e6f4b0615db726353d6fc39d73f1fbce7f5f68499b38aef1e961a3acad40abb7d5230efa48fe10721230e587200d601bdd9a6c48
 MISC metadata.xml 647 BLAKE2B 67dce497b4fa65db5146f9e017ec00795ad4ef5d63058d4c20bfc730f17e2fabfcd82b403bd06330f9a68ef2e344198514930493eeadef69eb2ee8a618e5e0fc SHA512 970d9753c81eb387a06fc24be8bfb3b056e9e7cbf568f99511bdcfd35f6a8cdfe21ea0103ea36b8fba7be733016493663c3a38452b05225de35af7e1c5b359dc
diff --git a/app-containers/runc/runc-1.2.3.ebuild b/app-containers/runc/runc-1.2.3.ebuild
index 5aa85977a545..e9a15e300e2a 100644
--- a/app-containers/runc/runc-1.2.3.ebuild
+++ b/app-containers/runc/runc-1.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="Apache-2.0 BSD-2 BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
 IUSE="apparmor hardened +kmem +seccomp selinux test"
 
 COMMON_DEPEND="
diff --git a/app-containers/skopeo/Manifest b/app-containers/skopeo/Manifest
index a35551b521cf..b56fd8823026 100644
--- a/app-containers/skopeo/Manifest
+++ b/app-containers/skopeo/Manifest
@@ -1,10 +1,6 @@
-DIST skopeo-1.14.0.tar.gz 10548883 BLAKE2B 6ecf54d236405ce59bedf77acc124fa8b3bb12acefa24a679a1d2d85957ddf585b5a6ba163806b8b7b510485d936adbe1afd6eee8c92b267b948f7d78ac83d05 SHA512 59d329036a97cbeca4de20b15d9dd8adacd5201834b26ae5e5c88b05594b2a7101c22da91f22c35c07a98e41afa28f2c7103e660b3847c7f8c9691f27f4c4146
-DIST skopeo-1.14.2.tar.gz 10547979 BLAKE2B bca47d82380ad714397dc8e36e365a3e81fc628b47519b022ecb5edd2a03ce8972c066af350cd1f0b5a3d9d6c1585f0729b32a1a829cfc4eaefc1c7fc9dc2667 SHA512 ffb3c00cdde05f7a916bd3980c9cec1bb82b3f3bf90058bfff1837d3a9902087ac011828e6164baec18210d4aeee1a5258b75405411fd15ea2470a2522a6da73
-DIST skopeo-1.15.0.tar.gz 10710505 BLAKE2B b6804561ec96ce7f987ccdaf5a89aa7f5fd0ed2da1307467b4c1857386508d88e3fd28f066f49b136962e232b89594484610fc4f6b494be6a98b64908900865b SHA512 71fb94fd2cf9937bf2dd969c8b1b74f5b66eb2ac2bd9358e8c8983c3fd6548311ca274ed2f8c3f088c3c9d6032962075da1890449dcd25dcfd49882acbfa20de
 DIST skopeo-1.15.1.tar.gz 10709125 BLAKE2B aa688197fe0d803b6cb1f4e7c5c998a917e7d588fa41b9e6ede6d60fd1ef12f209e2f119bc29143bf92ae3349c1168e33f79cb36d6c7f5a1a22bcbf3f4e51792 SHA512 686d17da4a84d9029d688cfca08724576564ce2a05aed9380bf55059c244c90cffa3b21c2dbe84b19b746773e98d5f26e5ceaca58f7be26b656125977685c663
-EBUILD skopeo-1.14.0-r3.ebuild 1845 BLAKE2B 75d7c2b86ef231206ed2898089f0c64de58fa923d01c54a5b671c77d133240d10743713a355415c27a551eb2e7794f7f9e3d9f0746d05b992e7f637fc3c84e68 SHA512 fb1d518f9ca77dfa35073b3cc57c6fe866c6dab8dd6feb27eb012af7dab5160464255e043ef7a519e80a1b0900fcabf81587f18fae57d28553875c4c55d95982
-EBUILD skopeo-1.14.2.ebuild 1847 BLAKE2B 8024b877083ba54ef0ab21d835bc5524794e3e31babe163f3ac9130c832f36d9bd00d5a3fa5f646858748132b6018aa84a59c00d646f0eae0c3ac08bd2b3ad37 SHA512 a18d9aa5b6fd1a7ee213b15eab711a86abac4dbffe4443d9c4c0c4fdbb55a90ee1aa9e45a5252a5e149fbdbc53626c2962a6d4ebc451cd2e866f221622040784
-EBUILD skopeo-1.15.0.ebuild 1847 BLAKE2B 8024b877083ba54ef0ab21d835bc5524794e3e31babe163f3ac9130c832f36d9bd00d5a3fa5f646858748132b6018aa84a59c00d646f0eae0c3ac08bd2b3ad37 SHA512 a18d9aa5b6fd1a7ee213b15eab711a86abac4dbffe4443d9c4c0c4fdbb55a90ee1aa9e45a5252a5e149fbdbc53626c2962a6d4ebc451cd2e866f221622040784
+DIST skopeo-1.17.0.tar.gz 10682765 BLAKE2B 88e658a29bacaead26ef19309e2c138d5b689c04b56291a93f23765a97bcee0e3acfa82014babd5cf375127b78cc3ac4fb42b6ba3284632d43b1ac865a618969 SHA512 72cee72a88764a85252ff1812aff284215805db10708fdfd4f3c778d7efec16b8a0d4d26b966a2e18ca36eea9a98265d75e78967dfb3ea0bf94f98c3b61c6504
 EBUILD skopeo-1.15.1.ebuild 1845 BLAKE2B 75d7c2b86ef231206ed2898089f0c64de58fa923d01c54a5b671c77d133240d10743713a355415c27a551eb2e7794f7f9e3d9f0746d05b992e7f637fc3c84e68 SHA512 fb1d518f9ca77dfa35073b3cc57c6fe866c6dab8dd6feb27eb012af7dab5160464255e043ef7a519e80a1b0900fcabf81587f18fae57d28553875c4c55d95982
+EBUILD skopeo-1.17.0.ebuild 1847 BLAKE2B 1efd04e8d8e6c92afd812e2ab9239335551d2484cddef633a530837f85d14a19f2795f3b73394bdacff744e71dcbd77984875939dbc069ec700cde8c2436fa6b SHA512 2cca9270227d95bb7c28037c7d477e80c3942571b611ddd19bf154715e5a9c049e16e07b2fc94f4d55b4525ceed9969182e4db447f54a66668e0b980b660de06
 EBUILD skopeo-9999.ebuild 1847 BLAKE2B 8024b877083ba54ef0ab21d835bc5524794e3e31babe163f3ac9130c832f36d9bd00d5a3fa5f646858748132b6018aa84a59c00d646f0eae0c3ac08bd2b3ad37 SHA512 a18d9aa5b6fd1a7ee213b15eab711a86abac4dbffe4443d9c4c0c4fdbb55a90ee1aa9e45a5252a5e149fbdbc53626c2962a6d4ebc451cd2e866f221622040784
 MISC metadata.xml 930 BLAKE2B 0b4b93d0c3358bb809fd90da9c73c5cd50e780ffd62f040621147af47e5958061cae9ce1eeaa6809e9cdbd7554141de080b3c29e4751b4381b6be3f220b231d6 SHA512 152a06ec28cb661c0aeef1e1c264724016811f1716710e8c611c68c1816fa2f6e67a2e2ca0e6c333c4e33a267e7a6eed796c66575d0c3a3ea078611d77e685f0
diff --git a/app-containers/skopeo/skopeo-1.14.0-r3.ebuild b/app-containers/skopeo/skopeo-1.14.0-r3.ebuild
deleted file mode 100644
index 462b948cd231..000000000000
--- a/app-containers/skopeo/skopeo-1.14.0-r3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module linux-info
-
-DESCRIPTION="Work with remote container images registries"
-HOMEPAGE="https://github.com/containers/skopeo"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/skopeo.git"
-else
-	SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64"
-fi
-
-# main
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-IUSE="btrfs device-mapper rootless"
-
-COMMON_DEPEND="
-	>=app-crypt/gpgme-1.5.5:=
-	>=dev-libs/libassuan-2.4.3:=
-	btrfs? ( >=sys-fs/btrfs-progs-4.0.1 )
-	device-mapper? ( >=sys-fs/lvm2-2.02.145:= )
-	rootless? ( sys-apps/shadow:= )
-"
-
-# TODO: Is this really needed? cause upstream doesnt mention it https://github.com/containers/skopeo/blob/main/install.md#building-from-source
-# 	dev-libs/libgpg-error:=
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="
-	${COMMON_DEPEND}
-	app-containers/containers-common
-"
-BDEPEND="dev-go/go-md2man"
-
-RESTRICT="test"
-
-pkg_setup() {
-	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
-	use device-mapper && CONFIG_CHECK+=" ~MD"
-	linux-info_pkg_setup
-}
-
-run_make() {
-	emake \
-		BTRFS_BUILD_TAG="$(usex btrfs '' 'btrfs_noversion exclude_graphdriver_btrfs')" \
-		CONTAINERSCONFDIR="${EPREFIX}/etc/containers" \
-		LIBDM_BUILD_TAG="$(usex device-mapper '' 'libdm_no_deferred_remove exclude_graphdriver_devicemapper')" \
-		LIBSUBID_BUILD_TAG="$(usex rootless 'libsubid' '')" \
-		PREFIX="${EPREFIX}/usr" \
-		$@
-}
-
-src_compile() {
-	run_make all completions
-}
-
-src_install() {
-	# The install target in the Makefile tries to rebuild the binary and
-	# installs things that are already installed by containers-common.
-	dobin bin/skopeo
-	einstalldocs
-	doman docs/*.1
-	run_make "DESTDIR=${D}" install-completions
-}
diff --git a/app-containers/skopeo/skopeo-1.14.2.ebuild b/app-containers/skopeo/skopeo-1.14.2.ebuild
deleted file mode 100644
index ab892d6789a8..000000000000
--- a/app-containers/skopeo/skopeo-1.14.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module linux-info
-
-DESCRIPTION="Work with remote container images registries"
-HOMEPAGE="https://github.com/containers/skopeo"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/skopeo.git"
-else
-	SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
-fi
-
-# main
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-IUSE="btrfs device-mapper rootless"
-
-COMMON_DEPEND="
-	>=app-crypt/gpgme-1.5.5:=
-	>=dev-libs/libassuan-2.4.3:=
-	btrfs? ( >=sys-fs/btrfs-progs-4.0.1 )
-	device-mapper? ( >=sys-fs/lvm2-2.02.145:= )
-	rootless? ( sys-apps/shadow:= )
-"
-
-# TODO: Is this really needed? cause upstream doesnt mention it https://github.com/containers/skopeo/blob/main/install.md#building-from-source
-# 	dev-libs/libgpg-error:=
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="
-	${COMMON_DEPEND}
-	app-containers/containers-common
-"
-BDEPEND="dev-go/go-md2man"
-
-RESTRICT="test"
-
-pkg_setup() {
-	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
-	use device-mapper && CONFIG_CHECK+=" ~MD"
-	linux-info_pkg_setup
-}
-
-run_make() {
-	emake \
-		BTRFS_BUILD_TAG="$(usex btrfs '' 'btrfs_noversion exclude_graphdriver_btrfs')" \
-		CONTAINERSCONFDIR="${EPREFIX}/etc/containers" \
-		LIBDM_BUILD_TAG="$(usex device-mapper '' 'libdm_no_deferred_remove exclude_graphdriver_devicemapper')" \
-		LIBSUBID_BUILD_TAG="$(usex rootless 'libsubid' '')" \
-		PREFIX="${EPREFIX}/usr" \
-		$@
-}
-
-src_compile() {
-	run_make all completions
-}
-
-src_install() {
-	# The install target in the Makefile tries to rebuild the binary and
-	# installs things that are already installed by containers-common.
-	dobin bin/skopeo
-	einstalldocs
-	doman docs/*.1
-	run_make "DESTDIR=${D}" install-completions
-}
diff --git a/app-containers/skopeo/skopeo-1.15.0.ebuild b/app-containers/skopeo/skopeo-1.17.0.ebuild
index ab892d6789a8..cf1341e8921c 100644
--- a/app-containers/skopeo/skopeo-1.15.0.ebuild
+++ b/app-containers/skopeo/skopeo-1.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
author	V3n3RiX <venerix@koprulu.sector>	2025-01-11 06:41:28 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2025-01-11 06:41:28 +0000
commit	f1634517e73f2faf342a366354c3e0f2edb45952 (patch)
tree	ae3c632ec3576f8d57b3acd5e1aba5643f0f6d9b /app-containers
parent	f9d8ddaae80afb8fa0924cd3f769f9b37dd373e1 (diff)