gentoo auto-resync : 14:06:2024 - 00:09:04

32 files changed, 549 insertions, 291 deletions

diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 58a7c7740dd7..9f26913f28fc 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/aardvark-dns/Manifest b/app-containers/aardvark-dns/Manifest
index 4b669ff90a1e..d0cf7ef3683f 100644
--- a/app-containers/aardvark-dns/Manifest
+++ b/app-containers/aardvark-dns/Manifest
@@ -1,8 +1,11 @@
 DIST aardvark-dns-1.10.0.crate 51028 BLAKE2B 81cdc4eb7eaff7359a1a12657b2bc42603383cf0f80a3a599ce9ce277e15ad83e9d5b36c3de3bef15b3201a1e60d86286ad61469d1d58ba2252b4c0174506ea2 SHA512 3d67f1b3c66aeaf4878c09e5e8fc34717cea6c348e0295bc0521c0c4144433656a3306731c24bb362a0e340e652b036b7544e544cca99b61590547bd7a6ce629
+DIST aardvark-dns-1.11.0.crate 8977859 BLAKE2B d37c2015d1a46308bea214682133d6364fb50c75e840b664c692c6f344d21a093acab5a93dbf1c7dd624a0adc7cdd38cedc35be8dfde0904a7a773b4f620e002 SHA512 0fb9f9cb20e6c548483778a1109ec315c6135dc1afa3736980754847b06a2e988f5704de7b52b2784b20297d370d47d034137d3899f519d2bb5818a5a68234d8
 DIST aardvark-dns-1.9.0.crate 50846 BLAKE2B bae46eae2ec2071b1a1a301f00dc3e3aac0b3a5f1247f1f5be4f2e4b1d9d906fc22c53e5d56967731fcf226a295e8b1d8868dcfae228b05674a5ddecb58a1455 SHA512 1f21b4c40567c0aff967d38ea224884d5c2cb4a85ddffe7bbc5badd237a1195943e4d76f3c65ceb0cab984aa0c2528d8486e78e1e53c5376792477a6a5f426e7
 DIST aardvark-dns-v1.10.0-vendor.tar.gz 6283889 BLAKE2B cb69144eabf876e418667782171273541bbc416b456193780b4d7f1d22ad03e18f06ec0d6b1e51e21eab912317bd61dd73266d717fa97a81b4314a3c7d14776a SHA512 68d0106b71f42ba789810020d62911d880debf90a35a086aabfd614403985025dc0c5934087a98943b53f6dfd8ede4add99465cec1ae9a098ff1de1082e1ef9c
+DIST aardvark-dns-v1.11.0-vendor.tar.gz 6829221 BLAKE2B 42f7df29c407dd91e8e9ea1b43fc368b6795ea17169091d3900e59aea12be16174241c996b016e2f5de3e7a592ac3a1fa1c6b817f16ba282ebdda1ab65bfe61a SHA512 e49a6bb410238b90287a75adee481b8fe899ff680be48831c9b3cf36f9985d1fec1ba5bb858a095ffd520c05888651163d65f8b038e7512e975cfa522c0bee56
 DIST aardvark-dns-v1.9.0-vendor.tar.gz 8085548 BLAKE2B 487f69a9c34832d74783b66c565a7c2f67f101527e8a44c215f167e4ea80f069846b25decbb423972cd42cd9ee7717efc21c3d1b0885a7d87c0fbdb9cfb9d26f SHA512 f7174f1c4275991a6a2655046697f32511586f53fb343efa25f995cc07663091a634e8a82395840b022b6b3c8363863cdf8c9b6d4e38984fb841978eef0b1f22
 EBUILD aardvark-dns-1.10.0.ebuild 1112 BLAKE2B e3451c2ba5fcb1a3ca7d7607dd093e1f33cd4453d69b26ca08fbead10e1340277a27393f342b36b0b8f2e8e66a062c9b77b4f4211ce2bd1b990bf9c56473070e SHA512 7285cf3bc416de20396632d97979a2cce6136c2c885a288f3048ba033d59e84ac3b942ff9f7e73d18a3f21c54787631bdc5e42df63e3de2bd981ba354a803345
+EBUILD aardvark-dns-1.11.0.ebuild 1114 BLAKE2B 170688c618a1c4b4968435eebf70e35fa775018400be9ec87ff79db8f0d38eceb0277e83048d8eaea5bdde4a4c8335cb09e397114a09782d201f3d5c945a8847 SHA512 37e8bcaafa1f94b8842f03509819abdfa886580cda9f3dbad479d1a67de920393b7722414eb12f2c942605e1693d141257b7f3b9c289826f163ad55471a22d15
 EBUILD aardvark-dns-1.9.0.ebuild 1112 BLAKE2B e3451c2ba5fcb1a3ca7d7607dd093e1f33cd4453d69b26ca08fbead10e1340277a27393f342b36b0b8f2e8e66a062c9b77b4f4211ce2bd1b990bf9c56473070e SHA512 7285cf3bc416de20396632d97979a2cce6136c2c885a288f3048ba033d59e84ac3b942ff9f7e73d18a3f21c54787631bdc5e42df63e3de2bd981ba354a803345
 EBUILD aardvark-dns-9999.ebuild 1114 BLAKE2B 170688c618a1c4b4968435eebf70e35fa775018400be9ec87ff79db8f0d38eceb0277e83048d8eaea5bdde4a4c8335cb09e397114a09782d201f3d5c945a8847 SHA512 37e8bcaafa1f94b8842f03509819abdfa886580cda9f3dbad479d1a67de920393b7722414eb12f2c942605e1693d141257b7f3b9c289826f163ad55471a22d15
 MISC metadata.xml 915 BLAKE2B 7ae712b0f52e804cb23911533c31bd5520bd76e1371e07625f7054fcb4ad8fd432476556ade943d9f8700d91ad7f081fed9856c553c9db97125d0c7d20ac8d5d SHA512 b9b1b3ac577f60c233559abf0286e4c5ca7d25e825faf74aa962867189c3dd2fbb968b791dae0fb565786446ad8495973e5ffa1f36a5193d349dd44846395fac
