gentoo resync : 28.04.2019

46 files changed, 18 insertions, 3004 deletions

diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index f14e167c7873..0dd1998e65c1 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/acpid/Manifest b/sys-power/acpid/Manifest
index 9f690b841572..94f6022090b8 100644
--- a/sys-power/acpid/Manifest
+++ b/sys-power/acpid/Manifest
@@ -1,17 +1,4 @@
-AUX acpid-1.0.4-default 663 BLAKE2B 221343ecbabeaea79af570cde3bdd58e0408e67b954519ba41addfa242de3ab91e47f40b02e9e83be7eb97f3a953d2f0ec1953b0a1753cbe57b371e3cf064b05 SHA512 817c971371046bdac72c644eed508b17fe524007f0cf360198d2649bc80254a0b127def0f6442288432ea2fb822b42299324507711feb13dd14a29e9315e9238
-AUX acpid-1.0.6-default.sh 1231 BLAKE2B 493c16e1c5515b6b7d8844f90ec37652631b00cac2f79347ec6d0eabb4a386a61a53622a10cb9c43ff64d88fead8a79ee8a348636623bdc6a0ede34eeb9ba976 SHA512 25629153eb97d7dc60d9a2b3a40fb7c22d4dd8ff84bbe5431230b70660d6ad8efb43976be062ac581b796f7e515722c67f8875a3aaa5f460a1172580dcac3d14
-AUX acpid-2.0.16-conf.d 153 BLAKE2B e2c8a0d058311402b35c6c9777b9807d341f578bd60a82f1c866f182fef16d25332f37fa1cfe7a855824e004a877407d509bd6916388f6dfdf9114d9b93c57a3 SHA512 518cb397b2aa63b893ead1be08f32fe436d19b72663dee66834cfbc112b003333f0df8b9e4f1ffe64b813783f657d3fe8b9a0c5e992d5665583357e68b266705
-AUX acpid-2.0.25-add_mate-power-manager.patch 461 BLAKE2B 3cab3f239cdf1c575d6449b704e2f05a99fa075374f64523ca2ef6e3f9d3074fbd4eec4ceae1fd53c9fd4f648974e70939f45465becb10da68cc0d98af70bbb5 SHA512 faee772d2ba8e26d249d2fc9a7c9e1825383f82a1b90294581d315ffab413b67de2aee1887ee21fa6f9b782da988fb7261cd99505ae682024aaf5972669204ab
-AUX acpid-2.0.25-kde4.patch 1015 BLAKE2B 2e925c69ffc607126dafad82aa834e6f202769d9ef643fa0abe339e57d48e4c02e866e8cee2cf96b9eba2d3eee23961f1e5960638c3162dbc72845b8eaa4a093 SHA512 a619743a0e05948f368b1a884c06317be8434dd5d9ffa47571ce541e180cf938a6c4846f93ca6255243bddcce91be40d3c0efecf399a087f747a49136b1d3ab1
-AUX acpid-2.0.26-init.d 436 BLAKE2B de812b8d63f8427fc32b5d177f39d80cfdc8b92918cfe05de5483b6dd7c6091ce17ec65188376468c722c735cc2b01985366a9cedc693fd7d21eb6ada2055960 SHA512 7381d30b5c6478cdbf5dff93ae95baa0b3b1fe0a04b02cf491831f1657d6f71b8eef121b7e78f3201d11a5856bfb30df0a57437c76e6fbe05ad88cd45e86ae64
-AUX systemd/acpid.service 155 BLAKE2B 763b5f0ad5d03e91098ec9e71a17c5d0a52c90f1935381722513ef9ff5e53c4d1c98a989632a73707af006bf6a4fbd54f8e251b188eb84bfa8bf34c9cb8d5df8 SHA512 51c1e2a10968bd6555debf237c064dec7a347a5adfe0e8612e9ad49168e727d0779744ae8c2842b2e943dd46ab310343aeebb9eb6c9e85cb77123d966e8561b1
-AUX systemd/acpid.socket 119 BLAKE2B a0f22e8579c48d7258c81f7fb97a9566f1dd4722da9d2f68c1b960ee88ca432ab17890b556df913a44aaba9b91c309de073afa1710eea71528a3c85988533ad9 SHA512 9a8293166b3818255d39d972dd354e675d23e4d59fb4ce3a8b5dedbf33e809f808ae3020f308426ba8d9d1317396727edc5be5bf51a7a30bc40c809442c96c0a
-DIST acpid-2.0.29.tar.xz 155568 BLAKE2B 9a2c9f2f8ba035bf7452b633c20a73796ca05d4849d567f076a08a8216f2e07ca7a0b25e995054697e70bacacad07872e153c6c47f8204294964b276bca49f62 SHA512 5f480cb4456b6b843adb239519a8d05f83c3c668525457e55d7fae2ba7725356ec7a1faa16bbd54086f0eab2e8ca20952180c00b2b65a27eda534c3f28e8ed17
-DIST acpid-2.0.30.tar.xz 155528 BLAKE2B cbf387dc6342e0f4256360e99c02f8ebf4c322cd1c1dbd4ff0fcf703a323b90cfb0eb256233917dbdb81cd9a5f9bd075c581de9daee3d3a311208553084a093e SHA512 6901e93cc626817b782e43976caf4b7f89e8c4275eb7e9d31aeeb967b5d5bbb6a2b4dcf71e72ba666e10343cdbdbe8528feee955af5ba14de8ec88ef61b29f96
 DIST acpid-2.0.31.tar.xz 155620 BLAKE2B 11338d72156dfd90f680367e23e373f8c4ee5e553ad4a8a9c9688163e9a97ee99a9b866940320ee5af5a9e9fe956dd3e675d0b879ea984c2cca56162c0d163fd SHA512 05eb96cdae698731b14caa89aa01239a0f16ce732f897d295447753aab7c8d49227c9b9ce901c6fd3bfdb117688e6ed80ec61aea0f64d75c9c0afe2aea2aa91a
 DIST sys-power_acpid_2.0.29-r1_extras.tar.xz 2548 BLAKE2B 4568f0e44d33382fd294248d48c8852f689f0a6082d9b74b33b77918d3ce21d7f1bf8a3aafeaa252e8fe170b3829155344a256f01fe80414369f02d50a17ff55 SHA512 f2c366c50c75790df32a1f6573b7de640fd09a97c4598155ebd0aad2eba118961ddc82fe0fbb4dc935aa5b6d7fcfe3ade73fff555b4588b0e4579a1028bef12f
-EBUILD acpid-2.0.29-r1.ebuild 2104 BLAKE2B f477d8ec3a9f417e2b3b44ef24652c0653ed01ed7b013ef86c9bab17463441da4da3c8939c1b4fdad4cae78f4eca783dca1dc251fa8621d2c92961c7c1eec6a9 SHA512 a88604dc9044e2dc401b3dd5bf469b88fe8526b0250c2c266ba81c260e785e68aa13ce8ddf8c4b37c9c6f069c31b45e22893799648ef10524f3f063f6960d575
-EBUILD acpid-2.0.29.ebuild 1858 BLAKE2B 4bf788cb1010e66eebc1aaa34b4b3851307588bcb1b78f6dfcc0fd236db897f512d4ca3f98d0c0864c6bd10fb1fc27fcbaa94c8439d2d647caf1f684de9f1847 SHA512 a76fbf6aa2260cecf8a08a0fa013dc14a7a4d7fd90ad65f6a8a70c64d1dea445c97cff7413cb08c13e1251e9634ae3f2c33f8866f4e0c561635c79eb4e6e08be
-EBUILD acpid-2.0.30.ebuild 1963 BLAKE2B a93ac2d1cf60b49e2a95ad37bdb51181c86a5711fb683105eba86c7a0223715a5e688c1aa67029a44f4e0a0b8f6ab961d01eef9efba54cc4c111b2066f0d03a2 SHA512 86444c7c26a616937a6d4833c8710584ab9f3766978d1435a893f78b654ceac8dda33aec7ff2e62a1de1a4f1aa6a8e919a8871bc448a2c0d828848c81bfc89af
 EBUILD acpid-2.0.31.ebuild 1962 BLAKE2B 4095dace6957e021be73c336ccf9b33049abcdc789be44820a99f06f092f0b309b6629ebeab97246fdbe12a72fedee5c4fb7a4ce029f79a11e7f79ea05b046a7 SHA512 a4178b8e8d93aabadc3b9be21728ff387a7e2259ff78fa4431cb32cbd913e6463c942bbaf19cce2132b3b1bd7a20ceae0d59a24be313337598cd345130b7a1b1
 MISC metadata.xml 327 BLAKE2B f6c546808131faaccf65580107772b21a3fe59b681b1ae6c66846ce230c9bb4ce9209287ff88f150f4bd691d71cdbf7e2c4fd4ac8a049a2e8b9d9ab57967c1b3 SHA512 8e93170bc36e09c1cf6c1db7eb751cc1ddf737d3ed240ef69a5ba00279ea3d9e92c5ba5185faa5f2f3c86fca9922adfb8e8e0ffe673817984948aa941a2a7a3a
