gentoo auto-resync : 14:10:2024 - 04:04:03

5 files changed, 54 insertions, 4 deletions

diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 99a7999ca2e4..544ff5c28e69 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index a243e0751138..4ee7e03bced4 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -1,6 +1,8 @@
 DIST linux-6.11.tar.xz 146900704 BLAKE2B e7750c0878d71a56a0ce52d4c4c912199dad5bf5e2e8f872585a6494afbb37cbd852e612a6858936d2dc9b7776a3933818f540db408d57e90d18ea5249bba7ab SHA512 329c1f94008742e3f0c2ce7e591a16316d1b2cb9ea4596d4f45604097e07b7aa2f64afa40630a07f321a858455c77aa32ba57b271932ddcf4dc27863f9081cea
 DIST patch-6.12-rc1.patch 35514952 BLAKE2B 81d0c3a1231230e8e7fc8bb179df01ee41536033625f01a5a39c1839f3a95eed598c22dd462be37e170969bc7b41f31f84200f2d50750ff9f762abacf54dbff0 SHA512 31a3f1234edd1d2583788df11e1ed13d8572d44d957ad9fd84d9fd608e2c62854d9e84d5f60c8e9a28e63aebd98fc845fe1a25e6a2be5d018810404706314e0c
 DIST patch-6.12-rc2.patch 36093232 BLAKE2B 827554afd814da07ba0e089b06b60ea195f50843cac1d78984d9e42612eaff94635d3295e1091e7396fd76363031b54b0e8d822743e058a8a6395ca822822a43 SHA512 eac7c9ddca5892adc190d62c55e93a53960097b14c550af8e9ff826374fd294c020982d56e34d71202ba77b3c471e553e6ab0c1c4989f7e330b9cef7eaea5b87
+DIST patch-6.12-rc3.patch 37010782 BLAKE2B 932e95c6138efc2228332b3be112b8c2941789b094c00dd536a5cbb0fe39ff85b03ff2916873cf1b2b982db220daa6393d4a9e513179e215da08a5eeb09053d8 SHA512 94a14426d8f00dc1e34f1a9676a5ec45374d21c598827a7ced63a1c85a50fd9873996b954a1f0490ac2b5ead8ebc43dd82421eb056b8063a201a35615130324c
 EBUILD git-sources-6.12_rc1.ebuild 1174 BLAKE2B a84f722735539415ab553b5b9f38024e19cff19c72bbe1e4512944a34d505594f13e94e18f53c3bc92e3de6a40dae426d0df548f257cd7547365fe71024a6f77 SHA512 8b95e16191c6e30d931bc3653c5a6de10e0ac375495e039af6be54328c3c0567e2fd2de72996d1bba2fbdc19c605543f1c582451957a414ba60b87956bafa889
 EBUILD git-sources-6.12_rc2.ebuild 1174 BLAKE2B a84f722735539415ab553b5b9f38024e19cff19c72bbe1e4512944a34d505594f13e94e18f53c3bc92e3de6a40dae426d0df548f257cd7547365fe71024a6f77 SHA512 8b95e16191c6e30d931bc3653c5a6de10e0ac375495e039af6be54328c3c0567e2fd2de72996d1bba2fbdc19c605543f1c582451957a414ba60b87956bafa889
+EBUILD git-sources-6.12_rc3.ebuild 1174 BLAKE2B a84f722735539415ab553b5b9f38024e19cff19c72bbe1e4512944a34d505594f13e94e18f53c3bc92e3de6a40dae426d0df548f257cd7547365fe71024a6f77 SHA512 8b95e16191c6e30d931bc3653c5a6de10e0ac375495e039af6be54328c3c0567e2fd2de72996d1bba2fbdc19c605543f1c582451957a414ba60b87956bafa889
 MISC metadata.xml 465 BLAKE2B 089bfb0e4af03b69d3d118d39713b54aac6912012cf0e9352d22b4b597abe5b1ef86863c37f6a0be2f81995f2a81a8d08bc7c2927d06ac2042b7b18ba02c77be SHA512 cb2bec5a8cce1e6da593f6ab11ceb854112fb4e828198793820699913f2f7cb2a9443e1cb15c42e16730891a27fe8dcd1713527c2ba2cfa56f6d2296f6f6e001
