gentoo resync : 25.08.2020

34 files changed, 370 insertions, 373 deletions

diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 9bf4f047ca55..c1e1e73dcf7c 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/acpi_call/Manifest b/sys-power/acpi_call/Manifest
index d486a29a3593..cdc7f891eba6 100644
--- a/sys-power/acpi_call/Manifest
+++ b/sys-power/acpi_call/Manifest
@@ -6,9 +6,9 @@ AUX acpi_call-3.17-linux-4.14.patch 341 BLAKE2B 8402c22a3f016f8b2b00805f6ce1db3b
 AUX acpi_call-3.17-linux-5.6.patch 1002 BLAKE2B ac5ddd5a3375aff549117cb0410d1a3d0468e07f11eb9456b89809e2d6481ab0f63a33d4b5447a8de868ee3aa3b908ea1530b2ba59a9f551c59a5839f46b8220 SHA512 31aba84449ea18511914c7bc05124cbeefbb51ce34736b84b0bf83bf7f6ab9dc3d6df74e2f87ac09d7a6117f9839573b6602c0f94e8b56184af7695d9a4db389
 DIST acpi_call-1.1.0.tar.gz 10470 BLAKE2B 000c5e6f1eb968bdea3d8dfb6d6bf7b18daffe8baa75ff32e8c6c4b98cafe0a72a67a65a17994a1c8efa16f528bdfbf2b27686a146730c319a5195dfa9ec0d51 SHA512 d5cf13c15f9057e3a27aaacfee6dcdb17b6a79194bdc8fd57b8140c07a532e2e58151bea881aa158c1183ac3bbe89f83fcfc2279ffd9e945a72331b6ddbf2c70
 DIST acpi_call-3.17.tar.gz 10470 BLAKE2B e1a4912f4b92532aa8496e668541975b7e563dfd7613d41f33503d5eecad786b84ba98b205f27c4a4fbd3b37b034a467cf7c9a73f2995539d2117f50751df682 SHA512 39f8f924995ba4e5490e93f03c33db083ced224699b1028102294b2cc99edebd1eea04d33b50beed9dea86939c124682ef8d013c990d5611471b104be3200cb1
-EBUILD acpi_call-1.1.0-r1.ebuild 778 BLAKE2B b437b750c540d2348bdf13094d23a9c38a34c83984f1b7e47b436ee9977533e583246090bf9dc3c5353c2935885e58470e2d4635136d5cd2d534f53ad91588d3 SHA512 d806686711e0103bd4245aaa8d0dcb9ff0964f391c6935f5c1425a443bfe8cd8ff82ca27e8ff9c0e6ed0d5a87145b2feb706b3d2fb5a5a2eaf0f6e9f93346a74
-EBUILD acpi_call-1.1.0-r2.ebuild 832 BLAKE2B fa8a5377ffd2d5e7f9b2b2ac86b1709c5630f6720023e73a6bf598962a7b63011b75d94e25a108c216a6121e92918217c527d638fcdceca7d3af48ff9d136e67 SHA512 a29a162870bacf966f8036fd2c079803ad2037798c5ee9b06dcf1f5e550cbdfc4387538a477ad90d5a7fc7a98d407e6575287146e77cc2628b3236cb7123b201
-EBUILD acpi_call-1.1.0.ebuild 708 BLAKE2B 464a13863e5540b2cf702d7ab51dec1d15b5b400456594310661de9a757b83810d1577b978783ae385bed69ba2d22f539ef42700e4b544b58b532138dade486c SHA512 83848672df330912eede86df9025be30a3100e73fea3227ef84a68a11ee56de07f0a604c8dd8d3485723a6f78877f6fd953a6a27c273c459296f1566ac0974ef
-EBUILD acpi_call-3.17-r1.ebuild 808 BLAKE2B 35076a597e1fc879b8d11d0a121cd01a43c8fdb6774c00de9eb9b32ebe3a58130fd3b207af8fd7fe54fa70005c7a5c0567d705aeaad95fb3ab1f0c9b8f0276f4 SHA512 1e9e521ea51e0ebc9863d963dea0310d34ad1a47afa23eca29cf7c8492347799ae73d21881c61836b80c29e5faa92c8ef7de3689a530ef87a7614a2efd23ee5e
+EBUILD acpi_call-1.1.0-r3.ebuild 708 BLAKE2B 464a13863e5540b2cf702d7ab51dec1d15b5b400456594310661de9a757b83810d1577b978783ae385bed69ba2d22f539ef42700e4b544b58b532138dade486c SHA512 83848672df330912eede86df9025be30a3100e73fea3227ef84a68a11ee56de07f0a604c8dd8d3485723a6f78877f6fd953a6a27c273c459296f1566ac0974ef
+EBUILD acpi_call-1.1.0-r4.ebuild 778 BLAKE2B b437b750c540d2348bdf13094d23a9c38a34c83984f1b7e47b436ee9977533e583246090bf9dc3c5353c2935885e58470e2d4635136d5cd2d534f53ad91588d3 SHA512 d806686711e0103bd4245aaa8d0dcb9ff0964f391c6935f5c1425a443bfe8cd8ff82ca27e8ff9c0e6ed0d5a87145b2feb706b3d2fb5a5a2eaf0f6e9f93346a74
+EBUILD acpi_call-1.1.0-r5.ebuild 832 BLAKE2B fa8a5377ffd2d5e7f9b2b2ac86b1709c5630f6720023e73a6bf598962a7b63011b75d94e25a108c216a6121e92918217c527d638fcdceca7d3af48ff9d136e67 SHA512 a29a162870bacf966f8036fd2c079803ad2037798c5ee9b06dcf1f5e550cbdfc4387538a477ad90d5a7fc7a98d407e6575287146e77cc2628b3236cb7123b201
+EBUILD acpi_call-3.17-r2.ebuild 808 BLAKE2B 35076a597e1fc879b8d11d0a121cd01a43c8fdb6774c00de9eb9b32ebe3a58130fd3b207af8fd7fe54fa70005c7a5c0567d705aeaad95fb3ab1f0c9b8f0276f4 SHA512 1e9e521ea51e0ebc9863d963dea0310d34ad1a47afa23eca29cf7c8492347799ae73d21881c61836b80c29e5faa92c8ef7de3689a530ef87a7614a2efd23ee5e
 EBUILD acpi_call-9999.ebuild 685 BLAKE2B c562b75f62f68ebf5df42851fd8d330aaa86416dfa1fcf695ae278e15890505dbdb2cb463afd18e4c38eb721a4d37613488c92427c727f0115cdbc3ed9814414 SHA512 fec83bf1b8af54c3c0f0dc66ed373da4d6f40ec97ccaaa2d85b4e069d9ad4ae34af5c41db9369881f5d0cd6be46683e0d29decd81c2e88a8b7a001eb00807a16
 MISC metadata.xml 304 BLAKE2B e9ebd649d5b044096dfa71d43332fb12c6577abdff31ae880ab30f7d5bf83e244afa2a57d9ca135b5378dae1c45f7b8422c08caf24e5c0a604f76c3fe1774e01 SHA512 024d05a8863a152a45a50bc42018182781d46b83c0b83dc24f844909432f7a90c2e041a6aca6b57932a773082749639500e6a8a9823fcb64b54705cb753801ce
diff --git a/sys-power/acpi_call/acpi_call-1.1.0.ebuild b/sys-power/acpi_call/acpi_call-1.1.0-r3.ebuild
index fb33317d196b..fb33317d196b 100644
--- a/sys-power/acpi_call/acpi_call-1.1.0.ebuild
+++ b/sys-power/acpi_call/acpi_call-1.1.0-r3.ebuild
diff --git a/sys-power/acpi_call/acpi_call-1.1.0-r1.ebuild b/sys-power/acpi_call/acpi_call-1.1.0-r4.ebuild
index 2c15af2d8fe2..2c15af2d8fe2 100644
--- a/sys-power/acpi_call/acpi_call-1.1.0-r1.ebuild
+++ b/sys-power/acpi_call/acpi_call-1.1.0-r4.ebuild
diff --git a/sys-power/acpi_call/acpi_call-1.1.0-r2.ebuild b/sys-power/acpi_call/acpi_call-1.1.0-r5.ebuild
index 4dd39fb95a87..4dd39fb95a87 100644
--- a/sys-power/acpi_call/acpi_call-1.1.0-r2.ebuild
+++ b/sys-power/acpi_call/acpi_call-1.1.0-r5.ebuild
diff --git a/sys-power/acpi_call/acpi_call-3.17-r1.ebuild b/sys-power/acpi_call/acpi_call-3.17-r2.ebuild
index 87ae13124e96..87ae13124e96 100644
--- a/sys-power/acpi_call/acpi_call-3.17-r1.ebuild
+++ b/sys-power/acpi_call/acpi_call-3.17-r2.ebuild
diff --git a/sys-power/bbswitch/Manifest b/sys-power/bbswitch/Manifest
index 61e0662f0b2f..eadb05df5689 100644
--- a/sys-power/bbswitch/Manifest
+++ b/sys-power/bbswitch/Manifest
@@ -2,7 +2,7 @@ AUX bbswitch-0.8-kernel-4.12.patch 528 BLAKE2B 4c4b5dbf29338b9a8bbd4cfc974466bee
 AUX bbswitch-0.8-kernel-5.6.patch 1432 BLAKE2B 69c8aab963f1305dd2ffec7e46838df7538e1d87de2048fbd36525fd30a9680dccaf364297b2fae44eb68ad9358dcb865e767bf159502dc9dd2f73490a0d14ce SHA512 90e62a760e9c620b95deaa9ab1f8b8936a764f2adc9991972f3d47bf5768376c6b6007b5613b48303c17ae5ac4fa668ca8b071b7e2b236c7699a91fc01359a99
 AUX bbswitch.modprobe 46 BLAKE2B e76506e79adc57bedd68f038293257e7c70f1f3bc924776741e152b7c95c691f5241066b742583af063a4bdde90134005949ce28715d0b8f0c51f59c582223c8 SHA512 a4fa992d66b401e039c995b64ac5f3b2491c3ccf4412e211d50d1e514253f9341dc77a6d8da808f03988735e44a97bb973f3303ed3c0eeed6f4e21794d3545b6
 DIST bbswitch-0.8.tar.gz 15800 BLAKE2B d9a16d2ca8baebcbc7ad1d8c1daeb9822ed4ea797ff297848e7087d2a0b142b7cd1333d12346fcde85ad06ddb0640e0d6e299d00e0e8e6c7f96d0a409a08d1c6 SHA512 11ab163931feb6c0e202d04c4552b848e999fedea9990390c26b28abdb4a69081ccfb5a22d1e390cc274f1c0cfc9adedc719c5fece14738b17aaa93e28865b7c
