gentoo auto-resync : 19:03:2024 - 06:50:06

9 files changed, 111 insertions, 12 deletions

diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index b1461a8f5424..901675dc9a4b 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/containers-common/Manifest b/app-containers/containers-common/Manifest
index c2a7424155d3..a967acbade02 100644
--- a/app-containers/containers-common/Manifest
+++ b/app-containers/containers-common/Manifest
@@ -3,7 +3,9 @@ AUX examplify-mounts-conf.patch 214 BLAKE2B 3e72e91ce65190acb437a1ec5e0cbbb27b46
 AUX policy.json 256 BLAKE2B 78693988b98b88c35807db755bea923203ab289435d2c4ffd914ec52904dadded467ff131d90b337bf7534d533e478420a0c81599858a9012668bc4d1815144f SHA512 120f43f579f48758af6b8292fc2cfbcb5ecc46564d2d16afb74dbd1c043de44daec6633ff585b0046c55fd48aed6dbc2901623c753ec13670d3fdcecb19a42c5
 DIST containers-common-0.57.0.tar.gz 12700958 BLAKE2B 8432a7d839b94b59eabd75d4978a4d0c1340a64ed626db74e74a8318e08c61172bfba5e4f4c4b0dfffec302c5a310bb5be8fad3ab4d91a6d89ced373a0a6f297 SHA512 b993821040788085ff44e48023a64cea4e3e7e50731c359087bd287168e6849a543d930acbdaff2437fc7951acc46f7183f337dd977215eca814332e6869d1e3
 DIST containers-common-0.57.3.tar.gz 12702863 BLAKE2B 7842893f9b8ca72fa0657ea716f61cad95c4a8bff680922a15cffad4cecf897683591272fee83494e800023a432458cc689a810726e60e4d5ff9dd6af2d71737 SHA512 f0b7c4632317e666342f7b31bd9e5e9cdc794125d4d358e6a62ba115099ee1e6b33751cff982dcadbb3055b093d05fbd1049402f79ca2e6465cc6fcabce7c928
+DIST containers-common-0.58.0.tar.gz 13164567 BLAKE2B 17795eec2d38b4d8b9d6afeb20e249208c5ae2ac767a365ef7313d1e7c36eadb9a9eb284a657dfe3f4fcb0577448d4883fabbad76e0318425fdc03809e27cd7c SHA512 6f569d68d3b0e5ead304c7f23341808d66a47b6352c772d353d50c5f4777cd8a5a5b85d6faaf2887f828c17ec49b9c5f929177a67294b5bbb69baa80656982a8
 EBUILD containers-common-0.57.0.ebuild 1750 BLAKE2B e3146c256b3b613489dc9761702a0dad914f8989669381c5eb222df39adfcb80793d9e15c3b6ec4b9ecbfa3ef1f4ce19c9ae18ab14d86ba7d92c83e14a1d1d6c SHA512 48fec563927b44bf7e25d341f4939dad0a89dac98bcdec8c8340b7c308f1f5f3ca6065a8199eb104fca18f85da2c2c43000f1e6e59717dad970de53d75f9021c
 EBUILD containers-common-0.57.3.ebuild 1428 BLAKE2B 483ea726e31c955ccb059aa58e05027033d2a3d682b40a31423472a15c2a35e1cdc231019dcdb184050fc09442bcb93a4bee4e9d45c9c69a1f36622eb68f68af SHA512 4bb587c92ffb790886ca468fe997357c50bf4c21066f276b48d134252809f2ac7efe8737700cae0a28c6f7e3ee83873b4a6064f5a398000587073a3065647624
-EBUILD containers-common-9999.ebuild 1428 BLAKE2B 483ea726e31c955ccb059aa58e05027033d2a3d682b40a31423472a15c2a35e1cdc231019dcdb184050fc09442bcb93a4bee4e9d45c9c69a1f36622eb68f68af SHA512 4bb587c92ffb790886ca468fe997357c50bf4c21066f276b48d134252809f2ac7efe8737700cae0a28c6f7e3ee83873b4a6064f5a398000587073a3065647624
+EBUILD containers-common-0.58.0.ebuild 1402 BLAKE2B 71d0084a227b7cefc8bd5fc8398e8ee8a9ece59c40ed38c172283914b830cae3befb5b2d617d3ffb87635e3fd691ccb3fbf75c965f1a1674b30ee0793120f02b SHA512 07a07af974fbfe3d596b192f304520d50a2565ce559d8d6fc8a69469a77a776441a0fafe067751783eaeca8d905daabbc4df151264714f80e91d34ffb2827558
+EBUILD containers-common-9999.ebuild 1402 BLAKE2B 71d0084a227b7cefc8bd5fc8398e8ee8a9ece59c40ed38c172283914b830cae3befb5b2d617d3ffb87635e3fd691ccb3fbf75c965f1a1674b30ee0793120f02b SHA512 07a07af974fbfe3d596b192f304520d50a2565ce559d8d6fc8a69469a77a776441a0fafe067751783eaeca8d905daabbc4df151264714f80e91d34ffb2827558
 MISC metadata.xml 741 BLAKE2B 727dfc3215f6fb9155105aad6b83e4cff72d8f484e2abaf267a299c07777490abb657a6d0eb349587bae53ad614a6137bd6a205252c835d8141925698cdc2464 SHA512 d014e28716c2b2fd1926a5d7612437cf7553a62fcd26ede88dd180eeb8cfa52f0bfc0c61f539b05dcc7a7faf7c1f17a99e20cbf3743044c1aad1478fbfb11316
