gentoo auto-resync : 26:06:2024 - 00:12:24

10 files changed, 12 insertions, 16 deletions

diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 0bee59fa7b32..cd652cf2d6fb 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/docker-cli/Manifest b/app-containers/docker-cli/Manifest
index d71c608fc656..ab4bf991149b 100644
--- a/app-containers/docker-cli/Manifest
+++ b/app-containers/docker-cli/Manifest
@@ -1,4 +1,4 @@
 DIST docker-cli-26.1.0-man.tar.xz 79004 BLAKE2B 36dcf969c6567680990420d6d177101bf457f7fc1c24dff195ce8b478268335419fba5ff51a7b77bb8c0a6e0e6077d83ddb50f2ecf08bf069be89fc4849afd6e SHA512 36297ee3cbf096112ec41db2cd1d06796ddd27a57c4323e71a727e17d3930102710f643a77df9e68cd9b3294a6bb0fdf5565379e9fae7331e25afcd147b0084f
 DIST docker-cli-26.1.0.tar.gz 7213165 BLAKE2B 302236467f2b6f3f46b0f0c75e89c2cef0cd251d36e12f78a67c906cfb85b842b998fd3b07f4a2dfc0a04825a9b105d90f11d176055ded397f2d4e9145639d5d SHA512 1a1e9af1a836765ffa91f7f2e1b27911e2b6b373c308a7db332a7cd1825459ab1c04a93d03c9947b631bead0af21d9f03e06c3a60855cc56ca7039e50e38ba87
-EBUILD docker-cli-26.1.0.ebuild 1948 BLAKE2B b5452c4bcfca4bc6f07d816319c1f24f883a86e8e9cd3bb38b5a4eeff5b6c2edaa2f07399d871707e8b891e099f5c6c275d3fff040032ce09f9d46e6edb88554 SHA512 053edc16298ad414c2327e5a1cc8f53963e6c48b93de130121fd673d09b19c6d658ca304d7b94606b9e184c10c9756415829eec0e86b1307acee1c8dd4d536e2
+EBUILD docker-cli-26.1.0.ebuild 1938 BLAKE2B 34cc509b6258248dd831f0ae25b27b24af357aa97a19a6ec5dd1a6dc1889faf239a69c01cb0ed2b4eabf943aca92f57176fca21614cc29095dddfd9463d1672d SHA512 6e599bcf0ef5e076e722a6c1af9c1c18eb5b9a805201630223dcbd99bd4cc62fe21d1c91c328c930555b3842728ac7eccb1522bb9b5c7c44cae0e0c10ee4a2a0
 MISC metadata.xml 398 BLAKE2B f9cd5360fa32f30edeeb2fe1df0ea50fd0b061bf882c66c65f18d15ba56995deac8c054419ddbf2d6436bf90f6fb729dda9560b3766b558d45498ae2c8de486c SHA512 4b2cf7c3b38df8382680539e1a8121f6f2f75cbe70f1f92c589fb40dd4c368f2f207cf3567ead5620714c323c0c196c318a4c5ab947d49092668dc2a3a8a6a53
