gentoo resync : 02.09.2020

14 files changed, 149 insertions, 117 deletions

diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index c1e1e73dcf7c..aa74f4d3993b 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/acpilight/Manifest b/sys-power/acpilight/Manifest
index 06207e4b71a8..76ce453310fa 100644
--- a/sys-power/acpilight/Manifest
+++ b/sys-power/acpilight/Manifest
@@ -1,7 +1,6 @@
 AUX acpilight.confd 269 BLAKE2B 196245bd083f89d9d975a81aaaf66d0422655cd6a5f575c2cbb898747c92bdb888f8123dbf8ddf34089be2547d39e33508119065ffb97c26f9d1d3915bee8bb2 SHA512 28e513dbcaa30cec4d2f876c244766037eb6e94ff660ff2caf9cb955f40c710ea750cac73eb5e3890b42904227ccbd7f6c3e2595c2496e54d3339d6afdd0ffb0
 AUX acpilight.initd 742 BLAKE2B bc2ad5027cd9e5c9f8d0d55e249117f7f59ad587522d21ea2baf69e45a884df242d46cb3001ef46ef63c1e1f87a18bc5c05d4facf1e9d72d4b596926e9a6b69b SHA512 9fe648ea994eeb9baa294226b55bd6230cb2b28952f651755da622278539fc071527e3aa2425e26687bb8065ef2e372ab93d7090532dbf3208ccac8519f01fca
-DIST acpilight-v1.1.tar.gz 17583 BLAKE2B 9505d0b2e1eb6e311b3be7938c455dcca399b2a644856f57593be4da56b637445b796f16300540436645b4dc660f7330b63ff3eecf93ecb49b366d152d5c5faf SHA512 af10a538fec83315aaec3837647622ecea41cb936d38667e4e70689a2b8a968a786fc9ad2be136d5799fa091f07614886decc9044e71aec1e64765e90ddae439
 DIST acpilight-v1.2.tar.gz 18068 BLAKE2B 469fd12c0a24b152681d73add559733a294f8a0848f46d0d3a1e209dea2ad3b180294677a8d84a82387ec34b00bbfda85a10f447fe22b81a3c51225cdce14051 SHA512 ef634ec0f315fe94dca138f1b9231f320b93340db3365ab9a09cf898fe4691f70573041bcb04563d760f1201000ea3ff11ab5dad3bfffddf3d3070dedb5732d7
-EBUILD acpilight-1.1.ebuild 1471 BLAKE2B 2a028a4ed73e2169ab8aa4190b7880a3bddd3d18d9888079159982885deb2b02997a97ee7bd2023574c0bf8bebe97fbb7cc60ed6a4d55885ecba6096c10ee7f2 SHA512 3bde69d668fe1b178c9dad14f171933ccf524a34115b59690bddf596af3c8eb7fb12e46630a1d83fe9430874712b188ffe6553c8d28a302a14ab9dda1aa0370a
+EBUILD acpilight-1.2-r1.ebuild 1505 BLAKE2B df5b446e3dd8723995171c8e6021480d2628a1d205be2554bea606758ba6b3df5c29d268a1d4e45a88d2d440f6ce37c6fb4bf492c7cbbae7c86c1cc736ca76ad SHA512 84394a2b323ddd5eaa16d3b3c94b39c3fec7f95487b6f119bb6fb047dd7a69c6d5f0e9148436b912d85a1c4fb37c2788d602d923050574798dad4514697fd9a7
 EBUILD acpilight-1.2.ebuild 1506 BLAKE2B e3185588af5d251aedd7636fdab21ebe54fbaefe37f7a281515c6dde65848d28a6992cfd60c119d317a5f6ed63f025d7b61f4f1c7f036927ea85f0eed2cce7e9 SHA512 ae50de05acf6242c929fa79bc2543a5d01efa39e48c22a65af364a2a22099718be2dc0627d5a68102e6b10142b2af46870c1f4a9c1ef52b21480bf2beba560a8
 MISC metadata.xml 337 BLAKE2B ad7ecd612b078bad830f6f10efaca7f41b7b5ef1d290799ce4c2dbd5489076c5c0fc3500e0c64bc3f00f448f80a1eedb9737c967258bbea5e105a85d7e4b8749 SHA512 6f624eadeaad1f4a440a2663ac9672cd6a36dbb668d11bcdb621aa5ddb739632c8bc74bbbde9905adf023618a9432a26bfec4f6861f5e4ba6167a0c2658dacd0
diff --git a/sys-power/acpilight/acpilight-1.1.ebuild b/sys-power/acpilight/acpilight-1.2-r1.ebuild
index c22bf8439c5a..36f03785d73c 100644
--- a/sys-power/acpilight/acpilight-1.1.ebuild
+++ b/sys-power/acpilight/acpilight-1.2-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
 
