Adding metadata

47 files changed, 889 insertions, 517 deletions

diff --git a/app-containers/aardvark-dns/Manifest b/app-containers/aardvark-dns/Manifest
index 9d55d9815e7c..66f4ee9f6555 100644
--- a/app-containers/aardvark-dns/Manifest
+++ b/app-containers/aardvark-dns/Manifest
@@ -1,6 +1,8 @@
 DIST aardvark-dns-1.15.0.crate 59884 BLAKE2B 6be0126b526359b1c402a6f10cfe9b28b9d351621b0f1e9556150fb2477a2c468938dbac1c11bde3eff6deb258ccfa6ed05e6f2a01206d3e08f1e88193016432 SHA512 963d68a662439ea920fbeec08eaa3b9fb486f5e61e46b702b0c9211241c3b1057ce573bac1f75ed558faa0cc99b0f36b7f5299c296e30b6ce6ed046a02cd9782
 DIST aardvark-dns-1.17.0.crate 62370 BLAKE2B 7105e4c96e973d6cbda48d7db957423a0743330c53fd694be14951b85ba162624ffa3d96d6737856d7e5d39910a26403a4ab11e912317d6449a85642c8c5d236 SHA512 f8cc4f39b9a16106a7fbe08c94558507e0519018709ceb80474696be24328626f76aedf9bdd12c853be0728f4e9c57e945b442e7f66c22042e25410a690b69e0
 DIST aardvark-dns-1.17.1.crate 62779 BLAKE2B 487b8de4d01df37ca8eef8b911f8231db1df4417a61b921e1c109661af0270115b8941d56493a468a6ecd58174c0074a5c8687c8d4ae6d21bfc028efae45d663 SHA512 eee8ecd47626093dd2f0a60f862593c035efc87fd4ba9fc209c93f75ca624300bc70ecc11a3828198eb36ff97ab0bb32ba090c0708793279117793876ede47a3
+DIST aardvark-dns-2.0.0.crate 60884 BLAKE2B c883311c633b069a52fe07d0a6ccdd1958cfc79cb8d8d96373685e56ecf500119b7287680a0be46359125631442e0d5cd2a82e0a4ce181102c363612968e1257 SHA512 8ff50f93015ab1d343ce42a81bdbede016e77e5709f111f1085df2b1a9a683694ccde16d4267092055f1b30ac335f1dabb6d6b8932e0225159ebd9b2bfab9df2
 DIST aardvark-dns-v1.15.0-vendor.tar.gz 9910590 BLAKE2B 876be4b719cf7d364dbd8ce04a3984d32b24dfba81ece1ce56d1f3e3f80f2607eefd77ff7dece2a678240b1f996cb498ae81f1be06c8f7eaa696eb6001090e4b SHA512 fbe6e77a2d412ed34bcf2c710db3aa8989a5887ab475988c393fb1c49584cac5b09a34b82e880eebe81c59af7817985af87391ffb8421da07abf080704cae5c0
 DIST aardvark-dns-v1.17.0-vendor.tar.gz 10267613 BLAKE2B 72b5da08584c5a35188d50646ec98b6463578b09520121224807e3770d6e911b12f61597ca5852be75a8e9de9ade02d507f490ff3a414e681fe31076930dde78 SHA512 b7ec2a2a34d5bb36dbcc55611dc9ec0ff2c1bed4469cc4b12d4eb0bd78bb7d6cae6f80a02ac32ade5c435fdd11e22ddd99646aa4de504c8369ee56cfa470e6a5
 DIST aardvark-dns-v1.17.1-vendor.tar.gz 10267576 BLAKE2B 984a27b5dbd773d9fa2db7123e8bd16f59407249caa1ab203d76bd1626b63e7bbadcf9a32e46b087d8cbb38442e7203bd810ce8d45c988e24c3237ea282def0a SHA512 ce6768f90a731a55511fdb78f8048ed3c5ff4b058d3edfc7832430330a239b58b6250851c6a268706f24b4fc94f47afd6ce4c1e4cbb1132e0dc7a2d0127d62ff
+DIST aardvark-dns-v2.0.0-vendor.tar.gz 10533784 BLAKE2B 96792ab9a38b0e7a1c05a8536a617ecaa5f2da5b1b3a530cd7fff4cae8f6a62739b3186c57be360d678bc0f024a876df4e9ddac030a828e1914796bf0d669189 SHA512 dc7d72dd8dc18031be55578e12c911f73137632e5c92a04a53a85bcf99b7dae4ad4faddc483a99e3cf5d5cab6a8e22d09bc47e6ae38ce15e7ba9b07fc10e9ea4
diff --git a/app-containers/aardvark-dns/aardvark-dns-1.17.1.ebuild b/app-containers/aardvark-dns/aardvark-dns-1.17.1.ebuild
index 7eae965ad9c9..7710b5e98cd9 100644
--- a/app-containers/aardvark-dns/aardvark-dns-1.17.1.ebuild
+++ b/app-containers/aardvark-dns/aardvark-dns-1.17.1.ebuild
@@ -16,7 +16,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/aardvark-dns/aardvark-dns-2.0.0.ebuild b/app-containers/aardvark-dns/aardvark-dns-2.0.0.ebuild
new file mode 100644
index 000000000000..7eae965ad9c9
--- /dev/null
+++ b/app-containers/aardvark-dns/aardvark-dns-2.0.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2023-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+RUST_MIN_VER="1.88.0"
+[[ ${PV} == 9999* ]] || CRATES="${PN}@${PV}"
+inherit cargo
+
+DESCRIPTION="A container-focused DNS server"
+HOMEPAGE="https://github.com/containers/aardvark-dns"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/containers/aardvark-dns.git"
+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"
+fi
+
+# main
+LICENSE="Apache-2.0"
+# deps
+LICENSE+=" 0BSD Apache-2.0-with-LLVM-exceptions MIT Unlicense Unicode-DFS-2016 ZLIB"
+SLOT="0"
+
+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_install() {
+	local -x PREFIX="${EPREFIX}"/usr
+	default
+}
diff --git a/app-containers/buildah/Manifest b/app-containers/buildah/Manifest
index f5593f73ce69..71cd66299458 100644
--- a/app-containers/buildah/Manifest
+++ b/app-containers/buildah/Manifest
@@ -1,3 +1,4 @@
 DIST buildah-1.40.0.tar.gz 12321438 BLAKE2B 3d923ddd249fd93476a8e88b72b1989b4bead9b282657d372c2aa04da0d787ee8e807cb74bface8a165ae0282ead791eb3da20a73751b63e3cfe7ee6ab34bd94 SHA512 bb96d04a17ab5a77e5d984dca369e3890131044c505ae3b030d95ffd66378df22da33315a50c9e500e783345ded23ebacdfa0965002a18e1d929c5fa3ce39311
 DIST buildah-1.40.1.tar.gz 12329760 BLAKE2B dd5be8e27be8c37b211dd3009d8533f44d234ef6bc8f5405a258931b51f0b79a1b5dc456e3e0269ca9b4c4e981c226c97ff51876ae2f1836bc16c974838f5615 SHA512 6b37b6cc5fa3d7972800cfaef5919df8ee6c9220e8635850ee9d8356645b08afa4252d688f4316b3265e5f6aef6fa0647fb4f7602b7add292fc8b56a74c4fa1f
 DIST buildah-1.41.0.tar.gz 11971274 BLAKE2B af197271bf519f84d1e7d08cbaab6a4aef3d1bdc234eaf8127f33e1fdd0c3f66c09262bf1aef9776d8d3fdfd853ae23cccd4ae6fcd06b2f86b7769d82f71617a SHA512 50be5c400a5063c12d5b97dc285d4969e50e88fa21de537f1c2317df36a1ccabf26ba70ece9e3e5c891e76ee8d85ab946029dc240de40ec88c86ad678e963823
