gentoo resync : 10.09.2021

15 files changed, 266 insertions, 83 deletions

diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 9b8de48dd27a..c050ff50db1a 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/bbswitch/Manifest b/sys-power/bbswitch/Manifest
index 53694a76c500..bba859f0a6ca 100644
--- a/sys-power/bbswitch/Manifest
+++ b/sys-power/bbswitch/Manifest
@@ -1,9 +1,7 @@
 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
 DIST bbswitch-0.8_p20200526.tar.gz 15869 BLAKE2B cdeaf539a0996f53d3add215fca1127321b7183526a248340177f4320171b92a5ce531eeedfb1da2f0d9f07c6b61e8cfb635a457406e477640f2e7090b29b655 SHA512 487bcd845d1f462e77b5b9e3f304cd28d0ddfd391ecc36de530a3d18d9d4932bc895ed29972e27006b6f3eeb50c37b523ef786a26b6ee75c19fa55288a496d4a
-EBUILD bbswitch-0.8-r5.ebuild 1135 BLAKE2B ddb38409e9e6222deaf4fabe96b19ec744cfd8a7d6c94a8d3bd66996c1a6e87b19a69a2313a549fac3995743e0c9c38b9146eae7e07b79230a37588bedb056b0 SHA512 fde0d208777d494e3f8f8deacf5fc63185c16caaf2ff5e5f240faf51554b3ea08690275a208d2b4d248514050bb3a9e72a8ef9da167b57a5c932c296b68f188e
-EBUILD bbswitch-0.8_p20200526.ebuild 1156 BLAKE2B f1d24cfe96641d320c38f70b3da90cc27fff7fdc38d36a7cb62364f98140597382a5c61902da38f94f8cb2c412ce90f0673b46d8a627585a544534f1a39dcbfe SHA512 551c49b794c4f9f367ebf3c885707647b2ef73d8542dcaef4e0b937ade8643cbf33e3017492df224fe60578b96c88af9552e74b547747f61ca0202c31f8371ce
+EBUILD bbswitch-0.8_p20200526.ebuild 1155 BLAKE2B cf4f4914b11e0d132d7f333bad291e12df6109efbae5a569e20994ea5c8936a4e71754d8e3fffade9d1bd761f4f0a11064e17a9eaf98e2f3ba6127b276f36fbf SHA512 028378100271cf8cbbb61b1cedd1d196e1de3927147c874be16fb6bb69ba8beebb676a93449f354f1f3f4c1e8186c567ebc4d08c30005dc7b3599fdc06c7ec9e
 EBUILD bbswitch-9999.ebuild 1157 BLAKE2B b6b77f0ecaf7ac94cc370d498929a8597572c9ecabcda1b817d9e4ceb01d5028d2e7d79f3ee0f5020fbe1d7d7a6fedba9e9daa16cbcf48e60b4a062eaa65e800 SHA512 3c7484b57111e6a78236e75a480472f68a68222e02dd763462197424812d301d0d2ada87290f0b226f2f9825fdc3e583809adceac348a8e6c49dd5816fe10e92
 MISC metadata.xml 998 BLAKE2B 301228a4c00ee4b8a05f0c1cf42dc09290cd590030d13ce3a14610aafdb5c38aec6b8cad1a2bd5ad61a947886a6765bed3a06f8a10841e4eb384f07311129d8c SHA512 8bf83e54791002aa9918333dd0646d6cce6d3ee8edfd5e66b563e3f1a4b0c530522260a8034f48f14f8efa060f8aeab5e878f72407cf31ec24dc6e03df0a7140