-EBUILD bbswitch-0.8-r2.ebuild 1058 BLAKE2B 2de38efe1b1c147057e59b52b0138f12ff8b2c885ddbc3b467a5a91fac589ff7f682ae0887c9a1e86a752637a79da35a9fc98c5a4cf57a2cc01c022f1c3ed926 SHA512 02d646717a882a6c2ca1687c4a718ed0a7e09b741d599794af873543093ace6d7749edc7c05cca1854e35f9793ae2f77c37336df0228b7554ea056bd5858e6c3
-EBUILD bbswitch-0.8-r3.ebuild 1135 BLAKE2B ddb38409e9e6222deaf4fabe96b19ec744cfd8a7d6c94a8d3bd66996c1a6e87b19a69a2313a549fac3995743e0c9c38b9146eae7e07b79230a37588bedb056b0 SHA512 fde0d208777d494e3f8f8deacf5fc63185c16caaf2ff5e5f240faf51554b3ea08690275a208d2b4d248514050bb3a9e72a8ef9da167b57a5c932c296b68f188e
+EBUILD bbswitch-0.8-r4.ebuild 1058 BLAKE2B 73a1b0f973f4775c794a6aa1065d04b6a64d1baa11ea16c0f3f303c9dfeca94d9e675f0fab7c3f2f481167958f1f9ca92194b264e2418968ca29ec36b4efb6b2 SHA512 2c00a60517b571aceaad6a49ab3c9a43b4d107acad2bf76e4c08dca432578c2c6d3b4610419a10ba417f8527ecaa7c30692d2685c00cbcc297f50f75c481b7f0
+EBUILD bbswitch-0.8-r5.ebuild 1135 BLAKE2B ddb38409e9e6222deaf4fabe96b19ec744cfd8a7d6c94a8d3bd66996c1a6e87b19a69a2313a549fac3995743e0c9c38b9146eae7e07b79230a37588bedb056b0 SHA512 fde0d208777d494e3f8f8deacf5fc63185c16caaf2ff5e5f240faf51554b3ea08690275a208d2b4d248514050bb3a9e72a8ef9da167b57a5c932c296b68f188e
 EBUILD bbswitch-9999.ebuild 1137 BLAKE2B f76f3505d8f64c195dfe5cd9335ae9e49ccb1e8500f203899122016605505d37a84a03e202115a65d94855b93a34954d71d0344b81c9b3260d11347e0a63222f SHA512 32a0912adbca5994fb59ead90815d4b6c66fa2c6968a8f23d668a49e0d1b402a81481ffdf4c929ae6d62b4601e677ed99b21e80e5318cf5235a69f2782fa5c38
 MISC metadata.xml 975 BLAKE2B 37f16c518caa9f2dd7a10d312365f59ced2bee2b22d446d256f0ed49b499dd457bee37a90285ace9fbb7fc3fce3c4ac9547aa3ee1e2126ff063c534d4f7cf9d5 SHA512 8281867207c08d1383eb9b5c770637b7cb0174d08859f3838155d80c2a6bf69f40946354f548d2ab7e4461529483755e0a666759708ec5debcd3487a11219f39
diff --git a/sys-power/bbswitch/bbswitch-0.8-r2.ebuild b/sys-power/bbswitch/bbswitch-0.8-r4.ebuild
index 19ec80590463..cd44f443292b 100644
--- a/sys-power/bbswitch/bbswitch-0.8-r2.ebuild
+++ b/sys-power/bbswitch/bbswitch-0.8-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/sys-power/bbswitch/bbswitch-0.8-r3.ebuild b/sys-power/bbswitch/bbswitch-0.8-r5.ebuild
index 90af8d532409..90af8d532409 100644
--- a/sys-power/bbswitch/bbswitch-0.8-r3.ebuild
+++ b/sys-power/bbswitch/bbswitch-0.8-r5.ebuild
diff --git a/sys-power/cpupower/Manifest b/sys-power/cpupower/Manifest
index 0f945fcd0bd9..000a49e3b714 100644
--- a/sys-power/cpupower/Manifest
+++ b/sys-power/cpupower/Manifest
@@ -8,5 +8,5 @@ AUX init.d-r4 804 BLAKE2B b143305b3f117afa49967de098f54419d5f57b86dee7e7153b7adb
 DIST cpupower-4.13.0.tar.xz 67812 BLAKE2B 3b94b18bb57b0499a96d57ca26a48f528bf993e0f1ed7eb6d2949c879de8796501629bd0978946eae925d86dd3204a1cab0c99f1c3a8b51731dfbdb61451e990 SHA512 5e7095e2741eae920a097864926931afb2656e492b504f203c40c24ddc5aee5014c7689b220225171b5ea10c69b70774fb2a979d05ea56ef1fa063f3097626c7
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 EBUILD cpupower-4.13.0.ebuild 1660 BLAKE2B d1f28db05813a69ffad80a074eab2422b020f07a3c740a34475d22ccee07062f814ba7e273e80c3300265cb4870545cabb67811b5aa8d045bcd8c4f7d2bfc05d SHA512 6e034ec616739e260fc7005dbdaf0eea4a6d4e794dbff30184b108b13e9f66b8daab115e5081840cef9013694143e82339dab7b7c180b0fbdd4db1329efff699
-EBUILD cpupower-5.4.ebuild 1686 BLAKE2B 56c6d3bfc5744308e1d016bbcdcd55ab83917a6803c76af4881caf65bbda4f37ce61b8b45d5e79f0a3774e612d0d04bb19eff7acb35d95d2a47639acc3bc42f8 SHA512 04ad5ed7eff5dad70c83d2de140d54814ca215289ef53004863dfc4d080df3e8723ae731f25384ec40f2b07c6f04beec82fcf90b6a94ad5a8715c807a40b4c5e
+EBUILD cpupower-5.4.ebuild 1684 BLAKE2B 577213319993e4f6f7b5bcc7d005aa7b31136ade6ffeec460869986d9cb0705b1416633233179a99b81fb460605a21137b959769d40796d1567d86b391a293c4 SHA512 200cba8c3c652c67fd709abc192c15e85aa6d505cc63acd530fa9d7c1524e9800d08c9e42a4d6906f530081740a9728a0152ff3c75b209db3a547bb439c48b1f
 MISC metadata.xml 340 BLAKE2B a03552056a3b361eecd25b085c5f3fe60af7d1dbef9bb74682066b2d87c92b91a7a3d5cb53d1cbb88d85f81982a4b7ee4f8c5ff15c1fd06a266447f2d309ffd9 SHA512 af0ccc6342a6f6095d2bf06f764729e2a3eaa885d95da97462e15e3f5d139d3260e4c6e981e1d1194f4c0b64d3216decf223f854ad80e580092af8235399e054
diff --git a/sys-power/cpupower/cpupower-5.4.ebuild b/sys-power/cpupower/cpupower-5.4.ebuild
index e2aa6103417a..88abd3b4403e 100644
--- a/sys-power/cpupower/cpupower-5.4.ebuild
+++ b/sys-power/cpupower/cpupower-5.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://cdn.kernel.org/pub/linux/kernel/v${PV%%.*}.x/linux-${PV}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0/0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="nls"
 
 # File collision w/ headers of the deprecated cpufrequtils
