gentoo auto-resync : 02:02:2024 - 11:45:20

20 files changed, 556 insertions, 50 deletions

diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index de9f0eb548d3..621dd88a5a30 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 8cd5e36c4cbe..3470d3e43549 100644
--- a/app-containers/aardvark-dns/Manifest
+++ b/app-containers/aardvark-dns/Manifest
@@ -1,6 +1,8 @@
+DIST aardvark-dns-1.10.0.crate 51028 BLAKE2B 81cdc4eb7eaff7359a1a12657b2bc42603383cf0f80a3a599ce9ce277e15ad83e9d5b36c3de3bef15b3201a1e60d86286ad61469d1d58ba2252b4c0174506ea2 SHA512 3d67f1b3c66aeaf4878c09e5e8fc34717cea6c348e0295bc0521c0c4144433656a3306731c24bb362a0e340e652b036b7544e544cca99b61590547bd7a6ce629
 DIST aardvark-dns-1.6.0.crate 49504 BLAKE2B aecd930746027146603e069febcd7a65c239f36cc22f5eba1077485cf251a46949b14876b7d44ddeeb259e5f196464f1c0ac9e7004c3cdd9b33ef5df9c447811 SHA512 c81b8a33a0287fa42fbe8ee582957e9f3614432dc53af95f1b6da8c4f919be35ef3dd7c707a47d2b5fc138487897007c1a8b99d991168e9ff1a25559a88dbae9
 DIST aardvark-dns-1.8.0.crate 49928 BLAKE2B f27808d6bf0f38cde54c32e11f8a70d6d66f99e97ef43c89494e2a736997fc60a0774e000fcab9338d815efab81aeeda497ac1ec82ff47bf10ecf250169d6091 SHA512 f8c85815e6e0e8d26fc5c40cf5864b0bb584b0d33b0e6b6e3fc4cae5459c81568a50cebcfa2ccedb62d7fdb0a5a32b92433c735cb3226396fca75556756b4195
 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.8.0-vendor.tar.gz 8307543 BLAKE2B c60ceb4b3bf16e651ba5d490a9969a47ccdb76b85f1008d6c69da9e89fb8b106587341f06a05cc6c2e9866214ef7bc3b89f84523ea940f15ea36bc5b0f9b3b78 SHA512 da300932f27f3fcde2f3bc2b67f0e5eb2184c428274844363fdaccc29c845e7f2efc238019f4bf3ff10bcd3e867a1d9dc603a0fac37686e579f47a3ac9cb2e55
 DIST aardvark-dns-v1.9.0-vendor.tar.gz 8085548 BLAKE2B 487f69a9c34832d74783b66c565a7c2f67f101527e8a44c215f167e4ea80f069846b25decbb423972cd42cd9ee7717efc21c3d1b0885a7d87c0fbdb9cfb9d26f SHA512 f7174f1c4275991a6a2655046697f32511586f53fb343efa25f995cc07663091a634e8a82395840b022b6b3c8363863cdf8c9b6d4e38984fb841978eef0b1f22
 DIST addr2line-0.21.0.crate 40807 BLAKE2B 9796b9a1177a299797902b7f64247d81d63d3f7e0dcc1256990628e84c5f92e3094ee8d753d9b72187b9aaa73b7ca67c0217899f2226ebd1076f8d25b458475b SHA512 afde7660dda30dee240e79df1fb5b92d4572520bf17a134ef3765e2a077af9e13713952d52e27fae420109b40f6e24dbce1056687dbcbead858ffc21cc7dc69b
@@ -253,9 +255,10 @@ DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac96759816
 DIST windows_x86_64_msvc-0.42.1.crate 664606 BLAKE2B 6c460cfa392aad0d11add200d652a42ee1a60052570527c4e85405f765255375729d4e26287f5246dcad65fa89ccadea23c5135171b311e6da5027e33149c547 SHA512 a651b1a34f101125f929c1d1f5e933691c7a5c19d0bb0c501fb6812236d2771805428e3bd5e05be7d72715595f5fc9e7978dd7934e5d92e9b78a41c2ece695b2
 DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
 DIST winnow-0.5.15.crate 145621 BLAKE2B 039262561227641c2d8b996ebb59c79718de3f2b7dd8e369fc3e341f3458b1e0213f35c575d615e87d5f89aad639c7a258e4efb2c10f58c2cd6e120482702cc2 SHA512 42dce18906f41e45e6dd75ba01af6a94501317dee8b45f4c7340f7c9c94f8935afe2536cd9ad5a91eef6f3a6135cab0a451d67a35b5a0fd69130a90e6aa47603
+EBUILD aardvark-dns-1.10.0.ebuild 1114 BLAKE2B 170688c618a1c4b4968435eebf70e35fa775018400be9ec87ff79db8f0d38eceb0277e83048d8eaea5bdde4a4c8335cb09e397114a09782d201f3d5c945a8847 SHA512 37e8bcaafa1f94b8842f03509819abdfa886580cda9f3dbad479d1a67de920393b7722414eb12f2c942605e1693d141257b7f3b9c289826f163ad55471a22d15
 EBUILD aardvark-dns-1.6.0.ebuild 3349 BLAKE2B e59c87a10b7ed211fa85c50b7410abefd76051aa3b1cfcff4d7210062964e3a8cf366d442423e93dc1a16a0334fbb3aaf1ee0f86fd12f8538dbd4dc36880ef25 SHA512 c635d4ba79cc45d938c137935282413421e6488b6317454e059d36efca0d6712ec541d16db54cbb52dbb758d8356553d87ebd7d580d374ac7b96105008d2a20c
 EBUILD aardvark-dns-1.8.0-r1.ebuild 1082 BLAKE2B ec6ad2f64e8cc7eeaa8461796b8d457119624ac7e94241ae08ebaeb890f3f0217726dd48e65023e504818ee7a1607f2ca3317ca6a11cc5c6b28f096f16ca5688 SHA512 61c30596056048b7c9a0e9b46fbb9e6e2d0007eb56c4158f858db9a8d52cba40bdac99aedd93101de7939c13634bf38aecb32091d50fb29365b54b0aca7d5452
 EBUILD aardvark-dns-1.8.0.ebuild 3541 BLAKE2B 75614368a3c8f6db8847ae0081612e7b7c88b9869e4c99f1f2667e234e48865087f909d2b888cbdd305ebbc0ccdf30e7bd8cdd5b3e889dbd5c487fbcb87c0cf4 SHA512 5974ad1f75492b2bddd88ef5d1ac11725686dfe35cf501857ea87609b16a46edd3f6b133d6758b6dd53325431bef858fbc0021fc53bd87b4e121fcc5f99e4a1d
 EBUILD aardvark-dns-1.9.0.ebuild 1112 BLAKE2B e3451c2ba5fcb1a3ca7d7607dd093e1f33cd4453d69b26ca08fbead10e1340277a27393f342b36b0b8f2e8e66a062c9b77b4f4211ce2bd1b990bf9c56473070e SHA512 7285cf3bc416de20396632d97979a2cce6136c2c885a288f3048ba033d59e84ac3b942ff9f7e73d18a3f21c54787631bdc5e42df63e3de2bd981ba354a803345