diff --git a/sys-power/bbswitch/bbswitch-0.8-r5.ebuild b/sys-power/bbswitch/bbswitch-0.8-r5.ebuild
deleted file mode 100644
index 90af8d532409..000000000000
--- a/sys-power/bbswitch/bbswitch-0.8-r5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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-0.8_p20200526.ebuild b/sys-power/bbswitch/bbswitch-0.8_p20200526.ebuild
index 692e85ece2db..62367166d15b 100644
--- a/sys-power/bbswitch/bbswitch-0.8_p20200526.ebuild
+++ b/sys-power/bbswitch/bbswitch-0.8_p20200526.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	COMMIT="ddbd243638c7bc2baecf43a78aff46cdc12e9b2e"
 	SRC_URI="https://github.com/Bumblebee-Project/bbswitch/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/bbswitch-${COMMIT}"
 fi
 
diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index 53cb23c78634..53035b430979 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -1,6 +1,10 @@
 AUX 0001-configure.ac-Use-PKG_PROG_PKG_CONFIG-macro.patch 3100 BLAKE2B e432205a6145f4f7efbe3dac7626b97b73bd4c9db6f639fb401494a38540025dcde40fe53464ed15057a5c67e4da5786a4a57b24e549a739c8a758d88654ab50 SHA512 79ca53f0c4ba9d37dd0a6b6bbfcac39651f658b0288aa33b941ae5bfc15cbf520ec197a6fe4230417385fc726723ef79f99a0728bda83eab96907391ebaaea32
+AUX 2.14-Revert-configure-Remove-AX-macros-from-configure.ac-.patch 1577 BLAKE2B 876d78cc370e50a3fffd7d54fbe846d55a524381f3e4cbb7a78fa73030eda0d1eb857f42e26862077e7dc114c1cead6cddfdc7fbeb7ae58931770d4ad0304467 SHA512 b81b6320bf93b65868c4a4353003738cb2f3ef2811f7ddc88d2f49b25e1a653e9a22a23d74ed6423dbd4637efa41694494e68fc7033e26a2f91eec30861af997
+AUX 2.14-configure-Use-AX_REQUIRE_DEFINED.patch 793 BLAKE2B 51db7bdae6443e76ae44aa87aa664763c036d5ec4ed476adba5ae4c9073bb740131b81cee68e86394aeb3eaa649e72371ab86c71e8e3cea4cfb023d4199f2a7c SHA512 8ce08ef7d561d670ac741b88896189745076d678f14fab8d5ad135980cf2f9e18098bae77ee932c735f6767353221ba33e4cf3417d87ff1ce78f01260d0cbd47
 AUX powertop-2.8-ncurses_tinfo.patch 1385 BLAKE2B 1b11138ae9c8fc90236b421d733f8cf0edff843572cfbfececba0efed5dd2a154ca561692b42e087a1c75bc19966b71fde241a029f16b126074b7d857e8c4bf5 SHA512 f1f483c43355fc1c52d0d7b9ca8e01f71c371e4e77c275584afc9f7178985e0028d42ed675adc52a1ea014325c5aaaafe245fa9166c14326cf467bd92c274522
 DIST powertop-2.13.tar.gz 303030 BLAKE2B 3c88e05f9889cc4b276bea3bc50a3a83228ca8efae278379a14fadc6104754f2837174e028bf9c5ded9f3af84ce6b8766ac3d24b6ae62b9b192c03fc3afdec11 SHA512 8ebeccd17b6f76d9e445382d9ce5b1c00ab2daf4f1e6e133c249bceb35ea582ca3e76da5415fd0b55a28b8a124655dc5ac7a18aaf2a3df955547d77495e59181
+DIST powertop-2.14.tar.gz 302578 BLAKE2B 5f53f81b01e83004f6436f497818d2a552b5e7ffda5007749aad415773adeab2a256aeffbacbf9e5fe803ff343a0c1954b5264aebdffa841bb70406b8b9611bc SHA512 f3e25901fb29405e0c8016643855a209cf9dba589fe9dd3e27c291d44699cebeb00dc8c7264c24436db08deb496759bd106666cb52d9ebd5f831bbb99e30f20f
 EBUILD powertop-2.13-r2.ebuild 3791 BLAKE2B 04356f510be06dd202dbfe437351caf9f27ffcfc7937dd15c7f9a2e12db276f9e426f68d9d1758a913a40c676d0bfaf0114846bb8a9e657dd301b51cd77ef00f SHA512 68b22c7bf3d2e78f0a6a81815d42527e2901f639da84424561e0f26c48992f58fa5e4401a8450761a3cad1098bc1cec16325a5d4ac2ce9ec507c244869b1f3dc
