gentoo (leap year) resync : 29.02.2020

25 files changed, 683 insertions, 57 deletions

diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index d10328d8b8d9..31aaf969904b 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 f93047eed1c1..a851e93d18c7 100644
--- a/sys-power/acpi_call/Manifest
+++ b/sys-power/acpi_call/Manifest
@@ -5,9 +5,9 @@ AUX acpi_call-3.17-linux-4.12.patch 256 BLAKE2B ed94570d4e815c92ec5228ef5d6caefe
 AUX acpi_call-3.17-linux-4.14.patch 341 BLAKE2B 8402c22a3f016f8b2b00805f6ce1db3b3a6005e4ce83ee43764ef248eaa5b49ba368b9dcb11ca923dd84f1bede7a1c39d64f72a09f882e53d2f3e59c1fa9e1a3 SHA512 d49ab94daf00cad83226060d8b884ba00f1d970fc1f3872ef5f47ef3ff657dc6f4d7d6656b76f8a685f6b865fb1b4d338f96f16cada5672f0e9560d6c0565dab
 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 779 BLAKE2B 7af9e860674878e18d42a2883049b1e9d04c4d627e4a80301a8a22e835fa7b56c10d129a4d5a11722d5a6dcfc931e916bc288f80380af12d9d10309d067d9e03 SHA512 164f8346a983c6b7c525dbc8206d5e0a51f4f3316b4efcd55cca2c884000967e4ea63280e182ca6512b8e69698e6af71f709ad4e3c64d5d7199dbd4b8bdc2245
-EBUILD acpi_call-1.1.0-r2.ebuild 834 BLAKE2B 191fcc7f9a1719a7af02a28891d37c3b4eadb976366e1be691f88e5bc6561a24f1a1f0390cf8fd88191a15e18a19e7356ad57e910b74f99285c9d9483e8858c1 SHA512 033a66d24857d3d833e5ce1f12b643fb781b212b851dce77fbe04e4b321b270ea8d0acbaa3ffdfb50fbbab589b4985ae13a2cdbebee86204f6c76cb5bc944b36
-EBUILD acpi_call-1.1.0.ebuild 710 BLAKE2B 2e1dff96cc5d66ad222f3420fc2407b66f0c4835e012338a053a4c3146197a7bb7352dbf19959f3b990648934706915f1ec0172125d344075a71a6ffafa02249 SHA512 bf3759f82e75bf3f7bdd3d5f208d5f57ebde4a6f1991b1945a6373185ec47c3723fd7edba0f0fa6f18d9e32cd0182996397e3a39dfc3c5387afca32c2f24e206
-EBUILD acpi_call-3.17.ebuild 801 BLAKE2B 65992dafbe2fda8eecd3f154a1c1391715718adc1c3f4669943001a3e1d50e2d6a4f1caf42944c9347abba3f79ecd5a33b11e89f0a9535fd5a34d7cde69e54d7 SHA512 637786c728a8794fa1207ab6b1c4c1f38d2617e3e012da86986f0d03d51901f3b67a387ed90be0f3445e0aa2689705368e364cd3bb7b97102aeeeaa1a8cc9bf0
-EBUILD acpi_call-9999.ebuild 714 BLAKE2B 3c0b337daa55722813dd98814e13d15cec183783d59f0d494b5aff9fd2b64ca016d3f4525adc85d6590e6871c2b50ca1469196747a82c2bba23ade4e06f92e3e SHA512 99ecf2e4dc29d037f59be6a81e55f4b6c7a88e9a680595238ba6750c55548212c2e85027c4357c3335c045abcb717ecca00e8f75d6c620e00505c38d091d9f0d
+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-9999.ebuild 715 BLAKE2B 7b6725b9122d01c93c9ebb60230f41dcb0a5036311e648be94d8e584ce2b216fce012d271b6d093e509b371b0965e90784fd907a524755a5d7026b8482bed88a SHA512 d82b65acee84a956e54a3c767868ba4d79dba200ee8bd02921af71555cfc5c2cf20443c7739cf73224c325696b655e6161fe879be9c725b8a6eb4bacfa310bbd
 MISC metadata.xml 304 BLAKE2B e9ebd649d5b044096dfa71d43332fb12c6577abdff31ae880ab30f7d5bf83e244afa2a57d9ca135b5378dae1c45f7b8422c08caf24e5c0a604f76c3fe1774e01 SHA512 024d05a8863a152a45a50bc42018182781d46b83c0b83dc24f844909432f7a90c2e041a6aca6b57932a773082749639500e6a8a9823fcb64b54705cb753801ce
diff --git a/sys-power/acpi_call/acpi_call-1.1.0-r1.ebuild b/sys-power/acpi_call/acpi_call-1.1.0-r1.ebuild
index b3f3963c65cf..2c15af2d8fe2 100644
--- a/sys-power/acpi_call/acpi_call-1.1.0-r1.ebuild
+++ b/sys-power/acpi_call/acpi_call-1.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,11 +26,11 @@ CONFIG_CHECK="ACPI"
 MODULE_NAMES="acpi_call(misc:${S})"
 BUILD_TARGETS="default"
 
