gentoo auto-resync : 29:11:2023 - 10:51:05

16 files changed, 296 insertions, 41 deletions

diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 2aacf4e00d80..469eade015e2 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 247e738ece0e..2a445585cfa4 100644
--- a/app-containers/aardvark-dns/Manifest
+++ b/app-containers/aardvark-dns/Manifest
@@ -1,6 +1,8 @@
 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.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
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST android-tzdata-0.1.1.crate 7674 BLAKE2B 4385a4875aadaacd5284a9ca7d1bf8a7bf14bf8925d1563d52fbabacc3af2c1ea08bfcf77106f3648f4fa052ac295158a21e7a0131d31eb9aecd99ea4ba20055 SHA512 4294024c21ddd0090c42c8eedf708d40d917f55ad5a4cb7aa3e64cfb6551b6df60f2e36bc08620c1d2fc8c7ba7207411518ee5c8635f60ed8ad9efdd458a2077
@@ -254,5 +256,6 @@ DIST winnow-0.5.15.crate 145621 BLAKE2B 039262561227641c2d8b996ebb59c79718de3f2b
 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-9999.ebuild 1084 BLAKE2B b96944761c759f5b6ca000fa8d39b013ded702c12b83737f8f6a8271beb1f58e81f3fac3d0249ab0402b15add9c508f1a13c5da8ad5ebad05c1ec0a2056ca045 SHA512 03731b32cfd81058cb61bd707bf4e957843e2d5d31c5eb242597d359d37281d8873baadb52e8b71a54186e591cdd24c34e83b111235a5dc54fb2eddfa267946a
+EBUILD aardvark-dns-1.9.0.ebuild 1109 BLAKE2B 7dbdcec7d81c8e9838447affec52f92bbb914688c4703d09d0977aeedaa95cfdd4e8824d17012bd7a278475d1577286043ebf83ef0798263fa3bd4b8e95e3d6a SHA512 ee507b8e9f0b0a893ea1fb5b4b2f51356f373e12a2b53f1480ac41daf6b3c6f63de24684079fa8fba7cfa80d245efc50272afa8b2d66b3a54192eb047b6692cf
+EBUILD aardvark-dns-9999.ebuild 1109 BLAKE2B 7dbdcec7d81c8e9838447affec52f92bbb914688c4703d09d0977aeedaa95cfdd4e8824d17012bd7a278475d1577286043ebf83ef0798263fa3bd4b8e95e3d6a SHA512 ee507b8e9f0b0a893ea1fb5b4b2f51356f373e12a2b53f1480ac41daf6b3c6f63de24684079fa8fba7cfa80d245efc50272afa8b2d66b3a54192eb047b6692cf
 MISC metadata.xml 917 BLAKE2B c341ba634981e4abcfcb26b75a71d55d63f45ca9c6d9c94946c834b6f92a9f83052935478bb158e167420f9461693067053991266076605d9b54bf5c1f25d0ef SHA512 7a16c10f04593adbb4c6d129e55a9c68a1106860a46ebae53a74bcc0186c39daf0a8f7b669f3e68cb1716d3ca8a9764ed8ee2bf0c4db2233b4e3df04605284a0
diff --git a/app-containers/aardvark-dns/aardvark-dns-1.9.0.ebuild b/app-containers/aardvark-dns/aardvark-dns-1.9.0.ebuild
new file mode 100644
index 000000000000..0ee642075eea
--- /dev/null
+++ b/app-containers/aardvark-dns/aardvark-dns-1.9.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2023 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 32b5cc8f5e20..0ee642075eea 100644
--- a/app-containers/aardvark-dns/aardvark-dns-9999.ebuild
+++ b/app-containers/aardvark-dns/aardvark-dns-9999.ebuild
@@ -3,12 +3,13 @@
 
 EAPI=8
 
-[[ ${PV} == *9999* ]] || CRATES="${PN}@${PV}"
+[[ ${PV} == 9999* ]] || CRATES="${PN}@${PV}"
 inherit cargo
 
 DESCRIPTION="A container-focused DNS server"
 HOMEPAGE="https://github.com/containers/aardvark-dns"
-if [[ ${PV} == *9999* ]]; then
+
+if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/containers/aardvark-dns.git"
 else