diff --git a/app-containers/aardvark-dns/aardvark-dns-1.11.0.ebuild b/app-containers/aardvark-dns/aardvark-dns-1.11.0.ebuild
new file mode 100644
index 000000000000..cdf0cb032c10
--- /dev/null
+++ b/app-containers/aardvark-dns/aardvark-dns-1.11.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+[[ ${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 ~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 target/$(usex debug debug release)|g;" Makefile || die
+}
+
+src_install() {
+	export PREFIX="${EPREFIX}"/usr
+	default
+}
diff --git a/app-containers/apptainer/Manifest b/app-containers/apptainer/Manifest
index 97740a608dcb..52b504b69afa 100644
--- a/app-containers/apptainer/Manifest
+++ b/app-containers/apptainer/Manifest
@@ -1,6 +1,4 @@
 AUX apptainer-1.0.2-trim_upstream_cflags.patch 1142 BLAKE2B 7238229b70a8ac37f3401a163d19dc705adb6a4ab6355e4eaa386ad5c639bfc1443cf61507112a53b66816399ca5fe2c32de964dd602ea16c5dfbf9003343f8c SHA512 1351ee000274567bb5a63aa740fbc43510d84ccad42c9af0c555943b99d93d86a2b036801c1681b93548a874bda1bab3304c2bf0da83bbca102a71e82574a032
-DIST apptainer-1.3.0.tar.gz 17103544 BLAKE2B ed42b763a20b2b71cce6081b903697dc506073f91f9d928d49801165289d15c1416044af8fcedddcbd2a260c17a2e6488ed3d06b1edb4fb5f5ca5e9d14a14312 SHA512 a72afcac8e783f43732517314a94ffe039ab8f29027bcc398295fed97b123e6777039c016b6655a3cefbcba7e69832f62f3418b11e1bbd0452edc702ecaef69e
 DIST apptainer-1.3.2.tar.gz 17129103 BLAKE2B a2c15d408dc956a4bc8cb154dadfe0e60aa8b4216277ff4afd508058f9425722fb66200e7d4ab33cf5a73aee34761ac198e7b31439ab69dfaceebb9f768b58e6 SHA512 c3112c8254c995f83e3ae424ecf734e8ca9583c34cd8b0e56fdde2a7ef8d5145ac68a7a2c9575b071515a2cb681d11423fe57a5a3910750d3bc697c85c15585d
-EBUILD apptainer-1.3.0.ebuild 2462 BLAKE2B 497f8306a9cf565584cf8b0aeca3b4dd39a3bacb78b1373257aca172bebf9ce25bd58273970687ad2ef8f5e52886cae5e35191767ca95f064c3f92325d2a4346 SHA512 cfb415e29601c5b0a2c86f67bb5cf4b89cbc5ca933707d606c09f227014a7a925f0a2482be4e06ef1701a35c94a5df015bda2850d4fbf1ae2c96450fbb91ab6a
-EBUILD apptainer-1.3.2.ebuild 2463 BLAKE2B 0ac11be5ab4bbf1fe0cf770c416e8f79efd95c5b998aa8a1457d27f5a38310b29298538c120a20f51f47f56732beb3c8884ac3012c75cf602891dd7c97ff1640 SHA512 f8ca6ec4ee64adb10398874120946a25852130b8ed27d415668990fe3144655c619e041ce2a7a59026580fa9f5842e34b9e1089f24f1b915557cb5533c8041ad
+EBUILD apptainer-1.3.2.ebuild 2462 BLAKE2B 97c52f554cc1d29249ccb1de44e26c62998441f1d37079caa702aa8cdacb39b740aac2626bb3acb0b04e5e58c50b45d0e4057001a86938200429882c7563e6df SHA512 760eff4dcee6a67202e2657f1e0126bb6c34bf724a4cc10497ef8f6331435c7bf19035e7fe30cdb500eb591149924b7e89a9f5b90c25204833102d072c1240d7
 MISC metadata.xml 454 BLAKE2B 7891b6acae30424b8b6877166b856c1113a13e40ebec9051935df10a0650bf941f52d75bdb6a4258795e07b080082979469b8b8242d2ddd56c52f9c5b6759f0e SHA512 ef53c2dee45734f36403ab71549494f3c24707bc183353e4bd9c548a97b3ab5d7877f4fc9d311d9e86ab249cbdb379f0a1a211ee36afda99fd552f0a5cac30bb
diff --git a/app-containers/apptainer/apptainer-1.3.0.ebuild b/app-containers/apptainer/apptainer-1.3.0.ebuild
deleted file mode 100644
index 5f69289300ad..000000000000
--- a/app-containers/apptainer/apptainer-1.3.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info toolchain-funcs
-
-DESCRIPTION="The container system for secure high-performance computing"
-HOMEPAGE="https://apptainer.org/"
-SRC_URI="https://github.com/apptainer/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples +network suid systemd"
-
-# Do not complain about CFLAGS etc. since go projects do not use them.
-QA_FLAGS_IGNORED='.*'
-
-DEPEND="app-crypt/gpgme
-	>=dev-lang/go-1.20.0
-	dev-libs/openssl
-	sys-apps/util-linux
-	sys-fs/cryptsetup
-	sys-fs/squashfs-tools
-	sys-libs/libseccomp
-	!suid? (
-		sys-fs/e2fsprogs[fuse]
-		sys-fs/squashfuse
-	)"
-RDEPEND="${DEPEND}
-	!sys-cluster/singularity"
-BDEPEND="virtual/pkgconfig"
-
-CONFIG_CHECK="~SQUASHFS"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.2-trim_upstream_cflags.patch
-)
-
-DOCS=( README.md CONTRIBUTORS.md CONTRIBUTING.md )
-
-src_configure() {
-	local myconfargs=(
-		-c "$(tc-getBUILD_CC)" \
-		-x "$(tc-getBUILD_CXX)" \
-		-C "$(tc-getCC)" \
-		-X "$(tc-getCXX)" \
-		--prefix="${EPREFIX}"/usr \
-		--sysconfdir="${EPREFIX}"/etc \
-		--runstatedir="${EPREFIX}"/run \
-		--localstatedir="${EPREFIX}"/var \
-		$(usex network "" "--without-network") \
-		$(use_with suid)
-	)
-	./mconfig -v ${myconfargs[@]} || die "Error invoking mconfig"
-}
-
-src_compile() {
-	emake -C builddir
-}
-
-src_install() {
-	emake DESTDIR="${D}" -C builddir install
-	keepdir /var/${PN}/mnt/session
-
-	if use systemd; then
-		sed -i -e '/systemd cgroups/ s/no/yes/' "${ED}"/etc/${PN}/${PN}.conf \
-			|| die "Failed to enable systemd use in configuration"
-	else
-		sed -i -e '/systemd cgroups/ s/yes/no/' "${ED}"/etc/${PN}/${PN}.conf \
-			|| die "Failed to disable systemd use in configuration"
-	fi
-
-	einstalldocs
-	if use examples; then
-		dodoc -r examples
-	fi
-}
-
-pkg_postinst() {
-	if ! use suid; then
-		local oldver
-		for oldver in ${REPLACING_VERSIONS}; do
-			if ver_test "${oldver}" -lt 1.1.0; then
-				ewarn "Since version 1.1.0 ${PN} no longer installs setuid-root components by default, relying on unprivileged user namespaces instead. For details, see https://apptainer.org/docs/admin/main/user_namespace.html"
-				ewarn "Make sure user namespaces (possibly except network ones for improved security) are enabled on your system, or re-enable installation of setuid root components by passing USE=suid to ${CATEGORY}/${PN}"
-				break
-			fi
-		done
-	fi
-}
diff --git a/app-containers/apptainer/apptainer-1.3.2.ebuild b/app-containers/apptainer/apptainer-1.3.2.ebuild
index 144ecd780c6e..25fe8dfed8df 100644
--- a/app-containers/apptainer/apptainer-1.3.2.ebuild
+++ b/app-containers/apptainer/apptainer-1.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/apptainer/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples +network suid systemd"
 
 # Do not complain about CFLAGS etc. since go projects do not use them.
diff --git a/app-containers/buildah/Manifest b/app-containers/buildah/Manifest
index a6c30c898f76..bb0407591e71 100644
--- a/app-containers/buildah/Manifest
+++ b/app-containers/buildah/Manifest
@@ -4,9 +4,11 @@ DIST buildah-1.33.7.tar.gz 18604354 BLAKE2B d2788096d8d6fd6cc528e8f33edc577778a2
 DIST buildah-1.34.3.tar.gz 18856476 BLAKE2B c91c995a2ff4be8b4e84a70c581a817cb2f1333b08ca297163d218f80d538905c41718cfc267c03173330234c3476344be44df799eaaac891395a22bc7a020b3 SHA512 26d5c48cb5b056a274c1a9c6820a6076337f625fc6dd6683000db871f3de9d37907bd962ced3400334bfc230718219cda2108e2e984be5f8c76ecfa4a2f1e1ac
 DIST buildah-1.35.3.tar.gz 19372597 BLAKE2B 014bea80b3a8c4482bbe098a0c5293892cf9f4f0d4d74ecaba8f155e49fab326689b95b690b413d64f6b576c7269bdb9d0f446244b832afe311e909b3f96856d SHA512 ca325ce1a878eb9e9a6caedf236add16702d8dcd83f15a1995b8215998821218104ea8cb7a5d11fc354ee01d9805c339578975d35db859f1d53b08e0a2139fe3
 DIST buildah-1.35.4.tar.gz 19370823 BLAKE2B 6dc8ad2a21c3ce41d4b8a2908d90bcbb32f5598c11fcde49a706334407370998731fedac7d8ee8e080a6a168c10b4a0404bf1120cab8b561e916a9df2bd2d115 SHA512 679f2328f675a39f9965128d51a6e8a3f82d64a6d3c3cdcb862cfcb7691eba272d869b6718147da1590aa573534081329ef05e879875024a11aa9ad52b2f292f
+DIST buildah-1.36.0.tar.gz 19328201 BLAKE2B d3602b62a587d75904741b086bea6d789ac30fb6079b574214368552269e48310921340f42050c5c648173452fab7b478690fbfbd80bbebda4a5ec9a102aa4e6 SHA512 feb55b0dfb3cba4e9c6776b0f4730ebb4b9ea416f507e342f3b1cbf23b2bb79d96a58622faac7a980727e6739df7e0ceddf1a9d5ae483a3c7e781f7af75d115f
 EBUILD buildah-1.33.7.ebuild 3994 BLAKE2B 7c60e479bdc171ee817d8d703e05aa2c422911a2e623d4eeabcd4226bc1d7dfdd619ab6fa98323f98c964e36d8e0f567dc4a82ed7609b1c764b56b6d7038cbce SHA512 506340b81a1338870fd1b6c83f5048cfe5ddaa72bd9a320823e5e5a5fed0edc5933a8d66afe00b83a4bec0c09fe01386815d5bc0ae32ff325f3280bb2dd7aef2
 EBUILD buildah-1.34.3.ebuild 4061 BLAKE2B 225b32e4528504ce67423827af079494f43a4101967bd2751b37fba3eafde7c35a81ce60f41949713c57fcaa971e5605542b8682bbf66e42a039ec7586f3d0b1 SHA512 c18b4ba32a6a0114662d4157bfd78cb14c0a7b084fd879f15f77b1a315e4a0ecb6cd3fd64c3e07881cd983b0e76c9b6106ccfd22f6e5e552286586bf86008afb
 EBUILD buildah-1.35.3.ebuild 3184 BLAKE2B c4921b642a814ab645fce1c7e36bccfcc0714564f6e915582b9ccf061a366103f5f962f8cbd05c4e644f2445400266b1ff74ac1b26286fefe7057348c30c3579 SHA512 defa4e45ba7c327732ce5422803a056e93b3ec2a69631596d1c41eee4606e23bd9d115492b5dec398f00bca6c27dde7a1c06c08087b3ac7eb2aec27c997982d0
 EBUILD buildah-1.35.4.ebuild 3184 BLAKE2B c4921b642a814ab645fce1c7e36bccfcc0714564f6e915582b9ccf061a366103f5f962f8cbd05c4e644f2445400266b1ff74ac1b26286fefe7057348c30c3579 SHA512 defa4e45ba7c327732ce5422803a056e93b3ec2a69631596d1c41eee4606e23bd9d115492b5dec398f00bca6c27dde7a1c06c08087b3ac7eb2aec27c997982d0
-EBUILD buildah-9999.ebuild 3124 BLAKE2B 329e87ab012af334b5c59edd87dc9be3de2d99d732112ccad276e3250fc8f03046bbc0088d5de0f4cfc958a398582410ce1a23cc69d8242f9eef82edbe82e00d SHA512 685ed84503d4d745d73fe549b271735762dc9bebfa8f1bd5fe5d87ddd26b9a5487900aa1ec77e09f7b95d0da23040861fb1eecd5367547eaff20b7ba5534f858
+EBUILD buildah-1.36.0.ebuild 3058 BLAKE2B bc6cceb1ec7b1050271785dd1b09ee63985f64e20f0ca1866d40deb87da329df38bf345a9527d0bc7f7a91e6573cd87c712f06ea5d52b90b770dc01ff4a0980e SHA512 eb2a82a6989dca76a5b606997e6125a3f3c80bfef21df281df69029912eb3c6236a06cab738b49efe2f1edb5fa7baa910379ee9342581768cc3993b576d68fd1
+EBUILD buildah-9999.ebuild 3058 BLAKE2B bc6cceb1ec7b1050271785dd1b09ee63985f64e20f0ca1866d40deb87da329df38bf345a9527d0bc7f7a91e6573cd87c712f06ea5d52b90b770dc01ff4a0980e SHA512 eb2a82a6989dca76a5b606997e6125a3f3c80bfef21df281df69029912eb3c6236a06cab738b49efe2f1edb5fa7baa910379ee9342581768cc3993b576d68fd1
 MISC metadata.xml 716 BLAKE2B 8d1868e48306b5ded8700bcfde93d2a0d1a4afedc5440781355f0645b5f71e5a80569be4b14ab459033c5ec7cf5f02eb49e3948154274ad09b088e09d8ac5069 SHA512 b8a7e951a5342ad1a32f650ab21d373c3afa86d482463d87dad5db0e6e715e3d4bde7642b75f68da7f5b4a7e935953ce2ac41affb66724e7882f75f97dfde023
diff --git a/app-containers/buildah/buildah-1.36.0.ebuild b/app-containers/buildah/buildah-1.36.0.ebuild
new file mode 100644
index 000000000000..1d1b2acc5e46
--- /dev/null
+++ b/app-containers/buildah/buildah-1.36.0.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2024 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"
+DOCS=(
+	"CHANGELOG.md"
+	"troubleshooting.md"
+	"docs/tutorials"
+)
+
+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="
+	systemd? ( sys-apps/systemd )
+	btrfs? ( sys-fs/btrfs-progs )
+	seccomp? ( sys-libs/libseccomp:= )
+	apparmor? ( sys-libs/libapparmor:= )
+	>=app-containers/containers-common-0.58.0-r1
+	app-crypt/gpgme:=
+	dev-libs/libgpg-error:=
+	dev-libs/libassuan:=
+	sys-apps/shadow:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-go/go-md2man"
+
+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 btrfs_installed_tag.sh btrfs_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 || {
+		cat <<-'EOF' > "${T}/disable_seccomp.patch"
+		 --- a/Makefile
+		 +++ b/Makefile
+		 @@ -5 +5 @@
+		 -SECURITYTAGS ?= seccomp $(APPARMORTAG)
+		 +SECURITYTAGS ?= $(APPARMORTAG)
+		EOF
+		eapply "${T}/disable_seccomp.patch" || die
+	}
+
+	cat <<-EOF > hack/systemd_tag.sh || die
+	#!/usr/bin/env bash
+	$(usex systemd 'echo systemd' echo)
+	EOF
+
+	echo -e "#!/usr/bin/env bash\n echo" > btrfs_installed_tag.sh || die
+	cat <<-EOF > btrfs_tag.sh || die
+	#!/usr/bin/env bash
+	$(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
+	EOF
+
+	use test || {
+		cat <<-'EOF' > "${T}/disable_tests.patch"
+		--- a/Makefile
+		+++ b/Makefile
+		@@ -54 +54 @@
+		-all: bin/buildah bin/imgtype bin/copy bin/tutorial docs
+		+all: bin/buildah docs
+		@@ -123 +123 @@
+		-docs: install.tools ## build the docs on the host
+		+docs: ## build the docs on the host
+		EOF
+		eapply "${T}/disable_tests.patch" || die
+	}
+
+}
+
+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)"
+	default
+}
+
+src_test() {
+	emake test-unit
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install install.completions
+	einstalldocs
+}
diff --git a/app-containers/buildah/buildah-9999.ebuild b/app-containers/buildah/buildah-9999.ebuild
index 987715de5560..1d1b2acc5e46 100644
--- a/app-containers/buildah/buildah-9999.ebuild
+++ b/app-containers/buildah/buildah-9999.ebuild
@@ -44,10 +44,6 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="dev-go/go-md2man"
 
