3 files changed, 5 insertions, 403 deletions
diff --git a/sys-kernel/scx/Manifest b/sys-kernel/scx/Manifest
index 3a53328ef91e..f4a5a8c69e1c 100644
--- a/sys-kernel/scx/Manifest
+++ b/sys-kernel/scx/Manifest
@@ -179,7 +179,6 @@ DIST rustix-0.38.36.crate 370932 BLAKE2B 0c4b963c9045fbb6fd2e4fc91888f574de53107
 DIST rustversion-1.0.17.crate 17621 BLAKE2B 1f077ca6fd90333724d1ea9df7f5b178f37f895b71a7b2814e9ba8618bffcd2307f9cb4ac2eea25d461a6686a4b5b51eebb80f1b1ccc773d4da1948c47fe8abe SHA512 0565cddecaedae17e7cd99bc34f54cda242d4c29cd4269f8e3b178ff91d49f3682e7ffe66e436bbb138299736c8e55cc143fefb74c076911fefcc41ba98064f3
 DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df9f902871f13208515e5a2ab1daa226fc1e7291278e64448332845be4cc9409bce3b2f3daed409259e104 SHA512 a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
-DIST scx-1.0.5.tar.gz 1724582 BLAKE2B 926de0bf39818f1db6d7487b8f21770839f1126ca8c084fde94f4a820e85f46139b9cb28f3601efafc4ba70d0d234c1e79b6ba67cc3912b670de161aa4242c3d SHA512 05517e5d796fb79e8625b17c3ffedafa2eebc17501e05c1fb99319282729e4cae9cfcfbf32c8034d7b4c6ed20f7e37dcbd9db8d074c49eb70185b6186f7db827
 DIST scx-1.0.6.tar.gz 4172710 BLAKE2B 5d2cf3930c309b2753a08df80943af8c6a3a0d81fafc0f8b8f481aa8c1d8670cea4134f4d64a49b481b64fdcccb368c23eca86cc843fd83b482a22aef938a50d SHA512 16e9960a9411a6f9ed9f3b1a8c70eb8535c5fe79decfd5fccc11fe6463f227bc22a434f3509e14d6e49c66e658d03792f9cb9253bae4875f686310e4a45d5e06
 DIST semver-1.0.23.crate 30622 BLAKE2B af5f7401daa2004ac1fc419ff907a65feb9b11743ad0feca0929bf2409eb81e03637ec5f92ba9f38ea386c4ee5cde72bd3d2042083e2fb0d6fa0b839b1c5093a SHA512 5ea1fa17c08d1280c3a4bc8d28494e88ee05acd5dc969ef6f0c6f91fd3b5a8fbe999c9e8bbd2da383413038b8d29fabf02b87bd5265bbb8333f3fcbe409103ec
 DIST serde-1.0.210.crate 78338 BLAKE2B b3621d1313312177a346313e6e384fe9660f74eefb18e6cffa39fc2aadc0ab73be84b9037c59b716e5feafcd73f4f054f83e6d17d82746984b3064bf8d3ed338 SHA512 0d853ca51543ae8b4a0c70204ff4e559a4eec77af3d3bdcfc75c5905c80d4ffd1bd9eb8258ea4f6ecfbdd26477ecac7dd698d84d86759fa32e03a9cce02fa4ae
@@ -287,6 +286,5 @@ 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 f186799d161f825ce18adb137d858c9f0055d596aee962f74ae36977e126061bd9e3bca61d4069f0770ce33a417556bc2b79b9f19cc801ee2b72599e55860650 SHA512 e88c69e2c590b9b74d03a5df6a8f56dbe7b52d55fe0886859422e2ea6b75e7ed4c8fa777d101d97b9e7d29770c334b80d282b57b90e8ae58f22f83afb0102c2f
-EBUILD scx-1.0.6-r1.ebuild 7723 BLAKE2B cf138e42811752331af3674a2c2ecf7d796922a2772375e21e00fef50110721107a4a3552fdf2449f590924aa0333b22d0eb4ddb55aaa8f4083a9ef1ca933790 SHA512 ee14dc8c5171a67d8675272d3f1993659eba3091344ece79868f293b68ff6cbc8b858db43b081e243a9b8360b0a6ceec88847de96592e2ff73c2ab0fd34fe648
+EBUILD scx-1.0.6-r2.ebuild 7812 BLAKE2B 8067a65610e19691336309338d65c16a07de56726204ed5080bd97c596c3178452ef4e9d7d09b6096237f3d92d141bd999f697b4a3e2fba88a9706609381b909 SHA512 6064774584a2c0c4708149a00fb9f931e828bd5d88a379921f078e4f28bd7ad9422f83215ac26415058f3a214da04dc1b25eefda53e0dc3ae66f3d8056620818
 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
