gentoo auto-resync : 03:02:2024 - 11:44:27

4 files changed, 17 insertions, 2 deletions

diff --git a/app-containers/containers-image/Manifest b/app-containers/containers-image/Manifest
index a82b30a10f63..083fb3d6a83e 100644
--- a/app-containers/containers-image/Manifest
+++ b/app-containers/containers-image/Manifest
@@ -1,10 +1,11 @@
 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.28.0.tar.gz 688100 BLAKE2B 0cee8be579bd11eb0524590d8afe16b6ef863d7adfd74db51b68385142804c8096fec3f2a492e0d5a5021eba9edc91219b327138635aaa329c6ef7d0c01129c8 SHA512 0b76539e04016f5f1067c576a877ace475f25d0f0840fc969606601105a8a7f0e242cc054b0a2cfb6f1b751d850734360a524c78563fdf2330c8ae8c11bba1cf
 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
 EBUILD containers-image-5.28.0.ebuild 806 BLAKE2B 0e8bc9c407a1d6951ccc8faa053a8c2634c013a3c556f970bb2d6e16e5dce371cdaf9c343c533c455ce856d25d50b8c48bbb3744c06ee326d92ba9049cb34b70 SHA512 cb5c1ab825791ed3e856c87394fbe827e3dec8c40857201a5f02f6d50a32859cceb18e073455670f28e2b5ad6b7c7fe966eec2c2166bbb516b15d3ac0f100281
 EBUILD containers-image-5.29.0.ebuild 755 BLAKE2B c6db87c8e66eb57b0820b92c25bb38cf3e14a4c91ca08b703fb09e9fbbc2457f87f3e032001f4ca26a81f49daa056cfecffa986ad1ba229e0774b5a9db8d83d8 SHA512 c59433f5c71dfeca32280916dc8f4849882e78160cf7a8aa642c2356936c9ff3476542551e132e92c754ee317534c77f4c374e8d0abc5675b9335a7a3f799091
-EBUILD containers-image-5.29.2.ebuild 837 BLAKE2B d1db62b98283a3fe71401ed0b1c79303b2c2cd99da409f67566158ba691e48f88da6f7114d64f114d3da3361528da935ce484ccf80504119b5ae753157af52c0 SHA512 e7eb31c64c498cdeff6b08ad0e688c3d712ed072b28420441aa9dd9e124dc2430fb233c316816b1a14a96f24d136570ad48c1b51d9396b6df16fe4b7993dba99
-EBUILD containers-image-9999.ebuild 772 BLAKE2B 9f5e2c2e4fa8e9cdc001100ea888e6dba211492b98ba4ba5fbe540611ba386f27f97141634b697185e0fdb9b10d0e39d1482392c8376be8aff6a06bcac027cc8 SHA512 766acfad54db8b4e902947f6dbad65eda12bc15ce4fc1f8e151fe71b2f6748611462228455149efa2da4345c10964d8db84b391478b2d2903d01fc5dab3bf203
+EBUILD containers-image-5.29.2-r1.ebuild 890 BLAKE2B 044444d96b665e60e28089d24bef313f9e2d3999d3117479918f11b96ecd9d384ac9bf909c96db950fc02da17936b27099977816fb5b06717e876befb15ad872 SHA512 425aebf6e6047eb250257ce321f43854b36a7aad7bb61de3b78fb59af528db56d508ac4e35731d94a58b7c6f2e61df2a7c7b897b669c8dde52b395dde169175e
+EBUILD containers-image-9999.ebuild 837 BLAKE2B b50d28d4dc142f5c8f7448b3ab16d3711bd71982d6d7e5a8c432800c42d907fccd72e8cc825d50fc7b65a3fb0d39a761e9e579ec9ee2fa1025bc73debeb541c7 SHA512 7353136adeafcdb5bddfc78877c789f945e463c5efb08551d6edd9568691b4cbea898bdba04553fc5894a6521ea1395e31296281a202c207b4bb6d89033bc583
 MISC metadata.xml 627 BLAKE2B 3853a7a5cd67aa9162b4e6a198369680070780508e03dadd3e90e7551d94e1bcd1c1220281905f8fb99611ef55bc171eab5e8c15be89e26c553f1b3299bc9d1a SHA512 f1d276a06c7af474488bfa76cc2cab6fa96fa7f4d3938c3016d9b6692dfeb943e3fad8f29310de26d475077b73457739d84ff90eb61bf532abd5c330bf61b91c
diff --git a/app-containers/containers-image/containers-image-5.29.2.ebuild b/app-containers/containers-image/containers-image-5.29.2-r1.ebuild
index 0a3bb536ab4f..ddd9efcc26d5 100644
--- a/app-containers/containers-image/containers-image-5.29.2.ebuild
+++ b/app-containers/containers-image/containers-image-5.29.2-r1.ebuild
@@ -23,6 +23,7 @@ RESTRICT='test'
 BDEPEND=">=dev-go/go-md2man-2.0.3"
 PATCHES=(
 	"${FILESDIR}"/moving-policy-json-default-yaml.patch
+	"${FILESDIR}"/prevent-downloading-mods-5.29.2.patch
 )
 
 src_compile() {
diff --git a/app-containers/containers-image/containers-image-9999.ebuild b/app-containers/containers-image/containers-image-9999.ebuild
index 4fb96c1222c3..2df39141c68d 100644
--- a/app-containers/containers-image/containers-image-9999.ebuild
+++ b/app-containers/containers-image/containers-image-9999.ebuild
@@ -21,6 +21,9 @@ SLOT="0"
 # https://github.com/gentoo/gentoo/pull/35012#discussion_r1473740969
 RESTRICT='test'
 BDEPEND=">=dev-go/go-md2man-2.0.3"
+PATCHES=(
+	"${FILESDIR}"/prevent-downloading-mods-5.29.2.patch
+)
 
 src_compile() {
 	emake docs
diff --git a/app-containers/containers-image/files/prevent-downloading-mods-5.29.2.patch b/app-containers/containers-image/files/prevent-downloading-mods-5.29.2.patch
new file mode 100644
index 000000000000..8d70156bfb6f
--- /dev/null
+++ b/app-containers/containers-image/files/prevent-downloading-mods-5.29.2.patch
@@ -0,0 +1,10 @@
+--- a/Makefile
++++ b/Makefile
+@@ -15,7 +15,6 @@
+ BUILDTAGS = btrfs_noversion libdm_no_deferred_remove
+ BUILDFLAGS := -tags "$(BUILDTAGS)"
+ 
+-PACKAGES := $(shell GO111MODULE=on go list $(BUILDFLAGS) ./...)
+ SOURCE_DIRS = $(shell echo $(PACKAGES) | awk 'BEGIN{FS="/"; RS=" "}{print $$4}' | uniq)
+ 
+ PREFIX ?= ${DESTDIR}/usr