8 files changed, 108 insertions, 74 deletions
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 54374b1e57f7..2cdca908a23a 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/cri-o/Manifest b/app-containers/cri-o/Manifest
index b3453f9baa60..6e824d5bdc63 100644
--- a/app-containers/cri-o/Manifest
+++ b/app-containers/cri-o/Manifest
@@ -1,5 +1,7 @@
 AUX cri-o.logrotated 81 BLAKE2B f17d96920c3e9bbfe68a38fcae49be999c0edcea085ebbc1f09585284c5b7930c185d5cd0ef6c2f7de5db2a6af80355518628a050c1cb0639ccf3b53c6c338da SHA512 1115228546a696eeebeb6d4b3e5c3152af0c99a2559097fc5829d8b416d979c457b4b1789e0120054babf57f585d3f63cbe49949d40417ae7aab613184bf4516
 AUX crio.initd 846 BLAKE2B 844400d3cd706d4f78616edb3c8a50a9819ee21aecc7fc33f7d3d00871fde86b59e4b604ccc7cdb0058b10ccd28277f19dbdce34c83b2529c14e063126318617 SHA512 29561e95398975748236217bbd9df64997f6e3de6c0555d007306bd0535895a648368385a13079eb7d52c06249a91980523a73b6563e86d0575d9cd9c3fa4ee9
 DIST cri-o-1.31.2.tar.gz 19921920 BLAKE2B 4e60c15d73691dabab8f7f1229b0b8e534393128a53cd31639509454286ec237cf5e6bf258c8e06478b76b872b6e1e8d3481b19a277be4c0bf756b1a6d858d95 SHA512 be42d08ee2a9d030d9279dee269d121822de5c74aafa765688c91383a284cda890aa969a5a2b0649835893bd3b382e6bf2a1f81991710b479b4159877e0626aa
+DIST cri-o-1.31.4.tar.gz 19919611 BLAKE2B b9c2a855c8f8b780e4f77172dab0070cf9fa96216c1b03d1c06b42ac1385dbd9e57e4dadd88a54c4c0dde8366dda95293c1763c3fec554b79573ddd8da02aa6e SHA512 c10cb633a2bbc7c3d0fdbae7b5541fc948804ca797a71532e0dcd783d0e56158650ea93d3cce36995922e04f9f22c27c4255bc40a81930e263ebb0c710372a06
 EBUILD cri-o-1.31.2.ebuild 2789 BLAKE2B a638b6a4dcb840683bdc900c41951d86c4ea1d29e507834cfa9ce7971153d8a915af14692fab51450dc03f35bb412f1fa62bb0b9b8d668d675bcde8437c67a93 SHA512 f2ed5a575cbdbc5c552b3c7265aa69ee346c8ec6b62a10a5310e2b093ca9e14059db97e2e5dc698b265e0bfd72db71cee0df0b4850311bfdf285a1ddfbd4172c
+EBUILD cri-o-1.31.4.ebuild 2789 BLAKE2B 908944f4e7e19de07c1e76b8c0262bc521baade82b17d448eacb9e4a13e3253d336c7c0c79ae1f7d3f9c26f2203e7823bae121e86ef839fef9b14a82f46ce527 SHA512 d65e59acca4e349b47c58e2cdc5a565582a1a71bd3f6510e48784c469eb3a5845343be4b21fd74fc8fa2040ce1119bc4b80b6fc0a4b95201e207cdee0c0370f6
 MISC metadata.xml 908 BLAKE2B ff6e1663f563dff74dbdeeb5d5c778a70fe2395ff0c0836e31b538f0009215a74946384a1429f2cf8e65bccc26d4b357233f1aab1a2c70ca3f544653d79cf999 SHA512 0fe5ad9f9f1c3b7386f361febbedddb690fcf83145f80da05d77be72bf04f84d9106d46ff6962ed6cc99d7b12f3792263eb7b1711763a2cd2f8a7dac08ed5c09
