gentoo auto-resync : 12:10:2024 - 04:04:10

17 files changed, 494 insertions, 12 deletions

diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 3eaa47f3e131..b37ca9e8d9b2 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 04d17f8eb8ee..7f477a2d2195 100644
--- a/app-containers/aardvark-dns/Manifest
+++ b/app-containers/aardvark-dns/Manifest
@@ -1,11 +1,14 @@
 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.12.2.crate 55913 BLAKE2B b1c4e647c5a31946a48deb01c4428eb43550e8d906f3328226399ab6ba2ea44907382ceea47ba7ce125800bc8d0a01c287f6a73630a48671873a8df644ede488 SHA512 05a1410229e6e9cc495015e92fb4252d55af8439b9e6cbbba1b0a8b78256b01bca4bc205f61be903201eab27497062335f1c4235ea6ed7818a325d6cc68eb09d
 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.12.2-vendor.tar.gz 6919039 BLAKE2B 5edc43d9e7044da6e3a1694af77dd20c2e2d7ef897083a1609bee32fa96a9c63d18b7e9310e3a7226e71d921a44c5b5184b9975d2712163604a671a1236dcc0d SHA512 1dfacc29962acca5c7baa11fbe4d1c93276b91cb5e1db6033d8e23e963ca4c4098bdbf4bdf89730fdea4d5a45b3a2c00ee65888d502e8009d2adaaa6f8374dba
 DIST aardvark-dns-v1.9.0-vendor.tar.gz 8085548 BLAKE2B 487f69a9c34832d74783b66c565a7c2f67f101527e8a44c215f167e4ea80f069846b25decbb423972cd42cd9ee7717efc21c3d1b0885a7d87c0fbdb9cfb9d26f SHA512 f7174f1c4275991a6a2655046697f32511586f53fb343efa25f995cc07663091a634e8a82395840b022b6b3c8363863cdf8c9b6d4e38984fb841978eef0b1f22
 EBUILD aardvark-dns-1.10.0.ebuild 1097 BLAKE2B 67f4643151ce9f5efc4bf6f6415cd3ae6224c55fbc66dadc2a5155211556928a2373bd55abce93212bc04fcffd7a239ccb76777e35439a949f364743564e965f SHA512 a851974effdc3a66e426cab4bfdd2cc0c35f7e56ee2f136fbb96d32e55b86458f49ed8fbba14ed37ce94b04bf99c053d9373ece0a982b5f974296cfb1af9b54f
 EBUILD aardvark-dns-1.11.0.ebuild 1104 BLAKE2B f8ccaa04f8c584e0a1759c39663d2183b320c918ba9e5c8b51caffd073f2c79adb5dbcf848cd27b519501175d411e7005f594071b007dd757869affc402852dc SHA512 4fffbef119250bbacbb63da0420c6efe4c838f74401e836a2dd785c762ee405598221d5b423a9dc1a1f35dd832844e7f9031ce8a854162d2270a4be037c43bf3
+EBUILD aardvark-dns-1.12.2.ebuild 1106 BLAKE2B d6007c1ec8a83890386aa0663384c74aa6c92870071af2fbb8e6fd66e4cd63a607a8ce27022a5825ca2d9d5877c88bc219d49019dda3b1ab8017fdb21b8e6aeb SHA512 feafdda46634663ba10496e6fa6f4be35d2ca7bc7bed4a60e895298692e942ce17eaecce58f1d81fd05eed358ce075dea53d2e35b3fe82e830bb318a4656f52c
 EBUILD aardvark-dns-1.9.0.ebuild 1097 BLAKE2B 67f4643151ce9f5efc4bf6f6415cd3ae6224c55fbc66dadc2a5155211556928a2373bd55abce93212bc04fcffd7a239ccb76777e35439a949f364743564e965f SHA512 a851974effdc3a66e426cab4bfdd2cc0c35f7e56ee2f136fbb96d32e55b86458f49ed8fbba14ed37ce94b04bf99c053d9373ece0a982b5f974296cfb1af9b54f
 EBUILD aardvark-dns-9999.ebuild 1106 BLAKE2B d6007c1ec8a83890386aa0663384c74aa6c92870071af2fbb8e6fd66e4cd63a607a8ce27022a5825ca2d9d5877c88bc219d49019dda3b1ab8017fdb21b8e6aeb SHA512 feafdda46634663ba10496e6fa6f4be35d2ca7bc7bed4a60e895298692e942ce17eaecce58f1d81fd05eed358ce075dea53d2e35b3fe82e830bb318a4656f52c
 MISC metadata.xml 915 BLAKE2B 7ae712b0f52e804cb23911533c31bd5520bd76e1371e07625f7054fcb4ad8fd432476556ade943d9f8700d91ad7f081fed9856c553c9db97125d0c7d20ac8d5d SHA512 b9b1b3ac577f60c233559abf0286e4c5ca7d25e825faf74aa962867189c3dd2fbb968b791dae0fb565786446ad8495973e5ffa1f36a5193d349dd44846395fac
