gentoo resync : 15.12.2017

9 files changed, 170 insertions, 100 deletions

diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 8a26ea4f51ff..c402992e1fa2 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/phc-intel/Manifest b/sys-power/phc-intel/Manifest
index 60a88c926255..3407669f84c4 100644
--- a/sys-power/phc-intel/Manifest
+++ b/sys-power/phc-intel/Manifest
@@ -17,12 +17,13 @@ AUX phc-intel-0.3.2-rev21-trailing-space-4.1.patch 1551 BLAKE2B beac24454d87eded
 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
-DIST phc-intel-pack-rev15.1.tar.bz2 97762 BLAKE2B e2acf8bbd1fbbb4226be2a46d08a61ceb1d7508f41a9e492aeffade76a2708180719a99ddaa4ac17b228fa64df0ef988c129c92e4d817fa3fcd93919e0ff7c23 SHA512 e0163f315343bb34dde57cb806d99b6ea6586b54827142a49532d862cbe02689d581e221ebd6466d1992107e4d98456989402ba4172e85b9e9f24405f27d28f1
-DIST phc-intel-pack-rev16.tar.bz2 100320 BLAKE2B 64501132883cf2c894b011c30f8cae25d2b830f36d52b040ef594b0cb0210fb282bddc008df243972ea884b7fb99d6284e7f31b533076a3cb11e27d2bf99d57d SHA512 bfe502e67f68ec7b4dbae77f0e2b57876928c6d5047697842c397a1d622978c270b85d0c5f83d22ca74a48942da60ab2b78e405ba866f55ee937f5b530f5165e
+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
-EBUILD phc-intel-0.3.2.12.15.1.ebuild 2069 BLAKE2B ffc1d1f76613feb9597c4e02c1e159d9c08e2bdc9e6fbae8195015bb08b6bf47d9fbaa2b38ac12157526b765ff1a0b0841fab4e22501dbdf1df13d0b4646a10c SHA512 63d7dee5b53db37b2e495a5309c17c81fb2a5958002cfc45a07d6df5c3e3e8de43b403704fd8e776fcf96c2bc5b2aa0400d67581f4eabd11f1eda76b91216455
-EBUILD phc-intel-0.3.2.12.16.ebuild 2188 BLAKE2B ef465bc5f22c9837e62302845829941c69045713555d91a9354951fec5465fec36b5026c134a5f2695d820007956f21f8a1d10579067b1f2c4aed1fd6a21018a SHA512 7259ab5d65568f81666ae0c8988697e499b419f95ea7425ab220d7913c6a05c48b070962b3e2961435e4ffc5eb849c6d015c4151f0634d5d0895d10820adf75f
+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 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
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
new file mode 100644
index 000000000000..e5820b315033
--- /dev/null
+++ b/sys-power/phc-intel/files/phc-intel-0.3.2-rev24-trailing-space-4.10.patch
@@ -0,0 +1,51 @@
+--- 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
new file mode 100644
index 000000000000..256910ba42e4
--- /dev/null
+++ b/sys-power/phc-intel/files/phc-intel-0.3.2-rev24-trailing-space-4.7.patch
@@ -0,0 +1,51 @@
+--- 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
new file mode 100644
index 000000000000..08e5b7ecb848
--- /dev/null
+++ b/sys-power/phc-intel/files/phc-intel-0.3.2-rev24-trailing-space-4.9.patch
@@ -0,0 +1,51 @@
+--- 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/phc-intel-0.3.2.12.15.1.ebuild b/sys-power/phc-intel/phc-intel-0.3.2.12.15.1.ebuild
deleted file mode 100644
index d304743498ac..000000000000
--- a/sys-power/phc-intel/phc-intel-0.3.2.12.15.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 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=161 -> phc-intel-pack-rev15.1.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 3 15 ; then
-		eerror "Your kernel version is not yet supported by this version of ${PN}."
-		eerror "Please use a newer version of ${PN} or an older kernel."
-		die
-	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
-
-	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
-	else
-		epatch inc/${KV_MAJOR}.${KV_MINOR}/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.16.ebuild b/sys-power/phc-intel/phc-intel-0.3.2.12.24.ebuild
index 1a5be9e0ac5c..34f2567f2ada 100644
--- a/sys-power/phc-intel/phc-intel-0.3.2.12.16.ebuild
+++ b/sys-power/phc-intel/phc-intel-0.3.2.12.24.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit linux-info linux-mod eutils
 