diff --git a/sys-power/acpid/acpid-2.0.29-r1.ebuild b/sys-power/acpid/acpid-2.0.29-r1.ebuild
deleted file mode 100644
index 23eb1895e8df..000000000000
--- a/sys-power/acpid/acpid-2.0.29-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit linux-info systemd
-
-DESCRIPTION="Daemon for Advanced Configuration and Power Interface"
-HOMEPAGE="https://sourceforge.net/projects/acpid2"
-EXTRAS_VER="2.0.29-r1"
-EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
-SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.xz
-	https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz
-	"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 ia64 x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-apm )"
-DEPEND=">=sys-kernel/linux-headers-3"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~INPUT_EVDEV"
-	local WARNING_INPUT_EVDEV="CONFIG_INPUT_EVDEV is required for ACPI button event support."
-	[[ ${MERGE_TYPE} != buildonly ]] && check_extra_config
-}
-
-pkg_setup() { :; }
-
-PATCHES=(
-	"${WORKDIR}/${EXTRAS_NAME}/${PN}-2.0.25-kde4.patch" #515088
-	"${WORKDIR}/${EXTRAS_NAME}/${PN}-2.0.29-r1-extend-pms-list.patch" #538590, 628698
-)
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newdoc kacpimon/README README.kacpimon
-	dodoc -r samples
-	rm -f "${D}"/usr/share/doc/${PF}/COPYING || die
-
-	exeinto /etc/acpi
-	newexe "${WORKDIR}/${EXTRAS_NAME}/${PN}-1.0.6-default.sh" default.sh
-	exeinto /etc/acpi/actions
-	newexe samples/powerbtn/powerbtn.sh powerbtn.sh
-	insinto /etc/acpi/events
-	newins "${WORKDIR}/${EXTRAS_NAME}/${PN}-1.0.4-default" default
-
-	newinitd "${WORKDIR}/${EXTRAS_NAME}/${PN}-2.0.26-init.d" ${PN}
-	newconfd "${WORKDIR}/${EXTRAS_NAME}/${PN}-2.0.16-conf.d" ${PN}
-
-	systemd_dounit "${WORKDIR}"/${EXTRAS_NAME}/systemd/${PN}.{service,socket}
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "You may wish to read the Gentoo Linux Power Management Guide,"
-		elog "which can be found online at:"
-		elog "https://wiki.gentoo.org/wiki/Power_management/Guide"
-		elog
-	fi
-
-	# files/systemd/acpid.socket -> ListenStream=/run/acpid.socket
-	mkdir -p "${ROOT%/}"/run
-
-	if ! grep -qs "^tmpfs.*/run " "${ROOT%/}"/proc/mounts ; then
-		echo
-		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
-	fi
-}
diff --git a/sys-power/acpid/acpid-2.0.29.ebuild b/sys-power/acpid/acpid-2.0.29.ebuild
deleted file mode 100644
index f9699804c533..000000000000
--- a/sys-power/acpid/acpid-2.0.29.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit linux-info systemd
-
-DESCRIPTION="Daemon for Advanced Configuration and Power Interface"
-HOMEPAGE="https://sourceforge.net/projects/acpid2"
-SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-apm )"
-DEPEND=">=sys-kernel/linux-headers-3"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~INPUT_EVDEV"
-	local WARNING_INPUT_EVDEV="CONFIG_INPUT_EVDEV is required for ACPI button event support."
-	[[ ${MERGE_TYPE} != buildonly ]] && check_extra_config
-}
-
-pkg_setup() { :; }
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.25-kde4.patch #515088
-	"${FILESDIR}"/${PN}-2.0.25-add_mate-power-manager.patch #538590
-)
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newdoc kacpimon/README README.kacpimon
-	dodoc -r samples
-	rm -f "${D}"/usr/share/doc/${PF}/COPYING || die
-
-	exeinto /etc/acpi
-	newexe "${FILESDIR}"/${PN}-1.0.6-default.sh default.sh
-	exeinto /etc/acpi/actions
-	newexe samples/powerbtn/powerbtn.sh powerbtn.sh
-	insinto /etc/acpi/events
-	newins "${FILESDIR}"/${PN}-1.0.4-default default
-
-	newinitd "${FILESDIR}"/${PN}-2.0.26-init.d ${PN}
-	newconfd "${FILESDIR}"/${PN}-2.0.16-conf.d ${PN}
-
-	systemd_dounit "${FILESDIR}"/systemd/${PN}.{service,socket}
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "You may wish to read the Gentoo Linux Power Management Guide,"
-		elog "which can be found online at:"
-		elog "https://wiki.gentoo.org/wiki/Power_management/Guide"
-		elog
-	fi
-
-	# files/systemd/acpid.socket -> ListenStream=/run/acpid.socket
-	mkdir -p "${ROOT%/}"/run
-
-	if ! grep -qs "^tmpfs.*/run " "${ROOT%/}"/proc/mounts ; then
-		echo
-		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
-	fi
-}
diff --git a/sys-power/acpid/acpid-2.0.30.ebuild b/sys-power/acpid/acpid-2.0.30.ebuild
deleted file mode 100644
index 52a2ac1739cc..000000000000
--- a/sys-power/acpid/acpid-2.0.30.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit linux-info systemd
-
-DESCRIPTION="Daemon for Advanced Configuration and Power Interface"
-HOMEPAGE="https://sourceforge.net/projects/acpid2"
-EXTRAS_VER="2.0.29-r1"
-EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
-SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.xz
-	https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz
-	"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ia64 x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-apm )"
-DEPEND=">=sys-kernel/linux-headers-3"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~INPUT_EVDEV"
-	local WARNING_INPUT_EVDEV="CONFIG_INPUT_EVDEV is required for ACPI button event support."
-	[[ ${MERGE_TYPE} != buildonly ]] && check_extra_config
-}
-
-pkg_setup() { :; }
-
-PATCHES=(
-)
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newdoc kacpimon/README README.kacpimon
-	dodoc -r samples
-	rm -f "${D}"/usr/share/doc/${PF}/COPYING || die
-
-	exeinto /etc/acpi
-	newexe "${WORKDIR}/${EXTRAS_NAME}/${PN}-1.0.6-default.sh" default.sh
-	exeinto /etc/acpi/actions
-	newexe samples/powerbtn/powerbtn.sh powerbtn.sh
-	insinto /etc/acpi/events
-	newins "${WORKDIR}/${EXTRAS_NAME}/${PN}-1.0.4-default" default
-
-	newinitd "${WORKDIR}/${EXTRAS_NAME}/${PN}-2.0.26-init.d" ${PN}
-	newconfd "${WORKDIR}/${EXTRAS_NAME}/${PN}-2.0.16-conf.d" ${PN}
-
-	systemd_dounit "${WORKDIR}"/${EXTRAS_NAME}/systemd/${PN}.{service,socket}
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "You may wish to read the Gentoo Linux Power Management Guide,"
-		elog "which can be found online at:"
-		elog "https://wiki.gentoo.org/wiki/Power_management/Guide"
-		elog
-	fi
-
-	# files/systemd/acpid.socket -> ListenStream=/run/acpid.socket
-	mkdir -p "${ROOT%/}"/run
-
-	if ! grep -qs "^tmpfs.*/run " "${ROOT%/}"/proc/mounts ; then
-		echo
-		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
-	fi
-}
diff --git a/sys-power/acpid/files/acpid-1.0.4-default b/sys-power/acpid/files/acpid-1.0.4-default
deleted file mode 100644
index a07c1827f4e9..000000000000
--- a/sys-power/acpid/files/acpid-1.0.4-default
+++ /dev/null
@@ -1,19 +0,0 @@
-# /etc/acpi/events/default
-# This is the ACPID default configuration, it takes all
-# events and passes them to /etc/acpi/default.sh for further
-# processing.
-
-# event keeps a regular expression matching the event. To get
-# power events only, just use something like "event=button[ /]power.*"
-# to catch it.
-# action keeps the command to be executed after an event occurs
-# In case of the power event above, your entry may look this way:
-#event=button[ /]power.*
-#action=/sbin/init 0
-
-# Optionally you can specify the placeholder %e. It will pass
-# through the whole kernel event message to the program you've
-# specified.
-
-event=.*
-action=/etc/acpi/default.sh %e
diff --git a/sys-power/acpid/files/acpid-1.0.6-default.sh b/sys-power/acpid/files/acpid-1.0.6-default.sh
deleted file mode 100644
index 8be6f3e1a9f4..000000000000
--- a/sys-power/acpid/files/acpid-1.0.6-default.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-# /etc/acpi/default.sh
-# Default acpi script that takes an entry for all actions
-
-set $*
-
-group=${1%%/*}
-action=${1#*/}
-device=$2
-id=$3
-value=$4
-
-log_unhandled() {
-	logger "ACPI event unhandled: $*"
-}
-
-case "$group" in
-	button)
-		case "$action" in
-			power)
-				/etc/acpi/actions/powerbtn.sh
-				;;
-
-			# if your laptop doesnt turn on/off the display via hardware
-			# switch and instead just generates an acpi event, you can force
-			# X to turn off the display via dpms.  note you will have to run
-			# 'xhost +local:0' so root can access the X DISPLAY.
-			#lid)
-			#	xset dpms force off
-			#	;;
-
-			*)	log_unhandled $* ;;
-		esac
-		;;
-
-	ac_adapter)
-		case "$value" in
-			# Add code here to handle when the system is unplugged
-			# (maybe change cpu scaling to powersave mode).  For
-			# multicore systems, make sure you set powersave mode
-			# for each core!
-			#*0)
-			#	cpufreq-set -g powersave
-			#	;;
-
-			# Add code here to handle when the system is plugged in
-			# (maybe change cpu scaling to performance mode).  For
-			# multicore systems, make sure you set performance mode
-			# for each core!
-			#*1)
-			#	cpufreq-set -g performance
-			#	;;
-
-			*)	log_unhandled $* ;;
-		esac
-		;;
-
-	*)	log_unhandled $* ;;
-esac
diff --git a/sys-power/acpid/files/acpid-2.0.16-conf.d b/sys-power/acpid/files/acpid-2.0.16-conf.d
deleted file mode 100644
index 9aadb4cd814a..000000000000
--- a/sys-power/acpid/files/acpid-2.0.16-conf.d
+++ /dev/null
@@ -1,6 +0,0 @@
-# /etc/conf.d/acpid: config file for /etc/init.d/acpid
-
-# Options to pass to the acpid daemon.
-# See the acpid(8) man page for more info.
-
-ACPID_ARGS=""
diff --git a/sys-power/acpid/files/acpid-2.0.25-add_mate-power-manager.patch b/sys-power/acpid/files/acpid-2.0.25-add_mate-power-manager.patch
deleted file mode 100644
index 7061744ed57e..000000000000
--- a/sys-power/acpid/files/acpid-2.0.25-add_mate-power-manager.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/538590
-
---- acpid-2.0.25/samples/powerbtn/powerbtn.sh
-+++ acpid-2.0.25/samples/powerbtn/powerbtn.sh
-@@ -51,7 +51,7 @@
- getXconsole
- 
- # A list of power management system process names.
--PMS="gnome-power-manager kpowersave xfce4-power-manager"
-+PMS="gnome-power-manager kpowersave xfce4-power-manager mate-power-manager"
- PMS="$PMS guidance-power-manager.py dalston-power-applet"
- 
- # If one of those is running or any of several others,
diff --git a/sys-power/acpid/files/acpid-2.0.25-kde4.patch b/sys-power/acpid/files/acpid-2.0.25-kde4.patch
deleted file mode 100644
index 1a91bb945246..000000000000
--- a/sys-power/acpid/files/acpid-2.0.25-kde4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/515088
-
---- acpid-2.0.25/samples/powerbtn/powerbtn.sh
-+++ acpid-2.0.25/samples/powerbtn/powerbtn.sh
-@@ -57,7 +57,7 @@
- # If one of those is running or any of several others,
- if pidof x $PMS > /dev/null ||
- 	( test "$XUSER" != "" && pidof dcopserver > /dev/null && test -x /usr/bin/dcop && /usr/bin/dcop --user $XUSER kded kded loadedModules | grep -q klaptopdaemon) ||
--	( test "$XUSER" != "" && test -x /usr/bin/qdbus && test -r /proc/$(pidof kded4)/environ && su - $XUSER -c "eval $(echo -n 'export '; cat /proc/$(pidof kded4)/environ |tr '\0' '\n'|grep DBUS_SESSION_BUS_ADDRESS); qdbus org.kde.kded" | grep -q powerdevil) ; then
-+	( test "$XUSER" != "" && test -x /usr/bin/qdbus && test -r /proc/$(pgrep -n kded4)/environ && su - $XUSER -c "eval $(echo -n 'export '; cat /proc/$(pgrep -n kded4)/environ |tr '\0' '\n'|grep DBUS_SESSION_BUS_ADDRESS); qdbus org.kde.kded" | grep -q powerdevil) ; then
- 	# Get out as the power manager that is running will take care of things.
-     exit
- fi
diff --git a/sys-power/acpid/files/acpid-2.0.26-init.d b/sys-power/acpid/files/acpid-2.0.26-init.d
deleted file mode 100644
index f8076d43b0ab..000000000000
--- a/sys-power/acpid/files/acpid-2.0.26-init.d
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload"
-command="/usr/sbin/acpid"
-command_args="${ACPID_ARGS}"
-description="Daemon for Advanced Configuration and Power Interface"
-
-depend() {
-	need localmount
-	use logger
-}
-
-reload() {
-	ebegin "Reloading acpid configuration"
-	start-stop-daemon --exec $command --signal HUP
-	eend $?
-}
diff --git a/sys-power/acpid/files/systemd/acpid.service b/sys-power/acpid/files/systemd/acpid.service
deleted file mode 100644
index e4ddacdbead7..000000000000
--- a/sys-power/acpid/files/systemd/acpid.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=ACPI event daemon
-Requires=acpid.socket
-
-[Service]
-ExecStart=/usr/sbin/acpid -f
-
-[Install]
-WantedBy=multi-user.target
-Also=acpid.socket
diff --git a/sys-power/acpid/files/systemd/acpid.socket b/sys-power/acpid/files/systemd/acpid.socket
deleted file mode 100644
index 1b23f8735d48..000000000000
--- a/sys-power/acpid/files/systemd/acpid.socket
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=ACPID Listen Socket
-
-[Socket]
-ListenStream=/var/run/acpid.socket
-
-[Install]
-WantedBy=sockets.target
diff --git a/sys-power/acpilight/Manifest b/sys-power/acpilight/Manifest
index c23cadcb2ade..3622820a8e6b 100644
--- a/sys-power/acpilight/Manifest
+++ b/sys-power/acpilight/Manifest
@@ -2,6 +2,6 @@ AUX acpilight.confd 269 BLAKE2B 196245bd083f89d9d975a81aaaf66d0422655cd6a5f575c2
 AUX acpilight.initd 742 BLAKE2B bc2ad5027cd9e5c9f8d0d55e249117f7f59ad587522d21ea2baf69e45a884df242d46cb3001ef46ef63c1e1f87a18bc5c05d4facf1e9d72d4b596926e9a6b69b SHA512 9fe648ea994eeb9baa294226b55bd6230cb2b28952f651755da622278539fc071527e3aa2425e26687bb8065ef2e372ab93d7090532dbf3208ccac8519f01fca
 DIST acpilight-1.0.tar.gz 16452 BLAKE2B 6594612a25974d33d845b9b0dec4ad0a105ea7da0b24dd540385d5a3751058d9b23afe58600082095c041c86cb477f671fcf4bc7f760869f7290e9e62c8c3124 SHA512 f7913f7ebf6cbde95a42165d8bfa237be03d90fc097164b971c92721cc76f1260a6a607d85f3ecb05ec482019f0ed7f0827a473608daf39b0d05b37c1d228a8a
 DIST acpilight-v1.1.tar.gz 17583 BLAKE2B 9505d0b2e1eb6e311b3be7938c455dcca399b2a644856f57593be4da56b637445b796f16300540436645b4dc660f7330b63ff3eecf93ecb49b366d152d5c5faf SHA512 af10a538fec83315aaec3837647622ecea41cb936d38667e4e70689a2b8a968a786fc9ad2be136d5799fa091f07614886decc9044e71aec1e64765e90ddae439