@@ -16,14 +17,18 @@ else
 	SRC_URI+="https://github.com/containers/aardvark-dns/releases/download/v${PV}/${PN}-v${PV}-vendor.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
 fi
-LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT Unlicense Unicode-DFS-2016 ZLIB"
+
+# 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
+	if [[ ${PV} == 9999* ]]; then
 		git-r3_src_unpack
 		cargo_live_src_unpack
 	else
diff --git a/app-containers/containers-common/Manifest b/app-containers/containers-common/Manifest
index 09ccf7663d04..b58785d7b922 100644
--- a/app-containers/containers-common/Manifest
+++ b/app-containers/containers-common/Manifest
@@ -3,6 +3,8 @@ AUX examplify-mounts-conf.patch 214 BLAKE2B 3e72e91ce65190acb437a1ec5e0cbbb27b46
 AUX fix-warnings.patch 419 BLAKE2B 55f23a30af6225b6e56dc7ba97d1af8052a6fa06ee7e29816ff00d7a7847136ec916eca07ddaa86f0529beef41e30f433f341497f8dd914a736ccfc0e29a2841 SHA512 b247af0b4540f80662f8ba53f531bf1ee5ee0f944862c0baf2806df5dad0ef0d44af5cb1d3ce28de956194a9d4a2b92c897e8a432dbeb4b5f52486e7e291a9de
 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
 EBUILD containers-common-0.56.0-r1.ebuild 1741 BLAKE2B a40e4ef18f0d14504c5dddb1f58c579a79e2abeb49e43a2a829de0ae781ce336595def5da1bf819d27e783d4fdbbd05da4934e4287fe5a0312dea30bd415a002 SHA512 6bd6d804f9024cdcb9ae5a063de97d38a9bcfe2d7a09c2e6d5cfd9a24cae55e1b081290f70bbefc5dd7c41b5309a123151b6ffc5c2bc57a55ba2aeebda1a7de7
-EBUILD containers-common-9999.ebuild 1743 BLAKE2B d020d96a4c2998ecb279313dd78990f70950ac7d9ec950a399bdc278fa5c02127fc9d56731fa16c48b3d2d5cbf7a2988f62bfb3337d383b2ca712b58bb485789 SHA512 579905b8eb42ff2f3f6866045490ee839ff07f9ff9c0dd6cbb67b8e1d80b762a047a36cdfd70d3eb7e3c88ce4e98dc22545db08485de5779619c5b94a20d1e08
+EBUILD containers-common-0.57.0.ebuild 1752 BLAKE2B e6e0d00f9bf8258c5481906a64e3f4c18d9bef8c5a823546670bea78fb972f8ecab1f8a2b10cf38c763ace3c840f860ee9fbfd4788b6384d5140193b62a21776 SHA512 42ffb974fa4d628d6c14cd4532e4055ecc56b15983c5a40959a757b11127f698dca74f6adfd4552c5868c3118dc08bff967ff304d1917d582da2f22d7a4f9ca0
+EBUILD containers-common-9999.ebuild 1752 BLAKE2B e6e0d00f9bf8258c5481906a64e3f4c18d9bef8c5a823546670bea78fb972f8ecab1f8a2b10cf38c763ace3c840f860ee9fbfd4788b6384d5140193b62a21776 SHA512 42ffb974fa4d628d6c14cd4532e4055ecc56b15983c5a40959a757b11127f698dca74f6adfd4552c5868c3118dc08bff967ff304d1917d582da2f22d7a4f9ca0
 MISC metadata.xml 632 BLAKE2B 24d632b4108ab28cea425929a7389b0972b372c030d8a6e094d99fe6b3fac66e60a8f63b23531a8386f1c64f400195dd582fa4450e4fde81da2b0aefe75a0512 SHA512 751fcc4ea652ed7b23df6f8645962112c3dc71f9398fcb6ff5a30d3716febbfea41607a1e8bac1e4065638577506624f169db94fde9e2438e80b7b61ffa329e9