diff --git a/app-containers/aardvark-dns/aardvark-dns-1.12.2.ebuild b/app-containers/aardvark-dns/aardvark-dns-1.12.2.ebuild
new file mode 100644
index 000000000000..6eb7550f45c2
--- /dev/null
+++ b/app-containers/aardvark-dns/aardvark-dns-1.12.2.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 ~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() {
+	export PREFIX="${EPREFIX}"/usr
+	default
+}
diff --git a/app-containers/containers-common/Manifest b/app-containers/containers-common/Manifest
index 7b6816067da7..c63b2f9db8cb 100644
--- a/app-containers/containers-common/Manifest
+++ b/app-containers/containers-common/Manifest
@@ -2,8 +2,10 @@ AUX examplify-mounts-conf.patch 214 BLAKE2B 3e72e91ce65190acb437a1ec5e0cbbb27b46
 DIST containers-common-0.57.0.tar.gz 12700958 BLAKE2B 8432a7d839b94b59eabd75d4978a4d0c1340a64ed626db74e74a8318e08c61172bfba5e4f4c4b0dfffec302c5a310bb5be8fad3ab4d91a6d89ced373a0a6f297 SHA512 b993821040788085ff44e48023a64cea4e3e7e50731c359087bd287168e6849a543d930acbdaff2437fc7951acc46f7183f337dd977215eca814332e6869d1e3
 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
+DIST containers-common-0.60.4.tar.gz 13106900 BLAKE2B 1afb428044bc8eebd002b884f2a2072971cd83fca561fd509b83088ccdf82b3a62d63ff32ec5ef856c3d0ee0ffac316201fa8f1d7956153ce30e2244cc860f02 SHA512 5d61415d4959486223a36ff98304363a558e6da9ccbdca94f976649a37d404ac00c8454019f60a79360029c91c9565d22868b109dbb84c19f13377e0e23dcc4d
 EBUILD containers-common-0.57.0-r1.ebuild 1469 BLAKE2B f83e531ffd457701110bac047423efc64de104efb3fe8343bd572f7742b2c340a2c11528ddadca19da6e98dcc4549ad458be3e76a587f46efede14b199c5af54 SHA512 4c7edd8ea8580e080ab96e8a833f37be236db8d7fb6370e0a8b205daac659947d27d549f0038ee7908cdbd8bcdc0e91f93ee7338d85a396d38b2e0dc1bfd1e53
 EBUILD containers-common-0.58.0-r1.ebuild 1831 BLAKE2B 5d4f98e52111ff64943128235fed05377c04d2a5e2b8d7610c23f1be32551e56327e7e78bbb8bca243beefa843b33cea4584fa6436738534be2065110ed04217 SHA512 a91a4d3d2e4375bf93a5a733c358b3da601b088933746b7bb683390d0da20a9218eb98c938944741c5357c887c19e9417b02a0660eebe57d12e38070151d6560
 EBUILD containers-common-0.59.1.ebuild 1836 BLAKE2B 0b728de99ccc6f80ae8f2709d3a3362faa39467023e87b552a020f42efac3a8c7dc36d408df091eed96655ad50fcd84afe53be3525a53e92065b2f0825542152 SHA512 f2c79608f8737cfdfd76aa6607feffada0db5dfd208218aca536d6789e456ed420a71a4a72a2b9383a782b22276c0a5c89b00cb6ca40132005ece4a9abcc4532
-EBUILD containers-common-9999.ebuild 1838 BLAKE2B 8453c4b4e7c46157c7118aab83658720b3695f70ad78d16c258f85463aa008efeaec4b2824410c7070912367bd963f67b4c58bedb71f1197a2737e030acc8238 SHA512 6ec92807a3f7343150cdec8906b95e60f32c1c5719c5f79a866ccd64c9fce9ad4401c4d0c05b350838233f0f50afffdf0063ad9ad9aea3057a57f0c6ed04792c
+EBUILD containers-common-0.60.4.ebuild 1836 BLAKE2B 516b4d6ff4f0a8235206f28f6a254527b21cbff2db55e438a6ecc515bcd4b34d983fea7a13c0bf7b233ac3b68c2e61ed1d1e383e73cfeca3b0e30e44cfe58fcc SHA512 954b99a77dcfe272bf02fdfdf1a85862575d94b81b152273f5e6b10d95cef838a9a88fb6a24b7cd5ce33435bbeb4fb21fe498b1fe71978659ae0d80b41eed498
+EBUILD containers-common-9999.ebuild 1836 BLAKE2B 516b4d6ff4f0a8235206f28f6a254527b21cbff2db55e438a6ecc515bcd4b34d983fea7a13c0bf7b233ac3b68c2e61ed1d1e383e73cfeca3b0e30e44cfe58fcc SHA512 954b99a77dcfe272bf02fdfdf1a85862575d94b81b152273f5e6b10d95cef838a9a88fb6a24b7cd5ce33435bbeb4fb21fe498b1fe71978659ae0d80b41eed498
 MISC metadata.xml 741 BLAKE2B 727dfc3215f6fb9155105aad6b83e4cff72d8f484e2abaf267a299c07777490abb657a6d0eb349587bae53ad614a6137bd6a205252c835d8141925698cdc2464 SHA512 d014e28716c2b2fd1926a5d7612437cf7553a62fcd26ede88dd180eeb8cfa52f0bfc0c61f539b05dcc7a7faf7c1f17a99e20cbf3743044c1aad1478fbfb11316
