gentoo auto-resync : 15:04:2024 - 12:04:02

8 files changed, 70 insertions, 6 deletions

diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index bc954c79466e..f295753eb6f0 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 3ea04ab7b4a5..473559285078 100644
--- a/app-containers/containers-common/Manifest
+++ b/app-containers/containers-common/Manifest
@@ -4,7 +4,8 @@ AUX policy.json 256 BLAKE2B 78693988b98b88c35807db755bea923203ab289435d2c4ffd914
 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.0-r1.ebuild 1469 BLAKE2B f83e531ffd457701110bac047423efc64de104efb3fe8343bd572f7742b2c340a2c11528ddadca19da6e98dcc4549ad458be3e76a587f46efede14b199c5af54 SHA512 4c7edd8ea8580e080ab96e8a833f37be236db8d7fb6370e0a8b205daac659947d27d549f0038ee7908cdbd8bcdc0e91f93ee7338d85a396d38b2e0dc1bfd1e53
+EBUILD containers-common-0.57.0.ebuild 1759 BLAKE2B d268eeed2c13c26772c0826293188dab0882686d5b71375c68170a0f64a81e7d62ef7a4a3554ce19e45b63a279f074dca767547ac201ef0d24e93ebd954988dc SHA512 a0e2125c3a5e26c930103f6e4d371194e4b6591d08207588b9cf39bab2a8156c3015c23f17923a8c0a02935e5771853ae56b0487fd68d91067d55305be1eb7e5
 EBUILD containers-common-0.57.3.ebuild 1428 BLAKE2B 483ea726e31c955ccb059aa58e05027033d2a3d682b40a31423472a15c2a35e1cdc231019dcdb184050fc09442bcb93a4bee4e9d45c9c69a1f36622eb68f68af SHA512 4bb587c92ffb790886ca468fe997357c50bf4c21066f276b48d134252809f2ac7efe8737700cae0a28c6f7e3ee83873b4a6064f5a398000587073a3065647624
 EBUILD containers-common-0.58.0-r1.ebuild 1831 BLAKE2B 5d4f98e52111ff64943128235fed05377c04d2a5e2b8d7610c23f1be32551e56327e7e78bbb8bca243beefa843b33cea4584fa6436738534be2065110ed04217 SHA512 a91a4d3d2e4375bf93a5a733c358b3da601b088933746b7bb683390d0da20a9218eb98c938944741c5357c887c19e9417b02a0660eebe57d12e38070151d6560
 EBUILD containers-common-0.58.0.ebuild 1402 BLAKE2B 71d0084a227b7cefc8bd5fc8398e8ee8a9ece59c40ed38c172283914b830cae3befb5b2d617d3ffb87635e3fd691ccb3fbf75c965f1a1674b30ee0793120f02b SHA512 07a07af974fbfe3d596b192f304520d50a2565ce559d8d6fc8a69469a77a776441a0fafe067751783eaeca8d905daabbc4df151264714f80e91d34ffb2827558