diff --git a/app-containers/containers-common/containers-common-0.57.0.ebuild b/app-containers/containers-common/containers-common-0.57.0.ebuild
new file mode 100644
index 000000000000..f96e1c184a69
--- /dev/null
+++ b/app-containers/containers-common/containers-common-0.57.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 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
+	!<app-containers/podman-4.5.0-r1
+	net-firewall/nftables
+	net-firewall/iptables[nftables]
+	|| ( app-containers/crun app-containers/runc )
+	|| (
+		( >=app-containers/netavark-1.6.0 >=app-containers/aardvark-dns-1.6.0 )
+		>=app-containers/cni-plugins-0.9.1
+	)
+"
+
+BDEPEND="
+	>=dev-go/go-md2man-2.0.2
+"
+
+src_prepare() {
+	default
+
+	[[ -f docs/Makefile && -f Makefile ]] || die
+	sed -i -e 's|/usr/local|/usr|g;' docs/Makefile Makefile || die
+
+	# add comments to mounts.conf
+	eapply "${FILESDIR}/examplify-mounts-conf.patch"
+}
+
+src_compile() {
+	emake docs
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	insinto /etc/containers
+	# https://github.com/containers/skopeo/raw/main/default-policy.json
+	doins pkg/config/containers.conf "${FILESDIR}/policy.json"
+
+	insinto /etc/containers/registries.d
+	# https://github.com/containers/skopeo/raw/main/default.yaml
+	doins "${FILESDIR}/default.yaml"
+
+	insinto /usr/share/containers
+	doins pkg/seccomp/seccomp.json pkg/subscriptions/mounts.conf
+
+	keepdir /etc/containers/certs.d /etc/containers/oci/hooks.d /etc/containers/systemd /var/lib/containers/sigstore
+}
diff --git a/app-containers/containers-common/containers-common-9999.ebuild b/app-containers/containers-common/containers-common-9999.ebuild
index 8963de7d6a47..f96e1c184a69 100644
--- a/app-containers/containers-common/containers-common-9999.ebuild
+++ b/app-containers/containers-common/containers-common-9999.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=8
 
-DESCRIPTION="Common config files and docs for Containers eco-system"
+DESCRIPTION="Common config files and docs for Containers stack"
 HOMEPAGE="https://github.com/containers/common"
 
-if [[ ${PV} == *9999* ]]; then
+if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/containers/common.git"
 else
@@ -39,10 +39,10 @@ BDEPEND="
 src_prepare() {
 	default
 
-	[[ -f docs/Makefile ]] || die
-	sed -i -e 's|/usr/local|/usr|g;' docs/Makefile || die
+	[[ -f docs/Makefile && -f Makefile ]] || die
+	sed -i -e 's|/usr/local|/usr|g;' docs/Makefile Makefile || die
 
-	eapply "${FILESDIR}/fix-warnings.patch"
+	# add comments to mounts.conf
 	eapply "${FILESDIR}/examplify-mounts-conf.patch"
 }
 
@@ -51,7 +51,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	emake DESTDIR="${ED}" install
 
 	insinto /etc/containers
 	# https://github.com/containers/skopeo/raw/main/default-policy.json
diff --git a/app-containers/containers-image/Manifest b/app-containers/containers-image/Manifest
index 467735429041..dcc95c4729f7 100644
--- a/app-containers/containers-image/Manifest
+++ b/app-containers/containers-image/Manifest
@@ -1,5 +1,7 @@
 AUX fix-warnings.patch 397 BLAKE2B a5922e061c825e25398fc3fccdf683abf8331b065337ff240227478d7d3ef5398957d56a430c0b04aa823033b56653e87c8186065e5898818e75310451b347e0 SHA512 a96ab3fea76be4751d6dc3893b4272b063c854503e1a65b4501819a5925f3911c285fbfb4ee6827795a41c696015cc06f446e4ddb1318e21cf0141e15804833e
 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
 EBUILD containers-image-5.28.0.ebuild 806 BLAKE2B 0e8bc9c407a1d6951ccc8faa053a8c2634c013a3c556f970bb2d6e16e5dce371cdaf9c343c533c455ce856d25d50b8c48bbb3744c06ee326d92ba9049cb34b70 SHA512 cb5c1ab825791ed3e856c87394fbe827e3dec8c40857201a5f02f6d50a32859cceb18e073455670f28e2b5ad6b7c7fe966eec2c2166bbb516b15d3ac0f100281