-EBUILD powertop-9999.ebuild 3605 BLAKE2B e5ad4d84557b7a9cfa04478e44bed49552b06ee9a7454f425e35003678c637bcb1de09a942be26fa9365a424491e44e32a5fa7249624cdd5173090282ed067a9 SHA512 df83e70b1457855857e0d2e81120fedbd103e097a115b453f871bdadc9f013b7ab417d527dc46dac58ad9c382a1702b79cdfb37c30af64bf7e542361bfa4c45a
+EBUILD powertop-2.14.ebuild 3708 BLAKE2B d79059466f0758a9cce32a1b80de2d3cbdbdaa8986958ebcfccc7a7c5015f48416a4d1d3477164ff138b3ff461ac5e8572d8d0b93191aafb2add4cec6a32bc64 SHA512 8b9136397d0f4dfda43f1e335072930179263f8f3dc1cc460f03f64493efcb7f6272eeacb12b619c6836c79a89d80bb2b243778c5a54ee498c714667c53320ef
+EBUILD powertop-9999.ebuild 3510 BLAKE2B 42b8048f45e6c77fc2551f89a096c33e88be620b8559e65c6ea0dc5966c63cfd48756e7ed4aee217e4784e36d50d060b337f4223210c9abb695de4550bee4963 SHA512 ac9c788c0c0ac5107eecee6134ca94ecdc222f7be8b97a6e5522e76ca9a1faf505277dd8c558a8b5fc384ceccd381069016c1866dcfedb4726a53d1ce7e0b649
 MISC metadata.xml 328 BLAKE2B b0558a511f51fb77479976e60fde11b9cc46f85af935d78d060a53a1d5b1dc2611721e3c1451e3d23229cb8db0bd2bd9c6bb902c9b0fca8f57718f53f16032a8 SHA512 9d17013502d4a90d7c41493c2e69f7bc20bfd834f6f2caa5b105f9cc3045b87382393903c08a8e25bd75faaa9371e2d5c16d2521a90a89dd08697069ce8e8f5d
