gentoo resync : 28.04.2021

32 files changed, 323 insertions, 135 deletions

diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 3282ffc72d92..cf0fdfebefc5 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/acpitool/Manifest b/sys-power/acpitool/Manifest
index 677eb9f5512b..c4c553414228 100644
--- a/sys-power/acpitool/Manifest
+++ b/sys-power/acpitool/Manifest
@@ -1,7 +1,7 @@
-AUX acpitool-0.5.1-ac_adapter.patch 2259 BLAKE2B 507657912c0936fc12a0e64b24bb47a1a8a7e93507ddc30620011aa05896cce60e8706c7af832c4654d960aeb150caf6ac958384d46ab3ba16aff6b0253122e1 SHA512 b00dc0785a4773cb917b35287b92d95d480486dfe51ebf73269b6d95e33201200b88c8a628c56bbef694ac0446633042f486d70b79525621782a26f08b3e901f
-AUX acpitool-0.5.1-battery.patch 17336 BLAKE2B ffc34d04f6dc4830a9ccf9202299f70b8a521f299c2ee65f5fc67369c4fc6b282b8bda0430faf606a00d83fac920062ed33cfc4dc283aba6c101cac1ec8fb087 SHA512 3fcfc91947cfd4e37e26524044673886c2ca999f8626ab141683b51f7d56e2e3f97465cca99277a5b4d6afdf195477ae56560215d5bfa958e585ae7ab634ee2f
-AUX acpitool-0.5.1-kernel3.patch 250 BLAKE2B 955eaf3cbe52aec1b5e1571160add30715e1ddb0e8cffb5725a78a9daf385ff0c80213cc67f68133cdac144306b2cdedd5ba26dd48e4e4b7cc3545392c51b251 SHA512 64b53ac77dd61a6ab88c6d933840382e62cc650fa7cffd58ea21b76ea91766673242c5c85114486c19d86d680d90cbdd0009bf4c22543cfba8fd6744f2936cbd
+AUX acpitool-0.5.1-ac_adapter.patch 2263 BLAKE2B b5bcd0109ab8efbfdfb7a1a8e630bd0f540778f7d8713b1a94f33f9695f8c20c2d41176d6d6b1b69f329b0ea57ac4bde800807d0ab54187483dec8308f847d52 SHA512 f3b4dd3847233686aa29497c1c3c801f49a262c03ff435b8d114ba2ca994c6f1be51a28282f575905286eb03426dc05a162a2f96e17e322bbb9c4b23229a9f36
+AUX acpitool-0.5.1-battery.patch 17344 BLAKE2B f40d1d241614b210785556a7915a77d192e2b272a9ba8df40289ee42ee43c9cfcd8b3f38d33c41f34d26693267e14006b10b5a66cc508d508976ca337f78cd0f SHA512 94887010bfb3a548206222a92df6d806475390e96296070ac9c71a29583ff9fc9e58dcb5cfc5423090418af67da1d4ddad19ff8d03ec35aacb81a3a9e2cab2c4
+AUX acpitool-0.5.1-kernel3.patch 254 BLAKE2B ca760c4bcbeb0dc82ccca27fb8043ddb1b12716ff344277c07a2329c5e80535587d8a1ada1f4e962158202f11e6ca3f2f49478ff9d22d416ac144ec8c377b839 SHA512 abf66e330a07ea68450355e10bce73c92de5c264dfde891c1d49963daae243f226c7efaeff5d5587a7bbf35b15901ba50e1fde20185d949a33806c60b4f56e24
 AUX acpitool-0.5.1-wakeup.patch 2570 BLAKE2B 4aa0c9f81d03c6c7b1d75e15e3c183361dba46e01b081560773106a600fde4ab865e69779aa7018636fb40be82ac538f2ece0085250bbaeb8d074137014a2f83 SHA512 792c1356b1b67853383b4c79cc234cd352b1ac88911960f4a48ecdac130f8d23478bc36506613420912539a40bcdd4f92f65ac594b6c7a9c59bd69243a619f18
 DIST acpitool-0.5.1.tar.bz2 109584 BLAKE2B 6c37495dbb9075fd08a594839aafcda5ac45233eb8ff24954a6f55dc4d74644fb2aceb9ba7caa4a194614c7d2f007df142d9358a11002716e3cb2df172d90823 SHA512 3e8684525b3dbe165b30507943beb975881a374ac3171fcfdf88098721fa3f751bfc161c3ac84180df1ae455673e0c0bc24fd06f0786911f15502effeeaab86b
-EBUILD acpitool-0.5.1-r1.ebuild 585 BLAKE2B 28ddc28bbf60f089e5a0f6f10a150cc1f31a8dd3c23f04dcf419f1d5feb7910f519b533c32ec1124f12772163142ddecb8eadbbb394481667f8464eab6b7779c SHA512 4ec5eae9b5c99ea222879e8eb987da70d1d2211ee11555bbf756c838468ef4836c79e1bcf6698343dab868ef8bd7d941f6d8b27684d0db7a29e69a8acd921af7
+EBUILD acpitool-0.5.1-r2.ebuild 448 BLAKE2B e0c4e44d60d5883dc616f953482a4a8a5e1babb0902b0b338753b558f15ad2e7aa702a30f4187a4f86e59353a1bebcf304bf1c95d4706a29d1f842de4968b99f SHA512 66cf9b9297a385efcee90fb02d8c91bf710de23d4cb0e33f170af0b410a305e4a58308c04221506c60784c4e9de5b7f031767193a39918895a048f7b82cc4007
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-power/acpitool/acpitool-0.5.1-r1.ebuild b/sys-power/acpitool/acpitool-0.5.1-r1.ebuild
deleted file mode 100644
index 825fc55d48e3..000000000000
--- a/sys-power/acpitool/acpitool-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="A small command line application, intended to be a replacement for the apm tool"
-HOMEPAGE="http://packages.debian.org/sid/acpitool"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DOCS="AUTHORS ChangeLog README TODO"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-ac_adapter.patch \
-		"${FILESDIR}"/${P}-battery.patch \
-		"${FILESDIR}"/${P}-kernel3.patch \
-		"${FILESDIR}"/${P}-wakeup.patch
-}
diff --git a/sys-power/acpitool/acpitool-0.5.1-r2.ebuild b/sys-power/acpitool/acpitool-0.5.1-r2.ebuild
new file mode 100644
index 000000000000..e88c1dc56f8e
--- /dev/null
+++ b/sys-power/acpitool/acpitool-0.5.1-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A replacement for the APM tool"
+HOMEPAGE="https://packages.debian.org/sid/acpitool"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-ac_adapter.patch
+	"${FILESDIR}"/${P}-battery.patch
+	"${FILESDIR}"/${P}-kernel3.patch
+	"${FILESDIR}"/${P}-wakeup.patch
+)
diff --git a/sys-power/acpitool/files/acpitool-0.5.1-ac_adapter.patch b/sys-power/acpitool/files/acpitool-0.5.1-ac_adapter.patch
index 070fdf9de1b7..fb70e86d2b81 100644
--- a/sys-power/acpitool/files/acpitool-0.5.1-ac_adapter.patch
+++ b/sys-power/acpitool/files/acpitool-0.5.1-ac_adapter.patch
@@ -1,8 +1,8 @@
 Author: Michael Meskes <meskes@debian.org>
 Description: Fix reading of ac_adapter information.
 