-EBUILD aardvark-dns-9999.ebuild 1109 BLAKE2B 7dbdcec7d81c8e9838447affec52f92bbb914688c4703d09d0977aeedaa95cfdd4e8824d17012bd7a278475d1577286043ebf83ef0798263fa3bd4b8e95e3d6a SHA512 ee507b8e9f0b0a893ea1fb5b4b2f51356f373e12a2b53f1480ac41daf6b3c6f63de24684079fa8fba7cfa80d245efc50272afa8b2d66b3a54192eb047b6692cf
+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.10.0.ebuild b/app-containers/aardvark-dns/aardvark-dns-1.10.0.ebuild
new file mode 100644
index 000000000000..cdf0cb032c10
--- /dev/null
+++ b/app-containers/aardvark-dns/aardvark-dns-1.10.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/aardvark-dns/aardvark-dns-9999.ebuild b/app-containers/aardvark-dns/aardvark-dns-9999.ebuild
index 0ee642075eea..cdf0cb032c10 100644
--- a/app-containers/aardvark-dns/aardvark-dns-9999.ebuild
+++ b/app-containers/aardvark-dns/aardvark-dns-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/app-containers/containers-common/Manifest b/app-containers/containers-common/Manifest
index 6b67a40bd43e..4fd04f10ec4b 100644
--- a/app-containers/containers-common/Manifest
+++ b/app-containers/containers-common/Manifest
@@ -4,7 +4,9 @@ AUX fix-warnings.patch 419 BLAKE2B 55f23a30af6225b6e56dc7ba97d1af8052a6fa06ee7e2
 AUX policy.json 256 BLAKE2B 78693988b98b88c35807db755bea923203ab289435d2c4ffd914ec52904dadded467ff131d90b337bf7534d533e478420a0c81599858a9012668bc4d1815144f SHA512 120f43f579f48758af6b8292fc2cfbcb5ecc46564d2d16afb74dbd1c043de44daec6633ff585b0046c55fd48aed6dbc2901623c753ec13670d3fdcecb19a42c5
 DIST containers-common-0.56.0.tar.gz 12616120 BLAKE2B 6495ca7d0c9134bc8bd5f7b7541bb4f1160c74abb7a64bd4d2124104ea563f5381f0092da20ab45d81929a8632b1fcc1107ac05fdae011be446cff14ebf88c45 SHA512 4af720be95e6b5ca7d0664f99a389bf092b9f45d4e0602d9b49ef1d21b359d2307a94e0c88378fe0c751f5b40db54d7aab67eb497185a289cea9288cbfaa042c
 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
 EBUILD containers-common-0.56.0-r1.ebuild 1741 BLAKE2B a40e4ef18f0d14504c5dddb1f58c579a79e2abeb49e43a2a829de0ae781ce336595def5da1bf819d27e783d4fdbbd05da4934e4287fe5a0312dea30bd415a002 SHA512 6bd6d804f9024cdcb9ae5a063de97d38a9bcfe2d7a09c2e6d5cfd9a24cae55e1b081290f70bbefc5dd7c41b5309a123151b6ffc5c2bc57a55ba2aeebda1a7de7
 EBUILD containers-common-0.57.0.ebuild 1750 BLAKE2B e3146c256b3b613489dc9761702a0dad914f8989669381c5eb222df39adfcb80793d9e15c3b6ec4b9ecbfa3ef1f4ce19c9ae18ab14d86ba7d92c83e14a1d1d6c SHA512 48fec563927b44bf7e25d341f4939dad0a89dac98bcdec8c8340b7c308f1f5f3ca6065a8199eb104fca18f85da2c2c43000f1e6e59717dad970de53d75f9021c