-EBUILD acpilight-1.0.ebuild 1021 BLAKE2B bb7c25ceacc5fe33a0fe5315c316712a7f383b2e26bc40c639cd617bf24d71aa62c4a5c1229be62ff08245023bcb502edd2fbf1778784b5fbc1bf60ca84d3cf7 SHA512 0a19078799a0342a52edb6aa2d5f30babd37d6a290cc69f91f810c1949fd78bb8564a0a6bb7ea1d24eb919d976b449225f2d76639790126551a816089cedaec1
+EBUILD acpilight-1.0.ebuild 1008 BLAKE2B b092b02ea4a9976a11fd462480f2dab442cd1b5f4672d3da9d031ccc91525b86c746fb7b2d1cd70d835b6a4c22a3f31161bdfbebbfc50906079f260e1960e419 SHA512 ec38b355f26aaad4c00820b45047312fb0759a0f93d41a909c14f5d82e762fa822aebfc3ddaa06a918239d6dcde26731511987677ee0ff1f029a75c349deec67
 EBUILD acpilight-1.1.ebuild 1484 BLAKE2B 3c9f5ebbe3217e90529dc824a74871c6e5c38983a8658345417cf63d06635ba5e49d219a93351440c61d5217f593074d1a3004148863389f1dea569dee7819b6 SHA512 ef352987197e35bf8306348b18f5c7e067413aced2364e1433e69e0e6e9e2a9310f8950cd27ea3a292fac1b3816be3a8c507c9a1232c66007d6565afeee709c8
 MISC metadata.xml 337 BLAKE2B 7888981587ed09568a184afbfd7133b628495b425a39754634ffc71296c11087c4c2406e616a7bb8e5c4078e56dcb416785b6729159a20bed750110c8dc8c5d2 SHA512 4f183fd6e3292302ca589c466292f6222e6980a72a11ff7b82fefc293d3d37902b79439f1f044ec44a88dfa5675f769b2f39e44005e57bfa3e1ed132ff451cd4
diff --git a/sys-power/acpilight/acpilight-1.0.ebuild b/sys-power/acpilight/acpilight-1.0.ebuild
index 5cad2efcab7f..4e09faee8395 100644
--- a/sys-power/acpilight/acpilight-1.0.ebuild
+++ b/sys-power/acpilight/acpilight-1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+PYTHON_COMPAT=( python2_7 python3_5 )
 
 inherit python-r1 udev
 
diff --git a/sys-power/iasl/Manifest b/sys-power/iasl/Manifest
index ec5c66e37dc8..c20017bf04a3 100644
--- a/sys-power/iasl/Manifest
+++ b/sys-power/iasl/Manifest
@@ -1,15 +1,12 @@
 AUX iasl-20140214-nostrip.patch 253 BLAKE2B 744ae94cdf798b4d0b593de3e69d408c61b720aebfd385aa2e22929530a8ef84aba92b4484fd2c35cb5c51e15e75e4d8bafcf3c9339b63ca54746db1c30835ad SHA512 1379fa71c03d880b53ed1ed34ec925d5e94fe6f636f86cfdbb5a1e65a1c6a82fb99a42b991be154c018da9eaaa70c7443fa4b5ca38eb03fe5cec4f0de1dd6364
 AUX iasl-20140828-locale.patch 349 BLAKE2B b435e40f257103acfaa8f74c8dd5ed66850ce53e3c7577ce59e1773b738dfaff89c58dbdb4517a0213b9b8c1ab4cbdcdf78e2dbe3c0a4857cf4f91b437b23cb9 SHA512 311c20b7d5cdc7e3ce5e2a84e508eb898cd506efa720d1e4bb017ff0b34d786ffed30168b7dcf16b4bee988702d00258289e5e320e0a3bb3cf630a1a71145640
 DIST acpica-unix-20160729.tar.gz 1556095 BLAKE2B 2785d343d7aa0e3cce83d762bb70f8a7e76221da5d0e803eac3253b4a26dcaf852e114eadf811f387c7c040aeeb794de8cae37c47d8c29968f8cd0a0d76ed4b6 SHA512 37b0439b03e8d811c8b14d0c7c89471989227fb78b462f585c6290431afecc5b258073e568dde8dc982fa959ebce4b4d51589ea997f0066e66d4785ce185ccf2
-DIST acpica-unix-20161222.tar.gz 1580428 BLAKE2B dcf44d1a19b51e43ad1a74b2ba5b4bfadeb83eca584ff5a5062aff9cc4b0a65153b1590d993b7bca602e35da747683d230ea56c380afbec3308fb83fdb03908a SHA512 ff733d210b3b013970d3f3a0bea45f346ca5cf78dd61b583d30114a69c80e8272af304d14248aa34e775e19bca1c2ddbbed1b4ba5e8ba660b28621a8ca45ae31
-DIST acpica-unix-20171215.tar.gz 1769116 BLAKE2B f15c1202244ce5f489d80240e6c89f7fda38a3c74cf0773c4530e265876f931502571e3086aabae0082654a2085f3d6e5eeed324fd892c199a91a8837fdb19e2 SHA512 4cd3755fe28344de3259dad5209a58c9548216ecaf50a830165a0ee8993af57d4b63836904faafd5f97b1651051ee2f17a908395e0a048bab20b13395fe0d3ff
 DIST acpica-unix-20180810.tar.gz 1797634 BLAKE2B 66b1c53874a7fa898fb042d0aac6001e623bb056ef17de46fc5a8e3ee5667178c47b5d8ecec194ebd8d2b0bdf947b5c85a1874c5d11a9ba3307a85418856ebdb SHA512 f37d8e0f1393b87cbfd9c6607104b05f85386583e4e5a5bcdbd2f049c122592a53e7cd56fe7da75e93bf3a424921fbc9291e7a39e06de80e6403abe042f869cd
+DIST acpica-unix-20190215.tar.gz 1809671 BLAKE2B aff312636ff0f38e7708a251daad84689cb64abd0dd241d57063b5e229c50a3a8bd3e509c2fe9918da4ab9179b07d2207e01eb7c9f94670d0758eec73bb2714b SHA512 7a469097d82721ea55f86eeefa2a67fc6be6b3d2e0382bb830f64c7daf7d99e2bce60011fb68e54b3891939b1fed91da03de9d19c2d4020d3412656cce2c09b0
 DIST acpitests-unix-20160729.tar.gz 1829061 BLAKE2B 8dacb39c477ff8ba8b68a3f061b74e90a128a90eb287b9febd57d6871ff0878dfe2eaf616d9881af2b0bca6c8db57d48711ad9009c6ceb1ceba321bed182a51c SHA512 bf6073092a0dfb208f1d4b13ff3a3c5335be8e1326b1e58acd41def1a402ab0d843600f616019d1dde6593db8c53c6876bd9d489360fe98c6a7bee95d9215600
-DIST acpitests-unix-20161222.tar.gz 1759278 BLAKE2B cb1b3ea882135e9ee87c4337df4710ac2e613b89f2606306c3ce68af049735f999ae6a37b1f75c112f0fb5f8bc5af6897bf18715f657c8dcac82a37637da2a57 SHA512 ff0435f40564a94ceb3bc6cfc11ac859a5467b650004238092d7f3e2f7d596e7eb2fb9d3c56f0860c8324d38fcbedf3c6f4bc3f0569f1148462b824c7c025408
-DIST acpitests-unix-20171215.tar.gz 2034932 BLAKE2B c36aaf6a8a7aadf54651f95486af918926b664069ed961993c3ee8a062a646a7bd4e40adeebe82a101a5997080b90762fa016724ed4be31af56086eb3c3b3ab9 SHA512 b405e87f18b15bd01540d32c021a7b900139abd7e698b55786ccbaf8536c5068087a8ba1e7adbb69e0954cdc6b347e9a88428f1e8f889e0e9eb3a472c11235f9
 DIST acpitests-unix-20180810.tar.gz 2093850 BLAKE2B 519ce7807026dc11617ed9c34f294600ddae77a57a1fb76220da50da1bee56975373d583d51dfcdd81c8ccba3d5e735167b831bdb4669ab9cb2a1d9753d9261d SHA512 36c2527e8d670ccfb9a537b4944cfb8432c9638c1427e3c59f614c2ca43a66089228ecb74392301a07f266870e2d79bf0e2c671c6c7af06a4683bf97ac01ba54
+DIST acpitests-unix-20190215.tar.gz 2094957 BLAKE2B 3a31ae398650a1dc3ac70843c43868a35501cbe0376d1d2437a3568aad1fb63b3d83270653c009885b014894c69dcfff075bbf5d18290220067bcd1804a38097 SHA512 80060a61c80b01231b10e04dd65c2ab41d42824c439152cf128328890cee39ef597dc3f5bc535db4566cb322394bfce2760e1835df781d699818049cad5a4419
 EBUILD iasl-20160729.ebuild 3387 BLAKE2B 3caecded7550e0240e4a1ba5936f41475aad9221579bf2abb4e5a12088b3452aea512a718048015b820b5e4d4ac05bf4fab5b1ce0b81db34472e906364cda9a8 SHA512 5ec2719cf0f45344613cb0b5d5fee9e551ada4d44c8e65ef5bc7b241fa49bf910fe711abbf5e1f6a8d136f3aeb182430e8362e519091eac2acc520fc1c93c0ba