-EBUILD containers-image-9999.ebuild 794 BLAKE2B 68a7bbe15e21f49a15ba685c6e30374dc3ed15309ef600537d54d28d63046b2289ce76cb44f170ae52303e7b2553a88265468630a7a697aa32d8d3945c2a5fa7 SHA512 7552a9e886c485aba8451c25695a79be561fbed5dcf0e171424b2d2dfc605d0b93853d7161d481e2f8877066c60b07c084fc3ef4f25f9cac64657ef2f5471b52
+EBUILD containers-image-5.29.0.ebuild 742 BLAKE2B 15567e62ad04fa2605ddef7edb2a4e356235ef664bced96eff5f6e8a90197e4678e2ed7fabf826bf0e56a6a85953484e76930c6b214d100b0c214de4343e59c8 SHA512 5eeb9b83dde0647458f5614c711fbb8865357a926a7527f31659d500af8152599989507f4a5a949e21f7ca261fb84c27768c993524156962f75868af000b1201
+EBUILD containers-image-9999.ebuild 742 BLAKE2B 15567e62ad04fa2605ddef7edb2a4e356235ef664bced96eff5f6e8a90197e4678e2ed7fabf826bf0e56a6a85953484e76930c6b214d100b0c214de4343e59c8 SHA512 5eeb9b83dde0647458f5614c711fbb8865357a926a7527f31659d500af8152599989507f4a5a949e21f7ca261fb84c27768c993524156962f75868af000b1201
 MISC metadata.xml 629 BLAKE2B 45a8c8421fe8f6992ad5690f3739131320546e6577d6fc34a65ac0e379cbb80cdec7bb1464467f71b180c08455170f32b4a680fb1cb6dce054555033e4dea20e SHA512 0a76a5f3f3e7b2fb873ff7bd227c9c804db9537784690adfd88b7a3f893ac24b503d417bf41149c47c2c2409ef62cc9c937bce5c7eda4d89422633764b6de519
diff --git a/app-containers/containers-image/containers-image-5.29.0.ebuild b/app-containers/containers-image/containers-image-5.29.0.ebuild
new file mode 100644
index 000000000000..7e9e9b9dad81
--- /dev/null
+++ b/app-containers/containers-image/containers-image-5.29.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 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"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+BDEPEND=">=dev-go/go-md2man-2.0.2"
+
+src_prepare() {
+	default
+	eapply "${FILESDIR}/fix-warnings.patch"
+}
+
+src_compile() {
+	emake docs
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	insinto /etc/containers
+	doins registries.conf
+}
diff --git a/app-containers/containers-image/containers-image-9999.ebuild b/app-containers/containers-image/containers-image-9999.ebuild
index a29e5e602b78..7e9e9b9dad81 100644
--- a/app-containers/containers-image/containers-image-9999.ebuild
+++ b/app-containers/containers-image/containers-image-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DESCRIPTION="Default config and docs related to Containers' images"
 HOMEPAGE="https://github.com/containers/image"
 
-if [[ ${PV} == *9999* ]]; then
+if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/containers/image.git"
 else
@@ -18,27 +18,19 @@ fi
 LICENSE="Apache-2.0"
 SLOT="0"
 
-DEPEND=">=dev-go/go-md2man-2.0.2"
+BDEPEND=">=dev-go/go-md2man-2.0.2"
 
 src_prepare() {
 	default
 	eapply "${FILESDIR}/fix-warnings.patch"
 }
 
-src_configure() {
-	return
-}
-
 src_compile() {
 	emake docs
 }
 