-EBUILD containers-common-9999.ebuild 1462 BLAKE2B a209a8769afb6f20b6ffb0fdffbfacc8f2a5693e24f6225fe489db3638d934fa7f4b1cbc048076b666d5ca7bfd8ba1f82bc4f460fac62bab7a6725df6aea89e4 SHA512 f8949aaa6bf99bdab9af41c6de5e270b2d4b2a3a5b6b83ea243ad0c1de1670a677033e8a45331c4e9ea2c857f5f9aa4d4ef147920136adcd17616294ea64b55a
+EBUILD containers-common-0.57.3.ebuild 1428 BLAKE2B 483ea726e31c955ccb059aa58e05027033d2a3d682b40a31423472a15c2a35e1cdc231019dcdb184050fc09442bcb93a4bee4e9d45c9c69a1f36622eb68f68af SHA512 4bb587c92ffb790886ca468fe997357c50bf4c21066f276b48d134252809f2ac7efe8737700cae0a28c6f7e3ee83873b4a6064f5a398000587073a3065647624
+EBUILD containers-common-9999.ebuild 1428 BLAKE2B 483ea726e31c955ccb059aa58e05027033d2a3d682b40a31423472a15c2a35e1cdc231019dcdb184050fc09442bcb93a4bee4e9d45c9c69a1f36622eb68f68af SHA512 4bb587c92ffb790886ca468fe997357c50bf4c21066f276b48d134252809f2ac7efe8737700cae0a28c6f7e3ee83873b4a6064f5a398000587073a3065647624
 MISC metadata.xml 630 BLAKE2B 36b2fe2aef65f5bd535f6a420b8ccfc236f286d975885e87ba7aba725610a1660bc3008422eade412fca9a7d13fa37b2143b4ed32091e904aec048a01b453a69 SHA512 4221bff3c63b8f895e7814f6f957c25d328a8e6073d8aeabdc328d5cf194faaaf629796f038d54c93d7a365586130f094d5060a9ae8627ae248db764173696f7
diff --git a/app-containers/containers-common/containers-common-0.57.3.ebuild b/app-containers/containers-common/containers-common-0.57.3.ebuild
new file mode 100644
index 000000000000..5a0aa2f26d0b
--- /dev/null
+++ b/app-containers/containers-common/containers-common-0.57.3.ebuild
@@ -0,0 +1,59 @@
+# 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-9999.ebuild b/app-containers/containers-common/containers-common-9999.ebuild
index 5eca915dd606..5a0aa2f26d0b 100644
--- a/app-containers/containers-common/containers-common-9999.ebuild
+++ b/app-containers/containers-common/containers-common-9999.ebuild
@@ -22,7 +22,6 @@ RDEPEND="
 	app-containers/containers-image
 	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 )
@@ -33,7 +32,7 @@ RDEPEND="
 "
 
 BDEPEND="