-PATCHES=(
-	"${FILESDIR}"/softcode-strip-upstream-pr-5446.patch
-)
-
 pkg_pretend() {
 	local CONFIG_CHECK=""
 	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
diff --git a/app-containers/containerd/Manifest b/app-containers/containerd/Manifest
index 53bbc1e57b61..ce6de036c0f4 100644
--- a/app-containers/containerd/Manifest
+++ b/app-containers/containerd/Manifest
@@ -10,7 +10,7 @@ DIST containerd-1.7.8.tar.gz 9939250 BLAKE2B cddfea0617e92dc56f118e63a3e7af0103c
 EBUILD containerd-1.7.1-r1.ebuild 1975 BLAKE2B 46d84564110988f1c9a6a76101fbc439237d303dc9bd63c240250b666abbbbad92416cac822c0bf6882fe2ab6f2aac4cdea9a42b0eba67b472a88c24a88c2fe4 SHA512 ba2b77f93c115a57286eecefa4b826c925ccb06ebcd8283b13981548cfd82a2f0b0e9febf147d04eb4f47711cc5ea95ca8017cdf7f4ddfb32b502b8ade0f547d
 EBUILD containerd-1.7.13.ebuild 1979 BLAKE2B 13d405afb76c805c9cd2e3fc1efc25802d7ec9cec4fe5e4e79d39a927efe1c80d028220374ff9c350f19ab35540a130e6ec50104510cf66532c5d3d77ec60495 SHA512 9aabee17f13bb31922992605dc38381a5cae5706247e2aea67435330a59bad9986b96739d557d218cfc0c5d5c045c752ce0f1647f2384ed3c569c11553a0a51f
 EBUILD containerd-1.7.14.ebuild 1979 BLAKE2B 79e57f56dc71eb987c0faa0d1d6700ac3b49aec91bea91ee956c096e6e976d782afa8dd466f7ba995fe6b0fd05fe00e0abcd03effe095304ff7402eb7637a4cc SHA512 df481e7051df8a00591dd33f4e925140577e5be9bddcac9b5762e5a0c686a6277450fa7dcd5657fb420efe37ce480d11f2c45c2885477d48f36829081d56bc90
-EBUILD containerd-1.7.15.ebuild 1979 BLAKE2B f280695a379b2f580b46b69a8d39d6fa835db779ea11f4141c667bb246eec77b02fc1cfbc6af28a2a611ee341a72a466e7e1bcbdce1ff2e39b5664b18937cf6f SHA512 6a1950c36e15b79cbf9d1c47aec0fa3a806689e3b0ec96dcc3a988d24f243c5c97419b0535e6eb1a38612de8c02d8d8eaed6691604b7dbb43dd38511ccec2de5
+EBUILD containerd-1.7.15.ebuild 1976 BLAKE2B 038a302335d730a6b0c8b6caeb0672beabd7ef48d2a24ec3a317be6d15b41e00551cd95594d575b68fcec6f28757980f91ffbe41cb975bc220168e4963cacf48 SHA512 1fde07b64582f154e76728dd307b4fff449c368ab50c92f68750540ed4805aa383edf400aed1ea8fdc2e52f9a10b61efeddad9ed8f2412b205dfc443c53e771d
 EBUILD containerd-1.7.2.ebuild 1978 BLAKE2B d5c26371468150ed09683ea01250b87802e9862cbb5d15556a16488841ff1f98f9f2aaed054bec160a88e3e00291065c13c9c35e1df5be35639910c44c0d376e SHA512 ec53beae6b6365911a164ffca5d9993b22f4c5a68aeaa886705a1be1aa5d965beef59a704f6c9de16e41442b63ba39e81ab52793c2d544c1b0bcc89a03b43213
 EBUILD containerd-1.7.6.ebuild 1978 BLAKE2B 6d6791e5bb448294a41128e331b19986366510c00276e71890b483fcdfab1852cc842b8eb02b09e7c441f1c9ca4e7a2316f6b72f85a473469835ef03813271c9 SHA512 adc345a3ee0d6e18268b0353318f5c8e006bea3ed5271d8e8fd2e56404dee057389f4cdbf3ed09f710aedf32447135b328702d337e4f1768b56ccdc7c52be47f
 EBUILD containerd-1.7.8.ebuild 1978 BLAKE2B 501601bdba0dbf3e3cf8a32477854a654da005d9ff43ad005a0529cfe8c44edaa5b0f5489006a89e02f8ffe3f40ec339fc29bd739e54f4f2443d3920f8ca4250 SHA512 a3f1b86137cecaeead08c401321d21b75a84c730f2ddf7a4b85a056eac78b620b4f9205c8e797199850ba95fe3e809f4a7cd6bfdf1d09f27cc9b3560d51abfc9
diff --git a/app-containers/containerd/containerd-1.7.15.ebuild b/app-containers/containerd/containerd-1.7.15.ebuild
index 8f8b2dbe442a..4d421941b684 100644
--- a/app-containers/containerd/containerd-1.7.15.ebuild
+++ b/app-containers/containerd/containerd-1.7.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
 IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
 
 DEPEND="
diff --git a/app-containers/containers-common/Manifest b/app-containers/containers-common/Manifest
index 473559285078..43839f44d2ac 100644
--- a/app-containers/containers-common/Manifest
+++ b/app-containers/containers-common/Manifest
@@ -2,12 +2,10 @@ AUX default.yaml 978 BLAKE2B ab316e77c296f0ea9e51788bd62cf3abbbc0fb5b3f630acfd8d
 AUX examplify-mounts-conf.patch 214 BLAKE2B 3e72e91ce65190acb437a1ec5e0cbbb27b46b8581a062729bd90792bea8ea3a9549c4cc4d445198eda05ef4673391aa8bff6616918fab427fb2c9973e81484e1 SHA512 2f1aaadca8644c6e7062ac7d79864297b3bcd34c4c84a6d2651ac24e159fae8773cc240d0916f27354e394ab701a4339c15d5dde6957d61f5b153677a5bebca1
 AUX policy.json 256 BLAKE2B 78693988b98b88c35807db755bea923203ab289435d2c4ffd914ec52904dadded467ff131d90b337bf7534d533e478420a0c81599858a9012668bc4d1815144f SHA512 120f43f579f48758af6b8292fc2cfbcb5ecc46564d2d16afb74dbd1c043de44daec6633ff585b0046c55fd48aed6dbc2901623c753ec13670d3fdcecb19a42c5
 DIST containers-common-0.57.0.tar.gz 12700958 BLAKE2B 8432a7d839b94b59eabd75d4978a4d0c1340a64ed626db74e74a8318e08c61172bfba5e4f4c4b0dfffec302c5a310bb5be8fad3ab4d91a6d89ced373a0a6f297 SHA512 b993821040788085ff44e48023a64cea4e3e7e50731c359087bd287168e6849a543d930acbdaff2437fc7951acc46f7183f337dd977215eca814332e6869d1e3
-DIST containers-common-0.57.3.tar.gz 12702863 BLAKE2B 7842893f9b8ca72fa0657ea716f61cad95c4a8bff680922a15cffad4cecf897683591272fee83494e800023a432458cc689a810726e60e4d5ff9dd6af2d71737 SHA512 f0b7c4632317e666342f7b31bd9e5e9cdc794125d4d358e6a62ba115099ee1e6b33751cff982dcadbb3055b093d05fbd1049402f79ca2e6465cc6fcabce7c928
 DIST containers-common-0.58.0.tar.gz 13164567 BLAKE2B 17795eec2d38b4d8b9d6afeb20e249208c5ae2ac767a365ef7313d1e7c36eadb9a9eb284a657dfe3f4fcb0577448d4883fabbad76e0318425fdc03809e27cd7c SHA512 6f569d68d3b0e5ead304c7f23341808d66a47b6352c772d353d50c5f4777cd8a5a5b85d6faaf2887f828c17ec49b9c5f929177a67294b5bbb69baa80656982a8
+DIST containers-common-0.59.1.tar.gz 13131960 BLAKE2B 5b3b947789f889955716816fa15a84eb2f398d6cfb59c85bd969442fb8f55715f2c17c78d963ae913d96e6a109f69da745cfc7db8d23e2ed6516f992b982dda0 SHA512 452c9b84f7631afdf39b7b1fcaf2f721bede312d8fb55b89a953f16ca3546c0df11bb23c99588a592b6375275516d1364570261fbc15301ca3ad486ee66eae32
 EBUILD containers-common-0.57.0-r1.ebuild 1469 BLAKE2B f83e531ffd457701110bac047423efc64de104efb3fe8343bd572f7742b2c340a2c11528ddadca19da6e98dcc4549ad458be3e76a587f46efede14b199c5af54 SHA512 4c7edd8ea8580e080ab96e8a833f37be236db8d7fb6370e0a8b205daac659947d27d549f0038ee7908cdbd8bcdc0e91f93ee7338d85a396d38b2e0dc1bfd1e53
-EBUILD containers-common-0.57.0.ebuild 1759 BLAKE2B d268eeed2c13c26772c0826293188dab0882686d5b71375c68170a0f64a81e7d62ef7a4a3554ce19e45b63a279f074dca767547ac201ef0d24e93ebd954988dc SHA512 a0e2125c3a5e26c930103f6e4d371194e4b6591d08207588b9cf39bab2a8156c3015c23f17923a8c0a02935e5771853ae56b0487fd68d91067d55305be1eb7e5
-EBUILD containers-common-0.57.3.ebuild 1428 BLAKE2B 483ea726e31c955ccb059aa58e05027033d2a3d682b40a31423472a15c2a35e1cdc231019dcdb184050fc09442bcb93a4bee4e9d45c9c69a1f36622eb68f68af SHA512 4bb587c92ffb790886ca468fe997357c50bf4c21066f276b48d134252809f2ac7efe8737700cae0a28c6f7e3ee83873b4a6064f5a398000587073a3065647624
 EBUILD containers-common-0.58.0-r1.ebuild 1831 BLAKE2B 5d4f98e52111ff64943128235fed05377c04d2a5e2b8d7610c23f1be32551e56327e7e78bbb8bca243beefa843b33cea4584fa6436738534be2065110ed04217 SHA512 a91a4d3d2e4375bf93a5a733c358b3da601b088933746b7bb683390d0da20a9218eb98c938944741c5357c887c19e9417b02a0660eebe57d12e38070151d6560
-EBUILD containers-common-0.58.0.ebuild 1402 BLAKE2B 71d0084a227b7cefc8bd5fc8398e8ee8a9ece59c40ed38c172283914b830cae3befb5b2d617d3ffb87635e3fd691ccb3fbf75c965f1a1674b30ee0793120f02b SHA512 07a07af974fbfe3d596b192f304520d50a2565ce559d8d6fc8a69469a77a776441a0fafe067751783eaeca8d905daabbc4df151264714f80e91d34ffb2827558
+EBUILD containers-common-0.59.1.ebuild 1831 BLAKE2B 5d4f98e52111ff64943128235fed05377c04d2a5e2b8d7610c23f1be32551e56327e7e78bbb8bca243beefa843b33cea4584fa6436738534be2065110ed04217 SHA512 a91a4d3d2e4375bf93a5a733c358b3da601b088933746b7bb683390d0da20a9218eb98c938944741c5357c887c19e9417b02a0660eebe57d12e38070151d6560
 EBUILD containers-common-9999.ebuild 1831 BLAKE2B 5d4f98e52111ff64943128235fed05377c04d2a5e2b8d7610c23f1be32551e56327e7e78bbb8bca243beefa843b33cea4584fa6436738534be2065110ed04217 SHA512 a91a4d3d2e4375bf93a5a733c358b3da601b088933746b7bb683390d0da20a9218eb98c938944741c5357c887c19e9417b02a0660eebe57d12e38070151d6560
 MISC metadata.xml 741 BLAKE2B 727dfc3215f6fb9155105aad6b83e4cff72d8f484e2abaf267a299c07777490abb657a6d0eb349587bae53ad614a6137bd6a205252c835d8141925698cdc2464 SHA512 d014e28716c2b2fd1926a5d7612437cf7553a62fcd26ede88dd180eeb8cfa52f0bfc0c61f539b05dcc7a7faf7c1f17a99e20cbf3743044c1aad1478fbfb11316
diff --git a/app-containers/containers-common/containers-common-0.57.0.ebuild b/app-containers/containers-common/containers-common-0.57.0.ebuild
deleted file mode 100644
index 2d56b46669f2..000000000000
--- a/app-containers/containers-common/containers-common-0.57.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Common config files and docs for Containers stack"
-HOMEPAGE="https://github.com/containers/common"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/common.git"
-else
-	SRC_URI="https://github.com/containers/common/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P#containers-}"
-	KEYWORDS="amd64 ~arm64 ~riscv"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-RESTRICT="test"
-RDEPEND="
-	<app-containers/containers-image-5.29.2
-	app-containers/containers-storage
-	app-containers/containers-shortnames
-	!<app-containers/podman-4.5.0-r1
-	net-firewall/nftables
-	net-firewall/iptables[nftables]
-	|| ( app-containers/crun app-containers/runc )
-	|| (
-		( >=app-containers/netavark-1.6.0 >=app-containers/aardvark-dns-1.6.0 )
-		>=app-containers/cni-plugins-0.9.1
-	)
-"
-
-BDEPEND="
-	>=dev-go/go-md2man-2.0.2
-"
-
-src_prepare() {
-	default
-
-	[[ -f docs/Makefile && -f Makefile ]] || die
-	sed -i -e 's|/usr/local|/usr|g;' docs/Makefile Makefile || die
-
-	# add comments to mounts.conf
-	eapply "${FILESDIR}/examplify-mounts-conf.patch"
-}
-
-src_compile() {
-	emake docs
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	insinto /etc/containers
-	# https://github.com/containers/skopeo/raw/main/default-policy.json
-	doins pkg/config/containers.conf "${FILESDIR}/policy.json"
-
-	insinto /etc/containers/registries.d
-	# https://github.com/containers/skopeo/raw/main/default.yaml
-	doins "${FILESDIR}/default.yaml"
-
-	insinto /usr/share/containers
-	doins pkg/seccomp/seccomp.json pkg/subscriptions/mounts.conf
-
-	keepdir /etc/containers/certs.d /etc/containers/oci/hooks.d /etc/containers/systemd /var/lib/containers/sigstore
-}
diff --git a/app-containers/containers-common/containers-common-0.57.3.ebuild b/app-containers/containers-common/containers-common-0.57.3.ebuild
deleted file mode 100644
index 5a0aa2f26d0b..000000000000
--- a/app-containers/containers-common/containers-common-0.57.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Common config files and docs for Containers stack"
-HOMEPAGE="https://github.com/containers/common"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/common.git"
-else
-	SRC_URI="https://github.com/containers/common/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P#containers-}"
-	KEYWORDS="~amd64 ~arm64 ~riscv"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-RESTRICT="test"
-RDEPEND="
-	app-containers/containers-image
-	app-containers/containers-storage
-	app-containers/containers-shortnames
-	net-firewall/nftables
-	net-firewall/iptables[nftables]
-	|| ( app-containers/crun app-containers/runc )
-	|| (
-		( >=app-containers/netavark-1.6.0 >=app-containers/aardvark-dns-1.6.0 )
-		>=app-containers/cni-plugins-0.9.1
-	)
-"
-
-BDEPEND="
-	>=dev-go/go-md2man-2.0.3
-"
-
-src_prepare() {
-	default
-
-	[[ -f docs/Makefile && -f Makefile ]] || die
-	sed -i -e 's|/usr/local|/usr|g;' docs/Makefile Makefile || die
-
-	# add comments to mounts.conf
-	eapply "${FILESDIR}/examplify-mounts-conf.patch"
-}
-
-src_compile() {
-	emake docs
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	insinto /usr/share/containers
-	doins pkg/seccomp/seccomp.json pkg/subscriptions/mounts.conf
-
-	keepdir /etc/containers/certs.d /etc/containers/oci/hooks.d /etc/containers/systemd /var/lib/containers/sigstore
-}
diff --git a/app-containers/containers-common/containers-common-0.58.0.ebuild b/app-containers/containers-common/containers-common-0.59.1.ebuild
index c4d53773f1d9..4a0427e20df7 100644
--- a/app-containers/containers-common/containers-common-0.58.0.ebuild
+++ b/app-containers/containers-common/containers-common-0.59.1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit readme.gentoo-r1
+
 DESCRIPTION="Common config files and docs for Containers stack"
 HOMEPAGE="https://github.com/containers/common"
 
@@ -19,16 +21,16 @@ LICENSE="Apache-2.0"
 SLOT="0"
 RESTRICT="test"
 RDEPEND="
-	app-containers/containers-image
-	app-containers/containers-storage
+	>=app-containers/aardvark-dns-1.10.0
+	>=app-containers/crun-1.14.3
+	>=app-containers/containers-image-5.30.0
+	>=app-containers/containers-storage-1.53.0
 	app-containers/containers-shortnames
+	>=app-containers/netavark-1.10.3
 	net-firewall/nftables
 	net-firewall/iptables[nftables]
-	|| ( app-containers/crun app-containers/runc )
-	|| (
-		( >=app-containers/netavark-1.6.0 >=app-containers/aardvark-dns-1.6.0 )
-		>=app-containers/cni-plugins-0.9.1
-	)
+	>=net-misc/passt-2024.03.20
+	>=sys-fs/fuse-overlayfs-1.13
 "
 
 BDEPEND="
@@ -39,6 +41,14 @@ PATCHES=(
 	"${FILESDIR}/examplify-mounts-conf.patch"
 )
 
+DOC_CONTENTS="\n
+For rootless operations, one needs to configure subuid(5) and subgid(5)\n
+See /etc/sub{uid,gid} to check whether rootless user is already configured\n
+If not, quickly configure it with:\n
+usermod --add-subuids 1065536-1131071 <rootless user>\n
+usermod --add-subgids 1065536-1131071 <rootless user>\n
+"
+
 src_prepare() {
 	default
 
@@ -52,9 +62,14 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${ED}" install
+	readme.gentoo_create_doc
 
 	insinto /usr/share/containers
 	doins pkg/seccomp/seccomp.json pkg/subscriptions/mounts.conf
 
 	keepdir /etc/containers/certs.d /etc/containers/oci/hooks.d /etc/containers/systemd /var/lib/containers/sigstore
 }
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-containers/containers-image/Manifest b/app-containers/containers-image/Manifest
index c35d92c16722..82d280f1f8ac 100644
--- a/app-containers/containers-image/Manifest
+++ b/app-containers/containers-image/Manifest
@@ -1,10 +1,8 @@
 AUX fix-warnings.patch 397 BLAKE2B a5922e061c825e25398fc3fccdf683abf8331b065337ff240227478d7d3ef5398957d56a430c0b04aa823033b56653e87c8186065e5898818e75310451b347e0 SHA512 a96ab3fea76be4751d6dc3893b4272b063c854503e1a65b4501819a5925f3911c285fbfb4ee6827795a41c696015cc06f446e4ddb1318e21cf0141e15804833e
 AUX moving-policy-json-default-yaml.patch 3285 BLAKE2B c0c9dd1380b6edec05162df127085ba74b7f426b00f7565bf4f14a2fe1809fe66fa13b19a84d84ae32dc3179ea0967aff8d8e24875ae706906f2427120fad801 SHA512 a3e8d2cbf3797e998636feaf963968b1e382ab1376b4d6a42bfa7187359e04d782aa043debd20f4ea2b1e4280d049029a71d8525a3fd2a87c780523eedcaf04f
 AUX prevent-downloading-mods-5.29.2.patch 322 BLAKE2B b3358abc9a9850a24153d188289068e3a8482a7b30e56b9440694ab78c04c37f10f5e3f31a24e82cbbe2f4c365d0df3dc5ccea1778df6dc9fe3dc12977169bf6 SHA512 1c78ae9dd35c7e8546984b32e149f29beaf955fe673264c0a3ea45b86046fa1628b5f74696f7224fcffbf54fc642d696848d0530beadf41be0084e4d77992a04
-DIST containers-image-5.29.0.tar.gz 706774 BLAKE2B 0af5c7c43e8b75df591cbd291d0865ac19322bf62ad98b4f36cfb51b006ced088f91f0b3f582ce29ae80582e72087467cfe589683216eeb50ad3762152853dc0 SHA512 5e670f85fe0b43769667f1a3e710434ab65c4ec2d8c60b0cad4b0ed41c35f84677528f9dfecb0b946de556ebbdd56f4949760432ec49b1b3c691120a323af869
 DIST containers-image-5.29.2.tar.gz 707618 BLAKE2B f1556cbb26ceedd74a338355caf8b557c43286726f4be63544cebc9a8f4b92be78d7a0cddbedaba7352d13e9fc399f62ee114caba6c8b1ecc334dab1379e523b SHA512 f3f6e09670dc393067992a78303f01e2584dabe79ba156973a50d7a460c011e5a27d0ccdf0ff6b399099a9a3a4c57f3badf24fb5d0704efd645ab7196a544d8f
 DIST containers-image-5.30.0.tar.gz 719070 BLAKE2B 5952ab703b6df793f326dd4fc82f50c5f672e2b9d142e0bc706014092420e3563599d9f1c1f65f743e1a8144b91f92b2326d7bf4c3024b5efb466d777a8ad613 SHA512 89cd0d482bb5d70037ff51413b7abca01d36bc7f39e9dc130c78462e501dae32193137a367d81532afd216a7432e127728147e6e839d5d99eeb6b6680f31d4dc
-EBUILD containers-image-5.29.0.ebuild 755 BLAKE2B c6db87c8e66eb57b0820b92c25bb38cf3e14a4c91ca08b703fb09e9fbbc2457f87f3e032001f4ca26a81f49daa056cfecffa986ad1ba229e0774b5a9db8d83d8 SHA512 c59433f5c71dfeca32280916dc8f4849882e78160cf7a8aa642c2356936c9ff3476542551e132e92c754ee317534c77f4c374e8d0abc5675b9335a7a3f799091
 EBUILD containers-image-5.29.2-r1.ebuild 941 BLAKE2B fc67e64e032fdeabffe229307966f71732fd8de208e2059c866da21f246a0f356122f40bc3b2cdee53dfb4bf5c4dcd054e8bb844cee7e01835239ad4aeaf4c40 SHA512 f912c9f49786be67573ade0cbd1c7676fa4e13d054d44c947b55b7dd4e7faa5a98f5813e261d029666bd7d302452c63ee84fd1e734e2cbbe67dcbf2b098eff38
 EBUILD containers-image-5.30.0.ebuild 869 BLAKE2B 358eff00bafd571014e83163f339e952c446aad0e9ca9247334a107d57b183b34042732976ec64fc3c067eef6b1e309c44577e0157f18b5861f9ca6c5ff96220 SHA512 984ec912160afe7503c88ff7a6090d9627e744e58fdea63bc4d430928bddf1c8dae98b97c00373e839e41db7315b328b8d2ee9f89957bb137e6ea216e6bb0b12
 EBUILD containers-image-9999.ebuild 871 BLAKE2B 2ec49f1a708ade5e736111751825dfe0cff5528e7e7fff6d0ccef4c33955954a873f4325e286042952cde46a67b4be050a75bfc3f1d12d40e7a2752225af3c6f SHA512 6d38bdb24fa90c37576c0bc949a85ad7a606b4144c356dc8448bcacd911c3db57082f3b6bb1e41fb479978fd50822ead8d48e975828bc1f9dfb235557201b5e7
diff --git a/app-containers/containers-image/containers-image-5.29.0.ebuild b/app-containers/containers-image/containers-image-5.29.0.ebuild
deleted file mode 100644
index eb50b44f8f73..000000000000
--- a/app-containers/containers-image/containers-image-5.29.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Default config and docs related to Containers' images"
-HOMEPAGE="https://github.com/containers/image"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/image.git"
-else
-	SRC_URI="https://github.com/containers/image/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P#containers-}"
-	KEYWORDS="amd64 ~arm64 ~riscv"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-BDEPEND=">=dev-go/go-md2man-2.0.2"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}/fix-warnings.patch"
-}
-
-src_compile() {
-	emake docs
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	insinto /etc/containers
-	doins registries.conf
-}
diff --git a/app-containers/docker-cli/Manifest b/app-containers/docker-cli/Manifest
index d34614f6186f..93b8501134d7 100644
--- a/app-containers/docker-cli/Manifest
+++ b/app-containers/docker-cli/Manifest
@@ -15,5 +15,5 @@ EBUILD docker-cli-24.0.6.ebuild 1919 BLAKE2B 8dc1817b481ab4d8e6a0238d4d0f99e78b2
 EBUILD docker-cli-24.0.7.ebuild 1919 BLAKE2B 6440d35df56e524ff25f9a79fdf7bfb8515049b01a3ad04f7082db5b3e44c4e230430ecc87040477a07c9bd692b08cb4dc706d04b40e618e30f57bf7fe570070 SHA512 21e3d5460fe942e1f5172746fb01a414e79c68e52b9e3b43f8396d43199e72e2dffe569b6d9fc26d7c3d23dbf54274f40ecb6d9f6cd2f8c27a3d236058b0d5b4
 EBUILD docker-cli-25.0.1.ebuild 1919 BLAKE2B 6adaa473aba7456aba95afabe3d59b346e0ba2c25784b3ffe529b17225776abcc8f3c424be2c5c88627814ee4c68cb4ffb25b0941271be3ad6c68d22c05c1d18 SHA512 e3bde16e2eae8a5a6d0acca62f255346e8935c3c5056c2613e873ca094d2bbd65d7442f852fb19bbf1904d79d2f6654853f6adf0aa4af11c83daead83f264121
 EBUILD docker-cli-25.0.4.ebuild 1919 BLAKE2B d100b2ce4b6193f4ca1ae057649f3d9953fceceebaf948c1cd63bf2c3a2bd002455f0551e697a01aaa104ce883bcdeb03ae7bdeeaff0f3aeb8f4460447bdfb57 SHA512 2de913249a4e2257487b80ba42a266058edf9b068e54fe373bac5ac9a84d5a12dc8a69aebc5b5f9bd5419466bcb7bf150c837f943b12f91905e29839c061517f