diff --git a/app-containers/containers-common/containers-common-0.57.0-r1.ebuild b/app-containers/containers-common/containers-common-0.57.0-r1.ebuild
new file mode 100644
index 000000000000..3cb764cb31ce
--- /dev/null
+++ b/app-containers/containers-common/containers-common-0.57.0-r1.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-5.29.2
+	app-containers/containers-storage
+	app-containers/containers-shortnames
+	!<app-containers/podman-4.5.0-r1
+	net-firewall/nftables
+	net-firewall/iptables[nftables]
+	|| ( app-containers/crun app-containers/runc )
+	|| (
+		( >=app-containers/netavark-1.6.0 >=app-containers/aardvark-dns-1.6.0 )
+		>=app-containers/cni-plugins-0.9.1
+	)
+"
+
+BDEPEND="
+	>=dev-go/go-md2man-2.0.2
+"
+
+src_prepare() {
+	default
+
+	[[ -f docs/Makefile && -f Makefile ]] || die
+	sed -i -e 's|/usr/local|/usr|g;' docs/Makefile Makefile || die
+
+	# add comments to mounts.conf
+	eapply "${FILESDIR}/examplify-mounts-conf.patch"
+}
+
+src_compile() {
+	emake docs
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	insinto /usr/share/containers
+	doins pkg/seccomp/seccomp.json pkg/subscriptions/mounts.conf
+
+	keepdir /etc/containers/certs.d /etc/containers/oci/hooks.d /etc/containers/systemd /var/lib/containers/sigstore
+}
diff --git a/app-containers/containers-common/containers-common-0.57.0.ebuild b/app-containers/containers-common/containers-common-0.57.0.ebuild
index 0643011c3d6e..2d56b46669f2 100644
--- a/app-containers/containers-common/containers-common-0.57.0.ebuild
+++ b/app-containers/containers-common/containers-common-0.57.0.ebuild
@@ -12,14 +12,14 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/containers/common/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${P#containers-}"
-	KEYWORDS="amd64 arm64 ~riscv"
+	KEYWORDS="amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
 RESTRICT="test"
 RDEPEND="
-	app-containers/containers-image
+	<app-containers/containers-image-5.29.2
 	app-containers/containers-storage
 	app-containers/containers-shortnames
 	!<app-containers/podman-4.5.0-r1
diff --git a/app-containers/containers-image/Manifest b/app-containers/containers-image/Manifest
index 7ee7994ad316..812e36562118 100644
--- a/app-containers/containers-image/Manifest
+++ b/app-containers/containers-image/Manifest
@@ -5,7 +5,7 @@ DIST containers-image-5.29.0.tar.gz 706774 BLAKE2B 0af5c7c43e8b75df591cbd291d086
 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-5.30.0.ebuild 818 BLAKE2B e48b4ebb0d7b6fa6b352be1bc65c36a6dfd6facda33dae02afe7eb88d47dfd13151f68f6baba92c87b53326670c6c07e14ead263bd4a549acf7ffc47940acaef SHA512 329ba2356394138c7832928764bf338fe807c9fb097bc693d68eeede6a86e03ebf09ff509b22fe06c365a31faaffaa2e7458f6252a93e51db6ec1bccc8872442
-EBUILD containers-image-9999.ebuild 818 BLAKE2B e48b4ebb0d7b6fa6b352be1bc65c36a6dfd6facda33dae02afe7eb88d47dfd13151f68f6baba92c87b53326670c6c07e14ead263bd4a549acf7ffc47940acaef SHA512 329ba2356394138c7832928764bf338fe807c9fb097bc693d68eeede6a86e03ebf09ff509b22fe06c365a31faaffaa2e7458f6252a93e51db6ec1bccc8872442
+EBUILD containers-image-5.29.2-r1.ebuild 941 BLAKE2B fc67e64e032fdeabffe229307966f71732fd8de208e2059c866da21f246a0f356122f40bc3b2cdee53dfb4bf5c4dcd054e8bb844cee7e01835239ad4aeaf4c40 SHA512 f912c9f49786be67573ade0cbd1c7676fa4e13d054d44c947b55b7dd4e7faa5a98f5813e261d029666bd7d302452c63ee84fd1e734e2cbbe67dcbf2b098eff38
+EBUILD containers-image-5.30.0.ebuild 871 BLAKE2B 2ec49f1a708ade5e736111751825dfe0cff5528e7e7fff6d0ccef4c33955954a873f4325e286042952cde46a67b4be050a75bfc3f1d12d40e7a2752225af3c6f SHA512 6d38bdb24fa90c37576c0bc949a85ad7a606b4144c356dc8448bcacd911c3db57082f3b6bb1e41fb479978fd50822ead8d48e975828bc1f9dfb235557201b5e7
+EBUILD containers-image-9999.ebuild 871 BLAKE2B 2ec49f1a708ade5e736111751825dfe0cff5528e7e7fff6d0ccef4c33955954a873f4325e286042952cde46a67b4be050a75bfc3f1d12d40e7a2752225af3c6f SHA512 6d38bdb24fa90c37576c0bc949a85ad7a606b4144c356dc8448bcacd911c3db57082f3b6bb1e41fb479978fd50822ead8d48e975828bc1f9dfb235557201b5e7
 MISC metadata.xml 738 BLAKE2B ce4b4915d322a13866596221e70f6d19fecf6835cc7d56cdf58d8fbb640aeeb68c03cc0e97a77db270879fd2fdd6751157d932afd69aa31256200ffecf7993e9 SHA512 19f3c8bc2109b189cf6bc8f37fedf7426d0a8c76efc3862d23a10a233cd9bbad20d0798601f999a60c86856d8825b5d4f91931388aded6185144399731fd09c7
diff --git a/app-containers/containers-image/containers-image-5.29.2-r1.ebuild b/app-containers/containers-image/containers-image-5.29.2-r1.ebuild
index 770d024fa41e..5a0b9d37566c 100644
--- a/app-containers/containers-image/containers-image-5.29.2-r1.ebuild
+++ b/app-containers/containers-image/containers-image-5.29.2-r1.ebuild
@@ -21,6 +21,7 @@ SLOT="0"
 # https://github.com/gentoo/gentoo/pull/35012#discussion_r1473740969
 RESTRICT='test'
 BDEPEND=">=dev-go/go-md2man-2.0.3"
+RDEPEND="!<=app-containers/containers-common-0.57.0"
 PATCHES=(
 	"${FILESDIR}"/moving-policy-json-default-yaml.patch
 	"${FILESDIR}"/prevent-downloading-mods-5.29.2.patch
diff --git a/app-containers/containers-image/containers-image-5.30.0.ebuild b/app-containers/containers-image/containers-image-5.30.0.ebuild
index f4507f8d00cf..9d755c4cf4ad 100644
--- a/app-containers/containers-image/containers-image-5.30.0.ebuild
+++ b/app-containers/containers-image/containers-image-5.30.0.ebuild
@@ -21,6 +21,7 @@ SLOT="0"
 # https://github.com/gentoo/gentoo/pull/35012#discussion_r1473740969
 RESTRICT='test'
 BDEPEND=">=dev-go/go-md2man-2.0.3"
+RDEPEND="!<=app-containers/containers-common-0.57.0"
 PATCHES=(
 	"${FILESDIR}"/fix-warnings.patch
 )
diff --git a/app-containers/containers-image/containers-image-9999.ebuild b/app-containers/containers-image/containers-image-9999.ebuild
index f4507f8d00cf..9d755c4cf4ad 100644
--- a/app-containers/containers-image/containers-image-9999.ebuild
+++ b/app-containers/containers-image/containers-image-9999.ebuild
@@ -21,6 +21,7 @@ SLOT="0"
 # https://github.com/gentoo/gentoo/pull/35012#discussion_r1473740969
 RESTRICT='test'
 BDEPEND=">=dev-go/go-md2man-2.0.3"
+RDEPEND="!<=app-containers/containers-common-0.57.0"
 PATCHES=(
 	"${FILESDIR}"/fix-warnings.patch
 )