diff --git a/sys-power/powertop/files/2.14-Revert-configure-Remove-AX-macros-from-configure.ac-.patch b/sys-power/powertop/files/2.14-Revert-configure-Remove-AX-macros-from-configure.ac-.patch
new file mode 100644
index 000000000000..7f2b7820ff2f
--- /dev/null
+++ b/sys-power/powertop/files/2.14-Revert-configure-Remove-AX-macros-from-configure.ac-.patch
@@ -0,0 +1,60 @@
+From 2eb781ba822f2d57420400f648f6f531689c8c5d Mon Sep 17 00:00:00 2001
+From: David King <amigadave@amigadave.com>
+Date: Thu, 15 Apr 2021 11:37:24 +0100
+Subject: [PATCH 1/2] Revert "configure: Remove AX macros from configure.ac
+ file"
+
+This reverts commit 1e478d84f051ba56962a1214cb750b810379ac1d.
+---
+ README.md    | 4 ++--
+ configure.ac | 9 +++++++++
+ 2 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/README.md b/README.md
+index 1b17365..43bd5b2 100644
+--- a/README.md
++++ b/README.md
+@@ -26,7 +26,7 @@ Example packages to install in Ubuntu*:
+ 
+     sudo apt install libpci-dev libnl-3-dev libnl-genl-3-dev gettext \
+     libgettextpo-dev autopoint gettext libncurses5-dev libncursesw5-dev libtool-bin \
+-    dh-autoreconf pkg-config
++    dh-autoreconf autoconf-archive pkg-config
+ 
+ 
+ ## Building PowerTOP
+@@ -39,7 +39,7 @@ source files are modified.
+ To build PowerTOP from the cloned source, use the following commands:
+ 
+     ./autogen.sh
+-    ./configure LDFLAGS='-pthread'
++    ./configure
+     make
+ 
+ 
+diff --git a/configure.ac b/configure.ac
+index 2571c5d..7eeeb9c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -36,9 +36,18 @@ AC_PROG_LIBTOOL
+ AC_PROG_CC
+ AC_PROG_INSTALL
+ AM_PROG_CC_C_O
++AX_ADD_FORTIFY_SOURCE
++AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
+ PKG_PROG_PKG_CONFIG
+ 
+ # Checks for libraries.
++AX_PTHREAD([
++    LIBS="$PTHREAD_LIBS $LIBS"
++    CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++    CC="$PTHREAD_CC"
++  ], [
++    AC_MSG_ERROR([Could not configure pthreads support])
++])
+ 
+ # Checks for header files.
+ AC_CHECK_HEADERS([ \
+-- 
+2.32.0
+
diff --git a/sys-power/powertop/files/2.14-configure-Use-AX_REQUIRE_DEFINED.patch b/sys-power/powertop/files/2.14-configure-Use-AX_REQUIRE_DEFINED.patch
new file mode 100644
index 000000000000..f036bf73d619
--- /dev/null
+++ b/sys-power/powertop/files/2.14-configure-Use-AX_REQUIRE_DEFINED.patch
@@ -0,0 +1,28 @@
+From e87357a35f376518c3663a2f5cac53e9c4917427 Mon Sep 17 00:00:00 2001
+From: David King <amigadave@amigadave.com>
+Date: Thu, 15 Apr 2021 11:45:13 +0100
+Subject: [PATCH 2/2] configure: Use AX_REQUIRE_DEFINED
+
+Require additional macros to be defined early, to avoid an aclocal
+"too many loops" error when copying macros.
+---
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 7eeeb9c..37c1304 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -29,6 +29,9 @@ AM_GNU_GETTEXT([external])
+ AM_GNU_GETTEXT_VERSION([0.18.2])
+ 
+ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
++AX_REQUIRE_DEFINED([AX_ADD_FORTIFY_SOURCE])
++AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX])
++AX_REQUIRE_DEFINED([AX_PTHREAD])
+ # Checks for programs.
+ AC_PROG_CPP
+ AC_PROG_CXX
+-- 
+2.32.0
+
diff --git a/sys-power/powertop/powertop-2.14.ebuild b/sys-power/powertop/powertop-2.14.ebuild
new file mode 100644
index 000000000000..378581ae5c29
--- /dev/null
+++ b/sys-power/powertop/powertop-2.14.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://github.com/fenrus75/powertop.git"
+
+if [[ ${PV} == "9999" ]] ; then
+	GIT_ECLASS="git-r3"
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/fenrus75/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+inherit autotools ${GIT_ECLASS} linux-info
+
+DESCRIPTION="tool to diagnose issues with power consumption and power management"
+HOMEPAGE="https://01.org/powertop/ https://github.com/fenrus75/powertop/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls unicode X"
+
+DEPEND="
+	dev-libs/libnl:3
+	sys-apps/pciutils
+	sys-libs/ncurses:=[unicode(+)?]
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	sys-devel/autoconf-archive
+	>=sys-devel/gettext-0.20.2
+"
+RDEPEND="
+	${DEPEND}
+	X? ( x11-apps/xset )
+	virtual/libintl
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.8-ncurses_tinfo.patch
+	"${FILESDIR}"/${PV}-Revert-configure-Remove-AX-macros-from-configure.ac-.patch
+	"${FILESDIR}"/${PV}-configure-Use-AX_REQUIRE_DEFINED.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
+
+	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 92a8b30bd07a..b0062714c6c4 100644
--- a/sys-power/powertop/powertop-9999.ebuild
+++ b/sys-power/powertop/powertop-9999.ebuild
@@ -100,9 +100,6 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	# Bug 599114
-	sed -i '1s|^|AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX])|' configure.ac || die
-
 	eautoreconf
 }
 
