5 files changed, 23 insertions, 56 deletions
diff --git a/app-containers/cri-tools/Manifest b/app-containers/cri-tools/Manifest
index 74094119c86d..a67abf87f207 100644
--- a/app-containers/cri-tools/Manifest
+++ b/app-containers/cri-tools/Manifest
@@ -1,3 +1,2 @@
-DIST cri-tools-1.23.0.tar.gz 6823865 BLAKE2B 75d394ec1f9ccf2122476c9b845499212d668f8170ae8551913e3e057271986ab77454bdd0fa646127bfadda203fabdc57cc448dfe1e64dd7cdbedc8f5ee8cf6 SHA512 36700eaf872da14921e0b2c8fa68f91e3e0226364e29a5b8e132fbd52504e130e0bc2cce30aba21e7def576a4682f150b0b051d44b78aa694c225c10999d7155
-DIST cri-tools-1.24.0.tar.gz 5868141 BLAKE2B 281c397bb60bb5075d2b99cab11a44cf8746c1f744dfafc4f051dd6c2344a53eba948a35d90f814105ef3cb2b0bef3e7e1723408069a2ab4293801f906ec48b0 SHA512 5c7468c15b9f030d5cf93112abc28f8024e1d1b46f85459cb0a10c84ab63d07f5dfa830d019f8ed1a31bf04ea14c5e200b11d85ae7573be44860b74312e66dbc
-DIST cri-tools-1.24.1.tar.gz 5928557 BLAKE2B 42d2f0fc8227fd704c3884f1e8a195952aff1a64fb85629bef4122c011f76d0c7eb94ddcec7d56df610af6b3599b345676efa416249ce292725ec2bb35e8da66 SHA512 d36fda28e733fbf29a53c0384da86abf56373f4471797aaa030dc3d63a2f4682dddb0a5fd9a54ae74ac20c76e8acc5244781d8688ae03f8e930e56bcbe896fb0
+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
diff --git a/app-containers/cri-tools/cri-tools-1.24.0.ebuild b/app-containers/cri-tools/cri-tools-1.24.0.ebuild
deleted file mode 100644
index 0a580bdda110..000000000000
--- a/app-containers/cri-tools/cri-tools-1.24.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2022 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"
-
-DEPEND="dev-lang/go"
-
-RESTRICT+=" test"
-
-src_compile() {
-	emake VERSION="${PV}"
-	./build/bin/crictl completion bash > "${PN}.bash" || die
-	./build/bin/crictl completion zsh > "${PN}.zsh" || die
-}
-
-src_install() {
-	dobin ./build/bin/crictl
-
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	dodoc -r docs {README,RELEASE,CHANGELOG,CONTRIBUTING}.md
-}
diff --git a/app-containers/cri-tools/cri-tools-1.24.1.ebuild b/app-containers/cri-tools/cri-tools-1.25.0.ebuild
index 0ae021d25349..67c3e8b38870 100644
--- a/app-containers/cri-tools/cri-tools-1.24.1.ebuild
+++ b/app-containers/cri-tools/cri-tools-1.25.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/kubernetes-sigs/cri-tools/archive/v${PV}.tar.gz -> $
 
 LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 ~arm64"
 
 DEPEND="dev-lang/go"
 
diff --git a/app-containers/cri-tools/cri-tools-1.23.0.ebuild b/app-containers/cri-tools/cri-tools-1.27.0.ebuild
index 45007ff68a89..ae910c91f755 100644
--- a/app-containers/cri-tools/cri-tools-1.23.0.ebuild
+++ b/app-containers/cri-tools/cri-tools-1.27.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit bash-completion-r1 go-module
 
@@ -11,24 +11,23 @@ SRC_URI="https://github.com/kubernetes-sigs/cri-tools/archive/v${PV}.tar.gz -> $
 
 LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~arm64"
+RESTRICT="test"
 
-DEPEND="dev-lang/go"
-
-RESTRICT+=" test"
+DOCS=( docs {README,RELEASE,CHANGELOG,CONTRIBUTING}.md )
 
 src_compile() {
 	emake VERSION="${PV}"
-	./build/bin/crictl completion bash > "${PN}.bash" || die
-	./build/bin/crictl completion zsh > "${PN}.zsh" || die
+	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() {
-	dobin ./build/bin/crictl
+	einstalldocs
 
-	newbashcomp ${PN}.bash ${PN}
+	dobin ./build/bin/crictl
+	newbashcomp crictl.bash crictl
 	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	dodoc -r docs {README,RELEASE,CHANGELOG,CONTRIBUTING}.md
+	newins crictl.zsh _crictl
 }
diff --git a/app-containers/cri-tools/metadata.xml b/app-containers/cri-tools/metadata.xml
index ebe162c4841a..8d6a4c5d53d2 100644
--- a/app-containers/cri-tools/metadata.xml
+++ b/app-containers/cri-tools/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">kubernetes-sigs/cri-tools</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">kubernetes-sigs/cri-tools</remote-id>
+	</upstream>
 </pkgmetadata>