diff --git a/app-containers/containers-common/containers-common-0.58.0.ebuild b/app-containers/containers-common/containers-common-0.58.0.ebuild
new file mode 100644
index 000000000000..c4d53773f1d9
--- /dev/null
+++ b/app-containers/containers-common/containers-common-0.58.0.ebuild
@@ -0,0 +1,60 @@
+# 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
+"
+
+PATCHES=(
+	"${FILESDIR}/examplify-mounts-conf.patch"
+)
+
+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
+
+	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 5a0aa2f26d0b..c4d53773f1d9 100644
--- a/app-containers/containers-common/containers-common-9999.ebuild
+++ b/app-containers/containers-common/containers-common-9999.ebuild
@@ -35,14 +35,15 @@ BDEPEND="
 	>=dev-go/go-md2man-2.0.3
 "
 
+PATCHES=(
+	"${FILESDIR}/examplify-mounts-conf.patch"
+)
+
 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() {
diff --git a/app-containers/containers-image/Manifest b/app-containers/containers-image/Manifest
index 47105b890983..7ee7994ad316 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.0.tar.gz 706774 BLAKE2B 0af5c7c43e8b75df591cbd291d0865ac19322bf62ad98b4f36cfb51b006ced088f91f0b3f582ce29ae80582e72087467cfe589683216eeb50ad3762152853dc0 SHA512 5e670f85fe0b43769667f1a3e710434ab65c4ec2d8c60b0cad4b0ed41c35f84677528f9dfecb0b946de556ebbdd56f4949760432ec49b1b3c691120a323af869
 DIST containers-image-5.29.2.tar.gz 707618 BLAKE2B f1556cbb26ceedd74a338355caf8b557c43286726f4be63544cebc9a8f4b92be78d7a0cddbedaba7352d13e9fc399f62ee114caba6c8b1ecc334dab1379e523b SHA512 f3f6e09670dc393067992a78303f01e2584dabe79ba156973a50d7a460c011e5a27d0ccdf0ff6b399099a9a3a4c57f3badf24fb5d0704efd645ab7196a544d8f
+DIST containers-image-5.30.0.tar.gz 719070 BLAKE2B 5952ab703b6df793f326dd4fc82f50c5f672e2b9d142e0bc706014092420e3563599d9f1c1f65f743e1a8144b91f92b2326d7bf4c3024b5efb466d777a8ad613 SHA512 89cd0d482bb5d70037ff51413b7abca01d36bc7f39e9dc130c78462e501dae32193137a367d81532afd216a7432e127728147e6e839d5d99eeb6b6680f31d4dc
 EBUILD containers-image-5.29.0.ebuild 755 BLAKE2B c6db87c8e66eb57b0820b92c25bb38cf3e14a4c91ca08b703fb09e9fbbc2457f87f3e032001f4ca26a81f49daa056cfecffa986ad1ba229e0774b5a9db8d83d8 SHA512 c59433f5c71dfeca32280916dc8f4849882e78160cf7a8aa642c2356936c9ff3476542551e132e92c754ee317534c77f4c374e8d0abc5675b9335a7a3f799091
 EBUILD containers-image-5.29.2-r1.ebuild 888 BLAKE2B 04202bfac7f6c856bbeb90b55083e67c57785d8b00598d35166cafe993beff67043ec0c5584d77750a5950d9c393d150eb3ed8f68b193948774255de77399e39 SHA512 90436455f3b7bac8eabbb3a538bdac77428e46f99a47d752fa09500acd3256a219e5c75baa9ff60fcdc3cb0b5547c79710244a5a7426fec8ec5f32da8bf65a1b
-EBUILD containers-image-9999.ebuild 837 BLAKE2B b50d28d4dc142f5c8f7448b3ab16d3711bd71982d6d7e5a8c432800c42d907fccd72e8cc825d50fc7b65a3fb0d39a761e9e579ec9ee2fa1025bc73debeb541c7 SHA512 7353136adeafcdb5bddfc78877c789f945e463c5efb08551d6edd9568691b4cbea898bdba04553fc5894a6521ea1395e31296281a202c207b4bb6d89033bc583
+EBUILD containers-image-5.30.0.ebuild 818 BLAKE2B e48b4ebb0d7b6fa6b352be1bc65c36a6dfd6facda33dae02afe7eb88d47dfd13151f68f6baba92c87b53326670c6c07e14ead263bd4a549acf7ffc47940acaef SHA512 329ba2356394138c7832928764bf338fe807c9fb097bc693d68eeede6a86e03ebf09ff509b22fe06c365a31faaffaa2e7458f6252a93e51db6ec1bccc8872442
+EBUILD containers-image-9999.ebuild 818 BLAKE2B e48b4ebb0d7b6fa6b352be1bc65c36a6dfd6facda33dae02afe7eb88d47dfd13151f68f6baba92c87b53326670c6c07e14ead263bd4a549acf7ffc47940acaef SHA512 329ba2356394138c7832928764bf338fe807c9fb097bc693d68eeede6a86e03ebf09ff509b22fe06c365a31faaffaa2e7458f6252a93e51db6ec1bccc8872442
 MISC metadata.xml 738 BLAKE2B ce4b4915d322a13866596221e70f6d19fecf6835cc7d56cdf58d8fbb640aeeb68c03cc0e97a77db270879fd2fdd6751157d932afd69aa31256200ffecf7993e9 SHA512 19f3c8bc2109b189cf6bc8f37fedf7426d0a8c76efc3862d23a10a233cd9bbad20d0798601f999a60c86856d8825b5d4f91931388aded6185144399731fd09c7
diff --git a/app-containers/containers-image/containers-image-5.30.0.ebuild b/app-containers/containers-image/containers-image-5.30.0.ebuild
new file mode 100644
index 000000000000..f4507f8d00cf
--- /dev/null
+++ b/app-containers/containers-image/containers-image-5.30.0.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}"/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 2df39141c68d..f4507f8d00cf 100644
--- a/app-containers/containers-image/containers-image-9999.ebuild
+++ b/app-containers/containers-image/containers-image-9999.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
 RESTRICT='test'
 BDEPEND=">=dev-go/go-md2man-2.0.3"
 PATCHES=(
-	"${FILESDIR}"/prevent-downloading-mods-5.29.2.patch
+	"${FILESDIR}"/fix-warnings.patch
 )
 
 src_compile() {
diff --git a/app-containers/podman-tui/Manifest b/app-containers/podman-tui/Manifest
index 8ac77d1c7d38..d2d16eeb6102 100644
--- a/app-containers/podman-tui/Manifest
+++ b/app-containers/podman-tui/Manifest
@@ -1,8 +1,8 @@
-DIST podman-tui-0.12.0.tar.gz 15740756 BLAKE2B 2d38997e6ffc67d8d4f2e8c68856b4da4eb3b658ab5998da752b5d01a7d7591d3f196efba11f9d6d67bf438335729ea7bcab920eb1e2e847f6a024c3f4b3ebed SHA512 753932fef58746c80752c142aae17ef61b4632af51f8d9bd5aee29246ffc8179f98f4e38c7607a82efd25d0b809e9065a5b537b1a3a823eabae23a87b5b6dd74
 DIST podman-tui-0.14.0.tar.gz 15857429 BLAKE2B c1a6f056b45d4fa9e0cd749570275da1d98d3f8477a1e85a151afd1cecc9506555c55e065b86d9c49acde36a27c3dac960530218022672fc8044dee0d2284c62 SHA512 d79e5b0cabed6873ff90e4e36fec841b74d53b0e876f6449c9b5512c8a92d7d4bcf733e23abc92a6344d6dcd72957929fde48b4e16dcb1cc33cf10f33074171a
 DIST podman-tui-0.17.0.tar.gz 15853215 BLAKE2B bfdaf085837497c8ce1525eccb04fc977472291e45417a3993a3e9bc2a742e132d14bce7580c0126be94262a10999da2b81edd6997b8c377a3de8a4da20c153f SHA512 137740737e4fe5138198923fb5db6dc6ca901ed7739af09c19bcb0a60fdfe0db79d7c2ac83157675ec478ab8e9dc9b1348cd8aa9f0e5298f8d20ff6cf0284afc
-EBUILD podman-tui-0.12.0.ebuild 885 BLAKE2B 9d44c2616057549c8e33ea7b74bab6a48a9908447023d7cdd767c01e2b5850a72017007334d771bfef1835315f7d5d7642971e77c6089e976d92ab871bcf9ac9 SHA512 c654bdbdd43731f4d1b92308d9f2bf454a85a77651fb88f573d7e22c68bbd40d211ed104acc9fd5378744cb2df0b9075213409f93d3f55d57503798da6ad6b71
+DIST podman-tui-0.18.0.tar.gz 15928626 BLAKE2B 80fd4f826a407b4eeeb664c065f836f12dd85cacab35003ad8fbcabf3eb69b3838bf02fb76269124d18c110370e42556cff8e348caabb100aa88a1994f99d4cc SHA512 77107a9e64b12fd5065698b7065909d5aa45ca49d749056cfb0f76aa2fd0f269708d3d75ecb4cab7939c30571510cdacebcdaac67549979873e3656e1af4db9f
 EBUILD podman-tui-0.14.0.ebuild 885 BLAKE2B 9d44c2616057549c8e33ea7b74bab6a48a9908447023d7cdd767c01e2b5850a72017007334d771bfef1835315f7d5d7642971e77c6089e976d92ab871bcf9ac9 SHA512 c654bdbdd43731f4d1b92308d9f2bf454a85a77651fb88f573d7e22c68bbd40d211ed104acc9fd5378744cb2df0b9075213409f93d3f55d57503798da6ad6b71
 EBUILD podman-tui-0.17.0.ebuild 842 BLAKE2B c0338b4ecdf0e83008b93f0dd7e1f8b7fa0dcf2e7f0b624dbce1f2998b32d260d7d0644bcd35e52bc92d0dc72c9ef7b35b0fb19153a3d4cbbc3e3203c76d0951 SHA512 ac5c59f756f223b2a433618d420069ea84655d268bf2439d66e8b1c5f206f2ec436cd78b43b5c3d5f7f6755a3c791f63dd804a22ae3ead545f5d6ab8f108123f
+EBUILD podman-tui-0.18.0.ebuild 842 BLAKE2B c0338b4ecdf0e83008b93f0dd7e1f8b7fa0dcf2e7f0b624dbce1f2998b32d260d7d0644bcd35e52bc92d0dc72c9ef7b35b0fb19153a3d4cbbc3e3203c76d0951 SHA512 ac5c59f756f223b2a433618d420069ea84655d268bf2439d66e8b1c5f206f2ec436cd78b43b5c3d5f7f6755a3c791f63dd804a22ae3ead545f5d6ab8f108123f
 EBUILD podman-tui-9999.ebuild 842 BLAKE2B c0338b4ecdf0e83008b93f0dd7e1f8b7fa0dcf2e7f0b624dbce1f2998b32d260d7d0644bcd35e52bc92d0dc72c9ef7b35b0fb19153a3d4cbbc3e3203c76d0951 SHA512 ac5c59f756f223b2a433618d420069ea84655d268bf2439d66e8b1c5f206f2ec436cd78b43b5c3d5f7f6755a3c791f63dd804a22ae3ead545f5d6ab8f108123f
 MISC metadata.xml 727 BLAKE2B 61f7988612a085d64584990b9d3b0e91ddda06153e2bf3809d586f15b9d63cdf93ff1ee8e219859e02e54877c037f706c9ebe2a7bb598bc909dd3597661e9979 SHA512 b861ed4983427544169777f39b53ecc7ece16f997448a92bf387e4691d44b9b1cc749cff6132b093c4bd6f0c348ba0e242bb369d2b3bc34da2614d8f4d7556b7
diff --git a/app-containers/podman-tui/podman-tui-0.12.0.ebuild b/app-containers/podman-tui/podman-tui-0.18.0.ebuild
index 2effb9e6c06b..beefef11ab58 100644
--- a/app-containers/podman-tui/podman-tui-0.12.0.ebuild
+++ b/app-containers/podman-tui/podman-tui-0.18.0.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
@@ -21,9 +21,6 @@ LICENSE="Apache-2.0"
 LICENSE+=" BSD-2 BSD MIT MPL-2.0"
 SLOT="0"
 RESTRICT="test"
-RDEPEND="
-	>=app-containers/podman-4.0.2
-"
 
 src_compile() {
 	# parse tags from Makefile & make them comma-seperated as space-seperated list is deprecated