-EBUILD docker-cli-26.1.0.ebuild 1951 BLAKE2B 2337893c609428c71fe7b08942c811305ac6f39ecc9b2b819f9f6275dfc9aa283ce923a55e0733edc846b30b7fbc620362a97c7e6a0243ad89474829800bc769 SHA512 a97867d0b8785f972bfd0b14314cc450f694836e4cc8e71607ae1fec7d8b0021b20f0c6a53f73f62d0db98bcf808507993f4170e15b95888c497336b0daef7e6
+EBUILD docker-cli-26.1.0.ebuild 1948 BLAKE2B b5452c4bcfca4bc6f07d816319c1f24f883a86e8e9cd3bb38b5a4eeff5b6c2edaa2f07399d871707e8b891e099f5c6c275d3fff040032ce09f9d46e6edb88554 SHA512 053edc16298ad414c2327e5a1cc8f53963e6c48b93de130121fd673d09b19c6d658ca304d7b94606b9e184c10c9756415829eec0e86b1307acee1c8dd4d536e2
 MISC metadata.xml 398 BLAKE2B f9cd5360fa32f30edeeb2fe1df0ea50fd0b061bf882c66c65f18d15ba56995deac8c054419ddbf2d6436bf90f6fb729dda9560b3766b558d45498ae2c8de486c SHA512 4b2cf7c3b38df8382680539e1a8121f6f2f75cbe70f1f92c589fb40dd4c368f2f207cf3567ead5620714c323c0c196c318a4c5ab947d49092668dc2a3a8a6a53
