gentoo Easter resync : 12.04.2020

30 files changed, 669 insertions, 31 deletions

diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 31aaf969904b..093fd6d2badc 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 a851e93d18c7..04d8ee895318 100644
--- a/sys-power/acpi_call/Manifest
+++ b/sys-power/acpi_call/Manifest
@@ -3,11 +3,12 @@ AUX acpi_call-1.1.0-linux-4.12.patch 315 BLAKE2B 49c7e3145e367169ac028dbc854659b
 AUX acpi_call-1.1.0-linux-4.14.patch 317 BLAKE2B f1d5067511174466d551e9747f7160c12eff6e6a83473c98b51baf80206c2b8e5045ab2c2085451794b8ccc1fe6820c7bfa38de9c280cdb248971f965d64bab8 SHA512 3c823712a59b0bf739fe06cc5dffe6b895ff869dd78457615452a13ef810976a27b7a9ef5bf61189135b8d278e2df340199f36e8016d6e90b040317d468b9b39
 AUX acpi_call-3.17-linux-4.12.patch 256 BLAKE2B ed94570d4e815c92ec5228ef5d6caefe55649902105cf071c4c1c83fa8b2240b9ace2c25c6a66528a50be0998aaf17b16e83a254b87de4b77365497a3f1a2b5d SHA512 49c12db4eefa721599096947faadc48e328f5d3a37eba5ee6f833124e228632e2cc0a871d7ee8427c1e798a1adf67df75674061c2cc6c05ffca1a3b02cffd742
 AUX acpi_call-3.17-linux-4.14.patch 341 BLAKE2B 8402c22a3f016f8b2b00805f6ce1db3b3a6005e4ce83ee43764ef248eaa5b49ba368b9dcb11ca923dd84f1bede7a1c39d64f72a09f882e53d2f3e59c1fa9e1a3 SHA512 d49ab94daf00cad83226060d8b884ba00f1d970fc1f3872ef5f47ef3ff657dc6f4d7d6656b76f8a685f6b865fb1b4d338f96f16cada5672f0e9560d6c0565dab
+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.ebuild 802 BLAKE2B 8fff4c3f825053f56c7906ca7941c0d935c81538afd2faee64e60f9462efc544fd892a1a14c6374b1aa289c3d8fc2e9e5e36609bce5bc75f953e466ddd25fe2c SHA512 dc1d88033e5d5d8ba011fd4e298d93dff76e3503821f8fb194fbb545ce6111583a5548ea2ec9912a6175451a0a8ee984c0b10079e53b373580f30b2e3b75ecac
+EBUILD acpi_call-3.17.ebuild 838 BLAKE2B 71d8509fcad153659845160310a601feb3c4c92fb771901a5f129beba01305baa449d046811c04483b958609879c6bc970415f7c8de7086d28196b8e6c2b4a11 SHA512 fa46311f5e21706a4e01646451c95dcb8f1f423a739d1277654eb02ad8927d61b0f8e074499a997797754b0734830e957c1d850c831dd740b7a9d860cbce3aba
 EBUILD acpi_call-9999.ebuild 715 BLAKE2B 7b6725b9122d01c93c9ebb60230f41dcb0a5036311e648be94d8e584ce2b216fce012d271b6d093e509b371b0965e90784fd907a524755a5d7026b8482bed88a SHA512 d82b65acee84a956e54a3c767868ba4d79dba200ee8bd02921af71555cfc5c2cf20443c7739cf73224c325696b655e6161fe879be9c725b8a6eb4bacfa310bbd
 MISC metadata.xml 304 BLAKE2B e9ebd649d5b044096dfa71d43332fb12c6577abdff31ae880ab30f7d5bf83e244afa2a57d9ca135b5378dae1c45f7b8422c08caf24e5c0a604f76c3fe1774e01 SHA512 024d05a8863a152a45a50bc42018182781d46b83c0b83dc24f844909432f7a90c2e041a6aca6b57932a773082749639500e6a8a9823fcb64b54705cb753801ce