-inherit python-r1 udev
+inherit python-single-r1 udev
 
 MY_P="${PN}-v${PV}"
 
@@ -14,12 +14,13 @@ HOMEPAGE="https://gitlab.com/wavexx/acpilight/"
 SRC_URI="https://gitlab.com/wavexx/acpilight/-/archive/v${PV}/${MY_P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
 
 RDEPEND="virtual/udev
+	acct-group/video
 	${PYTHON_DEPS}
 	!x11-apps/xbacklight"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -29,7 +30,7 @@ DOCS=( README.rst NEWS.rst )
 src_compile() { :; }
 
 src_install() {
-	python_foreach_impl python_doscript xbacklight
+	python_doscript xbacklight
 	udev_dorules "${S}"/90-backlight.rules
 	doman xbacklight.1
 	einstalldocs
@@ -45,7 +46,7 @@ pkg_postinst() {
 	elog "If this utility does not find any backlights to manipulate,"
 	elog "verify you have kernel support on the device and display driver enabled."
 	einfo
-	elog "To take advantage of the init script, and automate the process of"
+	elog "To take advantage of the OpenRC init script, and automate the process of"
 	elog "saving and restoring the brightness level you should add acpilight"
 	elog "to the boot runlevel. You can do this as root like so:"
 	elog "# rc-update add acpilight boot"
diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest
index 895f94bf13a2..8ecb71b99b0c 100644
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -11,5 +11,5 @@ AUX nut-2.7.4-py3.patch 1940 BLAKE2B 5bb77bca18ad40a1ba4e579098accb0135c0f4b2443
 AUX nut-openssl-1.1-support.patch 3873 BLAKE2B 17877276e46372aa17d357efc0851b9cdb33b14ac0c40913b47ea513a8ecaa6eebe3241ae8b324583070d76b6c12d3cf18c043778754b5774af846fb8a33b4d7 SHA512 8945f2f663dc50cfd7041cc7f2c4af5cca4b5ef9cfa1be48c122a623e6eadfc511bbaa60a8bd6b68bb2569c75d5f64613d595ad7444b8d6ec9f773d7743872a1
 AUX nut.powerfail.initd 1306 BLAKE2B 9e9c6eb40c6a313ad625136523de730a75b811841331ae5f7dd42b71b65f591c4ab5b8da6e954ceab42da89f4a20e8655cae57354aec6ab796cec80f60ebb419 SHA512 b9aaab526d0996b36a7a6d76a3ee63c1452b0a1bed358e23f6f7f5534e0da7751281428091efc7dba2004706996850ec18318809fdacb94cd8d73ea22bda52ee
 DIST nut-2.7.4.tar.gz 2509831 BLAKE2B 367c687efd739150898a14c700d5fddbe22bf926522923e1842011ec49b67d6638620500c4eda50291feb474cc6eef39fff63764cb3e0fad5898abee981f8308 SHA512 320c4aff85d8a370c5eff77d33924fdfc3caf6a250620693cdd5bf3336b3a80d8a207488eee841bcf8b72fbad68fda4c074e63b99c56e7886716fc934122d11a
-EBUILD nut-2.7.4-r6.ebuild 8999 BLAKE2B a94ea04ff35787debeb39c22f93f8576d9c1d37cd0ef4356562ab03091944715593a00c8ac2bdd3ae975117183e60f179442adc0ad7c1902549ee7d069992457 SHA512 bc39684b03642d4fd9fdd8d898cabcdc1b57d1a7f44e49d343c5a6ba3e3f2ec351861017f39ec10d3d0ccca2be3a6c23fdb38f72836739b658d054bceb370bf6
+EBUILD nut-2.7.4-r6.ebuild 8998 BLAKE2B 9cfefee6ae7d1d53205a4cd3783f06ebf1512ef85c46079a9713e1d696c89f4cb6b2b146409b47c4f15ac6e972eb208e3e887231614f1d27fd542f3bd6531aa8 SHA512 d722e9ad5e2d63c5cc28113191e5d4eb13807fb8efdea2f508bfd51507933cc27aee69fb0d9c766f42ac9422f200778af6495bb99aa3c1bb395dc2ae0eb42a57
 MISC metadata.xml 5272 BLAKE2B cc580840e8c437fb37cd8c2132d2daf6751097374ccf11c5a7519756adc6b5d3654e3c40cfe7a66cee8ee5b016c09f65f4f425e4edbd503aed88da5f0eedc1a9 SHA512 f3133fcd673344452904f95d5898fdca3988970bf6526f50191cfa1741fb222468dc00652e968ba305a21851e6a070478627d181c26f6a1d152a215399f469ee
diff --git a/sys-power/nut/nut-2.7.4-r6.ebuild b/sys-power/nut/nut-2.7.4-r6.ebuild
index 79cbbe8f3dc3..abdd3bd8c69d 100644
--- a/sys-power/nut/nut-2.7.4-r6.ebuild
+++ b/sys-power/nut/nut-2.7.4-r6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.networkupstools.org/"
 SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ppc ~ppc64 x86"
 
 IUSE="cgi ipmi snmp +usb selinux split-usr ssl tcpd xml zeroconf"
 
diff --git a/sys-power/nvclock/Manifest b/sys-power/nvclock/Manifest
index 4e62e795a4fb..8f28a38a9f8a 100644
--- a/sys-power/nvclock/Manifest
+++ b/sys-power/nvclock/Manifest
@@ -1,9 +1,10 @@
 AUX nvclock-0.8_p20110102-buffers.patch 5181 BLAKE2B b81a50603032dfc38d950397466deabe3f5897369bf6169906c9473e5e953630b5ad3db807476008658c7417f50ae88e45de8b0403725f8eb61e3c7e7e2d3f70 SHA512 bca744826c3b3d12e4e694d692d58cc6b1004c6198ea65af765dacce717e523e0ae4f48fc7b95cadd377160e4c41a311ca901c0a269d0781705fb25ce2919924
 AUX nvclock-0.8_p20110102-desktop.patch 544 BLAKE2B 9c2ae5c07d971df66d446230de515d6f387aabb970319b088e64552349690ae5480cdb3f2ccdca3cb959478c8d7ccd869eada2ed8fd5e3127c28710483a73f6a SHA512 4816780a6fc1770853d547de3f4e7b1533086b69ac380e99df47ba23dff696f1bd9644de9fac25ed82cb86284f2af28323245249d9372a6064499cdfc84618c2
-AUX nvclock-0.8_p20110102-r1-make.patch 2788 BLAKE2B aff5388fb9bb3cdf2171fa9d4beca191ce73785b2094e37c01c6664ff8183aca4db86c0663e6d67a04df89d5dd68c98b4ec9dd79cacb7100cf31e083dac76224 SHA512 fa1b6591efd950d90501a72ecd1232fdac878cd6126eb15528526a90f4b99c7fe4348a6382a0c111b5af849f678b0a59b143a8ea74653e6d78114887c632a0a6
+AUX nvclock-0.8_p20110102-fno-common.patch 304 BLAKE2B e662980be6b63a46d8e175e0c9645aab3be6a4e723d40c8b076fc66f855de3b4d129b17150e37ff98efb54524ff70650b51b6ea0c37acb7f09937c7b5a4c92c3 SHA512 428cb270846b7aefffb845572a229557843977d5a53b3100ebeee7d6084f827d5bbbf4ac3f7f9b0c6c54b9fe990d210aa26c765161667f80ae9870557cad2977
+AUX nvclock-0.8_p20110102-r1-make.patch 4309 BLAKE2B c7bd8db246a16d9c4b7691440150485e43bad226850adb8452bd5fc93ae13817d5f5a5f85cb79f18c22b3ef76d94a317e5f12d3deb054bf8951b10526eb91fa4 SHA512 b1dd7e910b9f08bd04531d57528d655c8b7e95dd735a98413400c4fb2be90dbab43bbd2577f09f01654887cef2415e5d226e4978ff84076df2c55d944d4c60bb
 AUX nvclock-0.8_p20110102-usleep.patch 295 BLAKE2B a900bceebca6422d99689a51d4cfbfd0917331bb2a3747fe6944a7a432e984beaf5a2a42346b3468a07ab04ec29009bbb767037ad27477dfaa43898e61c4672e SHA512 6681f08788d79b0534734cc09fef5df3686c5fe6664f5e7bd634ee8e45a3e49821201895f221cd42e7cab2be88330febd57f069a24e09da4c60ef2b1fd6ee206
 AUX nvclock_confd 360 BLAKE2B 7aa4edd182d4dcb62cd16b3cd6d62ece10f0454cac047aab211423e781739b24fae3429f971cab3e355523480d8b57e6d9006f41f6e7050aadec766efd12d0f6 SHA512 9a5ebc91fe1346677b982d178099d577ad285b104c38720a975fc6b25190ec86e00ffbc165e7409b8aba5d8d9c1d336508579deb573c5ba7495b84fa28900519
 AUX nvclock_initd 145 BLAKE2B ef01d1f81821e64117d77b2908a48cf99b351dcc12339bbcb26bab760ef6fcb03e94d8fdb068a7909845655644eb0151adb71ff3f00ca597806e2cdfeb520d92 SHA512 348601da9728e2d726504bf23da944859813e52999ef1c716561523d6de61c1726be89b3f57e1a27d4ab641eda19b4dddc6eb8588a0ae1f64b4b418cc14876b1
 DIST nvclock-0.8_p20110102.tar.bz2 285043 BLAKE2B f1a524b6841a7eedcfbb9b0cd449f1af10c40cee11a814221d0cdcb42e507763313de112eea948dc05508fbd439a3dac504297c723fe4f0f821241204f5ccf89 SHA512 01bf7faed83acdf2390e1f410b2f8b697ff647b15562a6960a99666ec5121b532cbf4380137c9ee24221ccafff641bcdef4748dcad7ac92fb25fa15e735dd140
-EBUILD nvclock-0.8_p20110102-r2.ebuild 1310 BLAKE2B 5d5865fd4bc29c66b9000b7e63f8f6d69e9a2cfc0a7cc79c4f260306cc78a0204fd51e65de65a097ceec3cc812226b5cdd33f45123d972325c7ac83e9d3b54fc SHA512 a86b3cecac20984a1bb1a066072fa8f1118cd192b9cf9cedf12ed962fd58db83c0dd7626f34b32b45f5768ac9f4fd72998cb1386e02c16e383dc8a6e342d573b
+EBUILD nvclock-0.8_p20110102-r2.ebuild 1252 BLAKE2B ee7820297a1b7c6c27c5c27a82f0f5c5e97a3d9953bc8031365a87fd6e406f5077b802cdd6cd9748db0762d3446eb6bd2d828f23251637029386046131e39fab SHA512 aa02f9448e5d93bac97af1f21c573db123e9101b2020f4d4a27dfb4fede5bac748b159f41852367d087682d3be9e1902761e62a6a44c7178065a8708ebdf7c1e
 MISC metadata.xml 399 BLAKE2B 6c23d1a832367b5ded4ae9b48591fb407f0f808289f89aa32cd833cb6ce3952496457206e6a5b289fbbb492c85aacfec8dea445c448fda1d315ccf8e70f1fefb SHA512 df14f8340f688857210010d6843e0a86d706ba3bb9edbe015ad42e36fb7eb6c8606e2ea9d5dbfea7c4f7ad3f0e94c78d7b8c2b7b2a29af88d5c161162f8befcb
diff --git a/sys-power/nvclock/files/nvclock-0.8_p20110102-fno-common.patch b/sys-power/nvclock/files/nvclock-0.8_p20110102-fno-common.patch
new file mode 100644
index 000000000000..d95053a54cc6
--- /dev/null
+++ b/sys-power/nvclock/files/nvclock-0.8_p20110102-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/src/nvcontrol/nvcontrol.h
++++ b/src/nvcontrol/nvcontrol.h
+@@ -42,7 +42,7 @@
+ } NVOptionList;
+ 
+ #define OPTION_LIST_SIZE 27
+-NVOptionList option_list[OPTION_LIST_SIZE];
++extern NVOptionList option_list[OPTION_LIST_SIZE];
+ int init_nvcontrol();
+ NVOptionList *nvcontrol_lookup_option(int option);
+ 
diff --git a/sys-power/nvclock/files/nvclock-0.8_p20110102-r1-make.patch b/sys-power/nvclock/files/nvclock-0.8_p20110102-r1-make.patch
index e45e2a6aa341..89a9b7c1c5e3 100644
--- a/sys-power/nvclock/files/nvclock-0.8_p20110102-r1-make.patch
+++ b/sys-power/nvclock/files/nvclock-0.8_p20110102-r1-make.patch
@@ -1,11 +1,56 @@
 - Fix building with --as-needed
 - Fix parallel make by defining two new targets
 - Fix one spelling error
-- Respect CFLAGS, LDFLAGS
+- Respect AR, CC, RANLIB, CFLAGS, LDFLAGS
 - Link GTK frontend against -lX11 since it uses XOpenDisplay all the time
 
 --- a/configure.in
 +++ b/configure.in
+@@ -11,6 +11,9 @@
+ AC_PROG_MAKE_SET
+ AC_HEADER_STDC
+ 
++AC_CHECK_TOOL([AR], [ar])
++AC_PROG_RANLIB
++
+ 
+ HAVE_GTK2=no
+ HAVE_QT=no
+@@ -75,6 +78,7 @@
+ 
+ dnl We will only compile one NVClock gtk binary, choose the latest version availible
+ if test x"$enable_gtk" = "xyes"; then
++    PKG_CHECK_MODULES([X11], [x11])
+     PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4.0, have_gtk2=yes, have_gtk2=no)
+     GTK2_CFLAGS=$GTK_CFLAGS
+     GTK2_LIBS=$GTK_LIBS
+@@ -109,22 +113,18 @@
+ 	X11_LIBS="$X11_LIBS $XEXT_LIBS"
+ 	if test x"$X11_LIBS" != x ; then
+ 		HAVE_NVCONTROL=yes
+-	AC_SUBST(X11_CFLAGS)
+-	AC_SUBST(X11_LIBS)
+ 	AC_DEFINE([HAVE_NVCONTROL], [1], [NV-CONTROL support for changing OpenGL settings])
+ 	fi
+ fi
+ 
++AC_SEARCH_LIBS([dlsym], [dl dld], [], [
++    AC_MSG_ERROR([unable to find the dlsym() function])
++])
++
+ AC_SUBST(HAVE_GTK2)
+ AC_SUBST(HAVE_QT)
+ AC_SUBST(HAVE_NVCONTROL)
+ 
+-AC_SUBST(CFLAGS)
+-AC_SUBST(LIBS)
+-
+-RANLIB=ranlib
+-AC_SUBST(RANLIB)
+-
+ 
+ AC_OUTPUT(src/Makefile
+ 	src/backend/Makefile
 @@ -141,7 +141,7 @@
  if [test "$HAVE_NVCONTROL" = "yes"]; then
      echo "- NV-CONTROL support enabled"
@@ -15,6 +60,50 @@
  fi
  if [test "$HAVE_GTK2" = "yes"]; then
      echo "- GTK2 GUI enabled"
+--- a/src/backend/Makefile.in
++++ b/src/backend/Makefile.in
+@@ -1,11 +1,11 @@
+-CC=@CC@ -O0
+-AR=ar
++CC=@CC@
++AR=@AR@
+ RANLIB=@RANLIB@
+ 
+ system=@system@
+ HAVE_NVCONTROL=@HAVE_NVCONTROL@
+ OBJECTS=backend.o bios.o config.o error.o nv30.o nv40.o nv50.o info.o overclock.o utils.o i2c.o xf86i2c.o adt7473.o f75375.o lm99.o w83781d.o w83l785r.o libc_wrapper.o
+-CFLAGS=@X11_CFLAGS@ -I../.. -I../nvcontrol
++CFLAGS=@CFLAGS@ @X11_CFLAGS@ -I../.. -I../nvcontrol
+ 
+ ifeq ($(system), FreeBSD)
+     OBJECTS+=back_bsd.o
+--- a/src/gtk/Makefile.in
++++ b/src/gtk/Makefile.in
+@@ -20,20 +20,21 @@
+ 
+ ifeq ($(HAVE_NVCONTROL), yes)
+     DEPS=$(libbackend) $(libnvcontrol)
+-    LIBS=@GTK_LIBS@ -L../backend -lbackend -L../nvcontrol -lnvcontrol
++    LIBS=@LIBS@ @GTK_LIBS@ -L../backend -lbackend -L../nvcontrol -lnvcontrol
+     OBJECTS=banner.o gl.o hw.o main.o settings.o
+ else
+     DEPS=$(libbackend)
+-    LIBS=@GTK_LIBS@ -L../backend -lbackend
++    LIBS=@LIBS@ @GTK_LIBS@ -L../backend -lbackend
+     OBJECTS=banner.o hw.o main.o settings.o
+ endif
++X11_LIBS=@X11_LIBS@
+ 
+ 
+ .PHONY: clean distclean install
+ all: $(PROGRAM)
+ 
+ nvclock_gtk: $(DEPS) $(OBJECTS)
+-	$(CC) $(CFLAGS) -o nvclock_gtk $(OBJECTS) $(libbackend) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o nvclock_gtk $(OBJECTS) $(libbackend) $(LIBS) $(X11_LIBS)
+ 
+ clean:
+ 	rm -f nvclock_gtk *.core *.o *.exe
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
 @@ -16,7 +16,7 @@
@@ -46,25 +135,15 @@
  
  
  clean: clean-recursive clean-app
---- a/src/gtk/Makefile.in
-+++ b/src/gtk/Makefile.in
-@@ -27,6 +27,7 @@
-     LIBS=@GTK_LIBS@ -L../backend -lbackend
-     OBJECTS=banner.o hw.o main.o settings.o
- endif
-+LIBS += -lX11
- 
- 
- .PHONY: clean distclean install
-@@ -33,7 +33,7 @@
- all: $(PROGRAM)
- 
- nvclock_gtk: $(DEPS) $(OBJECTS)
--	$(CC) $(CFLAGS) -o nvclock_gtk $(OBJECTS) $(libbackend) $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o nvclock_gtk $(OBJECTS) $(libbackend) $(LIBS)
- 
- clean:
- 	rm -f nvclock_gtk *.core *.o *.exe
+--- a/src/nvcontrol/Makefile.in
++++ b/src/nvcontrol/Makefile.in
+@@ -1,5 +1,5 @@
+ CC=@CC@
+-AR=ar
++AR=@AR@
+ RANLIB=@RANLIB@
+ system=@system@
+ CFLAGS=@CFLAGS@
 --- a/src/qt/Makefile.in
 +++ b/src/qt/Makefile.in
 @@ -31,7 +31,7 @@
@@ -76,19 +155,3 @@
  
  clean:
  	rm -f nvclock_qt *.core *.moc *.o
---- a/src/backend/Makefile.in
-+++ b/src/backend/Makefile.in
-@@ -1,11 +1,11 @@
--CC=@CC@ -O0
-+CC=@CC@
- AR=ar
- RANLIB=@RANLIB@
- 
- system=@system@
- HAVE_NVCONTROL=@HAVE_NVCONTROL@
- OBJECTS=backend.o bios.o config.o error.o nv30.o nv40.o nv50.o info.o overclock.o utils.o i2c.o xf86i2c.o adt7473.o f75375.o lm99.o w83781d.o w83l785r.o libc_wrapper.o
--CFLAGS=@X11_CFLAGS@ -I../.. -I../nvcontrol
-+CFLAGS=@CFLAGS@ @X11_CFLAGS@ -I../.. -I../nvcontrol
- 
- ifeq ($(system), FreeBSD)
-     OBJECTS+=back_bsd.o
diff --git a/sys-power/nvclock/nvclock-0.8_p20110102-r2.ebuild b/sys-power/nvclock/nvclock-0.8_p20110102-r2.ebuild
index 92f0dd852e67..d14d2d9f9b1d 100644
--- a/sys-power/nvclock/nvclock-0.8_p20110102-r2.ebuild
+++ b/sys-power/nvclock/nvclock-0.8_p20110102-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit autotools eutils toolchain-funcs
+inherit autotools
 
 DESCRIPTION="NVIDIA Overclocking Utility"
 HOMEPAGE="http://www.linuxhardware.org/nvclock/"
@@ -19,27 +19,30 @@ RDEPEND="
 		x11-libs/gtk+:2
 		x11-libs/libX11
 	)