-EBUILD iasl-20161222.ebuild 3397 BLAKE2B 26d33dc795ac4c8c72b2bfcb4156ed42ae558f0599993de169a6a814a509e5c59fb7ff10cb95e5874f70e057b35588e639dd46bac6eb25a2097d426cced797e1 SHA512 a4c870fe8f286888c18642889d02873c90b966519902a29036fec7b1b772c0ca5e947317eae9a659d0fcfd50c457ae87bb32d04c8c35077efc573a7c58634430
-EBUILD iasl-20171215.ebuild 3397 BLAKE2B 26d33dc795ac4c8c72b2bfcb4156ed42ae558f0599993de169a6a814a509e5c59fb7ff10cb95e5874f70e057b35588e639dd46bac6eb25a2097d426cced797e1 SHA512 a4c870fe8f286888c18642889d02873c90b966519902a29036fec7b1b772c0ca5e947317eae9a659d0fcfd50c457ae87bb32d04c8c35077efc573a7c58634430
-EBUILD iasl-20180810.ebuild 3381 BLAKE2B ec55712dba0ce5e8d7b16a8bf23fe74e7f5fbcd155beae88464fddd8f7101651bf054c871640d817bd7b91dcfd8584f47dae4d2ba8b0f78ed2133716147ef732 SHA512 81fab08f17bf94e647f4f0758991ba17327910590dac721bb0d6f25926c346f6650e22b0946ad99523df16955e0b22fcbd0e0510e96ce90142ad6be8c2a63beb
+EBUILD iasl-20180810.ebuild 3425 BLAKE2B 06a9ffda4d43d20b799e63dff05b5279179bfda1229b1dd5205bce5640270d58b64c2466b4161355aaaa30bf5f3f1c5da21da256b43661e8054e6cdffc84a33d SHA512 53964342296d2cb733ce779c64f5e1a1f6f87e09ff5599c19661049f4ce4bf3e8161bed7f3eb603c60f066af73583c8cbdf88405330113d43b6afe7e253aa669
+EBUILD iasl-20190215.ebuild 3426 BLAKE2B d9f29d91fa78afd4326e09b395ca5317876e5d7cdd3e864844fdac3d0e7c6e54329cae1b81e71bfbcfd33c6e9d17495375f0c5b2aa2fa5739ed5a62ea5b07100 SHA512 6ed5c6a81b3dc42318fc627cd41fe98c4c9a48f551e142bac9da61099b9562714c725c14085911fb1561c15fd764e9c64ad4d05ede7251406e2e45a249585a0e
 MISC metadata.xml 330 BLAKE2B 4c0218788685cc36fddf5d759c091898a71c01bf22e9e7995d1f5da37cd0508c961895b4265bda462062676f3e722205f0a6b10f64db718110f7afe8f088d136 SHA512 4d7760ec82f64ce49478c359b32aa100ca9778471033741b7fd89905d075b3a067fda413c6dcc5115d7755d0ab6cd9d30a848ff674f1c83ef6205c51ec501a65
diff --git a/sys-power/iasl/iasl-20161222.ebuild b/sys-power/iasl/iasl-20161222.ebuild
deleted file mode 100644
index 7bc182a44cec..000000000000
--- a/sys-power/iasl/iasl-20161222.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic eutils
-
-MY_PN=acpica-unix
-MY_P=${MY_PN}-${PV}
-MY_TESTS_P=${MY_PN/ca/tests}-${PV}
-DESCRIPTION="Intel ACPI Source Language (ASL) compiler"
-HOMEPAGE="https://www.acpica.org/downloads/"
-SRC_URI="http://www.acpica.org/sites/acpica/files/${MY_P}.tar.gz
-	test? ( http://www.acpica.org/sites/acpica/files/${MY_TESTS_P}.tar.gz )"
-
-LICENSE="iASL"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="test"
-
-DEPEND="sys-devel/bison
-	sys-devel/flex"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use test && has test ${FEATURES}; then
-		ewarn 'You have selected USE="test". This will install the test results'
-		ewarn "into /usr/share/${PF}/, compressed as a tarball."
-		ewarn 'The tests themselves will only rarely die, but the test results'
-		ewarn 'are interesting for arch testing. The tests may take quite some'
-		ewarn 'time to complete.'
-	fi
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20140828-locale.patch"
-	"${FILESDIR}/${PN}-20140214-nostrip.patch"
-)
-
-src_prepare() {
-	default
-
-	find "${S}" -type f -name 'Makefile*' -print0 | \
-		xargs -0 -I '{}' \
-		sed -r -e 's:-\<Werror\>::g' -i '{}' \
-		|| die
-
-	# BITS is tied to ARCH - please set appropriately if you add new keywords
-	if [[ $ARCH == @(amd64|amd64-fbsd) ]] ; then
-		export BITS=64
-	else
-		export BITS=32
-	fi
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	cd generate/unix || die
-	emake BITS=${BITS}
-}
-
-src_test() {
-	aslts_test
-	#The aapits test currently fails, missing include probably.
-	#aapits_test
-}
-
-src_install() {
-	cd generate/unix || die
-	emake install DESTDIR="${D}" BITS=${BITS}
-	default_src_install
-	#local bin
-	#for bin in $(<"${T}"/binlist) ; do
-	#	dobin "${T}"/${bin}
-	#done
-	dodoc "${S}"/changes.txt
-	newdoc "${S}"/source/compiler/readme.txt compiler-readme.txt
-	newdoc "${S}"/generate/unix/readme.txt unix-readme.txt
-	newdoc "${S}"/generate/lint/readme.txt lint-readme.txt
-	newdoc "${S}"/source/compiler/new_table.txt compiler-new_table.txt
-
-	if use test && has test ${FEATURES}; then
-		tb="${T}"/testresults.tar.bz2
-		export ASLTSDIR="$(<"${T}"/asltdir)"
-		ebegin "Creating Test Tarball"
-		tar -cjf "${tb}" -C "${ASLTSDIR}"/tmp/RESULTS .  || die "tar failed"
-		eend $?
-		dodir /usr/share/${PF}
-		insinto /usr/share/${PF}
-		doins ${tb}
-	fi
-
-}
-
-aslts_test() {
-	export	ASL="${S}"/generate/unix/bin/iasl \
-		acpiexec="${S}"/generate/unix/bin/acpiexec \
-		ASLTSDIR="${WORKDIR}/${MY_TESTS_P}"/tests/aslts
-	export	PATH="${PATH}:${ASLTSDIR}/bin"
-	echo "$ASLTSDIR" >"${T}"/asltdir
-	cd "${ASLTSDIR}" || die
-	edos2unix $(find . -type 'f')
-	make install || die "make install aslts test failed"
-	chmod +x $(find bin/ ! -regex 'ERROR_OPCODES|HOW_TO_USE|README' ) || die "chmod bin +x failed"
-
-	#The below Do commands runs the tests twice and then dies if the results aren't
-	#Identical.
-	Do 1 || die "failed Do 1"
-	Do 2 || die "failed Do 2"
-}
-
-aapits_test() {
-	mv "${WORKDIR}/${MY_TESTS_P}/tests/aapits" "${S}/tools/" || die "mv failed"
-	cd "${S}/tools/aapits" || die "cannot find ${S}/tools/aapits"
-	edos2unix $(find . -type 'f')
-	chmod +x $(find bin/ | sed  -r -e '/\/[A-Z_]+$/d') || die "chmod bin +x failed"
-	make || die "make in aapits failed"
-	cd asl || die "cd asl failed"
-	make || die "make in asl failed"
-	cd ../bin || die
-	./aapitsrun || die "aapitsrun failed"
-}
diff --git a/sys-power/iasl/iasl-20180810.ebuild b/sys-power/iasl/iasl-20180810.ebuild
index b96e7473a7a7..dea2f0931dab 100644
--- a/sys-power/iasl/iasl-20180810.ebuild
+++ b/sys-power/iasl/iasl-20180810.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="http://www.acpica.org/sites/acpica/files/${MY_P}.tar.gz
 
 LICENSE="iASL"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~amd64 ~arm64 ppc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="test"
 
 DEPEND="sys-devel/bison