diff --git a/sys-power/acpi_call/acpi_call-3.17.ebuild b/sys-power/acpi_call/acpi_call-3.17.ebuild
index 186d45388dc7..62437ef10975 100644
--- a/sys-power/acpi_call/acpi_call-3.17.ebuild
+++ b/sys-power/acpi_call/acpi_call-3.17.ebuild
@@ -29,6 +29,7 @@ BUILD_TARGETS="default"
 PATCHES=(
 	"${FILESDIR}/${P}-linux-4.12.patch"
 	"${FILESDIR}/${P}-linux-4.14.patch"
+	"${FILESDIR}/${P}-linux-5.6.patch"
 )
 
 src_compile() {
diff --git a/sys-power/acpi_call/files/acpi_call-3.17-linux-5.6.patch b/sys-power/acpi_call/files/acpi_call-3.17-linux-5.6.patch
new file mode 100644
index 000000000000..c05c7e3c337e
--- /dev/null
+++ b/sys-power/acpi_call/files/acpi_call-3.17-linux-5.6.patch
@@ -0,0 +1,36 @@
+From d128d10c5f1554254ce55f3c79ca08390279d628 Mon Sep 17 00:00:00 2001
+From: "Jason A. Donenfeld" <Jason@zx2c4.com>
+Date: Sun, 8 Mar 2020 13:04:55 +0800
+Subject: [PATCH] Support newer proc_ops interface for 5.6
+
+Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
+---
+ acpi_call.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/acpi_call.c b/acpi_call.c
+index 801798b..65eb344 100644
+--- a/acpi_call.c
++++ b/acpi_call.c
+@@ -348,11 +348,18 @@ static ssize_t acpi_proc_read( struct file *filp, char __user *buff,
+     return ret;
+ }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)
+ static struct file_operations proc_acpi_operations = {
+         .owner    = THIS_MODULE,
+         .read     = acpi_proc_read,
+         .write    = acpi_proc_write,
+ };
++#else
++static const struct proc_ops proc_acpi_operations = {
++        .proc_read  = acpi_proc_read,
++        .proc_write = acpi_proc_write,
++};
++#endif
+ 
+ #else
+ static int acpi_proc_read(char *page, char **start, off_t off,
+-- 
+2.25.1
+
diff --git a/sys-power/acpid/Manifest b/sys-power/acpid/Manifest
index 4eef274a0006..75e18df4cc98 100644
--- a/sys-power/acpid/Manifest
+++ b/sys-power/acpid/Manifest
@@ -3,8 +3,8 @@ DIST acpid-2.0.32.tar.xz 155768 BLAKE2B 829b2f78f497d9c0bbd90d952cadad96beece307
 DIST sys-power_acpid_2.0.29-r1_extras.tar.xz 2548 BLAKE2B 4568f0e44d33382fd294248d48c8852f689f0a6082d9b74b33b77918d3ce21d7f1bf8a3aafeaa252e8fe170b3829155344a256f01fe80414369f02d50a17ff55 SHA512 f2c366c50c75790df32a1f6573b7de640fd09a97c4598155ebd0aad2eba118961ddc82fe0fbb4dc935aa5b6d7fcfe3ade73fff555b4588b0e4579a1028bef12f
 DIST sys-power_acpid_2.0.32-r1_extras.tar.xz 2204 BLAKE2B 7f3b6c7c93c0989071c4e1046a0e07311c617673621aef13ca71e407be7d67b97ace3251daa5b91be23f84d882a8f17bc02f180d3d1946bd880c0f071e7cdbf1 SHA512 5012687d1afec41f5cb617f767c6a97dcfaa118b3261dfe7588ce8be1732edd183abbe405f33ae2441cdb3a11606d52defcf0554f455d04941cdde8d0f4bf822
 DIST sys-power_acpid_2.0.32-r2_extras.tar.xz 2196 BLAKE2B 0975289f7cff6ce24523246f1daac22149d69c410e07a19a5952457e269fc1f736bd3636c93038f660c411f3085d375250c31dc3de3ac1bc6335a97e1fa3dea3 SHA512 f49cf3f75f5db4ca454d29330ae40461deb1109f076e140188a7560fedd78970572a6c023146c4d33c0778ff65056abcbc66725c000ece8e6861419d02d0c6ca
-EBUILD acpid-2.0.31.ebuild 1962 BLAKE2B 4095dace6957e021be73c336ccf9b33049abcdc789be44820a99f06f092f0b309b6629ebeab97246fdbe12a72fedee5c4fb7a4ce029f79a11e7f79ea05b046a7 SHA512 a4178b8e8d93aabadc3b9be21728ff387a7e2259ff78fa4431cb32cbd913e6463c942bbaf19cce2132b3b1bd7a20ceae0d59a24be313337598cd345130b7a1b1
-EBUILD acpid-2.0.32-r1.ebuild 2038 BLAKE2B bb67f9e76b81cad3ce466def481c7295f11be51ce17dbe0948d6508730053e0248d0328673f9b230afc2b3bce8d2f486c3feea213dcfd68bc265f5d7fef7aca2 SHA512 73798af4800fbaa71e55a495895300787818a49d5edd63b0c80c1ece5dd4cd8ba98ff2294e89c0ad1ef97e44466663b2faf2d22bcb62703574d55698b8893034
+EBUILD acpid-2.0.31.ebuild 1963 BLAKE2B 849a3193c21d908549798a9a553ae4af336f45a4450a115c9311993dffaa2c7d2bba42a040305120be72e835ae5256d8ff65aa9e8bb0c5b3659906537bf22e4e SHA512 7243e2dba4a56c2c59620615a1752abc4978f67e199d6bbd841eb1cab8c8c5ae2eb3e2ddf84693a786e8e5204b4fcf0708ee2b00b6d28fd08b9864a5df0158e4
+EBUILD acpid-2.0.32-r1.ebuild 2038 BLAKE2B 2c9c8d25586695143f9e036f886793829a539095392b6ba74ac055e55e6a0ec0d90c33d797d195da667fe4488d8dbd88865d60064cd2c60d6ee068a459467609 SHA512 3cad647a535eabcdfd73beef403b7c910254cdd5782340dab3e8d564bdc5834722b134dda6a2aaca832abf87d1b37444f984206a27dca8836026b586341f0931
 EBUILD acpid-2.0.32-r2.ebuild 2041 BLAKE2B b21de548d49079ba9a81421d15cce55ae3aacddce5784ba89f454efb6add0a3a301583b45065027b0319c45f11ab239f4bd979236876c6bce25381ef9b561e70 SHA512 4ae907eb235113edb057da145fe450fd07f48999f0b125863625f01d14e074a8bf675a3af39ec0f86c9248ea0057f9edfe5acd26fad386a7c655762ea56f090c
 EBUILD acpid-2.0.32.ebuild 1966 BLAKE2B ec877eb0334d301be61fe4ebc3d458e1c4b98895137d92d8fa6e6c320aa83c9b2199fe61a40ceb5d0fa3cb153da7c11f005d41705b1f0955c1bc223d28e72882 SHA512 ac8d3f67c720261d3d3757118e8196df612e024c0025ffd55861089e85ba8e63fee0ff6daa0ae5d64f90f02f3fd4ecc45f08c884a1afceb2c07d9b4f8579c1f3
 MISC metadata.xml 327 BLAKE2B f6c546808131faaccf65580107772b21a3fe59b681b1ae6c66846ce230c9bb4ce9209287ff88f150f4bd691d71cdbf7e2c4fd4ac8a049a2e8b9d9ab57967c1b3 SHA512 8e93170bc36e09c1cf6c1db7eb751cc1ddf737d3ed240ef69a5ba00279ea3d9e92c5ba5185faa5f2f3c86fca9922adfb8e8e0ffe673817984948aa941a2a7a3a
diff --git a/sys-power/acpid/acpid-2.0.31.ebuild b/sys-power/acpid/acpid-2.0.31.ebuild
index 16f46b163fbf..e03295fad8d4 100644
--- a/sys-power/acpid/acpid-2.0.31.ebuild
+++ b/sys-power/acpid/acpid-2.0.31.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ia64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 x86"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-apm )"
diff --git a/sys-power/acpid/acpid-2.0.32-r1.ebuild b/sys-power/acpid/acpid-2.0.32-r1.ebuild
index bee6b1236412..89f652d187ba 100644
--- a/sys-power/acpid/acpid-2.0.32-r1.ebuild
+++ b/sys-power/acpid/acpid-2.0.32-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ia64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 x86"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-apm )"
diff --git a/sys-power/bbswitch/Manifest b/sys-power/bbswitch/Manifest
index 04316790e197..61e0662f0b2f 100644
--- a/sys-power/bbswitch/Manifest
+++ b/sys-power/bbswitch/Manifest
@@ -1,6 +1,8 @@
 AUX bbswitch-0.8-kernel-4.12.patch 528 BLAKE2B 4c4b5dbf29338b9a8bbd4cfc974466bee4f5e73c9c39f1093dc48ab2db721743e425c12fdc80e4cfa12c296897ec367f6b255679cf5c4305bf7a844619da38d7 SHA512 52b8f8cc378d915f0671fff193041c13d756db4d4b8db01594d9411a1422e1d8ff0e364d041f472b15b7c581a2fec583ecd86bcb5477b3703c9d993504a6ab61
+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-9999.ebuild 1060 BLAKE2B 1e0d64798d692efb54aaae8c3abf8fef445b383d7758aa78c4622440206108893d5bb9bc40c715a5534935b029d7240d53dc29d3a3af899db48493f75267320b SHA512 51d60415904a06222a4c8ad6eeb353bbd659dd22a25d189d97e95e51e29f04b16aa770714d40f7b384a9538158a63447bf4ae7f1341df1dcdb2358d2892c7a6a
+EBUILD bbswitch-0.8-r3.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-r3.ebuild b/sys-power/bbswitch/bbswitch-0.8-r3.ebuild
new file mode 100644
index 000000000000..90af8d532409
--- /dev/null
+++ b/sys-power/bbswitch/bbswitch-0.8-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Bumblebee-Project/${PN}.git"
+	EGIT_BRANCH="develop"
+else
+	PATCHES=(
+		"${FILESDIR}/${PN}-0.8-kernel-4.12.patch"
+		"${FILESDIR}/${PN}-0.8-kernel-5.6.patch"
+	)
+	SRC_URI="https://github.com/Bumblebee-Project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 x86"
+fi
+
+DESCRIPTION="Toggle discrete NVIDIA Optimus graphics card"
+HOMEPAGE="https://github.com/Bumblebee-Project/bbswitch"
+
+SLOT="0"
+LICENSE="GPL-3+"
+IUSE=""
+
+DEPEND="
+	virtual/linux-sources
+	sys-kernel/linux-headers
+"
+RDEPEND=""
+
+MODULE_NAMES="bbswitch(acpi)"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	BUILD_TARGETS="default"
+	BUILD_PARAMS="KVERSION=${KV_FULL} CC=$(tc-getCC)"
+}
+
+src_prepare() {
+	# Fix build failure, bug #513542
+	sed "s%^KDIR :=.*%KDIR := ${KERNEL_DIR}%g" -i Makefile || die
+
+	default
+}
+
+src_install() {
+	einstalldocs
+
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}"/bbswitch.modprobe bbswitch.conf
+
+	linux-mod_src_install
+}
diff --git a/sys-power/bbswitch/bbswitch-9999.ebuild b/sys-power/bbswitch/bbswitch-9999.ebuild
index ad44354463cd..7efe9cf7ccdc 100644
--- a/sys-power/bbswitch/bbswitch-9999.ebuild
+++ b/sys-power/bbswitch/bbswitch-9999.ebuild
@@ -1,16 +1,19 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit linux-mod
+inherit linux-mod toolchain-funcs
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Bumblebee-Project/${PN}.git"
 	EGIT_BRANCH="develop"
 else
