gentoo auto-resync : 11:01:2025 - 06:41:28

3 files changed, 3 insertions, 44 deletions

diff --git a/app-containers/containers-image/Manifest b/app-containers/containers-image/Manifest
index 497875f21442..29b8da3ec8c9 100644
--- a/app-containers/containers-image/Manifest
+++ b/app-containers/containers-image/Manifest
@@ -1,11 +1,9 @@
 AUX fix-warnings.patch 397 BLAKE2B a5922e061c825e25398fc3fccdf683abf8331b065337ff240227478d7d3ef5398957d56a430c0b04aa823033b56653e87c8186065e5898818e75310451b347e0 SHA512 a96ab3fea76be4751d6dc3893b4272b063c854503e1a65b4501819a5925f3911c285fbfb4ee6827795a41c696015cc06f446e4ddb1318e21cf0141e15804833e
 AUX moving-policy-json-default-yaml.patch 3285 BLAKE2B c0c9dd1380b6edec05162df127085ba74b7f426b00f7565bf4f14a2fe1809fe66fa13b19a84d84ae32dc3179ea0967aff8d8e24875ae706906f2427120fad801 SHA512 a3e8d2cbf3797e998636feaf963968b1e382ab1376b4d6a42bfa7187359e04d782aa043debd20f4ea2b1e4280d049029a71d8525a3fd2a87c780523eedcaf04f
 AUX prevent-downloading-mods-5.29.2.patch 322 BLAKE2B b3358abc9a9850a24153d188289068e3a8482a7b30e56b9440694ab78c04c37f10f5e3f31a24e82cbbe2f4c365d0df3dc5ccea1778df6dc9fe3dc12977169bf6 SHA512 1c78ae9dd35c7e8546984b32e149f29beaf955fe673264c0a3ea45b86046fa1628b5f74696f7224fcffbf54fc642d696848d0530beadf41be0084e4d77992a04
-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
 DIST containers-image-5.32.2.tar.gz 735422 BLAKE2B a0585c877b4679226d1760bf873ceeb5cba7f5177ab83fa6f8a161b1f3958f3d660445556b13b4221712c241cee94429cabdb1fd4186d4dc6edba7b032fce2bc SHA512 7498f9e446b2c205b033703641f7cfcb6c8bd8f097b12ef3f734c94772d63fc7b9b40a6700d53d93919d2c34772f079aa3cb7d9f9e5a130b6587f4fe2a558df6
-EBUILD containers-image-5.29.2-r1.ebuild 941 BLAKE2B fc67e64e032fdeabffe229307966f71732fd8de208e2059c866da21f246a0f356122f40bc3b2cdee53dfb4bf5c4dcd054e8bb844cee7e01835239ad4aeaf4c40 SHA512 f912c9f49786be67573ade0cbd1c7676fa4e13d054d44c947b55b7dd4e7faa5a98f5813e261d029666bd7d302452c63ee84fd1e734e2cbbe67dcbf2b098eff38
 EBUILD containers-image-5.30.0.ebuild 876 BLAKE2B 33c68c540357f5741622eadc8d6052a9fe916aebc4b490048eb0fe567f339534e3c4905b6a0549a3a24c2ac84438e9f80fff77d185846489df015e8ac58b7433 SHA512 0cda4908a4dd9e1c369053bd62cd78cf06b9e3e3286d4935e1359e2688b3428bd278961a54a09ad0584e565764a95f4cf0ce9b3d3baf8ed66ff0405c8cf059a2
-EBUILD containers-image-5.32.2.ebuild 832 BLAKE2B 28111e291882afa8f49ce40664039869a01a1514e3937c272002bc44d1497290bec6b45ac7f017fe9b7c04be1b7d0b52da385fa67183569236a128c22258de5b SHA512 4f6c5d60b4a9995a9c9c994cdf69af9d573a40548df9fbcedcdbabe63ca18398c4caf240f27f68ead4608928f9bc87060c517e25bfeb0070da26d167e25cb957
+EBUILD containers-image-5.32.2.ebuild 830 BLAKE2B d07749947955ddf185306dfafed5b9113d9fd2b5b16f4688190295484df35f32cd19f0ffdf033b24bc6097ce36f8f39e1311c9a56c1f53f1d65713a167ad6bfa SHA512 5e3bd2e474da6f104fb29e9ce72a858bed0a3ac84bcf0b7789a91d75ffd04e3aaeae3dcc0e311736f9cd4963c36337a56145d372f0bf787fc58d386244021cab
 EBUILD containers-image-9999.ebuild 832 BLAKE2B 28111e291882afa8f49ce40664039869a01a1514e3937c272002bc44d1497290bec6b45ac7f017fe9b7c04be1b7d0b52da385fa67183569236a128c22258de5b SHA512 4f6c5d60b4a9995a9c9c994cdf69af9d573a40548df9fbcedcdbabe63ca18398c4caf240f27f68ead4608928f9bc87060c517e25bfeb0070da26d167e25cb957
 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
deleted file mode 100644
index 5a0b9d37566c..000000000000
--- a/app-containers/containers-image/containers-image-5.29.2-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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"
-RDEPEND="!<=app-containers/containers-common-0.57.0"
-PATCHES=(
-	"${FILESDIR}"/moving-policy-json-default-yaml.patch
-	"${FILESDIR}"/prevent-downloading-mods-5.29.2.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-5.32.2.ebuild b/app-containers/containers-image/containers-image-5.32.2.ebuild
index 2b3c1bcb8666..4226aabc608e 100644
--- a/app-containers/containers-image/containers-image-5.32.2.ebuild
+++ b/app-containers/containers-image/containers-image-5.32.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ 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 ~arm64 ~loong ~riscv"
+	KEYWORDS="amd64 arm64 ~loong ~riscv"
 fi
 
 LICENSE="Apache-2.0"