diff --git a/app-containers/containers-common/containers-common-0.60.4.ebuild b/app-containers/containers-common/containers-common-0.60.4.ebuild
new file mode 100644
index 000000000000..985ebb5c0ca4
--- /dev/null
+++ b/app-containers/containers-common/containers-common-0.60.4.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit readme.gentoo-r1
+
+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 ~loong ~riscv"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+RESTRICT="test"
+RDEPEND="
+	>=app-containers/aardvark-dns-1.12.0
+	>=app-containers/crun-1.17
+	>=app-containers/containers-image-5.32.0
+	>=app-containers/containers-storage-1.55.0
+	app-containers/containers-shortnames
+	>=app-containers/netavark-1.12.0
+	net-firewall/nftables
+	net-firewall/iptables[nftables]
+	>=net-misc/passt-2024.09.06
+	>=sys-fs/fuse-overlayfs-1.14
+"
+
+BDEPEND="
+	>=dev-go/go-md2man-2.0.3
+"
+
+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
+
+	[[ -f docs/Makefile && -f Makefile ]] || die
+	sed -i -e 's|/usr/local|/usr|g;' docs/Makefile Makefile || die
+}
+
+src_compile() {
+	emake docs
+}
+
+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-common/containers-common-9999.ebuild b/app-containers/containers-common/containers-common-9999.ebuild
index deb362fc0d3b..985ebb5c0ca4 100644
--- a/app-containers/containers-common/containers-common-9999.ebuild
+++ b/app-containers/containers-common/containers-common-9999.ebuild
@@ -21,16 +21,16 @@ LICENSE="Apache-2.0"
 SLOT="0"
 RESTRICT="test"
 RDEPEND="
-	>=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/aardvark-dns-1.12.0
+	>=app-containers/crun-1.17
+	>=app-containers/containers-image-5.32.0
+	>=app-containers/containers-storage-1.55.0
 	app-containers/containers-shortnames
-	>=app-containers/netavark-1.10.3
+	>=app-containers/netavark-1.12.0
 	net-firewall/nftables
 	net-firewall/iptables[nftables]
-	>=net-misc/passt-2024.03.20
-	>=sys-fs/fuse-overlayfs-1.13
+	>=net-misc/passt-2024.09.06
+	>=sys-fs/fuse-overlayfs-1.14
 "
 
 BDEPEND="
diff --git a/app-containers/containers-image/Manifest b/app-containers/containers-image/Manifest
index 8894d3ce7afb..497875f21442 100644
--- a/app-containers/containers-image/Manifest
+++ b/app-containers/containers-image/Manifest
@@ -3,7 +3,9 @@ AUX moving-policy-json-default-yaml.patch 3285 BLAKE2B c0c9dd1380b6edec05162df12
 AUX prevent-downloading-mods-5.29.2.patch 322 BLAKE2B b3358abc9a9850a24153d188289068e3a8482a7b30e56b9440694ab78c04c37f10f5e3f31a24e82cbbe2f4c365d0df3dc5ccea1778df6dc9fe3dc12977169bf6 SHA512 1c78ae9dd35c7e8546984b32e149f29beaf955fe673264c0a3ea45b86046fa1628b5f74696f7224fcffbf54fc642d696848d0530beadf41be0084e4d77992a04
 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
+DIST containers-image-5.32.2.tar.gz 735422 BLAKE2B a0585c877b4679226d1760bf873ceeb5cba7f5177ab83fa6f8a161b1f3958f3d660445556b13b4221712c241cee94429cabdb1fd4186d4dc6edba7b032fce2bc SHA512 7498f9e446b2c205b033703641f7cfcb6c8bd8f097b12ef3f734c94772d63fc7b9b40a6700d53d93919d2c34772f079aa3cb7d9f9e5a130b6587f4fe2a558df6
 EBUILD containers-image-5.29.2-r1.ebuild 941 BLAKE2B fc67e64e032fdeabffe229307966f71732fd8de208e2059c866da21f246a0f356122f40bc3b2cdee53dfb4bf5c4dcd054e8bb844cee7e01835239ad4aeaf4c40 SHA512 f912c9f49786be67573ade0cbd1c7676fa4e13d054d44c947b55b7dd4e7faa5a98f5813e261d029666bd7d302452c63ee84fd1e734e2cbbe67dcbf2b098eff38
 EBUILD containers-image-5.30.0.ebuild 876 BLAKE2B 33c68c540357f5741622eadc8d6052a9fe916aebc4b490048eb0fe567f339534e3c4905b6a0549a3a24c2ac84438e9f80fff77d185846489df015e8ac58b7433 SHA512 0cda4908a4dd9e1c369053bd62cd78cf06b9e3e3286d4935e1359e2688b3428bd278961a54a09ad0584e565764a95f4cf0ce9b3d3baf8ed66ff0405c8cf059a2