diff --git a/sys-power/thermald/Manifest b/sys-power/thermald/Manifest
index 20ca82973a62..bcda9f4dea04 100644
--- a/sys-power/thermald/Manifest
+++ b/sys-power/thermald/Manifest
@@ -1,6 +1,8 @@
 AUX thermald 374 BLAKE2B 2ea9775b75acb7797c078c8c7786d442bd9c98102cd53073e1c040a0972dfd6be8424a62889a666573ee72ce5273bc53169fae5762bc0005a1c899324a699d27 SHA512 17f1c2133e47e897c4a5407ef622adfebb8498fce7ea9bf17cfd177269a3d869bdc21c3d2558010e9669ddc53e69e521bb4c1e112c51010168aa3c074c259e02
 DIST thermald-2.4.3.tar.gz 455850 BLAKE2B 2348a5ce9175049e3cb2436ee6d7773af50ace9693956f5a0e64f9fbb28826004f5cf599887d7b4a8405680ecdf90dc04c054082bcca484151373e91d64eab1b SHA512 eda313aa91235ae024a673e9933267c3aa97a3a8e3e6501bf7daac24be747174b223c2f297e7b301477899d099878aa46c58cda936507c8d4683c4f14df009c0
 DIST thermald-2.4.5.tar.gz 455875 BLAKE2B f080dc065f5a0227cabed8e88d44c85c6e8ac932a6042b095a91840ea586213fe1b8ca93a04ee872f3e971d1efdd95c0f50357727d70b8e4fecd735e9c840f73 SHA512 8b7d75b3f1d7a98a9985c7552963cde19c81053d12fa39974c1129315fc23e66a432d9ada5d9e385989976453a83cf6418f410d3ce3317e23133d15d2ec37695