@@ -9,7 +9,7 @@ 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=162 -> phc-intel-pack-rev16.tar.bz2"
+SRC_URI="http://www.linux-phc.org/forum/download/file.php?id=178 -> phc-intel-pack-rev24.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -26,12 +26,12 @@ BUILD_TARGETS="all"
 S=${WORKDIR}/${A/.tar.bz2}
 
 pkg_setup() {
-	if kernel_is lt 2 6 27 ; then
+	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 3 19 ; then
+	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
@@ -39,13 +39,12 @@ pkg_setup() {
 }
 
 src_prepare() {
+	default
+
 	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
+		"${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
@@ -59,12 +58,10 @@ src_prepare() {
 		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
+	if kernel_is lt 4 11 ; then
 		epatch inc/${KV_MAJOR}.${KV_MINOR}/linux-phc-0.3.2.patch
 	else
-		epatch inc/3.16/linux-phc-0.3.2.patch
+		epatch inc/4.10/linux-phc-0.3.2.patch
 	fi
 
 	mv acpi-cpufreq.c phc-intel.c || die
diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index 5e455c7eb08a..dbc8b8feeb19 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -1,4 +1,3 @@
-AUX powertop-2.4-tinfo.patch 580 BLAKE2B a4453ffd36366f8e8161aa37a59543c8af4bf548a872f53dd31023fa4527545bd89ea2e7e63ffe04e9f59ba5635024821614fff9fd849b6d1c48e554c3fade77 SHA512 51a075ec585a8bc33a8e91f5b808e6f7f8fb63f1b77f879dee75811b61e78ee105887e3a02edcb2ff7cd624216b7139572c81cbe2b54d8e4b06946a730b53a5d
 DIST powertop-2.8.tar.gz 670000 BLAKE2B 4259f462d36fe0cbb157859d6e1d3e1face67f7232fe8d4112d77f844b545f49e9cf486e21bcbc34f64ffb0c891c1864141784dde14e3a96647d6535641a840a SHA512 253d0e15f0972cf8639735c510f4884d49a0da76c31dd2f39603e2297e6c6f0b9fa283c7b3cb04a431c91f8296275c0adaecc4c3e9ea132c0c31064f7f432c80
 EBUILD powertop-2.8.ebuild 3316 BLAKE2B 2abff4940a54cd69899acd851ef7539447b99dc231ccb5c5465c7b3f5ef9dd9dfb65e4e9e06de129b4ac1d21f18a206cade36d44e96a8873fb0dbd6b3ae1ddd4 SHA512 89fddfe5836f3c52e83761eea4b58eadbe89354bb1a220bac798a637e9eff349cb5273df563b74bbb96413a41cc487a917fa4fbde65faeccf0ee9ac18c548d49
 EBUILD powertop-9999.ebuild 3575 BLAKE2B 39a2dd7a0e0bdd42459cd9c3605d934935b230d63e1a4db087abecc37f5d7c1f39325f192a5adb9f4fd79933122f4c423c9feb0b28b61f1f0c928e510207720a SHA512 c4f4fa75a57402806a1eb80183aea4c2dbbdbc0e9add49ccfc216445334674a104308318ff5fa228585cd1754c265a202465752fc043718843af49878937bc3e
diff --git a/sys-power/powertop/files/powertop-2.4-tinfo.patch b/sys-power/powertop/files/powertop-2.4-tinfo.patch
deleted file mode 100644
index b965d8e06a59..000000000000
--- a/sys-power/powertop/files/powertop-2.4-tinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -46,7 +46,7 @@
- AC_FUNC_STRTOD
- AC_CHECK_FUNCS([fdatasync getpagesize gettimeofday memmove memset mkdir munmap pow realpath regcomp select setlocale socket sqrt strcasecmp strchr strdup strerror strncasecmp strstr strtoul strtoull])
- 
--AC_SEARCH_LIBS([delwin], [ncursesw ncurses], [], AC_MSG_ERROR([ncurses is required but was not found]), [])
-+PKG_CHECK_MODULES(ncurses, ncurses, [LIBS="$LIBS $ncurses_LIBS"], AC_MSG_ERROR([ncurses is required but was not found]))
- 
- has_libpci=0
- PKG_CHECK_MODULES([PCIUTILS], [libpci],[has_libpci=1],[