-	nvcontrol? ( x11-libs/libX11 x11-libs/libXext )
-"
+	nvcontrol? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)"
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-r1-make.patch
+	"${FILESDIR}"/${P}-usleep.patch
+	"${FILESDIR}"/${P}-desktop.patch
+	"${FILESDIR}"/${P}-buffers.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-r1-make.patch \
-		"${FILESDIR}"/${P}-usleep.patch \
-		"${FILESDIR}"/${P}-desktop.patch \
-		"${FILESDIR}"/${P}-buffers.patch
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
 src_configure() {
-	sed -i \
-		-e "/^AR=ar/s:=.*:=$(tc-getAR):" \
-		src/*/Makefile.in || die
-
-	# Qt support would mean Qt 3.
+	# only <Qt-4 supported
 	econf \
-		--docdir=/usr/share/doc/${PF} \
 		--disable-qt \
 		$(use_enable gtk) \
 		$(use_enable nvcontrol)
@@ -51,8 +54,7 @@ src_compile() {
 }
 
 src_install() {
-	mkdir -p "${D}"/usr/bin || die
-
+	dodir /usr/bin
 	default
 
 	newinitd "${FILESDIR}"/nvclock_initd nvclock
diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest
index d0686e5e03b8..b96d88ad9fb0 100644
--- a/sys-power/powertop/Manifest
+++ b/sys-power/powertop/Manifest
@@ -4,6 +4,6 @@ DIST powertop-2.13.tar.gz 303030 BLAKE2B 3c88e05f9889cc4b276bea3bc50a3a83228ca8e
 DIST powertop-v2.10.tar.gz 722992 BLAKE2B 573f1f0ed40705d3463f6e6f76c67ae99127ab2541b851143dafa707ef1c2dab4127d27811b63ad27e6b002ea4efd39417297a0227996ad9b01141b6de733d41 SHA512 4219e7aadbeebdf6932c04f784434e4dd0f540bf4941d43c1830b1b5cad1f3928769b13897e24dd956b6bdee65fb1fbe902ee30685bca229b71e140d65367837
 EBUILD powertop-2.10.ebuild 3843 BLAKE2B f0d637015c7ed1dbf8f69c619630dcf7ea3a0a6fe1a9698da2dda5274a28d054c88ac884b8a7c6ca312c1bca4a582da6e008476a548592fdf60ad357083b85b0 SHA512 c9f56ee6c4d33ad52d4774ffc96b791f7c82c677aa5e439a84c9ee7d4e7c6205163b7ede16c3e30cf10bbee3835fd16d6cbd7aa5c955c8a303f5830842c2d494
 EBUILD powertop-2.11.ebuild 3690 BLAKE2B 145b1787828fc13066f4e076e311b39e5ac22ea990591fe5817b6410d6b16e5c686b9d2c1fe839e9e20653dc920eaaadfc98529d40f523f38f1a9c6ca00ffe7b SHA512 e13aa9b1cef15c80f5f69a9c51bcb286a2211c4c5161b281cb4e879fc970bb7e607a829c987093c1f8b9087f6dbaa2a7649eb905496875220f99e19bf5f03786
-EBUILD powertop-2.13.ebuild 3720 BLAKE2B d76e814d38362aa34bd075384b8f187fd340584156f56051c792aa4fba14ab5d7f9d81863074c933d33d8dc359643d7ddb8e9e229f6780f27e0404db60f7cc1d SHA512 137b409b54ff0f28ab8542203afe7ed7a8701ef4946d2c688fdf0bf45ea2f958a989c5249fbc1459078a39457d57c5d5fd508a04d4a59b157ca246991216027b
+EBUILD powertop-2.13.ebuild 3719 BLAKE2B f4f9d0554bc4eee892f13a5fa3f733befcd0555af4366345745c7967393abc0e1138dc3b0d4bcf25e78902d55ce9785c5510cee4a207d9d57258ae9ab2a94401 SHA512 49f66a7edd7671af9a683fa6a219aac16d493bebb2779315b9379c3af178832eb83af1b06aab122fe1a1a8ad4473998c3e1e2d5f3b7d662a4952f992ebe767fa
 EBUILD powertop-9999.ebuild 3602 BLAKE2B b52644b5010edb0cbad9a339a75edaca4ec98188da83ab5c4c16cd85e3cec5ef8613a5fe5622cfc1d0c43654b9073372e6a63fce14d54bfd1c22792181ae9ea3 SHA512 3e918cf6c3012fba1ba5acc486c5bd8c0791f8ff1dc6c4d139c1acb0b7a9cd319a7b50c9b1808ddfafafcf591ac9a0c9d81ee58c115a99b4be5045a553437338
 MISC metadata.xml 328 BLAKE2B b0558a511f51fb77479976e60fde11b9cc46f85af935d78d060a53a1d5b1dc2611721e3c1451e3d23229cb8db0bd2bd9c6bb902c9b0fca8f57718f53f16032a8 SHA512 9d17013502d4a90d7c41493c2e69f7bc20bfd834f6f2caa5b105f9cc3045b87382393903c08a8e25bd75faaa9371e2d5c16d2521a90a89dd08697069ce8e8f5d
diff --git a/sys-power/powertop/powertop-2.13.ebuild b/sys-power/powertop/powertop-2.13.ebuild
index 2a324272186d..c3f8c0534105 100644
--- a/sys-power/powertop/powertop-2.13.ebuild
+++ b/sys-power/powertop/powertop-2.13.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	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"
+	KEYWORDS="amd64 arm ~arm64 ppc sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 inherit autotools ${GIT_ECLASS} linux-info
diff --git a/sys-power/thermald/Manifest b/sys-power/thermald/Manifest
index 504f6be20df3..7f0147bfb185 100644
--- a/sys-power/thermald/Manifest
+++ b/sys-power/thermald/Manifest
@@ -1,8 +1,6 @@
 AUX thermald 374 BLAKE2B 2ea9775b75acb7797c078c8c7786d442bd9c98102cd53073e1c040a0972dfd6be8424a62889a666573ee72ce5273bc53169fae5762bc0005a1c899324a699d27 SHA512 17f1c2133e47e897c4a5407ef622adfebb8498fce7ea9bf17cfd177269a3d869bdc21c3d2558010e9669ddc53e69e521bb4c1e112c51010168aa3c074c259e02
-DIST thermald-1.9.1.tar.gz 429116 BLAKE2B 7b6105b25e89e68f82368e154b4ca2a826192d596c7427ebea3c6aa726c28b5409cf7e0f022132e2ee47423cc732a6d37b2eb05236c579e2c725820516f6993f SHA512 7c16871316fb264abad9d0182cf8b6b5c1b4c747093672e74b7db2b6aa4f322fafdf6a94bfc8a11f427f7be2ee5e5691dc6a25bb5357ce45e7afe868f89b89e1
-DIST thermald-2.1.tar.gz 435310 BLAKE2B 7a5b67c2f8cb56276427188a91cc0d0c5cc7975ea847abe6eddc41b5dba77f908bc1ab97234568c65b2bcbb3bfff7881412cef2f8aa422139c64d5fb089a6511 SHA512 407d743d2799f84cd178e17ef694f0825f03db4ce80a47df95826bc26a9f142b80295905707fcba41bd5268d411a03478cd9d432545f9e2f1394d7d61539e169
 DIST thermald-2.2.tar.gz 435659 BLAKE2B 500189b924594e5b1d68adc776b3ad0c1d531d4259c65dd77f9166648c9b4273c52e1f8222254ec6500b3d37e39deb4ec862443728d50e9be95dee8e43496645 SHA512 f2c691061436699aef5bb7d9681370306dc7a64c453208911077c9a4af50e35b32247fc0a35853bb314d0e4289dd07f6116a3ade7fa278b521ed9b7b13db949b
-EBUILD thermald-1.9.1.ebuild 922 BLAKE2B d5481f4bf46b429ce06e194fab8665d7edc46ec73c15ca16479b33455fc6d71f51c204e01cadbfe39dd970f386168c4ec33d1b8edbc8e74fbd31d5830e5f2c1d SHA512 3f4bef46cf1ec58ee2da8f243102ef7710efde6357d60e150d4ada0310111d49a7c176e844799b9763d33ef484dae84db60261fd9b269b09ae2f0caf21073450
-EBUILD thermald-2.1.ebuild 924 BLAKE2B 22a248bb8becef8fbb2dd4ebca3d20e879508bae70a3b2690b9e27f04451a9d0c44cca46d1e82f20560d5cdb9c81c5843433fefd7b8af3a39f64c272b22696dc SHA512 de36365498bf49ef44c2e5830e1def6bf4a9fdf8f8888d7b66b9890b433a2c981f40c63b51df77aff4fa248d0587b1f5785a1ec7298f940edc584e5bd3105c07
+DIST thermald-2.3.tar.gz 452790 BLAKE2B caef87d670b14bfa0dbe6ca4873ebea4b0a9960a9bad48ddb10abb348e25cafdbdf5dad831a1c3ad38e71ab61d7f123df99046dec1e5ce2c32be506bc4b1312f SHA512 0d722c35e3638bb917994b8a123e1226b737b120f0946cfc604eb3bb4bd501121b1f196833f8cb3aceee73a8bb3566ef1d176d81143b84423f89d20966e91ed8
 EBUILD thermald-2.2.ebuild 922 BLAKE2B d5481f4bf46b429ce06e194fab8665d7edc46ec73c15ca16479b33455fc6d71f51c204e01cadbfe39dd970f386168c4ec33d1b8edbc8e74fbd31d5830e5f2c1d SHA512 3f4bef46cf1ec58ee2da8f243102ef7710efde6357d60e150d4ada0310111d49a7c176e844799b9763d33ef484dae84db60261fd9b269b09ae2f0caf21073450
+EBUILD thermald-2.3-r1.ebuild 979 BLAKE2B ab4543dd9c2359ecff866931d7cbca0534a326845060e8015e3f23488eef173a8357f4be131caacc9d8696595859c06fa05c7edcb4025f7a3bfb8fe3cafd9e57 SHA512 3651d62fbd995b6caecb0d92ede8e805ba9a5968ee0de80b6e743b5828525d95a3470d37267c91333dcf19b9b1773ce2b79a16f9a80c8b2526f5231c0bd9953b
 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
deleted file mode 100644
index fefc84b2d488..000000000000
--- a/sys-power/thermald/thermald-1.9.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic out-of-source systemd
-
-DESCRIPTION="Thermal daemon for Intel architectures"
-HOMEPAGE="https://01.org/linux-thermal-daemon"
-SRC_URI="https://github.com/01org/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:=
-	sys-apps/dbus:="
-DEPEND="${RDEPEND}
-	dev-util/glib-utils"
-
-S=${WORKDIR}/thermal_daemon-${PV}
-DOCS=( thermal_daemon_usage.txt README.txt )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-my_src_configure() {
-	# bug 618948
-	append-cxxflags -std=c++14
-
-	ECONF_SOURCE="${S}" econf \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-}
-
-my_src_install_all() {
-	einstalldocs
-
-	rm -rf "${ED}"/etc/init || die
-	doinitd "${FILESDIR}"/thermald
-}
diff --git a/sys-power/thermald/thermald-2.1.ebuild b/sys-power/thermald/thermald-2.3-r1.ebuild
index b551961e47bf..0e305e3aa636 100644
--- a/sys-power/thermald/thermald-2.1.ebuild
+++ b/sys-power/thermald/thermald-2.3-r1.ebuild
@@ -18,8 +18,11 @@ 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}