diff --git a/sys-kernel/git-sources/git-sources-6.12_rc3.ebuild b/sys-kernel/git-sources/git-sources-6.12_rc3.ebuild
new file mode 100644
index 000000000000..4c32ee9cdd98
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-6.12_rc3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="6.11"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+K_NODRYRUN="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.6-r5"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index f84d9e16a29c..1f4bf5a22856 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -8,5 +8,5 @@ DIST linux-firmware-20240909.tar.xz 383099276 BLAKE2B 3769ca5501db43a6d1ca54ac11
 EBUILD linux-firmware-20240709-r2.ebuild 11025 BLAKE2B 8362004307337300997032efa50bbcedf2380c7c1c66915773396b2c5567ccab067d596cf8cdd1c607bcce4e956cd3e1e7b55fbeaa4537bb63d40eac498df997 SHA512 271a506d8b039af9209df63145a4522dc245fbd554a3a95478bf8911e73b28287073c76e549368f3639ed85a65def43b1bd3666b49e645006dba09f57fb7bf36
 EBUILD linux-firmware-20240811-r1.ebuild 11025 BLAKE2B 8362004307337300997032efa50bbcedf2380c7c1c66915773396b2c5567ccab067d596cf8cdd1c607bcce4e956cd3e1e7b55fbeaa4537bb63d40eac498df997 SHA512 271a506d8b039af9209df63145a4522dc245fbd554a3a95478bf8911e73b28287073c76e549368f3639ed85a65def43b1bd3666b49e645006dba09f57fb7bf36
 EBUILD linux-firmware-20240909-r1.ebuild 11025 BLAKE2B 8362004307337300997032efa50bbcedf2380c7c1c66915773396b2c5567ccab067d596cf8cdd1c607bcce4e956cd3e1e7b55fbeaa4537bb63d40eac498df997 SHA512 271a506d8b039af9209df63145a4522dc245fbd554a3a95478bf8911e73b28287073c76e549368f3639ed85a65def43b1bd3666b49e645006dba09f57fb7bf36
-EBUILD linux-firmware-99999999.ebuild 11321 BLAKE2B 9e941ca1b6ff5bc683638a1ae514fbbce3cbfbd0540c07c988183d20d9baa79a450f85c02c7e2ab426cfd4eab9fa3b373a6cd5b6914e23a4724b211fdec320a8 SHA512 3e527ee380cf95df54b3e90d43d8a0666f091893d2d7c170abc8916f38c2d0481664fb48f20301776d9d878ef6f9777a6de81434f8861bd02564cd2828f7d3cf
+EBUILD linux-firmware-99999999.ebuild 11516 BLAKE2B 63bd0c84fe8e9a33e310175a419f2f09553d43819e3bf3dedd01e86ea71b5596f93d3f0764bf76861c50870cf967888e9a45943e88cc4232f099d6b683097149 SHA512 53f61a8213080e3cbde17244ca4dc20fa5ce9feece9a4f4967671443eb0ac09c3921a37a4ba66334aa0166438a7d01940abe41bbed358c5e60d2334071d6627b
 MISC metadata.xml 1289 BLAKE2B 109336d30e5ec5fb5e679cff9b31e6f69c0b4f629e2aaf4d0d7b6c0db78c1ddcbbb0b283f724f2758207324b622c2af9dfe15874ab34b34876e3e4f58cb5ced6 SHA512 9b925b26bb58a39360ab5ff3cdd7d88bd489645e73f101209f0813a0b926b15dae34f28db05ff6419a0a62fab2ac84ae0546b5007ce17ad3611188bf7aeda3e5
diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
index d96b4b85e55b..a177433c8846 100644
--- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-inherit dist-kernel-utils linux-info mount-boot savedconfig
+PYTHON_COMPAT=( python3_{10..13} )
+inherit dist-kernel-utils linux-info mount-boot python-any-r1 savedconfig
 
 # In case this is a real snapshot, fill in commit below.
 # For normal, tagged releases, leave blank
@@ -40,7 +41,8 @@ RESTRICT="binchecks strip test
 BDEPEND="initramfs? ( app-alternatives/cpio )
 	compress-xz? ( app-arch/xz-utils )
 	compress-zstd? ( app-arch/zstd )
-	deduplicate? ( app-misc/rdfind )"
+	deduplicate? ( app-misc/rdfind )
+	${PYTHON_DEPS}"
 
 #add anything else that collides to this
 RDEPEND="!savedconfig? (
@@ -84,6 +86,9 @@ pkg_pretend() {
 }
 
 pkg_setup() {
+
+	python_setup
+
 	if use compress-xz || use compress-zstd ; then
 		local CONFIG_CHECK
 
@@ -120,6 +125,8 @@ src_prepare() {
 		|| die
 
 	chmod +x copy-firmware.sh || die
+	chmod +x dedup-firmware.sh || die
+	chmod +x check_whence.py || die
 	cp "${FILESDIR}/${PN}-make-amd-ucode-img.bash" "${T}/make-amd-ucode-img" || die
 	chmod +x "${T}/make-amd-ucode-img" || die
 
@@ -136,6 +143,8 @@ src_prepare() {
 	# whitelist of misc files
 	local misc_files=(
 		copy-firmware.sh
+		dedup-firmware.sh
+		check_whence.py
 		WHENCE
 		README
 	)
@@ -284,9 +293,9 @@ src_install() {
 	elif use compress-zstd; then
 		FW_OPTIONS+=( "--zstd" )
 	fi
-	! use deduplicate && FW_OPTIONS+=( "--ignore-duplicates" )
 	FW_OPTIONS+=( "${ED}/lib/firmware" )
 	./copy-firmware.sh "${FW_OPTIONS[@]}" || die
+	use deduplicate && ./dedup-firmware.sh "${ED}/lib/firmware" || die
 
 	pushd "${ED}/lib/firmware" &>/dev/null || die