+DIST buildah-1.44.0.tar.gz 10888725 BLAKE2B 409046d73dbc4ffb835a37e26c28111f6c1f28c165ab6c979738fc6459b81edfdcfe468337b39a2edce018cb568df32b2868e6c46a5b414eb005cfb4d2546b8c SHA512 660f29ff9b8c8f7f3776e96391bb803feb54622c92aaf78f5ac37783bdc77573353acd5f692502b61169ad58f6b89a8e8268ec41c0cb080dfec3f8466dd6419e
diff --git a/app-containers/buildah/buildah-1.44.0.ebuild b/app-containers/buildah/buildah-1.44.0.ebuild
new file mode 100644
index 000000000000..3a2213de5c2b
--- /dev/null
+++ b/app-containers/buildah/buildah-1.44.0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module linux-info toolchain-funcs
+
+DESCRIPTION="A tool that facilitates building OCI images"
+HOMEPAGE="https://github.com/containers/buildah"
+
+# main pkg
+LICENSE="Apache-2.0"
+# deps
+LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+
+SLOT="0"
+IUSE="apparmor btrfs +seccomp systemd test"
+RESTRICT="test"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	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"
+fi
+
+RDEPEND="
+	>=app-containers/containers-common-0.58.0-r1
+	app-crypt/gpgme:=
+	dev-db/sqlite:3=
+	dev-libs/libgpg-error:=
+	dev-libs/libassuan:=
+	sys-apps/shadow:=
+	apparmor? ( sys-libs/libapparmor:= )
+	btrfs? ( sys-fs/btrfs-progs )
+	seccomp? ( sys-libs/libseccomp:= )
+	systemd? ( sys-apps/systemd )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-go/go-md2man
+	>=dev-lang/go-1.25.6
+"
+
+DOCS=( CHANGELOG.md troubleshooting.md docs/tutorials )
+
+pkg_pretend() {
+	local CONFIG_CHECK=""
+	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
+	check_extra_config
+
+	linux_config_exists || ewarn "Cannot determine configuration of your kernel."
+}
+
+src_prepare() {
+	default
+
+	# ensure all  necessary files are there
+	local file
+	for file in docs/Makefile hack/libsubid_tag.sh hack/apparmor_tag.sh \
+		hack/systemd_tag.sh hack/sqlite_tag.sh btrfs_installed_tag.sh; do
+		[[ -f "${file}" ]] || die
+	done
+
+	sed -i -e "s|/usr/local|/usr|g" Makefile docs/Makefile || die
+	echo -e '#!/usr/bin/env bash\necho libsubid' > hack/libsubid_tag.sh || die
+
+	cat <<-EOF > hack/apparmor_tag.sh || die
+	#!/usr/bin/env bash
+	$(usex apparmor 'echo apparmor' echo)
+	EOF
+
+	use seccomp || eapply "${FILESDIR}/${PN}-1.37.5-disable-seccomp.patch"
+
+	cat <<-EOF > hack/systemd_tag.sh || die
+	#!/usr/bin/env bash
+	$(usex systemd 'echo systemd' echo)
+	EOF
+
+	cat <<-EOF > btrfs_installed_tag.sh || die
+	#!/usr/bin/env bash
+	$(usex btrfs echo 'echo exclude_graphdriver_btrfs')
+	EOF
+
+	# instead of statically compiling sqlite into binary dynamically link it
+	# for better security and smaller binary size.
+	# Refer https://github.com/containers/buildah/commit/e5b8765
+	cat <<-EOF > hack/sqlite_tag.sh || die
+	#!/usr/bin/env bash
+	echo libsqlite3
+	EOF
+
+	use test || eapply "${FILESDIR}/${PN}-1.44.0-disable-tests.patch"
+}
+
+src_compile() {
+	# For non-live versions, prevent git operations which causes sandbox violations
+	# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
+	[[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT=""
+
+	tc-export AS LD STRIP
+	export GOMD2MAN="$(command -v go-md2man)"
+	export SELINUXOPT=
+	default
+}
+
+src_test() {
+	emake test-unit
+}
+
+src_install() {
+	emake DESTDIR="${ED}" SELINUXOPT= install install.completions
+	einstalldocs
+}
diff --git a/app-containers/buildah/files/buildah-1.44.0-disable-tests.patch b/app-containers/buildah/files/buildah-1.44.0-disable-tests.patch
new file mode 100644
index 000000000000..7c3eb88316e7
--- /dev/null
+++ b/app-containers/buildah/files/buildah-1.44.0-disable-tests.patch
@@ -0,0 +1,8 @@
+--- a/Makefile
++++ b/Makefile
+@@ -62,1 +62,1 @@
+-all: bin/buildah bin/imgtype bin/copy bin/inet bin/tutorial bin/dumpspec bin/passwd bin/crash bin/wait bin/grpcnoop docs
++all: bin/buildah docs
+@@ -122 +122 @@
+-docs: install.tools ## build the docs on the host
++docs: ## build the docs on the host
diff --git a/app-containers/cni-plugins/Manifest b/app-containers/cni-plugins/Manifest
index 05dc72369569..4e4211f3b010 100644
--- a/app-containers/cni-plugins/Manifest
+++ b/app-containers/cni-plugins/Manifest
@@ -2,3 +2,4 @@ DIST cni-plugins-1.3.0.tar.gz 3684138 BLAKE2B c5599f1d8ac3bffb802877ae8c49024a9d
 DIST cni-plugins-1.5.1.tar.gz 3808203 BLAKE2B 481e6c3e929d9169c643596ba48e008151aef10ff670cac9fa00294a3fe98bc5d7c9ee9f83394becb4c127290abb3b082c4124d332b32c8d97f44fcb01b7e3cf SHA512 d2e01958dd8328407164cb6be9d962321742dae7011ce7cd7b2342f5e4b4bbcd992d8249c53d3d81250a60c27f049969bbf329a75440524f52c1f1466b6e7132
 DIST cni-plugins-1.6.1.tar.gz 3940454 BLAKE2B eaeb9d48645efe680f259c3b6d295134459a79a8890cb8645dd4e0e32215decb44f6f72d8b8f575daedc34f0a55a517e213f505639c0a203b0479ca1067b5e38 SHA512 62b4e2c5c4bf6a9b21880e7b145547bec153f591926419d9960345cc7fb7d499ae44b0236928bbfeb46e383f38018d7504e58da1dd8a6ad39ef4ae3122b3be56
 DIST cni-plugins-1.6.2.tar.gz 3940423 BLAKE2B b53061312cf96f0e4a385a63433e76695f4c8b419e18a14296644cc435cf49be5f76021cadc4186955c99af74cf0b06c46c344b0368355f47e4fe9fd6773d8c3 SHA512 ee577e3fe39558d6a6296754c97de6608f95152805c01b8053e2958d16634ab57d147eea7c950fcc4d1a98d6733a85717adf7078ee2dffff007ec3b063386c24
+DIST cni-plugins-1.9.1.tar.gz 4094909 BLAKE2B 5d2623cdf68ac0df3c9f0df2090978eaea66d329d647e265936dd937ea7493bea32c077b8e2cf5d6734d68b45e875ecdafd95d61541bd524e387be303ad443f3 SHA512 5811fb14786f1f9d9e40741ce337449ce329e14e04213bc660102eb470150f24026e59caec480572e37d0e3e6e6518737f3cc7ac462c47034d0737283ec532f9
diff --git a/app-containers/cni-plugins/cni-plugins-1.9.1.ebuild b/app-containers/cni-plugins/cni-plugins-1.9.1.ebuild
new file mode 100644
index 000000000000..f5f40db93b5c
--- /dev/null
+++ b/app-containers/cni-plugins/cni-plugins-1.9.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module linux-info systemd
+
+DESCRIPTION="Standard networking plugins for container networking"
+HOMEPAGE="https://github.com/containernetworking/plugins"
+SRC_URI="https://github.com/containernetworking/plugins/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/plugins-${PV}
+
+LICENSE="Apache-2.0"
+# Dependent licenses
+LICENSE+=" Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+
+RDEPEND="net-firewall/iptables"
+
+CONFIG_CHECK="~BRIDGE_VLAN_FILTERING ~NETFILTER_XT_MATCH_COMMENT
+	~NETFILTER_XT_MATCH_MULTIPORT"
+
+src_compile() {
+	local f
+	for f in plugins/{meta,main,ipam}/*; do
+		[[ ${f} == *windows* ]] && continue
+		einfo "Building ${f}"
+		ego build -mod=vendor -o "bin/${f##*/}" "./${f}"
+	done
+}
+
+src_install() {
+	exeinto /opt/cni/bin
+	doexe bin/*
+
+	dodoc README.md
+	local f
+	for f in plugins/{meta,main,ipam}/*/README.md; do
+		[[ ${f} == *windows* ]] && continue
+		f=${f%/*}
+		newdoc "${f}/README.md" "${f##*/}.README.md"
+	done
+
+	systemd_dounit plugins/ipam/dhcp/systemd/cni-dhcp.{service,socket}
+	newinitd "${FILESDIR}"/cni-dhcp.initd cni-dhcp
+}
diff --git a/app-containers/conmon/Manifest b/app-containers/conmon/Manifest
index f5dc825381cb..dfff93708991 100644
--- a/app-containers/conmon/Manifest
+++ b/app-containers/conmon/Manifest
@@ -1,3 +1,4 @@
 DIST conmon-2.1.11-make-docs-target-not-depend-on-install.tools.patch 985 BLAKE2B f2f34ca9a6f067f88f39726b52c5d476946413e84a93bfff2b9d4e9a0b9b117bf25a903455c3a762895746c5bca6eb93bf2ac7c2c6123d7b9bca9c345aba6230 SHA512 a9716057b0127d2b5aaca303e6d26484a5dbe91b9114259b2fded2a0c803568749b725e816004c80cb8b47ddff7a2fbcc231edd2df1d78a56ecaf6d3020c7fd7
 DIST conmon-2.1.11.tar.gz 121573 BLAKE2B 600a3e13eee5f71ef5f7aa21d9cf0184dd01c8e5e68d31aa35efcb08c3cf4305313fcfcf0aba3eedb243fe36f0e1e27f68a71627e2050c8ed4a73de273b98131 SHA512 47952f6cbbb810591d78c67856100be0edbf96d30328a10f22c3ec927bc6d1187540824c388d1fc7f3bb16fb7414339f3f20311d1baffb1fae1e38c4d5e7249c
 DIST conmon-2.1.13.tar.gz 116624 BLAKE2B b6e707521a1d4f1f843b07af7e861f7e2ef29f5f7f52a2cd73add16718b8d9c71659c620d236ce9287cf75048d0427139bfcc798c5eeb6a91e8c20bb9448a826 SHA512 cb98b26b3c5f5e5f0b09f5373bd58dc958b66ac4edcac2aa509f48be8b7e9a33001428016290944c4002ddbf63e11fb4657aaad879c89c5776f8c8031f4d1d08
+DIST conmon-2.2.1.tar.gz 84632 BLAKE2B 286b2487ddc4cc50d45207921db43a8044a62ac4c432360dca6139ee756d4c84974e1c7275adcad1c3aa87f8a9344f8a941d95f05fa4cb88ddcd8fb4b15dedd4 SHA512 52513fc25b0db0b7c9c99aa63f6be4c495add350b9269fad67136f728d3399dbb54c5fa526d52c158c67956ded8980f1cc3624fc531a152b16c09caa3399be3b
diff --git a/app-containers/conmon/conmon-2.2.1.ebuild b/app-containers/conmon/conmon-2.2.1.ebuild
new file mode 100644
index 000000000000..50c6c6651539
--- /dev/null
+++ b/app-containers/conmon/conmon-2.2.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="An OCI container runtime monitor"
+HOMEPAGE="https://github.com/containers/conmon"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/containers/conmon.git"
+else
+	SRC_URI="https://github.com/containers/conmon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+seccomp selinux systemd"
+RESTRICT="test"
+
+DEPEND="
+	dev-libs/glib:=
+	seccomp? ( sys-libs/libseccomp )
+	systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-podman )
+"
+BDEPEND="dev-go/go-md2man"
+
+src_prepare() {
+	default
+	sed -i -e "s|shell.*--exists libsystemd.* && echo \"0\"|shell echo $(usex systemd 0 1)|g;" Makefile || die
+	echo -e "#!/usr/bin/env bash\necho $(usex seccomp 0 1)" > hack/seccomp-notify.sh || die
+}
+
+src_compile() {
+	tc-export CC PKG_CONFIG
+	export PREFIX="${EPREFIX}/usr" GOMD2MAN=$(command -v go-md2man)
+	default
+}
+
+src_install() {
+	default
+	dosym -r /usr/bin/"${PN}" /usr/libexec/crio/"${PN}"
+	dosym -r /usr/bin/"${PN}" /usr/libexec/podman/"${PN}"
+}
diff --git a/app-containers/cosign/Manifest b/app-containers/cosign/Manifest
index e8b60d4f3534..efc3e7990cc4 100644
--- a/app-containers/cosign/Manifest
+++ b/app-containers/cosign/Manifest
@@ -4,3 +4,5 @@ DIST cosign-2.6.1-deps.tar.xz 147025452 BLAKE2B 6addec265e7b674214a88361b4a83dce
 DIST cosign-2.6.1.tar.gz 987321 BLAKE2B a5c01899ab3a2f69c40fa3a80206334497c772c7a197fc2923b75db560583504abba072972cab4623feb82f4bb5f99293dcce33099fe0a193cbbcbfeebfcef98 SHA512 1498ef9504c10f0787927ca5841c8b158fec69902e59bac55b28409d21f241a787ceee7052e846570b192faa9181bea792d8a1d6099ef183420e620b0bb4ae28
 DIST cosign-3.0.3-deps.tar.xz 147117736 BLAKE2B 8dfd5140715e19adc3daedcf974f94ddcfe53e84af8c17334be003789f3fef87d6b778fdb8c38eb9ecb2f714857b40bf34dcea84071b9619f4f74c77f538410c SHA512 f638eb23ba58ca80f2fa3095d36a9205b04438325a003666573355167c515581843f1a92ff016b748c7d210f4cd42c19e61b57c610cf6bf54c7d861c65303c02
 DIST cosign-3.0.3.tar.gz 949214 BLAKE2B c41a776f5967c4692e84764f450340707f14c3a12dcbf6ded45bbb3d9b5cef59f291aaf5b56b56229a47f58baeee2b5efeff6529f3327d76eec86dee367b9dd0 SHA512 bbb0a248ad858a0c867e8760a752030cbe957682686f3f3cfaf1bd7ae350832df2e6d6fe9388f7323353d7377ae9920a99006c3be27610e5d89bfa9b737ab343
