7 files changed, 145 insertions, 4 deletions
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 701111cafd8c..d929889071d5 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/crun/Manifest b/app-containers/crun/Manifest
index aaec6e70c803..4de9f42af499 100644
--- a/app-containers/crun/Manifest
+++ b/app-containers/crun/Manifest
@@ -2,8 +2,10 @@ DIST crun-1.14.3.tar.xz 750456 BLAKE2B 5a63b5da2f85ff1a83d4589be224c5b7a1123b6d7
 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.19.1.tar.gz 1786019 BLAKE2B 555f7c917c9e9ed80919b708cd711890d47c395b5b6fa1c2b542d311176941c5ece23bd7ff0cb4c3dcf81be4f46fec21fa8127da57092657157707537771dfe1 SHA512 6cb6148a3b6e18b4dbb0178ea23eaaa57c040781a34b5c5c5dac71be513941717011fe996a7400b9dee0a73f7f0dd2fc36544fe72382a3f2543e4de90589fe6a
+DIST crun-1.20.tar.gz 1787750 BLAKE2B 4f31c21056c6c764c76021d3121dfaa4dd9b91f17def977238df831af02f27aff267cf22c3f1ade4f332d757ffc50cc98a480aea7cd67b3552f19ba5c810c3f8 SHA512 759326768a9a141ecaec5824e3c30cade0a0c7d848935d434cada4fdc5a59a992f1916515141a84387cdb95ee1307f5bec471679d7ff9b403b0cb2b10c7dfd74
 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 1849 BLAKE2B dfff255620040bfe53c24ff39784f52b7947f9393f74db88daba0c970803c25f7ec5819e0189798d803b28a13cb7b2287b2486779ec2e5f98c13726def762926 SHA512 d13f581e27957dc38748cf1e74efeb00ce9db6cd0de2ca8b131422c551ff51960ab21f90f6a41198a8467e2982be4e4b339ac036a50957e0deaa79907c67cee0
-EBUILD crun-1.19.1.ebuild 1852 BLAKE2B 8dceb6234c9152ae25c6e06bfa4ed08ed57b09883bd5d1891a6994d0f02782c4a3c2f0e6306f440dd8c93fc47763301f6f575b98819ee7400113eac526c7be5d SHA512 5dec9758446959db62978c0810226bdba46d2febde6d7c671f8f34b4f3405720174e79291f2d5cc194a7f4c6934b9edc9fc43196bb0e6289a485b50c411b6a8a
+EBUILD crun-1.19.1.ebuild 1849 BLAKE2B dfff255620040bfe53c24ff39784f52b7947f9393f74db88daba0c970803c25f7ec5819e0189798d803b28a13cb7b2287b2486779ec2e5f98c13726def762926 SHA512 d13f581e27957dc38748cf1e74efeb00ce9db6cd0de2ca8b131422c551ff51960ab21f90f6a41198a8467e2982be4e4b339ac036a50957e0deaa79907c67cee0
+EBUILD crun-1.20.ebuild 1756 BLAKE2B aaf604326fbe18b4dd41d98ff0ea243a8fd59d98c200be260f1b9a7c7ba9005367297652864a227d324ae061dd6e55dccaa51cfcfe48cb490bb5fe7e6541bc00 SHA512 cdcbcbef071eb0d61023499e9cc129cd933872e030ea74b176b4a637cf34a74430e6f9ba7f427449231afe03b2864a8598527f568e9c7703e5e46052a5398b2a
 MISC metadata.xml 1300 BLAKE2B a0ae27420fca097e4e7b5e983de3b76fef43bf13887bd5fe903da14e20c2f0ebd2fc273dae74e32e28c2768b5f8d6e5e6c8b4c9f07ca6d47e41902621173a167 SHA512 1699a89a01de32b580bc74bc747430ef7b1a6284b2f459b4041b22de0efbebda45778803deb512a61806ed8e2998b141caefb7830acafc68d42ce4343b193dd6