-EBUILD thermald-2.4.3.ebuild 1243 BLAKE2B c605e7c2f943184a9bf9c7ef71996601030211db219e72b6f1f30a50e4354fe5a0305adecbc6f39a40d395db92d7e2b8cb2c3085da6a8d22eeb83a45a56af8c0 SHA512 020218d8d67499e1bde6f69a640d8e2f3d972f30ea3e4ecff070c428f779a8e6e991931bf1c92552ff5168816e42b38eadf23dcac18a60a435589e2cba3320e2
-EBUILD thermald-2.4.5.ebuild 1245 BLAKE2B 170c49f06dc41e270625b41514322b521b1d2c208ddd73e86375761de1637a07eebeabbb101ef3410562001dadbe95f12306dd919a5f20c0c75a3da4639e2dc0 SHA512 9876a0fb51d2401aac53bed4b38b1f09339aef3b4dd540faf2a57a47eaaf857485134e4659f2d342e87a0491ea9c595d59ddb7aac2e9a3e91d5cd3de56750d6a
+DIST thermald-2.4.6.tar.gz 455905 BLAKE2B 0e3eae24bd4de8f7adc9cb8cc6dec83907d8e8240bec87d752e4502c923e7b407546204af474fe32fa43ba85a60ba51bd3dc6f1ce7cf3a62dd60dc5b0235ed52 SHA512 e337b00ec7f4fa565927f047dbb17dc05b8513850f2488dd6cfc838e5123938fbfe7c39464fffb77c100073edfca9ea51708680eaa2cba537470326df9508d3a
+EBUILD thermald-2.4.3.ebuild 1066 BLAKE2B cd1b730da42dc13c6163a04a2c81df89c1dcf708af8fc1632340692fb0d12048ce02d3a7b76e8cf7a94d1fb73abd48246ef36dc3e058766a3c36ce66a5b8207b SHA512 dd8ec95a533add81a462c1d71496ccfa86acbcd9ca2ef92b881daf9557f73508403397bb91117b33b4975008339ad09cb0fbc67a60bd10a91146d386062aae5b
+EBUILD thermald-2.4.5.ebuild 1068 BLAKE2B effcb26eb7b0a7b0cd8a65d790434cc0d573bfea16b7b18bc4b33766b6eea5ce4856eee918ea6b1b1ebe3f299813eb71ea159b000188a58ffbc77541068efb8f SHA512 91ffe7fe9854aad92e060a8be221d4c8a54096b0e2dfd2a30dd7a8871da994cc8a59fc234aae5c537d8eae64a7f140a3c9ec6b337c73dc8b66026c2bbd97f108
+EBUILD thermald-2.4.6.ebuild 1068 BLAKE2B effcb26eb7b0a7b0cd8a65d790434cc0d573bfea16b7b18bc4b33766b6eea5ce4856eee918ea6b1b1ebe3f299813eb71ea159b000188a58ffbc77541068efb8f SHA512 91ffe7fe9854aad92e060a8be221d4c8a54096b0e2dfd2a30dd7a8871da994cc8a59fc234aae5c537d8eae64a7f140a3c9ec6b337c73dc8b66026c2bbd97f108
 MISC metadata.xml 643 BLAKE2B 92fe71631920f61dd6667c2dc8b4e27d2ea1e9bfb64509a9b4a9b0a72e9b4a11b7ae06febf120564c28272b9e079cf71a114bca620ce2651ec615439dd5ff9b3 SHA512 bad363023e01da0232632d54b2cb65dce89a7c70441f05fc873640a29f6fd4ec4ea30b00f94f723a786de1eef87b94673dad455102bc57a11573346e3a8ae2e8
diff --git a/sys-power/thermald/thermald-2.4.3.ebuild b/sys-power/thermald/thermald-2.4.3.ebuild
index 093c0f2a0eb6..b64a17ce7957 100644
--- a/sys-power/thermald/thermald-2.4.3.ebuild
+++ b/sys-power/thermald/thermald-2.4.3.ebuild
@@ -48,10 +48,3 @@ my_src_install_all() {
 	rm -rf "${ED}"/etc/init || die
 	doinitd "${FILESDIR}"/thermald
 }
-
-pkg_postinst() {
-	if ! has_version sys-power/dptfxtract; then
-		elog "dptfxtract can be used to generate a more specific"
-		elog "thermald configuration for your system"
-	fi
-}
diff --git a/sys-power/thermald/thermald-2.4.5.ebuild b/sys-power/thermald/thermald-2.4.5.ebuild
index 2683a9652ea6..a482dfef0ff9 100644
--- a/sys-power/thermald/thermald-2.4.5.ebuild
+++ b/sys-power/thermald/thermald-2.4.5.ebuild
@@ -48,10 +48,3 @@ my_src_install_all() {
 	rm -rf "${ED}"/etc/init || die
 	doinitd "${FILESDIR}"/thermald
 }