---- src/ac_adapter.cpp
-+++ src/ac_adapter.cpp
+--- a/src/ac_adapter.cpp
++++ b/src/ac_adapter.cpp
 @@ -149,7 +149,7 @@
  int Do_AC_Info_Sys()
  {
diff --git a/sys-power/acpitool/files/acpitool-0.5.1-battery.patch b/sys-power/acpitool/files/acpitool-0.5.1-battery.patch
index 76428ca7d970..c4a9a5e6a65d 100644
--- a/sys-power/acpitool/files/acpitool-0.5.1-battery.patch
+++ b/sys-power/acpitool/files/acpitool-0.5.1-battery.patch
@@ -1,8 +1,8 @@
 Author: Evgeni Golov <evgeni@debian.org>, Michael Meskes <meskes@debian.org>
 Description: Fix reading of battery information.
 
---- src/acpitool.h
-+++ src/acpitool.h
+--- a/src/acpitool.h
++++ b/src/acpitool.h
 @@ -39,6 +39,9 @@
      char Serial[13];
      char Bat_Type[13];
@@ -13,8 +13,8 @@ Description: Fix reading of battery information.
  };
  
  
---- src/battery.cpp
-+++ src/battery.cpp
+--- a/src/battery.cpp
++++ b/src/battery.cpp
 @@ -107,6 +107,9 @@
  	    memset(Batt_Info[i]->Serial, '\0', 13);
  	    memset(Batt_Info[i]->Bat_Type, '\0', 13); 
diff --git a/sys-power/acpitool/files/acpitool-0.5.1-kernel3.patch b/sys-power/acpitool/files/acpitool-0.5.1-kernel3.patch
index cd793d2e1e67..cd4b5c357e65 100644
--- a/sys-power/acpitool/files/acpitool-0.5.1-kernel3.patch
+++ b/sys-power/acpitool/files/acpitool-0.5.1-kernel3.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/377355
 
---- src/acpitool.cpp
-+++ src/acpitool.cpp
+--- a/src/acpitool.cpp
++++ b/src/acpitool.cpp
 @@ -205,8 +205,7 @@
  	Kernel_24 = 1;           
  	Kernel_26 = 0;
diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index 7ae8f0d745de..e767ac0c9ff1 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -1,12 +1,17 @@
 AUX apcupsd-3.14.9-aliasing.patch 2108 BLAKE2B b6ce1e6e3e40b6d533a08d5fac633e7c3d81574b2b2fd9c442a10eac8e507abfa73ddf3dc74ac9fc4d8bbd9c7da3f7d9eb5194f6df959dbe792d5b103d88844c SHA512 48eb51385136216d1cdddb6b237b89a52c516b223aa7fe50fb35761cd595d9ab7f7fabbd0e4f8c0f7d45df6feed0a2e240d227181f3d772fc5fa9f8bfa62529f
+AUX apcupsd-3.14.9-close-on-exec.patch 1700 BLAKE2B 33bc681a008c98a6659a832359d3906bfe153db7cf3fbb0dbf442dc60e97c41dd0680eb5674592c835a28731f1fb361a20f2f5acae88f84142781153fba5ca66 SHA512 5f348efc11f35538fc9810d9026b2f8eeeadf5675ca1bf2275f704310a654266e5e79e393a59e6c25171a94f5d0b1d9e74b45a1511c4289242379f6f4e30888b
+AUX apcupsd-3.14.9-commfailure.patch 519 BLAKE2B 58763a637f44ad3e506b1f8da73027353d05bbcab6a3a108d39c4d189682a8185d89960e46eb760b7f5781115b266ff0c5ebb902a1307634faed0639c7b4ceb9 SHA512 856063b915ccd583abbef4347e01a8a5f71f7853efbfeb62d2edfee1acd14030e34373c420d5fdd58bc47ce03e79b55dd4a5ee6486c8dee984e8f272257af673
+AUX apcupsd-3.14.9-fix-nologin.patch 529 BLAKE2B 6d3f6c735d88808056a73620c92e5f219cda2501714dc4566e6ccc9b36e4ef6a28da97d4938dd0174f8c7769afe71c2937fdfe0b9bf46d5f1172307f84d22a7f SHA512 50c614aeaa2118cc5745f34ec86aada0eaf41af4b6616717b7d5637aa84710fd078950a149fb0bf3a68107619125ea0c74ea6f8fa937338a662c7ee31804fbab
+AUX apcupsd-3.14.9-gapcmon.patch 1213 BLAKE2B ecc9798a010cb60beb9bacd93b1223b2d8f0c7f5739b2237bd7bdc10182c4973944bc49a34c7a3060c164965524f19e2fbe40a042df8e6c7e77001874b396ab1 SHA512 5cb0eeb7449c16bd820f17ff64895f6e7beaa7f2af66376fbe5450e9ef803138f5248f43232bc7753b72ca7c650ca177b0227ce79d4002383f19d0174adbe542
+AUX apcupsd-3.14.9-wall-on-mounted-usr.patch 815 BLAKE2B dcc4e89328b0d5afc8d33555cc5c9b9a5ea06e74d80ffc761506f0435b65b4174ce9e4873344e7a1838f3a11d69eb9f7286b189f0cc67e7c21ae66db1baa7aca SHA512 00a3a01f3afdb1755c65ebc9832778bd3a7bfeab115531a1282668ba5340fd081eeaa263264a6510722ac4726e5d84961089c6c0305d0a6f7d1cf9e4de80be00
 AUX apcupsd-tmpfiles.conf 70 BLAKE2B 6bc5fdff60918a5ccb616e28cc3832053938accd47a75aa29c3e569808c59ee35d618f385022309ab8eb2f714b5d87d6c752547447d896b7537b30b8dfc262ed SHA512 c63242a06cc14242575c24a8aca4ea35a7150e6073425c8230e36c7117a1bc49dc659dbb0c455ddc454a0ac5ebd7faa5638fb70282c38ed5d1ca9ffab700ef05
 AUX apcupsd-udev.rules 328 BLAKE2B be1a8ff2eb09c045137ab2f1e48d3caa5ea9df85f766da5f9ae04786895631503d986cb184c74fd92aa6c229d34fedeab0a61dc5cad4a8fba1a799ade3f01081 SHA512 ba2ebb9f28011548c845a81f17a328b98ec8d79c1e6be33aeab863d77b9d3aa61b4dfbd1bb89a0cae00465387dffe8cc223634a6e9a2f59170846d4bed9e7135
 AUX apcupsd.conf 12475 BLAKE2B c7695035887fa4fa867b2588f2ed0e2fee6c6a0086c221fec3019e3de639202287e9a35082334b8801cda38c846a0bcac714b046b1ddc1297f764bb211e42fb9 SHA512 1519d3cd47a2a73ff4148e4f74964ae841d37639616fe5b974b426983f5379db89b8793a6952389c443c56b84d0ef33f6995eccd920f71b4e5efc842a58a04e1
+AUX apcupsd.init 804 BLAKE2B 7afd83a6be8b068133f6221cc2396a1fe4cab23f6dec68957b48ef7940730908e7a20e1597a21480eeffdb79314fd02505d4bafdd0b7a6bd1ff2b7c452f847ef SHA512 dd7fcc52b495c3f73bc9b2fe73bbb7c8fe3ec959ea733360d370148d617d98f34de3b48f1cb451f9a8356eb8088b06d3c736bd6cbad2bb5e9e609e37d5f2c53c
 AUX apcupsd.init.4 926 BLAKE2B a698aa40ebab7bb14f6efd05f8d1300f95e81d18aa74d2d8daa35629803f8758a56ec4f6f79f27ccc3aec9d54a53a7326f5afe72b9972de90387b751c7ca21b2 SHA512 b31d054252d0caeaeee4b3e0d7d9d0f5c1d0ad32a08f952f57fe91a36964d6a895ff26bb5514820cc8e83b7e87df1b0c508c3ae35c39f43d2be2e1cd66ef705e
 AUX apcupsd.powerfail.init 397 BLAKE2B 472512906536753d3054d275707764a98094c14866da63fbc8d2d62e16a9099fdce0b61cf572a4ba862f0be13e1ed3407821ed07ec90f9c77fb8d95f18aafc2f SHA512 cd0ed9d24a8371de7920bf0ce2e89bb63c0bee58da1ac782ed2b929068f95b2af47458529223a33ecea4e8f73ddfe3a7b9591af6f64828de7ed1d91e2edbb6e1
 AUX apcupsd.service 111 BLAKE2B bf2ac8161af5b971642298c30b08ad78d289044bb2452bdef39b31119b60eceb0a14add7c00262132bb80dbf1964103242452cb8d9b815d6ec82c204100ea184 SHA512 011e3e52e7909f36fb73b6064277a69e5db41263cfc72bda07e326172396d5318cd2b050f1fb84c4cc6da7a247c0035c36c55322ffb234a1cfa7bf13ba492889
