gentoo resync : 12.05.2022

4 files changed, 62 insertions, 69 deletions

diff --git a/sys-process/rtirq/Manifest b/sys-process/rtirq/Manifest
index 0811499c7d1c..ebc106a8d264 100644
--- a/sys-process/rtirq/Manifest
+++ b/sys-process/rtirq/Manifest
@@ -1,7 +1,6 @@
-AUX rtirq 435 BLAKE2B db105cd1c0765a92ede509ec010b8c2c96cd6180dcdfefff3c4f9dac6ed18a2da32f04dc4d023b6b7d21708d9a0897f20ddb4a87cb0c7eef2257bfcf0be2205a SHA512 9b7ef8e58098032f68210b64ae604558fed58a66b8d86ec9198dcf2f4b020582d8c4983d95f60e048bc97c0ef19b4b31cdc615635b4f57902362843a11a5fc6f
 AUX rtirq.initd 431 BLAKE2B 7b3846513cb389fa05e31cf556d5a668969d227a5d47c6d75c94bb152d97ae23550bc34b1e19b9b72a3a03a0ffae23f66ec9378af09831e8dc394c5d7c6b412b SHA512 3bf69aa9b78e2c0093226b2e8cd495157b54482ca72fe79c70d52b3adc2bd59a1027157b79f558e5fa546c7f70973aa9bcbb8ab1e7e52d82970b6367951c4e1e
-DIST rtirq-20180209.tar.gz 12290 BLAKE2B 432bf6c931b753d4d9a5d7c50a35b0fb9b2161d09c9f762b97a5aae88152de1f3d14a2a4ccc46d8607d7379e4a7a659d603cc09ee20017923b176359eb4b9133 SHA512 9de924e627b91d6df162b6c8c0c3421fbab11f08162abe98b0fac8742ea924a7e0a18aab23d828e19fe81dfdb70f2f6814c7195acbcbc93af9a339dc549190b2
 DIST rtirq-20191121.tar.gz 12755 BLAKE2B 040e1b39b83dc27e542093a12830fa51c9786c2747962740c31e684235acab33275a40761fd87cd1307284c2b8e49362d4acb216000338bc0744dd0ca6b0144c SHA512 bb1ae0099e37220b13f91303e56e8ae7892964638c1000fd66b6ceb23925c8aa2ac0c629bbb799a59c1a8adb035c34c4b0bee31afe05fcc9f80cd94d5a84ddc1
-EBUILD rtirq-20180209.ebuild 902 BLAKE2B 0081b1bc8013e04ef1994fe26296988726a1c080d9f97c8f09218cbb19a14e85db92ac03d666129b0266656a4bea05f22147c1c65622e38aad678e9e7cf9ff75 SHA512 e56be7a09553cdc6b734c04a652f3ebe28196818ed21b3e12b9b1797f392b6f3e8da1cc55024cc9c999e273bb2bc663ed0f16715c34596b443d000e27cec7847
+DIST rtirq-20210329.tar.gz 15360 BLAKE2B 278868817b349d0fd8bc70f0fb0374016d9117b593ed2fe710300fe194e7f8e640f4071f30e73688cca11d6da79fd93624a5e5e5246bfc2f9cd367397c00cadd SHA512 e08ee7768c93dd4e7244b61629272c4a4482d63b1fe37b7972a27703cd0a55cc12449589a781b33e9c92f5dd664c1a4ceba65caadb09c676deea86c161cc3d37
 EBUILD rtirq-20191121.ebuild 1514 BLAKE2B dfbe4a08e1b0498fcf85b6e83632217c2e7b72bb9c849cd4f042651a6e5e7c5d53ea0200d8e767d280219e15070e0f5cc4bc0f688f57f0ef52b999432e4210be SHA512 144245e13c0fd540f40fb95e80d99cfb2e0c95e6e77eebd23881fa834fe9738eb0a47a8cf1f2e50f3578342a080605e86a290508565aa8f9532bcccf08176d03
+EBUILD rtirq-20210329.ebuild 1643 BLAKE2B 59724231938f9d168efde313b79e10e8ac9341cc8eab4ada781605622a4fcc2d3b8707863e6d3c313246f8db925b7bc13bd20a832b54c776a7f8b4e394e1ef74 SHA512 89ca414a2442135abc02a5c07f77634da0f1f6b5cf39c07f285c6bcc35cea56598eec9b20a6c3807420f0a73a745937ac243c2c6a320fadd9e6c0aa527016280
 MISC metadata.xml 395 BLAKE2B 676ceaef4b63cc5fd7c0ad8b28065738adf013fa4f85cb2fa70bd1cafa8ea6b76fc6ca81e36e91c839bcc55c55a8bf24b4a325e44b0830f653adc89ee09dbfc4 SHA512 30eec216eef39513374c06cc1b0be994f53deb7054f7241a55b1ccc73d58ab0b578b92096eb56daef0e7f8d1377480a00a6bbb6e0bcbffb19d53a48f081170f3