+DIST cosign-3.1.0-vendor.tar.xz 10611608 BLAKE2B fdd9cabc98b7bafbab0fa256310861ca392f98170c7008e228e902bf6ed1cfcd73f0baa0c4d1ff827294ebe242e1b45ab72816fa5308574bfbc89b067f0ae226 SHA512 f7d403f098252e4db72634fa1a8d4778502bdf0e0df625b89aafd7cf03de6fbf063600605aaae41cf17cdfcf1c7d6341b05aa4ab26cfa5e45888c0d4dbdc6a64
+DIST cosign-3.1.0.tar.gz 973713 BLAKE2B 8891355686be3ccf29cff720bd1ea0adfac5058fd53c85152fa9a38de5960a9ce6b0977a37251eea026e74dcb1a51f3fda4f113e859174007906dd98ceceabf2 SHA512 c7154667ecbf76b97b1133d659c737b921df66297c2cb192b7f29407797de9055ecf8b91dd617017de6d8d0541df32474f6daadaeaaa7a964fc229903ef8a450
diff --git a/app-containers/cosign/cosign-3.1.0.ebuild b/app-containers/cosign/cosign-3.1.0.ebuild
new file mode 100644
index 000000000000..7a50b0f7e12e
--- /dev/null
+++ b/app-containers/cosign/cosign-3.1.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2022-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module shell-completion sysroot
+
+GIT_HASH=d253adffe00042d99e7bd7cdcd1d6d2abc3d750d
+# checkout the tag and run `git log -1 --no-show-signature --pretty=%ct`
+SOURCE_DATE_EPOCH=1780697990
+
+DESCRIPTION="container signing utility"
+HOMEPAGE="https://sigstore.dev"
+SRC_URI="https://github.com/sigstore/cosign/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://github.com/gentoo-golang-dist/${PN}/releases/download/v${PV}/${P}-vendor.tar.xz"
+
+LICENSE="Apache-2.0"
+# Dependent licenses
+LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test"
+
+BDEPEND=">=dev-lang/go-1.26.0"
+
+src_compile() {
+	emake \
+		GIT_HASH=${GIT_HASH} \
+		GIT_VERSION=v${PV} \
+		GIT_TREESTATE=clean \
+		SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH}
+
+	einfo "generating shell completion files"
+	sysroot_try_run_prefixed ./cosign completion bash > ${PN}.bash || die
+	sysroot_try_run_prefixed ./cosign completion zsh > ${PN}.zsh || die
+	sysroot_try_run_prefixed ./cosign completion fish > ${PN}.fish || die
+}
+
+src_install() {
+	dobin cosign
+	einstalldocs
+	dodoc CHANGELOG.md
+
+	[[ -s ${PN}.bash ]] && newbashcomp ${PN}.bash ${PN}
+	[[ -s ${PN}.zsh ]] && newzshcomp ${PN}.zsh _${PN}
+	[[ -s ${PN}.fish ]] && dofishcomp ${PN}.fish
+}
diff --git a/app-containers/cri-o/Manifest b/app-containers/cri-o/Manifest
index a766d9de0763..28bb3eba4f45 100644
--- a/app-containers/cri-o/Manifest
+++ b/app-containers/cri-o/Manifest
@@ -1,3 +1,4 @@
 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
 DIST cri-o-1.34.3.tar.gz 21788931 BLAKE2B 2c4c87d5a07f479d306c8f511257a3194fde907aea7af10745cbd909c972c875c8d9b81f9ce922ba89b2451d47ae31f62ae5bcb7038aa525fb8a79bfdfb4b28f SHA512 031396b4e5ac49a484c32857ed156b51940025d973996b69db9b40cb96305072d68e980222d9f23185dd7fb9bb25a21b4858b87ceb46bbe45ff34034f5eaeea9