-EBUILD containers-image-9999.ebuild 878 BLAKE2B c3181d706737c546931509afadfd1b5bff95b5217263c5501a2b67fe724e8ec231b8c6f9a2211437ea2acd792edcff3f99a9b6348eea6a803653bd212fc7f95b SHA512 7b9a47c89a1c0f0317fd23b19b9d6383f8a78fb04ea3c66fc6eba42f8b19a61274cff6d59d784d8aa6141e703d384bd4fecf50ecaccf614a24e409e2dec64246
+EBUILD containers-image-5.32.2.ebuild 832 BLAKE2B 28111e291882afa8f49ce40664039869a01a1514e3937c272002bc44d1497290bec6b45ac7f017fe9b7c04be1b7d0b52da385fa67183569236a128c22258de5b SHA512 4f6c5d60b4a9995a9c9c994cdf69af9d573a40548df9fbcedcdbabe63ca18398c4caf240f27f68ead4608928f9bc87060c517e25bfeb0070da26d167e25cb957
+EBUILD containers-image-9999.ebuild 832 BLAKE2B 28111e291882afa8f49ce40664039869a01a1514e3937c272002bc44d1497290bec6b45ac7f017fe9b7c04be1b7d0b52da385fa67183569236a128c22258de5b SHA512 4f6c5d60b4a9995a9c9c994cdf69af9d573a40548df9fbcedcdbabe63ca18398c4caf240f27f68ead4608928f9bc87060c517e25bfeb0070da26d167e25cb957
 MISC metadata.xml 738 BLAKE2B ce4b4915d322a13866596221e70f6d19fecf6835cc7d56cdf58d8fbb640aeeb68c03cc0e97a77db270879fd2fdd6751157d932afd69aa31256200ffecf7993e9 SHA512 19f3c8bc2109b189cf6bc8f37fedf7426d0a8c76efc3862d23a10a233cd9bbad20d0798601f999a60c86856d8825b5d4f91931388aded6185144399731fd09c7
diff --git a/app-containers/containers-image/containers-image-5.32.2.ebuild b/app-containers/containers-image/containers-image-5.32.2.ebuild
new file mode 100644
index 000000000000..2b3c1bcb8666
--- /dev/null
+++ b/app-containers/containers-image/containers-image-5.32.2.ebuild
@@ -0,0 +1,35 @@
+# 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 ~loong ~riscv"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+# https://github.com/gentoo/gentoo/pull/35012#discussion_r1473740969
+RESTRICT='test'
+BDEPEND=">=dev-go/go-md2man-2.0.3"
+RDEPEND="!<=app-containers/containers-common-0.57.0"
+
+src_compile() {
+	emake docs
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	insinto /etc/containers
+	doins registries.conf
+}
diff --git a/app-containers/containers-image/containers-image-9999.ebuild b/app-containers/containers-image/containers-image-9999.ebuild
index 40770f7a7d7d..2b3c1bcb8666 100644
--- a/app-containers/containers-image/containers-image-9999.ebuild
+++ b/app-containers/containers-image/containers-image-9999.ebuild
@@ -22,9 +22,6 @@ SLOT="0"
 RESTRICT='test'
 BDEPEND=">=dev-go/go-md2man-2.0.3"
 RDEPEND="!<=app-containers/containers-common-0.57.0"