diff --git a/app-containers/docker-cli/docker-cli-26.1.0.ebuild b/app-containers/docker-cli/docker-cli-26.1.0.ebuild
index 964ba9056825..ae27ce232a20 100644
--- a/app-containers/docker-cli/docker-cli-26.1.0.ebuild
+++ b/app-containers/docker-cli/docker-cli-26.1.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-man.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86"
 IUSE="hardened selinux"
 
 RDEPEND="!<app-containers/docker-20.10.1
diff --git a/app-containers/docker/Manifest b/app-containers/docker/Manifest
index 4a5a724bf472..d4dd7e765e5c 100644
--- a/app-containers/docker/Manifest
+++ b/app-containers/docker/Manifest
@@ -12,5 +12,5 @@ EBUILD docker-24.0.6.ebuild 7730 BLAKE2B b0b794e5b2286db6f0e150d9fb9dda78affc11e
 EBUILD docker-24.0.7-r1.ebuild 7859 BLAKE2B 051f48853e4e55c7c998280c550522598ddab232acb3896faacdf1d7bdec0a7d7e3dd2761c23bbcec9aeba49b260c5940bc40f17b3f067ea4a16b2ddcecce246 SHA512 406070d547ed53e59ca3bd6143ed0a579e3bc6c7b6b5484b286f754c26de9b542f5f4ecb12086e9d4a10c4e6d5078f398f2eb688af8614b6e64966cdce0503da
 EBUILD docker-25.0.1.ebuild 7400 BLAKE2B 27cc2cbcba89474dae5d73bb7085d75820bffd7d0bbab25906517b75a6150c4b33a1b411178a13c11b2bb7acbb0896be8e6b7d7e08b5a22be5fd4c3d89a4fcef SHA512 a4e1e3cde6170cced1f73e47a0f54497818fcd46aebace94732e84a4b09b7717490e5fe465b0a9e72e341b58f661070e45acf7901f5e1836044e26cbcb0143ed
 EBUILD docker-25.0.4.ebuild 7402 BLAKE2B 2fad943f26d8e74d7dbb2eb6417b0ccae49f0ca07ffcc5d3b0c3146e1344cfc4307a6881786ff28bcea31c5217fe058598163ab56b0b4e3c363475fa06663bcb SHA512 f494f5f0fa47b29c488154e52373fcffedb2e450df0c72bc51ad513ef53dff2bb9ffd0021d76e2cd440fb43f1008561ab91c3e3ecdb67b151923684a8f2ef885
-EBUILD docker-26.1.0-r1.ebuild 7535 BLAKE2B 634f539707209593c0c611b3b8e012beb5ddcd731edf8cba23dc9b811dccf9c33e0e992127718518f5357b543cb7b6f02b20fd812e84070b101d743592823ae8 SHA512 43440d69faba36e5a506721f28a3fb81d6d92eec96e670935d632653e3814cbb7aeab6846e88147bf9cd856f86559fe7d66b9b4aab873607f7b94deb5a15043c
+EBUILD docker-26.1.0-r1.ebuild 7532 BLAKE2B 4ea141e681d5db35248a0411f9ad0601d1cd8e25be77c217138e0d90709a122405d200d4351a57a77dadbbc18e953a395c9223c2954dc850efc6bb90dfe3c797 SHA512 5797b7045a5dc8c94e65abf46bbcd0ff14c35e5c1940997a4f510eb3c04cb6549e54c9f357ffd575a4c41d6a1ab1739a6ce00245099ac332f090d2edd4f3482f
 MISC metadata.xml 1238 BLAKE2B 66ba70d18bda5204db7a3a11ce1b258d5f3c3679ee5e9271033b04eeb9a23891632c5fb55a1bbd4d549b865261c9f05e9515879e989001b8b8e84e082dca8fb9 SHA512 ed304e622873eb5cb5e5f6e79955b19c4d660d8d3348ebc632b7c2ec996680ce43a53ee920c0f124525911836aa08e6cdaf942c9a856f68d31632a955930b271
diff --git a/app-containers/docker/docker-26.1.0-r1.ebuild b/app-containers/docker/docker-26.1.0-r1.ebuild
index 9a1e51a65f67..6aec21b30a71 100644
--- a/app-containers/docker/docker-26.1.0-r1.ebuild
+++ b/app-containers/docker/docker-26.1.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
 IUSE="apparmor btrfs +container-init overlay seccomp selinux systemd"
 
 DEPEND="
diff --git a/app-containers/netavark/Manifest b/app-containers/netavark/Manifest
index 4dc110e1c145..b076957dc283 100644
--- a/app-containers/netavark/Manifest
+++ b/app-containers/netavark/Manifest
@@ -1,11 +1,14 @@
 DIST netavark-1.10.2.crate 154261 BLAKE2B 2da5b12917f5db01d82c47808f403e06d6abbcbad0b777d1871de73d52d25219e3d6f8db48feb862aff8a20ed2184c728e813871aa1acc1d02e3997987a932b6 SHA512 362dd2652b3a9d9d1dec99cd85bc6e74b323d86b79ded742e68472e0b58881a5306d7217218d88e27d5e1c4094f2d67c9cb766d4b4c1ee2185c8b4fcbd299e3d
 DIST netavark-1.10.3.crate 154416 BLAKE2B a7750304484ae820eb3bb1bc4de8c2ad22d95494fe10471014e0eb999fb7578c5e9c2ab352fe357d964d701206ee7016f87134a62afe0a03cd1b574cae1264ca SHA512 6ed9cd5a69a6eacc4ad839a82680c7b98d453564aadee41eb6ea632223fba7fbdb20f11e4146dc74b6c6d3695ac50624424b3260dbb7769a4100a918e4328dbf