-	PATCHES=( "${FILESDIR}/${PN}-0.8-kernel-4.12.patch" )
+	PATCHES=(
+		"${FILESDIR}/${PN}-0.8-kernel-4.12.patch"
+		"${FILESDIR}/${PN}-0.8-kernel-5.6.patch"
+	)
 	SRC_URI="https://github.com/Bumblebee-Project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
@@ -34,7 +37,7 @@ pkg_setup() {
 	linux-mod_pkg_setup
 
 	BUILD_TARGETS="default"
-	BUILD_PARAMS="KVERSION=${KV_FULL}"
+	BUILD_PARAMS="KVERSION=${KV_FULL} CC=$(tc-getCC)"
 }
 
 src_prepare() {
diff --git a/sys-power/bbswitch/files/bbswitch-0.8-kernel-5.6.patch b/sys-power/bbswitch/files/bbswitch-0.8-kernel-5.6.patch
new file mode 100644
index 000000000000..aa95a21cdb04
--- /dev/null
+++ b/sys-power/bbswitch/files/bbswitch-0.8-kernel-5.6.patch
@@ -0,0 +1,52 @@
+From c2f808efeb0820edf23dbb66362ad3091321253f Mon Sep 17 00:00:00 2001
+From: Mateusz Mandera <mateusz.mandera@protonmail.com>
+Date: Tue, 31 Mar 2020 15:11:30 +0200
+Subject: [PATCH] Use proc_ops structure for kernel version >= 5.6.0
+
+Since 5.6.0, proc_create requires a proc_ops* argument
+instead of file_operations*.
+---
+ bbswitch.c | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/bbswitch.c b/bbswitch.c
+index d64cdae..9ca0e42 100644
+--- a/bbswitch.c
++++ b/bbswitch.c
+@@ -42,6 +42,9 @@
+ #include <linux/suspend.h>
+ #include <linux/seq_file.h>
+ #include <linux/pm_runtime.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)
++#include <linux/proc_fs.h>
++#endif
+ 
+ #define BBSWITCH_VERSION "0.8"
+ 
+@@ -382,6 +385,15 @@ static int bbswitch_pm_handler(struct notifier_block *nbp,
+     return 0;
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)
++static struct proc_ops bbswitch_fops = {
++    .proc_open   = bbswitch_proc_open,
++    .proc_read   = seq_read,
++    .proc_write  = bbswitch_proc_write,
++    .proc_lseek = seq_lseek,
++    .proc_release= single_release
++};
++#else
+ static struct file_operations bbswitch_fops = {
+     .open   = bbswitch_proc_open,
+     .read   = seq_read,
+@@ -389,6 +401,7 @@ static struct file_operations bbswitch_fops = {
+     .llseek = seq_lseek,
+     .release= single_release
+ };
++#endif
+ 
+ static struct notifier_block nb = {
+     .notifier_call = &bbswitch_pm_handler
+-- 
+2.26.0
+
diff --git a/sys-power/iasl/Manifest b/sys-power/iasl/Manifest
index 9e3f1d4cc2b9..fec0fa23e072 100644
--- a/sys-power/iasl/Manifest
+++ b/sys-power/iasl/Manifest
@@ -2,11 +2,19 @@ AUX iasl-20140214-nostrip.patch 253 BLAKE2B 744ae94cdf798b4d0b593de3e69d408c61b7
 AUX iasl-20140828-locale.patch 349 BLAKE2B b435e40f257103acfaa8f74c8dd5ed66850ce53e3c7577ce59e1773b738dfaff89c58dbdb4517a0213b9b8c1ab4cbdcdf78e2dbe3c0a4857cf4f91b437b23cb9 SHA512 311c20b7d5cdc7e3ce5e2a84e508eb898cd506efa720d1e4bb017ff0b34d786ffed30168b7dcf16b4bee988702d00258289e5e320e0a3bb3cf630a1a71145640
 AUX iasl-20190703-Makefile.patch 2185 BLAKE2B d3785e324332ddf71e7d3dadff9d62bbd863d82e63961ed099c62a59e3d8c11a76120e1c13723a009abb6eba78e5b7e7b1dabe19133bdb0634fbd6ee0623ea71 SHA512 68ce1372c919fd8e07c8b2a06897a3f5eb4d846ebd11ab4d28e9b3d7b2aebec1e574d929e78be4ec8a520113e63ec0cc40ac4c3c4ffa09bc4097343b00d849eb
 AUX iasl-20190703-gcc10-fno-common.patch 2257 BLAKE2B e98ef965a8053a9047de922fb401ef5a59b0742c6c0d0de0893ebc81da3ba834d98b202fd0059e1f7bb807ff278c3c7a54a33b6bcd1873a3531a910b85403931 SHA512 7470ba23c182f6cb74ccd3d833972e1d0b50196e25824706c3ab2b184deea5bd5b2a678cb62b0c9b9523ac88a38ad17340f103911890df0de8c463a05f6ca0c0
+AUX iasl-20200214-Makefile.patch 2205 BLAKE2B d066a9370d7e3ff3590492f0f4efdb61fcf13f92c8ea04157d06e56025f38612ab27f1aa5ef98d541f47e9b6ed29426b91740c893da77b5f04f31c1c7d2f9493 SHA512 673902c3d7902a9f5be48c26b33a36398be2552e35d9db70ca1e346b2cf51e357710498f431888082f83811752caf24f6be85760b8f4a14d468f2aea33e5a04c
+AUX iasl-20200326-Makefile.patch 2227 BLAKE2B eaf6d7cb51f65f430d207cea7c54c2f5489dd3dc3fd2930035af37576cf2c22b237c229a6bfe2f5ffa5c76c3bd8c4b138d360c4c0beba7f2558f1efabf577afa SHA512 07be0ba4034d3b3c19b7e29e66ec41b433c32bc077622db89520b89f52f44ad8069a4c50a9da6579eec130672b5187e0217e6dacc3b0c638b1d9ba54d83f91b3
 DIST acpica-unix-20190215.tar.gz 1809671 BLAKE2B aff312636ff0f38e7708a251daad84689cb64abd0dd241d57063b5e229c50a3a8bd3e509c2fe9918da4ab9179b07d2207e01eb7c9f94670d0758eec73bb2714b SHA512 7a469097d82721ea55f86eeefa2a67fc6be6b3d2e0382bb830f64c7daf7d99e2bce60011fb68e54b3891939b1fed91da03de9d19c2d4020d3412656cce2c09b0
 DIST acpica-unix-20190703.tar.gz 1845874 BLAKE2B bc217c40c1154fd562f28e0eb22e8bf664c3ae451e7087e046845623beebc7422d1629a21fed61a82e31c89b3040427fd524bfcde562873cc42191f44f88e6ad SHA512 f687f407aaa14684e5d09d21a2e3c197c490b710a633bca491412875f8dfa9164ba5c2c8531946f82713c24d32f47ff4ea3c108c7c124adb83a69e19a6b31163
+DIST acpica-unix-20200214.tar.gz 1846645 BLAKE2B 6be4bfcf5cc0680da661ef36fef265d467e1d50651bd1330831f6980efaa25c7681d738e8591ec9cb32cfd2e855a969c481967e4779bf1754ada23d1d89af160 SHA512 d41692bad249ce300acc5b581723f1ddb077254a15448351738ad4b2639772c79d440befb22018b8927a83a2b69bb0325e6e5b6bbfd2215586435c6cea91f914
+DIST acpica-unix-20200326.tar.gz 1850373 BLAKE2B 4b0c8548ff4b99fb774eb4301687368da2149bfaf68e02c638eecf890fc89974dadd75acc844233ecde8cfac2b98d75df79df2bb1bd6993dc8d502b3156c1012 SHA512 253ea7fc2bb540dd0cfa55552648c33562f39efb9a9b8cbab751ad7f4fea9bd3800eb241afb30313140e2008889b62b82b4427624e087a275353d81555403e76
 DIST acpitests-unix-20190215.tar.gz 2094957 BLAKE2B 3a31ae398650a1dc3ac70843c43868a35501cbe0376d1d2437a3568aad1fb63b3d83270653c009885b014894c69dcfff075bbf5d18290220067bcd1804a38097 SHA512 80060a61c80b01231b10e04dd65c2ab41d42824c439152cf128328890cee39ef597dc3f5bc535db4566cb322394bfce2760e1835df781d699818049cad5a4419
 DIST acpitests-unix-20190703.tar.gz 2009568 BLAKE2B 3d1a527c55a94390381e33a46111bed7ecd3761627b87e24d9345b0d38d9fbd32c371adab3f19a0ca05a99c4532491bc9b466805e231a5ecd8c7a6af346577fb SHA512 d9bab56198dc00fc11b50a199035eb9dc164c226441cd00e163ecd6362d399a50058afa7582f86e62a085b990772995fc10e077581a3b04a6c6b2e95e055f167
+DIST acpitests-unix-20200214.tar.gz 2212834 BLAKE2B 91d119c7f6d3532006a7ea3e233becca09834a7a133a2281774dfc44221d357c0e2457de3d37647609e0e100c9ba61695730feb0f5da40b16bf4411240e4d715 SHA512 b4d37d4784d3fbb697f244477c085e433efa152bc4c4a06d336b216358405252a77c331f4e792f5fa9b912d6f5f200aa1b6379f1b5064e58be12cf8d4415ee15
+DIST acpitests-unix-20200326.tar.gz 2212897 BLAKE2B d88d3d900ac06d165c4a50cddd65495b75db345009b10e76d9f38197ba42efe3ea396ec9828bef62da1fd96ac331d95623c03194e08b00037ff1234321fcf0d3 SHA512 332b4ed016cee48662a5f4572e6d170461f02ee1386109a3970fbe8d104f2a2b14c19235ea43ae9b26e8faf9ef9597cb3d2148e498741361aca62978d0b62189
 EBUILD iasl-20190215.ebuild 3445 BLAKE2B 9792dffc74c16505a41c2252c5d4a335844887eecd8af91da748d957cccfa23a28f70cbce1da02e54b66bb05f46a73c0cb3009ff696e3b27d71f79d56e3d71f7 SHA512 7c0d5a3364bc571d5ae0e5f62c6b275ec0ca739f481384384039330010ed4d9a2c5fd43b293bb5d2a8c35a8e9b3336819a9cd175a1bb2717a087cade4f35e3af
 EBUILD iasl-20190703-r1.ebuild 3443 BLAKE2B 9184933e5686736e7e3928b48c2026b2b272bdedbef58c7cb7939395c0483b6afd41458a9eafc5d8f967bdd9c12075eabdd7e4ef1a6a88cd43d882b7501c710e SHA512 b9b96ea8732399be47c19f41af9b5f26b53f0490f874946913221303942038f897aa69ff6608984c5d594ee5c17aaafe174fdfbab0d9cc5d95925ef7f3f9a61f
 EBUILD iasl-20190703.ebuild 3468 BLAKE2B 44d91a87906aba6b210b76afeb53864ede0ac20cefc01b6d7e440e47232a760345051ff8231d731d6b8af58d154fe74bc479406fcf245de61498cf13ea81de31 SHA512 74aaa2af5f80cff0c63c50e7ccf46c1f7afd809d30fabb785f79e660a767a782c2a54c1af409d4d8992d170d25e17668c2e7570a43881e96210fd4b50ad4ae0c
+EBUILD iasl-20200214.ebuild 3442 BLAKE2B 8bc42b93ba2553346043908f1adbbeca6e30cf37e8eaae948825a14c8e937e2a7bde61fe96b31cbabb1d02dccfcc2c111ca14386926a29d23dd6cecbc00af53f SHA512 8839c32dbf926432ef043760a02054184a6b5b32cdf91ff37db7c1c03d035431a2053f700a034919e41e69dbe6d42be08ec6c6e20606ba6b091eb565a0175525
+EBUILD iasl-20200326.ebuild 3388 BLAKE2B 757e04a8a3d41634185e365e196f574611cd41bd71881b31efbbf36ad6d164ff29c082498b62834887b57d1736d200f73f97460a9c668a01a53c06c170c39324 SHA512 1c7ae6118c067d805986223a279dc2968e2e988cd01a53026261cbe9b9c22021e9f7c564629784d1fa9bba0f24cf1f365b61c14133e712dde608feda27a56830
 MISC metadata.xml 330 BLAKE2B 4c0218788685cc36fddf5d759c091898a71c01bf22e9e7995d1f5da37cd0508c961895b4265bda462062676f3e722205f0a6b10f64db718110f7afe8f088d136 SHA512 4d7760ec82f64ce49478c359b32aa100ca9778471033741b7fd89905d075b3a067fda413c6dcc5115d7755d0ab6cd9d30a848ff674f1c83ef6205c51ec501a65
diff --git a/sys-power/iasl/files/iasl-20200214-Makefile.patch b/sys-power/iasl/files/iasl-20200214-Makefile.patch
new file mode 100644
index 000000000000..e5fb563cf922
--- /dev/null
+++ b/sys-power/iasl/files/iasl-20200214-Makefile.patch
@@ -0,0 +1,105 @@
+--- a/generate/unix/acpiexec/Makefile
++++ b/generate/unix/acpiexec/Makefile
+@@ -256,12 +256,12 @@
+ endif
+ 
+ ifneq ($(ACPI_HOST),_QNX)
+-LDFLAGS += -lpthread
++LIBS += -lpthread
+ endif
+ 
+ ifneq ($(ACPI_HOST),_APPLE)
+ ifneq ($(ACPI_HOST),_QNX)
+-LDFLAGS += -lrt
++LIBS += -lrt
+ endif
+ endif
+ 
+--- a/generate/unix/Makefile.config
++++ b/generate/unix/Makefile.config
+@@ -35,15 +35,14 @@
+ .SUFFIXES :
+ PROGS = acpibin acpidump acpiexamples acpiexec acpihelp acpinames acpisrc acpixtract iasl
+ ACPI_HOST ?= _CYGWIN
+-CC ?=    gcc
+ 
+ #
+ # Common defines
+ #
+ OBJDIR =     obj
+ BINDIR =     bin
+-COMPILEOBJ = $(CC) -c $(CFLAGS) $(OPT_CFLAGS) -o $@ $<
+-LINKPROG =   $(CC) $(OBJECTS) -o $(PROG) $(LDFLAGS) $(OPT_LDFLAGS)
++COMPILEOBJ = $(CC) -c $(CFLAGS) $(CPPFLAGS) $(OPT_CFLAGS) -o $@ $<
++LINKPROG =   $(CC) $(LDFLAGS) $(OBJECTS) -o $(PROG) $(LIBS)
+ PREFIX ?=    /usr
+ INSTALLDIR = $(PREFIX)/bin
+ UNAME_S := $(shell uname -s)
+@@ -76,7 +75,7 @@
+ INSTALLFLAGS ?= -f
+ else
+ INSTALL =    install
+-INSTALLFLAGS ?= -m 555 -s
++INSTALLFLAGS ?= -m 555
+ endif
+ 
+ INSTALLPROG = \
+@@ -153,26 +152,18 @@
+ #
+ ifeq ($(M32),TRUE)
+ CFLAGS +=-m32
+-LDFLAGS +=-m32
++LIBS +=-m32
+ endif
+ 
+ #
+ # Optionally disable optimizations. Optimization causes problems on
+ # some compilers such as gcc 4.4
+ #
+-ifneq ($(NOOPT),TRUE)
+-OPT_CFLAGS += -O2
+-else
+-OPT_CFLAGS += -O0
+-endif
+ 
+ #
+ # Optionally disable fortify source. This option can cause
+ # compile errors in toolchains where it is already defined.
+ #
+-ifneq ($(NOFORTIFY),TRUE)
+-OPT_CFLAGS += -D_FORTIFY_SOURCE=2
+-endif
+ 
+ CFLAGS += \
+     -D$(HOST)\
+@@ -264,11 +255,11 @@
+ #YACC=      byacc
+ #YFLAGS +=
+ #
+-YACC=       bison
++YACC=       LC_ALL=C bison
+ YFLAGS +=   -y
+ 
+ MACROPROC=  m4
+ MFLAGS=     -P -I$(ASL_COMPILER)
+ 
+-LEX=        flex
++LEX=        LC_ALL=C flex
+ LFLAGS +=   -i -s
+--- a/generate/unix/Makefile.rules
++++ b/generate/unix/Makefile.rules
+@@ -12,12 +12,12 @@
+ 
+ $(PROG) : $(INTERMEDIATES) $(MISC) $(OBJECTS)
+ 	@echo "- Link" $(PROG)
+-	@$(LINKPROG)
++	$(LINKPROG)
+ 	$(RENAMEPROG)
+ 
+ $(OBJDIR)/%.o : %.c $(HEADERS) $(ACPICA_HEADERS)
+ 	@echo $(PROG)  $<
+-	@$(COMPILEOBJ)
++	$(COMPILEOBJ)
+ 
+ clean :
+ 	@rm -f $(PROG) $(PROG).exe $(OBJECTS) $(OBJDIR)/*.o $(INTERMEDIATES) $(MISC)
diff --git a/sys-power/iasl/files/iasl-20200326-Makefile.patch b/sys-power/iasl/files/iasl-20200326-Makefile.patch
new file mode 100644
index 000000000000..4848c80ec663
--- /dev/null
+++ b/sys-power/iasl/files/iasl-20200326-Makefile.patch
@@ -0,0 +1,106 @@
+--- a/generate/unix/acpiexec/Makefile
++++ b/generate/unix/acpiexec/Makefile
+@@ -256,12 +256,12 @@
+ endif
+ 
+ ifneq ($(ACPI_HOST),_QNX)
+-LDFLAGS += -lpthread
++LIBS += -lpthread
+ endif
+ 
+ ifneq ($(ACPI_HOST),_APPLE)
+ ifneq ($(ACPI_HOST),_QNX)
+-LDFLAGS += -lrt
++LIBS += -lrt
+ endif
+ endif
+ 
+--- a/generate/unix/Makefile.config
++++ b/generate/unix/Makefile.config
+@@ -35,15 +35,14 @@
+ .SUFFIXES :
+ PROGS = acpibin acpidump acpiexamples acpiexec acpihelp acpinames acpisrc acpixtract iasl
+ ACPI_HOST ?= _CYGWIN
+-CC ?=    gcc
+ 
+ #
+ # Common defines
+ #
+ OBJDIR =     obj
+ BINDIR =     bin
+-COMPILEOBJ = $(CC) -c $(CFLAGS) $(OPT_CFLAGS) -o $@ $<
+-LINKPROG =   $(CC) $(OBJECTS) -o $(PROG) $(LDFLAGS) $(OPT_LDFLAGS)
++COMPILEOBJ = $(CC) -c $(CFLAGS) $(CPPFLAGS) $(OPT_CFLAGS) -o $@ $<
++LINKPROG =   $(CC) $(LDFLAGS) $(OBJECTS) -o $(PROG) $(LIBS)
+ PREFIX ?=    /usr
+ INSTALLDIR = $(PREFIX)/bin
+ UNAME_S := $(shell uname -s)
+@@ -76,7 +75,7 @@
+ INSTALLFLAGS ?= -f
+ else
+ INSTALL =    install
+-INSTALLFLAGS ?= -m 555 -s
++INSTALLFLAGS ?= -m 555
+ endif
+ 
+ INSTALLPROG = \
+@@ -161,26 +160,18 @@
+ #
+ ifeq ($(M32),TRUE)
+ CFLAGS +=-m32
+-LDFLAGS +=-m32
++LIBS +=-m32
+ endif
+ 
+ #
+ # Optionally disable optimizations. Optimization causes problems on
+ # some compilers such as gcc 4.4
+ #
+-ifneq ($(NOOPT),TRUE)
+-OPT_CFLAGS += -O2
+-else
+-OPT_CFLAGS += -O0
+-endif
+ 
+ #
+ # Optionally disable fortify source. This option can cause
+ # compile errors in toolchains where it is already defined.
+ #
+-ifneq ($(NOFORTIFY),TRUE)
+-OPT_CFLAGS += -D_FORTIFY_SOURCE=2
+-endif
+ 
+ CFLAGS += \
+     -D$(ACPI_HOST)\
+@@ -272,12 +263,12 @@
+ #YACC=      byacc
+ #YFLAGS +=
+ #
+-YACC=       bison
++YACC=       LC_ALL=C bison
+ YFLAGS +=   -y
+ 
+ MACROPROC=  m4
+ MFLAGS=     -P -I$(ASL_COMPILER)
+ 
+-LEX=        flex
++LEX=        LC_ALL=C flex
+ LFLAGS +=   -i -s
+ DLFLAGS +=   -i
+--- a/generate/unix/Makefile.rules
++++ b/generate/unix/Makefile.rules
+@@ -12,12 +12,12 @@
+ 
+ $(PROG) : $(INTERMEDIATES) $(MISC) $(OBJECTS)
+ 	@echo "- Link" $(PROG)
+-	@$(LINKPROG)
++	$(LINKPROG)
+ 	$(RENAMEPROG)
+ 
+ $(OBJDIR)/%.o : %.c $(HEADERS) $(ACPICA_HEADERS)
+ 	@echo $(PROG)  $<
+-	@$(COMPILEOBJ)
++	$(COMPILEOBJ)
+ 
+ clean :
+ 	@rm -f $(PROG) $(PROG).exe $(OBJECTS) $(OBJDIR)/*.o $(INTERMEDIATES) $(MISC)
diff --git a/sys-power/iasl/iasl-20200214.ebuild b/sys-power/iasl/iasl-20200214.ebuild
new file mode 100644
index 000000000000..a52227dac14a
--- /dev/null
+++ b/sys-power/iasl/iasl-20200214.ebuild
@@ -0,0 +1,129 @@
+# 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 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20190703-gcc10-fno-common.patch
+	"${FILESDIR}"/${PN}-20200214-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/iasl/iasl-20200326.ebuild b/sys-power/iasl/iasl-20200326.ebuild
new file mode 100644
index 000000000000..050b1a001e8a
--- /dev/null
+++ b/sys-power/iasl/iasl-20200326.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 ~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/pm-quirks/Manifest b/sys-power/pm-quirks/Manifest
index c70e2cd74c0a..8b390b3c2049 100644
--- a/sys-power/pm-quirks/Manifest
+++ b/sys-power/pm-quirks/Manifest
@@ -1,3 +1,3 @@
 DIST pm-quirks-20100619.tar.gz 10033 BLAKE2B dd6e455ac8dd76789b0698cce77be682e886afdc2ae547850e10c091b0f531609f8bf071cd87182dc0533585444220a1ed266dc04bfaed132671a65d56d9bfc8 SHA512 e20244fb72475945e08010d7ec19db2c017c1a04fa01d3d08c03d704d7f07f9c087bac6a5a44242cc8ed6cec5db47bc06a8862dd0f74088a565d37b6d7b95afc
-EBUILD pm-quirks-20100619-r1.ebuild 471 BLAKE2B 6373b3fcc438e2affca49610c3b29e1c821565b4d87eb49f4038d1b3408058ad9c8bf6925b14fc36bab43d047755ff1e841a8aa975bd41214b527dbf71f079c3 SHA512 0becbfb32b3f17ffa3df2dd6410d7affeb7ed29e8552ab7ace3f27eb8068e54390bbfedf41f4fe65ca6e9659b1191dd41b75b855abb16c1a5af34144e668586a
+EBUILD pm-quirks-20100619-r1.ebuild 472 BLAKE2B 2d7ed61cde96da7152b1024df6c2b79cf5e24842511af75283c032a9ceb1ea116f98ea863c88b5ef51e0a8102af954502d71d58481640ac04ac4bec5c4777af6 SHA512 414e067584671fa69758ef6a50176c872aa0b27a35040b252c127e586987f85dffe1bc908790d21991e0587438a44a3b80dc95c35ddeee18d645032d4bd61d63
 MISC metadata.xml 270 BLAKE2B 9c2dafa0390cfc7b94b5c44505d72021bf57cf8ffb35be7a3327f4316c3e4b2dbbfa0325d97243a8ea933440a5678cc5d35c639f5aa210b1d5ceb8ab65eb5d90 SHA512 92c366ec57074ced42e6f9960f97d1cd1a022dba7450b51f3617a6a5e00c755496dfa84aa4ac259f4b00c676366b1eaa3ec30eeb9bcb0bf41253d1910005db2f
diff --git a/sys-power/pm-quirks/pm-quirks-20100619-r1.ebuild b/sys-power/pm-quirks/pm-quirks-20100619-r1.ebuild
index c896eeafaf40..6be0547c41cd 100644
--- a/sys-power/pm-quirks/pm-quirks-20100619-r1.ebuild
+++ b/sys-power/pm-quirks/pm-quirks-20100619-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://pm-utils.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}"
diff --git a/sys-power/pm-utils/Manifest b/sys-power/pm-utils/Manifest
index 934e95f2e99e..23c067598d6d 100644
--- a/sys-power/pm-utils/Manifest
+++ b/sys-power/pm-utils/Manifest
@@ -15,6 +15,6 @@ AUX power.d/pci_devices 1391 BLAKE2B 5da4f067b6b7e6d6905fb719cdbead8abf65d347ea3
 AUX power.d/usb_bluetooth 1121 BLAKE2B abcd8ab1e9b455dacadd5ca9627a63e9bb61c6c49912d644283c299c10171d27b684d48166058f64e1a2ebdb24f04492bf728015e3e9f33f7612da3c8d903e13 SHA512 b96abfdb8745f320ac3f1f368d1095195c68b0a56270aea4c5ad61e913ddc1641c5b5e1aadc6225d78f88956c4ffb2a396e031de02b9ecced09fac09765701bf
 AUX sleep.d/50unload_alx 316 BLAKE2B b674a3b9480c77836dc7137dedd4639704b428a6109f7e13971ef45ee328e157c7b4304e12ed0e022298c68d6fc4d2aafbb2da4a5b50d27366e6991ff027320b SHA512 64e7f77088a6157c90024d26ae6afde40abffc17d8ec2775e6a4ed17fac6c6fc1787c9f1b02cd0f4cd9e18dd74502f84e894006875b7dcacc39e509b3e0d86b0
 DIST pm-utils-1.4.1.tar.gz 208687 BLAKE2B dde7992acf1b28378021f4bd433a8e08c37bb35035af19d8b811cf8a22c141ded5cc02caf3e2ffd7119592eefcd941e4ddebb0dfbe715007788ea201cb96d073 SHA512 5bc9479fe75f120aee136befeb24c8d7d85f61410b551177ed61fd1b4ea9cce7989796b067e357ea93b44b4ae9f66311687066f188236c5efdfd3750695a8017
-EBUILD pm-utils-1.4.1-r6.ebuild 2913 BLAKE2B a62f763dde1fc57760fdfbadd53d69e9cce0f12a7731f64f4593f20940eb7e21bd64746700e745dfc8ec653b90f7b758c7a1fd53551c8540699d67ae5afca4dc SHA512 a87010a40972c79bdc36b741fef40e61b626f361a4d40499fac696ef3687bcff950d70cae245c359b86fddcac611da963a67b25c72a15ad1430f1a5aec71fbe5
-EBUILD pm-utils-1.4.1-r7.ebuild 2957 BLAKE2B 69c4c938ad167c599b46a1313236de45e306e6f33f2d47259b77d302616ab4628a79d2c893a6d84445fda5e09ddd105f5dc6f8236e1ee28f30e63794068b804c SHA512 1b4067cebe4a3f1e4ebb08408eff3ab97d19bb4af6860c24481385155f0ddfcd146be7af2c33c13da8bcc1b4f1825d1748970706376f7c22e37be3169315be62
+EBUILD pm-utils-1.4.1-r6.ebuild 2914 BLAKE2B 7010fb2a2225ee2e82d513f82d44bf771462ad88da12c229de36da0f0c5f235ce3b8b08aa65ac64b696b0de4d47fb9af31abfec63105f87c38274435b4649ff2 SHA512 80440890a8cf4245984ba20146b756b1677ed07b396604d16fcd30ebe32ac28e563456c6b40b6c2cec7a558e922170e3a6c39d6fa2fb8870469a3d0797380433
+EBUILD pm-utils-1.4.1-r7.ebuild 2958 BLAKE2B d6682a59f2bfee19428292a17f27ab3460075a23907f5323ed4bb691a59bf8a0a7ff8a8f051f120ac31828dc1642c51761b49db55df6bf891c4d3affd42b05c8 SHA512 731c270de8041ee0165557544a364de70a7ca1773886b8373e571aa623b2ea9978b7e95556829b0d04e0f78b7c49925dd0d37a250b831782c4b6c5d8f1e2920a
 MISC metadata.xml 321 BLAKE2B 17786e84c4ddae5272489e8238655805099de241a1ffa04c985434d4a35c902d2f5a39c8a288dc1c35d6c4d54167d4ccf8439982faee55418ff8872e2ca6aac6 SHA512 8bbd7192ac92567bef9234c1725dd9abd12fbb2809d961d0f6690f05b9477e0d07ef6056a516b1eddb1c533c6b80560c9924d74f1e2fe57f682ca1e622354563
diff --git a/sys-power/pm-utils/pm-utils-1.4.1-r6.ebuild b/sys-power/pm-utils/pm-utils-1.4.1-r6.ebuild
index 504b185e5dd7..7f54b68cd96f 100644
--- a/sys-power/pm-utils/pm-utils-1.4.1-r6.ebuild
+++ b/sys-power/pm-utils/pm-utils-1.4.1-r6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://pm-utils.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="alsa debug ntp video_cards_intel video_cards_radeon"
 
 vbetool="!video_cards_intel? ( sys-apps/vbetool )"
diff --git a/sys-power/pm-utils/pm-utils-1.4.1-r7.ebuild b/sys-power/pm-utils/pm-utils-1.4.1-r7.ebuild
index 5b3b22a742c5..c49848365a21 100644
--- a/sys-power/pm-utils/pm-utils-1.4.1-r7.ebuild
+++ b/sys-power/pm-utils/pm-utils-1.4.1-r7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://pm-utils.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="alsa debug ntp video_cards_intel video_cards_radeon"
 
 vbetool="!video_cards_intel? ( sys-apps/vbetool )"
diff --git a/sys-power/powermgmt-base/Manifest b/sys-power/powermgmt-base/Manifest
index 0c995a6ac12b..ba5b35fa9d85 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 1021 BLAKE2B 2f1a3c466c4c081c1e104c2401fa2a900238eccb78c25fae7ea24ee2d5dc8945afc1e7d409ec209e38c6e59ac9b9a6067531c97b4a98895cc75a47fdbee1311e SHA512 84d5e7223aac70cb0dc9572db8e4d3ab770f05e45876f7535c374f9b40400701b5dcafcdc11c432474c5f0d11471406c525a74dbce5821a2d2105ed804efbb80
+EBUILD powermgmt-base-1.31.ebuild 1022 BLAKE2B 7b8f81109450c12855ec643ab25cbffd6b39e0f5afb0a74de1b501dbc75924aa937ddff868490f2462063100eca6f8f5b02deb8d5f47d1ff51789c32bcdea08e SHA512 e6562c69dd6c251cf89bc845db0dcfc02a147ca3eb48752262a93011ad7100efcb1fba30a2805a4e433bdab5cd35857d56e4a52f02d9aeb55ca477ebc22b164e
 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.ebuild
index 3fa5d4ee9619..a4aebd1b9f2e 100644
--- a/sys-power/powermgmt-base/powermgmt-base-1.31.ebuild
+++ b/sys-power/powermgmt-base/powermgmt-base-1.31.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ia64 ppc ppc64 x86"
+KEYWORDS="amd64 arm ~ia64 ppc ppc64 x86"
 IUSE="+pm-utils"
 
 RDEPEND="!pm-utils? ( virtual/awk )
diff --git a/sys-power/powerstat/Manifest b/sys-power/powerstat/Manifest
index 26069d77cbd6..06890d7abc86 100644
--- a/sys-power/powerstat/Manifest
+++ b/sys-power/powerstat/Manifest
@@ -1,7 +1,7 @@
 AUX powerstat-0.02.17-makefile.patch 432 BLAKE2B d917331055d4c33df53e926ad7aa0fb8aec2d45d5d1f80f7dee4ac67ba351f8d5602304ac9d750c182b84ead33cea9a92cecc36bad1f1b1b1ae076461866c05f SHA512 f9da9311295b420bf1101a1a19aaa23617368319b7d825667195d66965ad292b111a2c8779d4a0183e9c1693892d848b686a53a1eb377e61b87f91eb597d71c8
-DIST powerstat-0.02.20.tar.gz 59127 BLAKE2B 893637b3b2ebb2969dcea34a02ff9c90aa1d08b2bb5fafcb80b6d41520e03b5696acc6020a337afaac676eb29e48e5449f718a40d88535d114766d77f70f6fca SHA512 1bfe33cb06d4647c8552ee4b85e12f55475b3a0aa77aaa9cbd72ba11c9c67bb087d64dbda2b6362fb60440e30060e670eb6ba4b7f164f7ab306320994e54fabe
 DIST powerstat-0.02.21.tar.gz 59255 BLAKE2B 4a7416aaa29c89863b4f372a6b48a0f77250d80343a552a2aa882b2caad10cbb5cfed13510c8fcc5b7f5d4f6df5e0e6291d4ca4f46e6776fe0e671aceedd94de SHA512 776baf8092b0d4e791b18679cf397fb6fc4ba482e5a24ca8bd6b787bdab2106cd5f172a5c0233be5cbc139445f3430eb6290cfac2a4502e83928d2a5700be63c
-EBUILD powerstat-0.02.20.ebuild 550 BLAKE2B ed53a9fc2ad8a40eb4f45c9a19dfda3a77701d4c28c1bfa8ab004488c6fc20613587ec438b35b6f98bb51d8ae54086d4165ec34158ae6a6a0176620d95f25fc9 SHA512 e02f7061f81f66901cd5a388dc319dae9ee66dec404c68b0382f83b858db6e0b505d78f3ae0adaf2575048345b07f208e076cbcd6f9ff3ddd30f6b27cb6d1491
+DIST powerstat-0.02.22.tar.gz 59609 BLAKE2B bfb392a37fa5fe9f03360fcad3435c73b34a6a7be642ddf9ecc3f4d83efd38e67b287b53e91a4fd00c6c18700541ed0a2f901c0016e4ab6e2ec937f6cfe9c7bf SHA512 e11131a0c49dd11337444ec69f3f59c0e803d03d2b135f2364bed5b55029e9473621b5d8709e2019f461d56c34fa52c22173a5e55c1175044aca67f18f5c505b
 EBUILD powerstat-0.02.21.ebuild 542 BLAKE2B 0eb98edbb1850fad11328e79e704b6f86ce952943653831aab5fb09f5b9944b9f18c92e4b589b34f1214594566d0af0da29e2c119be1796499a529c3a85243f6 SHA512 61692e5b56403d6ec24f151255bb0ee9d6be024602bd3535825f1b647cf34d16da6d0357ae3a0c53b5ba7330b00d947ba728bced982a0611dcab6e8119ae241a
-EBUILD powerstat-9999.ebuild 531 BLAKE2B 2fc562f4da1d7a9261fbb429eac189375d7047296b6fd33f1c3596f32034b7e0457f5fbd60f3f33303d091fd4f82d5b177b1c4938012cfdf8148c1235079d61a SHA512 dd7e7f083efc2775ffa29e5ec1cf2b362f3d9949cbd565e5c07d8337d4a3eb29c24e13e8883d0a48089ae923cf29e62d8848d1621c4004ea490740daebcc8eb0
+EBUILD powerstat-0.02.22.ebuild 632 BLAKE2B e8f15c044440806558e577e8daa5016845998c73e7b59117cf987347c5baffb5fb91362415becffcf2dd4e9f282981747643cd4c2e23016680fbefe84b8504dd SHA512 6b1d5a42567efc032203a71d865334ae84007774753b0a94028aae21adf3bc0cf3c5a5a3bed95861fc25107a10427789c3d10b800b67bd7d66729e7682bf8264
+EBUILD powerstat-9999.ebuild 613 BLAKE2B 650b18e1d48b3eb859e73e10e36dda27ff87a39988f515ce0b003f4b4de16c6b674318e9dd1cf9a35890c7341f523a6692ecd4435e0322f61fb403bc11f2a835 SHA512 34b116b524169edddfef4d0a78a044bb26c9aa2486420e979cf98c5c8a6ad6ecb09279cac9c7b8822f3f6f21d112f7f108317bbebaa5a1b9ee3cbae3df179f7b
 MISC metadata.xml 858 BLAKE2B 75ca9db98e72e80d14d2f17970fe65183bca67ff52fa19e61101de1cad8bd8c5119b9cfe3286a67282c5cbdcdfe821b627dbffee7a04ceae0a158f2fb3f50462 SHA512 59311c93c878c4dd09141428ccfb72fa030b72538978ddd2b44c505c0e083a5a0dfe017c865dfaff27fdd3edf3abb9a78fd938e2e0d32ff92fa121ad27a84f1f
diff --git a/sys-power/powerstat/powerstat-0.02.20.ebuild b/sys-power/powerstat/powerstat-0.02.22.ebuild
index 9a3027b8978c..d4da91922c1a 100644
--- a/sys-power/powerstat/powerstat-0.02.20.ebuild
+++ b/sys-power/powerstat/powerstat-0.02.22.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
@@ -14,8 +14,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-# Don't compress manpages
-PATCHES=( "${FILESDIR}"/"${PN}"-0.02.17-makefile.patch )
+src_prepare() {
+	default
+
+	# Don't compress manpages
+	sed -i  -e '/install:/s/ powerstat.8.gz//' \
+		-e '/cp powerstat.8/s/.gz//' \
+		Makefile || die "sed failed"
+}
 
 src_compile() {
 	emake CC="$(tc-getCC)"
diff --git a/sys-power/powerstat/powerstat-9999.ebuild b/sys-power/powerstat/powerstat-9999.ebuild
index d86952ed42b3..b3ef9d2bcb8b 100644
--- a/sys-power/powerstat/powerstat-9999.ebuild
+++ b/sys-power/powerstat/powerstat-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
@@ -16,8 +16,14 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-# Don't compress manpages
-PATCHES=( "${FILESDIR}"/"${PN}"-0.02.17-makefile.patch )
+src_prepare() {
+	default
+
+	# Don't compress manpages
+	sed -i  -e '/install:/s/ powerstat.8.gz//' \
+		-e '/cp powerstat.8/s/.gz//' \
+		Makefile || die "sed failed"
+}
 
 src_compile() {
 	emake CC="$(tc-getCC)"
diff --git a/sys-power/thermald/Manifest b/sys-power/thermald/Manifest
index ef8bc8a0573e..78e605784e75 100644
--- a/sys-power/thermald/Manifest
+++ b/sys-power/thermald/Manifest
@@ -3,6 +3,6 @@ AUX thermald-1.8-x86-fix.patch 1314 BLAKE2B c563b2a23d1f96ae508c55bc17e3c8c02892
 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
-EBUILD thermald-1.9.1.ebuild 924 BLAKE2B 22a248bb8becef8fbb2dd4ebca3d20e879508bae70a3b2690b9e27f04451a9d0c44cca46d1e82f20560d5cdb9c81c5843433fefd7b8af3a39f64c272b22696dc SHA512 de36365498bf49ef44c2e5830e1def6bf4a9fdf8f8888d7b66b9890b433a2c981f40c63b51df77aff4fa248d0587b1f5785a1ec7298f940edc584e5bd3105c07
+EBUILD thermald-1.9.1.ebuild 923 BLAKE2B f61674468004dc218e2f6d9ac7ed76f2b2df2c5b50cecdcb98464fd8fab22fba91f6111999b7b0568baefd867fab63ae1620b23ff0915ac23179c0748aec3ff7 SHA512 fcd83849886e1ea017fd5804bdac79d49e8c936b6544497cfc9d91cd9e6bef38045d946c6d801078c6dee05463583bb3e82ceb04c35beb3f23e162c9a323043d
 EBUILD thermald-1.9.ebuild 969 BLAKE2B 552f431a2298645c8ba1bffa43c44ebb0a377a82ddb567bbb3755597ded23adcc338c874a4151ee9a6180b999b6d58ef8b9624b41f44af6fcd062f94a1bed2df SHA512 0eba38d7d333c205349366da32a1ba4e522d8914a30c9ace287917be586ae8d53fc515c9a6a87bf4b8a52def446fff670b269e7a952674737086bcced0f27ead
 MISC metadata.xml 643 BLAKE2B 92fe71631920f61dd6667c2dc8b4e27d2ea1e9bfb64509a9b4a9b0a72e9b4a11b7ae06febf120564c28272b9e079cf71a114bca620ce2651ec615439dd5ff9b3 SHA512 bad363023e01da0232632d54b2cb65dce89a7c70441f05fc873640a29f6fd4ec4ea30b00f94f723a786de1eef87b94673dad455102bc57a11573346e3a8ae2e8
diff --git a/sys-power/thermald/thermald-1.9.1.ebuild b/sys-power/thermald/thermald-1.9.1.ebuild
index b551961e47bf..d28e5e815911 100644
--- a/sys-power/thermald/thermald-1.9.1.ebuild
+++ b/sys-power/thermald/thermald-1.9.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/01org/thermal_daemon/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index 824cd217a9be..04f46c9cfc3b 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -3,5 +3,5 @@ AUX upower-0.99.9-pending-charge2.patch 2016 BLAKE2B 87a3078acf6c95dd8237f894aa2
 DIST upower-0.99.11.tar.xz 430128 BLAKE2B 77604d02a69de98e4c7b268d11d189aa42ace2d62b982fda9bc41131ce383ede32953ada31eae0bbfd1121600af5863924d48c636e60a28f505a6998dcac227c SHA512 67219a0beb98c97ac4512e4fe8ba83fc80a1035d1edb5367dda6911da50c672b047051f2f528e8703be29ab47547d92b6c71a7ef695226a1bdb5bc33e6d18803
 DIST upower-0.99.9.tar.xz 448408 BLAKE2B 5fa2436f33c94cffb736d8e3fad433acf58954cf06ccd403a0361214be5afc45d79ea279f3c5c48dcd58b92ccaf995777c95987d1749fd8c8c8958317e439570 SHA512 45eb587b0e5ffcce88bad8c56bc5efa30559748913016a55d58313280f5159378e5fbb4a9842c3a6409257bb97822d235f96b03704268b8471455c93eb05fe2f
 EBUILD upower-0.99.11.ebuild 2128 BLAKE2B 6b3dc32b67d954f9bf413ab30c41db426c6756fbe906dbec3a3d3dac38a9977076d859167638382b7c1f52ccff67b7b4ac48881b0cded81337d8266aefef7511 SHA512 a79ba936bbbdc7c507f4cb3616af4b2390769cc9dabc9194c2ed159283fc09349bbc53c0e91392814780aba9491a365398127da6d1432b87127ed9a7138f22c4
-EBUILD upower-0.99.9-r1.ebuild 2343 BLAKE2B 0f32746b467307491007266a46f7e198b2e966df9334f90c21c6d2f0899807f3974ddfda41d64a9ac581bbe6534a2acad7750e08a195f9947c241deb41681e2a SHA512 317f031f26674d5a7e3fdf1e8478220104026ad640ad967aac313e67b899f3d65a7f9ca964f3ee80febb78d20bfc986162e09b54de14cd53cfde3766701d25cb
+EBUILD upower-0.99.9-r1.ebuild 2344 BLAKE2B 3b286baaa33786c5964f86e0153900c1614f5ad37f5ecdd0d3d1c9587bd14ca1759169e3f3bab6f71f2347f7c0453f5b4903f6deb935b0ac3c196e21f139f33f SHA512 05292d9d5f90fbc9c0478db5d2b8b96fb17725cdae9411f4d5fd653d27e2402e50c07feb52b373754330e03210dd1f6735b144a5361c9c004c989a1fda19868a
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/sys-power/upower/upower-0.99.9-r1.ebuild b/sys-power/upower/upower-0.99.9-r1.ebuild
index d89ca96a39a4..a67c244bb30d 100644
--- a/sys-power/upower/upower-0.99.9-r1.ebuild
+++ b/sys-power/upower/upower-0.99.9-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.freedesktop.org/upower/upower/uploads/${COMMIT}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0/3" # based on SONAME of libupower-glib.so
-KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 
 # gtk-doc files are not available as prebuilt in the tarball
 IUSE="doc +introspection ios kernel_FreeBSD kernel_linux selinux"