diff --git a/app-containers/crun/crun-1.19.1.ebuild b/app-containers/crun/crun-1.19.1.ebuild
index f1b4ab06660e..b54381361852 100644
--- a/app-containers/crun/crun-1.19.1.ebuild
+++ b/app-containers/crun/crun-1.19.1.ebuild
@@ -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.20.ebuild b/app-containers/crun/crun-1.20.ebuild
new file mode 100644
index 000000000000..2e67a51ee6ca
--- /dev/null
+++ b/app-containers/crun/crun-1.20.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2019-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+
+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"
+IUSE="+bpf +caps criu +seccomp selinux systemd static-libs"
+
+DEPEND="
+	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
+"
+
+src_configure() {
+	local myeconfargs=(
+		--cache-file="${S}"/config.cache
+		$(use_enable bpf)
+		$(use_enable caps)
+		$(use_enable criu)
+		$(use_enable seccomp)
+		$(use_enable systemd)
+		--enable-shared
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	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"
+	)
+	emake check-TESTS TESTS="${supported_tests[*]}"
+}
+
+src_install() {
+	emake "DESTDIR=${D}" install-exec
+	doman crun.1
+	einstalldocs
+
+	find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/app-containers/skopeo/Manifest b/app-containers/skopeo/Manifest
index b56fd8823026..b534b96ffc29 100644
--- a/app-containers/skopeo/Manifest
+++ b/app-containers/skopeo/Manifest
@@ -1,6 +1,8 @@
 DIST skopeo-1.15.1.tar.gz 10709125 BLAKE2B aa688197fe0d803b6cb1f4e7c5c998a917e7d588fa41b9e6ede6d60fd1ef12f209e2f119bc29143bf92ae3349c1168e33f79cb36d6c7f5a1a22bcbf3f4e51792 SHA512 686d17da4a84d9029d688cfca08724576564ce2a05aed9380bf55059c244c90cffa3b21c2dbe84b19b746773e98d5f26e5ceaca58f7be26b656125977685c663
 DIST skopeo-1.17.0.tar.gz 10682765 BLAKE2B 88e658a29bacaead26ef19309e2c138d5b689c04b56291a93f23765a97bcee0e3acfa82014babd5cf375127b78cc3ac4fb42b6ba3284632d43b1ac865a618969 SHA512 72cee72a88764a85252ff1812aff284215805db10708fdfd4f3c778d7efec16b8a0d4d26b966a2e18ca36eea9a98265d75e78967dfb3ea0bf94f98c3b61c6504
+DIST skopeo-1.18.0.tar.gz 10790607 BLAKE2B ebbd9c481fd9ae03ff853042276037a521a7911ded67006faa1b11d6a70affadce35bdcea67209250cde36196ae87f1206ba654f9a52c7ec833cb25fe6c0af1e SHA512 7d56d78b4e0299c187eb2ea46a2d6ac41a4ad30848e9f5fe43285af74c5207f6fc4ee98c15bd5114de7a660e52846f75c26632ae1aa3ccf656b504798a6b1d56
 EBUILD skopeo-1.15.1.ebuild 1845 BLAKE2B 75d7c2b86ef231206ed2898089f0c64de58fa923d01c54a5b671c77d133240d10743713a355415c27a551eb2e7794f7f9e3d9f0746d05b992e7f637fc3c84e68 SHA512 fb1d518f9ca77dfa35073b3cc57c6fe866c6dab8dd6feb27eb012af7dab5160464255e043ef7a519e80a1b0900fcabf81587f18fae57d28553875c4c55d95982
-EBUILD skopeo-1.17.0.ebuild 1847 BLAKE2B 1efd04e8d8e6c92afd812e2ab9239335551d2484cddef633a530837f85d14a19f2795f3b73394bdacff744e71dcbd77984875939dbc069ec700cde8c2436fa6b SHA512 2cca9270227d95bb7c28037c7d477e80c3942571b611ddd19bf154715e5a9c049e16e07b2fc94f4d55b4525ceed9969182e4db447f54a66668e0b980b660de06
+EBUILD skopeo-1.17.0.ebuild 1845 BLAKE2B c99828e6279ccfa1a7b61375c9c5de99de2b87c01f5a1ba200e190e3f1907a46d734d9fe902dd4312ebdf91e8e4b0fddaaa942a57c3e7ed69ee762b2fa3c3bcb SHA512 99f0885ae78fbc71ba2f6ff93fdef3063f91163a8431f65e99933c462194a4597e8133d44e545e98cb6dccf1b385ae7acd1aa9394991f49b9bd4ead46aa09cf3
+EBUILD skopeo-1.18.0.ebuild 1633 BLAKE2B bbf5ab0d5a88e06024cd304c6d96ef513f123303fb20781a0f9c89d00224721f197eed177916d6792e27febde6e8b35db8b5994b01364aa7dfe4424070069c00 SHA512 ca036981ba68b0572c7a03dd8e719c3cdf920d967dc09e95a734f272ec2ea25e9b1e6cb4735851c798995b28375d62880acd6fbdd5df2af0467f92b21d4fd8c4
 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.17.0.ebuild b/app-containers/skopeo/skopeo-1.17.0.ebuild
index cf1341e8921c..1e31e65d7604 100644
--- a/app-containers/skopeo/skopeo-1.17.0.ebuild
+++ b/app-containers/skopeo/skopeo-1.17.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 	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"
+	KEYWORDS="amd64 arm64"
 fi
 
 # main
diff --git a/app-containers/skopeo/skopeo-1.18.0.ebuild b/app-containers/skopeo/skopeo-1.18.0.ebuild
new file mode 100644
index 000000000000..09b078b37744
--- /dev/null
+++ b/app-containers/skopeo/skopeo-1.18.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2023-2025 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"
+RESTRICT="test"
+
+DEPEND="
+	>=app-crypt/gpgme-1.5.5:=
+	btrfs? ( >=sys-fs/btrfs-progs-4.0.1 )
+	device-mapper? ( >=sys-fs/lvm2-2.02.145:= )
+	rootless? ( sys-apps/shadow:= )
+"
+RDEPEND="${DEPEND}
+	app-containers/containers-common
+"
+BDEPEND="dev-go/go-md2man"
+
+pkg_setup() {
+	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
+	use device-mapper && CONFIG_CHECK+=" ~MD"
+	linux-info_pkg_setup
+}
+
+run_make() {
+	local emakeflags=(
+		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"
+	)
+	emake "${emakeflags[@]}" "$@"
+}
+
+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
+}