+DIST netavark-1.11.0.crate 155698 BLAKE2B df460f6a2e5ce82645dccf6ca487724da2abc6f3f2c90f56d935d691ddd9a4229b785177a4e6360f75aa13ee7cdb29a2794c0b7360ef9d40ea3f946771d3ab73 SHA512 e25b075f98cb2aa55cf0e8d8868aac3b6ff0b390f4f0632d6ee2f431cede144948ed98015576cf8a64fcc1a2c33c454415159951aacbdf0611613da867db9a13
 DIST netavark-1.9.0.crate 139321 BLAKE2B c0c40c5b109544c094bf83ba9c73f829472c7703a72e25ec3dcb9b62b926f404618b2cb143fcc944f2240db074de14e711115d6f51d722125e152eea0ac0a631 SHA512 7a5fb4a856b5815c141ad63abbe0f122d762a411b86189add76cfff99adfdb066e24a7b577683950efdc39f2b7955bbdfb31f2c1c41037702fb732916e8aeebe
 DIST netavark-v1.10.2-vendor.tar.gz 16135498 BLAKE2B 607cad9d80067d579adaafdea22b238f5e2f6f92a3c6aed530c8e97bce2f7f869adeabbc7b7d1c04f7c517459112c42b5588aa3ccbf04d5205d2b8212c1e7a42 SHA512 a5079b724d25af60cc094dd5c0bc9e01d503f64bee7ef1c8e616e79793726d848a5e000d951f02d2516f10feea23e30ab637b37ae09da5580f4edb1e783240c0
 DIST netavark-v1.10.3-vendor.tar.gz 16135507 BLAKE2B 114519b76d932c5918fd91cea73e8bc9f5aa3a63275f9218e667e400c3e2512e5db29ce806b5e5b509b043c04a3436344a27cf170e203d4360d00247e48b5ca9 SHA512 b8a99f45ba4ebb20414fe052ff08b1e7a7a86994c7dfa2f36d0500d52bcbd2d279aeff19fb0844a65e2375e86da33af735851f038f598771d2dac96ff7e032a5
+DIST netavark-v1.11.0-vendor.tar.gz 17751524 BLAKE2B b466b27674e6944b2de8a684ee3e14f26775b6065f0f1e82987a0c240725c01f88d2138641b768b5e03fce5b26908d0281b1983b8c1844af4999064bf24d8f15 SHA512 d858bddaaf41b284af9ede84a4d3aab5b5935ea83df5261dfa58e2b7d14962dd55983b1a95b2692e323ea40fc2dc4d9b1bdf2aed90644739e6333c794a7915cb
 DIST netavark-v1.9.0-vendor.tar.gz 16032862 BLAKE2B 313bcde75f2355dab3fa4fdc82881109924c07408aa352e92b590356cf292cd60ad39d8ef31687935e3fed6f22ec8c3b8f26e6eae21fdf211c29c83b745c8a84 SHA512 a5c11dd47122490579a260b6ac3b1c8f01d1c2881e58dbcc5bece398c7d6ef01f376f8c342df4ef619b135cc92a95c48741c8098413c33ede696c87a9cdcc96c
 EBUILD netavark-1.10.2.ebuild 1367 BLAKE2B fb89d2b127f095facff1922161ddf22828a01cdb697aa1657c830a8fa8e7e40a983223354a85d958438e1d99c11c7b54d2c7c703e3004fe44c79ebe1753ff4c8 SHA512 0c666962b408b5a289031feca6f1cdaf61e7c7cdb21c7cb7f238962736de5b679a1aca5bc3e5a8853e77749cac0fd6e8d4348d5e99335c3040e5e312727ab6f7
 EBUILD netavark-1.10.3.ebuild 1365 BLAKE2B f79408066a3e792ef91030a9e31ba6e2221b3d24e1ac23f14336cb66e01259432b422a5f5f4e638963439698e399453b146d5e44c92a01357c03f2eb2b3d132f SHA512 5d841859d44888fa894dc5d8a61eadbd8311c60d0b6b343fa447d07bdb1e708e9c148bae3775040d771ec7fb157363270d8cff0080f3fa94865bcb5c2c54dbe5
+EBUILD netavark-1.11.0.ebuild 1367 BLAKE2B fb89d2b127f095facff1922161ddf22828a01cdb697aa1657c830a8fa8e7e40a983223354a85d958438e1d99c11c7b54d2c7c703e3004fe44c79ebe1753ff4c8 SHA512 0c666962b408b5a289031feca6f1cdaf61e7c7cdb21c7cb7f238962736de5b679a1aca5bc3e5a8853e77749cac0fd6e8d4348d5e99335c3040e5e312727ab6f7
 EBUILD netavark-1.9.0.ebuild 1365 BLAKE2B f79408066a3e792ef91030a9e31ba6e2221b3d24e1ac23f14336cb66e01259432b422a5f5f4e638963439698e399453b146d5e44c92a01357c03f2eb2b3d132f SHA512 5d841859d44888fa894dc5d8a61eadbd8311c60d0b6b343fa447d07bdb1e708e9c148bae3775040d771ec7fb157363270d8cff0080f3fa94865bcb5c2c54dbe5
 EBUILD netavark-9999.ebuild 1367 BLAKE2B fb89d2b127f095facff1922161ddf22828a01cdb697aa1657c830a8fa8e7e40a983223354a85d958438e1d99c11c7b54d2c7c703e3004fe44c79ebe1753ff4c8 SHA512 0c666962b408b5a289031feca6f1cdaf61e7c7cdb21c7cb7f238962736de5b679a1aca5bc3e5a8853e77749cac0fd6e8d4348d5e99335c3040e5e312727ab6f7
 MISC metadata.xml 944 BLAKE2B 072bce0ea9bd5b8e5647c64b79ff77d29099607b9c67f5add104daad074a510a1aabbc8a02e5587ade6363519f13ceb07019302dd8c5e627c271b61faf468d49 SHA512 538b0be977375a193dfc889a6ab77b5ea8fd0d26fc6479b146829cb98333dcf8f1b0d030e75970ec90b01a8cc8a5e35f21857bdbbb111a0fc278f7df3aeb6eda
diff --git a/app-containers/netavark/netavark-1.11.0.ebuild b/app-containers/netavark/netavark-1.11.0.ebuild
new file mode 100644
index 000000000000..a18be8dea54d
--- /dev/null
+++ b/app-containers/netavark/netavark-1.11.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+[[ ${PV} == 9999* ]] || CRATES="${PN}@${PV}"
+
+inherit cargo systemd
+
+DESCRIPTION="A container network stack"
+HOMEPAGE="https://github.com/containers/netavark"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/containers/netavark.git"
+else
+	SRC_URI="${CARGO_CRATE_URIS} https://github.com/containers/netavark/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+fi
+
+# main
+LICENSE="Apache-2.0"
+# deps
+LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 MIT Unicode-DFS-2016 Unlicense ZLIB"
+SLOT="0"
+BDEPEND="dev-go/go-md2man
+	dev-libs/protobuf"
+
+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 target/$(usex debug debug release)|g;" Makefile || die
+}
+
+src_compile() {
+	cargo_src_compile
+	export PREFIX="${EPREFIX}"/usr SYSTEMDDIR="$(systemd_get_systemunitdir)"
+	emake docs
+}
+
+# Following is needed because we want to use `make install` instead of `cargo install` (exported by cargo.eclass)
+src_install() {
+	default
+}
diff --git a/app-containers/podman-tui/Manifest b/app-containers/podman-tui/Manifest
index 69980278b553..01ac134fdd8e 100644
--- a/app-containers/podman-tui/Manifest
+++ b/app-containers/podman-tui/Manifest
@@ -1,8 +1,10 @@
 DIST podman-tui-0.18.0.tar.gz 15928626 BLAKE2B 80fd4f826a407b4eeeb664c065f836f12dd85cacab35003ad8fbcabf3eb69b3838bf02fb76269124d18c110370e42556cff8e348caabb100aa88a1994f99d4cc SHA512 77107a9e64b12fd5065698b7065909d5aa45ca49d749056cfb0f76aa2fd0f269708d3d75ecb4cab7939c30571510cdacebcdaac67549979873e3656e1af4db9f
 DIST podman-tui-1.0.0.tar.gz 16208356 BLAKE2B c5ae4274cdc6c4d5abb9f9a18c82949a40a9f2894a9127d8bdf89b8a9445716cc985d8400833c890dec4524fd617babd5791e3062e9e7654ea93d66c34dfe181 SHA512 918b3efb823a543a439ae0f56c59ee2689961ac6e39a40054a7971ddf02056ca50c7c681ca03c45590e9fdfce1822f406bbf90f9b25563a0ef9ae75b88235a8c
 DIST podman-tui-1.0.1.tar.gz 16252864 BLAKE2B 14b28a87aca99d90d9412d7bdd052604bdd8c05b262564eaa6821fd10f1f357bcb5f65d486da53a1abf98cfd45fadaf847f14942a27525136e70f83603ef6d85 SHA512 3c5ff5a77e885a0518a16e8d7fd0581a80b16650b546d2c736c50503c250797be1b8cb1a2da68ee1eed5a7a1dcdbcfa8344f37d0c6724c341470d05446a0591e
+DIST podman-tui-1.1.0.tar.gz 16091487 BLAKE2B e1d697a94da515c5ed896527bbf25f742a7ee315a5d83565377664c61fc65736beaef43d351dbbd64a0f6e254bed407278532a9a26eda7ec69637348ce60c5ce SHA512 d8e4710f489ac124ad11930c5051d9fc279166316bb85d952847e6a924f70b5cc64487f8c161878a21e8f88784c47c2f9f36b5b332c0736f48f3dd0ada92584a
 EBUILD podman-tui-0.18.0.ebuild 842 BLAKE2B c0338b4ecdf0e83008b93f0dd7e1f8b7fa0dcf2e7f0b624dbce1f2998b32d260d7d0644bcd35e52bc92d0dc72c9ef7b35b0fb19153a3d4cbbc3e3203c76d0951 SHA512 ac5c59f756f223b2a433618d420069ea84655d268bf2439d66e8b1c5f206f2ec436cd78b43b5c3d5f7f6755a3c791f63dd804a22ae3ead545f5d6ab8f108123f
 EBUILD podman-tui-1.0.0.ebuild 842 BLAKE2B c0338b4ecdf0e83008b93f0dd7e1f8b7fa0dcf2e7f0b624dbce1f2998b32d260d7d0644bcd35e52bc92d0dc72c9ef7b35b0fb19153a3d4cbbc3e3203c76d0951 SHA512 ac5c59f756f223b2a433618d420069ea84655d268bf2439d66e8b1c5f206f2ec436cd78b43b5c3d5f7f6755a3c791f63dd804a22ae3ead545f5d6ab8f108123f
 EBUILD podman-tui-1.0.1.ebuild 842 BLAKE2B c0338b4ecdf0e83008b93f0dd7e1f8b7fa0dcf2e7f0b624dbce1f2998b32d260d7d0644bcd35e52bc92d0dc72c9ef7b35b0fb19153a3d4cbbc3e3203c76d0951 SHA512 ac5c59f756f223b2a433618d420069ea84655d268bf2439d66e8b1c5f206f2ec436cd78b43b5c3d5f7f6755a3c791f63dd804a22ae3ead545f5d6ab8f108123f
