gentoo auto-resync : 12:11:2024 - 03:02:41

5 files changed, 21 insertions, 3 deletions

diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index f22bcbd994e0..848d6cd2badf 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index e788036ab071..6eaeb0a826b4 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -16,5 +16,5 @@ EBUILD dracut-060_pre20240104-r4.ebuild 4582 BLAKE2B 2e90c9669b95ccbdc38a3bedd13
 EBUILD dracut-103-r2.ebuild 4693 BLAKE2B 739ea0296e64867ea756d0062e20b6a475e8a70e76b0f306930d35ab42857c83936e90463e01cde10bf255c439442b3309b12dba826f0fe6ce9b9faa909c386e SHA512 5d75977e66c881f067ce86ef52adc3acfe563f17d7bd1ef3887b6c23b9dcbd727b550f1dc4f1cd5352dcd7663d0b863625a4163e1cf2fd5727b42daeb450655e
 EBUILD dracut-103-r4.ebuild 6183 BLAKE2B d95d7f9b5f2f3c6abba94f647cc18c7bc2c752e16a348d78115008fac8251b3e4abca295e965045d15cbadaeb855f5a9bbf7d8ac8502ea151ab2df96b31049f5 SHA512 abaf01ca4ca3f5cae79a4c36ada95dc085ab9806ac03231561a77629e83b003b3540153ef93e39f0b57da605737193519e6a03abf238774a8913545997d7fa96
 EBUILD dracut-105-r3.ebuild 6794 BLAKE2B 44d022baa8c4a06a0ce64ba2e1c79ee207574cd5af8183109276418b286e677e6c5ae0fd64e965985385314e5719abe80490d24a61b86d66ad497abd20627103 SHA512 eba341246301114ad86f73054e6cea7761c1311ea85f05a7203f3dfb703c0e38b4dd74c42e576d067f102ed39012f6165b02203e183c1b10418e48463443cccd
-EBUILD dracut-9999.ebuild 5989 BLAKE2B f43ffa2760d3bb523bf36002255d5f49f280c177140a16becbd61b73c4181e1fb15f56f843e34369978d3345297a0625169be935fe0759f86bc9ab6074675a0e SHA512 9edec1f4c46a95f0d4b1947b99c587ea5d4ab64bba4cad9a25c82b1f8ae8ca218adb0e17d3c7f663c7d6ef9f6d39b5958b0b66db33fd697d90ac87bf7b8f3db7
+EBUILD dracut-9999.ebuild 6476 BLAKE2B b7565285640c0612764419fe2c2db79191db1a07854b8c7ff30afff2f16df9c16bad171873cc360fa5c4ff3ab8ec497b5826cd87ce944c1037a11d4dd73ca73c SHA512 64b9008a3ed8066dd11c8d81a72ed1c3e65bcb66fa8f4824504c8c30804ac9e5dc8dc5ff2108536fb1e46e7b5e8db250a6283bc9107a589930872a177708a36d
 MISC metadata.xml 572 BLAKE2B a1f308c046673cc7acfc4c74cb78b8fd24527241eec46193004ac64fdd17f325eab761b19fdd5428071f4db6e7c1cc27ccaedd89a2724adc6226dd7e96f3714f SHA512 651ea5de77053dbb2b172e3f2a8d8e2d57957bfb726ef78801091f9f1c7c03fde9fe086cd28e94e2e6102b9a2e99f32cb84a6150b4f6b2b6a9cadae3856bad29
diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-9999.ebuild
index 8bbef8760f9d..ac29cf44513b 100644
--- a/sys-kernel/dracut/dracut-9999.ebuild
+++ b/sys-kernel/dracut/dracut-9999.ebuild
@@ -153,6 +153,24 @@ src_install() {
 	dodoc dracut.html
 }
 
