gentoo resync : 30.09.2020

8 files changed, 26 insertions, 828 deletions

diff --git a/sys-apps/linux-misc-apps/Manifest b/sys-apps/linux-misc-apps/Manifest
index 868297a76aab..8cf63c9fe726 100644
--- a/sys-apps/linux-misc-apps/Manifest
+++ b/sys-apps/linux-misc-apps/Manifest
@@ -1,16 +1,7 @@
 AUX freefall.confd 147 BLAKE2B b8fcd23306df7122e47e765dcba00cbec0fa7e2d9758d606e7e80cd3195b3fb7bce976fafef801812b425827f99689cde668106430119fcb57767bc816de635f SHA512 556472ab75ab8d3ccbedc44902a34bdef433430aa86fe5d8a125b27101f81e9c7c77e5a1fdfa84aef35078046e4b27a33eeb17d1745871f9e1f41e0ef64b2ba9
 AUX freefall.initd 1111 BLAKE2B c9c5de16da61124a4e984b47ca7cfa368cb5d02bfa85286f2cb9eaa50557da1b55d86b7a5beba5a5db60653c4a84b57276edc982782b7f8509d9a33cf45956e9 SHA512 e4d4d724276d9b64b80b29be5c28b9efc15556dd31545c85e45253aec2305d37af4b60a0be3f2f279c76c27aba5a968053a9bab7d08f2d559277701fd84375f4
-AUX hpfall.confd 144 BLAKE2B 9abe0f8d8a3454d88aaa00c186b4513045cbdc96a7b1679780f26ac8b0dcd4c082bc9807ba39efe6e21d15d3e6dfafce28ca121b95c60ef808f3c8a252d38879 SHA512 995fae481f169a2e53e4985113d5581ec37690a0fa2b77ca4665ff2e26d1ec073edc12d4001d4ca144ba3e3ce57b269bd8016ea024844fa3bde145bc7e4945f6
-AUX hpfall.initd 1098 BLAKE2B 0f854ffc7ee8649ca04aec13aaac0709ced20dcdf1981b9ad23076c9d97c0f8e2119ce9c40744b5af5d79f2680986f993f8a6680878b8dc153efa733e6528b72 SHA512 64c716255d8ecc5828d7c54b4aef9406353e2d3a2f0965882342344c533bebf7826b4a76e58263b974dfc1162b49688e2009eeb5a467e4361ab8241d23a028d7
-DIST linux-3.18.tar.xz 80934708 BLAKE2B cf796fa1eb24276470b51bd3754f02932e57c6469e45959893b3714457ba33f0081ff04137990f228e1aae6d42a05073478a3ef932df468af7cd02bf8c8836c4 SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009
-DIST linux-3.6.tar.bz2 82296001 BLAKE2B 454e1c86dd5b7d2f9ff8ba777feda3743b620ecf4325c06b7270b2b1f60d2af2797836b509252e7140980ab0ba620d8fc98dd5d3968d19f8101c9327af262eef SHA512 cbaefc2c4c8ab2251c3345b7b2c88d55a49e3468d8b177b05dd6d96a802efa9a052b1a1ecab8b71298bac97f45259516d88253838332b4fdb4307780ebcddce9
-DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
-DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
 DIST linux-5.6.tar.xz 111785252 BLAKE2B 8dbe02a8ca7fd3dcf512a15c5d8098c1e7f94257e65173fed43fcc45480e4ab790df8cd39bbbb4e2a21dc9a00385bc9bbe98215a31e7f7e1d9c8f21cd8ace69e SHA512 80846fe2b4e4a7ff471d2dde28a8216ae807a3209f959e93d39ea4fc9a189ea28ec3db9d303b3fe15a28c2cb90e7446876678e93e23353c2d6f262e364a06bc9
-EBUILD linux-misc-apps-3.18.ebuild 5027 BLAKE2B 7905159d229d6076acb850b4f453689c731f03af48279a5e2e607a0fcea41b35a90c6491e73f3adb2c7167cf02ae28e4f618dcb27a4fbfa780eaa778cacdf483 SHA512 6552b6eda377a8dc7eea4ec0a452c120fb762954eab016502898d9857cd9413c4b6a59810e50d552d523bc71c441a6c740f66f6ac0926b2910bd788fc7d8a2aa
-EBUILD linux-misc-apps-3.6-r2.ebuild 5110 BLAKE2B 7281954256d85ca023c37d7a31bb0662e90976d7d442219926a3bfce1a51a590b2a03f71921958db28ce5c757781465e15e78ccb8c4899c49dae8cd04167e78a SHA512 5b57aa7d64ef4f7381c1476962e439404b3131a28e4a0d461d0cde2cd091ea69dad00dbb7f621d95f32cdd24a26969645d587e06aa3dc0429b2b4a39c38001f1
-EBUILD linux-misc-apps-4.19.ebuild 6339 BLAKE2B 1c2a523d86dd4fdd3728128a1186918966956624b02075ecfc25c5d4d0ebf616689b9b761d84620256286e55dde130d81bee3af5018808910ac06015144153ca SHA512 c1703fc466ad5a4458529b64189ec59539f9c3de38e47e963d4faa10fca6edf93c1341eb1b95397f1567e583296f15fc1bcdbd01175516e9afecc8c93bcea8aa
-EBUILD linux-misc-apps-4.4-r1.ebuild 6368 BLAKE2B 66929629228f66fad494818f2d121358f061d86107f364dfc54a3088faf4f1cf466924055eeff0317c990ef267da95aed509037e390f5fea67d7fa82fb559f24 SHA512 b687566096f04098bb1df53a3d8e0947e8a0776f847522adf8d05064dd58ef69889a5935dac084cbfd830c9bfcdbf1477aa0f67c11b3d42356d42f5aa7c61190
-EBUILD linux-misc-apps-4.4.ebuild 5526 BLAKE2B 655a698d8931c7980ae8abcc0b650fd3dc38cd8aa5c084a1293848b15533ff63ecc1cd6d6f8930317eb7b116b83da9377d7562108f7a0a20ee949f6beaa263bc SHA512 e53020f00bed7b5913613321905fe46b73ba902c2e8e602bb60752a270febd86f978f8216282b2b3a5abe11159927e57bf4ebfc5145a37609c1125ca64ae3970
+DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
 EBUILD linux-misc-apps-5.6.ebuild 6576 BLAKE2B dd0b82e5853f89d1a29ebaeee407487ecf2db0968ad69a1a4bc11b23ccde9df317fd7e103bc7d483e51b14593cfaade6066982bfcfb45bd9b285b58f3bc0a08a SHA512 cd3d66bbd6933c16b6fbb70cfe619add154202108bbe773aee51a982fc2ea99cecdbffc6cb0ebb17c46ea9a81d88d33ad848b3c60982efd225db0ffc70eefe8d
