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

3 files changed, 63 insertions, 3 deletions

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() {