+EBUILD podman-tui-1.1.0.ebuild 842 BLAKE2B c0338b4ecdf0e83008b93f0dd7e1f8b7fa0dcf2e7f0b624dbce1f2998b32d260d7d0644bcd35e52bc92d0dc72c9ef7b35b0fb19153a3d4cbbc3e3203c76d0951 SHA512 ac5c59f756f223b2a433618d420069ea84655d268bf2439d66e8b1c5f206f2ec436cd78b43b5c3d5f7f6755a3c791f63dd804a22ae3ead545f5d6ab8f108123f
 EBUILD podman-tui-9999.ebuild 842 BLAKE2B c0338b4ecdf0e83008b93f0dd7e1f8b7fa0dcf2e7f0b624dbce1f2998b32d260d7d0644bcd35e52bc92d0dc72c9ef7b35b0fb19153a3d4cbbc3e3203c76d0951 SHA512 ac5c59f756f223b2a433618d420069ea84655d268bf2439d66e8b1c5f206f2ec436cd78b43b5c3d5f7f6755a3c791f63dd804a22ae3ead545f5d6ab8f108123f
 MISC metadata.xml 727 BLAKE2B 61f7988612a085d64584990b9d3b0e91ddda06153e2bf3809d586f15b9d63cdf93ff1ee8e219859e02e54877c037f706c9ebe2a7bb598bc909dd3597661e9979 SHA512 b861ed4983427544169777f39b53ecc7ece16f997448a92bf387e4691d44b9b1cc749cff6132b093c4bd6f0c348ba0e242bb369d2b3bc34da2614d8f4d7556b7
diff --git a/app-containers/podman-tui/podman-tui-1.1.0.ebuild b/app-containers/podman-tui/podman-tui-1.1.0.ebuild
new file mode 100644
index 000000000000..beefef11ab58
--- /dev/null
+++ b/app-containers/podman-tui/podman-tui-1.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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() {
+	# 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;')
+	ego build -tags "${BUILDTAGS}"
+}
+
+src_install() {
+	dobin "${PN}"
+	einstalldocs
+}
diff --git a/app-containers/podman/Manifest b/app-containers/podman/Manifest
index 749e0ecc37d8..e604f48ce0ee 100644
--- a/app-containers/podman/Manifest
+++ b/app-containers/podman/Manifest
@@ -10,8 +10,10 @@ AUX seccomp-toggle-4.7.0.patch 400 BLAKE2B 9f02e58c06b507a294207c66bd5ea218f8780
 DIST podman-4.9.4.tar.gz 21733620 BLAKE2B 17d099c0a13fbbb77556742313c39995127fc97b4086ef3c2d74a92cc0a4f825a6c729dd099c6d4f4cd3d2ebfd470494babdeaa85a5653b327ea1a16fb5ea993 SHA512 7b52555789a1c214fcf26b0826bdda6cf0ccca588f87c0f15ac5e8358ddac625e17cafbe6a43de07cad964e1418b5ee0d2e38a5cb5dc6f6d4e638399749a7f7b
 DIST podman-5.0.2.tar.gz 23811875 BLAKE2B e943eb36eb0b80332223afc5d971c0886f6eaffeb7133c634d28c0a38e9aae6a54266691067dbca7684882f8b6dad72c3d5de2287ec5a7e8fb4b1cfd96df0b4d SHA512 70dbac9fc81d66eb9b0a5174f5776b805397005cacca917674d2b001591fadd05a776c956e693bad932e9eefe591c35da5c566e8e9e01db8be42bc454cd03104
 DIST podman-5.0.3.tar.gz 23814179 BLAKE2B 46385710e4d24f8eca3a7c98c18a97b96ecd4691b3c965c5a5e7bc690d40d892a6d5fb71c1dd8ec56cc907a2167ab5ee795b4d2c2279c58cef3a5a1cece8b678 SHA512 c605a52cc5aba43d485796c4986f2d1be704e5c931473bf5ba1cf77f703cdb3d16f41d33da0b25287e8d001077f77caf117d3ea5dbd7c56a744274025d9ab07d
+DIST podman-5.1.1.tar.gz 23794366 BLAKE2B 0612a148972c96f532e96a8eb1ab388d80b32fe2ca7c5626e615748ef269a853407aeb39f34686d9eb75de239882e524cf5ee7c97152caccf5f77eb6ecfd54d8 SHA512 e896ee97980da4a522eb865d2eacb6876dd8bc5be1488aed8bd81a81af95faa1383b176b5d236d4af0f76bc30ddad5230df3e11c59ffc6f86e5b4cf3876ff184
 EBUILD podman-4.9.4.ebuild 4502 BLAKE2B d58fc9e32f8eb801589184d767fa1aaaaa493f40e78aa9dd6c8d5c1d0c577377228729884ac74a9f8fcc23dac7b2c9bd84ab3f54d17d169ad0d06d447272a0c6 SHA512 3c086dc648321fe7cd73d50f5f2beadf0ea88d581d9d5165dad7473615e47e0ecbf83732123d09a5dc825f1b8c018fbd960d8641c82455719181210f7e604094
 EBUILD podman-5.0.2.ebuild 3581 BLAKE2B 9e0e9beb556ac2cb7ccfc3ecb8f41d5fdd44945dc53b65ce55c06dd02aacddec7b6921b703d2da59a0f01c90a21c5f2c1c5a32bcebd1ddb0964ecae1c43b8617 SHA512 b613ceab57b3ff1c4d1b84e1dbaaaed4b70cddaf5e71338416f8c4d300fb1b95e1e7f5d23efb51cc90511f208dccbc4d00bf0c45e98f215411bb13bfd5f61284
 EBUILD podman-5.0.3.ebuild 3581 BLAKE2B 9e0e9beb556ac2cb7ccfc3ecb8f41d5fdd44945dc53b65ce55c06dd02aacddec7b6921b703d2da59a0f01c90a21c5f2c1c5a32bcebd1ddb0964ecae1c43b8617 SHA512 b613ceab57b3ff1c4d1b84e1dbaaaed4b70cddaf5e71338416f8c4d300fb1b95e1e7f5d23efb51cc90511f208dccbc4d00bf0c45e98f215411bb13bfd5f61284
-EBUILD podman-9999.ebuild 3581 BLAKE2B 9e0e9beb556ac2cb7ccfc3ecb8f41d5fdd44945dc53b65ce55c06dd02aacddec7b6921b703d2da59a0f01c90a21c5f2c1c5a32bcebd1ddb0964ecae1c43b8617 SHA512 b613ceab57b3ff1c4d1b84e1dbaaaed4b70cddaf5e71338416f8c4d300fb1b95e1e7f5d23efb51cc90511f208dccbc4d00bf0c45e98f215411bb13bfd5f61284
+EBUILD podman-5.1.1.ebuild 3918 BLAKE2B 97f8cf268b5ab62b43b52510749b950c66b245104ad8c60f224e1b92e44478164eabdcdfe718b9b48d47f1672b28952c1c9aadef7087403a959e1188c13e2c38 SHA512 a255b468beec88b456b151db9632027bc11ba2642b5f5582d5cda041e2c6a0c5abf4a39eefa5fc1bd485b9657c2c00a403df5745daf0dadc9c2c52e1bc964b30
+EBUILD podman-9999.ebuild 3918 BLAKE2B 97f8cf268b5ab62b43b52510749b950c66b245104ad8c60f224e1b92e44478164eabdcdfe718b9b48d47f1672b28952c1c9aadef7087403a959e1188c13e2c38 SHA512 a255b468beec88b456b151db9632027bc11ba2642b5f5582d5cda041e2c6a0c5abf4a39eefa5fc1bd485b9657c2c00a403df5745daf0dadc9c2c52e1bc964b30
 MISC metadata.xml 1709 BLAKE2B 0138cd1f7fec54f2b15f8a8af7a29ee0202b0c824371ed6f45726c06e84c5a0c78e6446f817ee2b81c44320203b50c54072757b9cd271080cd07a072141760ce SHA512 65fdac8344812dd71fcf7018da7320a055870f48af6c4f623a9c65f5375e69eee142409ff3451c5e046eef648e0ac00bf96550a7dfc37be5b7aa3aff1a51d42b
diff --git a/app-containers/podman/podman-5.1.1.ebuild b/app-containers/podman/podman-5.1.1.ebuild
new file mode 100644
index 000000000000..95b806ea578e
--- /dev/null
+++ b/app-containers/podman/podman-5.1.1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+
+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 ~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-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=(
+	"${T}"/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() {
+	cat <<'EOF' > "${T}"/togglable-seccomp.patch || die
+--- a/Makefile
++++ b/Makefile
+@@ -56,7 +56,6 @@ BUILDTAGS ?= \
+	$(shell hack/systemd_tag.sh) \
+	$(shell hack/libsubid_tag.sh) \
+	exclude_graphdriver_devicemapper \
+-	seccomp
+ # allow downstreams to easily add build tags while keeping our defaults
+ BUILDTAGS += ${EXTRA_BUILDTAGS}
+ # N/B: This value is managed by Renovate, manual changes are
+EOF
+
+	default
+
+	# assure necessary files are present
+	local file
+	for file in apparmor_tag btrfs_installed_tag btrfs_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
+
+	echo -e "#!/usr/bin/env bash\n echo" > hack/btrfs_installed_tag.sh || die
+	cat <<-EOF > hack/btrfs_tag.sh || die
+	#!/usr/bin/env bash
+	$(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
+	EOF
+}
+
+src_compile() {
+	export PREFIX="${EPREFIX}/usr"
+
+	# 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)" \
+		  all $(usev wrapper docker-docs)
+}
+
+src_install() {
+	emake DESTDIR="${D}" 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
+	fi
+
+	keepdir /var/lib/containers
+}
+
+pkg_postinst() {
+	tmpfiles_process podman.conf $(usev wrapper podman-docker.conf)
+}
diff --git a/app-containers/podman/podman-9999.ebuild b/app-containers/podman/podman-9999.ebuild
index 738613b007dc..95b806ea578e 100644
--- a/app-containers/podman/podman-9999.ebuild
+++ b/app-containers/podman/podman-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{11,12} )
+PYTHON_COMPAT=( python3_{11..13} )
 
 inherit go-module python-any-r1 tmpfiles toolchain-funcs linux-info
 
@@ -51,7 +51,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/seccomp-toggle-4.7.0.patch"
+	"${T}"/togglable-seccomp.patch
 )
 
 CONFIG_CHECK="