+EBUILD linux-misc-apps-5.8.ebuild 6525 BLAKE2B ca46c898c235376a5eb2558edc2cea4bf5b9186ad43a7f8446579da36fa3fc0fb640d2686791138750c4cf185dcfa40fe8ac264a19fc594404b37074bab3cfdd SHA512 2e36612df6eebed2fc0129da12daaf9934de30bae0c5ca40eef771aeb5e77df54aa9ec9f843d4382dd8280d3c90e80a54547a6dbac368a8073c80c3057553bf1
 MISC metadata.xml 318 BLAKE2B 87a15c795438a1025ba5624d0c00bfc1e3de3172205b20a4cdb27d5a0d524bc35d1aeb64e58b8c5fadd08d151a82913c35454c36ee5e653da86a6031ab707d24 SHA512 c5b90254b92fd0bd40596718daed1e9b5fd2c0039a814932811e33fb6827eac660aadd324bd45117d60ca56148b2f8213a075be1b255d6e8c006e2702f76833d
diff --git a/sys-apps/linux-misc-apps/files/hpfall.confd b/sys-apps/linux-misc-apps/files/hpfall.confd
deleted file mode 100644
index 4f3451b0bff6..000000000000
--- a/sys-apps/linux-misc-apps/files/hpfall.confd
+++ /dev/null
@@ -1,6 +0,0 @@
-# /etc/conf.d/hpfall
-
-# The name of the disk device that hpfall should protect.
-# Usually this is 'sda' or 'hda' the primary master.
-
-DISK="sda"
\ No newline at end of file
diff --git a/sys-apps/linux-misc-apps/files/hpfall.initd b/sys-apps/linux-misc-apps/files/hpfall.initd
deleted file mode 100644
index 8b4930612c4d..000000000000
--- a/sys-apps/linux-misc-apps/files/hpfall.initd
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-checkconfig() {
-    if [ -z "$DISK" ] ; then
-	eerror "You need to setup DISK in /etc/conf.d/hpfall first"
-	return 1
-    fi
-
-    if [ ! -b /dev/${DISK} ]; then
-        eerror "Could not find disk /dev/${DISK}!"
-        eerror "Adjust the DISK setting in /etc/conf.d/hpfall"
-        return 1
-    fi
-
-    if [ ! -e /sys/block/${DISK}/device/unload_heads ] ; then
-        eerror "No protect entry for ${DISK}!"
-        eerror "Kernel 2.6.28 and above is required"
-        return 1
-    fi
-
-    if [ ! -c /dev/freefall ]; then
-        ebegin "Loading hp_accel module"
-        modprobe hp_accel
-        eend $? || return 1
-    fi
-}
-
-start () {
-    checkconfig || return 1
-
-    ebegin "Starting active hard-drive protection daemon"
-    start-stop-daemon --start --quiet \
-        --exec /usr/sbin/hpfall /dev/${DISK}
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping active hard-drive protection daemon"
-    start-stop-daemon --stop --quiet \
-        --exec /usr/sbin/hpfall
-    eend $?
-}
diff --git a/sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild b/sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild
deleted file mode 100644
index 4821b1c04c42..000000000000
--- a/sys-apps/linux-misc-apps/linux-misc-apps-3.18.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator eutils toolchain-funcs linux-info ltprune flag-o-matic
-
-DESCRIPTION="Misc tools bundled with kernel sources"
-HOMEPAGE="https://kernel.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="static-libs tcpd"
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-LINUX_V=$(get_version_component_range 1-2)
-
-if [ ${PV/_rc} != ${PV} ]; then
-	LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
-	PATCH_VERSION=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV//_/-}.xz
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/testing/${LINUX_PATCH}
-		https://www.kernel.org/pub/linux/kernel/v3.x/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [ $(get_version_component_count) == 4 ]; then
-	# stable-release series
-	LINUX_VER=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV}.xz
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/${LINUX_PATCH}"
-else
-	LINUX_VER=${PV}
-fi
-
-LINUX_SOURCES=linux-${LINUX_VER}.tar.xz
-SRC_URI="${SRC_URI} https://www.kernel.org/pub/linux/kernel/v3.x/${LINUX_SOURCES}"
-
-# pmtools also provides turbostat
-# usbip available in seperate package now
-RDEPEND="sys-apps/hwids
-		>=dev-libs/glib-2.6
-		tcpd? ( sys-apps/tcp-wrappers )
-		!sys-power/pmtools"
-DEPEND="${RDEPEND}
-		virtual/pkgconfig"
-
-S="${WORKDIR}/linux-${LINUX_VER}"
-
-# All of these are integrated with the kernel build system,
-# No make install, and ideally build with with the root Makefile
-TARGETS_SIMPLE=(
-	Documentation/accounting/getdelays.c
-	Documentation/laptops/dslm.c
-	Documentation/laptops/freefall.c
-	Documentation/networking/timestamping/timestamping.c
-	Documentation/watchdog/src/watchdog-simple.c
-	tools/cgroup/cgroup_event_listener.c
-	tools/lguest/lguest.c
-	tools/vm/slabinfo.c
-	usr/gen_init_cpio.c
-)
-# tools/vm/page-types.c - broken, header path issue
-# tools/hv/hv_kvp_daemon.c - broken in 3.7 by missing linux/hyperv.h userspace
-# Documentation/networking/ifenslave.c - obsolete
-# Documentation/ptp/testptp.c - pending linux-headers-3.0
-
-# These have a broken make install, no DESTDIR
-TARGET_MAKE_SIMPLE=(
-	Documentation/misc-devices/mei:mei-amt-version
-	tools/firewire:nosy-dump
-	tools/power/x86/turbostat:turbostat:../../../../turbostat
-	tools/power/x86/x86_energy_perf_policy:x86_energy_perf_policy
-)
-# tools/perf - covered by dev-utils/perf
-# tools/usb - testcases only
-# tools/virtio - testcaes only
-
-	#for _pattern in {Documentation,scripts,tools,usr,include,lib,"arch/*/include",Makefile,Kbuild,Kconfig}; do
-src_unpack() {
-	unpack ${LINUX_SOURCES}
-
-	MY_A=
-	for _AFILE in ${A}; do
-		[[ ${_AFILE} == ${LINUX_SOURCES} ]] && continue
-		[[ ${_AFILE} == ${LINUX_PATCH} ]] && continue
-		MY_A="${MY_A} ${_AFILE}"
-	done
-	[[ -n ${MY_A} ]] && unpack ${MY_A}
-}
-
-src_prepare() {
-	if [[ -n ${LINUX_PATCH} ]]; then
-		epatch "${DISTDIR}"/${LINUX_PATCH}
-	fi
-
-	sed -i \
-		-e '/^nosy-dump.*LDFLAGS/d' \
-		-e '/^nosy-dump.*CFLAGS/d' \
-		-e '/^nosy-dump.*CPPFLAGS/s,CPPFLAGS =,CPPFLAGS +=,g' \
-		"${S}"/tools/firewire/Makefile
-}
-
-kernel_asm_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		# Merged arches
-		x86|amd64) echo x86 ;;
-		ppc*) echo powerpc ;;
-		# Non-merged
-		alpha|arm|ia64|m68k|mips|sh|sparc*) echo ${1} ;;
-		*) die "TODO: Update the code for your asm-ARCH symlink" ;;
-	esac
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	local karch=$(kernel_asm_arch "${ARCH}")
-	# This is the minimal amount needed to start building host binaries.
-	#emake allmodconfig ARCH=${karch}
-	#emake prepare modules_prepare ARCH=${karch}
-	#touch Module.symvers
-
-	# Now we can start building
-	for s in ${TARGETS_SIMPLE[@]} ; do
-		dir=$(dirname $s) src=$(basename $s) bin=${src%.c}
-		einfo "Building $s => $bin"
-		emake -f /dev/null M=${dir} ARCH=${karch} ${s%.c}
-	done
-
-	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
-		dir=${t/:*} target_binfile=${t#*:}
-		target=${target_binfile/:*} binfile=${target_binfile/*:}
-		[ -z "${binfile}" ] && binfile=$target
-		einfo "Building $dir => $binfile (via emake $target)"
-		emake -C $dir ARCH=${karch} $target
-	done
-}
-
-src_install() {
-	into /usr
-	for s in ${TARGETS_SIMPLE[@]} ; do
-		dir=$(dirname $s) src=$(basename $s) bin=${src%.c}
-		einfo "Installing $s => $bin"
-		dosbin ${dir}/${bin}
-	done
-
-	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
-		dir=${t/:*} target_binfile=${t#*:}
-		target=${target_binfile/:*} binfile=${target_binfile/*:}
-		[ -z "${binfile}" ] && binfile=$target
-		einfo "Installing $dir => $binfile"
-		dosbin ${dir}/${binfile}
-	done
-
-	newconfd "${FILESDIR}"/freefall.confd freefall
-	newinitd "${FILESDIR}"/freefall.initd freefall
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	echo
-	elog "The cpupower utility is maintained separately at sys-power/cpupower"
-	elog "The usbip utility is maintained separately at net-misc/usbip"
-	elog "The hpfall tool has been renamed by upstream to freefall; update your config if needed"
-	if find /etc/runlevels/ -name hpfall ; then
-		ewarn "You must change hpfall to freefall in your runlevels!"
-	fi
-}
diff --git a/sys-apps/linux-misc-apps/linux-misc-apps-3.6-r2.ebuild b/sys-apps/linux-misc-apps/linux-misc-apps-3.6-r2.ebuild
deleted file mode 100644
index 4d1f8227e84b..000000000000
--- a/sys-apps/linux-misc-apps/linux-misc-apps-3.6-r2.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator eutils toolchain-funcs linux-info ltprune autotools flag-o-matic
-
-DESCRIPTION="Misc tools bundled with kernel sources"
-HOMEPAGE="https://kernel.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="static-libs tcpd"
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-LINUX_V=$(get_version_component_range 1-2)
-
-if [ ${PV/_rc} != ${PV} ]; then
-	LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
-	PATCH_VERSION=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV//_/-}.bz2
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
-		https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [ $(get_version_component_count) == 4 ]; then
-	# stable-release series
-	LINUX_VER=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV}.bz2
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
-	LINUX_VER=${PV}
-fi
-
-LINUX_SOURCES=linux-${LINUX_VER}.tar.bz2
-SRC_URI="${SRC_URI} https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-# pmtools also provides turbostat
-# sysfsutils and glib for usbip - remove sysfsutils in 3.7 or 3.8
-RDEPEND="sys-apps/hwids
-		>=sys-fs/sysfsutils-2
-		>=dev-libs/glib-2.6
-		tcpd? ( sys-apps/tcp-wrappers )
-		!sys-power/pmtools
-		!net-misc/usbip"
-DEPEND="${RDEPEND}
-		virtual/pkgconfig"
-
-S="${WORKDIR}/linux-${LINUX_VER}"
-
-# All of these are integrated with the kernel build system,
-# No make install, and ideally build with with the root Makefile
-TARGETS_SIMPLE=(
-	Documentation/accounting/getdelays.c
-	Documentation/cgroups/cgroup_event_listener.c
-	Documentation/laptops/dslm.c
-	Documentation/laptops/hpfall.c
-	Documentation/networking/timestamping/timestamping.c
-	Documentation/watchdog/src/watchdog-simple.c
-	tools/lguest/lguest.c
-	tools/vm/page-types.c
-	tools/vm/slabinfo.c
-	usr/gen_init_cpio.c
-)
-# tools/hv/hv_kvp_daemon.c - broken in 3.7 by missing linux/hyperv.h userspace
-# Documentation/networking/ifenslave.c - obsolete
-# Documentation/ptp/testptp.c - pending linux-headers-3.0
-
-# These have a broken make install, no DESTDIR
-TARGET_MAKE_SIMPLE=(
-	tools/firewire:nosy-dump
-	tools/power/x86/turbostat:turbostat
-	tools/power/x86/x86_energy_perf_policy:x86_energy_perf_policy
-	Documentation/misc-devices/mei:mei-amt-version
-)
-# tools/perf - covered by dev-utils/perf
-# tools/usb - testcases only
-# tools/virtio - testcaes only
-
-	#for _pattern in {Documentation,scripts,tools,usr,include,lib,"arch/*/include",Makefile,Kbuild,Kconfig}; do
-src_unpack() {
-	unpack ${LINUX_SOURCES}
-
-	MY_A=
-	for _AFILE in ${A}; do
-		[[ ${_AFILE} == ${LINUX_SOURCES} ]] && continue
-		[[ ${_AFILE} == ${LINUX_PATCH} ]] && continue
-		MY_A="${MY_A} ${_AFILE}"
-	done
-	[[ -n ${MY_A} ]] && unpack ${MY_A}
-}
-
-src_prepare() {
-	if [[ -n ${LINUX_PATCH} ]]; then
-		epatch "${DISTDIR}"/${LINUX_PATCH}
-	fi
-
-	pushd drivers/staging/usbip/userspace >/dev/null &&
-	eautoreconf -i -f -v &&
-	popd >/dev/null || die "usbip"
-
-	sed -i \
-		-e '/^nosy-dump.*LDFLAGS/d' \
-		-e '/^nosy-dump.*CFLAGS/d' \
-		-e '/^nosy-dump.*CPPFLAGS/s,CPPFLAGS =,CPPFLAGS +=,g' \
-		"${S}"/tools/firewire/Makefile
-}
-
-kernel_asm_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		# Merged arches
-		x86|amd64) echo x86 ;;
-		ppc*) echo powerpc ;;
-		# Non-merged
-		alpha|arm|ia64|m68k|mips|sh|sparc*) echo ${1} ;;
-		*) die "TODO: Update the code for your asm-ARCH symlink" ;;
-	esac
-}
-
-src_configure() {
-	cd drivers/staging/usbip/userspace && \
-	econf \
-		$(use_enable static-libs static) \
-		$(use tcpd || echo --without-tcp-wrappers) \
-		--with-usbids-dir=/usr/share/misc
-}
-
-src_compile() {
-	local karch=$(kernel_asm_arch "${ARCH}")
-	# This is the minimal amount needed to start building host binaries.
-	#emake allmodconfig ARCH=${karch}
-	#emake prepare modules_prepare ARCH=${karch}
-	#touch Module.symvers
-
-	# Now we can start building
-	for s in ${TARGETS_SIMPLE[@]} ; do
-		dir=$(dirname $s) src=$(basename $s) bin=${src%.c}
-		einfo "Building $s => $bin"
-		emake -f /dev/null M=${dir} ARCH=${karch} ${s%.c}
-	done
-
-	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
-		dir=${t/:*} target=${t/*:}
-		einfo "Building $dir => $target"
-		emake -C $dir ARCH=${karch} $target
-	done
-
-	emake -C drivers/staging/usbip/userspace
-}
-
-src_install() {
-	into /usr
-	for s in ${TARGETS_SIMPLE[@]} ; do
-		dir=$(dirname $s) src=$(basename $s) bin=${src%.c}
-		einfo "Installing $s => $bin"
-		dosbin ${dir}/${bin}
-	done
-
-	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
-		dir=${t/:*} target=${t/*:}
-		einfo "Installing $dir => $target"
-		dosbin ${dir}/${target}
-	done
-
-	pushd drivers/staging/usbip/userspace >/dev/null \
-		|| die "Missing usbip/userspace"
-	emake DESTDIR="${D}" install
-
-	newdoc README README.usbip
-	newdoc AUTHORS AUTHORS.usbip
-	dodoc ../usbip_protocol.txt
-	popd >/dev/null
-
-	newconfd "${FILESDIR}"/hpfall.confd hpfall
-	newinitd "${FILESDIR}"/hpfall.initd hpfall
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	echo
-	elog "The cpupower utility is maintained separately at sys-power/cpupower"
-}
diff --git a/sys-apps/linux-misc-apps/linux-misc-apps-4.4-r1.ebuild b/sys-apps/linux-misc-apps/linux-misc-apps-4.4-r1.ebuild
deleted file mode 100644
index c1ed756f4430..000000000000
--- a/sys-apps/linux-misc-apps/linux-misc-apps-4.4-r1.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator eutils toolchain-funcs linux-info ltprune autotools flag-o-matic
-
-DESCRIPTION="Misc tools bundled with kernel sources"
-HOMEPAGE="https://kernel.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="static-libs tcpd usbip"
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-LINUX_V=$(get_version_component_range 1-2)
-
-if [ ${PV/_rc} != ${PV} ]; then
-	LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
-	PATCH_VERSION=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV//_/-}.xz
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/testing/${LINUX_PATCH}
-		https://www.kernel.org/pub/linux/kernel/v3.x/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [ $(get_version_component_count) == 4 ]; then
-	# stable-release series
-	LINUX_VER=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV}.xz
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/${LINUX_PATCH}"
-else
-	LINUX_VER=${PV}
-fi
-
-LINUX_SOURCES=linux-${LINUX_VER}.tar.xz
-SRC_URI="${SRC_URI} https://www.kernel.org/pub/linux/kernel/v3.x/${LINUX_SOURCES}"
-
-# pmtools also provides turbostat
-# usbip available in seperate package now
-RDEPEND="sys-apps/hwids
-		>=dev-libs/glib-2.6
-		>=sys-kernel/linux-headers-$(get_version_component_range 1-2)
-		usbip? (
-			!net-misc/usbip
-			tcpd? ( sys-apps/tcp-wrappers )
-			virtual/libudev
-		)
-		!sys-power/pmtools"
-DEPEND="${RDEPEND}
-		virtual/pkgconfig"
-
-S="${WORKDIR}/linux-${LINUX_VER}"
-
-# All of these are integrated with the kernel build system,
-# No make install, and ideally build with with the root Makefile
-TARGETS_SIMPLE=(
-	Documentation/accounting/getdelays.c
-	Documentation/laptops/dslm.c
-	Documentation/networking/timestamping/timestamping.c
-	Documentation/watchdog/src/watchdog-simple.c
-	tools/cgroup/cgroup_event_listener.c
-	tools/laptop/freefall/freefall.c
-	tools/vm/slabinfo.c
-	usr/gen_init_cpio.c
-	# Broken:
-	#tools/lguest/lguest.c # fails to compile
-	#tools/vm/page-types.c # page-types.c:(.text+0xe2b): undefined reference to `debugfs__mount', not defined anywhere
-	#tools/net/bpf_jit_disasm.c # /usr/include/x86_64-pc-linux-gnu/bfd.h:35:2: error: #error config.h must be included before this header
-)
-# tools/vm/page-types.c - broken, header path issue
-# tools/hv/hv_kvp_daemon.c - broken in 3.7 by missing linux/hyperv.h userspace
-# Documentation/networking/ifenslave.c - obsolete
-# Documentation/ptp/testptp.c - pending linux-headers-3.0
-
-# These have a broken make install, no DESTDIR
-TARGET_MAKE_SIMPLE=(
-	Documentation/misc-devices/mei:mei-amt-version
-	tools/firewire:nosy-dump
-	tools/iio:generic_buffer
-	tools/iio:iio_event_monitor
-	tools/iio:lsiio
-	tools/power/x86/turbostat:turbostat
-	tools/power/x86/x86_energy_perf_policy:x86_energy_perf_policy
-	tools/thermal/tmon:tmon
-)
-# tools/perf - covered by dev-utils/perf
-# tools/usb - testcases only
-# tools/virtio - testcaes only
-
-	#for _pattern in {Documentation,scripts,tools,usr,include,lib,"arch/*/include",Makefile,Kbuild,Kconfig}; do
-src_unpack() {
-	unpack ${LINUX_SOURCES}
-
-	MY_A=
-	for _AFILE in ${A}; do
-		[[ ${_AFILE} == ${LINUX_SOURCES} ]] && continue
-		[[ ${_AFILE} == ${LINUX_PATCH} ]] && continue
-		MY_A="${MY_A} ${_AFILE}"
-	done
-	[[ -n ${MY_A} ]] && unpack ${MY_A}
-}
-
-src_prepare() {
-	if [[ -n ${LINUX_PATCH} ]]; then
-		epatch "${DISTDIR}"/${LINUX_PATCH}
-	fi
-
-	pushd tools/usb/usbip/ >/dev/null &&
-	sed -i 's/-Werror[^ ]* //g' configure.ac &&
-	eautoreconf -i -f -v &&
-	popd >/dev/null || die "usbip"
-
-	sed -i \
-		-e '/^nosy-dump.*LDFLAGS/d' \
-		-e '/^nosy-dump.*CFLAGS/d' \
-		-e '/^nosy-dump.*CPPFLAGS/s,CPPFLAGS =,CPPFLAGS +=,g' \
-		"${S}"/tools/firewire/Makefile
-}
-
-kernel_asm_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		# Merged arches
-		x86|amd64) echo x86 ;;
-		ppc*) echo powerpc ;;
-		# Non-merged
-		alpha|arm|ia64|m68k|mips|sh|sparc*) echo ${1} ;;
-		*) die "TODO: Update the code for your asm-ARCH symlink" ;;
-	esac
-}
-
-src_configure() {
-	if use usbip; then
-		pushd tools/usb/usbip/ || die
-		econf \
-			$(use_enable static-libs static) \
-			$(use tcpd || echo --without-tcp-wrappers) \
-			--with-usbids-dir=/usr/share/misc
-		popd
-	fi
-}
-
-src_compile() {
-	local karch=$(kernel_asm_arch "${ARCH}")
-	# This is the minimal amount needed to start building host binaries.
-	#emake allmodconfig ARCH=${karch}
-	#emake prepare modules_prepare ARCH=${karch}
-	#touch Module.symvers
-
-	# Now we can start building
-	append-cflags -I./tools/lib
-	for s in ${TARGETS_SIMPLE[@]} ; do
-		dir=$(dirname $s) src=$(basename $s) bin=${src%.c}
-		einfo "Building $s => $bin"
-		emake -f /dev/null M=${dir} ARCH=${karch} ${s%.c}
-	done
-
-	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
-		dir=${t/:*} target_binfile=${t#*:}
-		target=${target_binfile/:*} binfile=${target_binfile/*:}
-		[ -z "${binfile}" ] && binfile=$target
-		einfo "Building $dir => $binfile (via emake $target)"
-		emake -C $dir ARCH=${karch} $target
-	done
-
-	if use usbip; then
-		emake -C tools/usb/usbip
-	fi
-}
-
-src_install() {
-	into /usr
-	for s in ${TARGETS_SIMPLE[@]} ; do
-		dir=$(dirname $s) src=$(basename $s) bin=${src%.c}
-		einfo "Installing $s => $bin"
-		dosbin ${dir}/${bin}
-	done
-
-	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
-		dir=${t/:*} target_binfile=${t#*:}
-		target=${target_binfile/:*} binfile=${target_binfile/*:}
-		[ -z "${binfile}" ] && binfile=$target
-		einfo "Installing $dir => $binfile"
-		dosbin ${dir}/${binfile}
-	done
-
-	if use usbip; then
-		pushd tools/usb/usbip/ >/dev/null || die "usbip"
-		emake DESTDIR="${D}" install
-		newdoc README README.usbip
-		newdoc AUTHORS AUTHORS.usbip
-		popd >/dev/null
-		dodoc drivers/usb/usbip/usbip_protocol.txt
-	fi
-
-	mv -f "${D}"/usr/sbin/{,iio_}generic_buffer
-
-	newconfd "${FILESDIR}"/freefall.confd freefall
-	newinitd "${FILESDIR}"/freefall.initd freefall
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	echo
-	elog "The cpupower utility is maintained separately at sys-power/cpupower"
-	elog "The lguest utility no longer builds, and has been dropped."
-	elog "The hpfall tool has been renamed by upstream to freefall; update your config if needed"
-	if find /etc/runlevels/ -name hpfall ; then
-		ewarn "You must change hpfall to freefall in your runlevels!"
-	fi
-	if use usbip; then
-		elog "For using USB/IP you need to enable USBIP_VHCI_HCD in the client"
-		elog "machine's kernel config and USBIP_HOST on the server."
-	fi
-}
diff --git a/sys-apps/linux-misc-apps/linux-misc-apps-4.4.ebuild b/sys-apps/linux-misc-apps/linux-misc-apps-4.4.ebuild
deleted file mode 100644
index ad1f27593bf9..000000000000
--- a/sys-apps/linux-misc-apps/linux-misc-apps-4.4.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator eutils toolchain-funcs linux-info ltprune flag-o-matic
-
-DESCRIPTION="Misc tools bundled with kernel sources"
-HOMEPAGE="https://kernel.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="static-libs tcpd"
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-LINUX_V=$(get_version_component_range 1-2)
-
-if [ ${PV/_rc} != ${PV} ]; then
-	LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
-	PATCH_VERSION=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV//_/-}.xz
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/testing/${LINUX_PATCH}
-		https://www.kernel.org/pub/linux/kernel/v3.x/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [ $(get_version_component_count) == 4 ]; then
-	# stable-release series
-	LINUX_VER=$(get_version_component_range 1-3)
-	LINUX_PATCH=patch-${PV}.xz
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/${LINUX_PATCH}"
-else
-	LINUX_VER=${PV}
-fi
-
-LINUX_SOURCES=linux-${LINUX_VER}.tar.xz
-SRC_URI="${SRC_URI} https://www.kernel.org/pub/linux/kernel/v3.x/${LINUX_SOURCES}"
-
-# pmtools also provides turbostat
-# usbip available in seperate package now
-RDEPEND="sys-apps/hwids
-		>=dev-libs/glib-2.6
-		tcpd? ( sys-apps/tcp-wrappers )
-		!sys-power/pmtools"
-DEPEND="${RDEPEND}
-		virtual/pkgconfig"
-
-S="${WORKDIR}/linux-${LINUX_VER}"
-
-# All of these are integrated with the kernel build system,
-# No make install, and ideally build with with the root Makefile
-TARGETS_SIMPLE=(
-	Documentation/accounting/getdelays.c
-	Documentation/laptops/dslm.c
-	Documentation/networking/timestamping/timestamping.c
-	Documentation/watchdog/src/watchdog-simple.c
-	tools/cgroup/cgroup_event_listener.c
-	tools/laptop/freefall/freefall.c
-	tools/vm/slabinfo.c
-	usr/gen_init_cpio.c
-	# Broken:
-	#tools/lguest/lguest.c # fails to compile
-	#tools/vm/page-types.c # page-types.c:(.text+0xe2b): undefined reference to `debugfs__mount', not defined anywhere
-	#tools/net/bpf_jit_disasm.c # /usr/include/x86_64-pc-linux-gnu/bfd.h:35:2: error: #error config.h must be included before this header
-)
-# tools/vm/page-types.c - broken, header path issue
-# tools/hv/hv_kvp_daemon.c - broken in 3.7 by missing linux/hyperv.h userspace
-# Documentation/networking/ifenslave.c - obsolete
-# Documentation/ptp/testptp.c - pending linux-headers-3.0
-
-# These have a broken make install, no DESTDIR
-TARGET_MAKE_SIMPLE=(
-	Documentation/misc-devices/mei:mei-amt-version
-	tools/firewire:nosy-dump
-	tools/iio:generic_buffer
-	tools/iio:iio_event_monitor
-	tools/iio:lsiio
-	tools/power/x86/turbostat:turbostat
-	tools/power/x86/x86_energy_perf_policy:x86_energy_perf_policy
-	tools/thermal/tmon:tmon
-)
-# tools/perf - covered by dev-utils/perf
-# tools/usb - testcases only
-# tools/virtio - testcaes only
-
-	#for _pattern in {Documentation,scripts,tools,usr,include,lib,"arch/*/include",Makefile,Kbuild,Kconfig}; do
-src_unpack() {
-	unpack ${LINUX_SOURCES}
-
-	MY_A=
-	for _AFILE in ${A}; do
-		[[ ${_AFILE} == ${LINUX_SOURCES} ]] && continue
-		[[ ${_AFILE} == ${LINUX_PATCH} ]] && continue
-		MY_A="${MY_A} ${_AFILE}"
-	done
-	[[ -n ${MY_A} ]] && unpack ${MY_A}
-}
-
-src_prepare() {
-	if [[ -n ${LINUX_PATCH} ]]; then
-		epatch "${DISTDIR}"/${LINUX_PATCH}
-	fi
-
-	sed -i \
-		-e '/^nosy-dump.*LDFLAGS/d' \
-		-e '/^nosy-dump.*CFLAGS/d' \
-		-e '/^nosy-dump.*CPPFLAGS/s,CPPFLAGS =,CPPFLAGS +=,g' \
-		"${S}"/tools/firewire/Makefile
-}
-
-kernel_asm_arch() {
-	a="${1:${ARCH}}"
-	case ${a} in
-		# Merged arches
-		x86|amd64) echo x86 ;;
-		ppc*) echo powerpc ;;
-		# Non-merged
-		alpha|arm|ia64|m68k|mips|sh|sparc*) echo ${1} ;;
-		*) die "TODO: Update the code for your asm-ARCH symlink" ;;
-	esac
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	local karch=$(kernel_asm_arch "${ARCH}")
-	# This is the minimal amount needed to start building host binaries.
-	#emake allmodconfig ARCH=${karch}
-	#emake prepare modules_prepare ARCH=${karch}
-	#touch Module.symvers
-
-	# Now we can start building
-	append-cflags -I./tools/lib
-	for s in ${TARGETS_SIMPLE[@]} ; do
-		dir=$(dirname $s) src=$(basename $s) bin=${src%.c}
-		einfo "Building $s => $bin"
-		emake -f /dev/null M=${dir} ARCH=${karch} ${s%.c}
-	done
-
-	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
-		dir=${t/:*} target_binfile=${t#*:}
-		target=${target_binfile/:*} binfile=${target_binfile/*:}
-		[ -z "${binfile}" ] && binfile=$target
-		einfo "Building $dir => $binfile (via emake $target)"
-		emake -C $dir ARCH=${karch} $target
-	done
-}
-
-src_install() {
-	into /usr
-	for s in ${TARGETS_SIMPLE[@]} ; do
-		dir=$(dirname $s) src=$(basename $s) bin=${src%.c}
-		einfo "Installing $s => $bin"
-		dosbin ${dir}/${bin}
-	done
-
-	for t in ${TARGET_MAKE_SIMPLE[@]} ; do
-		dir=${t/:*} target_binfile=${t#*:}
-		target=${target_binfile/:*} binfile=${target_binfile/*:}
-		[ -z "${binfile}" ] && binfile=$target
-		einfo "Installing $dir => $binfile"
-		dosbin ${dir}/${binfile}
-	done
-
-	mv -f "${D}"/usr/sbin/{,iio_}generic_buffer
-
-	newconfd "${FILESDIR}"/freefall.confd freefall
-	newinitd "${FILESDIR}"/freefall.initd freefall
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	echo
-	elog "The cpupower utility is maintained separately at sys-power/cpupower"
-	elog "The usbip utility is maintained separately at net-misc/usbip"
-	elog "The lguest utility no longer builds, and has been dropped."
-	elog "The hpfall tool has been renamed by upstream to freefall; update your config if needed"
-	if find /etc/runlevels/ -name hpfall ; then
-		ewarn "You must change hpfall to freefall in your runlevels!"
-	fi
-}
diff --git a/sys-apps/linux-misc-apps/linux-misc-apps-4.19.ebuild b/sys-apps/linux-misc-apps/linux-misc-apps-5.8.ebuild
index 45c7b3fd3bb5..c64dce76d292 100644
--- a/sys-apps/linux-misc-apps/linux-misc-apps-4.19.ebuild
+++ b/sys-apps/linux-misc-apps/linux-misc-apps-5.8.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit versionator eutils toolchain-funcs linux-info ltprune autotools flag-o-matic
+inherit eutils toolchain-funcs linux-info autotools flag-o-matic
 
 DESCRIPTION="Misc tools bundled with kernel sources"
 HOMEPAGE="https://kernel.org/"
@@ -16,17 +16,22 @@ IUSE="static-libs tcpd usbip"
 MY_PV="${PV/_/-}"
 MY_PV="${MY_PV/-pre/-git}"
 
-LINUX_V=$(get_version_component_range 1-2)
+LINUX_V=$(ver_cut 1-2)
+
+get_version_component_count() {
+	local cnt=( $(ver_rs 1- ' ') )
+	echo ${#cnt[@]} || die
+}
 
 if [ ${PV/_rc} != ${PV} ]; then
-	LINUX_VER=$(get_version_component_range 1-2).$(($(get_version_component_range 3)-1))
-	PATCH_VERSION=$(get_version_component_range 1-3)
+	LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
+	PATCH_VERSION=$(ver_cut 1-3)
 	LINUX_PATCH=patch-${PV//_/-}.xz
 	SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/testing/${LINUX_PATCH}
 		https://www.kernel.org/pub/linux/kernel/v3.x/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
 elif [ $(get_version_component_count) == 4 ]; then
 	# stable-release series
-	LINUX_VER=$(get_version_component_range 1-3)
+	LINUX_VER=$(ver_cut 1-3)
 	LINUX_PATCH=patch-${PV}.xz
 	SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/${LINUX_PATCH}"
 else
@@ -40,7 +45,7 @@ SRC_URI="${SRC_URI} https://www.kernel.org/pub/linux/kernel/v3.x/${LINUX_SOURCES
 # usbip available in seperate package now
 RDEPEND="sys-apps/hwids
 		>=dev-libs/glib-2.6
-		>=sys-kernel/linux-headers-$(get_version_component_range 1-2)
+		>=sys-kernel/linux-headers-${LINUX_V}
 		usbip? (
 			!net-misc/usbip
 			tcpd? ( sys-apps/tcp-wrappers )
@@ -59,7 +64,7 @@ TARGETS_SIMPLE=(
 	tools/accounting/getdelays.c
 	tools/cgroup/cgroup_event_listener.c
 	tools/laptop/freefall/freefall.c
-	tools/testing/selftests/networking/timestamping/timestamping.c
+	tools/testing/selftests/net/timestamping.c
 	tools/vm/slabinfo.c
 	usr/gen_init_cpio.c
 	# Broken:
@@ -116,6 +121,8 @@ src_prepare() {
 		-e '/^nosy-dump.*CFLAGS/d' \
 		-e '/^nosy-dump.*CPPFLAGS/s,CPPFLAGS =,CPPFLAGS +=,g' \
 		"${S}"/tools/firewire/Makefile
+
+	eapply_user
 }
 
 kernel_asm_arch() {
@@ -191,14 +198,19 @@ src_install() {
 		newdoc README README.usbip
 		newdoc AUTHORS AUTHORS.usbip
 		popd >/dev/null
-		dodoc Documentation/usb/usbip_protocol.txt
+		dodoc Documentation/usb/usbip_protocol.rst
+		find "${D}" -name 'libusbip*.la' -delete || die
 	fi
 
-	mv -f "${D}"/usr/sbin/{,iio_}generic_buffer
+	# At one point upstream it was moved, but be generic to detect if it's
+	# happened already
+	if [[ -f "${D}"/usr/sbin/generic_buffer ]] && \
+		[[ ! -f "${D}"/usr/sbin/iio_generic_buffer ]]; then
+		mv -f "${D}"/usr/sbin/{,iio_}generic_buffer || die
+	fi
 
 	newconfd "${FILESDIR}"/freefall.confd freefall
 	newinitd "${FILESDIR}"/freefall.initd freefall
-	prune_libtool_files
 }
 
 pkg_postinst() {
@@ -206,7 +218,7 @@ pkg_postinst() {
 	elog "The cpupower utility is maintained separately at sys-power/cpupower"
 	elog "The lguest utility no longer builds, and has been dropped."
 	elog "The hpfall tool has been renamed by upstream to freefall; update your config if needed"
-	if find /etc/runlevels/ -name hpfall ; then
+	if find "${ROOT}"/etc/runlevels/ -name hpfall ; then
 		ewarn "You must change hpfall to freefall in your runlevels!"
 	fi
 	if use usbip; then