deleted file mode 100644
index 91efbfa1f343..000000000000
--- a/sys-kernel/scx/scx-1.0.5-r2.ebuild
+++ /dev/null
@@ -1,400 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {16..18} )
-
-# List of crates for pycargoebuild:
-# rust/scx_{loader,rustland_core,stats,utils}
-# scheds/rust/scx_{bpfland,lavd,layered,rlfifo,rustland,rusty}
-CRATES="
-	addr2line@0.24.1
-	adler2@2.0.0
-	ahash@0.8.11
-	aho-corasick@1.1.3
-	android-tzdata@0.1.1
-	android_system_properties@0.1.5
-	anstream@0.6.15
-	anstyle-parse@0.2.5
-	anstyle-query@1.1.1
-	anstyle-wincon@3.0.4
-	anstyle@1.0.8
-	anyhow@1.0.87
-	async-broadcast@0.7.1
-	async-channel@2.3.1
-	async-io@2.3.4
-	async-lock@3.4.0
-	async-process@2.2.4
-	async-recursion@1.1.1
-	async-signal@0.2.10
-	async-task@4.7.1
-	async-trait@0.1.82
-	atomic-waker@1.1.2
-	autocfg@1.3.0
-	backtrace@0.3.74
-	bindgen@0.69.4
-	bitflags@1.3.2
-	bitflags@2.6.0
-	bitvec@1.0.1
-	block-buffer@0.10.4
-	blocking@1.6.1
-	bumpalo@3.16.0
-	byteorder@1.5.0
-	bytes@1.7.1
-	camino@1.1.9
-	cargo-platform@0.1.8
-	cargo_metadata@0.15.4
-	cargo_metadata@0.18.1
-	cc@1.1.18
-	cexpr@0.6.0
-	cfg-if@1.0.0
-	cfg_aliases@0.2.1
-	chrono@0.4.38
-	clang-sys@1.8.1
-	clap@4.5.17
-	clap_builder@4.5.17
-	clap_derive@4.5.13
-	clap_lex@0.7.2
-	colorchoice@1.0.2
-	colored@2.1.0
-	concurrent-queue@2.5.0
-	const_format@0.2.31
-	const_format_proc_macros@0.2.31
-	convert_case@0.6.0
-	core-foundation-sys@0.8.7
-	cpufeatures@0.2.14
-	crossbeam-channel@0.5.13
-	crossbeam-deque@0.8.5
-	crossbeam-epoch@0.9.18
-	crossbeam-queue@0.3.11
-	crossbeam-utils@0.8.20
-	crossbeam@0.8.4
-	crypto-common@0.1.6
-	ctrlc@3.4.5
-	darling@0.20.10
-	darling_core@0.20.10
-	darling_macro@0.20.10
-	deranged@0.3.11
-	digest@0.10.7
-	either@1.13.0
-	endi@1.1.0
-	endian-type@0.1.2
-	enumflags2@0.7.10
-	enumflags2_derive@0.7.10
-	equivalent@1.0.1
-	errno@0.3.9
-	event-listener-strategy@0.5.2
-	event-listener@5.3.1
-	fastrand@2.1.1
-	fb_procfs@0.7.1
-	filetime@0.2.25
-	fnv@1.0.7
-	funty@2.0.0
-	futures-core@0.3.30
-	futures-io@0.3.30
-	futures-lite@2.3.0
-	futures-sink@0.3.30
-	futures-task@0.3.30
-	futures-util@0.3.30
-	generic-array@0.14.7
-	getrandom@0.2.15
-	gimli@0.31.0
-	glob@0.3.1
-	gpoint@0.2.1
-	hashbrown@0.14.5
-	heck@0.5.0
-	hermit-abi@0.3.9
-	hermit-abi@0.4.0
-	hex@0.4.3
-	home@0.5.9
-	iana-time-zone-haiku@0.1.2
-	iana-time-zone@0.1.60
-	ident_case@1.0.1
-	indexmap@2.5.0
-	is_terminal_polyfill@1.70.1
-	itertools@0.12.1
-	itertools@0.13.0
-	itoa@1.0.11
-	js-sys@0.3.70
-	lazy_static@1.5.0
-	lazycell@1.3.0
-	libbpf-cargo@0.24.4
-	libbpf-rs@0.24.4
-	libbpf-sys@1.4.5+v1.4.5
-	libc@0.2.158
-	libloading@0.8.5
-	libredox@0.1.3
-	linux-raw-sys@0.4.14
-	log@0.4.22
-	memchr@2.7.4
-	memmap2@0.5.10
-	memoffset@0.6.5
-	memoffset@0.9.1
-	metrics-util@0.17.0
-	metrics@0.23.0
-	minimal-lexical@0.2.1
-	miniz_oxide@0.8.0
-	mio@1.0.2
-	nibble_vec@0.1.0
-	nix@0.25.1
-	nix@0.29.0
-	nom@7.1.3
-	ntapi@0.4.1
-	num-conv@0.1.0
-	num-traits@0.2.19
-	num_cpus@1.16.0
-	num_threads@0.1.7
-	nvml-wrapper-sys@0.8.0
-	nvml-wrapper@0.10.0
-	object@0.36.4
-	once_cell@1.19.0
-	openat@0.1.21
-	ordered-float@3.9.2
-	ordered-float@4.2.2
-	ordered-stream@0.2.0
-	parking@2.2.1
-	paste@1.0.15
-	pin-project-lite@0.2.14
-	pin-utils@0.1.0
-	piper@0.2.4
-	pkg-config@0.3.30
-	plain@0.2.3
-	polling@3.7.3
-	portable-atomic@1.7.0
-	powerfmt@0.2.0
-	ppv-lite86@0.2.20
-	prettyplease@0.2.22
-	proc-macro-crate@3.2.0
-	proc-macro2@1.0.86
-	quanta@0.12.3
-	quote@1.0.37
-	radium@0.7.0
-	radix_trie@0.2.1
-	rand@0.8.5
-	rand_chacha@0.3.1
-	rand_core@0.6.4
-	raw-cpuid@11.1.0
-	rayon-core@1.12.1
-	rayon@1.10.0
-	redox_syscall@0.5.3
-	regex-automata@0.4.7
-	regex-syntax@0.6.29
-	regex-syntax@0.8.4
-	regex@1.10.6
-	rustc-demangle@0.1.24
-	rustc-hash@1.1.0
-	rustix@0.38.36
-	rustversion@1.0.17
-	ryu@1.0.18
-	same-file@1.0.6
-	semver@1.0.23
-	serde@1.0.210
-	serde_derive@1.0.210
-	serde_json@1.0.128
-	serde_repr@0.1.19
-	sha1@0.10.6
-	shlex@1.3.0
-	signal-hook-registry@1.4.2
-	simple_logger@5.0.0
-	simplelog@0.12.2
-	sketches-ddsketch@0.2.2
-	slab@0.4.9
-	smallvec@1.13.2
-	socket2@0.5.7
-	sorted-vec@0.8.3
-	sscanf@0.4.2
-	sscanf_macro@0.4.2
-	static_assertions@1.1.0
-	strsim@0.10.0
-	strsim@0.11.1
-	syn@2.0.77
-	sysinfo@0.31.4
-	tap@1.0.1
-	tar@0.4.41
-	tempfile@3.12.0
-	termcolor@1.4.1
-	terminal_size@0.3.0
-	thiserror-impl@1.0.63
-	thiserror@1.0.63
-	threadpool@1.8.1
-	time-core@0.1.2
-	time-macros@0.2.18
-	time@0.3.36
-	tokio-macros@2.4.0
-	tokio@1.40.0
-	toml_datetime@0.6.8
-	toml_edit@0.22.20
-	tracing-attributes@0.1.27
-	tracing-core@0.1.32
-	tracing@0.1.40
-	typenum@1.17.0
-	uds_windows@1.1.0
-	unicase@2.7.0
-	unicode-ident@1.0.12
-	unicode-segmentation@1.11.0
-	unicode-width@0.1.12
-	unicode-xid@0.2.5
-	utf8parse@0.2.2
-	vergen@8.3.2
-	version-compare@0.1.1
-	version_check@0.9.5
-	vsprintf@2.0.0
-	walkdir@2.5.0
-	wasi@0.11.0+wasi-snapshot-preview1
-	wasm-bindgen-backend@0.2.93
-	wasm-bindgen-macro-support@0.2.93
-	wasm-bindgen-macro@0.2.93
-	wasm-bindgen-shared@0.2.93
-	wasm-bindgen@0.2.93
-	web-sys@0.3.70
-	which@4.4.2
-	winapi-i686-pc-windows-gnu@0.4.0
-	winapi-util@0.1.9
-	winapi-x86_64-pc-windows-gnu@0.4.0
-	winapi@0.3.9
-	windows-core@0.52.0
-	windows-core@0.57.0
-	windows-implement@0.57.0
-	windows-interface@0.57.0
-	windows-result@0.1.2
-	windows-sys@0.48.0
-	windows-sys@0.52.0
-	windows-sys@0.59.0
-	windows-targets@0.48.5
-	windows-targets@0.52.6
-	windows@0.57.0
-	windows_aarch64_gnullvm@0.48.5
-	windows_aarch64_gnullvm@0.52.6
-	windows_aarch64_msvc@0.48.5
-	windows_aarch64_msvc@0.52.6
-	windows_i686_gnu@0.48.5
-	windows_i686_gnu@0.52.6
-	windows_i686_gnullvm@0.52.6
-	windows_i686_msvc@0.48.5
-	windows_i686_msvc@0.52.6
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnu@0.52.6
-	windows_x86_64_gnullvm@0.48.5
-	windows_x86_64_gnullvm@0.52.6
-	windows_x86_64_msvc@0.48.5
-	windows_x86_64_msvc@0.52.6
-	winnow@0.6.18
-	wrapcenum-derive@0.4.1
-	wyz@0.5.1
-	xattr@1.3.1
-	xdg-home@1.3.0
-	zbus@4.4.0
-	zbus_macros@4.4.0
-	zbus_names@3.0.0
-	zerocopy-derive@0.7.35
-	zerocopy@0.7.35
-	zvariant@4.2.0
-	zvariant_derive@4.2.0
-	zvariant_utils@2.1.0
-"
-
-RUST_MIN_VER="1.74.1"
-
-inherit cargo linux-info llvm-r1 meson rust-toolchain
-
-DESCRIPTION="sched_ext schedulers and tools"
-HOMEPAGE="https://github.com/sched-ext/scx"
-SRC_URI="
-	https://github.com/sched-ext/scx/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="GPL-2"
-# Dependent crate licenses
-LICENSE+=" Apache-2.0 BSD-2 BSD ISC MIT MPL-2.0 Unicode-DFS-2016 ZLIB"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="openrc systemd"
-
-DEPEND="
-	virtual/libelf:=
-	sys-libs/zlib:=
-	>=dev-libs/libbpf-1.3:=
-	openrc? ( || (
-		sys-apps/openrc
-		sys-apps/openrc-navi
-	) )
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	app-misc/jq
-	dev-util/bpftool
-	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}=[llvm_targets_BPF(-)]
-	')
-"
-
-CONFIG_CHECK="
-	~BPF
-	~BPF_EVENTS
-	~BPF_JIT
-	~BPF_SYSCALL
-	~DEBUG_INFO_BTF
-	~FTRACE
-	~SCHED_CLASS_EXT
-"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	llvm-r1_pkg_setup
-	rust_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Inject the rust_abi value into install_rust_user_scheds
-	sed -i "s;\${MESON_BUILD_ROOT};\${MESON_BUILD_ROOT}/$(rust_abi);" \
-		meson-scripts/install_rust_user_scheds || die
-}
-
-src_configure() {
-	BUILD_DIR="${BUILD_DIR:-${WORKDIR}/${P}-build}"
-
-	local emesonargs=(
-		-Dbpf_clang="$(get_llvm_prefix)/bin/clang"
-		-Dbpftool=disabled
-		-Dlibbpf_a=disabled
-		-Dcargo="${EPREFIX}/usr/bin/cargo"
-		-Dcargo_home="${ECARGO_HOME}"
-		-Doffline=true
-		-Denable_rust=true
-		-Dlibalpm=disabled
-		$(meson_feature openrc)
-		$(meson_feature systemd)
-	)
-
-	cargo_env meson_src_configure
-}
-
-src_compile() {
-	cargo_env meson_src_compile
-}
-
-src_test() {
-	cargo_env meson_src_test
-}
-
-src_install() {
-	cargo_env meson_src_install
-
-	dodoc README.md
-
-	local readme readme_name
-	for readme in scheds/{rust,c}/*/README.md ./rust/*/README.md; do
-		[[ -e ${readme} ]] || continue
-		readme_name="${readme#*/rust/}"
-		readme_name="${readme_name#*/c/}"
-		readme_name="${readme_name%/README.md}"
-		newdoc "${readme}" "${readme_name}.md"
-	done
-}
diff --git a/sys-kernel/scx/scx-1.0.6-r1.ebuild b/sys-kernel/scx/scx-1.0.6-r2.ebuild
index 4b40f8f109f9..d16170eba04e 100644
--- a/sys-kernel/scx/scx-1.0.6-r1.ebuild
+++ b/sys-kernel/scx/scx-1.0.6-r2.ebuild
@@ -359,6 +359,10 @@ src_prepare() {
 	# Inject the rust_abi value into install_rust_user_scheds
 	sed -i "s;\${MESON_BUILD_ROOT};\${MESON_BUILD_ROOT}/$(rust_abi);" \
 		meson-scripts/install_rust_user_scheds || die
+
+	# bug #944832
+	sed -i 's;^#!/usr/bin/;#!/sbin/;' \
+		services/openrc/scx.initrd || die
 }
 
 src_configure() {