diff --git a/app-containers/docker-cli/docker-cli-26.1.0.ebuild b/app-containers/docker-cli/docker-cli-26.1.0.ebuild
index ae27ce232a20..12a42233ff2f 100644
--- a/app-containers/docker-cli/docker-cli-26.1.0.ebuild
+++ b/app-containers/docker-cli/docker-cli-26.1.0.ebuild
@@ -44,8 +44,8 @@ src_compile() {
 	export GOPATH="${WORKDIR}/${P}"
 	# setup CFLAGS and LDFLAGS for separate build target
 	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
+	CGO_CFLAGS+=" -I${ESYSROOT}/usr/include"
+	CGO_LDFLAGS+=" -L${ESYSROOT}/usr/$(get_libdir)"
 		emake \
 		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
 		VERSION="${PV}" \
diff --git a/app-containers/docker/Manifest b/app-containers/docker/Manifest
index 8a2ff52a3645..5e2d6e31e261 100644
--- a/app-containers/docker/Manifest
+++ b/app-containers/docker/Manifest
@@ -1,5 +1,5 @@
 AUX 0001-Openrc-Depend-on-containerd-init-script.patch 774 BLAKE2B a7ac6f6a1e9ee88751e8e0471cd33429b8141cbea07a3a56c61eccd63c796c9135edafaf5977571a4413e5d71931aac44b5313110af94c3206e286b15394f637 SHA512 bc709b6f0dd8685fbf2404be589743f32a5f4deb24dec8ed6aeec18f0fcd1db4c5d59587209c28f62d964d78ec9ab3a3fdbb795dc4b7e3fabd00a06a002af34e
 AUX docker-26.1.0-automagic-systemd.patch 355 BLAKE2B 95d2367d5450a15214939c0a080b81a07d3ea3fdaaee921b2fc221949f3737652182366e54af499da5a1597fb1353a29d8935ed0a5e60a805920d3375aa594a1 SHA512 ba694ac1ca135fadc39d1afe0b8fdfaef8d6b9c75cbe4177a51422f972022f3502625c5e5467cd54fe33b2e83acdfe2c524da2a4d37f74376f365d7baaa12bec
 DIST docker-26.1.0.tar.gz 16390376 BLAKE2B 6703e9b153c430bc28aed2e7de7bada0203353d61f0a2ce3d49ddbd017eab196a685dd1ab1e719a6b287813eb5fa4f2c612e2cf1ab95789d6e79ebe5dac7ace3 SHA512 47b6b9af9947016884614b6bc25977e1db281da95c9b8b34c753c21c664a737a893f9fa65d92cbb897735aae3893567e106e6bababb5507e069b1e0981e48d50
-EBUILD docker-26.1.0-r1.ebuild 7532 BLAKE2B 4ea141e681d5db35248a0411f9ad0601d1cd8e25be77c217138e0d90709a122405d200d4351a57a77dadbbc18e953a395c9223c2954dc850efc6bb90dfe3c797 SHA512 5797b7045a5dc8c94e65abf46bbcd0ff14c35e5c1940997a4f510eb3c04cb6549e54c9f357ffd575a4c41d6a1ab1739a6ce00245099ac332f090d2edd4f3482f
-MISC metadata.xml 1238 BLAKE2B 66ba70d18bda5204db7a3a11ce1b258d5f3c3679ee5e9271033b04eeb9a23891632c5fb55a1bbd4d549b865261c9f05e9515879e989001b8b8e84e082dca8fb9 SHA512 ed304e622873eb5cb5e5f6e79955b19c4d660d8d3348ebc632b7c2ec996680ce43a53ee920c0f124525911836aa08e6cdaf942c9a856f68d31632a955930b271
+EBUILD docker-26.1.0-r1.ebuild 7522 BLAKE2B 9b02ddf1d1a68847be4541e93a01cddbe486907e68eef51c3a87e6012ed5be52c4e31af675ed718ad0e911acbdb856fdc9b127edeaec92f879c778b4bff79bcf SHA512 a3e351d6c33cdea4584c4444902b0277543b7f6f573716225ed0ed8f68aa50422902d03958cce3b1a2ca0d128d1d1edd94247e8d32e063f75990985fa18726f3
+MISC metadata.xml 1100 BLAKE2B d7a5f93051eb7d087cadd9788a1607f115deb9e7bb73929efad1815a25633f7c9f66c6e797e0283ba975f573e7a8729b48a70d1b2384c392fab1f7b1e4842a17 SHA512 7637097ccfdcc4d07099d54de4eacbac42cfc0f84aa7da78aa5547fe9c42b3c77e853d15492d0fea467c0c53514068b35c0d34dbe6668c285212d8e2bb5371dc
diff --git a/app-containers/docker/docker-26.1.0-r1.ebuild b/app-containers/docker/docker-26.1.0-r1.ebuild
index 6aec21b30a71..980c31950f3d 100644
--- a/app-containers/docker/docker-26.1.0-r1.ebuild
+++ b/app-containers/docker/docker-26.1.0-r1.ebuild
@@ -242,8 +242,8 @@ src_compile() {
 
 	# setup CFLAGS and LDFLAGS for separate build target
 	# see https://github.com/tianon/docker-overlay/pull/10
-	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
+	CGO_CFLAGS+=" -I${ESYSROOT}/usr/include"
+	CGO_LDFLAGS+=" -L${ESYSROOT}/usr/$(get_libdir)"
 
 	# let's set up some optional features :)
 	export DOCKER_BUILDTAGS=''
diff --git a/app-containers/docker/metadata.xml b/app-containers/docker/metadata.xml
index 5c680bb1005b..63036f19e3e5 100644
--- a/app-containers/docker/metadata.xml
+++ b/app-containers/docker/metadata.xml
@@ -21,10 +21,6 @@
 			Makes the a staticly-linked init system tini available inside a
 			container.
 		</flag>
-		<flag name="device-mapper">
-			Enables dependencies for the "devicemapper" graph driver, including
-			necessary kernel flags.
-		</flag>
 		<flag name="overlay">
 			Enables dependencies for the "overlay" graph driver, including
 			necessary kernel flags.
diff --git a/app-containers/earthly/Manifest b/app-containers/earthly/Manifest
index 42ddb83d0af1..783950596c73 100644
--- a/app-containers/earthly/Manifest
+++ b/app-containers/earthly/Manifest
@@ -12,7 +12,7 @@ DIST earthly-0.8.9-deps.tar.zst 180210180 BLAKE2B 8d48677c9dac4571efadb41c882520
 DIST earthly-0.8.9.tar.gz 8070633 BLAKE2B 3ed83bf57654f89d0b579ec9df64a9025d9fae1da755018c83cfd6ac03e70da176de564185a2ad1f68383ff0c6a2e26132568cb451bc1b474b87c4852dc2266b SHA512 e1fccfafa845b1964f824850c05fa39904e2804f8145f24342ee86e6c9f1a8ffbb30b1a822744343f59ba9dc4b1e4788020d0cc6b954d9f62eeeb43a594bd326
 EBUILD earthly-0.8.10.ebuild 1873 BLAKE2B 7c1ea309aed992babc0f8127d2a4df9797d50c96e32dbb0d6c84f8b58245ca470b9faa2fc3284c0afef9580ba3f09d8fe6dfe820b8efddb4a1e67748a8591922 SHA512 242fd126574b5f0785526cd495c5fdece4f9eed947c54f111c076df9fb8adac01dd47c844dbac4755f77886e0f5aef40bfe1f5b87497c7ae3d8734e716a5e02c
 EBUILD earthly-0.8.11.ebuild 1877 BLAKE2B 6fc911dc914dd7ec94547b1e5e16dad19bde6e3ec77594b6eb5c4f9de064a6fa7adf3e2fd6b8b43f88831f28560f35b4bbf8c34dfecf7946fc763c4005c96bac SHA512 87b227258225147c8e8d250df51d6b6d985684b3eee0d094032ed5d03e853b3d0b79562deccae34a863a2c7ca1f052d852689924765f2d70f057a63e67c2122c
-EBUILD earthly-0.8.12.ebuild 1796 BLAKE2B 9d90d9f6e3887215fca65f86fbc1f4fe67349d8d34b1b2a1bc1e81aa758f53c3de49027c4f970f905b8827ea5d2b7d2da55af8bdad743490b0f7a10fa32bd4c1 SHA512 4f40f488c2c726ff5e3eb4fbe4d9b7c9aee4d172e0f8f66e62cfde6dafdcace729cfe3f61bbef1487fbc52b318df857c2ae4287b7ac181869cd3254bc00fabce
+EBUILD earthly-0.8.12.ebuild 1795 BLAKE2B 07309cb5dea85cdcefdfab91608755f040568d270d58e081f01a9fc6599b5a9d8b8b8418846b5827f3b270cf1b4e12894e5f242a024415ef8c0c68a54ec9069b SHA512 b2a315db2dd586951d596da3ef2f8fab606512c7edcdad837ee39e44155704962741b5d8e3e170de28b7b259f9bdaf4f5cbaa76c2a59d87e2645d1c1410a0d0b
 EBUILD earthly-0.8.13.ebuild 1796 BLAKE2B 146155eec0dd7ba5d88bd8f1df5584b04d67374561a4fde80043b933740d1bc9ca1dfd7a3676598b4932e21fac63f3e8b233f465919d2ad884d5c426586c0eaf SHA512 ae06695aa894ebd27248ae4dbf2c0912150d8028180716da33733efad908006af3ae6e19a766035576ed78f8f8fe2ce2fb5ea69c67f2e7584e43ca70c3f12426
 EBUILD earthly-0.8.14.ebuild 1796 BLAKE2B 5ac0a172fa7878f74725796849d265199e2f20f43dc7438d14e98810d01e5333d5099e4722bf8a44cc1898d8da90539ac6ccb0ce55618c729fc4279625cbc34d SHA512 53aa3669b41c6e938fa68c627e005b696092bbf8dc64da291fe0ed6b6ad6cd605d7b233db54accbdafa45945185cd741a6aaa51dd0d9e57b48076559fb7074f3
 EBUILD earthly-0.8.9.ebuild 1871 BLAKE2B 7beff59ec371e6939461329c555e7c8df218a619ce4ddf06c51c90c3b63ea3c141762e7ae631f1429d83989a2e1eb2b4dc6d3ad63715fb7e0e40b7fc6bf362ce SHA512 b767a6b99c1f471812ee9b0b7aed8f3602eaa87cbcd65d521ff3e2c418a3495ab315bb54d10547c482b4fcb1230f2d80d5c20dce263380ee905dec4d89562015
diff --git a/app-containers/earthly/earthly-0.8.12.ebuild b/app-containers/earthly/earthly-0.8.12.ebuild
index 5c52ef303f21..2b39a6ae5bc6 100644
--- a/app-containers/earthly/earthly-0.8.12.ebuild
+++ b/app-containers/earthly/earthly-0.8.12.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	|| (
diff --git a/app-containers/runc/Manifest b/app-containers/runc/Manifest
index ac6b37228077..58d205662f83 100644
--- a/app-containers/runc/Manifest
+++ b/app-containers/runc/Manifest
@@ -1,3 +1,3 @@
 DIST runc-1.1.12.tar.gz 2522196 BLAKE2B 14fe8d5f82d5b4d7f6b4bb9111c5d258e74f6a44aeb51fc87c69104e95b9bf24a3d503f4cc5dedb40d542fbd4b6e27273f456bda4fcf3bc298eb93ae292d9663 SHA512 92e8ac54a77d7ebcc76b5a9cc08d9a064211f12e9d26f064070cc203a5afb11c3af28d8f556f297513f797a2933d50bf10a8f22e307724041d66aa8c5ca1d9d3
-EBUILD runc-1.1.12.ebuild 1843 BLAKE2B 08106f5ac68bc0aad1bfbc3c1dbf3db9ee493e5c55f50cc312be88f2b9969caf2469ee66c7103f73a30ef16e3890ceb6b1a76d1bd84d37e60f6d272beed0ee6a SHA512 902d6df904091461cdfcf81732fdffe458f2ff688767127dfdf7958b28e4b3801835ce31cf552e0cda0ce398247d2f2caf6dff990f7d82b287f4ad5c6cd3dd08
+EBUILD runc-1.1.12.ebuild 1833 BLAKE2B 6815357831f57776945cb6c7d8e8e0a7735aacfa35ee4329ad5e8a8c165f788812c7a347b6933fd05e29b063dab3e886fa3e37f57d2e66f0d46401a65c620b8a SHA512 eb290a626e95d3cfc5ecc308aa63891e19f6d6e5092aa3704cdc174d7ed917dd8c53f86dc13a6ec9ddfcbf04a5c826fc1e6cc10ffe20c431209dadd9fcc427b0
 MISC metadata.xml 647 BLAKE2B 67dce497b4fa65db5146f9e017ec00795ad4ef5d63058d4c20bfc730f17e2fabfcd82b403bd06330f9a68ef2e344198514930493eeadef69eb2ee8a618e5e0fc SHA512 970d9753c81eb387a06fc24be8bfb3b056e9e7cbf568f99511bdcfd35f6a8cdfe21ea0103ea36b8fba7be733016493663c3a38452b05225de35af7e1c5b359dc
diff --git a/app-containers/runc/runc-1.1.12.ebuild b/app-containers/runc/runc-1.1.12.ebuild
index 9a94108c30b6..ed23ef215d7b 100644
--- a/app-containers/runc/runc-1.1.12.ebuild
+++ b/app-containers/runc/runc-1.1.12.ebuild
@@ -42,8 +42,8 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 src_compile() {
 	# Taken from app-containers/docker-1.7.0-r1
-	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
+	CGO_CFLAGS+=" -I${ESYSROOT}/usr/include"
+	CGO_LDFLAGS+=" $(usex hardened '-fno-PIC ' '')
 		-L${ESYSROOT}/usr/$(get_libdir)"
 
 	# build up optional flags