diff --git a/sys-power/dptfxtract/Manifest b/sys-power/dptfxtract/Manifest
new file mode 100644
index 000000000000..e7e7ccd61ee6
--- /dev/null
+++ b/sys-power/dptfxtract/Manifest
@@ -0,0 +1,3 @@
+DIST dptfxtract-1.4.3.tar.gz 1199293 BLAKE2B df06ad700193b43d78e70af9477bba20a39efcd387adea1f9ae1ceb79dbe784d84b8b18b7a203d96c42d73f6879de022be46001ddd6bd6930f7d629b3e18636d SHA512 3f14bbd5da06b130405bdf4694535e04a3e05352676f656419246965b0dbca333345035855565f5fec2cfd8c7b2e236ee20eb91e39bf876feb0eed07fc605cf5
+EBUILD dptfxtract-1.4.3.ebuild 476 BLAKE2B 85118a9d32da78c2bb7d5a35d36f4c86c16678a29e7c672f46ca35526fbf590a57c7fe99e4e4d5121dbf7d12af466d0afdb2259d241d4807f47439e19259fe45 SHA512 18dd9aacbfb8ccd71d863f9191df34cda84995e93e8e777ae90c468239b241fb21d51ed338379a36e1a633d2570b1929ea2de35c8acad3bbe031b0e2cb50485f
+MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/sys-power/dptfxtract/dptfxtract-1.4.3.ebuild b/sys-power/dptfxtract/dptfxtract-1.4.3.ebuild
new file mode 100644
index 000000000000..1d9109d51335
--- /dev/null
+++ b/sys-power/dptfxtract/dptfxtract-1.4.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Intel's Linux DPTF Extract Utility for generating thermald's thermal_conf.xml"
+HOMEPAGE="https://github.com/intel/dptfxtract"
+SRC_URI="https://github.com/intel/dptfxtract/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ipw3945"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+QA_PREBUILT="*"
+
+src_install() {
+	dobin "${PN}"
+	einstalldocs
+}
diff --git a/sys-power/dptfxtract/metadata.xml b/sys-power/dptfxtract/metadata.xml
new file mode 100644
index 000000000000..3da97a9953cc
--- /dev/null
+++ b/sys-power/dptfxtract/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+		<name>Pacho Ramos</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sys-power/iasl/Manifest b/sys-power/iasl/Manifest
index f10ce60ec44a..b7935ba6e28e 100644
--- a/sys-power/iasl/Manifest
+++ b/sys-power/iasl/Manifest
@@ -1,5 +1,8 @@
 AUX iasl-20200326-Makefile.patch 2227 BLAKE2B eaf6d7cb51f65f430d207cea7c54c2f5489dd3dc3fd2930035af37576cf2c22b237c229a6bfe2f5ffa5c76c3bd8c4b138d360c4c0beba7f2558f1efabf577afa SHA512 07be0ba4034d3b3c19b7e29e66ec41b433c32bc077622db89520b89f52f44ad8069a4c50a9da6579eec130672b5187e0217e6dacc3b0c638b1d9ba54d83f91b3
 DIST acpica-unix-20200326.tar.gz 1850373 BLAKE2B 4b0c8548ff4b99fb774eb4301687368da2149bfaf68e02c638eecf890fc89974dadd75acc844233ecde8cfac2b98d75df79df2bb1bd6993dc8d502b3156c1012 SHA512 253ea7fc2bb540dd0cfa55552648c33562f39efb9a9b8cbab751ad7f4fea9bd3800eb241afb30313140e2008889b62b82b4427624e087a275353d81555403e76
+DIST acpica-unix-20200717.tar.gz 1847795 BLAKE2B 84af34884bbea39aed9ea7ec86f20a27f3dd10fa68456b5f12de2bdecf9f205c43b4b4e5dcfb55325571a5682794cdc2e0c5a83c646036a15cc90f81223aefff SHA512 16de55b97a3b478dd2dd44fcbe51b871c7cc6174d337939b873bcbc871bee10487a796aa86abaa7b54ff6b75279cdbf9ec48e19f6baaea4290daf1ad56bdbc46
 DIST acpitests-unix-20200326.tar.gz 2212897 BLAKE2B d88d3d900ac06d165c4a50cddd65495b75db345009b10e76d9f38197ba42efe3ea396ec9828bef62da1fd96ac331d95623c03194e08b00037ff1234321fcf0d3 SHA512 332b4ed016cee48662a5f4572e6d170461f02ee1386109a3970fbe8d104f2a2b14c19235ea43ae9b26e8faf9ef9597cb3d2148e498741361aca62978d0b62189
+DIST acpitests-unix-20200717.tar.gz 2212717 BLAKE2B 939e8022c5ecb7c5e862767f89c0b0de6146e23014dc0100d7dee0f3502e7adcbba72a468c828f804317e75d3a80ba5864c5497a7695f70be0bc1e3dcc69b4e6 SHA512 02c6674cbb2d98f783f25c71b1f391713de6fb3b56e5b57de9a7ccba0927453be4db8aea513e6e7ad491fcf3a0b2c14fefe8a2b82877a2ae01ea1d7832d36844
 EBUILD iasl-20200326.ebuild 3392 BLAKE2B 0ff5e3a105785bb0379404b85bcf8a3d49dcd17db6b77e6dbc8536572cdadfc497da5f533e039270b7ebfd0d59ca6e36382f7f8df07b6f2ed146d993e45926b6 SHA512 ecf72d6339edc6093720a0d8598f66ef321b5cb411b8168512efe5909a10abdfd11b1413a86d31bac123f8d14573706b52cbc78adea10a279e1ad54de7e0db13
+EBUILD iasl-20200717.ebuild 3395 BLAKE2B b3b725cc68057472b7d7c39014ec1ea4cbc1870d5a3c85eb2fec38464818e9b4bba32c12bc098c350e91527e8f21b068ec8bcec11d7df561ec761464bcf095a7 SHA512 2af8ca2a3eb2987056ca0b2cb531f93e64ac4bf4c98ba3b1c924a58358bd3254fec234569362aa6b57d67900cfb3f3f1730ee76151864e95d36a2aa188002477
 MISC metadata.xml 330 BLAKE2B 4c0218788685cc36fddf5d759c091898a71c01bf22e9e7995d1f5da37cd0508c961895b4265bda462062676f3e722205f0a6b10f64db718110f7afe8f088d136 SHA512 4d7760ec82f64ce49478c359b32aa100ca9778471033741b7fd89905d075b3a067fda413c6dcc5115d7755d0ab6cd9d30a848ff674f1c83ef6205c51ec501a65
diff --git a/sys-power/iasl/iasl-20200717.ebuild b/sys-power/iasl/iasl-20200717.ebuild
new file mode 100644
index 000000000000..5ef5112d8e5e
--- /dev/null
+++ b/sys-power/iasl/iasl-20200717.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils toolchain-funcs
+
+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 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${PN}-20200326-Makefile.patch )
+
+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
+}
+
+src_prepare() {
+	default
+
+	find "${S}" -type f -name 'Makefile*' -print0 | \
+		xargs -0 -I '{}' \
+		sed -r -e 's:-\<Werror\>::g' -e "s:/usr:${EPREFIX}/usr:g" \
+		-i '{}' \
+		|| die
+}
+
+src_configure() {
+	tc-export CC
+
+	# 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_compile() {
+	emake -C generate/unix 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
+	#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 $?
+		insinto /usr/share/${PF}
+		doins ${tb}
+	fi
+}
+
+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"
+	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/intel-undervolt/Manifest b/sys-power/intel-undervolt/Manifest
index ed0fd04a079f..d42eb4e58a0e 100644
--- a/sys-power/intel-undervolt/Manifest
+++ b/sys-power/intel-undervolt/Manifest
@@ -1,4 +1,4 @@
 DIST intel-undervolt-1.7.tar.gz 31481 BLAKE2B 0daade381b492184616356f097de32d14c76d6ab3f7dd59240fb25f92ee1b9aebb16cbef8b6836e16e361a9560b000655470140c31b5822fed7bd90e0b9d9bf2 SHA512 727eddd47a92f6092e89f9326c6b453785fac6155f2c2c50887f9a90704226e6abaf27b4a91cabd4783c4477371699a92186fe7847ac9218da9c26fb295a5304
-EBUILD intel-undervolt-1.7.ebuild 1219 BLAKE2B 7e03cb969aa0e8852c21e09f2f5505bb6e375198f5a25eb8944570df30d309d8a4b293c0ccb6a5274d3628d46b8840f2aeaa359b22414af8a43925394e97ad3a SHA512 42142c857b9bbcb1c273b725e3aaee484c81b0de48e8a840fb4c49f932b0e284a2523d3a125d6e7e2d15a2b38729fb36221165f4a2a6da9d2e897c8b21e85d79
-EBUILD intel-undervolt-9999.ebuild 1219 BLAKE2B 7e03cb969aa0e8852c21e09f2f5505bb6e375198f5a25eb8944570df30d309d8a4b293c0ccb6a5274d3628d46b8840f2aeaa359b22414af8a43925394e97ad3a SHA512 42142c857b9bbcb1c273b725e3aaee484c81b0de48e8a840fb4c49f932b0e284a2523d3a125d6e7e2d15a2b38729fb36221165f4a2a6da9d2e897c8b21e85d79
+EBUILD intel-undervolt-1.7-r1.ebuild 1288 BLAKE2B cc7600305629b0cf69107a0817eb7c2d1c9d65ab4173141ff9041255f5f119d01a588287054753fbadc6c816e8acdc37bc189c96a50e01386ec52d67404b02c4 SHA512 9203e30fc2b0e37232148f777324987a005b4a648b4086c67e3a2506c3d7035e7bc92ec44be0f91120d56f6fbc8c5da6383cd949b2573f61f1ecef7e8a6e7d5d
+EBUILD intel-undervolt-9999.ebuild 1288 BLAKE2B cc7600305629b0cf69107a0817eb7c2d1c9d65ab4173141ff9041255f5f119d01a588287054753fbadc6c816e8acdc37bc189c96a50e01386ec52d67404b02c4 SHA512 9203e30fc2b0e37232148f777324987a005b4a648b4086c67e3a2506c3d7035e7bc92ec44be0f91120d56f6fbc8c5da6383cd949b2573f61f1ecef7e8a6e7d5d
 MISC metadata.xml 439 BLAKE2B 6381419880bfa93e46d034594091121d9f8c18fb096ef0b4ea1a45c820b18ce28f5526e483e9c928df246bcae04efa46b649b01856c03bf26e5b36819d3a2d17 SHA512 e02201c15d777f29c3976f0d1219a30f1be9f0ca061a75d1ca4f15bf6e366d0eb7ff4f2a9e91022662da928fa34069cc89c753198554711049d5904f8f41b606