+pkg_preinst() {
+	# Remove directory/symlink conflicts
+	# https://bugs.gentoo.org/943007
+	local save_nullglob=$(shopt -p nullglob)
+	shopt -s nullglob
+	local module
+	for module in "${EROOT}"/usr/lib/dracut/modules.d/{80test,80test-makeroot,80test-root}; do
+		if [[ ! -L ${module} && -d ${module} ]]; then
+			rm -rv "${module}" || die
+		fi
+		local backups=( "${module}".backup.* )
+		if [[ ${#backups[@]} -gt 0 ]]; then
+			rm -v "${backups[@]}" || die
+		fi
+	done
+	eval "${save_nullglob}"
+}
+
 pkg_postinst() {
 	optfeature "Networking support" net-misc/networkmanager
 	optfeature "Legacy networking support" net-misc/curl "net-misc/dhcp[client]" \
diff --git a/sys-kernel/scx/Manifest b/sys-kernel/scx/Manifest
index 78fc4ab6e19d..3a53328ef91e 100644
--- a/sys-kernel/scx/Manifest
+++ b/sys-kernel/scx/Manifest
@@ -287,6 +287,6 @@ DIST zerocopy-derive-0.7.35.crate 37829 BLAKE2B badeb7fa5e0bfe93a6788d93fd297604
 DIST zvariant-4.2.0.crate 82180 BLAKE2B 6d8309a223c32eae3c1ba4291d69bab395a3ef0f65da1e380552d27ccc547a31cf32f9dcf2feecce34276c065d044d0c897c9468b6df4c16efa94a0668dd19eb SHA512 ae7329db133ff8c262443bfe6fc10698606501ecdde8295367f3876e9c590730778ad2d4977c27e26288c92737055897686e7a0d30210723279c33da7467af80
 DIST zvariant_derive-4.2.0.crate 11057 BLAKE2B 891c141bfa0db95a5ac62ab2c31bef1215ef658a787d855c09c9b0e42485cd8aa52683c82a07394042615ec51b42ae5efcde81e7dbd2a35f7670888b28477df2 SHA512 8a50d143b38d57a757b3a6b6293c43d7db1a563ccf25002ad6b6a69b7c157765c604329659318a0cb64df1ecf78b3f0dbe88d6650740c016da9161719427f9c2
 DIST zvariant_utils-2.1.0.crate 7043 BLAKE2B b891c5fc2b5afb5eba01b9068b454a965b4f07548c1a080fd5b598165994a5177a7df5f39cf7263ea8bcc5d054c7d87012ca1588737d630d96f24f0d00dee6cf SHA512 345b70d1106b37df41426efdb1ba49bf270e00898381c2a8021b5761c59efdea55def45cb2e2598b130b6cba8733503f3997a55578bca90867ab3e8f2346f80e
-EBUILD scx-1.0.5-r2.ebuild 7659 BLAKE2B 7651dd94c1b7744f58144df372d965d3961163efc32595a5a3dd6f68f9fa07d0a7dc02b94b4aa6dfa2a87bab0cb3196e672f9b1afd7c0c6f5b731d21551bd83a SHA512 754a21cecff00f6168771140b9436431a75feb21a304b96ef1daff0eb4a013e0511861d60caf4282308da1554f1ea81322aaf90fb6c5bea2dfca36491ac926a7
+EBUILD scx-1.0.5-r2.ebuild 7659 BLAKE2B f186799d161f825ce18adb137d858c9f0055d596aee962f74ae36977e126061bd9e3bca61d4069f0770ce33a417556bc2b79b9f19cc801ee2b72599e55860650 SHA512 e88c69e2c590b9b74d03a5df6a8f56dbe7b52d55fe0886859422e2ea6b75e7ed4c8fa777d101d97b9e7d29770c334b80d282b57b90e8ae58f22f83afb0102c2f
 EBUILD scx-1.0.6-r1.ebuild 7723 BLAKE2B cf138e42811752331af3674a2c2ecf7d796922a2772375e21e00fef50110721107a4a3552fdf2449f590924aa0333b22d0eb4ddb55aaa8f4083a9ef1ca933790 SHA512 ee14dc8c5171a67d8675272d3f1993659eba3091344ece79868f293b68ff6cbc8b858db43b081e243a9b8360b0a6ceec88847de96592e2ff73c2ab0fd34fe648
 MISC metadata.xml 786 BLAKE2B 5cd78c254f6c4247a76fc3b65aef3046f4419fe2e5b2f6a52f61d8a01c17a8b17a5a0d2459c037aafff5c2fe98a8c1c5949bf72e6ef6542d53e371db38526b36 SHA512 f79a9746f9dee0f3f992aaa36a02616ad04223bc04b0d9ab4858d7d33d2360b32a721f8565df4cc84e616f0e7674585c31c6968795691d741a46983586986348
diff --git a/sys-kernel/scx/scx-1.0.5-r2.ebuild b/sys-kernel/scx/scx-1.0.5-r2.ebuild
index b2528d6fa81e..91efbfa1f343 100644
--- a/sys-kernel/scx/scx-1.0.5-r2.ebuild
+++ b/sys-kernel/scx/scx-1.0.5-r2.ebuild
@@ -296,7 +296,7 @@ CRATES="
 
 RUST_MIN_VER="1.74.1"
 
-inherit llvm-r1 cargo linux-info meson rust-toolchain
+inherit cargo linux-info llvm-r1 meson rust-toolchain
 
 DESCRIPTION="sched_ext schedulers and tools"
 HOMEPAGE="https://github.com/sched-ext/scx"