gentoo auto-resync : 18:07:2024 - 12:29:01

8 files changed, 12 insertions, 61 deletions

diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index faf26029e47e..3c13a502da06 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/asahi-sources/Manifest b/sys-kernel/asahi-sources/Manifest
index f9721c056080..09067dc8eb3b 100644
--- a/sys-kernel/asahi-sources/Manifest
+++ b/sys-kernel/asahi-sources/Manifest
@@ -1,5 +1,4 @@
 AUX asahi-6.8-config-gentoo-Drop-RANDSTRUCT-from-GENTOO_KERNEL_SEL.patch 1826 BLAKE2B 4e170e302c1d52b3f5b8d4f6e79eb096fe859745042d5539745df97a8e78cdca50fad24204cd5667620a3c65f93406dcf54c3eb51a3f45d9cd10369ca83cfe12 SHA512 afd78d1b42eae94472ba45cb259db811d6258af6b46e4f9cd64e30fd3c47728063c815199431f6c700c45f8a5d91fbfbf6e2c07a5f38dae7371cc8a2edae6ecf
-AUX asahi-6.8.2_revert_spi_stable_asahi.patch 1451 BLAKE2B 749163f2c8d1d6f7b667f5123afdb99106e9341375767cb652039d48415f101542abc6150b8f559a1b594209d1d29eaa158a3f9c1e0a450e1dff620a0c5e7e4a SHA512 7145725dccdeeeb304e97070f1dbec450165296919101e111ae1e188fd6d7c55cc68fbddcdf50d2bfe0e052f4aeb401a9cace8c59636afb4940405725a7ea327
 DIST genpatches-6.9-10.base.tar.xz 602768 BLAKE2B 614634ed1d1132be830e91a13dc509022a6a476b678f63dd4f3c428e7c37eec46f47a32f927f3895ff65a6ab5b046a3b0ca2df88a94678f898292d0970859734 SHA512 7826d46d8faaf64fb268f8dc940621f434f8729e706b4178adac2a2c353bccd854e5fea6c3489d5d0c48d469d6f6e26befa01d5a0deaba48f3e6140eb096de5e
 DIST genpatches-6.9-10.extras.tar.xz 4052 BLAKE2B 607bede5f0c3d38f72fba841861caf6f90e7f0068373d951a6aa21a29cb7523bcd6faeeb5602c6a7395a802d35e657aaee1172582ecddd0c4143fc21ea9c4b3c SHA512 b9e59d200cb06ea3287557e1ca1cf7116df61019f423fa8149195d36d7d2b143265341bef5430c4f761b0926ad823775cb2c83c852d22dc4acdb0d9628da12bc
 DIST genpatches-6.9-9.base.tar.xz 548708 BLAKE2B e0130d225056f77c92e566eef9db643ecdef6faf2f81e8329859830850bb5409e212aca0ab0da85b9b1e3377121221259044dac650986ec05feac46f4d588a5d SHA512 714016638f866b536b85edd24e3e44513048591aa270dbee1460c5893b3e8b0508f299d86a202deacd10f105c0da48038d78219226b2808e17012d1811df391e
@@ -7,6 +6,6 @@ DIST genpatches-6.9-9.extras.tar.xz 4048 BLAKE2B 7be69cb63abf9df9267bc61e3e36567
 DIST linux-6.9.tar.xz 144034416 BLAKE2B 4cf86c3cfe6e6534745d42dfaeca59b17ea1168c4e8b615c80e6d8aac735f11283cd85fa992b440b5d4452917e94b9f08397a64af0be5894e3df23c68892377e SHA512 fed3b4cd1fbfb4d94618587c1934273d2ecc8b6e42a3d586ff8a5f24980be930f2ef803aa2923ca3bfa5e4e619f967f3af315368f24fa76f610b10443624a579
 DIST linux-asahi-6.9.8-1.patch 5296308 BLAKE2B 7a6640235488d11ebaa230d022fc89d85633830a9082d5fc7a62ed7a46272a62dcf3b5f68387bc2c2cbe14a5fc9167d31a896ddbeefe1d8d70557077d83d90df SHA512 0c0de341a98fa91da4670c14a704d5cc0aaaf80ad74af86b9df2a13762a0f9196f0c32b32fc80cffce4f65c459d92a9363bee7c2c5f02e35d5ecd0ee0118b5d4
 DIST linux-asahi-6.9.9-5.patch 5356022 BLAKE2B c3b5fa8be8320d391f11e7f02b7aa4c67055484539da5a241e3557d075db6c60daea15abcb992dd04cc2dcd7b8fd67bf2a17b21225737a492f0b70a987403189 SHA512 49bb4812e467b0ef07a71b0f6c1a16b8ee627be9c9c0862b87b419080712d77f0a8b5a83ddb54b92776defc79afa8241749cec97e262d98c29da874801decaa3