-	>=dev-go/go-md2man-2.0.2
+	>=dev-go/go-md2man-2.0.3
 "
 
 src_prepare() {
diff --git a/app-containers/containers-image/Manifest b/app-containers/containers-image/Manifest
index f180b84b69db..a82b30a10f63 100644
--- a/app-containers/containers-image/Manifest
+++ b/app-containers/containers-image/Manifest
@@ -1,7 +1,10 @@
 AUX fix-warnings.patch 397 BLAKE2B a5922e061c825e25398fc3fccdf683abf8331b065337ff240227478d7d3ef5398957d56a430c0b04aa823033b56653e87c8186065e5898818e75310451b347e0 SHA512 a96ab3fea76be4751d6dc3893b4272b063c854503e1a65b4501819a5925f3911c285fbfb4ee6827795a41c696015cc06f446e4ddb1318e21cf0141e15804833e
+AUX moving-policy-json-default-yaml.patch 3285 BLAKE2B c0c9dd1380b6edec05162df127085ba74b7f426b00f7565bf4f14a2fe1809fe66fa13b19a84d84ae32dc3179ea0967aff8d8e24875ae706906f2427120fad801 SHA512 a3e8d2cbf3797e998636feaf963968b1e382ab1376b4d6a42bfa7187359e04d782aa043debd20f4ea2b1e4280d049029a71d8525a3fd2a87c780523eedcaf04f
 DIST containers-image-5.28.0.tar.gz 688100 BLAKE2B 0cee8be579bd11eb0524590d8afe16b6ef863d7adfd74db51b68385142804c8096fec3f2a492e0d5a5021eba9edc91219b327138635aaa329c6ef7d0c01129c8 SHA512 0b76539e04016f5f1067c576a877ace475f25d0f0840fc969606601105a8a7f0e242cc054b0a2cfb6f1b751d850734360a524c78563fdf2330c8ae8c11bba1cf
 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
 EBUILD containers-image-5.28.0.ebuild 806 BLAKE2B 0e8bc9c407a1d6951ccc8faa053a8c2634c013a3c556f970bb2d6e16e5dce371cdaf9c343c533c455ce856d25d50b8c48bbb3744c06ee326d92ba9049cb34b70 SHA512 cb5c1ab825791ed3e856c87394fbe827e3dec8c40857201a5f02f6d50a32859cceb18e073455670f28e2b5ad6b7c7fe966eec2c2166bbb516b15d3ac0f100281
 EBUILD containers-image-5.29.0.ebuild 755 BLAKE2B c6db87c8e66eb57b0820b92c25bb38cf3e14a4c91ca08b703fb09e9fbbc2457f87f3e032001f4ca26a81f49daa056cfecffa986ad1ba229e0774b5a9db8d83d8 SHA512 c59433f5c71dfeca32280916dc8f4849882e78160cf7a8aa642c2356936c9ff3476542551e132e92c754ee317534c77f4c374e8d0abc5675b9335a7a3f799091
-EBUILD containers-image-9999.ebuild 742 BLAKE2B 15567e62ad04fa2605ddef7edb2a4e356235ef664bced96eff5f6e8a90197e4678e2ed7fabf826bf0e56a6a85953484e76930c6b214d100b0c214de4343e59c8 SHA512 5eeb9b83dde0647458f5614c711fbb8865357a926a7527f31659d500af8152599989507f4a5a949e21f7ca261fb84c27768c993524156962f75868af000b1201
+EBUILD containers-image-5.29.2.ebuild 837 BLAKE2B d1db62b98283a3fe71401ed0b1c79303b2c2cd99da409f67566158ba691e48f88da6f7114d64f114d3da3361528da935ce484ccf80504119b5ae753157af52c0 SHA512 e7eb31c64c498cdeff6b08ad0e688c3d712ed072b28420441aa9dd9e124dc2430fb233c316816b1a14a96f24d136570ad48c1b51d9396b6df16fe4b7993dba99
+EBUILD containers-image-9999.ebuild 772 BLAKE2B 9f5e2c2e4fa8e9cdc001100ea888e6dba211492b98ba4ba5fbe540611ba386f27f97141634b697185e0fdb9b10d0e39d1482392c8376be8aff6a06bcac027cc8 SHA512 766acfad54db8b4e902947f6dbad65eda12bc15ce4fc1f8e151fe71b2f6748611462228455149efa2da4345c10964d8db84b391478b2d2903d01fc5dab3bf203
 MISC metadata.xml 627 BLAKE2B 3853a7a5cd67aa9162b4e6a198369680070780508e03dadd3e90e7551d94e1bcd1c1220281905f8fb99611ef55bc171eab5e8c15be89e26c553f1b3299bc9d1a SHA512 f1d276a06c7af474488bfa76cc2cab6fa96fa7f4d3938c3016d9b6692dfeb943e3fad8f29310de26d475077b73457739d84ff90eb61bf532abd5c330bf61b91c
diff --git a/app-containers/containers-image/containers-image-5.29.2.ebuild b/app-containers/containers-image/containers-image-5.29.2.ebuild
new file mode 100644
index 000000000000..0a3bb536ab4f
--- /dev/null
+++ b/app-containers/containers-image/containers-image-5.29.2.ebuild
@@ -0,0 +1,37 @@
+# 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"
+
+# https://github.com/gentoo/gentoo/pull/35012#discussion_r1473740969
+RESTRICT='test'
+BDEPEND=">=dev-go/go-md2man-2.0.3"
+PATCHES=(
+	"${FILESDIR}"/moving-policy-json-default-yaml.patch
+)
+
+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 7e9e9b9dad81..4fb96c1222c3 100644
--- a/app-containers/containers-image/containers-image-9999.ebuild
+++ b/app-containers/containers-image/containers-image-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,18 +12,15 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/containers/image/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${P#containers-}"
-	KEYWORDS="~amd64"
+	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"
-}
+# https://github.com/gentoo/gentoo/pull/35012#discussion_r1473740969
+RESTRICT='test'
+BDEPEND=">=dev-go/go-md2man-2.0.3"
 
 src_compile() {
 	emake docs
diff --git a/app-containers/containers-image/files/moving-policy-json-default-yaml.patch b/app-containers/containers-image/files/moving-policy-json-default-yaml.patch
new file mode 100644
index 000000000000..1713839371a5
--- /dev/null
+++ b/app-containers/containers-image/files/moving-policy-json-default-yaml.patch
@@ -0,0 +1,100 @@
+From 45441676e34e6410ae8af6dbb46b6161c5c81a7c Mon Sep 17 00:00:00 2001
+From: Rahil Bhimjiani <me@rahil.website>
+Date: Thu, 7 Dec 2023 14:12:26 +0530
+Subject: [PATCH] Moving policy.json and default.yaml from containers/skopeo
+
+It makes more sense to keep these 2 files along with their man
+pages...in c/image
+https://github.com/containers/common/pull/1757
+
+Signed-off-by: Rahil Bhimjiani <me@rahil.website>
+---
+ Makefile            | 11 +++++++++++
+ default-policy.json | 14 ++++++++++++++
+ default.yaml        | 27 +++++++++++++++++++++++++++
+ 3 files changed, 52 insertions(+)
+ create mode 100644 default-policy.json
+ create mode 100644 default.yaml
+
+diff --git a/Makefile b/Makefile
+index f329ef083..5e9799b19 100644
+--- a/Makefile
++++ b/Makefile
+@@ -24,6 +24,13 @@ GOMD2MAN ?= $(shell command -v go-md2man || echo '$(GOBIN)/go-md2man')
+ MANPAGES_MD = $(wildcard docs/*.5.md)
+ MANPAGES ?= $(MANPAGES_MD:%.md=%)
+ 
++ifeq ($(shell uname -s),FreeBSD)
++CONTAINERSCONFDIR ?= /usr/local/etc/containers
++else
++CONTAINERSCONFDIR ?= /etc/containers
++endif
++REGISTRIESDDIR ?= ${CONTAINERSCONFDIR}/registries.d
++
+ # N/B: This value is managed by Renovate, manual changes are
+ # possible, as long as they don't disturb the formatting
+ # (i.e. DO NOT ADD A 'v' prefix!)
+@@ -46,6 +53,10 @@ install-docs: docs
+ 	install -m 644 docs/*.5 ${MANINSTALLDIR}/man5/
+ 
+ install: install-docs
++	install -d -m 755 ${DESTDIR}${CONTAINERSCONFDIR}
++	install -m 644 default-policy.json ${DESTDIR}${CONTAINERSCONFDIR}/policy.json
++	install -d -m 755 ${DESTDIR}${REGISTRIESDDIR}
++	install -m 644 default.yaml ${DESTDIR}${REGISTRIESDDIR}/default.yaml
+ 
+ cross:
+ 	GOOS=windows $(MAKE) build BUILDTAGS="$(BUILDTAGS) $(BUILD_TAGS_WINDOWS_CROSS)"
+diff --git a/default-policy.json b/default-policy.json
+new file mode 100644
+index 000000000..dffc54a62
+--- /dev/null
++++ b/default-policy.json
+@@ -0,0 +1,14 @@
++{
++    "default": [
++        {
++            "type": "insecureAcceptAnything"
++        }
++    ],
++    "transports":
++        {
++            "docker-daemon":
++                {
++                    "": [{"type":"insecureAcceptAnything"}]
++                }
++        }
++}
+diff --git a/default.yaml b/default.yaml
+new file mode 100644
+index 000000000..9e892d760
+--- /dev/null
++++ b/default.yaml
+@@ -0,0 +1,27 @@
++# This is a default registries.d configuration file.  You may
++# add to this file or create additional files in registries.d/.
++#
++# lookaside: for reading/writing simple signing signatures
++# lookaside-staging: for writing simple signing signatures, preferred over lookaside
++#
++# lookaside and lookaside-staging take a value of the following:
++#   lookaside:  {schema}://location
++#
++# For reading signatures, schema may be http, https, or file.
++# For writing signatures, schema may only be file.
++
++# The default locations are built-in, for both reading and writing:
++# /var/lib/containers/sigstore for root, or
++# ~/.local/share/containers/sigstore for non-root users.
++default-docker:
++#  lookaside: https://…
++#  lookaside-staging: file:///…
++
++# The 'docker' indicator here is the start of the configuration
++# for docker registries.
++#
++# docker:
++#
++#   privateregistry.com:
++#    lookaside: https://privateregistry.com/sigstore/
++#    lookaside-staging: /mnt/nfs/privateregistry/sigstore
diff --git a/app-containers/netavark/Manifest b/app-containers/netavark/Manifest
index 100e6cf5b586..989b7051e964 100644
--- a/app-containers/netavark/Manifest
+++ b/app-containers/netavark/Manifest
@@ -117,9 +117,11 @@ DIST mio-0.8.6.crate 93658 BLAKE2B 32b10be05ef5d1ed44da41cd03c1624ccec78b6a89b51
 DIST mozim-0.2.2.crate 216563 BLAKE2B 56326eb9954dbd3696cfa009cb9ba40e1498412353cb56d2660bd69a37aa71c3d060c19a47416d77bb44f051258ad78a331ceb4289ea935a7a4b50266336a16d SHA512 bfc0763267bfddb472cd82965bc8ed76d47f2dc99f082c8b02b16df73bd9255695e62648c53e2a2325decc45f128e94d086c03af1de20e73c3244ed27cf719aa
 DIST mptcp-pm-0.1.2.crate 14732 BLAKE2B 6cce10cbe3ae86490bfa6f90f9a256062de24619292ad994fe7a7ba3e674b29ac6501ab6acc3c97e56d158d464e02f7a907aad5758d732e65c899418145122c8 SHA512 dedb02a90b261b66076e5f0c34caec97aaab623fd86756f9b731bc200666045f8c39c48d5741327bc8d46ea6a6225bd42d5deeae233792f0ec8e8c4b418162d9
 DIST multimap-0.8.3.crate 13518 BLAKE2B 7e00324be2944f3ca38bf02bfe37f47313aa501fc166ec417cd05f11059b14aa761b58f7a737792e2f9488ef5e7825fbb13cbb6ba2ce4935f4c39414fe069730 SHA512 8580982dde6624a0d181cfdf6cc2293c368762b548f32d196fb7a29fb698d1cb743bc2572ca284c6ecd107a632ea2a428fc998c05df164437f2cb470d24d23cd
+DIST netavark-1.10.2.crate 154261 BLAKE2B 2da5b12917f5db01d82c47808f403e06d6abbcbad0b777d1871de73d52d25219e3d6f8db48feb862aff8a20ed2184c728e813871aa1acc1d02e3997987a932b6 SHA512 362dd2652b3a9d9d1dec99cd85bc6e74b323d86b79ded742e68472e0b58881a5306d7217218d88e27d5e1c4094f2d67c9cb766d4b4c1ee2185c8b4fcbd299e3d
 DIST netavark-1.6.0.crate 124778 BLAKE2B faa702392cf6952ed410a67f0a2e4a92cf2da002c53ddd3d7533e5236940a5c35a72e6bcb167c5e3c8ab2eb823bdd8971da131cb41cf3e704d909a0ec5f405c9 SHA512 c2764b9bdd71e6eba864b52044ddce3b5f67a945ee58e237d9c951189ace14200885a8f8678377b416b9254fa8f5b74b67f80e338646918cf9b0aeeebe9c95da
 DIST netavark-1.8.0.crate 132651 BLAKE2B 3659cc97d784c7575d9ce4602461d151ba53ebf998ee9f819a05ab796d24d582f20700fd4f1810219245af118cc885c74c176777b147b1d175b68e1465063f48 SHA512 0094e2831ec3a0d92d18e7efb0ba6972ab4b5ddafaf0465f990e9ac07e8e8952233d8ddd2cad6c1fd450144714fc5e92c6aa079d415764ab1d1e3a6db5b789b9
 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.8.0-vendor.tar.gz 44454969 BLAKE2B ad13f7b80d9f1d7ae82cbf39e45244e7609f7881474637eb64ad765e00c01566b72cb4e88d0c58c60e638ce7a400b59bdbb1aba5ff68e1ebf53103a1945e203b SHA512 2d35baceda02c44a2d5393caab5391f4dbf27c92c18ca464fe06922656ed9ceefe32475b49948e76a20a77463ae7bd441a3962f062dc91aedd67ef1334fc8551
 DIST netavark-v1.9.0-vendor.tar.gz 16032862 BLAKE2B 313bcde75f2355dab3fa4fdc82881109924c07408aa352e92b590356cf292cd60ad39d8ef31687935e3fed6f22ec8c3b8f26e6eae21fdf211c29c83b745c8a84 SHA512 a5c11dd47122490579a260b6ac3b1c8f01d1c2881e58dbcc5bece398c7d6ef01f376f8c342df4ef619b135cc92a95c48741c8098413c33ede696c87a9cdcc96c
 DIST netlink-packet-core-0.5.0.crate 14989 BLAKE2B 3a432de3545ad7f203d6e27e4587171bfec781dd86695acf124b0672e29bd1f6966e3ab66fad2e56a507d8377db6df2b8de8f3a13612dab39a73d8ad9459690e SHA512 e4ccc75964be99251d1bce7267711f57167b39219ee6b9bbd4c184def0a323c136b82ca93bce5a0cdcc7e842d23435a042e23556e69e91452d74d3292f65deda
@@ -252,8 +254,9 @@ DIST zbus_names-2.5.0.crate 9861 BLAKE2B c171980b661d97142abc873eaa0acbf21300ac0
 DIST zvariant-3.11.0.crate 71214 BLAKE2B 19a83841b8dda8a733ffca5da2b143708bb5a96627297da866f85d3f021a5764709cc87dc49c833207f7f66f6fcf0516649a27fefd6144d02301a9f1a2003141 SHA512 17860c24098048e510e5dd8c8e9bd5c94ecaddec86ef4cc54dff23fb89e23ec3a5ef8348ea0e6d24b6fb8422bcf427c17ec2ae9b5a3f2af71b72218d2461bb54
 DIST zvariant_derive-3.11.0.crate 12364 BLAKE2B 611dd5211c398941d3967692ca462a365222c3c8dee0c8c7869aee345e9094176692100e77ac07ffbf8f2985efae472248fadc735f7a245dc52505b6a0d88274 SHA512 9030aae818ab3b54774ab50e6674c05f9f3c5ec640d052a8c9fdba6520b608273deab463e0e08e77204754c546a6161b07b7cf4540db1073a95c04fd452aa3b7
 DIST zvariant_utils-1.0.0.crate 6230 BLAKE2B cf0176e9187d493cee4d2f33945754695dcfc5c1fb56bf750667c9dcf1dd4d15c4896407225cfe26a6f63b9bd0d3511193d7bae8a11bfa3fa6f50884c79b6bb2 SHA512 51febffe7d013bf74ab9d57257d7db0ba86bb94a0bf8d5c55125de6a329903f07a7906103ed53b1705b1ba364c38b4f6aad7cadb53761f740fce6bf957e174aa
+EBUILD netavark-1.10.2.ebuild 1367 BLAKE2B fb89d2b127f095facff1922161ddf22828a01cdb697aa1657c830a8fa8e7e40a983223354a85d958438e1d99c11c7b54d2c7c703e3004fe44c79ebe1753ff4c8 SHA512 0c666962b408b5a289031feca6f1cdaf61e7c7cdb21c7cb7f238962736de5b679a1aca5bc3e5a8853e77749cac0fd6e8d4348d5e99335c3040e5e312727ab6f7
 EBUILD netavark-1.6.0.ebuild 5523 BLAKE2B 1b17645b21bfcd59a292a7b7c1746c2567cdffe96964242103499f6c09d69714da99f3c8ff91e95f6e2f2b14c5eacadc95318307794fc6b413cad19a62025bed SHA512 211ecd99a56ad0ce02a3b7b6f0cd83bc340a3500c4c16ade7a21eee589d273d2721d0b1e38d337555d1ab3f67c01e37fe7ad02430161bd39906323d7eaebe1cf
 EBUILD netavark-1.8.0.ebuild 1226 BLAKE2B 14c7df416e2075d3272095ee741e44c142450f8d28c01adfd723df8965a81da07634208dacecd97e1a4ad12a950a02a20328d84244319bde44495cdfb7021d4a SHA512 605883d52ba6f8958c147598d3a37dbd9ac81c98837decddfd5808d6ceae39aeb227c3b87c38f8792c9e550224de27d5a5852e6244d6ebe7c58f306708d3f2a2
 EBUILD netavark-1.9.0.ebuild 1365 BLAKE2B f79408066a3e792ef91030a9e31ba6e2221b3d24e1ac23f14336cb66e01259432b422a5f5f4e638963439698e399453b146d5e44c92a01357c03f2eb2b3d132f SHA512 5d841859d44888fa894dc5d8a61eadbd8311c60d0b6b343fa447d07bdb1e708e9c148bae3775040d771ec7fb157363270d8cff0080f3fa94865bcb5c2c54dbe5
-EBUILD netavark-9999.ebuild 1367 BLAKE2B 7cdfc8bbab04e3db45cd2dfec908197f67614d5fec3ddc4f457d1bf30ddc7cfb50e4b7a7266224e9ea1a48a97a48b46551700b5ba942dc226ef15c153b96f4e6 SHA512 983e219f63bc7c7103b3ffd1371135edcd4094799247e3ce394047e05b40033a3bbeba1a499bb9ccfff828e550da8923100189ef0eb6d7111c1dd9b477b522c2
+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.10.2.ebuild b/app-containers/netavark/netavark-1.10.2.ebuild
new file mode 100644
index 000000000000..a18be8dea54d
--- /dev/null
+++ b/app-containers/netavark/netavark-1.10.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 ~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/netavark/netavark-9999.ebuild b/app-containers/netavark/netavark-9999.ebuild
index 31531a21ec6e..a18be8dea54d 100644
--- a/app-containers/netavark/netavark-9999.ebuild
+++ b/app-containers/netavark/netavark-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/app-containers/podman/Manifest b/app-containers/podman/Manifest
index e66bfeee971a..8b0edbf182b5 100644
--- a/app-containers/podman/Manifest
+++ b/app-containers/podman/Manifest
@@ -3,6 +3,8 @@ AUX podman.initd 704 BLAKE2B 2fc4ffaa3b971774957ea244e05d851fa2797ec074529ea7c23
 AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690cac3c0cd905cd75add19179f99e26f29edbd963d5f44c38a3a2db0b5a3613dc665ab801654eac13dc2e SHA512 0136d063b15b07c41a9370ba1845c4f368ec46a7a30683b7ff7cbb0b12e5b2711c9a45329f5102af6a969e562edcec006a8de9055e43e1caf9395847d0c5ec45
 AUX seccomp-toggle-4.7.0.patch 400 BLAKE2B 9f02e58c06b507a294207c66bd5ea218f87803a9b9f0ddafc86a8b21df912589357adf054302e5a69d300155bdf8dcd8b77c18c1ddf8a4042ae1f05de5faf46d SHA512 e507e3a52d2f5f48b65fdb77ceaa095f13fda3e834dafc976bcd291cb35755da879c9c99b7950b2905399dedf4ac3370bd70462343648613a7c6aedc141d7ef7
 DIST podman-4.8.3.tar.gz 21565162 BLAKE2B 13d2e5800dce96ba8c1671f251c2809dc0166198b807978d44b6f10b4dd2095e909678a12518fed84a0a1b5eee5a71e944170eb55350c3af945a63910f9c8082 SHA512 13ade866b888d32ada3b38130d7cc4677591136e25234e040b478c5d002d1b7907ed46731996d25cc41b992b98b75f109c6e6eea44251f4ad89162b20266976d
+DIST podman-4.9.1.tar.gz 21573896 BLAKE2B 5005c84b0c430b790d64401d9b7e45cf8057f16add0535042ee9cd5f7af608461a13e266099fbf74631996edced3869bd019186266a7d1af82237db6fb990923 SHA512 59cece9806df3b69e202b39e0a45d71b3f6fd77dbbbe1452bc046468d5504fc52c21ad3056a89bab7d3f9a86c86e22369902e0a2840ca43e0dd3a6c4c10affc2
 EBUILD podman-4.8.3.ebuild 3642 BLAKE2B 8274534651ca251b5f967c3d5d2f4f1d74cb55b1f9454d8648bd5ef1d054688371c9a27b723b43d66760c71ff00ff2794f8cc1a1461a8862ad9fcdc118cd0aec SHA512 62cfe0c97f470df66b0b29d849bf5845e5b3a931a3b526c762c267a992791768d78b2ed11d0da00f733c58d02a37c74d955d71ff7eee0edd65e9011b93b38bd9
-EBUILD podman-9999.ebuild 3644 BLAKE2B ac04302a9c2da6e897b7b000b3578979e97cb9aec9ff778f6662811a019d3a1a2a191a458eb2f084df71e3a038d50c55f4f36da226e1565825385a1ef006d6e9 SHA512 4c469f14741cb925ba672eaa84f381a2375ac5fb6d5f7c9d1cad7a714618e99988c5cdd9a2ed63e12a54b7a3da45228aefd6bd2bd5b3ba99ec87064c87d5c73e
+EBUILD podman-4.9.1.ebuild 3644 BLAKE2B dc037fc2b393b17507b8a5f0f252fadf3c888010584dae59a159758c829c1484f7ce5bd1b12375e6084260618f1e72a7beee08ca71ea8f557a10d68bfe6f2b77 SHA512 3ad8170f00ded1bc778ac9516c73ce40dbc77ee9ea28f6fd8cdc3c9860f85b23462a919bd941d1f04c5d6cce92a4d651069d4af8528029fa33872c0976edec54
+EBUILD podman-9999.ebuild 3644 BLAKE2B dc037fc2b393b17507b8a5f0f252fadf3c888010584dae59a159758c829c1484f7ce5bd1b12375e6084260618f1e72a7beee08ca71ea8f557a10d68bfe6f2b77 SHA512 3ad8170f00ded1bc778ac9516c73ce40dbc77ee9ea28f6fd8cdc3c9860f85b23462a919bd941d1f04c5d6cce92a4d651069d4af8528029fa33872c0976edec54
 MISC metadata.xml 1750 BLAKE2B e801ba897038132a409e36fa57916a358717fb0c25545a12980623a825c623ee18b124741357332ab89edf6a85154eebf8107ce5c9ce0835cf6acb4f7fc530be SHA512 c84f5c988e2e92554670e3c94f1fb344a78c99f484d3b3c3b7c0bf2859db7c123b6aa280e202428ee057df73c44a415e6f89497cda4e4701ccdc88fc586c3928
diff --git a/app-containers/podman/podman-4.9.1.ebuild b/app-containers/podman/podman-4.9.1.ebuild
new file mode 100644
index 000000000000..3f6774cf6770
--- /dev/null
+++ b/app-containers/podman/podman-4.9.1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module tmpfiles 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}"
+	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 cgroup-hybrid wrapper +fuse +init +rootless +seccomp selinux systemd"
+RESTRICT="test"
+
+RDEPEND="
+	app-crypt/gpgme:=
+	>=app-containers/conmon-2.0.0
+	>=app-containers/containers-common-0.56.0
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error:=
+	sys-apps/shadow:=
+
+	apparmor? ( sys-libs/libapparmor )
+	btrfs? ( sys-fs/btrfs-progs )
+	cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6  )
+	!cgroup-hybrid? ( app-containers/crun )
+	wrapper? ( !app-containers/docker-cli )
+	fuse? ( sys-fs/fuse-overlayfs )
+	init? ( app-containers/catatonit )
+	rootless? ( app-containers/slirp4netns )
+	seccomp? ( sys-libs/libseccomp:= )
+	selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= )
+	systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-go/go-md2man
+"
+
+PATCHES=(
+	"${FILESDIR}/seccomp-toggle-4.7.0.patch"
+)
+
+CONFIG_CHECK="
+	~USER_NS
+"
+
+pkg_setup() {
+	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	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=""
+
+	# BUILD_SECCOMP is used in the patch to toggle seccomp
+	emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" BUILD_SECCOMP="$(usex seccomp)" all $(usev wrapper docker-docs)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install.completions $(usev wrapper install.docker-full)
+
+	insinto /etc/cni/net.d
+	doins cni/87-podman-bridge.conflist
+
+	newconfd "${FILESDIR}"/podman.confd podman
+	newinitd "${FILESDIR}"/podman.initd podman
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/podman.logrotated" podman
+
+	keepdir /var/lib/containers
+}
+
+pkg_preinst() {
+	PODMAN_ROOTLESS_UPGRADE=false
+	if use rootless; then
+		has_version 'app-containers/podman[rootless]' || PODMAN_ROOTLESS_UPGRADE=true
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process podman.conf $(usev wrapper podman-docker.conf)
+
+	local want_newline=false
+	if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then
+		${want_newline} && elog ""
+		elog "For rootless operation, you need to configure subuid/subgid"
+		elog "for user running podman. In case subuid/subgid has only been"
+		elog "configured for root, run:"
+		elog "usermod --add-subuids 1065536-1131071 <user>"
+		elog "usermod --add-subgids 1065536-1131071 <user>"
+		want_newline=true
+	fi
+}
diff --git a/app-containers/podman/podman-9999.ebuild b/app-containers/podman/podman-9999.ebuild
index e71d643e48de..3f6774cf6770 100644
--- a/app-containers/podman/podman-9999.ebuild
+++ b/app-containers/podman/podman-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/app-containers/skopeo/Manifest b/app-containers/skopeo/Manifest
index 3876dfb8dcab..0a7140e7e2e3 100644
--- a/app-containers/skopeo/Manifest
+++ b/app-containers/skopeo/Manifest
@@ -1,10 +1,12 @@
 DIST skopeo-1.10.0.tar.gz 6460856 BLAKE2B b904a161334ef0a3eaaab8c58f0c7e4c507fa68a09f8fa8235e8a9222d48c98874c9ce878a509e2816f210ffb37dbf707ff2653212e1efbd9ad6686efb97e147 SHA512 0d64e7f12a0d10c81074a04b6c74ed6e7213f598013f1ba672c4c696e9dad5827f41f41bb817263bf8606cd051b8e24e7eab65b95d73d8a1c8bbb3eaeb9defdb
 DIST skopeo-1.11.1.tar.gz 8071084 BLAKE2B 2411db318e377cfcfa9a80523c0bd4900201b1c17a4fe0f875dd78033bd4241e6c806816746ef77304e2edbc3737a3b22cfa83b83d65eb3c462cd5437de4e0b8 SHA512 521a2c8ddf629e361340a51d95200ec67bc4fef814e0449b6d679725536ec9448827229d4f993276f084269c2ec73c1b4edf97c0ce29122d950d350ed623a4b9
 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.5.1.tar.gz 5636533 BLAKE2B 7f0e86cdee5c3250ec1280d7e71554ac2f8ad96ababe0e81dfabc00e8c128a13fc0c9c561b7a9be389d7386e9f664b95118bd2122612b9c2e8844db49769c03c SHA512 3f8c730eaa739bf2a29b82d3b04aa4eee1c09f957b61964fc8c48e59d1537bcb87b5bdf9c18fa48f9d36cf2b7ede3a1448918a20b5a3167f6ce09881a6cd3dde
 EBUILD skopeo-1.10.0-r1.ebuild 1066 BLAKE2B f55aa099a396fca1f8513786c48929923d7419a08d232ba910d65d325c5f31c2a4fbb43487d3585c36098375687897f07fbd9e7274edeb4e1b7bf5301dba040d SHA512 0109637023cf52163bbdc2a30fbd086f514a5bd77948888ce30a7824cf4472c46f98f6011e9a0302a054578e5bb812d2b495dac041a060bdb26abbbd034c27bc
 EBUILD skopeo-1.11.1.ebuild 1066 BLAKE2B d304dfa99199b32528a24710a716ab757f9670e4b474fd48c5284005a0a01cc457af1d3882572f27aa81eadb058ec495c7dcebf775dec238ae4b44f0d748d0d0 SHA512 14ad618519d078c4f539afdc3595bd80a1fd102e21abd231f71a530de5019557d915a6809ce1cecb7dc1ee6be57ee9a5b12add0fee1fc8d7325fc2f1f567896b
 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.5.1.ebuild 1403 BLAKE2B a4c236cb6248a1551c90683a45247d19d5634ca7e9ca801761953131f73a7bd0058ab5bcea1d7b2593229eb20c6482e2dae833443227467daccef020b23b5f88 SHA512 b163486639a8831eb20db3a5906378485f0aaf3299e815217b1c8a2f4e27ca35af0bda40e6265a7c58107588cab429c0044717666cd22c43e8e21c73a75277dd
-EBUILD skopeo-9999.ebuild 2097 BLAKE2B 4f25431121f91ecf094f74820c9a948252ecaaa611b824e8b2dcdc6452a3c4de67c0f9dee07585f15cd6c57bb98aae661618f4cbf017b13160161cceb4143030 SHA512 428330a458080957266cc56f9214e25b08f964c20e33534b771a1f83e9812aca5d2d5703991a089258ab035192939669efb9103c88d8aebc7278dc8ac257c328
+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.14.2.ebuild b/app-containers/skopeo/skopeo-1.14.2.ebuild
new file mode 100644
index 000000000000..ab892d6789a8
--- /dev/null
+++ b/app-containers/skopeo/skopeo-1.14.2.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
+}
diff --git a/app-containers/skopeo/skopeo-9999.ebuild b/app-containers/skopeo/skopeo-9999.ebuild
index b7a859d817d5..ab892d6789a8 100644
--- a/app-containers/skopeo/skopeo-9999.ebuild
+++ b/app-containers/skopeo/skopeo-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -38,9 +38,6 @@ RDEPEND="
 BDEPEND="dev-go/go-md2man"
 
 RESTRICT="test"
-PATCHES=(
- "${FILESDIR}"/makefile-1.14.0.patch
-)
 
 pkg_setup() {
 	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
@@ -48,34 +45,25 @@ pkg_setup() {
 	linux-info_pkg_setup
 }
 
-src_prepare() {
-	default
-	local file
-	for file in btrfs_installed_tag btrfs_tag libdm_tag libsubid_tag; do
-		[[ -f hack/"${file}".sh ]] || die
-	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
-
-	cat <<-EOF > hack/libdm_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex device-mapper echo "echo libdm_no_deferred_remove exclude_graphdriver_devicemapper")
-	EOF
-
-	cat <<-EOF > hack/libsubid_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex rootless "echo libsubid" echo)
-	EOF
+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() {
-	# export variables which 'make install' is also going to use
-	export PREFIX="${EPREFIX}/usr" \
-		   CONTAINERSCONFDIR="${EPREFIX}/etc/containers"
-	# compile binary, docs, completions
-	emake all completions
+	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
 }