diff --git a/sys-power/intel-undervolt/intel-undervolt-1.7.ebuild b/sys-power/intel-undervolt/intel-undervolt-1.7-r1.ebuild
index 4fa869561791..6390ac5c14d9 100644
--- a/sys-power/intel-undervolt/intel-undervolt-1.7.ebuild
+++ b/sys-power/intel-undervolt/intel-undervolt-1.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,6 +32,7 @@ src_configure() {
 	local myconf=(
 		# it's a non-standard build system
 		$(usex elogind --enable-elogind '')
+		$(usex elogind --eloginddir="${EPREFIX}/$(get_libdir)/elogind" '')
 		--enable-openrc
 		--enable-systemd
 		--unitdir="$(systemd_get_systemunitdir)"
diff --git a/sys-power/intel-undervolt/intel-undervolt-9999.ebuild b/sys-power/intel-undervolt/intel-undervolt-9999.ebuild
index 4fa869561791..6390ac5c14d9 100644
--- a/sys-power/intel-undervolt/intel-undervolt-9999.ebuild
+++ b/sys-power/intel-undervolt/intel-undervolt-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,6 +32,7 @@ src_configure() {
 	local myconf=(
 		# it's a non-standard build system
 		$(usex elogind --enable-elogind '')
+		$(usex elogind --eloginddir="${EPREFIX}/$(get_libdir)/elogind" '')
 		--enable-openrc
 		--enable-systemd
 		--unitdir="$(systemd_get_systemunitdir)"
diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest
index 4d6429067599..895f94bf13a2 100644
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -7,9 +7,9 @@ AUX nut-2.6.5-init.d-upslog 573 BLAKE2B 2a0e04f83990035beb12eee33cfe7ce4fdcd1f31
 AUX nut-2.6.5-init.d-upsmon 557 BLAKE2B a48b215181d6b40691db244d38b5868e69844f5a1ee6f91cb8815c4386ae801f957b2fbaf53fbe5dd98925be42036dbd54dd5d13c0077c8884e018fac24d101a SHA512 9ccf947b2c5e7a73e96148edb7684f21ae84c4212b980f2ba7b88006dc1e3400b1b9017202b87648f928a3e19f4898094622a6683e0995b72f355ccb394280c3
 AUX nut-2.7.1-snmpusb-order.patch 1417 BLAKE2B 20c3150559d3810c8bf15a9560ccf950ad1bb26bd58b4f2bcf3736871f4599bc3ad948e5f008b1549184f78d0fa3b417bbc8728660fbb110f4537fce83231bad SHA512 df3701821bc4ef45a5089e4d4439c3367fb23cefce7d06168bd422a8c32a1b373ae9fb3456bd5f90a51a672edf9ce29254a08c2045efe210a11b82399793ec19
 AUX nut-2.7.2-no-libdummy.patch 535 BLAKE2B f18f65ca92e834b5e085358a09c7363cf156b4a156c6c99d4f7cc34a17d25cf1518f342c072791eb37db613a6dafc32aeed364b88063c4d92d20e21e34a5d807 SHA512 a402a70a4cfc922d31203560627ace87f82795aef072d333cb1bfb91a6b67fbc10769e5d68a8d2741ca512b81b5754e9141b68dcb197dbe558ed5556e2de37a1
+AUX nut-2.7.4-py3.patch 1940 BLAKE2B 5bb77bca18ad40a1ba4e579098accb0135c0f4b24436425de3983204554ddb0aeceb473a7a6729048dbfb6175e015129a8bfcce26b169b3e21c905f9f08f079e SHA512 2a4f12954bdf2e50cbfb7a7dd09ed83be27ed2a6d0a2e4244ca8b309614515599c81541b5cfb4c81244b739cf3a47d56cb2746db3fae9e8861c5115c0287041b
 AUX nut-openssl-1.1-support.patch 3873 BLAKE2B 17877276e46372aa17d357efc0851b9cdb33b14ac0c40913b47ea513a8ecaa6eebe3241ae8b324583070d76b6c12d3cf18c043778754b5774af846fb8a33b4d7 SHA512 8945f2f663dc50cfd7041cc7f2c4af5cca4b5ef9cfa1be48c122a623e6eadfc511bbaa60a8bd6b68bb2569c75d5f64613d595ad7444b8d6ec9f773d7743872a1
 AUX nut.powerfail.initd 1306 BLAKE2B 9e9c6eb40c6a313ad625136523de730a75b811841331ae5f7dd42b71b65f591c4ab5b8da6e954ceab42da89f4a20e8655cae57354aec6ab796cec80f60ebb419 SHA512 b9aaab526d0996b36a7a6d76a3ee63c1452b0a1bed358e23f6f7f5534e0da7751281428091efc7dba2004706996850ec18318809fdacb94cd8d73ea22bda52ee
 DIST nut-2.7.4.tar.gz 2509831 BLAKE2B 367c687efd739150898a14c700d5fddbe22bf926522923e1842011ec49b67d6638620500c4eda50291feb474cc6eef39fff63764cb3e0fad5898abee981f8308 SHA512 320c4aff85d8a370c5eff77d33924fdfc3caf6a250620693cdd5bf3336b3a80d8a207488eee841bcf8b72fbad68fda4c074e63b99c56e7886716fc934122d11a
-EBUILD nut-2.7.4-r4.ebuild 9808 BLAKE2B a95ead540d77690135d4d4127bc0271ba32ec98306101f201cc2d52607fd7d0e2b0f88bca8ebfd8c223362c11bcebf8cc6e59a379760bb30ee9048f5edde8d32 SHA512 7279d23da8aad9d567fb04ff467cc356ceea33dfafce971b31ef60a9fed871f91fd93628518373d7774fbeceb0ab5edcfdd728e00ae99430e6646d815e7d0897
-EBUILD nut-2.7.4-r5.ebuild 8967 BLAKE2B ed8112841bcc9e00e1a43afd5772a3ed962341b911b405456557bee80a4ce7cc7427edd8e5009c4ddd19a47edf4408c6de21257dbe14f8e51743f03aca900f64 SHA512 df8ae043ab75494ae483004fd812813f8bf7a59628384957d89aa6ff73768bd5c5204ba8e218187907e0a2629986cd20492c6f879890940fc1b5db96407577eb
-MISC metadata.xml 5329 BLAKE2B a97167cdd654c0a1cfc035fbab98a8c94150522b77651186f8c706ac2ebadac6b3e38c8c563a6fa16ac91fc8da760efd204ce3d3ce8e3e0c5239a9dd8c1adf4e SHA512 e57d635a530b16627fbc4807a07a227900189a8796285f309b710c4acb951c990b4f613dc9b3cbab71c480641d8ebfd942520a13e5712527d0058ca07c16b67d
+EBUILD nut-2.7.4-r6.ebuild 8999 BLAKE2B a94ea04ff35787debeb39c22f93f8576d9c1d37cd0ef4356562ab03091944715593a00c8ac2bdd3ae975117183e60f179442adc0ad7c1902549ee7d069992457 SHA512 bc39684b03642d4fd9fdd8d898cabcdc1b57d1a7f44e49d343c5a6ba3e3f2ec351861017f39ec10d3d0ccca2be3a6c23fdb38f72836739b658d054bceb370bf6
+MISC metadata.xml 5272 BLAKE2B cc580840e8c437fb37cd8c2132d2daf6751097374ccf11c5a7519756adc6b5d3654e3c40cfe7a66cee8ee5b016c09f65f4f425e4edbd503aed88da5f0eedc1a9 SHA512 f3133fcd673344452904f95d5898fdca3988970bf6526f50191cfa1741fb222468dc00652e968ba305a21851e6a070478627d181c26f6a1d152a215399f469ee
diff --git a/sys-power/nut/files/nut-2.7.4-py3.patch b/sys-power/nut/files/nut-2.7.4-py3.patch
new file mode 100644
index 000000000000..dbe661982eb1
--- /dev/null
+++ b/sys-power/nut/files/nut-2.7.4-py3.patch
@@ -0,0 +1,56 @@
+From eea0c5e9e5566c36a8b1e364ed4909231901a8f5 Mon Sep 17 00:00:00 2001
+From: Florian Bruhin <git@the-compiler.org>
+Date: Tue, 29 Nov 2016 10:45:04 +0100
+Subject: [PATCH 1/2] Make gen-nutupsconf-aug.py work with Python 3
+
+This makes the script work with Python 2.6+.
+Fixes #345.
+---
+ scripts/augeas/gen-nutupsconf-aug.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/scripts/augeas/gen-nutupsconf-aug.py b/scripts/augeas/gen-nutupsconf-aug.py
+index 55db17a73..4bb201602 100755
+--- a/scripts/augeas/gen-nutupsconf-aug.py
++++ b/scripts/augeas/gen-nutupsconf-aug.py
+@@ -18,6 +18,8 @@
+ # This program extracts all drivers specific variables, declared
+ # using 'addvar()' and output a complete ups.conf lens for Augeas
+ 
++from __future__ import print_function
++
+ import sys
+ import re
+ import glob
+@@ -69,7 +71,7 @@ def grep(string,list):
+ 
+ 	if (len(sys.argv) == 2):
+ 		dirPrefix = sys.argv[1]
+-		print dirPrefix
++		print(dirPrefix)
+ 
+ 	# 1/ Extract all specific drivers parameters, in a sorted list with unique entries
+ 	# 1.1/ List all drivers implementation files
+
+From 7bf209a5deef1ec1f05cf89c25c8399590d4e4e8 Mon Sep 17 00:00:00 2001
+From: Florian Bruhin <git@the-compiler.org>
+Date: Tue, 29 Nov 2016 17:37:01 +0100
+Subject: [PATCH 2/2] Fix gitlog2changelog.py on python 3
+
+---
+ tools/gitlog2changelog.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/gitlog2changelog.py b/tools/gitlog2changelog.py
+index d8c089187..f0bea4af6 100755
+--- a/tools/gitlog2changelog.py
++++ b/tools/gitlog2changelog.py
+@@ -80,7 +80,7 @@
+             else:
+                 message = message + " " + line.strip()
+     # If this line is hit all of the files have been stored for this commit
+-    elif re.search('files? changed', line) >= 0:
++    elif re.search('files? changed', line):
+         filesFound = True
+         continue
+     # Collect the files for this commit. FIXME: Still need to add +/- to files
diff --git a/sys-power/nut/metadata.xml b/sys-power/nut/metadata.xml
index bde98d03e531..384bfbd43fce 100644
--- a/sys-power/nut/metadata.xml
+++ b/sys-power/nut/metadata.xml
@@ -9,7 +9,6 @@
 		<email>prometheanfire@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name="gui">Install NUT-Monitor python gui</flag>
 		<flag name="ipmi">Support IPMI-based UPSes.</flag>
 		<flag name="ups_drivers_al175">Driver for Eltek UPS models with AL175 alarm module</flag>
 		<flag name="ups_drivers_bcmxcp">Driver for UPSes supporting the serial BCM/XCP protocol</flag>
diff --git a/sys-power/nut/nut-2.7.4-r4.ebuild b/sys-power/nut/nut-2.7.4-r4.ebuild
deleted file mode 100644
index 38d45641885d..000000000000
--- a/sys-power/nut/nut-2.7.4-r4.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit autotools bash-completion-r1 desktop fixheadtails flag-o-matic python-single-r1 systemd toolchain-funcs user
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Network-UPS Tools"
-HOMEPAGE="https://www.networkupstools.org/"
-SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-
-IUSE="cgi gui ipmi snmp +usb selinux split-usr ssl tcpd xml zeroconf"
-REQUIRED_USE="gui? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	dev-libs/libltdl:*
-	net-libs/libnsl
-	virtual/udev
-	cgi? ( >=media-libs/gd-2[png] )
-	gui? ( ${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	ipmi? ( sys-libs/freeipmi )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? ( >=dev-libs/openssl-1:= )
-	tcpd? ( sys-apps/tcp-wrappers )
-	usb? ( virtual/libusb:0= )
-	xml? ( >=net-libs/neon-0.25.0 )
-	zeroconf? ( net-dns/avahi )"
-
-BDEPEND="
-	virtual/pkgconfig"
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-nut )"
-
-S="${WORKDIR}/${MY_P}"
-
-# Bug #480664 requested UPS_DRIVERS_IUSE for more flexibility in building this package
-SERIAL_DRIVERLIST="al175 bcmxcp belkin belkinunv bestfcom bestfortress bestuferrups bestups dummy-ups etapro everups gamatronic genericups isbmex liebert liebert-esp2 masterguard metasys oldmge-shut mge-utalk microdowell mge-shut oneac optiups powercom rhino safenet solis tripplite tripplitesu upscode2 victronups powerpanel blazer_ser clone clone-outlet ivtscd apcsmart apcsmart-old apcupsd-ups riello_ser nutdrv_qx"
-SNMP_DRIVERLIST="snmp-ups"
-USB_LIBUSB_DRIVERLIST="usbhid-ups bcmxcp_usb tripplite_usb blazer_usb richcomm_usb riello_usb nutdrv_qx"
-USB_DRIVERLIST=${USB_LIBUSB_DRIVERLIST}
-#HAL_DRIVERLIST="usbhid-ups bcmxcp_usb tripplite_usb blazer_usb riello_usb nutdrv_qx"
-NEONXML_DRIVERLIST="netxml-ups"
-IPMI_DRIVERLIST="nut-ipmipsu"
-# Now we build from it:
-for name in ${SERIAL_DRIVERLIST} ; do
-	IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} +ups_drivers_${name}"
-done
-for name in ${USB_DRIVERLIST} ; do
-	IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} +ups_drivers_${name}"
-	REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( usb )"
-done
-for name in ${NEONXML_DRIVERLIST}; do
-	IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
-	REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( xml )"
-done
-for name in ${SNMP_DRIVERLIST} ; do
-	IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
-	REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( snmp )"
-done
-for name in ${IPMI_DRIVERLIST} ; do
-	IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
-	REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( ipmi )"
-done
-IUSE="${IUSE} ${IUSE_UPS_DRIVERS}"
-
-# public files should be 644 root:root
-NUT_PUBLIC_FILES="/etc/nut/{ups,upssched}.conf"
-# private files should be 640 root:nut - readable by nut, writeable by root,
-NUT_PRIVATE_FILES="/etc/nut/{upsd.conf,upsd.users,upsmon.conf}"
-# public files should be 644 root:root, only installed if USE=cgi
-NUT_CGI_FILES="/etc/nut/{{hosts,upsset}.conf,upsstats{,-single}.html}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.7.2-no-libdummy.patch
-	"${FILESDIR}"/${PN}-2.7.1-snmpusb-order.patch
-	"${FILESDIR}"/${PN}-2.6.2-lowspeed-buffer-size.patch
-	"${FILESDIR}"/nut-openssl-1.1-support.patch
-)
-
-pkg_setup() {
-	enewgroup nut 84
-	enewuser nut 84 -1 /var/lib/nut nut,uucp
-	# As of udev-104, NUT must be in uucp and NOT in tty.
-	gpasswd -d nut tty 2>/dev/null
-	gpasswd -a nut uucp 2>/dev/null
-	# in some cases on old systems it wasn't in the nut group either!
-	gpasswd -a nut nut 2>/dev/null
-	warningmsg ewarn
-	use gui && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
-		-e '/systemdsystemunitdir=.*echo.*sed.*libdir/s,^,#,g' \
-		-i configure.ac || die
-
-	sed -e "s:52.nut-usbups.rules:70-nut-usbups.rules:" \
-		-i scripts/udev/Makefile.am || die
-
-	rm ltmain.sh m4/lt* m4/libtool.m4 || die
-
-	sed -e 's:@LIBSSL_LDFLAGS@:@LIBSSL_LIBS@:' \
-		-i lib/libupsclient{.pc,-config}.in || die #361685
-
-	use gui && eapply "${FILESDIR}"/NUT-Monitor-1.3-paths.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	append-flags -fno-lto
-	tc-export CC
-	tc-export CXX
-	tc-export AR
-
-	local UPS_DRIVERS=""
-	for u in $USE ; do
-		u2=${u#ups_drivers_}
-		[[ "${u}" != "${u2}" ]] && UPS_DRIVERS="${UPS_DRIVERS} ${u2}"
-	done
-	UPS_DRIVERS="${UPS_DRIVERS# }" UPS_DRIVERS="${UPS_DRIVERS% }"
-	myconf="${myconf} --with-drivers=${UPS_DRIVERS// /,}"
-
-	use cgi && myconf="${myconf} --with-cgipath=/usr/share/nut/cgi"
-
-	# TODO: USE flag for sys-power/powerman
-	econf \
-		--sysconfdir=/etc/nut \
-		--datarootdir=/usr/share/nut \
-		--datadir=/usr/share/nut \
-		--disable-static \
-		--with-statepath=/var/lib/nut \
-		--with-drvpath=/$(get_libdir)/nut \
-		--with-htmlpath=/usr/share/nut/html \
-		--with-user=nut \
-		--with-group=nut \
-		--with-logfacility=LOG_DAEMON \
-		--with-dev \
-		--with-serial \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		--without-powerman \
-		$(use_with cgi) \
-		$(use_with ipmi) \
-		$(use_with ipmi freeipmi) \
-		$(use_with snmp) \
-		$(use_with ssl) \
-		$(use_with tcpd wrap) \
-		$(use_with usb) \
-		$(use_with xml neon) \
-		$(use_with zeroconf avahi) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	find "${D}" -name '*.la' -delete || die
-
-	dodir /sbin
-	use split-usr && dosym ../usr/sbin/upsdrvctl /sbin/upsdrvctl
-
-	if use cgi; then
-		elog "CGI monitoring scripts are installed in /usr/share/nut/cgi."
-		elog "copy them to your web server's ScriptPath to activate (this is a"
-		elog "change from the old location)."
-		elog "If you use lighttpd, see lighttpd_nut.conf in the documentation."
-	fi
-
-	if use gui; then
-		python_fix_shebang scripts/python/app
-		python_domodule scripts/python/module/PyNUT.py
-		python_doscript scripts/python/app/NUT-Monitor
-
-		insinto /usr/share/nut
-		doins scripts/python/app/gui-1.3.glade
-
-		dodir /usr/share/nut/pixmaps
-		insinto /usr/share/nut/pixmaps
-		doins scripts/python/app/pixmaps/*
-
-		sed -i -e 's/nut-monitor.png/nut-monitor/' -e 's/Application;//' \
-			scripts/python/app/${PN}-monitor.desktop || die
-
-		doicon scripts/python/app/${PN}-monitor.png
-		domenu scripts/python/app/${PN}-monitor.desktop
-	fi
-
-	# this must be done after all of the install phases
-	for i in "${D}"/etc/nut/*.sample ; do
-		mv "${i}" "${i/.sample/}" || die
-	done
-
-	local DOCS=( AUTHORS ChangeLog docs/*.txt MAINTAINERS NEWS README TODO UPGRADING )
-	einstalldocs
-
-	newdoc lib/README README.lib
-	newdoc "${FILESDIR}"/lighttpd_nut.conf-2.2.0 lighttpd_nut.conf
-
-	docinto cables
-	dodoc docs/cables/*
-
-	newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsd upsd
-	newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsdrv upsdrv
-	newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsmon upsmon
-	newinitd "${FILESDIR}"/nut-2.6.5-init.d-upslog upslog
-	newinitd "${FILESDIR}"/nut.powerfail.initd nut.powerfail
-
-	keepdir /var/lib/nut
-
-	einfo "Setting up permissions on files and directories"
-	fperms 0700 /var/lib/nut
-	fowners nut:nut /var/lib/nut
-
-	# Do not remove eval here, because the variables contain shell expansions.
-	eval fperms 0640 ${NUT_PRIVATE_FILES}
-	eval fowners root:nut ${NUT_PRIVATE_FILES}
-
-	# Do not remove eval here, because the variables contain shell expansions.
-	eval fperms 0644 ${NUT_PUBLIC_FILES}
-	eval fowners root:root ${NUT_PUBLIC_FILES}
-
-	# Do not remove eval here, because the variables contain shell expansions.
-	if use cgi; then
-		eval fperms 0644 ${NUT_CGI_FILES}
-		eval fowners root:root ${NUT_CGI_FILES}
-	fi
-
-	# this is installed for 2.4 and fbsd guys
-	if ! has_version virtual/udev; then
-		einfo "Installing non-udev hotplug support"
-		insinto /etc/hotplug/usb
-		insopts -m 755
-		doins scripts/hotplug/nut-usbups.hotplug
-	fi
-
-	newbashcomp "${S}"/scripts/misc/nut.bash_completion upsc
-	bashcomp_alias upsc upscmd upsd upsdrvctl upsmon upsrw
-}
-
-pkg_postinst() {
-	# this is to ensure that everybody that installed old versions still has
-	# correct permissions
-
-	chown nut:nut "${ROOT}"/var/lib/nut 2>/dev/null
-	chmod 0700 "${ROOT}"/var/lib/nut 2>/dev/null
-
-	# Do not remove eval here, because the variables contain shell expansions.
-	eval chown root:nut "${ROOT}"${NUT_PRIVATE_FILES} 2>/dev/null
-	eval chmod 0640 "${ROOT}"${NUT_PRIVATE_FILES} 2>/dev/null
-
-	# Do not remove eval here, because the variables contain shell expansions.
-	eval chown root:root "${ROOT}"${NUT_PUBLIC_FILES} 2>/dev/null
-	eval chmod 0644 "${ROOT}"${NUT_PUBLIC_FILES} 2>/dev/null
-
-	# Do not remove eval here, because the variables contain shell expansions.
-	if use cgi; then
-		eval chown root:root "${ROOT}"${NUT_CGI_FILES} 2>/dev/null
-		eval chmod 0644 "${ROOT}"${NUT_CGI_FILES} 2>/dev/null
-	fi
-
-	warningmsg elog
-}
-
-warningmsg() {
-	msgfunc="$1"
-	[ -z "$msgfunc" ] && die "msgfunc not specified in call to warningmsg!"
-	${msgfunc} "Please note that NUT now runs under the 'nut' user."
-	${msgfunc} "NUT is in the uucp group for access to RS-232 UPS."
-	${msgfunc} "However if you use a USB UPS you may need to look at the udev or"
-	${msgfunc} "hotplug rules that are installed, and alter them suitably."
-	${msgfunc} ''
-	${msgfunc} "You are strongly advised to read the UPGRADING file provided by upstream."
-	${msgfunc} ''
-	${msgfunc} "Please note that upsdrv is NOT automatically started by upsd anymore."
-	${msgfunc} "If you have multiple UPS units, you can use their NUT names to"
-	${msgfunc} "have a service per UPS:"
-	${msgfunc} "ln -s /etc/init.d/upsdrv /etc/init.d/upsdrv.\$UPSNAME"
-	${msgfunc} ''
-	${msgfunc} 'If you want apcupsd to power off your UPS when it'
-	${msgfunc} 'shuts down your system in a power failure, you must'
-	${msgfunc} 'add nut.powerfail to your shutdown runlevel:'
-	${msgfunc} ''
-	${msgfunc} 'rc-update add nut.powerfail shutdown'
-	${msgfunc} ''
-
-}
diff --git a/sys-power/nut/nut-2.7.4-r5.ebuild b/sys-power/nut/nut-2.7.4-r6.ebuild
index 3570688276d7..79cbbe8f3dc3 100644
--- a/sys-power/nut/nut-2.7.4-r5.ebuild
+++ b/sys-power/nut/nut-2.7.4-r6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.networkupstools.org/"
 SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
 
 IUSE="cgi ipmi snmp +usb selinux split-usr ssl tcpd xml zeroconf"
 
@@ -79,6 +79,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.7.1-snmpusb-order.patch
 	"${FILESDIR}"/${PN}-2.6.2-lowspeed-buffer-size.patch
 	"${FILESDIR}"/nut-openssl-1.1-support.patch
+	"${FILESDIR}"/nut-2.7.4-py3.patch
 )
 
 pkg_setup() {
diff --git a/sys-power/powermgmt-base/Manifest b/sys-power/powermgmt-base/Manifest
index ba5b35fa9d85..18b14105a3d7 100644
--- a/sys-power/powermgmt-base/Manifest
+++ b/sys-power/powermgmt-base/Manifest
@@ -1,3 +1,3 @@
 DIST powermgmt-base_1.31.tar.gz 10015 BLAKE2B 7beb933598b7885a996d9410ede2df92f280e6ff6c5e318223db7fb181e13a78e962ef9d2184e951c102d940f85a19f725c62af260c3d182469933ac82d3f99a SHA512 deae8b227e079a73fdd3f9a6be83bdc76400d457c17d3a0881ace1fddc8785ee401beddbafad93dbf3a09b5effe5ca7c998eae69a0740a083a9e8a65c2f0af40
-EBUILD powermgmt-base-1.31.ebuild 1022 BLAKE2B 7b8f81109450c12855ec643ab25cbffd6b39e0f5afb0a74de1b501dbc75924aa937ddff868490f2462063100eca6f8f5b02deb8d5f47d1ff51789c32bcdea08e SHA512 e6562c69dd6c251cf89bc845db0dcfc02a147ca3eb48752262a93011ad7100efcb1fba30a2805a4e433bdab5cd35857d56e4a52f02d9aeb55ca477ebc22b164e
+EBUILD powermgmt-base-1.31-r1.ebuild 1023 BLAKE2B cd4d9bfbb226d87256b6f399f66bfa27a5a33bc16bc748c7db8f2f8f72e586f384a637c82037748349e520e19a752f408dd84efcebf992c706ec7acebcd61af4 SHA512 9694da4f7c0b621720bd675d8da69ecb8cd77afe21ca1741e3d2c83a95e21eed5f1b22ebe3c81ca33852dd7c901df4134d48303ca9dc50ebaa857a1e7e3b825f
 MISC metadata.xml 281 BLAKE2B 3d9b4370754826c0b520531da7c7a2cd3c6517a94b2ce83d40eed23cbe4a2d362f9c98db4f4895ddd023a2ed915cdc3dbd5262d4b16f24110d89b93a44f9442a SHA512 ed5b52d81e30aadc840b8e7c834a1af4b9805c24c5598e34ccb41189f245ea52a389de7846043a60815411333efcf7281b680b20aeebb3d2ba4358a7716b1730
diff --git a/sys-power/powermgmt-base/powermgmt-base-1.31.ebuild b/sys-power/powermgmt-base/powermgmt-base-1.31-r1.ebuild
index a4aebd1b9f2e..974b61639253 100644
--- a/sys-power/powermgmt-base/powermgmt-base-1.31.ebuild
+++ b/sys-power/powermgmt-base/powermgmt-base-1.31-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ IUSE="+pm-utils"
 
 RDEPEND="!pm-utils? ( virtual/awk )
 	sys-apps/grep
-	virtual/modutils
+	sys-apps/kmod[tools]
 	pm-utils? ( >=sys-power/pm-utils-1.4.1 )"
 
 S=${WORKDIR}/${PN}
diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index 4f04225a65b3..d0686e5e03b8 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -1,7 +1,9 @@
 AUX powertop-2.8-ncurses_tinfo.patch 1385 BLAKE2B 1b11138ae9c8fc90236b421d733f8cf0edff843572cfbfececba0efed5dd2a154ca561692b42e087a1c75bc19966b71fde241a029f16b126074b7d857e8c4bf5 SHA512 f1f483c43355fc1c52d0d7b9ca8e01f71c371e4e77c275584afc9f7178985e0028d42ed675adc52a1ea014325c5aaaafe245fa9166c14326cf467bd92c274522
 DIST powertop-2.11.tar.gz 307755 BLAKE2B 01723262922df5cc2ec63f6972b2a301f7efc4c701dfa3c08280dcdaa4b79f2d04503592f8c17e43d77df89e7f08695b0381f498671969fe4aa388578f732978 SHA512 bbe2882196f1b3ae39885d38dd86018576bfac5b5e8f16ea10c7dfd197197d0493ae4ce83c969417a4c4239c41dbcfada989063f14e2943c088a7489e43953b7
+DIST powertop-2.13.tar.gz 303030 BLAKE2B 3c88e05f9889cc4b276bea3bc50a3a83228ca8efae278379a14fadc6104754f2837174e028bf9c5ded9f3af84ce6b8766ac3d24b6ae62b9b192c03fc3afdec11 SHA512 8ebeccd17b6f76d9e445382d9ce5b1c00ab2daf4f1e6e133c249bceb35ea582ca3e76da5415fd0b55a28b8a124655dc5ac7a18aaf2a3df955547d77495e59181
 DIST powertop-v2.10.tar.gz 722992 BLAKE2B 573f1f0ed40705d3463f6e6f76c67ae99127ab2541b851143dafa707ef1c2dab4127d27811b63ad27e6b002ea4efd39417297a0227996ad9b01141b6de733d41 SHA512 4219e7aadbeebdf6932c04f784434e4dd0f540bf4941d43c1830b1b5cad1f3928769b13897e24dd956b6bdee65fb1fbe902ee30685bca229b71e140d65367837
 EBUILD powertop-2.10.ebuild 3843 BLAKE2B f0d637015c7ed1dbf8f69c619630dcf7ea3a0a6fe1a9698da2dda5274a28d054c88ac884b8a7c6ca312c1bca4a582da6e008476a548592fdf60ad357083b85b0 SHA512 c9f56ee6c4d33ad52d4774ffc96b791f7c82c677aa5e439a84c9ee7d4e7c6205163b7ede16c3e30cf10bbee3835fd16d6cbd7aa5c955c8a303f5830842c2d494
 EBUILD powertop-2.11.ebuild 3690 BLAKE2B 145b1787828fc13066f4e076e311b39e5ac22ea990591fe5817b6410d6b16e5c686b9d2c1fe839e9e20653dc920eaaadfc98529d40f523f38f1a9c6ca00ffe7b SHA512 e13aa9b1cef15c80f5f69a9c51bcb286a2211c4c5161b281cb4e879fc970bb7e607a829c987093c1f8b9087f6dbaa2a7649eb905496875220f99e19bf5f03786
-EBUILD powertop-9999.ebuild 3565 BLAKE2B 4c0ac9b2d9589ad9d6b304b7c92f10657a4698479d0750eaafee8470ac93b78d3754c408a5f9f5dc597921b5548525b8512716996b5f5581fb10c46133553f44 SHA512 2c608a6af5abd67d3042388ffb3a4ddbc26e4d5670e0f6aa9fa441e5db69a3d200fe7c9e2db62abe45a81463ad2b5168dceca4ae50fc4a5042ba72d4b0f2ba83
+EBUILD powertop-2.13.ebuild 3720 BLAKE2B d76e814d38362aa34bd075384b8f187fd340584156f56051c792aa4fba14ab5d7f9d81863074c933d33d8dc359643d7ddb8e9e229f6780f27e0404db60f7cc1d SHA512 137b409b54ff0f28ab8542203afe7ed7a8701ef4946d2c688fdf0bf45ea2f958a989c5249fbc1459078a39457d57c5d5fd508a04d4a59b157ca246991216027b
+EBUILD powertop-9999.ebuild 3602 BLAKE2B b52644b5010edb0cbad9a339a75edaca4ec98188da83ab5c4c16cd85e3cec5ef8613a5fe5622cfc1d0c43654b9073372e6a63fce14d54bfd1c22792181ae9ea3 SHA512 3e918cf6c3012fba1ba5acc486c5bd8c0791f8ff1dc6c4d139c1acb0b7a9cd319a7b50c9b1808ddfafafcf591ac9a0c9d81ee58c115a99b4be5045a553437338
 MISC metadata.xml 328 BLAKE2B b0558a511f51fb77479976e60fde11b9cc46f85af935d78d060a53a1d5b1dc2611721e3c1451e3d23229cb8db0bd2bd9c6bb902c9b0fca8f57718f53f16032a8 SHA512 9d17013502d4a90d7c41493c2e69f7bc20bfd834f6f2caa5b105f9cc3045b87382393903c08a8e25bd75faaa9371e2d5c16d2521a90a89dd08697069ce8e8f5d
diff --git a/sys-power/powertop/powertop-2.13.ebuild b/sys-power/powertop/powertop-2.13.ebuild
new file mode 100644
index 000000000000..2a324272186d
--- /dev/null
+++ b/sys-power/powertop/powertop-2.13.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://github.com/fenrus75/powertop.git"
+
+if [[ ${PV} == "9999" ]] ; then
+	GIT_ECLASS="git-r3"
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/fenrus75/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 arm ~arm64 ~ppc sparc x86 ~amd64-linux ~x86-linux"
+fi
+
+inherit autotools ${GIT_ECLASS} linux-info
+
+DESCRIPTION="tool to diagnose issues with power consumption and power management"
+HOMEPAGE="https://01.org/powertop/ https://github.com/fenrus75/powertop/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls unicode X"
+
+DEPEND="
+	dev-libs/libnl:3
+	sys-apps/pciutils
+	sys-libs/ncurses:=[unicode?]
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	sys-devel/autoconf-archive
+	>=sys-devel/gettext-0.20.2
+"
+RDEPEND="
+	${DEPEND}
+	X? ( x11-apps/xset )
+	virtual/libintl
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.8-ncurses_tinfo.patch
+)
+
+pkg_setup() {
+	CONFIG_CHECK="
+		~X86_MSR
+		~DEBUG_FS
+		~PERF_EVENTS
+		~TRACEPOINTS
+		~NO_HZ_IDLE
+		~HIGH_RES_TIMERS
+		~HPET_TIMER
+		~CPU_FREQ_STAT
+		~CPU_FREQ_GOV_ONDEMAND
+		~FTRACE
+		~BLK_DEV_IO_TRACE
+		~TRACING
+	"
+	ERROR_KERNEL_X86_MSR="X86_MSR is not enabled in the kernel, you almost certainly need it"
+	ERROR_KERNEL_DEBUG_FS="DEBUG_FS is not enabled in the kernel, you almost certainly need it"
+	ERROR_KERNEL_PERF_EVENTS="PERF_EVENTS should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_TRACEPOINTS="TRACEPOINTS should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_NO_HZ_IDLE="NO_HZ_IDLE should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_HIGH_RES_TIMERS="HIGH_RES_TIMERS should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_HPET_TIMER="HPET_TIMER should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_CPU_FREQ_STAT="CPU_FREQ_STAT should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_CPU_FREQ_GOV_ONDEMAND="CPU_FREQ_GOV_ONDEMAND should be enabled in the kernel for full powertop function"
+	ERROR_KERNEL_FTRACE="FTRACE needs to be turned on to enable BLK_DEV_IO_TRACE"
+	ERROR_KERNEL_BLK_DEV_IO_TRACE="BLK_DEV_IO_TRACE needs to be turned on to enable other config options"
+	ERROR_KERNEL_TRACING="TRACING should be enabled in the kernel for full powertop function"
+	linux-info_pkg_setup
+	if linux_config_exists; then
+		if kernel_is -lt 3 7 0; then
+			if linux_chkconfig_present SND_HDA_INTEL; then
+				CONFIG_CHECK="~SND_HDA_POWER_SAVE"
+				ERROR_KERNEL_SND_HDA_POWER_SAVE="SND_HDA_POWER_SAVE should be enabled in the kernel for full powertop function"
+				check_extra_config
+			fi
+		fi
+		if kernel_is -lt 3 9 0; then
+			CONFIG_CHECK="~EVENT_POWER_TRACING_DEPRECATED"
+			ERROR_KERNEL_EVENT_POWER_TRACING_DEPRECATED="EVENT_POWER_TRACING_DEPRECATED should be enabled in the kernel for full powertop function"
+			check_extra_config
+		fi
+		if kernel_is -lt 3 19; then
+			CONFIG_CHECK="~PM_RUNTIME"
+			ERROR_KERNEL_PM_RUNTIME="PM_RUNTIME should be enabled in the kernel for full powertop function"
+			check_extra_config
+		else
+			CONFIG_CHECK="~PM"
+			ERROR_KERNEL_PM="PM should be enabled in the kernel for full powertop function"
+			check_extra_config
+		fi
+		if kernel_is -lt 4 11; then
+			CONFIG_CHECK="~TIMER_STATS"
+			ERROR_KERNEL_TIMER_STATS="TIMER_STATS should be enabled in the kernel for full powertop function"
+			check_extra_config
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Bug 599114
+	sed -i '1s|^|AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX])|' configure.ac || die
+
+	echo "\"${PV}\"" > version-short
+	echo "${PV}" > version-long
+
+	eautoreconf
+}
+
+src_configure() {
+	export ac_cv_search_delwin=$(usex unicode -lncursesw -lncurses)
+	econf $(use_enable nls)
+}
diff --git a/sys-power/powertop/powertop-9999.ebuild b/sys-power/powertop/powertop-9999.ebuild
index 39fc48dc78de..04d3fef7a87a 100644
--- a/sys-power/powertop/powertop-9999.ebuild
+++ b/sys-power/powertop/powertop-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,7 +30,8 @@ DEPEND="
 
 BDEPEND="
 	virtual/pkgconfig
-	sys-devel/gettext
+	sys-devel/autoconf-archive
+	>=sys-devel/gettext-0.20.2
 "
 RDEPEND="
 	${DEPEND}
diff --git a/sys-power/thermald/Manifest b/sys-power/thermald/Manifest
index 1c5a0c9b1f4c..504f6be20df3 100644
--- a/sys-power/thermald/Manifest
+++ b/sys-power/thermald/Manifest
@@ -1,9 +1,8 @@
 AUX thermald 374 BLAKE2B 2ea9775b75acb7797c078c8c7786d442bd9c98102cd53073e1c040a0972dfd6be8424a62889a666573ee72ce5273bc53169fae5762bc0005a1c899324a699d27 SHA512 17f1c2133e47e897c4a5407ef622adfebb8498fce7ea9bf17cfd177269a3d869bdc21c3d2558010e9669ddc53e69e521bb4c1e112c51010168aa3c074c259e02
-AUX thermald-1.9-size_t-format.patch 2375 BLAKE2B 1f795d846a6012f69bb5c5e27a2b503a206a85565ef18c5d13b01bc6f12c80b81e565d78cc1d6cd5d494d639fbba712ccfbdca8b893ef4e2d6a5ac274a9bd908 SHA512 dc470f499bac68e8154f90d233321b0ca2932a814e2e59fd5ab1bb9a1163fc25e9be26557bef987676591f05effa99ad5b4e00139b9492c6b354345c0cc478b3
 DIST thermald-1.9.1.tar.gz 429116 BLAKE2B 7b6105b25e89e68f82368e154b4ca2a826192d596c7427ebea3c6aa726c28b5409cf7e0f022132e2ee47423cc732a6d37b2eb05236c579e2c725820516f6993f SHA512 7c16871316fb264abad9d0182cf8b6b5c1b4c747093672e74b7db2b6aa4f322fafdf6a94bfc8a11f427f7be2ee5e5691dc6a25bb5357ce45e7afe868f89b89e1
-DIST thermald-1.9.tar.gz 427380 BLAKE2B 1954531838c0fc3677ab8f91476d5670a6b5d067d580c7c570b37e5d8d8ac408cacb218531bc8363cfd56eee9331291959ff11851550c6c782a43b19bacca01a SHA512 71fa6e9fc2f55623ed0acdb65f9699d5ea2c89c4092546a73d53ac3ea3ca0a5c60f3360c8bef0af9daeeecfe9a20411d9e4d25bc1d89349cfe83ebb03ba387a8
 DIST thermald-2.1.tar.gz 435310 BLAKE2B 7a5b67c2f8cb56276427188a91cc0d0c5cc7975ea847abe6eddc41b5dba77f908bc1ab97234568c65b2bcbb3bfff7881412cef2f8aa422139c64d5fb089a6511 SHA512 407d743d2799f84cd178e17ef694f0825f03db4ce80a47df95826bc26a9f142b80295905707fcba41bd5268d411a03478cd9d432545f9e2f1394d7d61539e169
+DIST thermald-2.2.tar.gz 435659 BLAKE2B 500189b924594e5b1d68adc776b3ad0c1d531d4259c65dd77f9166648c9b4273c52e1f8222254ec6500b3d37e39deb4ec862443728d50e9be95dee8e43496645 SHA512 f2c691061436699aef5bb7d9681370306dc7a64c453208911077c9a4af50e35b32247fc0a35853bb314d0e4289dd07f6116a3ade7fa278b521ed9b7b13db949b
 EBUILD thermald-1.9.1.ebuild 922 BLAKE2B d5481f4bf46b429ce06e194fab8665d7edc46ec73c15ca16479b33455fc6d71f51c204e01cadbfe39dd970f386168c4ec33d1b8edbc8e74fbd31d5830e5f2c1d SHA512 3f4bef46cf1ec58ee2da8f243102ef7710efde6357d60e150d4ada0310111d49a7c176e844799b9763d33ef484dae84db60261fd9b269b09ae2f0caf21073450
-EBUILD thermald-1.9.ebuild 969 BLAKE2B 552f431a2298645c8ba1bffa43c44ebb0a377a82ddb567bbb3755597ded23adcc338c874a4151ee9a6180b999b6d58ef8b9624b41f44af6fcd062f94a1bed2df SHA512 0eba38d7d333c205349366da32a1ba4e522d8914a30c9ace287917be586ae8d53fc515c9a6a87bf4b8a52def446fff670b269e7a952674737086bcced0f27ead
 EBUILD thermald-2.1.ebuild 924 BLAKE2B 22a248bb8becef8fbb2dd4ebca3d20e879508bae70a3b2690b9e27f04451a9d0c44cca46d1e82f20560d5cdb9c81c5843433fefd7b8af3a39f64c272b22696dc SHA512 de36365498bf49ef44c2e5830e1def6bf4a9fdf8f8888d7b66b9890b433a2c981f40c63b51df77aff4fa248d0587b1f5785a1ec7298f940edc584e5bd3105c07
+EBUILD thermald-2.2.ebuild 922 BLAKE2B d5481f4bf46b429ce06e194fab8665d7edc46ec73c15ca16479b33455fc6d71f51c204e01cadbfe39dd970f386168c4ec33d1b8edbc8e74fbd31d5830e5f2c1d SHA512 3f4bef46cf1ec58ee2da8f243102ef7710efde6357d60e150d4ada0310111d49a7c176e844799b9763d33ef484dae84db60261fd9b269b09ae2f0caf21073450
 MISC metadata.xml 643 BLAKE2B 92fe71631920f61dd6667c2dc8b4e27d2ea1e9bfb64509a9b4a9b0a72e9b4a11b7ae06febf120564c28272b9e079cf71a114bca620ce2651ec615439dd5ff9b3 SHA512 bad363023e01da0232632d54b2cb65dce89a7c70441f05fc873640a29f6fd4ec4ea30b00f94f723a786de1eef87b94673dad455102bc57a11573346e3a8ae2e8
diff --git a/sys-power/thermald/files/thermald-1.9-size_t-format.patch b/sys-power/thermald/files/thermald-1.9-size_t-format.patch
deleted file mode 100644
index 324b3b97f79a..000000000000
--- a/sys-power/thermald/files/thermald-1.9-size_t-format.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From dcdaf523393a6e7c07b5a510c573223722b0289b Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Thu, 1 Aug 2019 08:15:52 +0800
-Subject: [PATCH] Use correct format specifier for size_t
-
-%zu instead of %lu, otherwise on 32 bit:
-
-| In file included from ../git/src/thd_common.h:27,
-|                  from ../git/src/thd_zone.h:30,
-|                  from ../git/src/thd_zone.cpp:34:
-| ../git/src/thd_zone.cpp: In member function 'void cthd_zone::update_highest_trip_temp(cthd_trip_point&)':
-| ../git/src/thd_zone.cpp:322:16: error: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'std::vector<cthd_trip_point>::size_type' {aka 'unsigned int'} [-Werror=format=]
-|   322 |   thd_log_info("trip_points.size():%lu\n", trip_points.size());
-|       |                ^~~~~~~~~~~~~~~~~~~~~~~~~~  ~~~~~~~~~~~~~~~~~~
-|       |                                                            |
-|       |                                                            std::vector<cthd_trip_point>::size_type {aka unsigned int}
-| ../git/src/thermald.h:82:57: note: in definition of macro 'thd_log_info'
-|    82 | #define thd_log_info(...) g_log(NULL, G_LOG_LEVEL_INFO, __VA_ARGS__)
-|       |                                                         ^~~~~~~~~~~
-| ../git/src/thd_zone.cpp:322:38: note: format string is defined here
-|   322 |   thd_log_info("trip_points.size():%lu\n", trip_points.size());
-|       |                                    ~~^
-|       |                                      |
-|       |                                      long unsigned int
-|       |                                    %u
-
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
----
- src/thd_zone.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/thd_zone.cpp b/src/thd_zone.cpp
-index dd485d9..eb81d61 100644
---- a/src/thd_zone.cpp
-+++ b/src/thd_zone.cpp
-@@ -319,7 +319,7 @@ void cthd_zone::add_trip(cthd_trip_point &trip) {
- void cthd_zone::update_highest_trip_temp(cthd_trip_point &trip)
- {
- 	if (trip_points.size()) {
--		thd_log_info("trip_points.size():%lu\n", trip_points.size());
-+		thd_log_info("trip_points.size():%zu\n", trip_points.size());
- 		for (unsigned int j = trip_points.size() - 1;; --j) {
- 			if (trip_points[j].get_trip_type() == trip.get_trip_type()) {
- 				thd_log_info("updating existing trip temp \n");
diff --git a/sys-power/thermald/thermald-1.9.ebuild b/sys-power/thermald/thermald-2.2.ebuild
index 03b369146fb8..fefc84b2d488 100644
--- a/sys-power/thermald/thermald-1.9.ebuild
+++ b/sys-power/thermald/thermald-2.2.ebuild
@@ -26,7 +26,6 @@ S=${WORKDIR}/thermal_daemon-${PV}
 DOCS=( thermal_daemon_usage.txt README.txt )
 
 src_prepare() {
-	eapply "${FILESDIR}/${P}-size_t-format.patch"
 	default
 	eautoreconf
 }
diff --git a/sys-power/tuxedo-cc-wmi/Manifest b/sys-power/tuxedo-cc-wmi/Manifest
index b0c97bb8ddff..8c339a7340f1 100644
--- a/sys-power/tuxedo-cc-wmi/Manifest
+++ b/sys-power/tuxedo-cc-wmi/Manifest
@@ -1,3 +1,3 @@
 DIST tuxedo-cc-wmi-0.1.4.tar.gz 25089 BLAKE2B f71eedeb02a301caf27ef12326cc9c163631788c5b991e980e78b618ff767ab4c0f6a609ebffefb3afa830b781e6043bdb85b9e4659927838c280d0aaa3b300c SHA512 a41faa7290859410eb8446dd02ee2bdf87a3085882f3fc6b968701bb14bab87bd6bcd4bf9839111c62eab8a8751f8c2cf378aa7297879f7781f73998199e5f27
-EBUILD tuxedo-cc-wmi-0.1.4.ebuild 569 BLAKE2B 3974f0fb4364fb433e08462fed3ec19d40c25993a6076e293a3e0d56bfb3407c787492f2e76a4e47c60e9730d3ce5406203c22929eadd0ad44a42d51f70ffea5 SHA512 cf62cad568bfeaf5a322af17b0388f5c6a555ebbfb5266d6b38127709dfde9bdee3c6f9a39f8c305ad3039c3f3a485a6a8dcd666043417e04b0f723ef6777a9c
+EBUILD tuxedo-cc-wmi-0.1.4-r1.ebuild 569 BLAKE2B 3974f0fb4364fb433e08462fed3ec19d40c25993a6076e293a3e0d56bfb3407c787492f2e76a4e47c60e9730d3ce5406203c22929eadd0ad44a42d51f70ffea5 SHA512 cf62cad568bfeaf5a322af17b0388f5c6a555ebbfb5266d6b38127709dfde9bdee3c6f9a39f8c305ad3039c3f3a485a6a8dcd666043417e04b0f723ef6777a9c
 MISC metadata.xml 257 BLAKE2B 509de9ecfaa2a50c6900b1ec69308a827823d04fcd54b77575b9b18b71b508bfeecb4be9e230324cadb1bc70674516d4e6744a0dd50ed0556fd71b7b2458f86e SHA512 5f02fa3554ba0e4203073be18f3962b6b6c4dec5b7bf36dcadd9de78827b31c766573268d6c9b092a4e7382557fe423fc31899cfe963ddbfae9ee6015c05c920
diff --git a/sys-power/tuxedo-cc-wmi/tuxedo-cc-wmi-0.1.4.ebuild b/sys-power/tuxedo-cc-wmi/tuxedo-cc-wmi-0.1.4-r1.ebuild
index 3810dcdaae36..3810dcdaae36 100644
--- a/sys-power/tuxedo-cc-wmi/tuxedo-cc-wmi-0.1.4.ebuild
+++ b/sys-power/tuxedo-cc-wmi/tuxedo-cc-wmi-0.1.4-r1.ebuild