-EBUILD asahi-sources-6.9.8_p1.ebuild 1722 BLAKE2B dfa32aef22b6995527c63423e2941e114482cf82f66234eaf6a41190f3ffb1f4a3ae33b8fe164215feec8d699e8f0ac988cebc98f3d6ab42375b71185a294bcf SHA512 b48cbbf09c2c059632aaf4ecd9cb260b279577e023ecca6fbe291ded7da2ea42d12dbc0c58cc9e1878148286fe2dc48a1bd03da91263f6efb82c9eac87cff776
-EBUILD asahi-sources-6.9.9_p5.ebuild 1724 BLAKE2B 4e3b0ade0f7a3ffd6429f40d1263500f85c85d4120d4520eedcc90d2187e708fa029fc9cdc560ccf9fefe7889b495b648cdcb6d0595af2410b1009bae0ea0a62 SHA512 cceec565e1e986994131d10c472588aab742614c8e60c4875ab646df07407c4ba89e567f52de3bad7c9920af68369cad87a04c12c71eeda80eb9172a002ef244
+EBUILD asahi-sources-6.9.8_p1-r1.ebuild 1667 BLAKE2B 468797017674ddc886c27de712417afc54086aaaf94044662124c54bdb1fd4ca8c1bb034d469a325c896b06bff46b1ee3ad68746758943e71fcf2369bfe7c4c9 SHA512 87844e895d3fde35316967274d2af5bad28386fb9547e4743f8450b7c814c2cb48d38c9cc21c11a5c2bad7375d601e9088b5ccbbc820ec10557ae3f43da7c0c2
+EBUILD asahi-sources-6.9.9_p5-r1.ebuild 1669 BLAKE2B d5115d0f2880d4fa1cf5beb3722818bf2fc03e79bcd41babc0cbd2e1b3469e8ed7bfdf09a1ea2f71be4cb4eda050cdbca91f2c590878dc810ec8eadc52d6ea03 SHA512 1b9a6ef084f144ecaa81626cef33452c1fe40b249da290a32e9921880182b34f7289e911ccfc96b35cd1b4ebde764669eafa028d2a498d304dd8fa03662c360a
 MISC metadata.xml 606 BLAKE2B 81abc1eb15c66fbc4b2039b161e0bc06e8c6ce5e58727fca8ef80778db4dd04bc48486479d795c91e6181cd4e3f974b3ff7e3f6479e98e8271ccf4bdfd22b02e SHA512 c5e3349ebbbd7d04a0ac261c93df705b34882a3ed2472f28d90ef902377f5a89d3b5454e94b7f40c39c5d1745aedbd1267a607c189ff09917e77f0ed78009395
diff --git a/sys-kernel/asahi-sources/asahi-sources-6.9.8_p1.ebuild b/sys-kernel/asahi-sources/asahi-sources-6.9.8_p1-r1.ebuild
index ef7185794376..551f5fbce65e 100644
--- a/sys-kernel/asahi-sources/asahi-sources-6.9.8_p1.ebuild
+++ b/sys-kernel/asahi-sources/asahi-sources-6.9.8_p1-r1.ebuild
@@ -58,7 +58,6 @@ DEPEND="
 UNIPATCH_STRICTORDER="yes"
 UNIPATCH_LIST="
 	${FILESDIR}/asahi-6.8-config-gentoo-Drop-RANDSTRUCT-from-GENTOO_KERNEL_SEL.patch
-	${FILESDIR}/asahi-6.8.2_revert_spi_stable_asahi.patch
 	${DISTDIR}/linux-${ASAHI_TAG}.patch
 "
 
diff --git a/sys-kernel/asahi-sources/asahi-sources-6.9.9_p5.ebuild b/sys-kernel/asahi-sources/asahi-sources-6.9.9_p5-r1.ebuild
index 4b6fa5c16640..c7a931cddb78 100644
--- a/sys-kernel/asahi-sources/asahi-sources-6.9.9_p5.ebuild
+++ b/sys-kernel/asahi-sources/asahi-sources-6.9.9_p5-r1.ebuild
@@ -58,7 +58,6 @@ DEPEND="
 UNIPATCH_STRICTORDER="yes"
 UNIPATCH_LIST="
 	${FILESDIR}/asahi-6.8-config-gentoo-Drop-RANDSTRUCT-from-GENTOO_KERNEL_SEL.patch