+DIST cri-o-1.36.1.tar.gz 21684722 BLAKE2B 5b60a98889f502068db449381fdce4d28cb7ce513fa95058fcf704709f3aac46dd07f74e252053208a82d40f577fb6c05b0e1ef296a237ea285121abb6044f72 SHA512 3ab9dd8c202a9d3048e6c6262b5390d10b3d04d0bc6c52e874b5742435c3ecdac45559f47747918d907c469cc81f0fd7ae2146128e5d0af15db0212395da431f
diff --git a/app-containers/cri-o/cri-o-1.36.1.ebuild b/app-containers/cri-o/cri-o-1.36.1.ebuild
new file mode 100644
index 000000000000..d5861d81e052
--- /dev/null
+++ b/app-containers/cri-o/cri-o-1.36.1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=9
+
+EGIT_COMMIT=75a79851f912e67647903fddddcb65ae1bfdabeb
+
+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"
+
+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:= )
+"
+RDEPEND="${DEPEND}
+	!<app-containers/podman-1.3.2-r1
+	selinux? ( sec-policy/selinux-crio )
+"
+BDEPEND="
+	dev-go/go-md2man
+	>=dev-lang/go-1.26.3
+	sys-apps/which
+"
+
+src_prepare() {
+	default
+
+	echo ".NOTPARALLEL: binaries docs" >> Makefile || die
+
+	sed -e '/STRIP/d' -e 's/ -Werror / /' -i pinns/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/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}" \
+		BUILD_COMMIT="${EGIT_COMMIT}" \
+		SHRINKFLAGS="-w" \
+		GO_MD2MAN="$(which go-md2man)"
+}
+
+src_install() {
+	emake install install.config install.systemd \
+		DESTDIR="${D}" \
+		BUILD_COMMIT="${EGIT_COMMIT}" \
+		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/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index 0ce26d1309a1..afb08e5cf84f 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -1,5 +1,4 @@
 DIST compose-5.1.4-vendor.tar.xz 3753076 BLAKE2B 4fca50a6638ae928f33787d987edf9444df1992056a929c2fe8514c63023454476bb490f76399022297d570b376a8657029f17ca98f8d637c06a9fb7561773df SHA512 ee5ef37bb76eead1b221920f5ae7788a50c0c705eb2e51118c7b6d31fd7725a9ffed1cc785039170ab78c4a71a03ecb7fc6486ed3822a2adef2efea6d68ec9f0
-DIST docker-compose-1.29.2.gh.tar.gz 320320 BLAKE2B 2d1a6375127fa09661822f7148665161b45bbd234c93444ae31c1d926513fcbc9fb845f8af01d8f11788f24b7517bff5f6cea2a5da9ade897891f2dd728f26bd SHA512 09f2ae2ae7a17ab5fb3e22580f7a80f1a8253f7ad9fc8f29aca432911bcde46ed22030ff3073cdd7eff3d55aaba17f56e628a178ec05c3a9b4f28495d6045111
 DIST docker-compose-2.34.0-deps.tar.xz 61127872 BLAKE2B e676e93203ae0e670d7cedb6b8771aea01d501246bd9e2c997fc1f03ae6db16fc7816e05ae69bfda6fc83f912d5ccd82a1b7f22781cb5fce4910c326b63f93c7 SHA512 a7f7d710b03e52c3559c84e48e2171e9aa7d2f7c357f1a44963de396a4491a53fdea9e138c57d092572e1a6833e7d3e9ea50ea7e17885c7e37f9ded6cad1cf5e
 DIST docker-compose-2.34.0.gh.tar.gz 397231 BLAKE2B e500fcbb8e6d7ffb08ff43f667faf73dcc29c6084a8a105d1b3c3d0733681ed2499312f056406c6f95d108359f07d92c21e8e2384bd309514b7140bd8a939269 SHA512 8e2ca8cd3b23328a6655c235c6c515343cc848fb1d139a1e981c81a88595edfed4e9d6450f98eebfb8ff73c02c7fbf2aac6206e8fe90eb7883cb6edc6ec0682c
 DIST docker-compose-2.39.3-deps.tar.xz 61486084 BLAKE2B 1e1398f30992b2b8777d78ad13361a684ef83c8036e9d0a24a2d74fc81354e5fab7e9c2f27c695580b839237ec8d99ad7a08976b3308349905e03a390e08e25e SHA512 a20c66e0536b0ac40c34f043e63d73b1f6838e841de52ada307ba5f9793bbb41cfb00333fc0681764818386c483ce9f25c5f123ceba6a6c1d05d386c2b5a8b79
diff --git a/app-containers/docker-compose/docker-compose-1.29.2-r8.ebuild b/app-containers/docker-compose/docker-compose-1.29.2-r8.ebuild
deleted file mode 100644
index db47ea6671e5..000000000000
--- a/app-containers/docker-compose/docker-compose-1.29.2-r8.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2018-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{13..14} )
-
-inherit distutils-r1 shell-completion
-
-MY_PV=${PV/_/-}
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
-
-S="${WORKDIR}/compose-${MY_PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64"
-
-RDEPEND="
-	>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/docker-7[${PYTHON_USEDEP}]
-	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	>=dev-python/pysocks-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/pytest-5[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.2.2[${PYTHON_USEDEP}]
-		dev-python/py[${PYTHON_USEDEP}]
-	)"
-
-EPYTEST_DESELECT=(
-	# These are not ready for >=dev-python/docker-7
-	tests/unit/cli/docker_client_test.py::TLSConfigTestCase::
-)
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# Bug #679968 -- https://bugs.gentoo.org/679968
-	# Bug #681002 -- https://bugs.gentoo.org/681002
-	"${FILESDIR}"/${PN}-1.29.0-setup-py.patch
-	"${FILESDIR}"/${P}-tests-unit-cli-test-py.patch
-	# Bug #920631 -- https://bugs.gentoo.org/920631
-	"${FILESDIR}"/${P}-docker-7.patch
-	"${FILESDIR}"/${P}-python-3.13.patch
-)
-
-DOCS=( CHANGELOG.md README.md )
-
-src_prepare() {
-	# Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
-	sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
-
-	default
-}
-
-python_test() {
-	epytest tests/unit/
-}
-
-python_install_all() {
-	dobashcomp contrib/completion/bash/${PN}
-	dozshcomp contrib/completion/zsh/_${PN}
-
-	distutils-r1_python_install_all
-}
diff --git a/app-containers/docker-compose/files/docker-compose-1.29.0-setup-py.patch b/app-containers/docker-compose/files/docker-compose-1.29.0-setup-py.patch
deleted file mode 100644
index 5b42159a1342..000000000000
--- a/app-containers/docker-compose/files/docker-compose-1.29.0-setup-py.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 6829b2c1885b3a0ff758751db2c936ef384d00f9 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Wed, 7 Apr 2021 00:46:38 +0200
-Subject: [PATCH] setup.py: Drop generic upper version boundaries
-
----
- setup.py | 32 ++++++++++++++++----------------
- 1 file changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index aaf33f7..74be464 100644
---- a/setup.py
-+++ b/setup.py
-@@ -25,33 +25,33 @@ def find_version(*file_paths):
- 
- 
- install_requires = [
--    'docopt >= 0.6.1, < 1',
--    'PyYAML >= 3.10, < 6',
--    'requests >= 2.20.0, < 3',
--    'texttable >= 0.9.0, < 2',
--    'websocket-client >= 0.32.0, < 1',
--    'distro >= 1.5.0, < 2',
-+    'docopt >= 0.6.1',
-+    'PyYAML >= 3.10',
-+    'requests >= 2.20.0',
-+    'texttable >= 0.9.0',
-+    'websocket-client >= 0.32.0',
-+    'distro >= 1.5.0',
-     'docker[ssh] >= 5',
--    'dockerpty >= 0.4.1, < 1',
--    'jsonschema >= 2.5.1, < 4',
--    'python-dotenv >= 0.13.0, < 1',
-+    'dockerpty >= 0.4.1',
-+    'jsonschema >= 2.5.1',
-+    'python-dotenv >= 0.13.0',
- ]
- 
- 
- tests_require = [
--    'ddt >= 1.2.2, < 2',
--    'pytest < 6',
-+    'ddt >= 1.2.2',
-+    'pytest',
- ]
- 
- 
- if sys.version_info[:2] < (3, 4):
--    tests_require.append('mock >= 1.0.1, < 4')
-+    tests_require.append('mock >= 1.0.1')
- 
- extras_require = {
--    ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'],
--    ':python_version < "3.8"': ['cached-property >= 1.2.0, < 2'],
--    ':sys_platform == "win32"': ['colorama >= 0.4, < 1'],
--    'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
-+    ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
-+    ':python_version < "3.8"': ['cached-property >= 1.2.0'],
-+    ':sys_platform == "win32"': ['colorama >= 0.4'],
-+    'socks': ['PySocks >= 1.5.6, != 1.5.7'],
-     'tests': tests_require,
- }
- 
--- 
-2.31.1
-
diff --git a/app-containers/docker-compose/files/docker-compose-1.29.2-docker-7.patch b/app-containers/docker-compose/files/docker-compose-1.29.2-docker-7.patch
deleted file mode 100644
index aafa7a7dddde..000000000000
--- a/app-containers/docker-compose/files/docker-compose-1.29.2-docker-7.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 1e838052b7ccc2a5bb6b674154450a4411de9e15 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Mon, 8 Jan 2024 21:28:27 +0100
-Subject: [PATCH] compose/cli/docker_client.py: Quickfix for
- >=dev-python/docker-7
-
-Symptom was:
-> # docker-compose build
-> Traceback (most recent call last):
-> [..]
->   File "[..]/python3.12/site-packages/compose/cli/docker_client.py", line 124, in docker_client
->     kwargs = kwargs_from_env(environment=environment, ssl_version=tls_version)
->              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-> TypeError: kwargs_from_env() got an unexpected keyword argument 'ssl_version'
-
-Related: https://stackoverflow.com/a/77638834/11626624
----
- compose/cli/docker_client.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py
-index e4a0fea..f550e20 100644
---- a/compose/cli/docker_client.py
-+++ b/compose/cli/docker_client.py
-@@ -121,7 +121,7 @@ def docker_client(environment, version=None, context=None, tls_version=None):
-     according to the same logic as the official Docker client.
-     """
-     try:
--        kwargs = kwargs_from_env(environment=environment, ssl_version=tls_version)
-+        kwargs = kwargs_from_env(environment=environment)
-     except TLSParameterError:
-         raise UserError(
-             "TLS configuration is invalid - make sure your DOCKER_TLS_VERIFY "
--- 
-2.43.0
-
diff --git a/app-containers/docker-compose/files/docker-compose-1.29.2-python-3.13.patch b/app-containers/docker-compose/files/docker-compose-1.29.2-python-3.13.patch
deleted file mode 100644
index 15bcef2d9a07..000000000000
--- a/app-containers/docker-compose/files/docker-compose-1.29.2-python-3.13.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From e84ec8f7ed416df359b8e26f86232b5c8c1b41d4 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Fri, 28 Mar 2025 19:42:43 +0100
-Subject: [PATCH] Replace pipes.quote by shlex.quote for Python 3.13
-
----
- compose/cli/main.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/compose/cli/main.py b/compose/cli/main.py
-index fabd608..fe6ccc2 100644
---- a/compose/cli/main.py
-+++ b/compose/cli/main.py
-@@ -2,8 +2,8 @@ import contextlib
- import functools
- import json
- import logging
--import pipes
- import re
-+import shlex
- import subprocess
- import sys
- from distutils.spawn import find_executable
-@@ -1579,7 +1579,7 @@ def call_docker(args, dockeropts, environment):
-         )
- 
-     args = [executable_path] + tls_options + args
--    log.debug(" ".join(map(pipes.quote, args)))
-+    log.debug(" ".join(map(shlex.quote, args)))
- 
-     filtered_env = {k: v for k, v in environment.items() if v is not None}
- 
--- 
-2.48.1
-
diff --git a/app-containers/docker-compose/files/docker-compose-1.29.2-tests-unit-cli-test-py.patch b/app-containers/docker-compose/files/docker-compose-1.29.2-tests-unit-cli-test-py.patch
deleted file mode 100644
index 0d6cf44c1887..000000000000
--- a/app-containers/docker-compose/files/docker-compose-1.29.2-tests-unit-cli-test-py.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 988f954a7e185c521e7c0f720684e8a53068b136 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Thu, 15 Dec 2022 18:11:03 +0100
-Subject: [PATCH] tests/unit/cli_test.py: Fix access to
- py._path.local.LocalPath
-
-.. for test CLITestCase.test_default_project_name:
-
-> class CLITestCase(unittest.TestCase):
->
->     def test_default_project_name(self):
->         test_dir = py._path.local.LocalPath('tests/fixtures/simple-composefile')
->         [..]
----
- tests/unit/cli_test.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py
-index fa6e767..83ecef8 100644
---- a/tests/unit/cli_test.py
-+++ b/tests/unit/cli_test.py
-@@ -4,7 +4,7 @@ import tempfile
- from io import StringIO
- 
- import docker
--import py
-+import py._path.local
- import pytest
- from docker.constants import DEFAULT_DOCKER_API_VERSION
- 
--- 
-2.39.0
-
diff --git a/app-containers/docker-credential-helpers/Manifest b/app-containers/docker-credential-helpers/Manifest
index e93fd1c19939..3b8421432c95 100644
--- a/app-containers/docker-credential-helpers/Manifest
+++ b/app-containers/docker-credential-helpers/Manifest
@@ -1,3 +1,2 @@
-DIST docker-credential-helpers-0.8.2.tar.gz 283816 BLAKE2B 334ca059b619e5e3528864a99b07eea61b98083989aa8e8b619c83d781caad97fbf5f3ed60879adacf27d81e0b991a38567e1fa2bc27b9a772d86b51437a6e03 SHA512 ca04b7fe78871389c9f968b730c18e2aca2d2a818ce87c1f138efb7dafbfdea7b83c2c16504131d04c295428debee2187036e603dba711369b5de1a3993c2e8c
-DIST docker-credential-helpers-0.9.2.tar.gz 295411 BLAKE2B ad0814447c92b37ef16049e06e1f894e5e80c2235a26826f3f154714fed5558fdd2e0a45161e4f9e2cd8e14da39f41f72671aeccceb41009134edb7989faf19d SHA512 12f5445a99cdb1e3d61fb6e629d0c3acfc6111d1f770bf44e7d5f8f0b7a1c9c757076bcd9d1df3ee3ad80a898d4e4768b34008d3085f754665bd47b3b96bc13c
 DIST docker-credential-helpers-0.9.3.tar.gz 295607 BLAKE2B 4b59acf426cba27abe0f024b9479331f967bece8fd97bf3104ffcf17fc3a1f02e8248142177a19325a8941e71e5f26acc5fbdc1daa067e47ca29a98bb60af8c4 SHA512 01f58de113a402319e2695aba140322be13b03d234e2582c438735e178dfb999fa6e15abfcef4431490b2def87e7d1cb27d6ae855d348f30a878caf21d7f9a02
+DIST docker-credential-helpers-0.9.7.tar.gz 295449 BLAKE2B 6a02deb0031dfac2ef9f194b00f7e4b26391876091bcd6439192965e2373d7fbefea76ced069cc49f8e807dce75f00594f38d5c7585d8f7d1c890edd1f610a69 SHA512 cacfc2c7d68667df4a3e45bcb27a11e461734772a96cf6d0e7f4d91ccac745caccc311e12edfda3841ded7531b98c7d66c79fafd30e099094d40eb14c8030feb
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
deleted file mode 100644
index dfb6fe190584..000000000000
--- a/app-containers/docker-credential-helpers/docker-credential-helpers-0.8.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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/docker-credential-helpers-0.9.2.ebuild b/app-containers/docker-credential-helpers/docker-credential-helpers-0.9.7.ebuild
index dfb6fe190584..456d6f7a44e4 100644
--- a/app-containers/docker-credential-helpers/docker-credential-helpers-0.9.2.ebuild
+++ b/app-containers/docker-credential-helpers/docker-credential-helpers-0.9.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=8
+EAPI=9
 
 inherit go-module
 
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/docker/docker-credential-helpers/archive/v${PV}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64"
+KEYWORDS="~amd64 ~arm64"
 
 IUSE="keyring pass"
 REQUIRED_USE="|| ( keyring pass )"
@@ -22,6 +22,11 @@ RDEPEND="${DEPEND}
 	pass? ( app-admin/pass )
 "
 
+src_prepare() {
+	default
+	sed -e '/GO_LDFLAGS/s/ -s / /' -i Makefile || die
+}
+
 src_compile() {
 	local mymakeflags=(
 		VERSION="${PV}"
diff --git a/app-containers/docker-registry/Manifest b/app-containers/docker-registry/Manifest
index 5aff53b4192a..e9f471358950 100644
--- a/app-containers/docker-registry/Manifest
+++ b/app-containers/docker-registry/Manifest
@@ -1,2 +1,3 @@
 DIST docker-registry-3.0.0_rc2.tar.gz 13978331 BLAKE2B 0890b6128898d3fd036f95032f84641e4394b2ab4fc657116fe8a96e40ceccbc418847fac14f425a2649b9417ff7ae5eff1cea6a02f0eb525f5bc46e5e92edb9 SHA512 8a00939d0f9c1fc49e2d1fc2f8f8ba155e1e39a9bb9c19baeadf4070277a36fac29b11e2fc709c151b884eca7e36d11fa304ae02eea1faccdb29015083828448
 DIST docker-registry-3.0.0_rc3.tar.gz 13985046 BLAKE2B 08956601c9d07f33fd478e7dac11fa4a7ff003ba00b319dfd485ea93e893dfd5064afd82bddbbbe50f6446b34c07587be56acfc25e4b4519ff7ed3f61483c01e SHA512 41883d1b5187fd1ad77cf859e8d28367864c6608021b80ab302510c1e1d9df518653d0d869da61f8f21e73cfca2a69534918d2bddcafbbeda3cb0fcd23825bb7
+DIST docker-registry-3.1.1.tar.gz 14394650 BLAKE2B 4d52d66add6e5b468e644f9011211e1b1c728634a29482ef0620b09fe85fb8c1c96b334524cf8c0a55342faf642f794b7713b270f599da224231d60e2e140b84 SHA512 ea38ae2b04c1671b540740d5221edce50dc81363ad88522a02b87ef5660bb1f04503f47d30ea90a7f116f5086dfc84d782a39817a1dc560d5e74b1fdffb58210
diff --git a/app-containers/docker-registry/docker-registry-3.1.1.ebuild b/app-containers/docker-registry/docker-registry-3.1.1.ebuild
new file mode 100644
index 000000000000..25537543044c
--- /dev/null
+++ b/app-containers/docker-registry/docker-registry-3.1.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd
+
+MY_PV=${PV/_rc/-rc.}
+EGIT_COMMIT="9a8d98b679740cd514aa7e7d84d23d442a5ef54c"
+
+DESCRIPTION="Docker Registry 2.0"
+HOMEPAGE="https://github.com/docker/distribution"
+SRC_URI="https://github.com/docker/distribution/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/distribution-${MY_PV}
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 MIT ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+DEPEND="
+	acct-group/registry
+	acct-user/registry
+"
+RDEPEND="${DEPEND}"
+BDEPEND=">=dev-lang/go-1.25.0"
+
+src_prepare() {
+	default
+
+	sed -e "s/ -s//" -i Makefile || die
+
+	# bug 949973
+	sed -e "s/TestHTTPChecker/_&/" -i health/checks/checks_test.go || die
+	# flaky test
+	sed -e "s/TestDeleteOnlyDeletesSubpaths/_&/" -i registry/storage/driver/testsuites/testsuites.go || die
+}
+
+src_compile() {
+	local -x GO_BUILD_FLAGS="-v -mod=vendor"
+	emake VERSION="${MY_PV}" REVISION="${EGIT_COMMIT}" binaries
+}
+
+src_install() {
+	exeinto /usr/libexec/${PN}
+	doexe bin/*
+
+	insinto /etc/docker/registry
+	newins cmd/registry/config-example.yml config.yml.example
+
+	newinitd "${FILESDIR}/registry.initd" registry
+	newconfd "${FILESDIR}/registry.confd" registry
+	systemd_dounit "${FILESDIR}/registry.service"
+
+	keepdir /var/log/registry
+	fowners registry:registry /var/log/registry
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/registry.logrotated" registry
+}
diff --git a/app-containers/incus-ui/incus-ui-0.18.2.ebuild b/app-containers/incus-ui/incus-ui-0.18.2.ebuild
index a725f880c043..21bd307c36dd 100644
--- a/app-containers/incus-ui/incus-ui-0.18.2.ebuild
+++ b/app-containers/incus-ui/incus-ui-0.18.2.ebuild
@@ -45,11 +45,3 @@ src_install() {
 
 	systemd_install_dropin incus.service "${FILESDIR}"/incus.systemd.override
 }
-
-pkg_postinst() {
-	systemctl daemon-reload
-}
-
-pkg_postrm() {
-	systemctl daemon-reload
-}
diff --git a/app-containers/k3d/Manifest b/app-containers/k3d/Manifest
index accf3dea1bdf..43d88e5f9f6a 100644
--- a/app-containers/k3d/Manifest
+++ b/app-containers/k3d/Manifest
@@ -1 +1,2 @@
 DIST k3d-5.8.3.tar.gz 9542510 BLAKE2B d6b2e6701c576ff7cc25b979c18284e6e4dbe4fc8078f3669297b6aa0acddb6ad7e256255d8f8d8a97aef981b20f81529f621237d2f183c58aa37bfd58645b71 SHA512 e942a895b31c7906264380851e5f450e4f4b8bba5552d6693baf3428d2b8c7198f94d62b2791571867f24adda3a3edbac73253d04e13b8f5f3adba56310f6936
+DIST k3d-5.9.0.tar.gz 8955790 BLAKE2B dd8c6a71acf3886f35649c1bbae8bec555026fb9c35a67ccdbf48b61f1e45c8b32769e6767adc8c5e0ab1296315f325c1c09b73616027bb3a963ba410e6885c6 SHA512 ff13004db256c0fbc42472e5462c55c6c929d2bac774d7f0043810946541143bc878e3bb0bf8bf8b3b7c382aa6a4152e9f9e63a1d078336a3068b0be84a3cd48
diff --git a/app-containers/k3d/k3d-5.9.0.ebuild b/app-containers/k3d/k3d-5.9.0.ebuild
new file mode 100644
index 000000000000..5131cee5f690
--- /dev/null
+++ b/app-containers/k3d/k3d-5.9.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2021-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module shell-completion sysroot
+
+K3D_K3S_TAG=v1.36.1-k3s1
+
+DESCRIPTION="k3d creates k3s clusters in docker"
+HOMEPAGE="https://github.com/rancher/k3d"
+SRC_URI="https://github.com/rancher/k3d/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT Apache-2.0 BSD BSD-2 MPL-2.0 ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+BDEPEND=">=dev-lang/go-1.26.3"
+
+src_compile() {
+	local ldflags=(
+		-w
+		-X "github.com/k3d-io/k3d/v5/version.Version=v${PV}"
+		-X "github.com/k3d-io/k3d/v5/version.K3sVersion=${K3D_K3S_TAG}"
+	)
+	local -x GOWORK="" CGO_ENABLED=1
+	ego build -ldflags "${ldflags[*]}" -o bin/k3d
+
+	einfo "generating shell completion files"
+	sysroot_try_run_prefixed ./bin/k3d completion bash > ${PN}.bash || die
+	sysroot_try_run_prefixed ./bin/k3d completion zsh > ${PN}.zsh || die
+	sysroot_try_run_prefixed ./bin/k3d completion fish > ${PN}.fish || die
+}
+
+src_test() {
+	ego test -v ./... -skip "TestGetK3sVersion"
+}
+
+src_install() {
+	dobin bin/${PN}
+
+	[[ -s ${PN}.bash ]] && newbashcomp ${PN}.bash ${PN}
+	[[ -s ${PN}.zsh ]] && newzshcomp ${PN}.zsh _${PN}
+	[[ -s ${PN}.fish ]] && dofishcomp ${PN}.fish
+
+	DOCS=( *.md )
+	use doc && DOCS+=( docs )
+	einstalldocs
+}
diff --git a/app-containers/nerdctl/Manifest b/app-containers/nerdctl/Manifest
index a8f80fd3e4e8..c7bf17f804a9 100644
--- a/app-containers/nerdctl/Manifest
+++ b/app-containers/nerdctl/Manifest
@@ -4,3 +4,5 @@ DIST nerdctl-2.0.3-go-mod-vendor.tar.gz 7404790 BLAKE2B 5b28dc9b154d9709764941b0
 DIST nerdctl-2.0.3.tar.gz 1345686 BLAKE2B bd9b2e1979931de5882d64fa51c094a532023f8c7be1f9b397dbb998d6bf428a6b9839d3682ce66ddddb8887e432027f8704d97e06ead2f4d870ef8e2cd9b1a9 SHA512 32467f3b75e443104d7b49c40bb27df72080ae6c40c9c085968b8f8e3d839095f2047c4fd1cff540bcb785639b79a0874f9a50a5af9feb2a690a7c22621ab98d
 DIST nerdctl-2.2.1-go-mod-vendor.tar.gz 8108003 BLAKE2B 73fe63c9af84829392cb356381c0f24c63946c6eb35a8bad4f150bb3c33116eca93ad00661dfbc7b08c0fa9494836ed0a7f21a2227bc851ae451c86ef9f3389d SHA512 59ca6e6d529f02496f0a4cd98ffb62e6b104104f1a7a3c79705a0f6e8bcc9ac2a1788ec7e20a004e8ccbcff987d42dbd4970ef74a145edec157c7b26025bb556
 DIST nerdctl-2.2.1.tar.gz 1521355 BLAKE2B 1399a5a0ef2ce6dd46ce289cc1ccb8f40c5f7530ae5da0f8155e89b6d858dcb8efdfeb5d10e6a10eb6e7ec66ce10b06e633a15879320bcbf59d0fcf20f2a7189 SHA512 2b25061c0673633e28e42cb082e1cd5d86a31127c83ff23621c742a05b7b3314fca51acf20cc4a45f00400624d17d52b480e6803e886f59ac92cf38470ba983a
+DIST nerdctl-2.3.1-go-mod-vendor.tar.gz 7460204 BLAKE2B 099df61da3ba0f41786dad0e626109202a70768762cfa4de4a83af8b85dad80e27a23a5a9c83cf821dc5dddecd3fac7a91510f26a2a84dcce3fe876b6dc1b730 SHA512 21da94fcd7742e618cf57b95a7873148d12650de06b21433dfe8785fcbfd0bc47a7c7d8131a26ec7f0c2381ad5f145e7a3c8b6713799e153dcc17a51aeeee27c
+DIST nerdctl-2.3.1.tar.gz 1550447 BLAKE2B 4fb82e89d0100134ebced289d4b638dfe37063b533613899d67a6a9c07d805d64eaca2b6056b10cbdbc53c3ae9166d1f90b1769de958b86db72170c66af8337b SHA512 862be6d25232f71b1f53729084ca0806b2021f0ce2faa98890b70185fbcb237682a01cfc46035930f5e3f9ec971e0640704fdf9c31738bfab2c7b4f5be5f4124
diff --git a/app-containers/nerdctl/nerdctl-2.3.1.ebuild b/app-containers/nerdctl/nerdctl-2.3.1.ebuild
new file mode 100644
index 000000000000..773e493c25ec
--- /dev/null
+++ b/app-containers/nerdctl/nerdctl-2.3.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2021-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module optfeature shell-completion sysroot
+
+EGIT_COMMIT="04f63fe15f3f8d77fe41e56ab7ff1d1f3e312860"
+
+DESCRIPTION="Docker-compatible CLI for containerd, with support for Compose"
+HOMEPAGE="https://github.com/containerd/nerdctl"
+SRC_URI="
+	https://github.com/containerd/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/containerd/${PN}/releases/download/v${PV}/${P}-go-mod-vendor.tar.gz
+"
+
+LICENSE="Apache-2.0"
+LICENSE+=" BSD BSD-2 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND=">=dev-lang/go-1.26.3"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	cd "${S}"
+	unpack "${P}-go-mod-vendor.tar.gz"
+	mv home/runner/work/nerdctl/nerdctl/vendor . || die
+}
+
+src_prepare() {
+	default
+	sed -e 's/TestGet/_&/' -i pkg/resolvconf/resolvconf_linux_test.go || die
+}
+
+src_compile() {
+	emake VERSION=v${PV} REVISION="${EGIT_COMMIT}" GO_BUILD_LDFLAGS="-w"
+
+	einfo "generating shell completion files"
+	sysroot_try_run_prefixed ./_output/nerdctl completion bash > ${PN}.bash || die
+	sysroot_try_run_prefixed ./_output/nerdctl completion zsh > ${PN}.zsh || die
+	sysroot_try_run_prefixed ./_output/nerdctl completion fish > ${PN}.fish || die
+}
+
+src_install() {
+	local emake_args=(
+		DESTDIR="${D}"
+		VERSION=v${PV}
+		REVISION="${EGIT_COMMIT}"
+		DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		PREFIX="${EPREFIX}/usr"
+	)
+	emake "${emake_args[@]}" install
+	local DOCS=( README.md docs/* examples )
+	einstalldocs
+
+	[[ -s ${PN}.bash ]] && newbashcomp ${PN}.bash ${PN}
+	[[ -s ${PN}.zsh ]] && newzshcomp ${PN}.zsh _${PN}
+	[[ -s ${PN}.fish ]] && dofishcomp ${PN}.fish
+}
+
+pkg_postinst() {
+	optfeature "rootless mode" "app-containers/slirp4netns sys-apps/rootlesskit"
+}
diff --git a/app-containers/podman-compose/Manifest b/app-containers/podman-compose/Manifest
index 791670ffd48b..27d21a2f2e88 100644
--- a/app-containers/podman-compose/Manifest
+++ b/app-containers/podman-compose/Manifest
@@ -1 +1,2 @@
 DIST podman-compose-1.5.0.gh.tar.gz 128890 BLAKE2B 77a1acad78662358240ac638cfec95bff447d287f0f85d3d940989cdd1d4b4cbbf5ea24b21286e36031a0406e34f42a5ac0fbf8b7b31653ba89775059a202a93 SHA512 903b37b2233b0cb5965ef7730df11e2c2b69f5b2bce946004cbd728858ac7c068fd64c4e08c4860c97a10bb297de7d9d9f9a54cf74075e34f870d29f1b4f3d25
+DIST podman-compose-1.6.0.gh.tar.gz 155251 BLAKE2B 90a35e331a779dafd7aa0325c34e1d321cf34f9b0f7ace8840a9a2a861e840c730a038c327c1a2402b7abde7e1a030e16a5f97e618ae8de52b3215197beece69 SHA512 61b3ad7e7fbff109049ec25daf6231acb9627f5fe5b3dee95592cc16d1d35255a8ae2d33721c37bfc95e68378407fbabbccd4924af6fd2dff709de534b90f2f0
diff --git a/app-containers/podman-compose/podman-compose-1.6.0.ebuild b/app-containers/podman-compose/podman-compose-1.6.0.ebuild
new file mode 100644
index 000000000000..4037045024a1
--- /dev/null
+++ b/app-containers/podman-compose/podman-compose-1.6.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2023-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{13..14} )
+inherit distutils-r1
+
+DESCRIPTION="A script to run docker-compose.yml using Podman"
+HOMEPAGE="https://github.com/containers/podman-compose"
+SRC_URI="https://github.com/containers/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	app-containers/aardvark-dns
+	app-containers/netavark
+	app-containers/podman
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/pyaml[${PYTHON_USEDEP}]
+	dev-python/python-dotenv[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_PLUGINS=()
+distutils_enable_tests pytest
+
+python_test() {
+	epytest tests/unit
+}
diff --git a/app-containers/podman-tui/Manifest b/app-containers/podman-tui/Manifest
index 8ef0aef7d694..3aaafc90567d 100644
--- a/app-containers/podman-tui/Manifest
+++ b/app-containers/podman-tui/Manifest
@@ -1,3 +1,4 @@
+DIST podman-tui-1.11.1.tar.gz 18550099 BLAKE2B dcabe4942741ead1e879589fb61571889d3dd20707ef0741007b3e9ef986a48d81b02d2fb8886dd246ae72029752c8984d06b1b52c21f55c2e472a43cadd8e1f SHA512 4878f3e43f4197132e8fd0105ec390db38ef4e1c5754b2a1bb2f144c54c6b12cf936a68d91f72391a9388b01591ddafd8d5721d919d64235eec513ef21ddd8a3
 DIST podman-tui-1.5.0.tar.gz 20129613 BLAKE2B fb2da2fa77adf7f7b7476144c4e3f4d96829063f1a48cc219f1bd90629744dde53d73a0ceb8adbed385e8acd77d2e5614f932bef902185d5923987e035de4625 SHA512 a67acb15d292692cbe7e1e6e3b55c471a6d3a6ee9e777dcccd9b76bb26906117587b32bb7b6555e87a6079b9154b2355b9ddf00761b25046000578527107fffe
 DIST podman-tui-1.6.1.tar.gz 20301501 BLAKE2B 8e1f2ce6ee35adc236429703158d4df378b3e17783008d81296c21e033cd2b46389f9f7dd2d2210783525ea84def948fb0932087eba163b03dedc929125ef7f5 SHA512 dc7caf7e19440e0b72a19310ff80be979e103793ebbaf1060455632cffaefea3afb01d4c906b83bca13ce4e399680309c6a5142394b32cf76924af8c3c88ed14
 DIST podman-tui-1.9.0.tar.gz 18771918 BLAKE2B 8d548af6c064b55499077001b417e733fdecbfbbc927c3335efbc53c2725cb2947994c04df47f8aa2327ee932d130f038985fe480968437f7a57da5ad6f99049 SHA512 0fdd4cab2479251fa5f24ed0a1485319c604fdcec19cf83257a6c93bb81174e81d2930717393937998396913e56e553f960e37394d960a16141753bd29f40140
diff --git a/app-containers/podman-tui/podman-tui-1.11.1.ebuild b/app-containers/podman-tui/podman-tui-1.11.1.ebuild
new file mode 100644
index 000000000000..140862838341
--- /dev/null
+++ b/app-containers/podman-tui/podman-tui-1.11.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=9
+
+inherit go-module
+
+DESCRIPTION="Terminal UI frontend for Podman"
+HOMEPAGE="https://github.com/containers/podman-tui"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/containers/podman-tui.git"
+else
+	SRC_URI="https://github.com/containers/podman-tui/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+# main pkg
+LICENSE="Apache-2.0"
+# deps
+LICENSE+=" BSD-2 BSD MIT MPL-2.0"
+SLOT="0"
+RESTRICT="test"
+
+src_compile() {
+	local -x CGO_ENABLED=0
+	# parse tags from Makefile & make them comma-seperated as space-seperated list is deprecated
+	local BUILDTAGS=$(grep 'BUILDTAGS :=' Makefile | awk -F\" '{ print $2; }' | tr ' ' ',')
+	ego build -tags "${BUILDTAGS}"
+}
+
+src_install() {
+	dobin "${PN}"
+	einstalldocs
+}
diff --git a/app-containers/podman-tui/podman-tui-9999.ebuild b/app-containers/podman-tui/podman-tui-9999.ebuild
index 7d0076fdcbb8..140862838341 100644
--- a/app-containers/podman-tui/podman-tui-9999.ebuild
+++ b/app-containers/podman-tui/podman-tui-9999.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=8
+EAPI=9
 
 inherit go-module
+
 DESCRIPTION="Terminal UI frontend for Podman"
 HOMEPAGE="https://github.com/containers/podman-tui"
 
@@ -23,8 +24,9 @@ SLOT="0"
 RESTRICT="test"
 
 src_compile() {
+	local -x CGO_ENABLED=0
 	# parse tags from Makefile & make them comma-seperated as space-seperated list is deprecated
-	local BUILDTAGS=$(grep 'BUILDTAGS :=' Makefile | awk -F\" '{ print $2; }' | sed -e 's| |,|g;')
+	local BUILDTAGS=$(grep 'BUILDTAGS :=' Makefile | awk -F\" '{ print $2; }' | tr ' ' ',')
 	ego build -tags "${BUILDTAGS}"
 }
 
diff --git a/app-containers/podman/Manifest b/app-containers/podman/Manifest
index 37d181a5059a..5fb75ea8550d 100644
--- a/app-containers/podman/Manifest
+++ b/app-containers/podman/Manifest
@@ -1 +1,2 @@
 DIST podman-5.7.1.tar.gz 21266433 BLAKE2B 59adb23b18fe453d45d92b0dac22a2fc8db1b1d02074f5eabc65d95bf7764f43a1d835f7316fbd61bbb7d98f3aeb6a3306d53963c5f83b8f55d879c182518534 SHA512 81fd4c27ff1d16dcb85229d4e4fd2cb06943ddfe966b5324fa8a8a957b2d2ec2aed7c5da05d6c009148f53b76545b27b0cba506622c8861f70bf7cad6c214a08
+DIST podman-5.8.2.tar.gz 21302563 BLAKE2B daa2eefbd5014926825225f60ac46f42857d630e3b215631bc14305779b45efa28bd876c92c8c3fbd030b78f862d2738ae71d1a4a57a38a6e285ad518250a8f9 SHA512 4fb26b278aaaa64799c7cc27e168c6fd836a1ed95653c757db5de9873e774a4650353ad4aadad6a7968dd82db8e2833f871ba41304512825b706d4919ee333a7
diff --git a/app-containers/podman/podman-5.8.2.ebuild b/app-containers/podman/podman-5.8.2.ebuild
new file mode 100644
index 000000000000..7c0c158542cc
--- /dev/null
+++ b/app-containers/podman/podman-5.8.2.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{13..14} )
+
+inherit go-module python-any-r1 tmpfiles toolchain-funcs linux-info
+
+DESCRIPTION="A tool for managing OCI containers and pods with Docker-compatible CLI"
+HOMEPAGE="https://github.com/containers/podman/ https://podman.io/"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/containers/podman.git"
+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"
+fi
+
+# main pkg
+LICENSE="Apache-2.0"
+# deps
+LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="apparmor btrfs +seccomp selinux systemd wrapper"
+RESTRICT="test"
+
+RDEPEND="
+	app-containers/catatonit
+	>=app-containers/conmon-2.1.10
+	>=app-containers/containers-common-0.58.0-r1
+	app-crypt/gpgme:=
+	dev-db/sqlite:3
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error:=
+	sys-apps/shadow:=
+
+	apparmor? ( sys-libs/libapparmor )
+	btrfs? ( sys-fs/btrfs-progs )
+	wrapper? ( !app-containers/docker-cli )
+	seccomp? ( sys-libs/libseccomp:= )
+	selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= )
+	systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-go/go-md2man
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.5.2-togglable-seccomp.patch
+)
+
+CONFIG_CHECK="
+	~USER_NS
+"
+
+pkg_setup() {
+	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
+	linux-info_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# assure necessary files are present
+	local file
+	for file in apparmor_tag btrfs_installed_tag systemd_tag; do
+		[[ -f hack/"${file}".sh ]] || die
+	done
+
+	local feature
+	for feature in apparmor systemd; do
+		cat <<-EOF > hack/"${feature}"_tag.sh || die
+		#!/usr/bin/env bash
+		$(usex ${feature} "echo ${feature}" echo)
+		EOF
+	done
+
+	cat <<-EOF > hack/btrfs_installed_tag.sh || die
+	#!/usr/bin/env bash
+	$(usex btrfs echo 'echo exclude_graphdriver_btrfs')
+	EOF
+}
+
+src_compile() {
+	export ETCDIR="${EPREFIX}/etc" PREFIX="${EPREFIX}/usr" BUILD_ORIGIN="Gentoo Portage"
+
+	# For non-live versions, prevent git operations which causes sandbox violations
+	# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
+	[[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT="" EPOCH_TEST_COMMIT=""
+
+	# Use proper pkg-config to get gpgme cflags and ldflags when
+	# cross-compiling, bug 930982.
+	if tc-is-cross-compiler; then
+		tc-export PKG_CONFIG
+	fi
+
+	emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" EXTRA_BUILDTAGS="$(usev seccomp)" SELINUXOPT= \
+		  all $(usev wrapper docker-docs)
+}
+
+src_install() {
+	emake DESTDIR="${D}" SELINUXOPT= install install.completions $(usev wrapper install.docker-full)
+
+	if use !systemd; then
+		newconfd "${FILESDIR}"/podman-5.0.0_rc4.confd podman
+		newinitd "${FILESDIR}"/podman-5.0.0_rc4.initd podman
+
+		newinitd "${FILESDIR}"/podman-restart-5.0.0_rc4.initd podman-restart
+		newconfd "${FILESDIR}"/podman-restart-5.0.0_rc4.confd podman-restart
+
+		newinitd "${FILESDIR}"/podman-clean-transient-5.0.0_rc6.initd podman-clean-transient
+		newconfd "${FILESDIR}"/podman-clean-transient-5.0.0_rc6.confd podman-clean-transient
+
+		exeinto /etc/cron.daily
+		newexe "${FILESDIR}"/podman-auto-update-5.0.0.cron podman-auto-update
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/podman.logrotated" podman
+
+		exeinto /etc/user/init.d
+		newexe "${FILESDIR}/podman-5.0.0_rc4.user.initd" podman
+
+		insinto /etc/user/conf.d
+		newins "${FILESDIR}/podman-5.0.0_rc4.user.confd" podman
+	fi
+
+	keepdir /var/lib/containers
+}
+
+pkg_postinst() {
+	tmpfiles_process podman.conf $(usev wrapper podman-docker.conf)
+}
diff --git a/app-containers/skopeo/Manifest b/app-containers/skopeo/Manifest
index 2dbed9fe0f9e..c2a1f6d9b735 100644
--- a/app-containers/skopeo/Manifest
+++ b/app-containers/skopeo/Manifest
@@ -1,5 +1,2 @@
-DIST skopeo-1.18.0.tar.gz 10790607 BLAKE2B ebbd9c481fd9ae03ff853042276037a521a7911ded67006faa1b11d6a70affadce35bdcea67209250cde36196ae87f1206ba654f9a52c7ec833cb25fe6c0af1e SHA512 7d56d78b4e0299c187eb2ea46a2d6ac41a4ad30848e9f5fe43285af74c5207f6fc4ee98c15bd5114de7a660e52846f75c26632ae1aa3ccf656b504798a6b1d56
-DIST skopeo-1.19.0.tar.gz 10819827 BLAKE2B c413bdc58634e144bcd1ee64afcba5cbd472fb08791c6eb8acb1cc84fdc9a62ef16fcd52123ac3364b1473f2aa285b97007d440b99385f8503120b412294f17c SHA512 2e297a193e8414f0482b06b7e2aaa027c4510963e91e4675c00b8113e58b82abf26943f36a60584dc47fd7f3abd80c452fb9c92f29e1b82d4c329bd422a399ee
-DIST skopeo-1.21.0.tar.gz 10187308 BLAKE2B 7a173e99e940c64e27e541575880a13132d0784cf4187e5d5ca871a75a1c71d8cbbe04e8f462a58e9f5e9fafaa610af69db42f28bc2cb6329f21bebd972b7c20 SHA512 2d1bc2e991d11b2060f7d2d4869aa30bb281794c3a5fa8aa6c5e333fc9c0190eb716d1855f6554ab0ee810b93e1638fcfde48e58f1e3e01ac5474c329ac041c7
-DIST skopeo-1.22.0.tar.gz 10191616 BLAKE2B f763954cd209c5d3770da1bfd71ab3be485920326ada83770b4b190149b712e67c2d200ca4af442f317cf19f8048e90f7c7b4b03761d3e43b57b4e68e6e8d006 SHA512 d4030c4dca7288e8a80a31fadd37532990bdf16ad5ff7c5e8e2ef922cc1a3185f1a6c32ac9906bd07a826cc6968a68dfd6df4d7e10e8ee22d87dba3ac5bfd3b9
 DIST skopeo-1.22.2.tar.gz 10327855 BLAKE2B f3c6d5eafe98c54b0e8f4b69d75472cfe4367152a915ed4daf16dc8d0604547863d62acaf3ef3c50d82a7ab4996d9ee9c25b87300aefccbebc74c664de4ee515 SHA512 d65134f568bf49cabc1ec7564bc98a5debb9e6b16a6e5351cebc583534a56b6a16c0eb69356f8466681e68df5445172c34c9d34bcb362bc2a89bfe9288002066
+DIST skopeo-1.23.0.tar.gz 9433389 BLAKE2B 17f51bc19c45f8250830a111cae973947f76d204d5e92517466312f716692080b900163dec3969a0492b799eb462f5e07f652cdd6e8be51186735cd5d4cee7a0 SHA512 0985ac478b27bace31f5f2710bae44d214b90f160e61400d6d345e728779389103a3b9c4bcfd048f0d7d12d4dc7dcd8e0b2e20b1a8c18bdef652faa153fe0726
diff --git a/app-containers/skopeo/metadata.xml b/app-containers/skopeo/metadata.xml
index c71e8f8725c3..0b97e65e180d 100644
--- a/app-containers/skopeo/metadata.xml
+++ b/app-containers/skopeo/metadata.xml
@@ -18,8 +18,8 @@
     <flag name="rootless">Compiles with libsubid</flag>
   </use>
   <upstream>
-    <bugs-to>https://github.com/containers/skopeo/issues</bugs-to>
-    <doc>https://github.com/containers/skopeo/blob/main/README.md</doc>
+    <bugs-to>https://github.com/podman-container-tools/skopeo/issues</bugs-to>
+    <doc>https://github.com/podman-container-tools/skopeo/blob/main/README.md</doc>
   </upstream>
   <origin>baldeagleos-repo</origin>
 </pkgmetadata>
diff --git a/app-containers/skopeo/skopeo-1.18.0-r1.ebuild b/app-containers/skopeo/skopeo-1.18.0-r1.ebuild
deleted file mode 100644
index 17315ff35c5f..000000000000
--- a/app-containers/skopeo/skopeo-1.18.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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 rootless"
-RESTRICT="test"
-
-DEPEND="
-	>=app-crypt/gpgme-1.5.5:=
-	btrfs? ( >=sys-fs/btrfs-progs-4.0.1 )
-	rootless? ( sys-apps/shadow:= )
-"
-RDEPEND="${DEPEND}
-	app-containers/containers-common
-"
-BDEPEND="dev-go/go-md2man"
-
-pkg_setup() {
-	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
-	linux-info_pkg_setup
-}
-
-run_make() {
-	local emakeflags=(
-		BTRFS_BUILD_TAG="$(usex btrfs '' 'btrfs_noversion exclude_graphdriver_btrfs')"
-		CONTAINERSCONFDIR="${EPREFIX}/etc/containers"
-		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
-}
diff --git a/app-containers/skopeo/skopeo-1.19.0.ebuild b/app-containers/skopeo/skopeo-1.19.0.ebuild
deleted file mode 100644
index bd98d6c352d6..000000000000
--- a/app-containers/skopeo/skopeo-1.19.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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 rootless"
-RESTRICT="test"
-
-DEPEND="
-	>=app-crypt/gpgme-1.5.5:=
-	btrfs? ( >=sys-fs/btrfs-progs-4.0.1 )
-	rootless? ( sys-apps/shadow:= )
-"
-RDEPEND="${DEPEND}
-	app-containers/containers-common
-"
-BDEPEND="dev-go/go-md2man"
-
-pkg_setup() {
-	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
-	linux-info_pkg_setup
-}
-
-run_make() {
-	local emakeflags=(
-		BTRFS_BUILD_TAG="$(usex btrfs '' 'exclude_graphdriver_btrfs')"
-		CONTAINERSCONFDIR="${EPREFIX}/etc/containers"
-		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
-}
diff --git a/app-containers/skopeo/skopeo-1.21.0.ebuild b/app-containers/skopeo/skopeo-1.21.0.ebuild
deleted file mode 100644
index 462168600f12..000000000000
--- a/app-containers/skopeo/skopeo-1.21.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2023-2026 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 rootless"
-RESTRICT="test"
-
-DEPEND="
-	>=app-crypt/gpgme-1.5.5:=
-	dev-db/sqlite:3
-	btrfs? ( >=sys-fs/btrfs-progs-4.0.1 )
-	rootless? ( sys-apps/shadow:= )
-"
-RDEPEND="${DEPEND}
-	app-containers/containers-common
-"
-BDEPEND="dev-go/go-md2man"
-
-pkg_setup() {
-	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
-	linux-info_pkg_setup
-}
-
-run_make() {
-	local emakeflags=(
-		BTRFS_BUILD_TAG="$(usex btrfs '' 'exclude_graphdriver_btrfs')"
-		CONTAINERSCONFDIR="${EPREFIX}/etc/containers"
-		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
-}
diff --git a/app-containers/skopeo/skopeo-1.22.2.ebuild b/app-containers/skopeo/skopeo-1.22.2.ebuild
index 1f4415f9e052..819e0612b062 100644
--- a/app-containers/skopeo/skopeo-1.22.2.ebuild
+++ b/app-containers/skopeo/skopeo-1.22.2.ebuild
@@ -6,14 +6,14 @@ EAPI=8
 inherit go-module linux-info
 
 DESCRIPTION="Work with remote container images registries"
-HOMEPAGE="https://github.com/containers/skopeo"
+HOMEPAGE="https://github.com/podman-container-tools/skopeo"
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/skopeo.git"
+	EGIT_REPO_URI="https://github.com/podman-container-tools/skopeo.git"
 else
-	SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
+	SRC_URI="https://github.com/podman-container-tools/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 arm64"
 fi
 
 # main
diff --git a/app-containers/skopeo/skopeo-1.22.0.ebuild b/app-containers/skopeo/skopeo-1.23.0.ebuild
index 1f4415f9e052..d2055f903e55 100644
--- a/app-containers/skopeo/skopeo-1.22.0.ebuild
+++ b/app-containers/skopeo/skopeo-1.23.0.ebuild
@@ -6,13 +6,13 @@ EAPI=8
 inherit go-module linux-info
 
 DESCRIPTION="Work with remote container images registries"
-HOMEPAGE="https://github.com/containers/skopeo"
+HOMEPAGE="https://github.com/podman-container-tools/skopeo"
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/skopeo.git"
+	EGIT_REPO_URI="https://github.com/podman-container-tools/skopeo.git"
 else
-	SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/podman-container-tools/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64"
 fi
 
@@ -31,7 +31,10 @@ DEPEND="
 RDEPEND="${DEPEND}
 	app-containers/containers-common
 "
-BDEPEND="dev-go/go-md2man"
+BDEPEND="
+	dev-go/go-md2man
+	>=dev-lang/go-1.25.6
+"
 
 pkg_setup() {
 	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
diff --git a/app-containers/skopeo/skopeo-9999.ebuild b/app-containers/skopeo/skopeo-9999.ebuild
index 94322380c7c4..d700e3801409 100644
--- a/app-containers/skopeo/skopeo-9999.ebuild
+++ b/app-containers/skopeo/skopeo-9999.ebuild
@@ -1,17 +1,18 @@
-# Copyright 2023-2025 Gentoo Authors
+# Copyright 2023-2026 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"
+HOMEPAGE="https://github.com/podman-container-tools/skopeo"
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/skopeo.git"
+	EGIT_REPO_URI="https://github.com/podman-container-tools/skopeo.git"
 else
-	SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/podman-container-tools/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64"
 fi
 
diff --git a/app-containers/umoci/Manifest b/app-containers/umoci/Manifest
index 40a41e8ab4a3..93ff56a5732f 100644
--- a/app-containers/umoci/Manifest
+++ b/app-containers/umoci/Manifest
@@ -1 +1,2 @@
 DIST umoci-0.4.7.tar.gz 2515579 BLAKE2B 595fdaf8b3e8c330a2966bdb70a4915964fa6b8823572b0bc7dfc797fce47771732cdf24514f3458833a048c155155920306838eab8654a547553897458d5013 SHA512 bb76c6c74766bc6558fa414b66a626194c60a9dee49aee050ad459590675bd79032b8e8c390439c0aa74c09abc921a6789fac57fc996ef958a376bc1c675d9fc
+DIST umoci-0.6.0.tar.gz 3235280 BLAKE2B 714563be2c16f64c899b95af0a7070d0cd74b9165dc9254e43aec619a340f219f11fefa5af99649a748a7fb961e1763d0e5787a3548ae3d9978cf4ef02cf992b SHA512 ed5b06627885b540641c03e01567cf2af8db563e554f8ca47bc0cb0579034c2b767f7b5ba9aacb59b59a524a6e7ee70590b54442994cd6f3a599632bba1b6822
diff --git a/app-containers/umoci/umoci-0.6.0.ebuild b/app-containers/umoci/umoci-0.6.0.ebuild
new file mode 100644
index 000000000000..d7e192251659
--- /dev/null
+++ b/app-containers/umoci/umoci-0.6.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo go-module
+
+GOPROJECT=github.com/opencontainers/umoci
+COMMIT=1c44d6f2f9e4b50f5d2a99463f540acf9915dd47
+
+DESCRIPTION="Manipulation tool for OCI images"
+HOMEPAGE="https://github.com/opencontainers/umoci"
+SRC_URI="https://github.com/opencontainers/umoci/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test"
+
+BDEPEND="dev-go/go-md2man"
+
+src_compile() {
+	ego build -buildmode=pie -mod=vendor \
+		-ldflags "-w -X ${GOPROJECT}.gitCommit=${COMMIT}" \
+		-o "bin/${PN}" ./cmd/${PN}
+
+	cd doc/man || die
+	for f in *.1.md; do
+		edo go-md2man -in ${f} -out ${f%%.md}
+	done
+}
+
+src_install() {
+	dobin bin/${PN}
+	doman doc/man/*.1
+	local DOCS=( CHANGELOG.md README.md )
+	einstalldocs
+}