-PATCHES=(
-	"${FILESDIR}"/fix-warnings.patch
-)
 
 src_compile() {
 	emake docs
diff --git a/app-containers/containers-storage/Manifest b/app-containers/containers-storage/Manifest
index 4544fb3cc9dc..7b3dd620a7a9 100644
--- a/app-containers/containers-storage/Manifest
+++ b/app-containers/containers-storage/Manifest
@@ -2,8 +2,10 @@ AUX system-md2man-path.patch 169 BLAKE2B 707d7396af9c6a04a3a4860198acb927d6fbc68
 DIST containers-storage-1.51.0.tar.gz 4283732 BLAKE2B 108401d68e617e6237e68cf2147113680e0452a8d15ee099da9872508800f3e7b8f2c5508e17d9c5f3d58fec4efc1c20f23f1a567fe592533c0e63efd05ae5c8 SHA512 89916b49438bce8bb774b4aa799676d4b3a946a0b5207a1b5241b1a3ac0875b06b3cd8e81d7e23332ceae6010b693516fc31d8c7f75a37e7ad3056a83c75b6c1
 DIST containers-storage-1.53.0.tar.gz 4291738 BLAKE2B 939ecca8a948165c42453d5461429d46249d73582869793969f9d4ae52d0a9fec25e6c39cd13190dad0730d9a17de7af1f237b3cf5434fd30f442c78e57ee7b3 SHA512 ea4a1d1899208eb8861e36beba206724b1f55cfd6007bc5a90c3a6a5e02835b4a2985814dc9363c31dcdc81a3fb331b29f51f5523628edb8d9c64c465d6dcaa3
 DIST containers-storage-1.54.0.tar.gz 4165066 BLAKE2B 30f3e4287e9db46fca81ae6c08d3016ec4be6f38a4981d310f06cbc72e4125b458446fe49675f53232efdf0bec58e9cd18aa90424677e1b726338f1fb62b7172 SHA512 e3535ab378bcb7b852d1ebf431e94696f53da469278f618c07dde2d3c8c6b5b3a4c71d65a9c14d1c1b4fa1e41a0550029468ef9ba1f24c1d3294a5aeec55b5fd
+DIST containers-storage-1.55.0.tar.gz 4197147 BLAKE2B 62bf192225383961d045f7128b4da32af2b1c9a5f9844e17b2264e81b8fa4494f6d2705ec6415245c0c5d889604e712d922d76c46e8ec6600dff5476b2a530ff SHA512 4c035385167c4c3f6048f8bc2bbbd3cfe9993390d580449e0e5b52576a27d286bd536799c96e46d946b9bfa61ff7263325145acddd7fabfbfbacb967d81843d3
 EBUILD containers-storage-1.51.0.ebuild 801 BLAKE2B 271a601daefd6a6be8cdf93a721f1032ba22b2796b916c2064db0a6df0ca451a8e4c01bc2ce5b8ad7bc35490e73ef9ef1e8603c3e873ffbcb611920d5e42d565 SHA512 9cf4a5851dad036a245a31a32d422e97eb7df4167ad4e1942ebda1d4392019a2663b74a8ae1c3eef423c91652421f65c2f6ca535cb845055685dcad87218cf9d
 EBUILD containers-storage-1.53.0.ebuild 745 BLAKE2B 924ce0854421964abe4ea85b49306064a9022c05bbb99b58eadbf21b779966510f014a91e0fa64653c9a365066cedb90b601d5392546978090706dfa6bfdcc5c SHA512 1c4282333c333bf63153ece3d646b05b14e336a36af3a77a0ec5d8938d8ae6c967bee096fadb43b0a4769b7034eb8d65c884c18af72c2ace6dc6fc767d024588
 EBUILD containers-storage-1.54.0.ebuild 754 BLAKE2B 86a35099cf6fad534353d098ae91b05aa218923cfb49cb32b9b5ac9088d87f48bdcffe08166cbda1aeaa0224e94b48e0793bc396c8be200e79f6ec381e5a6cee SHA512 883d27128c9a59e0f06e514dd7528c9ff8146debf139eab0da381a7af9737b264fd8dca4777108e4dcb22300bb8149ccd0f2b422e59522054b0cbf637519fd3e
+EBUILD containers-storage-1.55.0.ebuild 754 BLAKE2B 86a35099cf6fad534353d098ae91b05aa218923cfb49cb32b9b5ac9088d87f48bdcffe08166cbda1aeaa0224e94b48e0793bc396c8be200e79f6ec381e5a6cee SHA512 883d27128c9a59e0f06e514dd7528c9ff8146debf139eab0da381a7af9737b264fd8dca4777108e4dcb22300bb8149ccd0f2b422e59522054b0cbf637519fd3e
 EBUILD containers-storage-9999.ebuild 754 BLAKE2B 86a35099cf6fad534353d098ae91b05aa218923cfb49cb32b9b5ac9088d87f48bdcffe08166cbda1aeaa0224e94b48e0793bc396c8be200e79f6ec381e5a6cee SHA512 883d27128c9a59e0f06e514dd7528c9ff8146debf139eab0da381a7af9737b264fd8dca4777108e4dcb22300bb8149ccd0f2b422e59522054b0cbf637519fd3e
 MISC metadata.xml 744 BLAKE2B 7d5d87bb4b2ccb68bc4289bc7f3a0d92ff527133f3264baa124e77d5e4602ca7f656a5694d66356a0b4f705606d82f318f5e522e23d776e84e46b148d8e3e968 SHA512 025a1a5456b44aeb87cd5cb645917a779c5330b2ddad64bcd5eb8cf6d87807dd4319b503044d6417f1376eac3e159f3912df2cd15f1173f31b3f927c425791cc
diff --git a/app-containers/containers-storage/containers-storage-1.55.0.ebuild b/app-containers/containers-storage/containers-storage-1.55.0.ebuild
new file mode 100644
index 000000000000..be92b5c954ce
--- /dev/null
+++ b/app-containers/containers-storage/containers-storage-1.55.0.ebuild
@@ -0,0 +1,32 @@
+# 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' storage"
+HOMEPAGE="https://github.com/containers/storage"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/containers/storage.git"
+else
+	SRC_URI="https://github.com/containers/storage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${P#containers-}"
+	KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+BDEPEND=">=dev-go/go-md2man-2.0.2"
+
+src_compile() {
+	emake -C docs GOMD2MAN=go-md2man containers-storage.conf.5
+}
+
+src_install() {
+	emake DESTDIR="${ED}" -C docs install
+
+	insinto /etc/containers
+	doins storage.conf
+}
diff --git a/app-containers/crun/Manifest b/app-containers/crun/Manifest
index 983407122f58..e2904a82cbf0 100644
--- a/app-containers/crun/Manifest
+++ b/app-containers/crun/Manifest
@@ -2,9 +2,11 @@ AUX crun-1.11.2-caps.patch 1149 BLAKE2B 241d7b26555d32d082e3c770a61b6c01285b4e3d
 DIST crun-1.11.2.tar.xz 738176 BLAKE2B ef13475089c87599159ce00dd26fbb19c7f2bb9564352c1f8040925e521bb924cf28a8d1f37cc95ce7d1b2797b8654740e9ad08352e357c8c9e2d176466101e0 SHA512 ae35ffb9bd1c7acebfd7f6236fa6a7ad524593d8f2cea1203f0e89023e9791d2d5bbc5c5cfc32ee5f18ad80662a1659076ab5f4d5ff74c6026842f2dd12be977
 DIST crun-1.14.3.tar.xz 750456 BLAKE2B 5a63b5da2f85ff1a83d4589be224c5b7a1123b6d7714b90a63c1907b78d42392aff25ffe5d9a4127173ac47026d57e9c93a39f5ba4b07de7f9f3722c14e6d203 SHA512 d6645c519ff00dda5def6d58240600d15e76969489918d51c0def2fee7dbad6374f83e5afc14a998d176aa2944765df5cd84c3031b265a1931ab23f2fc965fc1
 DIST crun-1.16.tar.gz 1759549 BLAKE2B 1dfdf9177ae52e627c92e70e48a558bb355c87f629e95f1debaf6b7d8c38802110bd796545d5b2dbe3cac7f8de1f9c94e9b5f046cc618e73afd4c434188d585c SHA512 718e17abdb8c2a9e1fdd39f09e7e3e435d88c5785cc13c1e67f492847d7d938cf399aecc055ecf88720fa8f73b8539f057e3b0e53f10f4e382f5664a2243b959
+DIST crun-1.17.tar.gz 1773153 BLAKE2B 9f75cb6879e0b8cd47bb8939c1cf6f88d5e13e6d8932c652ea20c64501bc69fbda84dd061866a9c08e353848f39d1022bf67fbc0d160d5ef7fdc08c1edec03f9 SHA512 7556467c5e0e93bb7321e2e88de8a2f537340e3e0acaa5501eab8deb0f4bb93c4561f8d063156789d3ee98fdd49069fc52c0ed0c773bd44db476eeeccc16aa1a
 DIST crun-1.8.4.tar.xz 729552 BLAKE2B 8169518a0ddd8deb3820f7030d03dec6941d5d34fb73a036b82f15b0d8f2f702e117de00b829a16cb9976e118f5a5ca732b1cd572708f664cfeafc564f883824 SHA512 2ed80db2e7ddd1438bbe33e99ec2cdbcc55c4869504f719ff9302e834929752af09a59cd905accb37ee5f6cae3b9b16fd4f4c3fdab31db5fc38b007c1505bfa0
 EBUILD crun-1.11.2.ebuild 1829 BLAKE2B 7de0ec9104725bee5336c6e766077e87cbf7ab89ad9363ad409c4ba3df2f52b04294828fd4573cde35f740b0ef17f534b72b5d532321a98764f376daabc3fd9d SHA512 77c44e288c714be902a8714b9cbdf23245c24790a7df1766add33516b380083a2ad1034f19f38a95e135a692d6d92318d4ba9cfd23a644ec1eb476b2e59e3edd
 EBUILD crun-1.14.3.ebuild 1625 BLAKE2B c405ac2c2fce7b8167e8b8df618ab54bcd5d0b009ba88f94cd8d54e429387a5748e76d26e889a9791a331b8814a242fe89958cef8d0592ab8c17dbbd9bd3b042 SHA512 ed5b0d330c516edba0fed743d04c12cbdabd4ca6adc8704068d5af6f26a5e949181cadd13cd5072af09b54e92fc5df2c7a27fb7c0babed7837f5b0aa9d63b9f5
 EBUILD crun-1.16.ebuild 1817 BLAKE2B 969247d6c41416dd213e6b1a1bcb5683cad0c6009397a0207c358db8a470c5e33c5bdf89d317afe68a0db9e61897b102f322e94e592b7a8da97c5adbeb366230 SHA512 221aeb2a020ecc7a5d1ad8e1f1d7302b431518a1b89e795b6067fbda06e578b47d3240c690b93c5e9347142dd4835303cd4639d7252c687fa0a3acb2f4141507
+EBUILD crun-1.17.ebuild 1817 BLAKE2B 969247d6c41416dd213e6b1a1bcb5683cad0c6009397a0207c358db8a470c5e33c5bdf89d317afe68a0db9e61897b102f322e94e592b7a8da97c5adbeb366230 SHA512 221aeb2a020ecc7a5d1ad8e1f1d7302b431518a1b89e795b6067fbda06e578b47d3240c690b93c5e9347142dd4835303cd4639d7252c687fa0a3acb2f4141507
 EBUILD crun-1.8.4.ebuild 1672 BLAKE2B 388b4daf7cc6fb32e33e9114253cab94281abff7a17d260dcfa255042ba57489e2dff0b95bfa6f5d700fac01066c9d2cb282becc8ac90458ed7c10d5f967aa90 SHA512 69077ea7f94586489abf3b16d0cef1f793569ab2db7a3334c89c7af7e2d4561479de456838da9f5aa1a9eaa5c3f51471436aa66a8595f643ed8a60eda7f8a0eb
 MISC metadata.xml 1300 BLAKE2B a0ae27420fca097e4e7b5e983de3b76fef43bf13887bd5fe903da14e20c2f0ebd2fc273dae74e32e28c2768b5f8d6e5e6c8b4c9f07ca6d47e41902621173a167 SHA512 1699a89a01de32b580bc74bc747430ef7b1a6284b2f459b4041b22de0efbebda45778803deb512a61806ed8e2998b141caefb7830acafc68d42ce4343b193dd6
diff --git a/app-containers/crun/crun-1.17.ebuild b/app-containers/crun/crun-1.17.ebuild
new file mode 100644
index 000000000000..c2730e40b57e
--- /dev/null
+++ b/app-containers/crun/crun-1.17.ebuild
@@ -0,0 +1,75 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit python-any-r1
+
+DESCRIPTION="A fast and low-memory footprint OCI Container Runtime fully written in C"
+HOMEPAGE="https://github.com/containers/crun"
+
+if [[ "$PV" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/containers/${PN}.git"
+else
+	SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv"
+fi
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+IUSE="+bpf +caps criu +seccomp selinux systemd static-libs"
+
+DEPEND="
+	dev-libs/yajl:=
+	sys-kernel/linux-headers
+	caps? ( sys-libs/libcap )
+	criu? ( >=sys-process/criu-3.15 )
+	seccomp? ( sys-libs/libseccomp )
+	systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-container )"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable bpf)
+		$(use_enable caps)
+		$(use_enable criu)
+		$(use_enable seccomp)
+		$(use_enable systemd)
+		$(usex static-libs '--enable-shared --enable-static' '--enable-shared --disable-static' '' '')
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake "DESTDIR=${D}" install-exec
+	doman crun.1
+	einstalldocs
+
+	einfo "Cleaning up .la files"
+	find "${ED}" -name '*.la' -delete || die
+}
+
+src_test() {
+	emake check-TESTS -C ./libocispec
+
+	# the crun test suite is comprehensive to the extent that tests will fail
+	# within a sandbox environment, due to the nature of the privileges
+	# required to create linux "containers".
+	local supported_tests=(
+		"tests/tests_libcrun_utils"
+		"tests/tests_libcrun_errors"
+		"tests/tests_libcrun_intelrdt"
+		"tests/test_oci_features"
+	)
+	emake check-TESTS TESTS="${supported_tests[*]}"
+}
diff --git a/app-containers/netavark/Manifest b/app-containers/netavark/Manifest
index 5b2156323016..44ae47341123 100644
--- a/app-containers/netavark/Manifest
+++ b/app-containers/netavark/Manifest
@@ -1,14 +1,17 @@
 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.12.2.crate 156878 BLAKE2B 787fd23e3fa233a18a753aa55a43413aafff47b4d0733a9f2250d3f2159c1a3d0dd20272997701b3bc39a6a042060e3d2edad2418326873111d8183f0060560c SHA512 45e423e15945ce63e1bb5d2364377de65efd2f2edfeb0fd3522d2d8afb5cb60e1951b5810ac1dbdbbdf77176885b738ad864132daa8d7de858fb4edce340d7ea
 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.12.2-vendor.tar.gz 18364290 BLAKE2B e2f09d53ac8106196aa873732df66f0357a5e26488cc1b8f1d10f5f5d650d471272efca7f33860afe6242500d934ee22d9ea58c256e47e296ed57d8d563f1f27 SHA512 1396eb4e41282745949a7a511c6c44e703c810624e56b8ca9455fec52c59d4ec4333103e00188b2b8c08a60bb9e8a8eca6ed995103c0dc20b3b91c1e0a1d0dfb
 DIST netavark-v1.9.0-vendor.tar.gz 16032862 BLAKE2B 313bcde75f2355dab3fa4fdc82881109924c07408aa352e92b590356cf292cd60ad39d8ef31687935e3fed6f22ec8c3b8f26e6eae21fdf211c29c83b745c8a84 SHA512 a5c11dd47122490579a260b6ac3b1c8f01d1c2881e58dbcc5bece398c7d6ef01f376f8c342df4ef619b135cc92a95c48741c8098413c33ede696c87a9cdcc96c
 EBUILD netavark-1.10.2.ebuild 1352 BLAKE2B 7faefe36bd5adf3a4142bee1f8efe913645e57a6f10f7f81eb20f090e58fceb2ed4357e3793822b40fb2a7214adb854378223d2886cc03e2a3ca593895b9b845 SHA512 58f4239d9d399ae8c9d784659053587cb88e32487508ee2c4847d862f7a417c25637118b34a10b48f54de709e1f7d797d40126b17101da3c8b04e03384a8093c
 EBUILD netavark-1.10.3.ebuild 1350 BLAKE2B 14ca0aaf558e59252f15cd3403307d480318889e44a6b2bc1fe12350e1a52f92c94f89cd73cc45d0e94cf993278e57a46937e26e99133805a05db15d36eed8d0 SHA512 6ee734ef88f5c1a72fa670ec2c4f8269c9254af2048a3103d883d34d2ed077ac53cc290a26eb099117990d3f97bce3231482a26ceda2c3bdc2678c66b6c76eec
 EBUILD netavark-1.11.0.ebuild 1359 BLAKE2B 021487ea8354717f18cf89fa031293a61871ff6857f4e66e36297b12a120fbab747a790f1bac6a58be8afa004af6cfc1bb5d416955e10a517003a630da7b0b78 SHA512 7f5e44fc774b3315a728a6c2f609de311c0e084e5da2a74a38f7b1458ace4c414077212a69943923620c778241863830d0074d6098fb93e189455c728da714ea
+EBUILD netavark-1.12.2.ebuild 1359 BLAKE2B 021487ea8354717f18cf89fa031293a61871ff6857f4e66e36297b12a120fbab747a790f1bac6a58be8afa004af6cfc1bb5d416955e10a517003a630da7b0b78 SHA512 7f5e44fc774b3315a728a6c2f609de311c0e084e5da2a74a38f7b1458ace4c414077212a69943923620c778241863830d0074d6098fb93e189455c728da714ea
 EBUILD netavark-1.9.0.ebuild 1350 BLAKE2B 14ca0aaf558e59252f15cd3403307d480318889e44a6b2bc1fe12350e1a52f92c94f89cd73cc45d0e94cf993278e57a46937e26e99133805a05db15d36eed8d0 SHA512 6ee734ef88f5c1a72fa670ec2c4f8269c9254af2048a3103d883d34d2ed077ac53cc290a26eb099117990d3f97bce3231482a26ceda2c3bdc2678c66b6c76eec
 EBUILD netavark-9999.ebuild 1359 BLAKE2B 021487ea8354717f18cf89fa031293a61871ff6857f4e66e36297b12a120fbab747a790f1bac6a58be8afa004af6cfc1bb5d416955e10a517003a630da7b0b78 SHA512 7f5e44fc774b3315a728a6c2f609de311c0e084e5da2a74a38f7b1458ace4c414077212a69943923620c778241863830d0074d6098fb93e189455c728da714ea
 MISC metadata.xml 944 BLAKE2B 072bce0ea9bd5b8e5647c64b79ff77d29099607b9c67f5add104daad074a510a1aabbc8a02e5587ade6363519f13ceb07019302dd8c5e627c271b61faf468d49 SHA512 538b0be977375a193dfc889a6ab77b5ea8fd0d26fc6479b146829cb98333dcf8f1b0d030e75970ec90b01a8cc8a5e35f21857bdbbb111a0fc278f7df3aeb6eda
diff --git a/app-containers/netavark/netavark-1.12.2.ebuild b/app-containers/netavark/netavark-1.12.2.ebuild
new file mode 100644
index 000000000000..81168b09df45
--- /dev/null
+++ b/app-containers/netavark/netavark-1.12.2.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 ~loong ~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 $(cargo_target_dir)|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/Manifest b/app-containers/podman/Manifest
index 3caaccca5f50..87552b2c28e1 100644
--- a/app-containers/podman/Manifest
+++ b/app-containers/podman/Manifest
@@ -11,9 +11,11 @@ DIST podman-4.9.4.tar.gz 21733620 BLAKE2B 17d099c0a13fbbb77556742313c39995127fc9
 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
+DIST podman-5.2.4.tar.gz 23833172 BLAKE2B b04f9b7009d42eb15396ed918889c43e3164e433ca9eb8485c9c642ba121a48cd9030b365a3853935f01e323576931b199b3ba0d2ec90bacf2400e3bdfd60483 SHA512 c6dc05cb377ba6ca3bf7a8d7875c97af9e82b972812702e011e41f7922a4546166061dd5fb809fbef9dd13ee233744de7b7fe16906d8d9631133fc4205a980c5
 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-5.1.1.ebuild 3925 BLAKE2B 87045b30eaef024e8d1cdd3026ff606e93226c7ff73ccf5ccd8b551d10282b32abadcf31e7155dbd377f145276214e5957fa23a27603db3e198ec3d9f86d507c SHA512 effe8b84da241b764e965bcd36104b82f39ec85694c5b3b3c8b0aab35b3da262d35dc3cde2765127f58964be55b531d7e998a8f2e1dc7f342016cae6c9ff2848
+EBUILD podman-5.2.4.ebuild 3925 BLAKE2B 87045b30eaef024e8d1cdd3026ff606e93226c7ff73ccf5ccd8b551d10282b32abadcf31e7155dbd377f145276214e5957fa23a27603db3e198ec3d9f86d507c SHA512 effe8b84da241b764e965bcd36104b82f39ec85694c5b3b3c8b0aab35b3da262d35dc3cde2765127f58964be55b531d7e998a8f2e1dc7f342016cae6c9ff2848
 EBUILD podman-9999.ebuild 3925 BLAKE2B 87045b30eaef024e8d1cdd3026ff606e93226c7ff73ccf5ccd8b551d10282b32abadcf31e7155dbd377f145276214e5957fa23a27603db3e198ec3d9f86d507c SHA512 effe8b84da241b764e965bcd36104b82f39ec85694c5b3b3c8b0aab35b3da262d35dc3cde2765127f58964be55b531d7e998a8f2e1dc7f342016cae6c9ff2848
 MISC metadata.xml 1709 BLAKE2B 0138cd1f7fec54f2b15f8a8af7a29ee0202b0c824371ed6f45726c06e84c5a0c78e6446f817ee2b81c44320203b50c54072757b9cd271080cd07a072141760ce SHA512 65fdac8344812dd71fcf7018da7320a055870f48af6c4f623a9c65f5375e69eee142409ff3451c5e046eef648e0ac00bf96550a7dfc37be5b7aa3aff1a51d42b
diff --git a/app-containers/podman/podman-5.2.4.ebuild b/app-containers/podman/podman-5.2.4.ebuild
new file mode 100644
index 000000000000..fd1d527b4b94
--- /dev/null
+++ b/app-containers/podman/podman-5.2.4.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 ~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-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)
+}