-	${FILESDIR}/asahi-6.8.2_revert_spi_stable_asahi.patch
 	${DISTDIR}/linux-${ASAHI_TAG}.patch
 "
 
diff --git a/sys-kernel/asahi-sources/files/asahi-6.8.2_revert_spi_stable_asahi.patch b/sys-kernel/asahi-sources/files/asahi-6.8.2_revert_spi_stable_asahi.patch
deleted file mode 100644
index fc6522e205b8..000000000000
--- a/sys-kernel/asahi-sources/files/asahi-6.8.2_revert_spi_stable_asahi.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
-index 46f153548760..d1b297f438f1 100644
---- a/drivers/spi/spi.c
-+++ b/drivers/spi/spi.c
-@@ -1042,14 +1042,10 @@ static void spi_set_cs(struct spi_device *spi, bool enable, bool force)
- 	if (spi->mode & SPI_CS_HIGH)
- 		enable = !enable;
- 
--	/*
--	 * Handle chip select delays for GPIO based CS or controllers without
--	 * programmable chip select timing.
--	 */
--	if ((spi_is_csgpiod(spi) || !spi->controller->set_cs_timing) && !activate)
--		spi_delay_exec(&spi->cs_hold, NULL);
--
- 	if (spi_is_csgpiod(spi)) {
-+		if (!spi->controller->set_cs_timing && !activate)
-+			spi_delay_exec(&spi->cs_hold, NULL);
-+
- 		if (!(spi->mode & SPI_NO_CS)) {
- 			/*
- 			 * Historically ACPI has no means of the GPIO polarity and
-@@ -1083,16 +1079,16 @@ static void spi_set_cs(struct spi_device *spi, bool enable, bool force)
- 		if ((spi->controller->flags & SPI_CONTROLLER_GPIO_SS) &&
- 		    spi->controller->set_cs)
- 			spi->controller->set_cs(spi, !enable);
-+
-+		if (!spi->controller->set_cs_timing) {
-+			if (activate)
-+				spi_delay_exec(&spi->cs_setup, NULL);
-+			else
-+				spi_delay_exec(&spi->cs_inactive, NULL);
-+		}
- 	} else if (spi->controller->set_cs) {
- 		spi->controller->set_cs(spi, !enable);
- 	}
--
--	if (spi_is_csgpiod(spi) || !spi->controller->set_cs_timing) {
--		if (activate)
--			spi_delay_exec(&spi->cs_setup, NULL);
--		else
--			spi_delay_exec(&spi->cs_inactive, NULL);
--	}
- }
- 
- #ifdef CONFIG_HAS_DMA
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index a5ff63fd00bd..190a50b14003 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -8,6 +8,6 @@ DIST linux-firmware-20240709.tar.xz 376713860 BLAKE2B 33ea1ca0ffafa37b7260438695
 EBUILD linux-firmware-20240513.ebuild 11701 BLAKE2B badc3af8bec613910d4595d9c19bd981b9d7bec7b668a6b620c93fe5327e4ea6e5dee74b9288d090be0e61c80e920cc7f19b4c7630da191781e35917610d3e48 SHA512 d82b20e52adacec96ac1a748e53d757d45ebac37e84ab152ad4285ee202d79d2befec4d7a2695a3119366683e6d143ce8b1311197afb180ee14f3e922d03121e
 EBUILD linux-firmware-20240610-r1.ebuild 11594 BLAKE2B b55a6cba54c649fef4ef1f1ef711a6cd5cee7f7b40326293d0ca3a6e6188ab9f87ccd316f67872d51a77e65e16cd080ae8d4890251b3464ab255120a95cb1c9f SHA512 ef5bd4c4853b0eb7c1d09210e5eaaa4a1dd8cd41486edcbe051a16a6b1d672e92231ba615066e8627b2df7bcfa557b45d889278f97cc366ec426bab698833c75
 EBUILD linux-firmware-20240610-r3.ebuild 10992 BLAKE2B dc1c7ae870ce8e8fc69181be65e780106e50c02a940f2a6a5f1f9066109e7d88994a857b31ab81027eea9c8be7f529a82a02c56d1256c32e7e89e30ae32863d8 SHA512 0e827ca4ac75e0cf67f176d8f1965a13b13ea2840d222858f774291abbe700607e81d79c0f98c5e88bb736d41e5c331f20a588517f6f411261ce6d563364eb06
-EBUILD linux-firmware-20240709-r1.ebuild 10984 BLAKE2B ec8d8905dead0b807839f33ad72e19fd4fc13d10228695eb3af054aac5d41018285479fcd2537636f0565d972f61298d3859847f3290e311fe2dc70f0f667a48 SHA512 ce34df13c03842e4a3fd59836a1b00683b3948239e2d153f5aeb5b19f0f24ae207169ff14837b491e9765662718f1cd9a0a9a04b573c99a2fb1b8ed4d436b998
-EBUILD linux-firmware-99999999.ebuild 11280 BLAKE2B ddd3566709e67b8c7941521fbaf0945b6d36296eabe263a86efc73200c43376b86691bb2faab0770a01f30f0d0967b8200b06c2502b539aaee222852deacca76 SHA512 7dbfe192b9760096f0e70fd09ffbf4fc9a51cca2828e2b4d9b0b504800b92626c5046201d30a10176fbf9f1ca96b476b6a9cbcbd68ad0ac55e2313e3209e776d
+EBUILD linux-firmware-20240709-r1.ebuild 10984 BLAKE2B 116684d6e36977e0a30a4692a01bbb5df322cdb732521e65077d171a1468f54de0c9826f0ab7cb4e7b1e653de84e5964c51d3dc03dae92f3670eea117f22ced5 SHA512 9ef2f07f8444e53817828509234d0501a7310f04aa2be7bc62d682b8020be722c9222f83b4f31f389032736e52fdc7c304e35b6e947ec9e5f2a4d4cfb6477c7d
+EBUILD linux-firmware-99999999.ebuild 11280 BLAKE2B ea1d3eda1a5036593bad18b8872cd0d5cae0f699bed082d853966fcc4e34efaa5c283b16afb8c929cf8f66fa5ee411523c607bb4cabc1a116517c5735d816422 SHA512 2fcfe24d2cc4c6ca64c01ba7e611cb128d1776f48d67fbd5287450804d20f9e76d1020a81bc87922a006f5dd57e0c436d06b7ce589c3d5a06fc93dc4da53da25
 MISC metadata.xml 1289 BLAKE2B 109336d30e5ec5fb5e679cff9b31e6f69c0b4f629e2aaf4d0d7b6c0db78c1ddcbbb0b283f724f2758207324b622c2af9dfe15874ab34b34876e3e4f58cb5ced6 SHA512 9b925b26bb58a39360ab5ff3cdd7d88bd489645e73f101209f0813a0b926b15dae34f28db05ff6419a0a62fab2ac84ae0546b5007ce17ad3611188bf7aeda3e5
diff --git a/sys-kernel/linux-firmware/linux-firmware-20240709-r1.ebuild b/sys-kernel/linux-firmware/linux-firmware-20240709-r1.ebuild
index eba1ddedc308..b7c47404963d 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20240709-r1.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20240709-r1.ebuild
@@ -70,10 +70,10 @@ PATCHES=( "${FILESDIR}"/${PN}-copy-firmware-r4.patch )
 
 pkg_pretend() {
 	if use initramfs; then
-		if [[ -z ${ROOT} ]] && use dist-kernel; then
+		if use dist-kernel; then
 			# Check, but don't die because we can fix the problem and then
 			# emerge --config ... to re-run installation.
-			nonfatal mount-boot_check_status
+			[[ -z ${ROOT} ]] && nonfatal mount-boot_check_status
 		else
 			mount-boot_pkg_pretend
 		fi
@@ -376,8 +376,8 @@ pkg_postinst() {
 	done
 
 	if use initramfs; then
-		if [[ -z ${ROOT} ]] && use dist-kernel; then
-			dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
+		if use dist-kernel; then
+			[[ -z ${ROOT} ]] && dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
 		else
 			# Don't forget to umount /boot if it was previously mounted by us.
 			mount-boot_pkg_postinst
diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
index 17a10c80a0fc..7635e488d909 100644
--- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
@@ -68,10 +68,10 @@ QA_PREBUILT="*"
 
 pkg_pretend() {
 	if use initramfs; then
-		if [[ -z ${ROOT} ]] && use dist-kernel; then
+		if use dist-kernel; then
 			# Check, but don't die because we can fix the problem and then
 			# emerge --config ... to re-run installation.
-			nonfatal mount-boot_check_status
+			[[ -z ${ROOT} ]] && nonfatal mount-boot_check_status
 		else
 			mount-boot_pkg_pretend
 		fi
@@ -382,8 +382,8 @@ pkg_postinst() {
 	done
 
 	if use initramfs; then
-		if [[ -z ${ROOT} ]] && use dist-kernel; then
-			dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
+		if use dist-kernel; then
+			[[ -z ${ROOT} ]] && dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
 		else
 			# Don't forget to umount /boot if it was previously mounted by us.
 			mount-boot_pkg_postinst