-src_test() {
-	return
-}
-
 src_install() {
-	emake DESTDIR="${D}" install
+	emake DESTDIR="${ED}" install
 
 	insinto /etc/containers
 	doins registries.conf
diff --git a/app-containers/containers-storage/Manifest b/app-containers/containers-storage/Manifest
index 70a29ce367ec..3873b3a1bc93 100644
--- a/app-containers/containers-storage/Manifest
+++ b/app-containers/containers-storage/Manifest
@@ -1,5 +1,7 @@
 AUX system-md2man-path.patch 169 BLAKE2B 707d7396af9c6a04a3a4860198acb927d6fbc68d8a1375340220778528f472f9026fff63c24cfa11ba48f6157faff3f993c0d9bac3e125de6152045ec3c9876b SHA512 6430e890fa731b4a8646bd001557bc17180c312d1efdccfd3aa611f7402eb8e8cc0ef551b5cfc9b0db60a0e69a6dd90b5c75c46139fa3d9424ae6f9700c91f64
 DIST containers-storage-1.50.2.tar.gz 4278269 BLAKE2B 3a2b08c710c043cfc130b9ffe39807e5ced8aa3cdb9805e9d9a4d0f60d8136f99e78ca03992c566b7c7d9aa1c25a2ab9da5e9edc4f1f841663302f5873dce419 SHA512 eb2ca9d243511abd5d6d1727c60166422dbfef4a3ddbb5062e58d915d0705afcd10ded8f1f79e897f9f5244fb6b6d349fbf3ed86ae57f41e31a1965c4e926941
+DIST containers-storage-1.51.0.tar.gz 4283732 BLAKE2B 108401d68e617e6237e68cf2147113680e0452a8d15ee099da9872508800f3e7b8f2c5508e17d9c5f3d58fec4efc1c20f23f1a567fe592533c0e63efd05ae5c8 SHA512 89916b49438bce8bb774b4aa799676d4b3a946a0b5207a1b5241b1a3ac0875b06b3cd8e81d7e23332ceae6010b693516fc31d8c7f75a37e7ad3056a83c75b6c1
 EBUILD containers-storage-1.50.2.ebuild 853 BLAKE2B e413f8bbf8749a42358829283362fa401ac5f0710588e71d9c44480137bf5219aed26adc5f946d5138c48463b4927853cf87df82e6a9048b7b41a1395576800a SHA512 1d969765c51ee6048e306f52e50120e88e473b4182e29e15129b1e3325827c9e7c21312b9481a6615167cb558c676f6ba5b012347d5fd21f5e7b66e44fdaa2db
-EBUILD containers-storage-9999.ebuild 841 BLAKE2B 767bbfc7a815dd17883d59bdc4e5a530a9140c2d30dbebb818da82946db373bd95c21ecb644ea2f58c14a40ddbb334aeede16c10fe87407a9b04c8aad89308ea SHA512 cae56fcb1a491193b10bd195b46f97043af30a340aac3a6abf82ed67380e5c0d6c8893c550c13f2feba6d6c5273dbbf305afb4b8808da958b86c0ce03ddbb7ef
+EBUILD containers-storage-1.51.0.ebuild 789 BLAKE2B 7044e44fa740a613702a4ccd4037e0095223334414a5d597cd976d43dbad533a5ca7b91117052c32fd0df9879618e55d51aa3db6b4a658240cccec2b94e16f8a SHA512 8cf77745e40e816f7092c0fdfa020b35e3b998ae81be87f2a78a54bf6f47e7348dc9bb66c29910e9c85b960def249c3ffdaeecfe83d29056bf4e6906d138722b
+EBUILD containers-storage-9999.ebuild 789 BLAKE2B 7044e44fa740a613702a4ccd4037e0095223334414a5d597cd976d43dbad533a5ca7b91117052c32fd0df9879618e55d51aa3db6b4a658240cccec2b94e16f8a SHA512 8cf77745e40e816f7092c0fdfa020b35e3b998ae81be87f2a78a54bf6f47e7348dc9bb66c29910e9c85b960def249c3ffdaeecfe83d29056bf4e6906d138722b
 MISC metadata.xml 746 BLAKE2B 1cbbdf0f04a682b22440c08f538309506b9bffdc8e5fc070c32e7bdf16403bff2365c32c8c01b1d515df10fc9c604f7af78e46d47c2afb1508c8506ff198e06c SHA512 5756f47aedb50cb2c45b52e9389c417e97139903529016c82a1b5fde828e717fd088d248baf125bf9a43e6dbdb7415ebf0a019490071d090455a0bdc235f33bf
diff --git a/app-containers/containers-storage/containers-storage-1.51.0.ebuild b/app-containers/containers-storage/containers-storage-1.51.0.ebuild
new file mode 100644
index 000000000000..4af5e711a1f0
--- /dev/null
+++ b/app-containers/containers-storage/containers-storage-1.51.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 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"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+BDEPEND=">=dev-go/go-md2man-2.0.2"
+
+src_prepare() {
+	default
+	eapply "${FILESDIR}"/system-md2man-path.patch
+}
+
+src_compile() {
+	emake -C docs containers-storage.conf.5
+}
+
+src_install() {
+	emake DESTDIR="${ED}" -C docs install
+
+	insinto /etc/containers
+	doins storage.conf
+}
diff --git a/app-containers/containers-storage/containers-storage-9999.ebuild b/app-containers/containers-storage/containers-storage-9999.ebuild
index 523b3a92b7ba..4af5e711a1f0 100644
--- a/app-containers/containers-storage/containers-storage-9999.ebuild
+++ b/app-containers/containers-storage/containers-storage-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DESCRIPTION="Default config and docs related to Containers' storage"
 HOMEPAGE="https://github.com/containers/storage"
 
-if [[ ${PV} == *9999* ]]; then
+if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/containers/storage.git"
 else
@@ -18,27 +18,19 @@ fi
 LICENSE="Apache-2.0"
 SLOT="0"
 
-DEPEND=">=dev-go/go-md2man-2.0.2"
+BDEPEND=">=dev-go/go-md2man-2.0.2"
 
 src_prepare() {
 	default
 	eapply "${FILESDIR}"/system-md2man-path.patch
 }
 
-src_configure() {
-	return
-}
-
 src_compile() {
 	emake -C docs containers-storage.conf.5
 }
 
-src_test() {
-	return
-}
-
 src_install() {
-	emake DESTDIR="${D}" -C docs install
+	emake DESTDIR="${ED}" -C docs install
 
 	insinto /etc/containers
 	doins storage.conf
diff --git a/app-containers/netavark/Manifest b/app-containers/netavark/Manifest
index cea4a227ee59..ae8379e6127f 100644
--- a/app-containers/netavark/Manifest
+++ b/app-containers/netavark/Manifest
@@ -119,7 +119,9 @@ DIST mptcp-pm-0.1.2.crate 14732 BLAKE2B 6cce10cbe3ae86490bfa6f90f9a256062de24619
 DIST multimap-0.8.3.crate 13518 BLAKE2B 7e00324be2944f3ca38bf02bfe37f47313aa501fc166ec417cd05f11059b14aa761b58f7a737792e2f9488ef5e7825fbb13cbb6ba2ce4935f4c39414fe069730 SHA512 8580982dde6624a0d181cfdf6cc2293c368762b548f32d196fb7a29fb698d1cb743bc2572ca284c6ecd107a632ea2a428fc998c05df164437f2cb470d24d23cd
 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.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
 DIST netlink-packet-generic-0.3.2.crate 13590 BLAKE2B 9c7971c5711e390533933b08022c4253e98851097d7c702a486f96b58b55de1dedff17e12bac1d2cd4b8bce9d0bb41b7dd812482ba064f057bde212d57b7c142 SHA512 648ade4cf4423b76fd849fff9f9cacb8b87c4930e0963b516f03622f830b55a8e9bfe3e9d656f63432a22ddaf6f3a5d884820d16f9b0e4c654e52cfd81ac0d59
 DIST netlink-packet-route-0.15.0.crate 107447 BLAKE2B 06823227a6eb76c578874c4c75bdc0d395df77fede7b888f724f84f0aa9d4ffdfb19872c3a265c179b7a31f8f43436b5f1541534a785fb1b7069e748c2375d7b SHA512 3af2f0cda2111987e708fe4684ecf0dedca5c189005d205fe51904ab98690425bac7dc88aaa7399a69cf05918e6f1174d055530bdb0e77649efb631a59e9463a
@@ -252,5 +254,6 @@ DIST zvariant_derive-3.11.0.crate 12364 BLAKE2B 611dd5211c398941d3967692ca462a36
 DIST zvariant_utils-1.0.0.crate 6230 BLAKE2B cf0176e9187d493cee4d2f33945754695dcfc5c1fb56bf750667c9dcf1dd4d15c4896407225cfe26a6f63b9bd0d3511193d7bae8a11bfa3fa6f50884c79b6bb2 SHA512 51febffe7d013bf74ab9d57257d7db0ba86bb94a0bf8d5c55125de6a329903f07a7906103ed53b1705b1ba364c38b4f6aad7cadb53761f740fce6bf957e174aa
 EBUILD netavark-1.6.0.ebuild 5523 BLAKE2B 1b17645b21bfcd59a292a7b7c1746c2567cdffe96964242103499f6c09d69714da99f3c8ff91e95f6e2f2b14c5eacadc95318307794fc6b413cad19a62025bed SHA512 211ecd99a56ad0ce02a3b7b6f0cd83bc340a3500c4c16ade7a21eee589d273d2721d0b1e38d337555d1ab3f67c01e37fe7ad02430161bd39906323d7eaebe1cf
 EBUILD netavark-1.8.0.ebuild 1226 BLAKE2B 14c7df416e2075d3272095ee741e44c142450f8d28c01adfd723df8965a81da07634208dacecd97e1a4ad12a950a02a20328d84244319bde44495cdfb7021d4a SHA512 605883d52ba6f8958c147598d3a37dbd9ac81c98837decddfd5808d6ceae39aeb227c3b87c38f8792c9e550224de27d5a5852e6244d6ebe7c58f306708d3f2a2
-EBUILD netavark-9999.ebuild 1228 BLAKE2B 47a9679bf1e84e8c21e761edb9944291a2bb66652dd20ae1267b329ffaac87049347073ae09e90d66b224c8abf9f2cdeae084160087196fc28d86ec54729de38 SHA512 73630c0667ea54c19b605ce138bbc2fe2d4c0021de51d31dde8fd96590841a086841304de6bb50f24a16a63dca834c3523bbe314564c972be34aa52d95e4f11b
+EBUILD netavark-1.9.0.ebuild 1367 BLAKE2B 7cdfc8bbab04e3db45cd2dfec908197f67614d5fec3ddc4f457d1bf30ddc7cfb50e4b7a7266224e9ea1a48a97a48b46551700b5ba942dc226ef15c153b96f4e6 SHA512 983e219f63bc7c7103b3ffd1371135edcd4094799247e3ce394047e05b40033a3bbeba1a499bb9ccfff828e550da8923100189ef0eb6d7111c1dd9b477b522c2
+EBUILD netavark-9999.ebuild 1367 BLAKE2B 7cdfc8bbab04e3db45cd2dfec908197f67614d5fec3ddc4f457d1bf30ddc7cfb50e4b7a7266224e9ea1a48a97a48b46551700b5ba942dc226ef15c153b96f4e6 SHA512 983e219f63bc7c7103b3ffd1371135edcd4094799247e3ce394047e05b40033a3bbeba1a499bb9ccfff828e550da8923100189ef0eb6d7111c1dd9b477b522c2
 MISC metadata.xml 946 BLAKE2B d062a87bcb14985bb673a604773bba4f512acf44735bb00f291651a0a7afee1f392eff6809f0f3e72c35fdbcea65010134702b19e52b407de2325ceb437a4704 SHA512 253dc19e41fc4a8568c29380506d8e7eb0911810bc6f7c18b3963cbac17647182b082d9bb621aa697b4af7617322069d1256a96a1ef4080346b8e571af594002
diff --git a/app-containers/netavark/netavark-1.9.0.ebuild b/app-containers/netavark/netavark-1.9.0.ebuild
new file mode 100644
index 000000000000..31531a21ec6e
--- /dev/null
+++ b/app-containers/netavark/netavark-1.9.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 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 7cb769c2a876..31531a21ec6e 100644
--- a/app-containers/netavark/netavark-9999.ebuild
+++ b/app-containers/netavark/netavark-9999.ebuild
@@ -3,20 +3,25 @@
 
 EAPI=8
 
-[[ ${PV} == *9999* ]] || CRATES="${PN}@${PV}"
+[[ ${PV} == 9999* ]] || CRATES="${PN}@${PV}"
 
 inherit cargo systemd
 
 DESCRIPTION="A container network stack"
 HOMEPAGE="https://github.com/containers/netavark"
-if [[ ${PV} == *9999* ]]; then
+
+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
-LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 MIT Unicode-DFS-2016 Unlicense ZLIB"
+
+# 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"
@@ -29,7 +34,7 @@ QA_PRESTRIPPED="
 ECARGO_VENDOR="${WORKDIR}/vendor"
 
 src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
+	if [[ ${PV} == 9999* ]]; then
 		git-r3_src_unpack
 		cargo_live_src_unpack
 	else
@@ -48,6 +53,7 @@ src_compile() {
 	emake docs
 }
 
+# Following is needed because we want to use `make install` instead of `cargo install` (exported by cargo.eclass)
 src_install() {
 	default
 }