@@ -65,6 +65,19 @@ pkg_setup() {
 }
 
 src_prepare() {
+	cat <<'EOF' > "${T}"/togglable-seccomp.patch || die
+--- a/Makefile
++++ b/Makefile
+@@ -56,7 +56,6 @@ BUILDTAGS ?= \
+	$(shell hack/systemd_tag.sh) \
+	$(shell hack/libsubid_tag.sh) \
+	exclude_graphdriver_devicemapper \
+-	seccomp
+ # allow downstreams to easily add build tags while keeping our defaults
+ BUILDTAGS += ${EXTRA_BUILDTAGS}
+ # N/B: This value is managed by Renovate, manual changes are
+EOF
+
 	default
 
 	# assure necessary files are present
@@ -101,8 +114,7 @@ src_compile() {
 		tc-export PKG_CONFIG
 	fi
 
-	# BUILD_SECCOMP is used in the patch to toggle seccomp
-	emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" BUILD_SECCOMP="$(usex seccomp)" \
+	emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" EXTRA_BUILDTAGS="$(usev seccomp)" \
 		  all $(usev wrapper docker-docs)
 }
 
diff --git a/app-containers/runc/Manifest b/app-containers/runc/Manifest
index 080d99752cff..359f639df98d 100644
--- a/app-containers/runc/Manifest
+++ b/app-containers/runc/Manifest
@@ -1,7 +1,7 @@
 DIST runc-1.1.12.tar.gz 2522196 BLAKE2B 14fe8d5f82d5b4d7f6b4bb9111c5d258e74f6a44aeb51fc87c69104e95b9bf24a3d503f4cc5dedb40d542fbd4b6e27273f456bda4fcf3bc298eb93ae292d9663 SHA512 92e8ac54a77d7ebcc76b5a9cc08d9a064211f12e9d26f064070cc203a5afb11c3af28d8f556f297513f797a2933d50bf10a8f22e307724041d66aa8c5ca1d9d3
 DIST runc-1.1.7.tar.gz 2511464 BLAKE2B 63f09052659636b62185abbb178f7e104d22125190899e80e71ed2ba35567eb855abf786d3c7fff3dd9a1ab43ee282fcaecb6650cd8a1ce49c05acefd7c12cde SHA512 e3a18f04ac2c3553a815074ca64e04cfd71af54d78edbd4a13819f187476f96d7311c23bb63fb5c311b91865db4540985a6f9daa84819b0bac5f023b3b2a832c
 DIST runc-1.1.9.tar.gz 2512231 BLAKE2B 4e8e2a454231492f83de34bf66ba25a02b8925b6ef0af2206cdf4ab3299173d3452cea4d51fcfeb02026df288dd8ca6c44ecd35fb075f25f56fd7bc07f873af7 SHA512 020986f2df49c45394d0acbfa4da62663353004550d9b4409f6cfe8369972a090fb8020e4a05342754bde5c1fbe9fcf3868faed2dceed5d54460c3373cdd2278
-EBUILD runc-1.1.12.ebuild 1846 BLAKE2B fad8390d7b36ea64e339566f03ded30d446fb27a5064c7f660c8127ce127215739784b09c7ff1b618841708cb2c77256e81e8367a9a32a55d9111a7c9f37c01b SHA512 bb90b48c309acf14e69de5901a71cc3ea135b1006412d980f4958e0007dcc60d5896e3ac603e3d3db000beca040cd7854909d629468a3ba446da729abe5c6909
+EBUILD runc-1.1.12.ebuild 1843 BLAKE2B 08106f5ac68bc0aad1bfbc3c1dbf3db9ee493e5c55f50cc312be88f2b9969caf2469ee66c7103f73a30ef16e3890ceb6b1a76d1bd84d37e60f6d272beed0ee6a SHA512 902d6df904091461cdfcf81732fdffe458f2ff688767127dfdf7958b28e4b3801835ce31cf552e0cda0ce398247d2f2caf6dff990f7d82b287f4ad5c6cd3dd08
 EBUILD runc-1.1.7.ebuild 1843 BLAKE2B 5dcdf28d4b75f14a565ad7766b9dfe6e4bf6ff644449175a7425a809d49048a219708a93bc77a51840cb6ab305f2a13551fb35449e3d4084aa68bab02a5aaa05 SHA512 b3dd66a07869fa8de8db8a13b06bfa19cbb593fe61b9092882073e4b0369e4000daf2735e5a23ba453dcde617e22bb822c76b145e864f6cb486fa0b352f84a90
 EBUILD runc-1.1.9.ebuild 1843 BLAKE2B 8620b7421c51f4e8fa426f98333bab6ea6d11a148bb145898119529402df21ce55a376da2752a4d3ea8550d205e95ee2f35101ae2eef69a1f1927a6fdf4c3da6 SHA512 8fcc48a37906e4d8eb69c9b9873b229fee0eb6eb70fccc2b3a51fb43e0937aa933c1d6e209daf46a02c8d9f7033cb6b49c62845d2fbc38451a2b55691157e57a
 MISC metadata.xml 647 BLAKE2B 67dce497b4fa65db5146f9e017ec00795ad4ef5d63058d4c20bfc730f17e2fabfcd82b403bd06330f9a68ef2e344198514930493eeadef69eb2ee8a618e5e0fc SHA512 970d9753c81eb387a06fc24be8bfb3b056e9e7cbf568f99511bdcfd35f6a8cdfe21ea0103ea36b8fba7be733016493663c3a38452b05225de35af7e1c5b359dc
diff --git a/app-containers/runc/runc-1.1.12.ebuild b/app-containers/runc/runc-1.1.12.ebuild
index c605e6d0a2c3..9a94108c30b6 100644
--- a/app-containers/runc/runc-1.1.12.ebuild
+++ b/app-containers/runc/runc-1.1.12.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P
 
 LICENSE="Apache-2.0 BSD-2 BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
 IUSE="apparmor hardened +kmem +seccomp selinux test"
 
 DEPEND="seccomp? ( sys-libs/libseccomp )"
diff --git a/app-containers/skopeo/Manifest b/app-containers/skopeo/Manifest
index cd36c39b6304..6a16ed72c992 100644
--- a/app-containers/skopeo/Manifest
+++ b/app-containers/skopeo/Manifest
@@ -1,8 +1,10 @@
 DIST skopeo-1.14.0.tar.gz 10548883 BLAKE2B 6ecf54d236405ce59bedf77acc124fa8b3bb12acefa24a679a1d2d85957ddf585b5a6ba163806b8b7b510485d936adbe1afd6eee8c92b267b948f7d78ac83d05 SHA512 59d329036a97cbeca4de20b15d9dd8adacd5201834b26ae5e5c88b05594b2a7101c22da91f22c35c07a98e41afa28f2c7103e660b3847c7f8c9691f27f4c4146
 DIST skopeo-1.14.2.tar.gz 10547979 BLAKE2B bca47d82380ad714397dc8e36e365a3e81fc628b47519b022ecb5edd2a03ce8972c066af350cd1f0b5a3d9d6c1585f0729b32a1a829cfc4eaefc1c7fc9dc2667 SHA512 ffb3c00cdde05f7a916bd3980c9cec1bb82b3f3bf90058bfff1837d3a9902087ac011828e6164baec18210d4aeee1a5258b75405411fd15ea2470a2522a6da73
 DIST skopeo-1.15.0.tar.gz 10710505 BLAKE2B b6804561ec96ce7f987ccdaf5a89aa7f5fd0ed2da1307467b4c1857386508d88e3fd28f066f49b136962e232b89594484610fc4f6b494be6a98b64908900865b SHA512 71fb94fd2cf9937bf2dd969c8b1b74f5b66eb2ac2bd9358e8c8983c3fd6548311ca274ed2f8c3f088c3c9d6032962075da1890449dcd25dcfd49882acbfa20de
+DIST skopeo-1.15.1.tar.gz 10709125 BLAKE2B aa688197fe0d803b6cb1f4e7c5c998a917e7d588fa41b9e6ede6d60fd1ef12f209e2f119bc29143bf92ae3349c1168e33f79cb36d6c7f5a1a22bcbf3f4e51792 SHA512 686d17da4a84d9029d688cfca08724576564ce2a05aed9380bf55059c244c90cffa3b21c2dbe84b19b746773e98d5f26e5ceaca58f7be26b656125977685c663
 EBUILD skopeo-1.14.0-r3.ebuild 1845 BLAKE2B 75d7c2b86ef231206ed2898089f0c64de58fa923d01c54a5b671c77d133240d10743713a355415c27a551eb2e7794f7f9e3d9f0746d05b992e7f637fc3c84e68 SHA512 fb1d518f9ca77dfa35073b3cc57c6fe866c6dab8dd6feb27eb012af7dab5160464255e043ef7a519e80a1b0900fcabf81587f18fae57d28553875c4c55d95982
 EBUILD skopeo-1.14.2.ebuild 1847 BLAKE2B 8024b877083ba54ef0ab21d835bc5524794e3e31babe163f3ac9130c832f36d9bd00d5a3fa5f646858748132b6018aa84a59c00d646f0eae0c3ac08bd2b3ad37 SHA512 a18d9aa5b6fd1a7ee213b15eab711a86abac4dbffe4443d9c4c0c4fdbb55a90ee1aa9e45a5252a5e149fbdbc53626c2962a6d4ebc451cd2e866f221622040784
 EBUILD skopeo-1.15.0.ebuild 1847 BLAKE2B 8024b877083ba54ef0ab21d835bc5524794e3e31babe163f3ac9130c832f36d9bd00d5a3fa5f646858748132b6018aa84a59c00d646f0eae0c3ac08bd2b3ad37 SHA512 a18d9aa5b6fd1a7ee213b15eab711a86abac4dbffe4443d9c4c0c4fdbb55a90ee1aa9e45a5252a5e149fbdbc53626c2962a6d4ebc451cd2e866f221622040784
+EBUILD skopeo-1.15.1.ebuild 1847 BLAKE2B 8024b877083ba54ef0ab21d835bc5524794e3e31babe163f3ac9130c832f36d9bd00d5a3fa5f646858748132b6018aa84a59c00d646f0eae0c3ac08bd2b3ad37 SHA512 a18d9aa5b6fd1a7ee213b15eab711a86abac4dbffe4443d9c4c0c4fdbb55a90ee1aa9e45a5252a5e149fbdbc53626c2962a6d4ebc451cd2e866f221622040784
 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.15.1.ebuild b/app-containers/skopeo/skopeo-1.15.1.ebuild
new file mode 100644
index 000000000000..ab892d6789a8
--- /dev/null
+++ b/app-containers/skopeo/skopeo-1.15.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2023-2024 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"
+
+COMMON_DEPEND="
+	>=app-crypt/gpgme-1.5.5:=
+	>=dev-libs/libassuan-2.4.3:=
+	btrfs? ( >=sys-fs/btrfs-progs-4.0.1 )
+	device-mapper? ( >=sys-fs/lvm2-2.02.145:= )
+	rootless? ( sys-apps/shadow:= )
+"
+
+# TODO: Is this really needed? cause upstream doesnt mention it https://github.com/containers/skopeo/blob/main/install.md#building-from-source
+# 	dev-libs/libgpg-error:=
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="
+	${COMMON_DEPEND}
+	app-containers/containers-common
+"
+BDEPEND="dev-go/go-md2man"
+
+RESTRICT="test"
+
+pkg_setup() {
+	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
+	use device-mapper && CONFIG_CHECK+=" ~MD"
+	linux-info_pkg_setup
+}
+
+run_make() {
+	emake \
+		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" \
+		$@
+}
+
+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
+}