diff --git a/sys-process/rtirq/files/rtirq b/sys-process/rtirq/files/rtirq
deleted file mode 100644
index 988337fbf1eb..000000000000
--- a/sys-process/rtirq/files/rtirq
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-command="/usr/sbin/rtirq.sh"
-
-extra_commands="status"
-
-depend() {
-    need localmount
-    after alsasound logger
-}
-
-start() {
-    ebegin "Starting rtirq"
-    ${command} start
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping rtirq"
-    ${command} reset
-    eend $?
-}
-
-status() {
-    ${command} status
-}
diff --git a/sys-process/rtirq/rtirq-20180209.ebuild b/sys-process/rtirq/rtirq-20180209.ebuild
deleted file mode 100644
index f51c09b09172..000000000000
--- a/sys-process/rtirq/rtirq-20180209.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit linux-info systemd
-
-DESCRIPTION="Modify realtime scheduling policy and priority of IRQ handlers"
-HOMEPAGE="https://www.rncbc.org/archive/#rtirq"
-SRC_URI="https://www.rncbc.org/archive/old/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_prepare() {
-	get_version
-
-	# Correct config file path.
-	sed -i -e "s:^\(RTIRQ_CONFIG\=\)\(.*\):\1/etc/conf.d/rtirq:" ${PN}.sh || die
-	sed -i -e "s:/etc/sysconfig/rtirq:/etc/conf.d/rtirq:" ${PN}.conf || die
-
-	default
-}
-
-src_install() {
-	dosbin rtirq.sh
-	doinitd "${FILESDIR}"/rtirq
-	newconfd rtirq.conf rtirq
-	systemd_dounit rtirq.service
-}
-
-pkg_postinst() {
-	if [[ ${KV_LOCAL} != *rt* ]] ; then
-		elog "To use rtirq you need a realtime kernel."
-		elog "Realtime kernel sources are supplied in sys-kernel/rt-sources."
-	fi
-}
diff --git a/sys-process/rtirq/rtirq-20210329.ebuild b/sys-process/rtirq/rtirq-20210329.ebuild
new file mode 100644
index 000000000000..56edc30f9a09
--- /dev/null
+++ b/sys-process/rtirq/rtirq-20210329.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit linux-info systemd
+
+DESCRIPTION="Modify realtime scheduling policy and priority of IRQ handlers"
+HOMEPAGE="https://www.rncbc.org/archive/#rtirq"
+SRC_URI="https://www.rncbc.org/archive/${P}.tar.gz
+	https://www.rncbc.org/archive/old/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	# We install into bin
+	sed -i -e "s:/usr/sbin/rtirq:/usr/bin/rtirq:" ${PN}{,-resume}.service || die
+
+	default
+}
+
+src_install() {
+	newbin rtirq.sh rtirq
+	newinitd "${FILESDIR}"/rtirq.initd rtirq
+	insinto /etc/
+	doins rtirq.conf
+	systemd_dounit rtirq{,-resume}.service
+}
+
+pkg_postinst() {
+	local kconfig_warn=1
+	local cmdline
+	local ver
+
+	if linux-info_get_any_version && linux_config_exists; then
+		if linux_chkconfig_present PREEMPT_RT; then
+			kconfig_warn=0
+		elif linux_chkconfig_present IRQ_FORCED_THREADING; then
+			cmdline=$(< /proc/cmdline) || die
+			[[ ${cmdline} == *threadirqs* ]] && kconfig_warn=0
+		fi
+	fi
+
+	if (( ${kconfig_warn} )); then
+		ewarn "To use rtirq, you need one of the following kernel configurations:"
+		ewarn " - PREEMPT_RT config option enabled (e.g. with sys-kernel/rt-sources);"
+		ewarn " - IRQ_FORCED_THREADING config option enabled and 'threadirqs' option"
+		ewarn "   added to the kernel cmdline."
+	fi
+
+	for ver in ${REPLACING_VERSIONS}; do
+		if ver_test ${ver} -lt "20210329"; then
+			elog "Starting with 20210329 version the config has been moved to '${EROOT}/etc/rtirq.conf'"
+			elog "Please migrate all you setting from '${EROOT}/etc/conf.d/rtirq'"
+			break
+		fi
+	done
+}