-DIST apcupsd-3.14.13.tar.gz 1935043 BLAKE2B 56d8fb9c6a055b20c2d99867e43b6a2d6ebe1d55c724d8a6701d9baa569a14f600cb03c6176380c6c42c46ac610f43136a4b52c47c8b86bc41966d4091481e95 SHA512 74f7763de268626e24f9dd99090b01d5bff35c2fde769039104105ec27941673d1613c41fcac11e3d97d2fe5c364bcc0459847fcba5d2f7f1aac85795d6d8570
 DIST apcupsd-3.14.14.tar.gz 1843409 BLAKE2B 48a3b249780064d699d86b658584aa222ce9f3b46a81209110b4684bf737cca7492b87b063154864ce76478f29f73cda83ab96b47f4a7aa7aa91e29a8abbf4a8 SHA512 c953bbf3e08f809748a7978a3952604176390d1cd276f187fe096d9bc3c8993b52127e8350c0363387da41318e24b4d1e00ea58df71f3bb8f50c9a5a64cd2d7f
-EBUILD apcupsd-3.14.13.ebuild 3924 BLAKE2B 85dfef3e437613485b35d62f6987340d9dbeff63f0da334fae429e629e137e7648c3138f669e22f6a0975acac07d8d6517c75830835abbfe91a4cd6d41bdc7c5 SHA512 5197db78dd4be02b5e8ea8316d69e06fd065d2b43900be364faaf363712897888dcf5b8315c13d6d37fd1ba9f91ac7ce2f4625f99eab3183ba9f3233bb2fb8f1
 EBUILD apcupsd-3.14.14-r2.ebuild 4042 BLAKE2B 3c71cb4717d389d1d6ff192c9654df79c515efde571b62e7a58bbf3dcd270220fba0611cc85f258255d95f989006c9a3521e62030b9fe2780aa48ca344c03bdb SHA512 864ed6f867c2f289318bd7ac8a1f123758bedf76f729c5304d84cf4a56e46313dc83054e2081e18e8a71a303e9da68d1e239e13b61e1b092d6e40a28c3ea6c09
+EBUILD apcupsd-3.14.14-r3.ebuild 4309 BLAKE2B 8951b63af6533640e2182e17138f578f55ed6b2481cf392a55a430ff4b4ee66ed5c21fd4ef183885bbb1371eb97b2169bcf4af4280fc72c9472f47c5b5e912d9 SHA512 d0257f7e2d11f3eabc89bac089bf0c85e783022310b774486ddd7ef44fc1a02544d95ed3427d88e72296042c2236b979b5c828c99a182362917c006a8828f977
 MISC metadata.xml 1161 BLAKE2B 6ea52dc98c841f0f6e018f74addd11054ddedc635d0f153f5f629b6949eebc0833d3c5a7e27a584a0344dc48319de2cf85d0304dd03ba77927244654713a2488 SHA512 384db8369118c9d430e4baea4d65bef498ec4f198e0379581eac77f081fb34705ce5171fec4753beeaa5ae3c153fe98a91dbebbd04ce5c671172c7ba28d30dfe
diff --git a/sys-power/apcupsd/apcupsd-3.14.13.ebuild b/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
index b3489084c867..12e0b16bcc7e 100644
--- a/sys-power/apcupsd/apcupsd-3.14.13.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI="7"
 
-inherit eutils linux-info flag-o-matic systemd udev tmpfiles
+inherit linux-info flag-o-matic systemd udev tmpfiles
 
 DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
 HOMEPAGE="http://www.apcupsd.org/"
@@ -11,42 +11,55 @@ SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
-IUSE="snmp +usb cgi nls gnome kernel_linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="snmp +usb +modbus cgi gnome kernel_linux"
 
-DEPEND="
-	>=sys-apps/util-linux-2.23[tty-helpers(-)]
+DEPEND=">=sys-apps/util-linux-2.23[tty-helpers(-)]
 	cgi? ( >=media-libs/gd-1.8.4 )
-	nls? ( sys-devel/gettext )
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	gnome? ( >=x11-libs/gtk+-2.4.0:2
+	modbus? ( usb? ( virtual/libusb:0 ) )
+	gnome? (
+		>=x11-libs/gtk+-2.4.0:2
 		dev-libs/glib:2
-		>=gnome-base/gconf-2.0 )"
+		>=gnome-base/gconf-2.0
+	)
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )"
+
 RDEPEND="${DEPEND}
-	sys-apps/openrc
 	virtual/mailx"
 
 CONFIG_CHECK="~USB_HIDDEV ~HIDRAW"
 ERROR_USB_HIDDEV="CONFIG_USB_HIDDEV:	needed to access USB-attached UPSes"
 ERROR_HIDRAW="CONFIG_HIDRAW:		needed to access USB-attached UPSes"
 