-src_prepare(){
+src_prepare() {
 	epatch "${FILESDIR}/${P}-linux-3.17.patch"
 }
 
-src_compile(){
+src_compile() {
 	BUILD_PARAMS="KDIR=${KV_OUT_DIR} M=${S}"
 	linux-mod_src_compile
 }
diff --git a/sys-power/acpi_call/acpi_call-1.1.0-r2.ebuild b/sys-power/acpi_call/acpi_call-1.1.0-r2.ebuild
index 3b3733ffcc83..4dd39fb95a87 100644
--- a/sys-power/acpi_call/acpi_call-1.1.0-r2.ebuild
+++ b/sys-power/acpi_call/acpi_call-1.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,7 +32,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-linux-4.14.patch"
 )
 
-src_compile(){
+src_compile() {
 	BUILD_PARAMS="KDIR=${KV_OUT_DIR} M=${S}"
 	linux-mod_src_compile
 }
diff --git a/sys-power/acpi_call/acpi_call-1.1.0.ebuild b/sys-power/acpi_call/acpi_call-1.1.0.ebuild
index a2501dc4df20..fb33317d196b 100644
--- a/sys-power/acpi_call/acpi_call-1.1.0.ebuild
+++ b/sys-power/acpi_call/acpi_call-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,7 +26,7 @@ CONFIG_CHECK="ACPI"
 MODULE_NAMES="acpi_call(misc:${S})"
 BUILD_TARGETS="default"
 
-src_compile(){
+src_compile() {
 	BUILD_PARAMS="KDIR=${KV_OUT_DIR} M=${S}"
 	linux-mod_src_compile
 }
diff --git a/sys-power/acpi_call/acpi_call-3.17.ebuild b/sys-power/acpi_call/acpi_call-3.17.ebuild
index f6d0dad48fe6..186d45388dc7 100644
--- a/sys-power/acpi_call/acpi_call-3.17.ebuild
+++ b/sys-power/acpi_call/acpi_call-3.17.ebuild
@@ -31,7 +31,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-linux-4.14.patch"
 )
 
-src_compile(){
+src_compile() {
 	BUILD_PARAMS="KDIR=${KV_OUT_DIR} M=${S}"
 	linux-mod_src_compile
 }
diff --git a/sys-power/acpi_call/acpi_call-9999.ebuild b/sys-power/acpi_call/acpi_call-9999.ebuild
index 37b48a19f79c..8eddd39e1548 100644
--- a/sys-power/acpi_call/acpi_call-9999.ebuild
+++ b/sys-power/acpi_call/acpi_call-9999.ebuild
@@ -26,7 +26,7 @@ CONFIG_CHECK="ACPI"
 MODULE_NAMES="acpi_call(misc:${S})"
 BUILD_TARGETS="default"
 
-src_compile(){
+src_compile() {
 	BUILD_PARAMS="KDIR=${KV_OUT_DIR} M=${S}"
 	linux-mod_src_compile
 }
diff --git a/sys-power/acpid/Manifest b/sys-power/acpid/Manifest
index 9323edf72137..4eef274a0006 100644
--- a/sys-power/acpid/Manifest
+++ b/sys-power/acpid/Manifest
@@ -2,7 +2,9 @@ DIST acpid-2.0.31.tar.xz 155620 BLAKE2B 11338d72156dfd90f680367e23e373f8c4ee5e55
 DIST acpid-2.0.32.tar.xz 155768 BLAKE2B 829b2f78f497d9c0bbd90d952cadad96beece3070240bee69f2a5cf28903e9e5f969a3bf9000552c63a52c17f8b94285a181f4301449a9b64c573032d9a4d255 SHA512 c7afffdf9818504e1ac03b0ad693a05f772bfd07af9808262b3b6bb82ca4dabe6253c94e6dc59e5be6f0da9e815e8bcf2d3e16f02b23d0248b6bad4509e78be7
 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 2041 BLAKE2B 5509b0148ba6394a1a7f9f6a9a77ac19bf1b3acc8a9c77421466f90c5d483ef647f01ba3e3e3156bbbf83f39a768382eeb6b7744c8579d0bead430478c7954e6 SHA512 7d3540945cd84f7c7e2ae9224d5def260a9ec16e76e8471ac12fac26e538e75cfc853e4c1853faa2da6654dd8fb66d243d759a07af4ffc37837e6c879f25f838
+EBUILD acpid-2.0.32-r1.ebuild 2038 BLAKE2B bb67f9e76b81cad3ce466def481c7295f11be51ce17dbe0948d6508730053e0248d0328673f9b230afc2b3bce8d2f486c3feea213dcfd68bc265f5d7fef7aca2 SHA512 73798af4800fbaa71e55a495895300787818a49d5edd63b0c80c1ece5dd4cd8ba98ff2294e89c0ad1ef97e44466663b2faf2d22bcb62703574d55698b8893034
+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.32-r1.ebuild b/sys-power/acpid/acpid-2.0.32-r1.ebuild
index 8e7cc7e4da8a..bee6b1236412 100644
--- a/sys-power/acpid/acpid-2.0.32-r1.ebuild
+++ b/sys-power/acpid/acpid-2.0.32-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=6
@@ -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-r2.ebuild b/sys-power/acpid/acpid-2.0.32-r2.ebuild
new file mode 100644
index 000000000000..1f2a1dd70146
--- /dev/null
+++ b/sys-power/acpid/acpid-2.0.32-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit linux-info systemd
+
+DESCRIPTION="Daemon for Advanced Configuration and Power Interface"
+HOMEPAGE="https://sourceforge.net/projects/acpid2"
+EXTRAS_VER="2.0.32-r2"
+EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
+SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.xz
+	https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz
+	"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-apm )"
+DEPEND=">=sys-kernel/linux-headers-3"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~INPUT_EVDEV"
+	local WARNING_INPUT_EVDEV="CONFIG_INPUT_EVDEV is required for ACPI button event support."
+	[[ ${MERGE_TYPE} != buildonly ]] && check_extra_config
+}
+
+pkg_setup() { :; }
+
+PATCHES=(
+	"${WORKDIR}/${EXTRAS_NAME}/${PN}-2.0.32-powerbtn-gsd-power.patch" #702700
+)
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	newdoc kacpimon/README README.kacpimon
+	dodoc -r samples
+	rm -f "${D}"/usr/share/doc/${PF}/COPYING || die
+
+	exeinto /etc/acpi
+	newexe "${WORKDIR}/${EXTRAS_NAME}/${PN}-1.0.6-default.sh" default.sh
+	exeinto /etc/acpi/actions
+	newexe samples/powerbtn/powerbtn.sh powerbtn.sh
+	insinto /etc/acpi/events
+	newins "${WORKDIR}/${EXTRAS_NAME}/${PN}-1.0.4-default" default
+
+	newinitd "${WORKDIR}/${EXTRAS_NAME}/${PN}-2.0.26-init.d" ${PN}
+	newconfd "${WORKDIR}/${EXTRAS_NAME}/${PN}-2.0.16-conf.d" ${PN}
+
+	systemd_dounit "${WORKDIR}"/${EXTRAS_NAME}/systemd/${PN}.{service,socket}
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "You may wish to read the Gentoo Linux Power Management Guide,"
+		elog "which can be found online at:"
+		elog "https://wiki.gentoo.org/wiki/Power_management/Guide"
+		elog
+	fi
+
+	# files/systemd/acpid.socket -> ListenStream=/run/acpid.socket
+	mkdir -p "${ROOT%/}"/run
+
+	if ! grep -qs "^tmpfs.*/run " "${ROOT%/}"/proc/mounts ; then
+		echo
+		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
+	fi
+}
diff --git a/sys-power/iasl/Manifest b/sys-power/iasl/Manifest
index ca6a6ed9c8f7..9e3f1d4cc2b9 100644
--- a/sys-power/iasl/Manifest
+++ b/sys-power/iasl/Manifest
@@ -1,12 +1,12 @@
 AUX iasl-20140214-nostrip.patch 253 BLAKE2B 744ae94cdf798b4d0b593de3e69d408c61b720aebfd385aa2e22929530a8ef84aba92b4484fd2c35cb5c51e15e75e4d8bafcf3c9339b63ca54746db1c30835ad SHA512 1379fa71c03d880b53ed1ed34ec925d5e94fe6f636f86cfdbb5a1e65a1c6a82fb99a42b991be154c018da9eaaa70c7443fa4b5ca38eb03fe5cec4f0de1dd6364
 AUX iasl-20140828-locale.patch 349 BLAKE2B b435e40f257103acfaa8f74c8dd5ed66850ce53e3c7577ce59e1773b738dfaff89c58dbdb4517a0213b9b8c1ab4cbdcdf78e2dbe3c0a4857cf4f91b437b23cb9 SHA512 311c20b7d5cdc7e3ce5e2a84e508eb898cd506efa720d1e4bb017ff0b34d786ffed30168b7dcf16b4bee988702d00258289e5e320e0a3bb3cf630a1a71145640
-DIST acpica-unix-20180810.tar.gz 1797634 BLAKE2B 66b1c53874a7fa898fb042d0aac6001e623bb056ef17de46fc5a8e3ee5667178c47b5d8ecec194ebd8d2b0bdf947b5c85a1874c5d11a9ba3307a85418856ebdb SHA512 f37d8e0f1393b87cbfd9c6607104b05f85386583e4e5a5bcdbd2f049c122592a53e7cd56fe7da75e93bf3a424921fbc9291e7a39e06de80e6403abe042f869cd
+AUX iasl-20190703-Makefile.patch 2185 BLAKE2B d3785e324332ddf71e7d3dadff9d62bbd863d82e63961ed099c62a59e3d8c11a76120e1c13723a009abb6eba78e5b7e7b1dabe19133bdb0634fbd6ee0623ea71 SHA512 68ce1372c919fd8e07c8b2a06897a3f5eb4d846ebd11ab4d28e9b3d7b2aebec1e574d929e78be4ec8a520113e63ec0cc40ac4c3c4ffa09bc4097343b00d849eb
+AUX iasl-20190703-gcc10-fno-common.patch 2257 BLAKE2B e98ef965a8053a9047de922fb401ef5a59b0742c6c0d0de0893ebc81da3ba834d98b202fd0059e1f7bb807ff278c3c7a54a33b6bcd1873a3531a910b85403931 SHA512 7470ba23c182f6cb74ccd3d833972e1d0b50196e25824706c3ab2b184deea5bd5b2a678cb62b0c9b9523ac88a38ad17340f103911890df0de8c463a05f6ca0c0
 DIST acpica-unix-20190215.tar.gz 1809671 BLAKE2B aff312636ff0f38e7708a251daad84689cb64abd0dd241d57063b5e229c50a3a8bd3e509c2fe9918da4ab9179b07d2207e01eb7c9f94670d0758eec73bb2714b SHA512 7a469097d82721ea55f86eeefa2a67fc6be6b3d2e0382bb830f64c7daf7d99e2bce60011fb68e54b3891939b1fed91da03de9d19c2d4020d3412656cce2c09b0
 DIST acpica-unix-20190703.tar.gz 1845874 BLAKE2B bc217c40c1154fd562f28e0eb22e8bf664c3ae451e7087e046845623beebc7422d1629a21fed61a82e31c89b3040427fd524bfcde562873cc42191f44f88e6ad SHA512 f687f407aaa14684e5d09d21a2e3c197c490b710a633bca491412875f8dfa9164ba5c2c8531946f82713c24d32f47ff4ea3c108c7c124adb83a69e19a6b31163
-DIST acpitests-unix-20180810.tar.gz 2093850 BLAKE2B 519ce7807026dc11617ed9c34f294600ddae77a57a1fb76220da50da1bee56975373d583d51dfcdd81c8ccba3d5e735167b831bdb4669ab9cb2a1d9753d9261d SHA512 36c2527e8d670ccfb9a537b4944cfb8432c9638c1427e3c59f614c2ca43a66089228ecb74392301a07f266870e2d79bf0e2c671c6c7af06a4683bf97ac01ba54
 DIST acpitests-unix-20190215.tar.gz 2094957 BLAKE2B 3a31ae398650a1dc3ac70843c43868a35501cbe0376d1d2437a3568aad1fb63b3d83270653c009885b014894c69dcfff075bbf5d18290220067bcd1804a38097 SHA512 80060a61c80b01231b10e04dd65c2ab41d42824c439152cf128328890cee39ef597dc3f5bc535db4566cb322394bfce2760e1835df781d699818049cad5a4419
 DIST acpitests-unix-20190703.tar.gz 2009568 BLAKE2B 3d1a527c55a94390381e33a46111bed7ecd3761627b87e24d9345b0d38d9fbd32c371adab3f19a0ca05a99c4532491bc9b466805e231a5ecd8c7a6af346577fb SHA512 d9bab56198dc00fc11b50a199035eb9dc164c226441cd00e163ecd6362d399a50058afa7582f86e62a085b990772995fc10e077581a3b04a6c6b2e95e055f167
-EBUILD iasl-20180810.ebuild 3442 BLAKE2B 7f45fdef51bdf1388c98b331c549fd048f79159dae9369a4f47e799873ecb0f56e1a93d1f2696c0c34e059ff772964c4e7dfd9844f0c908afa1cf64846f4ba4e SHA512 228eebc0dd6102cf502184a7d260674e371277f96395ee4712ad3abce466ba79161e81c8ceeca6d53735b84c34b70c9c56ecc8e0b26619fa6c189e09b164e28f
 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
 MISC metadata.xml 330 BLAKE2B 4c0218788685cc36fddf5d759c091898a71c01bf22e9e7995d1f5da37cd0508c961895b4265bda462062676f3e722205f0a6b10f64db718110f7afe8f088d136 SHA512 4d7760ec82f64ce49478c359b32aa100ca9778471033741b7fd89905d075b3a067fda413c6dcc5115d7755d0ab6cd9d30a848ff674f1c83ef6205c51ec501a65
diff --git a/sys-power/iasl/files/iasl-20190703-Makefile.patch b/sys-power/iasl/files/iasl-20190703-Makefile.patch
new file mode 100644
index 000000000000..f245c97d5317
--- /dev/null
+++ b/sys-power/iasl/files/iasl-20190703-Makefile.patch
@@ -0,0 +1,105 @@
+--- a/generate/unix/acpiexec/Makefile
++++ b/generate/unix/acpiexec/Makefile
+@@ -256,12 +256,12 @@
+ endif
+ 
+ ifneq ($(HOST),_QNX)
+-LDFLAGS += -lpthread
++LIBS += -lpthread
+ endif
+ 
+ ifneq ($(HOST),_APPLE)
+ ifneq ($(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
+ 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-20190703-gcc10-fno-common.patch b/sys-power/iasl/files/iasl-20190703-gcc10-fno-common.patch
new file mode 100644
index 000000000000..d6b8fd83cf02
--- /dev/null
+++ b/sys-power/iasl/files/iasl-20190703-gcc10-fno-common.patch
@@ -0,0 +1,64 @@
+--- a/source/compiler/aslcompiler.l
++++ b/source/compiler/aslcompiler.l
+@@ -156,7 +156,7 @@
+ 
+ #include <stdlib.h>
+ #include <string.h>
+-YYSTYPE AslCompilerlval;
++#define YYSTYPE AslCompilerlval;
+ 
+ /*
+  * Generation:  Use the following command line:
+--- a/source/compiler/dtparser.l
++++ b/source/compiler/dtparser.l
+@@ -208,7 +208,7 @@
+ /*
+  * Local support functions
+  */
+-YY_BUFFER_STATE         LexBuffer;
++static YY_BUFFER_STATE         LexBuffer;
+ 
+ /******************************************************************************
+  *
+--- a/source/compiler/prparser.l
++++ b/source/compiler/prparser.l
+@@ -224,7 +224,7 @@
+ /*
+  * Local support functions
+  */
+-YY_BUFFER_STATE         LexBuffer;
++static YY_BUFFER_STATE         LexBuffer;
+ 
+ 
+ /******************************************************************************
+--- a/source/include/acglobal.h
++++ b/source/include/acglobal.h
+@@ -438,7 +438,6 @@
+ ACPI_INIT_GLOBAL (ACPI_THREAD_ID,       AcpiGbl_DbThreadId, ACPI_INVALID_THREAD_ID);
+ 
+ ACPI_GLOBAL (BOOLEAN,                   AcpiGbl_DbOpt_NoIniMethods);
+-ACPI_GLOBAL (BOOLEAN,                   AcpiGbl_DbOpt_NoRegionSupport);
+ ACPI_GLOBAL (BOOLEAN,                   AcpiGbl_DbOutputToFile);
+ ACPI_GLOBAL (char *,                    AcpiGbl_DbBuffer);
+ ACPI_GLOBAL (char *,                    AcpiGbl_DbFilename);
+--- a/source/include/acpixf.h
++++ b/source/include/acpixf.h
+@@ -231,6 +231,8 @@
+  *
+  ****************************************************************************/
+ 
++ACPI_INIT_GLOBAL (BOOLEAN,          AcpiGbl_DbOpt_NoRegionSupport, FALSE);
++
+ /*
+  * Enable "slack mode" of the AML interpreter?  Default is FALSE, and the
+  * interpreter strictly follows the ACPI specification. Setting to TRUE
+--- a/source/tools/acpiexec/aemain.c
++++ b/source/tools/acpiexec/aemain.c
+@@ -192,7 +192,6 @@
+ UINT8                       AcpiGbl_RegionFillValue = 0;
+ BOOLEAN                     AcpiGbl_IgnoreErrors = FALSE;
+ BOOLEAN                     AcpiGbl_AbortLoopOnTimeout = FALSE;
+-BOOLEAN                     AcpiGbl_DbOpt_NoRegionSupport = FALSE;
+ UINT8                       AcpiGbl_UseHwReducedFadt = FALSE;
+ BOOLEAN                     AcpiGbl_DoInterfaceTests = FALSE;
+ BOOLEAN                     AcpiGbl_LoadTestTables = FALSE;
diff --git a/sys-power/iasl/iasl-20180810.ebuild b/sys-power/iasl/iasl-20190703-r1.ebuild
index 398bc0314380..2bb7d450ab68 100644
--- a/sys-power/iasl/iasl-20180810.ebuild
+++ b/sys-power/iasl/iasl-20190703-r1.ebuild
@@ -3,28 +3,35 @@
 
 EAPI=7
 
-inherit eutils toolchain-funcs flag-o-matic
+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
+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"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND="sys-devel/bison
+BDEPEND="
+	sys-devel/bison
 	sys-devel/flex"
-RDEPEND=""
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-20190703-gcc10-fno-common.patch
+	"${FILESDIR}"/${PN}-20190703-Makefile.patch
+)
+
 pkg_setup() {
 	if use test && has test ${FEATURES}; then
 		ewarn 'You have selected USE="test". This will install the test results'
@@ -35,18 +42,18 @@ pkg_setup() {
 	fi
 }
 
-PATCHES=(
-	"${FILESDIR}/${PN}-20140828-locale.patch"
-	"${FILESDIR}/${PN}-20140214-nostrip.patch"
-)
-
 src_prepare() {
 	default
 
 	find "${S}" -type f -name 'Makefile*' -print0 | \
 		xargs -0 -I '{}' \
-		sed -r -e 's:-\<Werror\>::g' -i '{}' \
+		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
@@ -56,13 +63,8 @@ src_prepare() {
 	fi
 }
 
-src_configure() {
-	:
-}
-
 src_compile() {
-	cd generate/unix || die
-	emake BITS=${BITS}
+	emake -C generate/unix BITS="${BITS}"
 }
 
 src_test() {
@@ -91,15 +93,13 @@ src_install() {
 		ebegin "Creating Test Tarball"
 		tar -cjf "${tb}" -C "${ASLTSDIR}"/tmp/RESULTS .  || die "tar failed"
 		eend $?
-		dodir /usr/share/${PF}
 		insinto /usr/share/${PF}
 		doins ${tb}
 	fi
-
 }
 
 aslts_test() {
-	export	ASL="${S}"/generate/unix/bin/iasl \
+	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
diff --git a/sys-power/intel-undervolt/Manifest b/sys-power/intel-undervolt/Manifest
index a15c08193ab7..11ae2fd136d2 100644
--- a/sys-power/intel-undervolt/Manifest
+++ b/sys-power/intel-undervolt/Manifest
@@ -5,4 +5,4 @@ DIST intel-undervolt-1.7.tar.gz 31481 BLAKE2B 0daade381b492184616356f097de32d14c
 EBUILD intel-undervolt-1.6.ebuild 1148 BLAKE2B 8f84169e6bcb0d30fdb3b1901ba7cdbce971e933514e447d67c4cabde2078a57194107f900cd430306d81bfbd245c960d2c9c48780c8ff84694eed8f7afe3385 SHA512 8116d5545b70c0a3a8e81f4c5258462f4f1912712725574177cc92c61e58b355abdc2e70abe854f748eeca1ee747d5c0d436485fd49831580445fbb3e477bd5d
 EBUILD intel-undervolt-1.7.ebuild 1219 BLAKE2B 7e03cb969aa0e8852c21e09f2f5505bb6e375198f5a25eb8944570df30d309d8a4b293c0ccb6a5274d3628d46b8840f2aeaa359b22414af8a43925394e97ad3a SHA512 42142c857b9bbcb1c273b725e3aaee484c81b0de48e8a840fb4c49f932b0e284a2523d3a125d6e7e2d15a2b38729fb36221165f4a2a6da9d2e897c8b21e85d79
 EBUILD intel-undervolt-9999.ebuild 1219 BLAKE2B 7e03cb969aa0e8852c21e09f2f5505bb6e375198f5a25eb8944570df30d309d8a4b293c0ccb6a5274d3628d46b8840f2aeaa359b22414af8a43925394e97ad3a SHA512 42142c857b9bbcb1c273b725e3aaee484c81b0de48e8a840fb4c49f932b0e284a2523d3a125d6e7e2d15a2b38729fb36221165f4a2a6da9d2e897c8b21e85d79
-MISC metadata.xml 560 BLAKE2B 64440b4ecea98975cee61547bd93e8ce22f2c718cc8d2cf8b0cfbb76634585fa1c20309099f0b62c05b847b9db34b5b49832ffd1473f21015d74c3894b2ce972 SHA512 4c7c00d520f219cf24e4828f023d617b3829f2df70960a4156b214e2de5b94d1b33b865c72fff5c53215c236061ed0e1623c2f8f1a397bca960880548a00ec3c
+MISC metadata.xml 439 BLAKE2B 6381419880bfa93e46d034594091121d9f8c18fb096ef0b4ea1a45c820b18ce28f5526e483e9c928df246bcae04efa46b649b01856c03bf26e5b36819d3a2d17 SHA512 e02201c15d777f29c3976f0d1219a30f1be9f0ca061a75d1ca4f15bf6e366d0eb7ff4f2a9e91022662da928fa34069cc89c753198554711049d5904f8f41b606
diff --git a/sys-power/intel-undervolt/metadata.xml b/sys-power/intel-undervolt/metadata.xml
index ae8c6fe793f2..2d95a51af093 100644
--- a/sys-power/intel-undervolt/metadata.xml
+++ b/sys-power/intel-undervolt/metadata.xml
@@ -5,9 +5,6 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
-	<longdescription lang="en">
-		Tool for undervolting and throttling limits alteration for Intel CPUs
-	</longdescription>
 	<use>
 		<flag name="elogind">Use elogind hook to apply voltage after system sleep</flag>
 	</use>
diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest
index 6481a62fe535..4d6429067599 100644
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -11,4 +11,5 @@ AUX nut-openssl-1.1-support.patch 3873 BLAKE2B 17877276e46372aa17d357efc0851b9cd
 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
diff --git a/sys-power/nut/nut-2.7.4-r5.ebuild b/sys-power/nut/nut-2.7.4-r5.ebuild
new file mode 100644
index 000000000000..3570688276d7
--- /dev/null
+++ b/sys-power/nut/nut-2.7.4-r5.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 desktop fixheadtails flag-o-matic 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 ipmi snmp +usb selinux split-usr ssl tcpd xml zeroconf"
+
+DEPEND="
+	dev-libs/libltdl:*
+	net-libs/libnsl
+	virtual/udev
+	cgi? ( >=media-libs/gd-2[png] )
+	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
+}
+
+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
+
+	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
+
+	# 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/powertop/Manifest b/sys-power/powertop/Manifest
index 9fc2c2471bc7..25a47407e523 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -1,5 +1,7 @@
 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-v2.10.tar.gz 722992 BLAKE2B 573f1f0ed40705d3463f6e6f76c67ae99127ab2541b851143dafa707ef1c2dab4127d27811b63ad27e6b002ea4efd39417297a0227996ad9b01141b6de733d41 SHA512 4219e7aadbeebdf6932c04f784434e4dd0f540bf4941d43c1830b1b5cad1f3928769b13897e24dd956b6bdee65fb1fbe902ee30685bca229b71e140d65367837
 EBUILD powertop-2.10.ebuild 3843 BLAKE2B f0d637015c7ed1dbf8f69c619630dcf7ea3a0a6fe1a9698da2dda5274a28d054c88ac884b8a7c6ca312c1bca4a582da6e008476a548592fdf60ad357083b85b0 SHA512 c9f56ee6c4d33ad52d4774ffc96b791f7c82c677aa5e439a84c9ee7d4e7c6205163b7ede16c3e30cf10bbee3835fd16d6cbd7aa5c955c8a303f5830842c2d494
-EBUILD powertop-9999.ebuild 3790 BLAKE2B fb6238df26defce86bfd33d36eed9c160ba491f7457dbe708eaaa4511ce9cf007288af610dd57103e9d5eb80b43dbeb1fda74195b044e406ca3a46baf630053a SHA512 ce9caf68f29e9788fc7732bf091a85bf97fc42beacc8a1c80b4d31efcb051a342762aacd546e5a2d88e01ee4426d8513891a16fa22233bc184d62862de8f3db9
+EBUILD powertop-2.11.ebuild 3770 BLAKE2B f2d2a23f341a7066ce587ad00dd4013ac1490a519bc6a23dcca32242e6c73b9a39c9a0f18ad50a98c7060e90c7324550b2cdbcf05a5f5bbe20884dc5534d6043 SHA512 c968286837c5c3b1881396991837eebe1ea424531153c2822250e73c418b31c42752633f284cbd256c35c5ac9211fcf4e8155a16914fe4f9cd0ee63be48cf75e
+EBUILD powertop-9999.ebuild 3712 BLAKE2B beb3e79720b7049713a52dcd40ae5282799155669183448c66a6d7944d3dec7328d1bb1eea5ca09bc60a0df571ac1defd907a5d912b0aa7fe7f9e34de28d1b57 SHA512 a3b8b274c51bde944c490242edfdc84dcb34b388474c17456cdc653cb6cca0695253c54585e8e7380f5ae7b718081398a3a21ef5d681a33e557c892bd6b12183
 MISC metadata.xml 328 BLAKE2B b0558a511f51fb77479976e60fde11b9cc46f85af935d78d060a53a1d5b1dc2611721e3c1451e3d23229cb8db0bd2bd9c6bb902c9b0fca8f57718f53f16032a8 SHA512 9d17013502d4a90d7c41493c2e69f7bc20bfd834f6f2caa5b105f9cc3045b87382393903c08a8e25bd75faaa9371e2d5c16d2521a90a89dd08697069ce8e8f5d
diff --git a/sys-power/powertop/powertop-2.11.ebuild b/sys-power/powertop/powertop-2.11.ebuild
new file mode 100644
index 000000000000..200e2c08f9f3
--- /dev/null
+++ b/sys-power/powertop/powertop-2.11.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 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/gettext
+"
+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_11])|' configure.ac || die
+
+	chmod +x scripts/version || die "Failed to make 'scripts/version' executable"
+	scripts/version || die "Failed to extract version information"
+
+	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 165318e3ddd1..bf3642c77e9b 100644
--- a/sys-power/powertop/powertop-9999.ebuild
+++ b/sys-power/powertop/powertop-9999.ebuild
@@ -9,10 +9,8 @@ if [[ ${PV} == "9999" ]] ; then
 	GIT_ECLASS="git-r3"
 	SRC_URI=""
 else
-	SRC_URI="https://01.org/sites/default/files/downloads/${PN}-v${PV}.tar.gz"
+	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"
-	MY_P="${PN}-v${PV}"
-	S="${WORKDIR}/${MY_P}"
 fi
 
 inherit autotools ${GIT_ECLASS} linux-info
@@ -104,10 +102,8 @@ src_prepare() {
 	# Bug 599114
 	sed -i '1s|^|AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX_11])|' configure.ac || die
 
-	if [[ ${PV} == "9999" ]] ; then
-		chmod +x scripts/version || die "Failed to make 'scripts/version' executable"
-		scripts/version || die "Failed to extract version information"
-	fi
+	chmod +x scripts/version || die "Failed to make 'scripts/version' executable"
+	scripts/version || die "Failed to extract version information"
 
 	eautoreconf
 }
diff --git a/sys-power/suspend/Manifest b/sys-power/suspend/Manifest
index d36c48778751..951f2896ea0b 100644
--- a/sys-power/suspend/Manifest
+++ b/sys-power/suspend/Manifest
@@ -1,4 +1,4 @@
 DIST suspend-1.0_p20120915.tar.xz 111080 BLAKE2B 99eea1d9808219373501001f0af90973c9176c1b19d62bff7be26886b11ebb514134b68434e9b453146ef1a4af2c4cc8e26326b956a1b2378c38c100638af17c SHA512 bb714b4a7c0f5749c4b711a5c38ca5d8cb5078176a75387957123f75cfe8348adc3aa4e96335eb65c14ad1dd2f99fd6dbca3b415525dd39b3c547f9b13b775be
 DIST suspend-1.0_p20190605.patch.xz 6224 BLAKE2B 0eefbef5a8d777590f69c85b02edb5575a357b373b78d94846e2c2bd59430cbd55af59ee0e676faa7f60388cb3910adb2182dedadb1fdc1df38a409411ea2df1 SHA512 cf576a029b35306368cbdabb9863965e055198920b86eab7205083f3502ae69ec3e8a4267fb6ceaaf1560a8bdb0c59543453f1baad4758c8adc4ac4ae92736bc
-EBUILD suspend-1.0_p20190605.ebuild 1272 BLAKE2B 79fa816ac9e697b25e0339723311649955d646fae4411bd267638002889b536c9027a6bfef574100b46a39ed94ba9661df4cdb75db2196dc2126b48d092ae38f SHA512 9ecb5db5b5e7cfac88e968652a0a1745bbaab8f8f7548f36a2fada30bc50d835fa63b9bcf3907a97c8835bbd55a4db21084c3eaba38e5dcd696f63a1533100d4
+EBUILD suspend-1.0_p20190605.ebuild 1236 BLAKE2B 58de9f7d775ea9a68f7195816286b699ec0a2030b1cd019436e28cce341a0bdbf65655746dfe6f6b8f230db0e6fa4188e4a5a94e786cf61229fd2dbc9bfddefe SHA512 75764d08c169246882f1e177a327fa12f842c931b215af2de76d80039e42c7054be9ced7aeab4d7ecee9c311d5d913e5306595229faec1ce149c7739b43b3673
 MISC metadata.xml 471 BLAKE2B 2ea30120686624747556b6498973fbd771c5d58ef822daa17f2f162ca212631b2657a0d2c8ac07e25f654e478f1be70c7fcf256112fbf54fe5adc1dc565509e8 SHA512 e357c0bf04493ca74cd36d4f3d5781c3d03afd24cad914a0fab8149c99a5543bc4dddee538d235147ea3b73a8ba081e16badde28bf10af52b2cb99eb89c19f4a
diff --git a/sys-power/suspend/suspend-1.0_p20190605.ebuild b/sys-power/suspend/suspend-1.0_p20190605.ebuild
index 9ade9df39d9d..68a9887f5290 100644
--- a/sys-power/suspend/suspend-1.0_p20190605.ebuild
+++ b/sys-power/suspend/suspend-1.0_p20190605.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
@@ -41,7 +41,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--docdir="/usr/share/doc/${PF}" \
 		--disable-fbsplash \
 		$(use_enable crypt encrypt) \
 		$(use_enable lzo compress) \
diff --git a/sys-power/thermald/Manifest b/sys-power/thermald/Manifest
index 63a7d91d3f71..ef8bc8a0573e 100644
--- a/sys-power/thermald/Manifest
+++ b/sys-power/thermald/Manifest
@@ -4,5 +4,5 @@ AUX thermald-1.9-size_t-format.patch 2375 BLAKE2B 1f795d846a6012f69bb5c5e27a2b50
 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.ebuild 970 BLAKE2B 70eb454a4f984e41404d430107a864eb68bd8a8161faf4c3a9d11a87da38d27950278eb516f92b4025a799731639aa8566abf6695a907ea8f057e98fffb96bb4 SHA512 d32f2b0d309023f8740254b849390a9da3f65aa75b0b637da36abf19cbd0b2f48b1393f6723d53730c12e5ef33e205a99ed03bd54261026186c06ea1ef333be8
+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.ebuild b/sys-power/thermald/thermald-1.9.ebuild
index b63dc27a30e2..03b369146fb8 100644
--- a/sys-power/thermald/thermald-1.9.ebuild
+++ b/sys-power/thermald/thermald-1.9.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="