diff --git a/app-containers/cri-o/cri-o-1.31.4.ebuild b/app-containers/cri-o/cri-o-1.31.4.ebuild
new file mode 100644
index 000000000000..3bc77ec3ed72
--- /dev/null
+++ b/app-containers/cri-o/cri-o-1.31.4.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EGIT_COMMIT=33d75981bee230f791709975125d7386fe2c530a
+
+inherit go-module
+
+DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
+HOMEPAGE="https://cri-o.io/"
+SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="btrfs +device-mapper selinux systemd"
+
+COMMON_DEPEND="
+	app-crypt/gpgme:=
+	app-containers/conmon
+	app-containers/runc
+	dev-libs/glib:=
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error:=
+	net-firewall/conntrack-tools
+	net-firewall/iptables
+	app-containers/cni-plugins
+	net-misc/socat
+	sys-apps/iproute2
+	sys-libs/libseccomp:=
+	btrfs? ( sys-fs/btrfs-progs )
+	device-mapper? ( sys-fs/lvm2:= )
+	selinux? ( sys-libs/libselinux:= )
+	systemd? ( sys-apps/systemd:= )"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}
+	!<app-containers/podman-1.3.2-r1
+	selinux? ( sec-policy/selinux-crio )"
+BDEPEND="sys-apps/which"
+
+src_prepare() {
+	default
+
+	sed -e '/^export GOPROXY=/d' \
+		-e '/^GIT_.*/d' \
+		-e '/	git diff --exit-code/d' \
+		-e 's/$(GO) build -i/$(GO) build -v -work -x/' \
+		-e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
+		-e "s|^GIT_COMMIT := .*|GIT_COMMIT := ${EGIT_COMMIT}|" \
+		-e "s|^COMMIT_NO := .*|COMMIT_NO := ${EGIT_COMMIT}|" \
+		-i Makefile || die
+
+	echo ".NOTPARALLEL: binaries docs" >> Makefile || die
+
+	sed -e 's:/usr/local/bin:/usr/bin:' \
+		-i contrib/systemd/* || die
+}
+
+src_compile() {
+	[[ -f hack/btrfs_installed_tag.sh ]] || die
+	use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+		hack/btrfs_installed_tag.sh || die; }
+
+	[[ -f hack/libdm_installed.sh ]] || die
+	use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \
+		hack/libdm_installed.sh || die; }
+
+	[[ -f hack/selinux_tag.sh ]] || die
+	use selinux || { echo -e "#!/bin/sh\ntrue" > \
+		hack/selinux_tag.sh || die; }
+
+	mkdir -p bin || die
+	emake all \
+		GOBIN="${S}/bin" \
+		GO_BUILD="go build ${GOFLAGS}" \
+		GO_MD2MAN="$(which go-md2man)"
+}
+
+src_install() {
+	emake install install.config install.systemd \
+		DESTDIR="${D}" \
+		GO_MD2MAN="$(which go-md2man)" \
+		PREFIX="${D}${EPREFIX}/usr"
+	keepdir /etc/crio
+	mv "${ED}/etc/crio/crio.conf"{,.example} || die
+
+	newinitd "${FILESDIR}/crio.initd" crio
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+
+	# Suppress crio log error messages triggered if these don't exist.
+	keepdir /etc/containers/oci/hooks.d
+	keepdir /usr/share/containers/oci/hooks.d
+
+	# Suppress crio "Missing CNI default network" log message.
+	keepdir /etc/cni/net.d
+	insinto /etc/cni/net.d
+	doins contrib/cni/99-loopback.conflist
+}
diff --git a/app-containers/cri-tools/Manifest b/app-containers/cri-tools/Manifest
index 69bd4b9a80f3..9afa25632653 100644
--- a/app-containers/cri-tools/Manifest
+++ b/app-containers/cri-tools/Manifest
@@ -1,9 +1,5 @@
-DIST cri-tools-1.25.0.tar.gz 7905707 BLAKE2B 79595f31fc22aff608406bad4319a60dddcabda5f4dab8706305f11500b3db43f1d7021a340a096227d4580212953f32a95b05bbf81c1236f8fa8cf635017abb SHA512 dc04359320d59d6b3789e4e81fb613f3795b7e82dbad681393eaeff2c876e5b0393dd9384d7857d24ada5de34d03e151f7cf121367cc20e71d0b78607372b3a1
 DIST cri-tools-1.27.0.tar.gz 8465050 BLAKE2B d6c0429271ebc4085e75b54d7f3b9f75ab796e63bc9ae7562105296b13bbad8b512293a7d25abf1ab946f4bf54e672016fdb72696c12c730d21ac74724da465c SHA512 b94122e6401eb0c33b9c3d112274b7ab20cbbad05e76a54933e79d2e42ded2d684771cb9ed703a6c1afa381844142b6f1b4dc77d17e915f9a42c236fd8426b9b
-DIST cri-tools-1.31.1.tar.gz 7830559 BLAKE2B 5ec935be8d453a2d024fb8b07c8c7a21a15c23c7aba03b9030806c5ed47698f41a5167b02c3d38e792fec035725fccdff92867e68c5b2c8a06ff040e4c37cc9e SHA512 a72946944207d20f27236da12f7c2d532a1c9ebc881c3af4709494f7abc6f7b2d421934006a535a0b4a35926f09f58315ff0aaf4da870fd5a65281f547ef86a1
 DIST cri-tools-1.32.0.tar.gz 7682096 BLAKE2B 125fc9014942e681353ef49d4d397af4fc77500c0fb37d2d1be0850839c37f51f2ef41b5c7d9ca422e814d1fe50f985bfd42d2bba11d391cea66b3bec381dc08 SHA512 654cfd4d546932d48c02e19071e137fa7565a5134ba1845498d61f2dfef45fca722a51dbadb7a467214f7424290c53cb79a2908684d1fbd3820836b55640f66d
-EBUILD cri-tools-1.25.0.ebuild 870 BLAKE2B aa699a0838d60539138310248e4bffda10cf43d1feb1506fd496566554a787b4b8b4a1a27b2102e5ac85a57ee303f666cdb4070388f03c531445a57a8ef7f36f SHA512 d7c5660c72ebc6fd8e70611d6d2286a350421ae0d8afc5ef0517e0ed9e4d8835bce98df979d83acce2258b2da9d6a559c35144fad1a4e1031154659a9502b2a6
 EBUILD cri-tools-1.27.0.ebuild 917 BLAKE2B ea1d949136eff43206b5f5d02996e96d67ee4e69c134a2cb316fb63bf4b8817834b7a9e23005306981beee6de59425ebaab08a616b59d436b6ef6cf78d38a5dd SHA512 b8f806329c303e3cddb82a2c45dc55f4aeae7ae126b6967c8d5efe394efd249f04a400fbcfbe3533805607c646bb07e5135b134f652f2ce7a089d02da127284a
-EBUILD cri-tools-1.31.1.ebuild 918 BLAKE2B 78cdba0853fcaafe0aaec933af02f078ec0422959a7e9fb9f1567ac1e744d697896728c62a4f95c268fd835ae3cd5c99f8f2cde1b20bb1ebeb14ee1863f7790d SHA512 e2eb0fb1e7a21ca16067220d465e264d2350b1f2f49a52e0b00c68419a1e85d2803abd07c43b29acce29e0f6b9dabd9ebc6adf5c0c44d61f8faeb142faed324a
 EBUILD cri-tools-1.32.0.ebuild 918 BLAKE2B 78cdba0853fcaafe0aaec933af02f078ec0422959a7e9fb9f1567ac1e744d697896728c62a4f95c268fd835ae3cd5c99f8f2cde1b20bb1ebeb14ee1863f7790d SHA512 e2eb0fb1e7a21ca16067220d465e264d2350b1f2f49a52e0b00c68419a1e85d2803abd07c43b29acce29e0f6b9dabd9ebc6adf5c0c44d61f8faeb142faed324a
 MISC metadata.xml 335 BLAKE2B 2144a466f521028b7bc93b372ec9b8f81f6ef5317285dede88a71736bff65aa0908bd1c8ed18b2b7b0563f14a24b10862efc81985e78c75b5c2a786d501331b1 SHA512 ae1cb972ec7ddc298a8e1747503400f52b27e899ed51b1aeba877a66c8f883248ca782b437ffea4d06cb1ad80ff6e8f071445ba848f98240e48ef5814c866c2e
diff --git a/app-containers/cri-tools/cri-tools-1.25.0.ebuild b/app-containers/cri-tools/cri-tools-1.25.0.ebuild
deleted file mode 100644
index 67c3e8b38870..000000000000
--- a/app-containers/cri-tools/cri-tools-1.25.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI and validation tools for Kubelet Container Runtime (CRI)"
-HOMEPAGE="https://github.com/kubernetes-sigs/cri-tools"
-SRC_URI="https://github.com/kubernetes-sigs/cri-tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-
-DEPEND="dev-lang/go"
-
-RESTRICT+=" test"
-
-src_compile() {
-	emake VERSION="${PV}"
-	./build/bin/crictl completion bash > "crictl.bash" || die
-	./build/bin/crictl completion zsh > "crictl.zsh" || die
-}
-
-src_install() {
-	dobin ./build/bin/crictl
-
-	newbashcomp crictl.bash crictl
-	insinto /usr/share/zsh/site-functions
-	newins crictl.zsh _crictl
-
-	dodoc -r docs {README,RELEASE,CHANGELOG,CONTRIBUTING}.md
-}
diff --git a/app-containers/cri-tools/cri-tools-1.31.1.ebuild b/app-containers/cri-tools/cri-tools-1.31.1.ebuild
deleted file mode 100644
index 21381a7af4bb..000000000000
--- a/app-containers/cri-tools/cri-tools-1.31.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="CLI and validation tools for Kubelet Container Runtime (CRI)"
-HOMEPAGE="https://github.com/kubernetes-sigs/cri-tools"
-SRC_URI="https://github.com/kubernetes-sigs/cri-tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-RESTRICT="test"
-
-DOCS=( docs {README,RELEASE,CHANGELOG,CONTRIBUTING}.md )
-
-src_compile() {
-	emake VERSION="${PV}"
-	find build/ -name crictl -exec cp {} build/bin/ \; || die
-	./build/bin/crictl completion bash > "crictl.bash" || die
-	./build/bin/crictl completion zsh > "crictl.zsh" || die
-}
-
-src_install() {
-	einstalldocs
-
-	dobin ./build/bin/crictl
-	newbashcomp crictl.bash crictl
-	insinto /usr/share/zsh/site-functions
-	newins crictl.zsh _crictl
-}
diff --git a/app-containers/distrobuilder/Manifest b/app-containers/distrobuilder/Manifest
index 632b1fd8ed0f..812f440fc24c 100644
--- a/app-containers/distrobuilder/Manifest
+++ b/app-containers/distrobuilder/Manifest
@@ -7,5 +7,5 @@ DIST distrobuilder-3.1.tar.gz 6184215 BLAKE2B 2cb88f90c4459f71a2878824f7cb8f1d98
 DIST distrobuilder-3.1.tar.gz.asc 833 BLAKE2B 6986484fd6efa20eb625ace7a8395abef82c4bc685e45792072cfe3c78bf060bc5e5ec776a801fac4ac32f49088f13029a4dd3fbd41fc008df7100f1a3c805e6 SHA512 7b1c9d7dcb59dfe93635bb8fe5b2a65c030a5da5cacb3c22fb2cdadffec1252ad68901b92efc0eedb0f8aac26cb14a9b5f934caa920d77039d150fe817bd1e21
 EBUILD distrobuilder-2.1.ebuild 1142 BLAKE2B 71d4bd47837aa793011875faebff828846fae4e0f77bff95c9c2783035405279be9c96b76ce2fab81281786c24eb2102684581d94378b21dd08cef005648cb61 SHA512 2c95fa4944165c19936590cfb201042fdd54135de94fe3cd5493df5f04624d39b0f91dbf33adaf24e5ade716a8a1b86a1fca6c755fa6d6b3b696dac9f5587695
 EBUILD distrobuilder-3.0-r1.ebuild 1096 BLAKE2B 98bad35daa9baa0f53bd2965e2a522fe6620df0deb618846349a2f1bbb985aab3fdfb2655109be9e8da584f7041092f5f120c65aad53584d168547a6fc7c34b0 SHA512 8cc0224565c4ef670da1fb1b1fdc1f62878b8a667bdd052492561c9e80ee31d96db86735f80ece6dc94347a86a51ce3ac8a756e15a0a0fb16ae4cac6ae3b5067
-EBUILD distrobuilder-3.1.ebuild 1238 BLAKE2B f963cf224f148d86bda16d89ae3ef46f09720db717ab363cf2764aaef0e8ac2dfa4822972fa820e385d485faf9911192b232077fa8580ce8a3009694b74b6dc9 SHA512 0d47a3582a4a061bfa44cc4bfb09886cb7c5df21867507c4bd4344df02481dcda8b631713c10bf435f77c74f769c18fb5d8cd05a411d4ab893f0523039f60e71
+EBUILD distrobuilder-3.1.ebuild 1237 BLAKE2B aa376855b11b5dec892cbb5bd48d20dab37a9406902ac3842104d88ab03eecce49931ab0d0b7163a8837b205a541110460f492d1a3d023a0ba54c0109902b7e7 SHA512 497801822441188e65dadc6bfb0ff40bf5bedd3a32b05058bd4a94c6f2d273f63de2fc1e7c1240190ccefbfabf4a6a3c4d42f5d1b8483ada9822b269da387ed1
 MISC metadata.xml 586 BLAKE2B d7fd625233c6bb5bafa2b0ee4ad9e45e39433fec0358fb8a0a2deaa117276e990a8795e6d5bd9e30402fa32c892bccc35f44b40ba95b4a8fc230d26afd88ea27 SHA512 42da39e6f8f2079cdda344216c9ba55a37198e8cbc8dfd45fcc50eb0833a55fa39807f17777b736f9d9cd2b8a1f340a24033fb0e494fdd28dd5661d041443e00
diff --git a/app-containers/distrobuilder/distrobuilder-3.1.ebuild b/app-containers/distrobuilder/distrobuilder-3.1.ebuild
index babc8dc8f04f..b8331783130d 100644
--- a/app-containers/distrobuilder/distrobuilder-3.1.ebuild
+++ b/app-containers/distrobuilder/distrobuilder-3.1.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
@@ -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-cdr/cdrtools