+DOCS=( ChangeLog ReleaseNotes )
+HTML_DOCS=( doc/manual )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.14.9-aliasing.patch
+	"${FILESDIR}"/${PN}-3.14.9-close-on-exec.patch
+	"${FILESDIR}"/${PN}-3.14.9-commfailure.patch
+	"${FILESDIR}"/${PN}-3.14.9-fix-nologin.patch
+	"${FILESDIR}"/${PN}-3.14.9-gapcmon.patch
+	"${FILESDIR}"/${PN}-3.14.9-wall-on-mounted-usr.patch
+)
+
 pkg_setup() {
-	if use kernel_linux && use usb && linux_config_exists; then
+	if use kernel_linux && use usb && linux_config_exists ; then
 		check_extra_config
 	fi
 }
 
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.14.9-aliasing.patch"
-}
-
 src_configure() {
 	local myconf
+
 	use cgi && myconf="${myconf} --enable-cgi --with-cgi-bin=/usr/libexec/${PN}/cgi-bin"
-	if use usb; then
-		myconf="${myconf} --with-upstype=usb --with-upscable=usb --enable-usb --with-dev= "
+
+	if use usb ; then
+		myconf="${myconf} --with-upstype=usb --with-upscable=usb --enable-usb --with-dev="
+		use modbus && myconf="${myconf} --enable-modbus-usb"
 	else
 		myconf="${myconf} --with-upstype=apcsmart --with-upscable=smart --disable-usb"
+		use modbus || myconf="${myconf} --disable-modbus"
 	fi
 
 	# We force the DISTNAME to gentoo so it will use gentoo's layout also
@@ -61,10 +74,10 @@ src_configure() {
 		--with-nis-port=3551 \
 		--enable-net --enable-pcnet \
 		--with-distname=gentoo \
-		$(use_enable snmp net-snmp) \
+		$(use_enable snmp) \
 		$(use_enable gnome gapcmon) \
 		${myconf} \
-		APCUPSD_MAIL=/bin/mail
+		APCUPSD_MAIL=$(type -p mail)
 }
 
 src_compile() {
@@ -72,34 +85,33 @@ src_compile() {
 	# the text files in the distribution, but I wouldn't count on them
 	# doing that anytime soon.
 	MANPAGER=$(type -p cat) \
-		emake
+		emake VERBOSE=2
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	rm -f "${D}"/etc/init.d/halt
+	emake DESTDIR="${D}" VERBOSE=2 install
+	rm "${ED}"/etc/init.d/halt || die
 
 	insinto /etc/apcupsd
 	newins examples/safe.apccontrol safe.apccontrol
 	doins "${FILESDIR}"/apcupsd.conf
 
-	dodoc ChangeLog* ReleaseNotes
 	doman doc/*.8 doc/*.5
 
-	dohtml -r doc/manual/*
+	einstalldocs
 
-	rm "${D}"/etc/init.d/apcupsd
-	newinitd "${FILESDIR}/${PN}.init.4" "${PN}"
+	rm "${ED}"/etc/init.d/apcupsd || die
+	newinitd "${FILESDIR}/${PN}.init" "${PN}"
 	newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail
 
 	systemd_dounit "${FILESDIR}"/${PN}.service
 	dotmpfiles "${FILESDIR}"/${PN}-tmpfiles.conf
 
-	# remove hal settings, we don't really want to have it around still.
-	rm -r "${D}"/usr/share/hal
+	# remove hal settings, we don't really want to have it still around.
+	rm -r "${D}"/usr/share/hal || die
 
 	# replace it with our udev rules if we're in Linux
-	if use kernel_linux; then
+	if use kernel_linux ; then
 		udev_newrules "${FILESDIR}"/apcupsd-udev.rules 60-${PN}.rules
 	fi
 
@@ -108,7 +120,7 @@ src_install() {
 pkg_postinst() {
 	tmpfiles_process ${PN}-tmpfiles.conf
 
-	if use cgi; then
+	if use cgi ; then
 		elog "The cgi-bin directory for ${PN} is /usr/libexec/${PN}/cgi-bin."
 		elog "Set up your ScriptAlias or symbolic links accordingly."
 	fi
diff --git a/sys-power/apcupsd/files/apcupsd-3.14.9-close-on-exec.patch b/sys-power/apcupsd/files/apcupsd-3.14.9-close-on-exec.patch
new file mode 100644
index 000000000000..aeaa78b35420
--- /dev/null
+++ b/sys-power/apcupsd/files/apcupsd-3.14.9-close-on-exec.patch
@@ -0,0 +1,50 @@
+Close the socket on exec - avoid leaked file descriptors, patch from Fedora
+
+--- a/src/apcnis.c
++++ b/src/apcnis.c
+@@ -157,6 +157,9 @@ void do_server(UPSINFO *ups)
+       sleep(5 * 60);
+    }
+ 
++   /* Close the socket on exec - avoid leaked file descriptors */
++   fcntl(sockfd, F_SETFD, FD_CLOEXEC);
++
+    /* Reuse old sockets */
+ #ifndef HAVE_MINGW
+    if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (void*)&turnon, sizeof(turnon)) < 0) {
+--- a/src/apcupsd.c
++++ b/src/apcupsd.c
+@@ -212,6 +212,9 @@ int main(int argc, char *argv[])
+       if (ups->event_fd < 0) {
+          log_event(ups, LOG_WARNING, "Could not open events file %s: %s\n",
+             ups->eventfile, strerror(errno));
++      } else {
++         /* Close the file on exec - avoid leaked file descriptors */
++         fcntl(ups->event_fd, F_SETFD, FD_CLOEXEC);
+       }
+    }
+ 
+--- a/src/drivers/usb/linux/linux-usb.c
++++ b/src/drivers/usb/linux/linux-usb.c
+@@ -246,8 +246,11 @@ bool LinuxUsbUpsDriver::open_usb_device()
+    /* Retry 10 times */
+    for (i = 0; i < 10; i++) {
+       _fd = open_device(_ups->device);
+-      if (_fd != -1)
++      if (_fd != -1) {
++         /* Close the device on exec - avoid leaked file descriptors */
++         fcntl(_fd, F_SETFD, FD_CLOEXEC);
+          return true;
++      }
+       sleep(1);
+    }
+ 
+@@ -270,6 +273,7 @@ auto_detect:
+             asnprintf(devname, sizeof(devname), "%s%d", hiddev[j], k);
+             _fd = open_device(devname);
+             if (_fd != -1) {
++               fcntl(_fd, F_SETFD, FD_CLOEXEC);
+                /* Successful open, save device name and return */
+                strlcpy(_ups->device, devname, sizeof(_ups->device));
+                return true;
+ 
diff --git a/sys-power/apcupsd/files/apcupsd-3.14.9-commfailure.patch b/sys-power/apcupsd/files/apcupsd-3.14.9-commfailure.patch
new file mode 100644
index 000000000000..49641c06bef3
--- /dev/null
+++ b/sys-power/apcupsd/files/apcupsd-3.14.9-commfailure.patch
@@ -0,0 +1,15 @@
+Author: Tero Janka <tero.janka@mbnet.fi>
+Description: apcaccess call blocking commfailure mails (Closes: #409734).
+
+Index: apcupsd/platforms/etc/commfailure.in
+===================================================================
+--- apcupsd.orig/platforms/etc/commfailure.in
++++ apcupsd/platforms/etc/commfailure.in
+@@ -13,7 +13,5 @@ MSG="$HOSTNAME Communications with UPS $
+    echo "Subject: $MSG"
+    echo " "
+    echo "$MSG"
+-   echo " "
+-   @sbindir@/apcaccess status
+ ) | $APCUPSD_MAIL -s "$MSG" $SYSADMIN
+ exit 0
diff --git a/sys-power/apcupsd/files/apcupsd-3.14.9-fix-nologin.patch b/sys-power/apcupsd/files/apcupsd-3.14.9-fix-nologin.patch
new file mode 100644
index 000000000000..75f9e4449bf5
--- /dev/null
+++ b/sys-power/apcupsd/files/apcupsd-3.14.9-fix-nologin.patch
@@ -0,0 +1,15 @@
+Description: only prohibit logins on shutdown if login is allowed at all
+Index: apcupsd-3.14.12/src/action.c
+===================================================================
+--- apcupsd-3.14.12.orig/src/action.c
++++ apcupsd-3.14.12/src/action.c
+@@ -208,7 +208,8 @@ static void do_shutdown(UPSINFO *ups, in
+    delete_lockfile(ups);
+    ups->set_fastpoll();
+    make_file(ups, ups->pwrfailpath);
+-   prohibit_logins(ups);
++   if (ups->nologin.type != NEVER)
++      prohibit_logins(ups);
+ 
+    if (!ups->is_slave()) {
+       /*
diff --git a/sys-power/apcupsd/files/apcupsd-3.14.9-gapcmon.patch b/sys-power/apcupsd/files/apcupsd-3.14.9-gapcmon.patch
new file mode 100644
index 000000000000..0dd1cc69aa35
--- /dev/null
+++ b/sys-power/apcupsd/files/apcupsd-3.14.9-gapcmon.patch
@@ -0,0 +1,33 @@
+Description: take care of some deprecated functions and format issue
+Author: Thorsten Alteholz <debian@alteholz.de>
+Index: apcupsd-3.14.14/src/gapcmon/gapcmon.c
+===================================================================
+--- apcupsd-3.14.14.orig/src/gapcmon/gapcmon.c	2016-07-16 03:04:22.000000000 +0200
++++ apcupsd-3.14.14/src/gapcmon/gapcmon.c	2017-10-06 09:26:40.412004149 +0200
+@@ -1580,7 +1580,7 @@
+          scaled = gdk_pixbuf_scale_simple(pixbuf, size, size, GDK_INTERP_BILINEAR);
+          gtk_image_set_from_pixbuf(GTK_IMAGE(pm->tray_image), scaled);
+          gtk_widget_show(pm->tray_image);
+-         gdk_pixbuf_unref(scaled);
++         g_object_unref(scaled);
+       }
+ 
+       if (pm->window != NULL)
+@@ -2889,7 +2889,7 @@
+ 
+    pch = g_strdup_printf("%s(%s) emsg=%s", pch_func, pch_topic, pch_emsg);
+ 
+-   g_message(pch);
++   g_message("%s",pch);
+ 
+    g_free(pch);
+ 
+@@ -4474,7 +4474,7 @@
+    gtk_image_set_from_pixbuf(GTK_IMAGE(image), scaled);
+    gtk_box_pack_start(GTK_BOX(hbox), image, TRUE, TRUE, 0);
+    gtk_widget_show(image);
+-   gdk_pixbuf_unref(scaled);
++   g_object_unref(scaled);
+ 
+    label = gtk_label_new(about_text);
+    gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
diff --git a/sys-power/apcupsd/files/apcupsd-3.14.9-wall-on-mounted-usr.patch b/sys-power/apcupsd/files/apcupsd-3.14.9-wall-on-mounted-usr.patch
new file mode 100644
index 000000000000..b89a5309e5ba
--- /dev/null
+++ b/sys-power/apcupsd/files/apcupsd-3.14.9-wall-on-mounted-usr.patch
@@ -0,0 +1,20 @@
+At halt/killpower time, /usr may already be umounted, and wall
+lives in /usr. Avoid failing by using cat if needed.
+
+Index: apcupsd/platforms/apccontrol.in
+===================================================================
+--- apcupsd.orig/platforms/apccontrol.in
++++ apcupsd/platforms/apccontrol.in
+@@ -62,10 +62,10 @@ fi
+ 
+ case "$1" in
+     killpower)
+-	echo "Apccontrol doing: ${APCUPSD} --killpower on UPS ${2}" | ${WALL}
++	echo "Apccontrol doing: ${APCUPSD} --killpower on UPS ${2}" | (${WALL} 2>/dev/null || cat)
+ 	sleep 10
+ 	${APCUPSD} --killpower
+-	echo "Apccontrol has done: ${APCUPSD} --killpower on UPS ${2}" | ${WALL}
++	echo "Apccontrol has done: ${APCUPSD} --killpower on UPS ${2}" | (${WALL} 2>/dev/null || cat)
+     ;;
+     commfailure)
+ 	echo "Warning communications lost with UPS ${2}" | ${WALL}
diff --git a/sys-power/apcupsd/files/apcupsd.init b/sys-power/apcupsd/files/apcupsd.init
new file mode 100644
index 000000000000..e544fd4f3900
--- /dev/null
+++ b/sys-power/apcupsd/files/apcupsd.init
@@ -0,0 +1,28 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+: ${APCUPSD_CONFIGFILE:=/etc/apcupsd/${SVCNAME#*.}.conf}
+: ${APCUPSD_POWERFAILFILE:=/etc/apcupsd/powerfail}
+: ${APCUPSD_PIDFILE:=/run/${SVCNAME}.pid}
+: ${APCUPSD_SSDARGS:=--wait 1000}
+: ${APCUPSD_TERMTIMEOUT:=TERM/60/KILL/5}
+
+command="/sbin/apcupsd"
+command_args="${APCUPSD_OPTS} --config-file \"${APCUPSD_CONFIGFILE}\" --pid-file \"${APCUPSD_PIDFILE}\""
+pidfile="${APCUPSD_PIDFILE}"
+retry="${APCUPSD_TERMTIMEOUT}"
+start_stop_daemon_args="${APCUPSD_SSDARGS}"
+required_files="${APCUPSD_CONFIGFILE}"
+
+depend() {
+	use dns
+}
+
+start_pre() {
+	if [ -e "${APCUPSD_POWERFAILFILE}" ] ; then
+		ebegin "Removing stale ${APCUPSD_POWERFAILFILE}"
+		rm "${APCUPSD_POWERFAILFILE}"
+		eend $?
+	fi
+}
diff --git a/sys-power/iasl/Manifest b/sys-power/iasl/Manifest
index b7935ba6e28e..e94c70d6b508 100644
--- a/sys-power/iasl/Manifest
+++ b/sys-power/iasl/Manifest
@@ -3,6 +3,6 @@ DIST acpica-unix-20200326.tar.gz 1850373 BLAKE2B 4b0c8548ff4b99fb774eb4301687368
 DIST acpica-unix-20200717.tar.gz 1847795 BLAKE2B 84af34884bbea39aed9ea7ec86f20a27f3dd10fa68456b5f12de2bdecf9f205c43b4b4e5dcfb55325571a5682794cdc2e0c5a83c646036a15cc90f81223aefff SHA512 16de55b97a3b478dd2dd44fcbe51b871c7cc6174d337939b873bcbc871bee10487a796aa86abaa7b54ff6b75279cdbf9ec48e19f6baaea4290daf1ad56bdbc46
 DIST acpitests-unix-20200326.tar.gz 2212897 BLAKE2B d88d3d900ac06d165c4a50cddd65495b75db345009b10e76d9f38197ba42efe3ea396ec9828bef62da1fd96ac331d95623c03194e08b00037ff1234321fcf0d3 SHA512 332b4ed016cee48662a5f4572e6d170461f02ee1386109a3970fbe8d104f2a2b14c19235ea43ae9b26e8faf9ef9597cb3d2148e498741361aca62978d0b62189
 DIST acpitests-unix-20200717.tar.gz 2212717 BLAKE2B 939e8022c5ecb7c5e862767f89c0b0de6146e23014dc0100d7dee0f3502e7adcbba72a468c828f804317e75d3a80ba5864c5497a7695f70be0bc1e3dcc69b4e6 SHA512 02c6674cbb2d98f783f25c71b1f391713de6fb3b56e5b57de9a7ccba0927453be4db8aea513e6e7ad491fcf3a0b2c14fefe8a2b82877a2ae01ea1d7832d36844
-EBUILD iasl-20200326.ebuild 3392 BLAKE2B 0ff5e3a105785bb0379404b85bcf8a3d49dcd17db6b77e6dbc8536572cdadfc497da5f533e039270b7ebfd0d59ca6e36382f7f8df07b6f2ed146d993e45926b6 SHA512 ecf72d6339edc6093720a0d8598f66ef321b5cb411b8168512efe5909a10abdfd11b1413a86d31bac123f8d14573706b52cbc78adea10a279e1ad54de7e0db13
-EBUILD iasl-20200717.ebuild 3395 BLAKE2B b3b725cc68057472b7d7c39014ec1ea4cbc1870d5a3c85eb2fec38464818e9b4bba32c12bc098c350e91527e8f21b068ec8bcec11d7df561ec761464bcf095a7 SHA512 2af8ca2a3eb2987056ca0b2cb531f93e64ac4bf4c98ba3b1c924a58358bd3254fec234569362aa6b57d67900cfb3f3f1730ee76151864e95d36a2aa188002477
+EBUILD iasl-20200326.ebuild 3395 BLAKE2B e8276ade03760864cd88c4186c699c08331b7bf9defd0ed90c36f1186d373a226aac24197be3c1a551191f460ddb1bb62855e0b826e73c09f9a7d42f451c8874 SHA512 ab7b7d66abddfdf9ad3a0867659f111afab81932f90c9577a951b8d3a927af9ce25e9fe9257cf183fd7319c4e799264573a66300a088eef8be2a28abee096235
+EBUILD iasl-20200717.ebuild 3398 BLAKE2B ec83332a39bf0b836219ec488483568d379b93968f73cb78feab20b5cb9d023a17a03eac7a68c663d9e98122b6bf0832070508c5599632a9e0c2cf43fc5d4996 SHA512 321126288e4a0b65544419f55c8cabd4010b9c7e15ebfad656cc0b9383f36ac63e11d7570c0b2f98934143b02a85fb96d0adb7b93f6f6647b40089b7cb086746
 MISC metadata.xml 330 BLAKE2B 4c0218788685cc36fddf5d759c091898a71c01bf22e9e7995d1f5da37cd0508c961895b4265bda462062676f3e722205f0a6b10f64db718110f7afe8f088d136 SHA512 4d7760ec82f64ce49478c359b32aa100ca9778471033741b7fd89905d075b3a067fda413c6dcc5115d7755d0ab6cd9d30a848ff674f1c83ef6205c51ec501a65
diff --git a/sys-power/iasl/iasl-20200326.ebuild b/sys-power/iasl/iasl-20200326.ebuild
index 22bcd5005b3e..26ba2d2907a5 100644
--- a/sys-power/iasl/iasl-20200326.ebuild
+++ b/sys-power/iasl/iasl-20200326.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils toolchain-funcs
+inherit edos2unix toolchain-funcs
 
 MY_PN=acpica-unix
 MY_P="${MY_PN}-${PV}"
diff --git a/sys-power/iasl/iasl-20200717.ebuild b/sys-power/iasl/iasl-20200717.ebuild
index 5ef5112d8e5e..681d65977c6a 100644
--- a/sys-power/iasl/iasl-20200717.ebuild
+++ b/sys-power/iasl/iasl-20200717.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils toolchain-funcs
+inherit edos2unix toolchain-funcs
 
 MY_PN=acpica-unix
 MY_P="${MY_PN}-${PV}"
diff --git a/sys-power/nvclock/Manifest b/sys-power/nvclock/Manifest
index f5071ffc5cca..e05d27d7cff4 100644
--- a/sys-power/nvclock/Manifest
+++ b/sys-power/nvclock/Manifest
@@ -8,5 +8,5 @@ AUX nvclock_initd 145 BLAKE2B ef01d1f81821e64117d77b2908a48cf99b351dcc12339bbcb2
 AUX nvclock_initd-r1 157 BLAKE2B 40bb386390c6222677c039eda83cb33a0108f68b57c5abb0211b898aa247c3d450e4097472f250a990913e40d9c1c15f7c2ec518d5a4ee94aad885417283b1cd SHA512 90026710b02e275167276a0c5151d386c04fc348d94d74ecbbb6ea7a26602514dfe0bd63bcb9f365a8bd9bb8adb824f7c7ad2ff4df3a721d6c323dc982b4c1ec
 DIST nvclock-0.8_p20110102.tar.bz2 285043 BLAKE2B f1a524b6841a7eedcfbb9b0cd449f1af10c40cee11a814221d0cdcb42e507763313de112eea948dc05508fbd439a3dac504297c723fe4f0f821241204f5ccf89 SHA512 01bf7faed83acdf2390e1f410b2f8b697ff647b15562a6960a99666ec5121b532cbf4380137c9ee24221ccafff641bcdef4748dcad7ac92fb25fa15e735dd140
 EBUILD nvclock-0.8_p20110102-r2.ebuild 1252 BLAKE2B ee7820297a1b7c6c27c5c27a82f0f5c5e97a3d9953bc8031365a87fd6e406f5077b802cdd6cd9748db0762d3446eb6bd2d828f23251637029386046131e39fab SHA512 aa02f9448e5d93bac97af1f21c573db123e9101b2020f4d4a27dfb4fede5bac748b159f41852367d087682d3be9e1902761e62a6a44c7178065a8708ebdf7c1e
-EBUILD nvclock-0.8_p20110102-r3.ebuild 1258 BLAKE2B a19c1b451393251036315b3487aa02b639711f4053a97cdc5367e49ae77f500296f08af0c9f1a9b7a5cdbcfc47f50e24d4c0a7eb585c7d112bec08ddc25786ca SHA512 4a5e78c3ab296075a33fa5036d873cb15fef3580f4f8ac9d78d219ec42658c263664c9041ec69cfbfac9b4c0cf619a9a37ac4ac6faad431e9df9a375dfdd9aaa
+EBUILD nvclock-0.8_p20110102-r3.ebuild 1256 BLAKE2B edc49fb3c8f19ed8c8955fef198f106fef58d18d31313f8f1df600c3983dc34b0498c0c94ed1a0c0524ed46a60ff402ca66766ae53415e37f7fa5ad5071d6a37 SHA512 8d1469ee4df65a9f8f67cdbbdfb5526661dfed75a13085817ac3d7b9e741056975210202b6589df90d58e6eefb19f5e27e9c0a465366c3c5c2379c16d6a29e8a
 MISC metadata.xml 399 BLAKE2B 6c23d1a832367b5ded4ae9b48591fb407f0f808289f89aa32cd833cb6ce3952496457206e6a5b289fbbb492c85aacfec8dea445c448fda1d315ccf8e70f1fefb SHA512 df14f8340f688857210010d6843e0a86d706ba3bb9edbe015ad42e36fb7eb6c8606e2ea9d5dbfea7c4f7ad3f0e94c78d7b8c2b7b2a29af88d5c161162f8befcb
diff --git a/sys-power/nvclock/nvclock-0.8_p20110102-r3.ebuild b/sys-power/nvclock/nvclock-0.8_p20110102-r3.ebuild
index 89cc3dc7aff1..94b5d228cdd1 100644
--- a/sys-power/nvclock/nvclock-0.8_p20110102-r3.ebuild
+++ b/sys-power/nvclock/nvclock-0.8_p20110102-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="gtk nvcontrol"
 
 RDEPEND="
diff --git a/sys-power/pmtools/Manifest b/sys-power/pmtools/Manifest
index 7e406a02fbc9..db2dabf2b712 100644
--- a/sys-power/pmtools/Manifest
+++ b/sys-power/pmtools/Manifest
@@ -3,5 +3,5 @@ AUX pmtools-20100123-acpixtract-pmtools.patch 1822 BLAKE2B 6d7f7de1f2807ae5a2309
 AUX pmtools-20100123-madt.patch 1191 BLAKE2B 46d74cafb71bea3a9c7391b3636da8d9dabda9f24fcf20ff0e9469e72cbdf44477a71a42b780f9d5ba442400381add000fce0fec588f37a62b72dce93475c546 SHA512 3984c4a26248a2b152009ab3703e3fd894abd8a12716aaa7f4913b8a8d922c2a60e7e987e401a0c93c56398b63c36013bcbf7b9c51d1c119f6aa7e67e2657594
 AUX pmtools-20101124-cflags-ldflags.patch 1743 BLAKE2B 65216ce6a9a347c2bc85a4ea8b891ede00d5dd6564541188cb4641747525fff801b5d20a5e2d21c1a37250ffb61f85db11e3beff07cc1bfb1107264a60f650a2 SHA512 63342f0f1f630eeb74dbe45eddd92b4be4794b34d93f691442bb6a761798d25967d93c73389ef0abace8a285efb91677493996948a34e981959782f493963dc0
 DIST pmtools-20110323.tar.gz 62002 BLAKE2B f1de2e266d72c8a69a61df0fc57bc0b27e9a4fc89f840e893b8fbb1bc93ec54dc5f502a1066d17d082341c99b829189911d558261409455fd1db368924fbea59 SHA512 81108c011b45c58c02013a3653c2d00bc2a9a9d80bf85438a193a4fed04a3fd2890d9cd4d64ab455e3e9c1613d35a6be59698395d9a27ca0a858e3935439bafd
-EBUILD pmtools-20110323-r1.ebuild 1297 BLAKE2B ecd314dbc9b7fded4a35b6bbe94530e3afbb8e51e914cfad04c420d51be71559f135fb36443a14775e6364103fd383b4b145d20387c01312224390dafaad84a9 SHA512 6f0bb08192aaeae46343760ff2c26d9ef0fcf00cd897497e97943cd057f33b3d9a6a4bf4aa9864cf968980ba0f68b3e3daf99483d6d1c1c68ef9fc4c46b5ad92
+EBUILD pmtools-20110323-r1.ebuild 1294 BLAKE2B 717dfb10f640246e051f7b6a4958eb2f56682bc7d6ba145ccb1048a662ce616cdcc21da1592707e2bbf718c21669de10119eac5c40accb6ee1dcdfa8ada7e2f6 SHA512 02f1eebb4c077a79fc82e34de0e167cbf8844bbd7dc7467db86ec8d4329ec58aef27e1610e9141848da3e6dabe7f61d50de5bf87e3b0d5dff61690a8cefa047d
 MISC metadata.xml 643 BLAKE2B e61f52f14ac46ff098eab04e4cf05b0b2e85f088d64f2f593d9d82c6fb26b3cbd467b2e5132a87f5ac53029e33cb4f4e8c10484c698c8adf3236b64629368ca5 SHA512 b5d35fb4bc2ad9062c9d089447521adcd717dd4b88ac54a49b56cc9a334ad9c6020ea66d5c0aaeb575b25143d1714f15e0b83025fe8859fd9f010091409a48f2
diff --git a/sys-power/pmtools/pmtools-20110323-r1.ebuild b/sys-power/pmtools/pmtools-20110323-r1.ebuild
index 2b6a541659eb..250b3393cd7b 100644
--- a/sys-power/pmtools/pmtools-20110323-r1.ebuild
+++ b/sys-power/pmtools/pmtools-20110323-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit epatch flag-o-matic toolchain-funcs
 
 DESCRIPTION="Collection of tools for ACPI and power management"
 HOMEPAGE="https://github.com/anyc/pmtools/"
diff --git a/sys-power/powernowd/Manifest b/sys-power/powernowd/Manifest
index 975319904abb..e706d4103370 100644
--- a/sys-power/powernowd/Manifest
+++ b/sys-power/powernowd/Manifest
@@ -4,6 +4,5 @@ AUX powernowd.confd 977 BLAKE2B ec8dd344e91888e1352f763d0ffb6b60833cadbfef3a9a4b
 AUX powernowd.initd 398 BLAKE2B a4189e244274abc2bcde4a9d0618931cf64e5ead0d8875e04512f7eedc40421f1bda266c98cbf79cdf6a1696a473d271affc47b362f2ed6bc6278d5f692b6e52 SHA512 b50273414b5804ac9a16016f76d7f66f6cfc39034da01ef5a43fe3584b8d0c03990f091f46097ae84ad0485444521fe07ebe469c502588af90bbbf2780e1e23b
 AUX powernowd.service 121 BLAKE2B db680c4f8cc22822396d5afb483a93adb45bb3bba5a4b817f2a2bd0c86e5f622650e470a628e09cc043ef319db0292b45621df43abf5916bb0095634260a6511 SHA512 c6593dbf90c9174c62eff6a19ed24885f7c190a51c4812f6988b51de6512d4d9728be3d2ae576f13fff42f3b90853750c8805a9ee6a28677a9f7508e0cca1886
 DIST powernowd-1.00.tar.gz 19651 BLAKE2B b3fb1b9adab694edd56fa9140b72203a9b87c2ade9be040f3b4f5e33573ec525367bfc3c86028f22644ad805622be58ea2300820405d408854305c05c350f9f3 SHA512 b4285de6b330927568ac44789ae4fda0cb431fc5f15abc5d275c03b5bfaec8627f453abbe78561971cce1eba895f73ed6f382be8a034fc2cf5d1a55010d30cf3
-EBUILD powernowd-1.00-r4.ebuild 862 BLAKE2B fdc20e1800939031c81b2996944b803a2a7e3ba398ac5d0d3feba5d0734bf1e04b3e430cff7eccb812ea1b70fe2730f6071515cd950313f63c661bb6384c0724 SHA512 ffb6f96dbc056fd8329dcba2eb182bc5aa538459384ff9f07d732beb1bad9a7269f606b7956a56833f70434c2d8d0f155b593d73acfb70a5cd03610daeeedb98
-EBUILD powernowd-1.00-r5.ebuild 906 BLAKE2B 3b1fec2f47d2c7f51193b0096499d907ab4c837f625760c5fada32079a8a2f1c35c235afec019a6aa66652157ee9f3270ad5d099dac401acc85483e65ee41126 SHA512 82b5c50a90a595629207724c3a1bd274221ad92a6ed6b44433ce4fdddc713aec96820e5b4a5d6d3e7c696564c30556ebb1b40f18574f9c8d5960917c8f0a08b0
+EBUILD powernowd-1.00-r5.ebuild 899 BLAKE2B 2d1ea8ddb38cb22ebb728f53198553f8831c2b745793c34ac59b3f14459f68096d951d003574513a5eeeca29bbba3d6fcfb2ad12ec4fe29e8857ee66c0226dc7 SHA512 c50f39830bd95d6cfa906f4bd6439456249f93927f67eebf0ecf4d7dd21dd1d5967c780a260f4becdc7abd6f5be50ff19e86196bce6022ebb28bff54291b6395
 MISC metadata.xml 248 BLAKE2B 50b88e8d1acee6637ff7449d1b9deb5a386d195a0386efedf72e9891551814b58e42ad02c537927bad619694ed1181b88b500777d96846912bb8f9352112002d SHA512 60cbe958ac09a85dd229e6dfd90c650599f03c588577a83e9ec44d303f3072c749a89242fe552e0ff6597423a75067bf9850bc747fbc11579a5fd8058b788cb9
diff --git a/sys-power/powernowd/powernowd-1.00-r4.ebuild b/sys-power/powernowd/powernowd-1.00-r4.ebuild
deleted file mode 100644
index a71966cff6d8..000000000000
--- a/sys-power/powernowd/powernowd-1.00-r4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils linux-info systemd toolchain-funcs
-
-DESCRIPTION="Daemon to control the speed and voltage of CPUs"
-HOMEPAGE="http://www.deater.net/john/powernowd.html https://github.com/clemej/powernowd"
-SRC_URI="http://www.deater.net/john/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-pkg_setup() {
-	CONFIG_CHECK="~CPU_FREQ"
-	WARNING_CPU_FREQ="Powernowd needs CPU_FREQ turned on!"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-buf.patch
-	rm -f Makefile
-	tc-export CC
-}
-
-src_compile() {
-	emake powernowd
-}
-
-src_install() {
-	dosbin powernowd
-	dodoc README
-
-	newconfd "${FILESDIR}"/powernowd.confd powernowd
-	newinitd "${FILESDIR}"/powernowd.initd powernowd
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
diff --git a/sys-power/powernowd/powernowd-1.00-r5.ebuild b/sys-power/powernowd/powernowd-1.00-r5.ebuild
index dc6334759ff5..f3b9a9e654ef 100644
--- a/sys-power/powernowd/powernowd-1.00-r5.ebuild
+++ b/sys-power/powernowd/powernowd-1.00-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://www.deater.net/john/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 PATCHES=(
 	"${FILESDIR}"/${P}-buf.patch
 	"${FILESDIR}"/${P}-inline.patch
diff --git a/sys-power/sispmctl/Manifest b/sys-power/sispmctl/Manifest
index 48fcd17a4193..9ec0403eb974 100644
--- a/sys-power/sispmctl/Manifest
+++ b/sys-power/sispmctl/Manifest
@@ -1,3 +1,3 @@
 DIST sispmctl-4.1.tar.gz 429477 BLAKE2B fe9231a5a0b22456d81166ae5dbaf98c86a636e79ff09112438c769daa503996128d31609bd90f66a5414459c9fce66956b1ee001ac3d57f8f472a09b34aee20 SHA512 52cf6e7d4df76c1d28d196a81a06dec59047f2d43571bc72ff08a22359c3e5d7a36fd446118036fe35f9c26e59a07563ac15d9e05285e7b09214b68aab5ef488
-EBUILD sispmctl-4.1.ebuild 891 BLAKE2B 29ee3415a8496859d83de418459a5e3ac7ccdb720e9e03436209a7c29e0634b37f0062ecfcca6439a2cb61f27581cd0300e178862729bfa63ca51cdb93423993 SHA512 d48afec4d96f3ad8ac092a86266d9a59c974155d12427ce4ac5bda069c019a7941f651e6f5900c32ec2de7819447ce5741a283b2da74def5251c9825832dac17
+EBUILD sispmctl-4.1-r1.ebuild 915 BLAKE2B 08c8fd843b7615a4b6a014f96577d784d7420b947d769ec1edc7065fcc52c700436001a82f63646ff0d3534745ad7bd95f88583bcf1ff6da8529fb35ce2f3f24 SHA512 300970a0fd30647bef36cb82502ebc54d91229c370b6907a7bd60be1d7cc5529041fd90e311cef2426875956851bfa44acfebc53f3cc3f2099183c138966fa91
 MISC metadata.xml 509 BLAKE2B 1c628f09631ed6ad22e54523822f42c24baa674abf87634e21f82f5c606dac0c12d45deedec8dcd97cc00a7ef9f8d4be98afe4ab11b10281fb099ed944a7746f SHA512 da969f49a8b638e997b6082acd8e1a07339dd5e3633331b22cdf0e1a579da4e851ae7d27a194edd0d4db879150ca2d45a34b115ab162772f0f8ecc106dd994b2
diff --git a/sys-power/sispmctl/sispmctl-4.1.ebuild b/sys-power/sispmctl/sispmctl-4.1-r1.ebuild
index 693002dbfb70..19a1e29df154 100644
--- a/sys-power/sispmctl/sispmctl-4.1.ebuild
+++ b/sys-power/sispmctl/sispmctl-4.1-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit bash-completion-r1 systemd udev user
+
+inherit bash-completion-r1 systemd udev
 
 DESCRIPTION="GEMBIRD SiS-PM control utility"
 HOMEPAGE="http://sispmctl.sourceforge.net/"
@@ -13,22 +14,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="static-libs"
 
-RDEPEND="
+DEPEND="
 	virtual/libusb:0
 "
-DEPEND="
-	${RDEPEND}
+RDEPEND="
+	${DEPEND}
+	acct-group/sispmctl
 "
-DOCS="AUTHORS README ChangeLog"
 
-pkg_setup() {
-	enewgroup ${PN}
-}
+DOCS="AUTHORS README ChangeLog"
 
 src_configure() {
-	econf \
-		$(use_enable static-libs static) \
+	local myeconfargs=(
+		$(use_enable static-libs static)
 		--enable-webless
+	)
+
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
diff --git a/sys-power/switcheroo-control/Manifest b/sys-power/switcheroo-control/Manifest
new file mode 100644
index 000000000000..77e7403a6c6d
--- /dev/null
+++ b/sys-power/switcheroo-control/Manifest
@@ -0,0 +1,3 @@
+DIST switcheroo-control-2.4.tar.xz 27964 BLAKE2B f85014ad6696e301bafd75b694f5c130498171d95b0330d2996568737cbcd677eef5256bc47638bf87d178d6fe099f3c53bd710a1534db20f1dbe5fbe51681c7 SHA512 47f071b17cbb520d862800ef2d8389ada1130be96a8c1efed9be6793081b5826355ad30b0feeba1cc9eda792b4c943ffc852d12648b0c5e74f25c207d151c1c3
+EBUILD switcheroo-control-2.4.ebuild 851 BLAKE2B 51ee108b4e95daa88f1f6d328bfbb1b05154e2e53cbb053423b0084c8352b887bc73d8fe04193c8534f36b330d367fb4f7aeb5418507aaacd431f9f76beb287f SHA512 e018f0087a28bb6b413773374af814fad047e95b73111eba65af697cfb7e154908e308fd8b47370703faa304be6b67b43aefbd3a424285b8c6321e01853ab4d7
+MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/sys-power/switcheroo-control/metadata.xml b/sys-power/switcheroo-control/metadata.xml
new file mode 100644
index 000000000000..020b40648ee8
--- /dev/null
+++ b/sys-power/switcheroo-control/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/sys-power/switcheroo-control/switcheroo-control-2.4.ebuild b/sys-power/switcheroo-control/switcheroo-control-2.4.ebuild
new file mode 100644
index 000000000000..9712cad1e582
--- /dev/null
+++ b/sys-power/switcheroo-control/switcheroo-control-2.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit meson
+
+DESCRIPTION="D-Bus service to check the availability of dual-GPU"
+HOMEPAGE="https://gitlab.freedesktop.org/hadess/switcheroo-control/"
+SRC_URI="https://gitlab.freedesktop.org/hadess/switcheroo-control/uploads/accd4a9492979bfd91b587ae7e18d3a2/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="gtk-doc"
+
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-libs/glib-2.56.0:2
+	>=dev-libs/libgudev-232:=
+	sys-apps/systemd
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? ( dev-util/gtk-doc )
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc gtk_doc)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "You need to run systemd and enable the service:"
+		elog "# systemctl enable switcheroo-control"
+	fi
+}
diff --git a/sys-power/uhubctl/Manifest b/sys-power/uhubctl/Manifest
index 1c1709882a18..2b78c47efec6 100644
--- a/sys-power/uhubctl/Manifest
+++ b/sys-power/uhubctl/Manifest
@@ -1,3 +1,3 @@
 DIST uhubctl-2.4.0.tar.gz 25661 BLAKE2B 44d1fa0ce92beb3c4c3e2d21c8acb982f71f2e450afffb8c467c488495f389b745ba437c6fbbe3049cd3f67a73fa8bda6ed9c987ab1326f12db59623ee107ece SHA512 d7f07679c4678565ce0174e1eb591263fae5629dd6fbb5aaa0321ca10176b8b2d662e75a3019caeb83aaf470c8386188848ba3095e1006451e8710b2a2c9bb1d
-EBUILD uhubctl-2.4.0.ebuild 546 BLAKE2B b24952a3c08703e459fb6c7e6da4cefb9e54baeb801381965c4db760463c400354123603ee594c4f81fc1cee9283dc67b933686bbc1f824fbf0c205da988cd1c SHA512 a912a647faff98ee7dd4aaf7a3d630271ba72f0389b89498da624c0a58fb0216fa8c867fc2b6a754c9c9e5de4e2b0f866b51e056002e4271fd42d7e973cc0ae0
+EBUILD uhubctl-2.4.0.ebuild 597 BLAKE2B e555406464331659b1a306962e3ba15e251e79dd4478788b25bb547889654fa2cff44a572af20d941de2a599557d4065ce8eee1ecced1d6ff2eaa120900f9674 SHA512 38d483e35786fe96a0a8ef134872a33a186c57b6b0964117ae45c21c999f62e9de7a585ba19fde59b565b0896f4f467e029ac2fda45062f1d3d58023a2a7c25d
 MISC metadata.xml 247 BLAKE2B 0f6116ad1a6532d4d062e4e8dadf00f3053ccd4408f030535d3adc5f0399e43ac1682b3786a1a321ba7dd8c1b448cebc5938207a5af59fc033e0e6cf4c654c40 SHA512 8111616dc98858617382132291d5d7a4900eb04643a2c67d4c2eae21dbd08e2fd5f73d533befaa5a0c6a074b04046f1e5bf7a139386ca10ffffef329825d0514
diff --git a/sys-power/uhubctl/uhubctl-2.4.0.ebuild b/sys-power/uhubctl/uhubctl-2.4.0.ebuild
index 094e1cc2428c..9d01116874ff 100644
--- a/sys-power/uhubctl/uhubctl-2.4.0.ebuild
+++ b/sys-power/uhubctl/uhubctl-2.4.0.ebuild
@@ -16,6 +16,7 @@ IUSE=""
 
 DEPEND="virtual/libusb:1"
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
@@ -24,6 +25,8 @@ src_prepare() {
 		-e "s/^GIT_VERSION/#&/" \
 		Makefile \
 		|| die
+
+	tc-export PKG_CONFIG
 }
 
 src_compile() {