-
-pkg_postinst() {
-	if ! has_version sys-power/dptfxtract; then
-		elog "dptfxtract can be used to generate a more specific"
-		elog "thermald configuration for your system"
-	fi
-}
diff --git a/sys-power/thermald/thermald-2.4.6.ebuild b/sys-power/thermald/thermald-2.4.6.ebuild
new file mode 100644
index 000000000000..a482dfef0ff9
--- /dev/null
+++ b/sys-power/thermald/thermald-2.4.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools out-of-source systemd
+
+DESCRIPTION="Thermal daemon for Intel architectures"
+HOMEPAGE="https://01.org/linux-thermal-daemon https://github.com/intel/thermal_daemon"
+SRC_URI="https://github.com/intel/thermal_daemon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/dbus-glib:=
+	dev-libs/glib:=
+	dev-libs/libxml2:=
+	dev-libs/libevdev
+	sys-power/upower
+	sys-apps/dbus:="
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc
+	dev-util/glib-utils"
+
+S=${WORKDIR}/thermal_daemon-${PV}
+DOCS=( thermal_daemon_usage.txt README.txt )
+
+src_prepare() {
+	sed -i -e "/group=/s/power/wheel/g" \
+		data/org.freedesktop.thermald.conf || die
+
+	default
+	eautoreconf
+}
+
+my_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--disable-werror \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+}
+
+my_src_install_all() {
+	einstalldocs
+
+	rm -rf "${ED}"/etc/init || die
+	doinitd "${FILESDIR}"/thermald
+}
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index 67c469c31e10..eece752c1b6c 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -2,5 +2,5 @@ AUX upower-0.99.12-fix-power_now-energy_rate-readings.patch 1636 BLAKE2B e61167d
 DIST upower-0.99.11.tar.xz 430128 BLAKE2B 77604d02a69de98e4c7b268d11d189aa42ace2d62b982fda9bc41131ce383ede32953ada31eae0bbfd1121600af5863924d48c636e60a28f505a6998dcac227c SHA512 67219a0beb98c97ac4512e4fe8ba83fc80a1035d1edb5367dda6911da50c672b047051f2f528e8703be29ab47547d92b6c71a7ef695226a1bdb5bc33e6d18803
 DIST upower-0.99.12.tar.xz 423640 BLAKE2B 4c5c6357f0a2f8d721ebae9736912b1871a898c7ce65708626f9a9465cde87036ba6ab8050d97f5b9074d92e2700d8ed1e71b67f43cd6305eb4e89336f1b628f SHA512 9858a0e5f65271522cc5f36b0cd8722a5fb3effba37dbc5b22f08606701d4242ee54329d07460768004a24dc42705a84140ac6d9691afb7f09584b2e61fe3413
 EBUILD upower-0.99.11.ebuild 2105 BLAKE2B c94253f904dba7fa27380996fa645218c34342d55e3b4a43cd38614d60176c3140ae4ac520d4c1ad05ada307f860a373bd8397915c7c644792c3a934b303bd68 SHA512 d778181809780a53677aa234ea64d5c4ba840b9f7ab465a1160d1efc1c4b26427032f1b09739333387406ed62a61cc9626e3e72da756869d0a1707fc8c45d45e
-EBUILD upower-0.99.12-r1.ebuild 2790 BLAKE2B 04bd2b963e8b20812a6b422cf41e41e17a115b978c36e3f67eb3916fe9a46568986e0524a361c41fc17d6442585cf584275571d689e7a79fe7ed965b34868411 SHA512 3ab74bf76a013694dda793883b09df765b506aa447693ad35d956f4922763941ea52700858635c6acf0dc389f387dd1d41eb45979329ae795353d0e5fe27b52e
+EBUILD upower-0.99.12-r1.ebuild 2787 BLAKE2B bb3ad3b69916f5807171f55a56b8703092498bfce7c9b304fafde6275b5ac6c14660cb753e05de375dc009a3bc67e082c083be9c7dd662dd0fc888b560d032df SHA512 28c075b897b56a12d77438bd5f36d14785b09cc02ee20a5c70ab7f0163740d59df710ec87e42d949c841cdabdc2eefeb2c43bbca73bd41b4dd475a1a3fa533dd
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/sys-power/upower/upower-0.99.12-r1.ebuild b/sys-power/upower/upower-0.99.12-r1.ebuild
index d94d23a3e00c..079e5fdd330f 100644
--- a/sys-power/upower/upower-0.99.12-r1.ebuild
+++ b/sys-power/upower/upower-0.99.12-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 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 
 # gtk-doc files are not available as prebuilt in the tarball
 IUSE="doc +introspection ios kernel_FreeBSD kernel_linux selinux"