@@ -99,6 +99,7 @@ src_install() {
 
 aslts_test() {
 	export	ASL="${S}"/generate/unix/bin/iasl \
+		acpibin="${S}"/generate/unix/bin/acpibin \
 		acpiexec="${S}"/generate/unix/bin/acpiexec \
 		ASLTSDIR="${WORKDIR}/${MY_TESTS_P}"/tests/aslts
 	export	PATH="${PATH}:${ASLTSDIR}/bin"
diff --git a/sys-power/iasl/iasl-20171215.ebuild b/sys-power/iasl/iasl-20190215.ebuild
index 7bc182a44cec..edd9ba4e0f01 100644
--- a/sys-power/iasl/iasl-20171215.ebuild
+++ b/sys-power/iasl/iasl-20190215.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit toolchain-funcs flag-o-matic eutils
+inherit toolchain-funcs flag-o-matic
 
 MY_PN=acpica-unix
-MY_P=${MY_PN}-${PV}
-MY_TESTS_P=${MY_PN/ca/tests}-${PV}
+MY_P="${MY_PN}-${PV}"
+MY_TESTS_P="${MY_PN/ca/tests}-${PV}"
 DESCRIPTION="Intel ACPI Source Language (ASL) compiler"
 HOMEPAGE="https://www.acpica.org/downloads/"
 SRC_URI="http://www.acpica.org/sites/acpica/files/${MY_P}.tar.gz
@@ -22,7 +22,7 @@ DEPEND="sys-devel/bison
 	sys-devel/flex"
 RDEPEND=""
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
 	if use test && has test ${FEATURES}; then
@@ -73,7 +73,7 @@ src_test() {
 src_install() {
 	cd generate/unix || die
 	emake install DESTDIR="${D}" BITS=${BITS}
-	default_src_install
+	default
 	#local bin
 	#for bin in $(<"${T}"/binlist) ; do
 	#	dobin "${T}"/${bin}
@@ -99,6 +99,7 @@ src_install() {
 
 aslts_test() {
 	export	ASL="${S}"/generate/unix/bin/iasl \
+		acpibin="${S}"/generate/unix/bin/acpibin \
 		acpiexec="${S}"/generate/unix/bin/acpiexec \
 		ASLTSDIR="${WORKDIR}/${MY_TESTS_P}"/tests/aslts
 	export	PATH="${PATH}:${ASLTSDIR}/bin"
diff --git a/sys-power/phc-intel/Manifest b/sys-power/phc-intel/Manifest
deleted file mode 100644
index cbf0b49f314c..000000000000
--- a/sys-power/phc-intel/Manifest
+++ /dev/null
@@ -1,29 +0,0 @@
-AUX phc-intel-0.3.2-rev12-trailing-space-misc.patch 33960 BLAKE2B 6f6969dbc4889e2fb43966c052ccb1654e1d873962ebf2110507b0d19f1965f200b8a7321d3b197b564c10122976add44cc5319f852603c5e15e5813073b4e41 SHA512 13f0b0da6eafefacfd617edaf5ff3d05dc0b5de3884ddd05459fcbc6ebde7f3c3671f8ce0be426bcc304460447a900e3948e6acc838c515f43f033cf6ffc08d0
-AUX phc-intel-0.3.2-rev14-trailing-space-3.13.patch 1557 BLAKE2B 6626f09ced14fcb1cd86d5b5ad4d7a78f2fd865b46873e1e0a180ceaaa175e42a21be9f2ae7c9b0c417a8b91cbca5e26162c953e33933278430de82f93ec34c5 SHA512 92a37dca6d703015db43f730d728bc39eaa43378b41a1cef8e2a3adb332c949bec78889099c8af24c4da835fd426b766291dd5d84d8567192853f5839c401036
-AUX phc-intel-0.3.2-rev14-trailing-space-3.14.patch 1557 BLAKE2B 8edf438ce66ec5c72bebba61feb1fe2ea4310bbda6e155b3d1484b3d3be9d3eb171f6937255744b9e1b6c1421f21a65e227ca1db44bca8ffcd4a7f09e16b328d SHA512 444864f1c13d0039861e9baafb8d4e8a2c304fadd9af6f18c499f29d371557ddbb9f7194dc952029c818fce81022d0a0c31faec698c213ba4cc69739b62827e0
-AUX phc-intel-0.3.2-rev15-trailing-space-3.15.patch 1561 BLAKE2B 747341a84ea00b1f965c4e5a4384ab4798fc866b6c19e62358ad2a2d8dc264dce453df76fffd6d0db2e9f56f47f375d20831abd6f0c37f8867506d4228119ba4 SHA512 1d9c34a5ff3a7853de5d3fc893e21c7ecc4351b29eae4d5e81eccc596f1492556110bb25f68654b32e4af912cf6aa5ca64d988d838ee63f16d3729a8b3782746
-AUX phc-intel-0.3.2-rev15-trailing-space-3.5.patch 1456 BLAKE2B c8b2522a6329b3593aa76fe8f6d134b4468c519b4fc42682891d726d9b7d42a458768a05906aeca8d74581adad9fcd24b28096178f838c3183057825c76a7c75 SHA512 d8da3d7d53ec13cdd3b21e3ebb4aeec3502f2e75571eeaea39a59b4825b3be6043b275fb89bbdae4778e415c22cc80639af04674fd3975f498a6adc926b39ce8
-AUX phc-intel-0.3.2-rev16-trailing-space-3.16.patch 1557 BLAKE2B 1d8dbcfe453d5398b040047034db3239e4d90311a79b680079e21c631d1bc51e0a41c3ffa5ab97fd190743e70e0fb04b68ed5dd302106f5c2e3287839b909e02 SHA512 4c044603bc1617f9fa8a33d4270ec6f9c9a32422599513d9d60033d572e14280d383e223e57367db59d46b91e22de0ebcf24955b663b119dc7388fe2a3c708c0
-AUX phc-intel-0.3.2-rev21-trailing-space-3.10.patch 1531 BLAKE2B 02ac49de4f94d848581cee718af749f9ba7c0cef25291edcf8971ed3f926b749182ea105ffe6fff22136841a3ef7b898435dfeb0cf334a145f5009857a3252e4 SHA512 145a6a2eee51afd273e8e22112a16840f98daa8bd6a725e8b42cdb2ed28a9ddcff820fe81a198f261646c762908e5874d44d65e0878bfccfc60911e786f50d38
-AUX phc-intel-0.3.2-rev21-trailing-space-3.11.patch 1561 BLAKE2B 9cc0e13aaa85298397079ab5001176573b1c67f152e3919c10fc8680a50e3e2adbe9bd032e42dc694ae90fc456d5bc57104abd70c775bee79b9ae7cc94936572 SHA512 b02815bf365f3c49f367f934a79e0097536aeda1827639da5d159368214dadee7f97786a98e65448d6e971ec1f32bc359704ccb5e4cef60753c861758edd14e7
-AUX phc-intel-0.3.2-rev21-trailing-space-3.12.patch 1553 BLAKE2B 501b393861508fa5cc29ac0d299734d4132a290e28d9b15e3777f8892ac33aceffaa8552cf707d24a01f5156d8a72079f81feab4ab4f0197effa207ea57b09ab SHA512 1cd0241e5b6a0020e27467534d6430aca11ec86c88160c0fae1367cbc9f40998887fead04c7993487721172795e0aaad40da21a44a34e68d31dbaaa2f6930a47
-AUX phc-intel-0.3.2-rev21-trailing-space-3.13.patch 1553 BLAKE2B 31df55c96a22ef5984bd71f2eb380597fa942aa2b9261fa15391a841dc2067476bc2a4b3c43fdd46c9e8a1fb63fd1810748545236a3643197a8a4b275efd3a6c SHA512 d00b71b4f4a7447b65de1eefee944230543280411b53c15ba5d8531144fb1014f76c87dc6c8a52c63ac6cf0272bbde8c11a3f76508e9e52310431026960c392c
-AUX phc-intel-0.3.2-rev21-trailing-space-3.14.patch 1553 BLAKE2B 16ac29beb93560d36e23e509172f7a4661430ffeb0032ea56b928c5024da3c37108bf90452d11aa3a374fb85878f2bfa363b6daa7af38b415117f44cc82d877a SHA512 eaa575d4e674c1719430f190ccb2c3e3a6f245da93b8f55b9c4055c8dec0cbfd38bf300dc1df2a815e151b88feebb87824275822c173c5a7f938a5d4f998aa5b
-AUX phc-intel-0.3.2-rev21-trailing-space-3.15.patch 1553 BLAKE2B 988eb7638d015aeff1c163f374d47ab22925dcfa4d97005c2b2f4a3152cad8e81ed3f99136447c5222bd5be0f076e09d10c6fa9efadf6a0aaeb6b393578e7fe2 SHA512 636be9bc0382bd0e6019da100c169a81c57fe9b0cde80d3eee2e23fc591a2c943c84a68d398fae979769a52349071528185f2fdb7278c607de5d6bdffa210bd9
-AUX phc-intel-0.3.2-rev21-trailing-space-3.4.patch 1452 BLAKE2B 9bf4abce447bd78a642d9a20d8c1119525fc28740b1983e25a66cc05979f44f36910a0e767723ee46762be68dbf760f6d53ea877d3bc6137d0e04fa2b077db90 SHA512 5abc31866fb8600eb8e5a05009e9929921fffab92a37c56de5498fdba66480c627dbcca4e6d660efef167829befa66e352cd853738755cc92276f07f66503572
-AUX phc-intel-0.3.2-rev21-trailing-space-3.7.patch 1533 BLAKE2B d675d8c1311f707a69984b56a85bfe4ca6943fcfb36305b635185acc795b5b7b3cdc8a5f44f1432394dcb252ad570d5012d1fbbaed8e74aa8733fe9ec6b96796 SHA512 5d1a94a666de155a18f18b10017aedbf6ef9b11177835ec7e3c0debd3b833e843f1714c5c36545679140093a0a202cfedeee2539ab7e9d936e5410ac69a1c696
-AUX phc-intel-0.3.2-rev21-trailing-space-3.9.patch 1533 BLAKE2B e7061c7a71e373fa05af6ae9e4c9711fb85f09e52dae3a66b45cdc6c0c3e811098a6429b3eacae97ef0762897628e2d014937d4f6df230db7761ac9a8c583efb SHA512 99bf0b47d7b0f0484041bda605a38b4cff6faf6369e1627ce640ce8ac4fe29e7390ff5825f5c5fedc90803bb39cfaf75ce8a38942aee4c8e3ed6c3eddd4a72ae
-AUX phc-intel-0.3.2-rev21-trailing-space-4.1.patch 1551 BLAKE2B beac24454d87eded1191894e777c40377ed911ede00d4836d45849f5a3aaf85805ccddaa2ff44ffbfbd9f1ad1c8f6421fc4ff7068f21ae0ee4c3c3feded68574 SHA512 20282756a1c95fd61a26a7f6fb21f666479811a5d7667f1b9f4bcd1cd77e24d649e65363ccdd7fa15196bd70eb29ffc395b6bace0e4ac6d6803c9eea786296a1
-AUX phc-intel-0.3.2-rev21-trailing-space-4.3.patch 1536 BLAKE2B 328c7edc018295e6c6f624ae53628db9537fed6eceba1952f17abfaa54cd1f619f11a2d4ffb7bfe639451b28e7c419ffe658f90ce07a16dcefc2b4e51d12883b SHA512 18efe8c2bbc2a21c4d6ebab26ef0f2247500b00e43460b23b4fa0dbe7a23ae074a1cea99f979e2a3edfdf79a50367dff002b108243c56252720a04dfe08e91d5
-AUX phc-intel-0.3.2-rev21-trailing-space-4.5.patch 1536 BLAKE2B a25e6379f383d66e52f0e18903f59eb667e17249214be69d9731729911c7526e93e112b8b0dfe194655042284000cc7b3e817af7b8b7d8bad5acd020fcc1bb76 SHA512 2762691445574f0c676b558b34cb71ac377d31c2cb82ac63dab77a094dc70d86331dc5090eb33a0a6863754f484ce291bc82a5d0ad6ac6090181cf05b852b3e6
-AUX phc-intel-0.3.2-rev21-trailing-space-4.6.patch 1536 BLAKE2B 7d85dcc2f4c5a96a75da07ad33877c8bba49cd3a52affd1a6fec40d2ca13d8f7906339b62434c49f344f320c4f462d50b2fe98d76630a4b17e596ebc600cc401 SHA512 99eb956a8643339baaf9432800e6bbb0fe2f2652db1311f640de8b6c9bf0146f4864a674dba9d2ab66cb4ae8c2e2b04f8bf53f3ed6a9958d8556ea8bd5ff0884
-AUX phc-intel-0.3.2-rev24-trailing-space-4.10.patch 1559 BLAKE2B 52ab9772fd01cbb20dc65282b507d4405c599d018ebb588c2c9f29bb47c707fea1f2086d1b420848809eb4461cf7bd9fdab1f469c6db6f94cf67404c757d74ea SHA512 f37e006fc91c34614d8524b5b1abab1884cf85e93253113d044f38273018025b0edf7a73d9fd87c8b86496b6ccfa9da8e255d53cb570992aafa68be87fcc1f56
-AUX phc-intel-0.3.2-rev24-trailing-space-4.7.patch 1536 BLAKE2B 876aadaa6f1e0a6f981a9d4675c32453823f26b4f66bcc84c81ab8535ef00c3870d8db2d4ce1ae4f307a62e49284b57bed87ecd99a10cb75917d6e594f01cb6e SHA512 7d57342011c1eab1ee449a8da5695be78ceb4a6981281b28b1fa0e4c1486dd4ca6f2e21246a53cce4ca0aab6f69bb37b0fc0276e10dbf7ca86873eee57a863c6
-AUX phc-intel-0.3.2-rev24-trailing-space-4.9.patch 1536 BLAKE2B c1dc84425afdd5c2585556f9347472eb4d51e49441c706fa8fb75eda0331675fbcb4f7523c694b1aad8ebb66cd2463ca0605f43bf8ef8e3b2809f409d2eab6ac SHA512 3ce8fa59c909b44e80c75444c6db7aaeb9eced64c80a6b65981a1d06bf86c59508ca37c411af05bbd5286f2cb2f7abc7f0e1c68ffc4a3d8b7ecb0f683e1ffda6
-DIST phc-intel-pack-rev17.tar.bz2 100565 BLAKE2B e9209b8530cc7eebd045c874766ae63116b3b112e21100d88b9e676894f0e72a3f63150abd6b5e85e964b7380439e9843ea3273f622e14a2532bdaac5ce99201 SHA512 0db84ae3e366ff95577ee89b2e1cb22778fdba76783aa2606b6b5925e46c6e5daf80a7365eba6f3f806a017daa98d7b20828c644a3967f180c612e7c92a94871
-DIST phc-intel-pack-rev21.tar.bz2 111951 BLAKE2B 77c469b897500bd7c7196b6f6869dba71514bad15a0ff21a3c2cc9a7871a718bedf06a3f93a61dd70ba4269405f8b9a7043bba134c0db003f519dd52c7d6fb6c SHA512 4aaa7beffe107d31bd9006f658b9a280ef0ace3d81ac88ef281b958803ac9e551ed4a33d5f25c0ec28d3d80349cfd4f81bcfcf708767dae133b4389b6d2348a0
-DIST phc-intel-pack-rev24.tar.bz2 117565 BLAKE2B 450518537c6a67b05448aca2a0f495cde5d6db60d981f7d2ffb07e861f842aabe20946edf67551e3062121c3d310ad0a9b052c9743b180c53920d1731607b881 SHA512 88b4c2e837729f62c59c3050c696d90c033a08a50e5594830ffa3b1008cecb7330792693453621758a0b64b239f9d96966c14f171bdb138341d64ff8a923881c
-EBUILD phc-intel-0.3.2.12.17.ebuild 2187 BLAKE2B a5d1300f4deddd6bc39c2af77c54c5e7340e1ab88ab94d6dac4ccef94f95176ee8f6316c5e514f5c5ef698cc4ddac7ef6958fb697fa60b98227719942d99452c SHA512 6d756387a159a905cbd73d4705e2e64cb8ae7f6ca94f78b1f46e744668b7dc4fc7e2d49fd207ed7acfe1989c3f907478b537b3b34f574c847159055a9be525be
-EBUILD phc-intel-0.3.2.12.21.ebuild 1848 BLAKE2B cc2b1690a8cc34275a940e5e70b8a9034124a9431b56e5fa29fd77a87ecec646c7359b941df37a77919bcd6e658de5eb37731e2fe0ed992e6107cf6f2b6229d7 SHA512 60af2a13ee4f98c12031a19052665c5991f0c4d107255c453c9031e11b7a2777a92d414667ec71b2f0cd8d6406b1c0708cc85d4bc35bb7e1d766900f750482ea
-EBUILD phc-intel-0.3.2.12.24.ebuild 1933 BLAKE2B 4e1f039fe24b038bf31e53b5c3e76bff364c5e2fa52565e96eb0cf61b2257289ff0ba9285c5e4096ccade5aaa8cde6e498ec9107b366c6c7fad60121f7e17259 SHA512 f014ffbd5d372b2f7d2a33c883dc6ddcbb31bb04411e69b33b52a8dd73c8792378130111393102afdfa954339dfacae8dd45b7198a5b118c44bd3faa7d00e81e
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev12-trailing-space-misc.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev12-trailing-space-misc.patch
deleted file mode 100644
index d20fb73a4fd6..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev12-trailing-space-misc.patch
+++ /dev/null
@@ -1,1179 +0,0 @@
-Remove trailing white spaces from /proc output.
-
-Signed-off-by: Michael Weber <xmw@gentoo.org>
---- phc-intel-pack-rev11/inc/2.6.27/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.27/linux-phc-0.3.2.patch
-@@ -73,7 +73,7 @@
-  
-  	return 0;
-  }
--@@ -757,12 +769,477 @@
-+@@ -757,12 +769,482 @@
-  	data->resume = 1;
-  
-  	return 0;
-@@ -156,6 +156,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -185,6 +186,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -211,6 +213,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -239,6 +242,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -270,6 +274,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
---- phc-intel-pack-rev11/inc/2.6.27.57/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.27.57/linux-phc-0.3.2.patch
-@@ -74,7 +74,7 @@
-  
-  	return 0;
-  }
--@@ -758,12 +770,477 @@
-+@@ -758,12 +770,482 @@
-  	data->resume = 1;
-  
-  	return 0;
-@@ -157,6 +157,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -186,6 +187,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -212,6 +214,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -240,6 +243,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -271,6 +275,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
---- phc-intel-pack-rev11/inc/2.6.28/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.28/linux-phc-0.3.2.patch
-@@ -73,7 +73,7 @@
-  
-  	return 0;
-  }
--@@ -758,12 +770,477 @@
-+@@ -758,12 +770,482 @@
-  	data->resume = 1;
-  
-  	return 0;
-@@ -156,6 +156,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -185,6 +186,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -211,6 +213,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -239,6 +242,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -270,6 +274,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
---- phc-intel-pack-rev11/inc/2.6.29/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.29/linux-phc-0.3.2.patch
-@@ -73,7 +73,7 @@
-  
-  	return 0;
-  }
--@@ -778,12 +790,477 @@
-+@@ -778,12 +790,482 @@
-  	data->resume = 1;
-  
-  	return 0;
-@@ -156,6 +156,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -185,6 +186,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -211,6 +213,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -239,6 +242,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -270,6 +274,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
---- phc-intel-pack-rev11/inc/2.6.29.2/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.29.2/linux-phc-0.3.2.patch
-@@ -73,7 +73,7 @@
-  
-  	return 0;
-  }
--@@ -790,12 +802,477 @@
-+@@ -790,12 +802,482 @@
-  	data->resume = 1;
-  
-  	return 0;
-@@ -156,6 +156,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -185,6 +186,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -211,6 +213,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -239,6 +242,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -270,6 +274,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
---- phc-intel-pack-rev11/inc/2.6.30/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.30/linux-phc-0.3.2.patch
-@@ -72,7 +72,7 @@
-  
-  	return 0;
-  }
--@@ -797,12 +809,474 @@
-+@@ -797,12 +809,479 @@
-  	data->resume = 1;
-  
-  	return 0;
-@@ -152,6 +152,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -181,6 +182,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -207,6 +209,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -235,6 +238,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -266,6 +270,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
---- phc-intel-pack-rev11/inc/2.6.31/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.31/linux-phc-0.3.2.patch
-@@ -73,7 +73,7 @@
-  
-  	return 0;
-  }
--@@ -793,12 +805,474 @@
-+@@ -793,12 +805,479 @@
-  	data->resume = 1;
-  
-  	return 0;
-@@ -153,6 +153,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -182,6 +183,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -208,6 +210,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -236,6 +239,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -267,6 +271,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
---- phc-intel-pack-rev11/inc/2.6.32/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.32/linux-phc-0.3.2.patch
-@@ -72,7 +72,7 @@
-  
-  	return 0;
-  }
--@@ -756,12 +768,474 @@
-+@@ -756,12 +768,479 @@
-  	data->resume = 1;
-  
-  	return 0;
-@@ -153,6 +153,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -182,6 +183,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -208,6 +210,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -236,6 +239,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -267,6 +271,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
---- phc-intel-pack-rev11/inc/2.6.32.27/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.32.27/linux-phc-0.3.2.patch
-@@ -73,7 +73,7 @@
-  
-  	return 0;
-  }
--@@ -757,12 +769,474 @@
-+@@ -757,12 +769,479 @@
-  	data->resume = 1;
-  
-  	return 0;
-@@ -154,6 +154,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -183,6 +184,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -209,6 +211,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -237,6 +240,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -268,6 +272,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
---- phc-intel-pack-rev11/inc/2.6.33/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.33/linux-phc-0.3.2.patch
-@@ -72,7 +72,7 @@
-  
-  	return 0;
-  }
--@@ -758,12 +770,474 @@
-+@@ -758,12 +770,479 @@
-  	data->resume = 1;
-  
-  	return 0;
-@@ -153,6 +153,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -182,6 +183,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -208,6 +210,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -236,6 +239,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -267,6 +271,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
---- phc-intel-pack-rev11/inc/2.6.33.8/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.33.8/linux-phc-0.3.2.patch
-@@ -73,7 +73,7 @@
-  
-  	return 0;
-  }
--@@ -759,12 +771,474 @@
-+@@ -759,12 +771,479 @@
-  	data->resume = 1;
-  
-  	return 0;
-@@ -154,6 +154,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -183,6 +184,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -209,6 +211,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -237,6 +240,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -268,6 +272,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
---- phc-intel-pack-rev11/inc/2.6.34/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.34/linux-phc-0.3.2.patch
-@@ -72,7 +72,7 @@
-  
-  	return 0;
-  }
--@@ -759,12 +771,474 @@
-+@@ -759,12 +771,479 @@
-  	data->resume = 1;
-  
-  	return 0;
-@@ -153,6 +153,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -182,6 +183,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -208,6 +210,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -236,6 +239,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -267,6 +271,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
---- phc-intel-pack-rev11/inc/2.6.34.9/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.34.9/linux-phc-0.3.2.patch
-@@ -73,7 +73,7 @@
-  
-  	return 0;
-  }
--@@ -760,12 +772,474 @@
-+@@ -760,12 +772,479 @@
-  	data->resume = 1;
-  
-  	return 0;
-@@ -154,6 +154,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -183,6 +184,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -209,6 +211,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -237,6 +240,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -268,6 +272,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
---- phc-intel-pack-rev11/inc/2.6.35/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.35/linux-phc-0.3.2.patch
-@@ -72,7 +72,7 @@
-  
-  	return 0;
-  }
--@@ -719,12 +731,474 @@
-+@@ -719,12 +731,479 @@
-  	data->resume = 1;
-  
-  	return 0;
-@@ -153,6 +153,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -182,6 +183,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -208,6 +210,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -236,6 +239,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -267,6 +271,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
---- phc-intel-pack-rev11/inc/2.6.35.10/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.35.10/linux-phc-0.3.2.patch
-@@ -73,7 +73,7 @@
-  
-  	return 0;
-  }
--@@ -720,12 +732,474 @@
-+@@ -720,12 +732,479 @@
-  	data->resume = 1;
-  
-  	return 0;
-@@ -154,6 +154,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -183,6 +184,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -209,6 +211,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -237,6 +240,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -268,6 +272,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
---- phc-intel-pack-rev11/inc/2.6.36/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.36/linux-phc-0.3.2.patch
-@@ -72,7 +72,7 @@
-  
-  	return 0;
-  }
--@@ -716,12 +728,474 @@
-+@@ -716,12 +728,479 @@
-  	data->resume = 1;
-  
-  	return 0;
-@@ -153,6 +153,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -182,6 +183,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -208,6 +210,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -236,6 +239,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -267,6 +271,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
---- phc-intel-pack-rev11/inc/2.6.36.2/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.36.2/linux-phc-0.3.2.patch
-@@ -73,7 +73,7 @@
-  
-  	return 0;
-  }
--@@ -717,12 +729,474 @@
-+@@ -717,12 +729,479 @@
-  	data->resume = 1;
-  
-  	return 0;
-@@ -154,6 +154,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -183,6 +184,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -209,6 +211,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -237,6 +240,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -268,6 +272,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
---- phc-intel-pack-rev11/inc/2.6.37/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/2.6.37/linux-phc-0.3.2.patch
-@@ -71,7 +71,7 @@
-  	}
-  
-  	return 0;
--@@ -717,12 +729,474 @@
-+@@ -717,12 +729,479 @@
-  	data->resume = 1;
-  
-  	return 0;
-@@ -152,6 +152,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -181,6 +182,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -207,6 +209,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -235,6 +238,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -266,6 +270,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
---- phc-intel-pack-rev11/inc/3.10/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/3.10/linux-phc-0.3.2.patch
-@@ -120,7 +120,7 @@
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
-  		msrs = msrs_alloc();
-  
--@@ -963,10 +965,484 @@
-+@@ -963,10 +965,489 @@
-  		msrs_free(msrs);
-  		msrs = NULL;
-  	}
-@@ -198,6 +198,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -227,6 +228,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -253,6 +255,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -281,6 +284,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -312,6 +316,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
---- phc-intel-pack-rev11/inc/3.11/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/3.11/linux-phc-0.3.2.patch
-@@ -122,7 +122,7 @@
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
-  		msrs = msrs_alloc();
-  
--@@ -986,10 +987,485 @@
-+@@ -986,10 +987,490 @@
-  		msrs_free(msrs);
-  		msrs = NULL;
-  	}
-@@ -200,6 +200,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -229,6 +230,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -255,6 +257,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -283,6 +286,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -314,6 +318,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
---- phc-intel-pack-rev11/inc/3.7.5/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/3.7.5/linux-phc-0.3.2.patch
-@@ -120,7 +120,7 @@
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
-  		msrs = msrs_alloc();
-  
--@@ -966,10 +968,484 @@
-+@@ -966,10 +968,489 @@
-  		msrs_free(msrs);
-  		msrs = NULL;
-  	}
-@@ -198,6 +198,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -227,6 +228,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -253,6 +255,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -281,6 +284,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -312,6 +316,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
---- phc-intel-pack-rev11/inc/3.9/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev11/inc/3.9/linux-phc-0.3.2.patch
-@@ -120,7 +120,7 @@
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
-  		msrs = msrs_alloc();
-  
--@@ -970,10 +972,484 @@
-+@@ -970,10 +972,489 @@
-  		msrs_free(msrs);
-  		msrs = NULL;
-  	}
-@@ -198,6 +198,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -227,6 +228,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -253,6 +255,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -281,6 +284,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -312,6 +316,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-Remove trailing white spaces from /proc output.
-
-Signed-off-by: Michael Weber <xmw@gentoo.org>
---- phc-intel-pack-rev12/inc/3.12/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev12/inc/3.12/linux-phc-0.3.2.patch
-@@ -97,7 +97,7 @@
-  static void __init acpi_cpufreq_boost_init(void)
-  {
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
--@@ -982,6 +983,480 @@
-+@@ -982,6 +983,485 @@
-  	}
-  }
-  
-@@ -173,6 +173,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -202,6 +203,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -228,6 +230,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -256,6 +259,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -287,6 +291,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev14-trailing-space-3.13.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev14-trailing-space-3.13.patch
deleted file mode 100644
index 4e1e4dfc8543..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev14-trailing-space-3.13.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev14/inc/3.13/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev14/inc/3.13/linux-phc-0.3.2.patch
-@@ -197,7 +197,7 @@
-  static void __init acpi_cpufreq_boost_init(void)
-  {
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
--@@ -956,6 +1050,480 @@
-+@@ -956,6 +1050,485 @@
-  	}
-  }
-  
-@@ -273,6 +273,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -302,6 +303,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -328,6 +330,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -356,6 +359,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -387,6 +391,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev14-trailing-space-3.14.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev14-trailing-space-3.14.patch
deleted file mode 100644
index 19c1b546fb7d..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev14-trailing-space-3.14.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev14/inc/3.14/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev14/inc/3.14/linux-phc-0.3.2.patch
-@@ -198,7 +198,7 @@
-  static void __init acpi_cpufreq_boost_init(void)
-  {
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
--@@ -929,6 +1022,481 @@
-+@@ -929,6 +1022,486 @@
-  	}
-  }
-  
-@@ -274,6 +274,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -303,6 +304,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -329,6 +331,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -357,6 +360,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -388,6 +392,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev15-trailing-space-3.15.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev15-trailing-space-3.15.patch
deleted file mode 100644
index e1db916f7192..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev15-trailing-space-3.15.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev15.1/inc/3.15/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev15.1/inc/3.15/linux-phc-0.3.2.patch
-@@ -198,7 +198,7 @@
-  static void __init acpi_cpufreq_boost_init(void)
-  {
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
--@@ -929,6 +1022,481 @@
-+@@ -929,6 +1022,486 @@
-  	}
-  }
-  
-@@ -274,6 +274,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -303,6 +304,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -329,6 +331,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -357,6 +360,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -388,6 +392,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev15-trailing-space-3.5.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev15-trailing-space-3.5.patch
deleted file mode 100644
index 01bf10bba48b..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev15-trailing-space-3.5.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev15.1/inc/3.5/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev15.1/inc/3.5/linux-phc-0.3.2.patch
-@@ -55,7 +55,7 @@
-  		kfree(data->freq_table);
-  		kfree(data);
-  	}
--@@ -716,8 +728,470 @@
-+@@ -716,8 +728,475 @@
-  	return 0;
-  }
-  
-@@ -134,6 +134,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -163,6 +164,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -189,6 +191,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -217,6 +220,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -248,6 +252,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev16-trailing-space-3.16.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev16-trailing-space-3.16.patch
deleted file mode 100644
index 1934d9cde11a..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev16-trailing-space-3.16.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev16/inc/3.16/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev16/inc/3.16/linux-phc-0.3.2.patch
-@@ -195,7 +195,7 @@
-  static void __init acpi_cpufreq_boost_init(void)
-  {
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
--@@ -928,6 +1019,481 @@
-+@@ -928,6 +1019,486 @@
-  	}
-  }
-  
-@@ -271,6 +271,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -300,6 +301,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -326,6 +328,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -354,6 +357,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -385,6 +389,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.10.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.10.patch
deleted file mode 100644
index 16fffd1833da..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.10.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev21/inc/3.10/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev21/inc/3.10/linux-phc-0.3.2.patch
-@@ -120,7 +120,7 @@
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
-  		msrs = msrs_alloc();
-  
--@@ -963,10 +965,484 @@
-+@@ -963,10 +965,489 @@
-  		msrs_free(msrs);
-  		msrs = NULL;
-  	}
-@@ -198,6 +198,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -227,6 +228,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -253,6 +255,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -281,6 +284,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -312,6 +316,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.11.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.11.patch
deleted file mode 100644
index 13d9df5eba2b..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.11.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev21/inc/3.11/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev21/inc/3.11/linux-phc-0.3.2.patch
-@@ -122,7 +122,7 @@
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
-  		msrs = msrs_alloc();
-  
--@@ -986,10 +987,485 @@
-+@@ -986,10 +987,489 @@
-  		msrs_free(msrs);
-  		msrs = NULL;
-  	}
-@@ -200,6 +200,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -229,6 +230,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -255,6 +257,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -283,6 +286,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -314,6 +318,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.12.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.12.patch
deleted file mode 100644
index 4031d34523a2..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.12.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev21/inc/3.12/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev21/inc/3.12/linux-phc-0.3.2.patch
-@@ -97,7 +97,7 @@
-  static void __init acpi_cpufreq_boost_init(void)
-  {
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
--@@ -982,6 +983,480 @@
-+@@ -982,6 +983,485 @@
-  	}
-  }
-  
-@@ -173,6 +173,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -202,6 +203,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -228,6 +230,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -256,6 +259,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -287,6 +291,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.13.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.13.patch
deleted file mode 100644
index 78db83fb478d..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.13.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev21/inc/3.13/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev21/inc/3.13/linux-phc-0.3.2.patch
-@@ -97,7 +97,7 @@
-  static void __init acpi_cpufreq_boost_init(void)
-  {
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
--@@ -956,6 +957,480 @@
-+@@ -956,6 +957,485 @@
-  	}
-  }
-  
-@@ -173,6 +173,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -202,6 +203,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -228,6 +230,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -256,6 +259,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -287,6 +291,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.14.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.14.patch
deleted file mode 100644
index 3c8e75a6a534..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.14.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev21/inc/3.14/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev21/inc/3.14/linux-phc-0.3.2.patch
-@@ -98,7 +98,7 @@
-  static void __init acpi_cpufreq_boost_init(void)
-  {
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
--@@ -929,6 +929,481 @@
-+@@ -929,6 +929,486 @@
-  	}
-  }
-  
-@@ -174,6 +174,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -203,6 +204,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -229,6 +231,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -257,6 +260,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -288,6 +292,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.15.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.15.patch
deleted file mode 100644
index d15916a1fbea..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.15.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev21/inc/3.15/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev21/inc/3.15/linux-phc-0.3.2.patch
-@@ -98,7 +98,7 @@
-  static void __init acpi_cpufreq_boost_init(void)
-  {
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
--@@ -929,6 +929,481 @@
-+@@ -929,6 +929,486 @@
-  	}
-  }
-  
-@@ -174,6 +174,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -203,6 +204,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -229,6 +231,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -257,6 +260,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -288,6 +292,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.4.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.4.patch
deleted file mode 100644
index 345fa6c73ab8..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.4.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev21/inc/3.4/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev21/inc/3.4/linux-phc-0.3.2.patch
-@@ -55,7 +55,7 @@
-  		kfree(data->freq_table);
-  		kfree(data);
-  	}
--@@ -716,8 +728,470 @@
-+@@ -716,8 +728,475 @@
-  	return 0;
-  }
-  
-@@ -134,6 +134,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -163,6 +164,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -189,6 +191,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -217,6 +220,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -248,6 +252,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.7.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.7.patch
deleted file mode 100644
index 003941fd729d..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.7.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev21/inc/3.7.5/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev21/inc/3.7.5/linux-phc-0.3.2.patch
-@@ -120,7 +120,7 @@
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
-  		msrs = msrs_alloc();
-  
--@@ -966,10 +968,484 @@
-+@@ -966,10 +968,489 @@
-  		msrs_free(msrs);
-  		msrs = NULL;
-  	}
-@@ -198,6 +198,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -227,6 +228,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -253,6 +255,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -281,6 +284,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -312,6 +316,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.9.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.9.patch
deleted file mode 100644
index 2532e37b40bc..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-3.9.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev21/inc/3.9.6/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev21/inc/3.9.6/linux-phc-0.3.2.patch
-@@ -120,7 +120,7 @@
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
-  		msrs = msrs_alloc();
-  
--@@ -970,10 +972,484 @@
-+@@ -970,10 +972,489 @@
-  		msrs_free(msrs);
-  		msrs = NULL;
-  	}
-@@ -198,6 +198,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -227,6 +228,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -253,6 +255,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -281,6 +284,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -312,6 +316,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-4.1.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-4.1.patch
deleted file mode 100644
index ddc65b4d34f1..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-4.1.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev21/inc/4.1/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev21/inc/4.1/linux-phc-0.3.2.patch
-@@ -95,7 +95,7 @@
-  static void __init acpi_cpufreq_boost_init(void)
-  {
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
--@@ -928,6 +925,481 @@
-+@@ -928,6 +925,486 @@
-  	}
-  }
-  
-@@ -171,6 +171,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -200,6 +201,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -226,6 +228,7 @@
- +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -254,6 +257,7 @@
- +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -285,6 +289,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-4.3.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-4.3.patch
deleted file mode 100644
index 103ad0b38b19..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-4.3.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev21/inc/4.3/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev21/inc/4.3/linux-phc-0.3.2.patch
-@@ -97,7 +97,7 @@
-  static void __init acpi_cpufreq_boost_init(void)
-  {
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
--@@ -941,6 +937,492 @@
-+@@ -941,6 +937,497 @@
-  	}
-  }
-  
-@@ -169,6 +169,7 @@
- +		vid = extract_vid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -197,6 +198,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -222,6 +224,7 @@
- +		fid = extract_fid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -252,6 +255,7 @@
- +		vid = extract_vid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -285,6 +289,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-4.5.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-4.5.patch
deleted file mode 100644
index 928edc616f7b..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-4.5.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev21/inc/4.5/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev21/inc/4.5/linux-phc-0.3.2.patch
-@@ -96,7 +96,7 @@
-  static void __init acpi_cpufreq_boost_init(void)
-  {
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
--@@ -935,6 +932,491 @@
-+@@ -935,6 +932,496 @@
-  	}
-  }
-  
-@@ -168,6 +168,7 @@
- +		vid = extract_vid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -196,6 +197,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -221,6 +223,7 @@
- +		fid = extract_fid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -251,6 +254,7 @@
- +		vid = extract_vid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -284,6 +288,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-4.6.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-4.6.patch
deleted file mode 100644
index efb4baf088e7..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev21-trailing-space-4.6.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev21/inc/4.6/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev21/inc/4.6/linux-phc-0.3.2.patch
-@@ -97,7 +97,7 @@
-  static void __init acpi_cpufreq_boost_init(void)
-  {
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
--@@ -917,6 +914,491 @@
-+@@ -917,6 +914,496 @@
-  	}
-  }
-  
-@@ -169,6 +169,7 @@
- +		vid = extract_vid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -197,6 +198,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -222,6 +224,7 @@
- +		fid = extract_fid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -252,6 +255,7 @@
- +		vid = extract_vid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -285,6 +289,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev24-trailing-space-4.10.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev24-trailing-space-4.10.patch
deleted file mode 100644
index e5820b315033..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev24-trailing-space-4.10.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev24/inc/4.10/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev24/inc/4.10/linux-phc-0.3.2.patch
-@@ -98,7 +98,7 @@
-  static enum cpuhp_state acpi_cpufreq_online;
-  
-  static void __init acpi_cpufreq_boost_init(void)
--@@ -934,6 +930,494 @@
-+@@ -934,6 +930,499 @@
-  		cpuhp_remove_state_nocalls(acpi_cpufreq_online);
-  }
-  
-@@ -172,6 +172,7 @@
- +		vid = extract_vid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -200,6 +201,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -225,6 +227,7 @@
- +		fid = extract_fid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -255,6 +258,7 @@
- +		vid = extract_vid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -288,6 +292,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev24-trailing-space-4.7.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev24-trailing-space-4.7.patch
deleted file mode 100644
index 256910ba42e4..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev24-trailing-space-4.7.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev24/inc/4.7/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev24/inc/4.7/linux-phc-0.3.2.patch
-@@ -98,7 +98,7 @@
-  static void __init acpi_cpufreq_boost_init(void)
-  {
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
--@@ -958,6 +954,494 @@
-+@@ -958,6 +954,499 @@
-  	}
-  }
-  
-@@ -172,6 +172,7 @@
- +		vid = extract_vid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -200,6 +201,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -225,6 +227,7 @@
- +		fid = extract_fid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -255,6 +258,7 @@
- +		vid = extract_vid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -288,6 +292,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2-rev24-trailing-space-4.9.patch b/sys-power/phc-intel/files/phc-intel-0.3.2-rev24-trailing-space-4.9.patch
deleted file mode 100644
index 08e5b7ecb848..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2-rev24-trailing-space-4.9.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- phc-intel-pack-rev24/inc/4.9/linux-phc-0.3.2.patch
-+++ phc-intel-pack-rev24/inc/4.9/linux-phc-0.3.2.patch
-@@ -98,7 +98,7 @@
-  static void __init acpi_cpufreq_boost_init(void)
-  {
-  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
--@@ -955,6 +951,494 @@
-+@@ -955,6 +951,499 @@
-  	}
-  }
-  
-@@ -172,6 +172,7 @@
- +		vid = extract_vid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -200,6 +201,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u ", vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -225,6 +227,7 @@
- +		fid = extract_fid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u ", fid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -255,6 +258,7 @@
- +		vid = extract_vid_from_control(perf->states[freq_table[i].driver_data].control);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
-@@ -288,6 +292,7 @@
- +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- +	}
-++	if (count) count--;
- +	count += sprintf(&buf[count], "\n");
- +
- +	return count;
diff --git a/sys-power/phc-intel/metadata.xml b/sys-power/phc-intel/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/sys-power/phc-intel/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/sys-power/phc-intel/phc-intel-0.3.2.12.17.ebuild b/sys-power/phc-intel/phc-intel-0.3.2.12.17.ebuild
deleted file mode 100644
index 32dd3dbe46a7..000000000000
--- a/sys-power/phc-intel/phc-intel-0.3.2.12.17.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-info linux-mod eutils
-
-DESCRIPTION="Processor Hardware Control for Intel CPUs"
-HOMEPAGE="http://www.linux-phc.org/
-	http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267"
-#no automatic filenames here, sorry
-SRC_URI="http://www.linux-phc.org/forum/download/file.php?id=166 -> phc-intel-pack-rev17.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CONFIG_CHECK="~!X86_ACPI_CPUFREQ"
-ERROR_X86_ACPI_CPUFREQ="CONFIG_X86_ACPI_CPUFREQ has to be configured to Module to enable the replacement of acpi-cpufreq with phc-intel."
-
-MODULE_NAMES="phc-intel(misc:)"
-BUILD_PARAMS="KERNELSRC=\"${KERNEL_DIR}\" -j1"
-BUILD_TARGETS="all"
-
-S=${WORKDIR}/${A/.tar.bz2}
-
-pkg_setup() {
-	if kernel_is lt 2 6 27 ; then
-		eerror "Your kernel version is no longer supported by this version of ${PN}."
-		eerror "Please use a previous version of ${PN} or a newer kernel."
-		die
-	fi
-	if kernel_is gt 4 0 ; then
-		eerror "Your kernel version is not yet tested with this version of ${PN}."
-		eerror "It might not build or expose runtime problems."
-	fi
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/phc-intel-0.3.2-rev12-trailing-space-misc.patch \
-		"${FILESDIR}"/phc-intel-0.3.2-rev15-trailing-space-3.5.patch \
-		"${FILESDIR}"/phc-intel-0.3.2-rev14-trailing-space-3.13.patch \
-		"${FILESDIR}"/phc-intel-0.3.2-rev14-trailing-space-3.14.patch \
-		"${FILESDIR}"/phc-intel-0.3.2-rev15-trailing-space-3.15.patch \
-		"${FILESDIR}"/phc-intel-0.3.2-rev16-trailing-space-3.16.patch
-
-	sed -e '/^all:/s:prepare::' \
-		-i Makefile || die
-
-	local my_sub=arch/x86/kernel/cpu
-	if kernel_is gt 2 6 39 ; then
-		my_sub=drivers
-	fi
-	cp -v "${KERNEL_DIR}"/${my_sub}/cpufreq/acpi-cpufreq.c . || die
-	if kernel_is lt 3 12 ; then
-		cp -v "${KERNEL_DIR}"/${my_sub}/cpufreq/mperf.h . || die
-	fi
-
-	if kernel_is lt 3 0 ; then
-		epatch inc/${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}/linux-phc-0.3.2.patch
-	elif kernel_is lt 3 17 ; then
-		epatch inc/${KV_MAJOR}.${KV_MINOR}/linux-phc-0.3.2.patch
-	else
-		epatch inc/3.16/linux-phc-0.3.2.patch
-	fi
-
-	mv acpi-cpufreq.c phc-intel.c || die
-}
diff --git a/sys-power/phc-intel/phc-intel-0.3.2.12.21.ebuild b/sys-power/phc-intel/phc-intel-0.3.2.12.21.ebuild
deleted file mode 100644
index 8c856060bc7b..000000000000
--- a/sys-power/phc-intel/phc-intel-0.3.2.12.21.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-info linux-mod eutils
-
-DESCRIPTION="Processor Hardware Control for Intel CPUs"
-HOMEPAGE="http://www.linux-phc.org/
-	http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267"
-#no automatic filenames here, sorry
-SRC_URI="http://www.linux-phc.org/forum/download/file.php?id=170 -> phc-intel-pack-rev21.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CONFIG_CHECK="~!X86_ACPI_CPUFREQ"
-ERROR_X86_ACPI_CPUFREQ="CONFIG_X86_ACPI_CPUFREQ has to be configured to Module to enable the replacement of acpi-cpufreq with phc-intel."
-
-MODULE_NAMES="phc-intel(misc:)"
-BUILD_PARAMS="KERNELSRC=\"${KERNEL_DIR}\" -j1"
-BUILD_TARGETS="all"
-
-S=${WORKDIR}/${A/.tar.bz2}
-
-pkg_setup() {
-	if kernel_is lt 3 1 ; then
-		eerror "Your kernel version is no longer supported by this version of ${PN}."
-		eerror "Please use a previous version of ${PN} or a newer kernel."
-		die
-	fi
-	if kernel_is gt 4 6 ; then
-		eerror "Your kernel version is not yet tested with this version of ${PN}."
-		eerror "It might not build or expose runtime problems."
-	fi
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/phc-intel-0.3.2-rev21-trailing-space-3.{4,7,9,10,11,12,13,14,15}.patch \
-		"${FILESDIR}"/phc-intel-0.3.2-rev21-trailing-space-4.{1,3,5,6}.patch
-
-	sed -e '/^all:/s:prepare::' \
-		-i Makefile || die
-
-	local my_sub=arch/x86/kernel/cpu
-	if kernel_is gt 2 6 39 ; then
-		my_sub=drivers
-	fi
-	cp -v "${KERNEL_DIR}"/${my_sub}/cpufreq/acpi-cpufreq.c . || die
-	if kernel_is lt 3 12 ; then
-		cp -v "${KERNEL_DIR}"/${my_sub}/cpufreq/mperf.h . || die
-	fi
-
-	if kernel_is lt 4 7 ; then
-		epatch inc/${KV_MAJOR}.${KV_MINOR}/linux-phc-0.3.2.patch
-	else
-		epatch inc/4.6/linux-phc-0.3.2.patch
-	fi
-
-	mv acpi-cpufreq.c phc-intel.c || die
-}
diff --git a/sys-power/phc-intel/phc-intel-0.3.2.12.24.ebuild b/sys-power/phc-intel/phc-intel-0.3.2.12.24.ebuild
deleted file mode 100644
index 34f2567f2ada..000000000000
--- a/sys-power/phc-intel/phc-intel-0.3.2.12.24.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info linux-mod eutils
-
-DESCRIPTION="Processor Hardware Control for Intel CPUs"
-HOMEPAGE="http://www.linux-phc.org/
-	http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267"
-#no automatic filenames here, sorry
-SRC_URI="http://www.linux-phc.org/forum/download/file.php?id=178 -> phc-intel-pack-rev24.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CONFIG_CHECK="~!X86_ACPI_CPUFREQ"
-ERROR_X86_ACPI_CPUFREQ="CONFIG_X86_ACPI_CPUFREQ has to be configured to Module to enable the replacement of acpi-cpufreq with phc-intel."
-
-MODULE_NAMES="phc-intel(misc:)"
-BUILD_PARAMS="KERNELSRC=\"${KERNEL_DIR}\" -j1"
-BUILD_TARGETS="all"
-
-S=${WORKDIR}/${A/.tar.bz2}
-
-pkg_setup() {
-	if kernel_is lt 3 1 ; then
-		eerror "Your kernel version is no longer supported by this version of ${PN}."
-		eerror "Please use a previous version of ${PN} or a newer kernel."
-		die
-	fi
-	if kernel_is gt 4 14 ; then
-		eerror "Your kernel version is not yet tested with this version of ${PN}."
-		eerror "It might not build or expose runtime problems."
-	fi
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	epatch \
-		"${FILESDIR}"/phc-intel-0.3.2-rev21-trailing-space-3.{4,7,9,10,11,12,13,14,15}.patch \
-		"${FILESDIR}"/phc-intel-0.3.2-rev21-trailing-space-4.{1,3,5,6}.patch \
-		"${FILESDIR}"/phc-intel-0.3.2-rev24-trailing-space-4.{7,9,10}.patch
-
-	sed -e '/^all:/s:prepare::' \
-		-i Makefile || die
-
-	local my_sub=arch/x86/kernel/cpu
-	if kernel_is gt 2 6 39 ; then
-		my_sub=drivers
-	fi
-	cp -v "${KERNEL_DIR}"/${my_sub}/cpufreq/acpi-cpufreq.c . || die
-	if kernel_is lt 3 12 ; then
-		cp -v "${KERNEL_DIR}"/${my_sub}/cpufreq/mperf.h . || die
-	fi
-
-	if kernel_is lt 4 11 ; then
-		epatch inc/${KV_MAJOR}.${KV_MINOR}/linux-phc-0.3.2.patch
-	else
-		epatch inc/4.10/linux-phc-0.3.2.patch
-	fi
-
-	mv acpi-cpufreq.c phc-intel.c || die
-}