gentoo auto-resync : 02:12:2024 - 02:07:07

3 files changed, 3 insertions, 108 deletions

diff --git a/app-containers/cri-o/Manifest b/app-containers/cri-o/Manifest
index 9150a97eb9dc..b3453f9baa60 100644
--- a/app-containers/cri-o/Manifest
+++ b/app-containers/cri-o/Manifest
@@ -1,7 +1,5 @@
 AUX cri-o.logrotated 81 BLAKE2B f17d96920c3e9bbfe68a38fcae49be999c0edcea085ebbc1f09585284c5b7930c185d5cd0ef6c2f7de5db2a6af80355518628a050c1cb0639ccf3b53c6c338da SHA512 1115228546a696eeebeb6d4b3e5c3152af0c99a2559097fc5829d8b416d979c457b4b1789e0120054babf57f585d3f63cbe49949d40417ae7aab613184bf4516
 AUX crio.initd 846 BLAKE2B 844400d3cd706d4f78616edb3c8a50a9819ee21aecc7fc33f7d3d00871fde86b59e4b604ccc7cdb0058b10ccd28277f19dbdce34c83b2529c14e063126318617 SHA512 29561e95398975748236217bbd9df64997f6e3de6c0555d007306bd0535895a648368385a13079eb7d52c06249a91980523a73b6563e86d0575d9cd9c3fa4ee9
-DIST cri-o-1.29.2.tar.gz 21203342 BLAKE2B deec88f8a505bdc1f184a3512da7f6d4b78499c4a66cacf0651a9fe56b62d33d62eaaf2ce68e5d8e856e13988b26e076ab69c24b30a62b42d88656441d948fcb SHA512 dd4105e0097a098b9009b00b59a8e8aeaad85b07177305e2e4b2c68a583a0c342e7a615f47a8cbcb7f179035f2c279573069f15aa1e91e491fe770eec1df326c
-DIST cri-o-1.30.4.tar.gz 19645954 BLAKE2B bb55eb674e7703ca313ed03cf6fa9952390121440a37c3413aac0c739b2cd7f03d36993139d41ae210faabb0530cab939074a78b8aa4319e0994063132a2e344 SHA512 fe0d69107e186943482909dac5e332226d7dfd5a1702722edc5c4f5df3ad9c6bff63e43dc7831c057ecc3ca387ee77815d43f531ad1e7b921d645d59797aa95d
-EBUILD cri-o-1.29.2.ebuild 2789 BLAKE2B f590e6d4c5e52c2761ec41b523d6662d029e8ff88bbe98034408b936f5c91761b43f13bfcd334a4680551c49572fca8ab2b1522103bb7129b7a34014510bd00c SHA512 2e4fc13b0f882b76ae14bcc1bdac1444c37c0f65320c2f1425dee2da457c37c49c4a0cf46a27ca869068143ee759ca694b771dea8b6b259c73dfc8a651819da7
-EBUILD cri-o-1.30.4.ebuild 2789 BLAKE2B e4f2542d3beff6d12a19e1e063af80689f102ee64643320f0b35b4d733a77c8be6a5f94b5e7e697883d40f2fdaa1b9d35f5f87827e437997ab9b6c607d50d1ff SHA512 508db6f18db98bae3418711750cc501201ed4f3a82816657e8c6ab9bff82dedf43d6375311d0ed853e7587718b6a4f35a5c7509bd171a6cff36a1c8cb9bc7329
+DIST cri-o-1.31.2.tar.gz 19921920 BLAKE2B 4e60c15d73691dabab8f7f1229b0b8e534393128a53cd31639509454286ec237cf5e6bf258c8e06478b76b872b6e1e8d3481b19a277be4c0bf756b1a6d858d95 SHA512 be42d08ee2a9d030d9279dee269d121822de5c74aafa765688c91383a284cda890aa969a5a2b0649835893bd3b382e6bf2a1f81991710b479b4159877e0626aa
+EBUILD cri-o-1.31.2.ebuild 2789 BLAKE2B a638b6a4dcb840683bdc900c41951d86c4ea1d29e507834cfa9ce7971153d8a915af14692fab51450dc03f35bb412f1fa62bb0b9b8d668d675bcde8437c67a93 SHA512 f2ed5a575cbdbc5c552b3c7265aa69ee346c8ec6b62a10a5310e2b093ca9e14059db97e2e5dc698b265e0bfd72db71cee0df0b4850311bfdf285a1ddfbd4172c
 MISC metadata.xml 908 BLAKE2B ff6e1663f563dff74dbdeeb5d5c778a70fe2395ff0c0836e31b538f0009215a74946384a1429f2cf8e65bccc26d4b357233f1aab1a2c70ca3f544653d79cf999 SHA512 0fe5ad9f9f1c3b7386f361febbedddb690fcf83145f80da05d77be72bf04f84d9106d46ff6962ed6cc99d7b12f3792263eb7b1711763a2cd2f8a7dac08ed5c09
diff --git a/app-containers/cri-o/cri-o-1.30.4.ebuild b/app-containers/cri-o/cri-o-1.30.4.ebuild
deleted file mode 100644
index 4feb101953a2..000000000000
--- a/app-containers/cri-o/cri-o-1.30.4.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-EGIT_COMMIT=dbc00ffd41a487c847158032193b6dca9b49e821
-
-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-o/cri-o-1.29.2.ebuild b/app-containers/cri-o/cri-o-1.31.2.ebuild
index 432e9db78f48..dc7fce58874d 100644
--- a/app-containers/cri-o/cri-o-1.29.2.ebuild
+++ b/app-containers/cri-o/cri-o-1.31.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-EGIT_COMMIT=d317b5dc918bbfbc78481072a0d93e572aa8d0e8
+EGIT_COMMIT=920af25f2b6fd4f52bced0e73f696e48464da543
 
 inherit go-module