gentoo resync : 13.10.2019

21 files changed, 117 insertions, 47 deletions

diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index eeedbb9f84d1..e70ec90bf38a 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index 9c4c2701f784..3907a57aecbe 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -7,6 +7,6 @@ AUX apcupsd.powerfail.init 397 BLAKE2B 472512906536753d3054d275707764a98094c1486
 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 3958 BLAKE2B e87053e35983347d5dad1c61ff484e65322678a90e59b23cdd8d97bd745b1590c01958ee8cf04e08b62d037d0bfb10a43f2707b37518877ba3371f49a6a9bb82 SHA512 6563b422815aa8904af1b50983fcf68d951c37be64caea016d5299fa87101d3e7323126f36973a4f43a409d4dd4116cee6876987986ce9def5cecfc67701ae38
-EBUILD apcupsd-3.14.14-r2.ebuild 4054 BLAKE2B bf026a30e9fe63716af1de4b0b777bb86f8db55929068883d624d252e9142e86566905a5d5065c4c44dcc4c1b5b75bd0cb1f237fce7fe48749b5176fbad21ac8 SHA512 ccda174d6fb4f427db9061a094ff4d32788dcc2f1c7765169678fa79f13498ba6b1991e4c1b52bffd5bc1fb3dec302c61497f486074ac392ebd4b07a7bd3b91a
+EBUILD apcupsd-3.14.13.ebuild 3948 BLAKE2B ff8354a4b10634cd6a3180e4cf7bfe31bfa08896eda745bd4b5d96202d2aefe83ffac02c407af45c2f1f834ad0fc30ae10c695dab2c3de9faaea6df28290e7a6 SHA512 76cd11e927a31fdd2119224ccd35b1689d2c32030b14802db4d9bfae89cf4ad44fd94f4bbdbd7f67e66530754f5809834c77d4a357a819fbe667bb296f7e540d
+EBUILD apcupsd-3.14.14-r2.ebuild 4044 BLAKE2B 07ef99ec65e4285bd4a1d2c87458394c0c7fb30dc0ca367ca6f1457d95c1ecfb8ecace6ebadfa57360c0f5f2ef0ad49d9effc15a87d0f6885868c01862f14eba SHA512 d6d644422ac1953b7afea59bb99ac5e34eea8047e363d15299e3382014b4ee6fce6301ac13cd192dfa46eb7bcde491df4d45b5174d3c6353a764f0d63d393cc8
 MISC metadata.xml 1259 BLAKE2B ca28cef92e8edcea0aaeece78cadb43ad8ad836297d8e857540558877a7781922f50c05b018d1a9f7d0753ddfb0a99aff84d16051fdfe5f0d407b79509058a35 SHA512 ba5660026926c0334a47aa3f84bfc0a4ef745db2170a1d773547cf495101cf1274cc24d71d3afa46fa62ebcb49e0913e92e9a0efe4cb70a349f77538b7f60eff
diff --git a/sys-power/apcupsd/apcupsd-3.14.13.ebuild b/sys-power/apcupsd/apcupsd-3.14.13.ebuild
index 08695428abc2..cbebbb1a5c2d 100644
--- a/sys-power/apcupsd/apcupsd-3.14.13.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc x86"
 IUSE="snmp +usb cgi nls gnome kernel_linux"
 
 DEPEND="
diff --git a/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild b/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild
index 237d66e517c4..24060d395a6a 100644
--- a/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc x86"
 IUSE="snmp +usb +modbus cgi gnome kernel_linux"
 
 DEPEND="
diff --git a/sys-power/cpupower/Manifest b/sys-power/cpupower/Manifest
index 2d7c52499740..61803b988a6c 100644
--- a/sys-power/cpupower/Manifest
+++ b/sys-power/cpupower/Manifest
@@ -6,7 +6,7 @@ AUX init.d-r4 804 BLAKE2B b143305b3f117afa49967de098f54419d5f57b86dee7e7153b7adb
 DIST cpupower-4.13.0.tar.xz 67812 BLAKE2B 3b94b18bb57b0499a96d57ca26a48f528bf993e0f1ed7eb6d2949c879de8796501629bd0978946eae925d86dd3204a1cab0c99f1c3a8b51731dfbdb61451e990 SHA512 5e7095e2741eae920a097864926931afb2656e492b504f203c40c24ddc5aee5014c7689b220225171b5ea10c69b70774fb2a979d05ea56ef1fa063f3097626c7
 DIST cpupower-4.9.0.tar.xz 67620 BLAKE2B 0aad0114af52b939f83d80ba89be49a061f46a7597ae2e2f27ee6134dbcb425beefd613b0c3f0217003b700cf9b81cd7538575938e9a867138a78eb6a0247f3e SHA512 67137bd7166a34f131332a5165384ebca5b97deb1c92e6d557195da4be4fecb0c5902159f748ea454461ad2181a778c32b4e4dfd1f8ce7e6a3ec41f553f23677
 DIST linux-3.18.tar.xz 80934708 BLAKE2B cf796fa1eb24276470b51bd3754f02932e57c6469e45959893b3714457ba33f0081ff04137990f228e1aae6d42a05073478a3ef932df468af7cd02bf8c8836c4 SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009
-EBUILD cpupower-3.18.ebuild 1603 BLAKE2B 54b502b9e53a429634cc50eb03df02e32560cc0e3be208917ca9e3d29087ab47fc0700c15b5adc1d6e0477ddb588aabb6e59eebbf471501e3a59f32877985db2 SHA512 dd1d25708f75be16cd908b252511dab6dbacd5b631e3d8ea385dfb3a40cf52d9f4e92bb62fa643f00570d8f8ec2a5a336770e08c7f18e123f961cd0ff5673399
+EBUILD cpupower-3.18.ebuild 1614 BLAKE2B 3629f1141e4517165df4472467ce66105fdba03790541f749a34a7dbf5ee54de5f590528af3a2f9514f63eec3512bda2c50fcdcde94e5026ea99d6025fc93db7 SHA512 7e6444d9f6a14374c190038ae53a3c13b9ab19fec9d3ad57fd495af9f9ccf2938563bacac1d5a3c928d4e783096cb14a8ce9867a799836a7dd7f003292cc65bb
 EBUILD cpupower-4.13.0.ebuild 1729 BLAKE2B 3dc42588fff8c7d26d8b028740e87e9a2e58340d1be6b69229ac3c9bf8092ed6927ee4db70b3aafb696d9803a35887ef416bc3b3d19c2ec543cf1a80538144ad SHA512 6a3054016fc9ecbb3d45a81bf945341ba718e76ff8a26f92df48e164bd0d5434173abb77c93b21b5a9a189f886b3e3f8f6fe2b51eecd281322ebc2bb091bd594
 EBUILD cpupower-4.9.0-r1.ebuild 1460 BLAKE2B cba65257b62d4c552d31d972a044ef6870c8390707ab9c85507379580dd32cf0d1feade9a097a0733b8344d7f8096d04794367f0f7c3e0b2bbb48cbcb5df1adc SHA512 e96a435498faf21b6427fbc5bf72ff2d40190b79354a5db11c8f8d4b505d4749b302f55f066396c8d358a55bdb4dbfb3b86d904f291862fb7ad0b24e78705b93
 MISC metadata.xml 434 BLAKE2B e7c13d7d29993f586d49a6333dccd91f748122e8ca6764bcf1286c46a0d4c197ef5a314889d89bd02a8f39f0122e362f2fed458df9d3bc0f3a793d73f7a23308 SHA512 9ce805896548834fd7c83f53af781432efcfc9a2d272ccb8ae93e57159507940570323a0fbc9d95097c71496cfb2b508d0c4f14bfebd9641140d5317005b2705
diff --git a/sys-power/cpupower/cpupower-3.18.ebuild b/sys-power/cpupower/cpupower-3.18.ebuild
index 51bd73b27134..0dcdb330bbc9 100644
--- a/sys-power/cpupower/cpupower-3.18.ebuild
+++ b/sys-power/cpupower/cpupower-3.18.ebuild
@@ -6,7 +6,7 @@ inherit multilib toolchain-funcs
 
 DESCRIPTION="Shows and sets processor power related values"
 HOMEPAGE="https://www.kernel.org/"
-SRC_URI="mirror://kernel/linux/kernel/v3.x/linux-${PV}.tar.xz"
+SRC_URI="https://www.kernel.org/pub/linux/kernel/v3.x/linux-${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-power/iasl/Manifest b/sys-power/iasl/Manifest
index 5330d3661ccb..4ac08cd4ff9e 100644
--- a/sys-power/iasl/Manifest
+++ b/sys-power/iasl/Manifest
@@ -6,7 +6,7 @@ DIST acpica-unix-20190703.tar.gz 1845874 BLAKE2B bc217c40c1154fd562f28e0eb22e8bf
 DIST acpitests-unix-20180810.tar.gz 2093850 BLAKE2B 519ce7807026dc11617ed9c34f294600ddae77a57a1fb76220da50da1bee56975373d583d51dfcdd81c8ccba3d5e735167b831bdb4669ab9cb2a1d9753d9261d SHA512 36c2527e8d670ccfb9a537b4944cfb8432c9638c1427e3c59f614c2ca43a66089228ecb74392301a07f266870e2d79bf0e2c671c6c7af06a4683bf97ac01ba54
 DIST acpitests-unix-20190215.tar.gz 2094957 BLAKE2B 3a31ae398650a1dc3ac70843c43868a35501cbe0376d1d2437a3568aad1fb63b3d83270653c009885b014894c69dcfff075bbf5d18290220067bcd1804a38097 SHA512 80060a61c80b01231b10e04dd65c2ab41d42824c439152cf128328890cee39ef597dc3f5bc535db4566cb322394bfce2760e1835df781d699818049cad5a4419
 DIST acpitests-unix-20190703.tar.gz 2009568 BLAKE2B 3d1a527c55a94390381e33a46111bed7ecd3761627b87e24d9345b0d38d9fbd32c371adab3f19a0ca05a99c4532491bc9b466805e231a5ecd8c7a6af346577fb SHA512 d9bab56198dc00fc11b50a199035eb9dc164c226441cd00e163ecd6362d399a50058afa7582f86e62a085b990772995fc10e077581a3b04a6c6b2e95e055f167
-EBUILD iasl-20180810.ebuild 3430 BLAKE2B 58a1c19fe0bcee83eb448f83d5c564be1d482b919efe339432e7e52a3c50cfc205fdc71f1abc9ddfbb4aa749f8fb75a7e97e109799075f58a0c10e37a6b11fc7 SHA512 5fcf3fd5d10bc7a75c861940b8f41844e5cb1941639c74f365ca0b50f682fb887b70e436ae9ab60063bc902e71cb92d1c735f6e83287d87778551196deeda420
-EBUILD iasl-20190215.ebuild 3433 BLAKE2B e5c36d9cfcb6beb61f2ebe1c22e479b0f0705fa608de260b0b86982a8bae6e8179885310cae784dbbfbe2795f2c149acb233c871c79e2481865865c10ea1c9b2 SHA512 36137a8da09b1b63b3bce8a12242fc98261176320bb43cde243335c87cbe430d0de9cf9692c17387c71948c73492f7d076d860aca715c8f6278c6320a2c75de4
-EBUILD iasl-20190703.ebuild 3426 BLAKE2B d9f29d91fa78afd4326e09b395ca5317876e5d7cdd3e864844fdac3d0e7c6e54329cae1b81e71bfbcfd33c6e9d17495375f0c5b2aa2fa5739ed5a62ea5b07100 SHA512 6ed5c6a81b3dc42318fc627cd41fe98c4c9a48f551e142bac9da61099b9562714c725c14085911fb1561c15fd764e9c64ad4d05ede7251406e2e45a249585a0e
+EBUILD iasl-20180810.ebuild 3408 BLAKE2B 55cd534d44f56cad6a45bb5223da837517bf8cbe832b52e6e036a3a932e2b928f5e2422357b2a5162dadd3c8effaf8ec760cce5b0e688dbe2207f74dd677aa29 SHA512 8ff1157eafdb88435a0dacfd9c957d9ae062641f4c606be82ac21061a8ad87946940dbcc1fbf71d4b336bac081e2202380b1386b3aed06cd6c92273698ab60d4
+EBUILD iasl-20190215.ebuild 3411 BLAKE2B aee5c1fdd6979036ed51bb52cff942dd8dc6e3942cd69352d9a097e3234a39d99de84ef2ef52d8c8b1e4d48d3dfe1ead2c86d80dd5fe5ac14e347760d6a0a5a1 SHA512 b20518fd7588b838b30cdcd5274c5b6723b166868f283f13d55fc8897361a4d7e0e2670f8305fe214dee90716ceb8fbb4be40e2e8c53eac56c923dad4e85cd21
+EBUILD iasl-20190703.ebuild 3404 BLAKE2B 890addefef22ecadd6ff01b01464ea473a680ee4c8b5a430d2ab3c74d6a6ed4cde8f0685ae11b8ff70d09d54d1a6dfccf98e556a5676efed434db5e77b9aeab3 SHA512 e7d67d4d0a1c202b60aa4312737907f3a33123fdaa7655d1d47b9212dcb4c861b856c85659488de2ed046f8a06500bf20a60a451e853e251ad67ea928177ebe7
 MISC metadata.xml 330 BLAKE2B 4c0218788685cc36fddf5d759c091898a71c01bf22e9e7995d1f5da37cd0508c961895b4265bda462062676f3e722205f0a6b10f64db718110f7afe8f088d136 SHA512 4d7760ec82f64ce49478c359b32aa100ca9778471033741b7fd89905d075b3a067fda413c6dcc5115d7755d0ab6cd9d30a848ff674f1c83ef6205c51ec501a65
diff --git a/sys-power/iasl/iasl-20180810.ebuild b/sys-power/iasl/iasl-20180810.ebuild
index 7d4945a34e3c..d913d38a351e 100644
--- a/sys-power/iasl/iasl-20180810.ebuild
+++ b/sys-power/iasl/iasl-20180810.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.acpica.org/sites/acpica/files/${MY_P}.tar.gz
 
 LICENSE="iASL"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86"
 IUSE="test"
 
 DEPEND="sys-devel/bison
diff --git a/sys-power/iasl/iasl-20190215.ebuild b/sys-power/iasl/iasl-20190215.ebuild
index fc4d7e040e8d..3de24d453ad5 100644
--- a/sys-power/iasl/iasl-20190215.ebuild
+++ b/sys-power/iasl/iasl-20190215.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.acpica.org/sites/acpica/files/${MY_P}.tar.gz
 
 LICENSE="iASL"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 DEPEND="sys-devel/bison
diff --git a/sys-power/iasl/iasl-20190703.ebuild b/sys-power/iasl/iasl-20190703.ebuild
index edd9ba4e0f01..d6153d6c1452 100644
--- a/sys-power/iasl/iasl-20190703.ebuild
+++ b/sys-power/iasl/iasl-20190703.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.acpica.org/sites/acpica/files/${MY_P}.tar.gz
 
 LICENSE="iASL"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
 IUSE="test"
 
 DEPEND="sys-devel/bison
diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest
index d4144e6340da..567c88e6b383 100644
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -10,7 +10,7 @@ AUX nut-2.7.2-no-libdummy.patch 535 BLAKE2B f18f65ca92e834b5e085358a09c7363cf156
 AUX nut-openssl-1.1-support.patch 9719 BLAKE2B 2bfe29e9f984fe5ad7854a67f60705ca3c6203392c59654738a91c2f8b543efcd498ebc3747fb509c3bc6934dde0d42cf31418572b60a8cf39fea790338bbe37 SHA512 25d7f9b761a3f7f158edc524071023973edc1c7ee50fe7f4eb487ae4ac131e112ebba944c0df20cd15bf5d2b83394e03f2387be17b95b4d5d969fba3d08e5d84
 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-r1.ebuild 9000 BLAKE2B 53cf51da6aaa6d9655b9fe68a2eeab13c53ce284fbd09b7fc5aee790220cc32a5d9c11ef50b31cae409ec034609e5e2ad7ab2d3f95db4f8fe6b38f69a4123968 SHA512 3fa055f36890e108ac31cd2cb79598a58c926ac887022c3871e7e31461b843b74744c064008afdb7e936c6b19c675881f6f53742479f5f5f070efe1167447807
-EBUILD nut-2.7.4-r2.ebuild 9730 BLAKE2B c8f4c2854ab90599e3d0d3813835d66af8bc94f21ddda161f9252edca05128aef019e7d38e4fb1ab0c394b00204d784889fbfd5c501223a8b547719dc5cc6a8a SHA512 ed9339618cca6caed393b8bce150900d86438fccb6a63ca863c60465b6b032e79ece41b3be931e864868031291a3045d16d6d5afa99ce73f9d64983705dcd21a
-EBUILD nut-2.7.4-r3.ebuild 9770 BLAKE2B 213ab23a9ba2e470f0cdb81511dc95ddf89719b90577cd429fbd823155ba62a01ae6a897332268da33f516fd68a49e3276bca37236f58afc39de073fe4a6dfd0 SHA512 0fa8444fc165f82c3027a2a8187d4d077af728b2e300b19f02fb744357781d60aaddcc58f415d5978e435e58ba567276219524d1f4e73471ba2843747067763f
+EBUILD nut-2.7.4-r1.ebuild 8990 BLAKE2B 6bc08488cf1d34acce75520ce232fb8d35eb495369ff5e6b8ad85ab34f0517ac7ca5a0a12b26507d63a2cd3494c03f33aa5e72a41ca9426767cb5b39f73bbb1d SHA512 8238f2d9a7e3df1cd670e66aa28b10ddc7a128d15757f58bd6c3952e9aace0b40c91a570582ff5d57a8e65a01de438e54ef1fbdd8059a666c98f2eeb45decd2a
+EBUILD nut-2.7.4-r2.ebuild 9720 BLAKE2B 9685414f8faa8a7565eb836d0e02671ad6d8e10f1038db98c43aa533e0fa1d2de6f1057ea9cea64887dcd1c29da7663ae1c72bf1b4c60b76fe5578b0ac9c4a25 SHA512 a1f6aad2acb0762ed0007b99ccf5af94b1d72c621adddf875b1f423d8041efb39091351ae3bd3bc172eac27214e1b5ae726967be7e3581790bfc65bf32e23060
+EBUILD nut-2.7.4-r3.ebuild 9760 BLAKE2B 9b6b485acf8f4e9713cc51875f44ef2d5d4fb20f3cac63ac85e9d4aee42609cf05410cca7106e4201ee82aaa47d5095559e21066edf588ef5a26b61dec1cbb7a SHA512 bea57a2a10f8e9f0f9a10be61100e472aabbfeaf6a745e884f06bd7000b8ab4166d215a539224d10d90076f98fea80a0905983727ceee0a7f1308258d8291476
 MISC metadata.xml 5329 BLAKE2B a97167cdd654c0a1cfc035fbab98a8c94150522b77651186f8c706ac2ebadac6b3e38c8c563a6fa16ac91fc8da760efd204ce3d3ce8e3e0c5239a9dd8c1adf4e SHA512 e57d635a530b16627fbc4807a07a227900189a8796285f309b710c4acb951c990b4f613dc9b3cbab71c480641d8ebfd942520a13e5712527d0058ca07c16b67d
diff --git a/sys-power/nut/nut-2.7.4-r1.ebuild b/sys-power/nut/nut-2.7.4-r1.ebuild
index a57d0c129171..33146bc92d79 100644
--- a/sys-power/nut/nut-2.7.4-r1.ebuild
+++ b/sys-power/nut/nut-2.7.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://random.networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ppc ppc64 x86"
 
 IUSE="cgi ipmi snmp +usb selinux ssl tcpd xml zeroconf"
 CDEPEND="
diff --git a/sys-power/nut/nut-2.7.4-r2.ebuild b/sys-power/nut/nut-2.7.4-r2.ebuild
index 4e93549bfb92..ad94972b18b9 100644
--- a/sys-power/nut/nut-2.7.4-r2.ebuild
+++ b/sys-power/nut/nut-2.7.4-r2.ebuild
@@ -13,7 +13,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 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 
 IUSE="cgi gui ipmi snmp +usb selinux ssl tcpd xml zeroconf"
 REQUIRED_USE="gui? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-power/nut/nut-2.7.4-r3.ebuild b/sys-power/nut/nut-2.7.4-r3.ebuild
index 5b780f48de5d..245adf5452f6 100644
--- a/sys-power/nut/nut-2.7.4-r3.ebuild
+++ b/sys-power/nut/nut-2.7.4-r3.ebuild
@@ -13,7 +13,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 ~x86-fbsd"
+KEYWORDS="amd64 arm ppc ppc64 x86"
 
 IUSE="cgi gui ipmi snmp +usb selinux ssl tcpd xml zeroconf"
 REQUIRED_USE="gui? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-power/powerstat/Manifest b/sys-power/powerstat/Manifest
index f2680d2d94ca..0f6739c16687 100644
--- a/sys-power/powerstat/Manifest
+++ b/sys-power/powerstat/Manifest
@@ -1,9 +1,7 @@
 AUX powerstat-0.02.17-makefile.patch 432 BLAKE2B d917331055d4c33df53e926ad7aa0fb8aec2d45d5d1f80f7dee4ac67ba351f8d5602304ac9d750c182b84ead33cea9a92cecc36bad1f1b1b1ae076461866c05f SHA512 f9da9311295b420bf1101a1a19aaa23617368319b7d825667195d66965ad292b111a2c8779d4a0183e9c1693892d848b686a53a1eb377e61b87f91eb597d71c8
-DIST powerstat-0.02.15.tar.gz 58529 BLAKE2B f5429392fbb6f3b42b2bef5ff3218adb8b421bae055a302b00ee26aaaf219eca561a39238150786de94f6b74110ce7df1318e784a80c1caa903a2d7758dc5625 SHA512 15fdcee2ffecf7ceb6895a9fcd74ce30708c40cdb35e5e15de2b3c0d39b63b3500862a7117b08ce0f388372aace849aa5f8343d97c2315ec19e499cb5d76e204
-DIST powerstat-0.02.17.tar.gz 58854 BLAKE2B c8459c410de2311fa409e80b2395958c9080e7b9991a9c39818fa60ad420039415b70dc891fdd293f0952f3228a9766cb237d6c98b85b7feb78c717958e83b82 SHA512 fa6ee1da5f75b0415f3e495dfd8db0ea416493c1ddb7d0a079c8136220c609207001c66dfedf624c8675b9ba12a25698e59154ae62b2647403a2447522f68f11
 DIST powerstat-0.02.18.tar.gz 59205 BLAKE2B 80230b0571b0920d68ed0148220d0b50c84dece6a24c11d866a885c63da336d5a632119a667a3348dcc8b6f62ed98a5785ad91120a3ee9d98ddd0dbb5952aaea SHA512 2634ae760d2cd68f71d315033d53bcda843b977bfe34190f792a5937a29dc4b6d220b91bd3b538be75394c8ba9b5a8d883e3d99ea8b840abf4106880da7a1404
-EBUILD powerstat-0.02.15.ebuild 459 BLAKE2B a915f5373b04953c575ff321c2334f458bf51ce7e4842891e86d9293338f399ab0ed16ceeb89a889685c2060af2d8fe4538149aebeb3e9fcce1ec6ce2b643419 SHA512 e2b655308006e62b610566396c2bec028790ec1f3bb25a99eb088e33cdf3c28c73a7bae8785eaef6f76f1fb331761badad6f8d780e8aa60e76660592d3e4ec2b
-EBUILD powerstat-0.02.17.ebuild 544 BLAKE2B 2e254b84fb5fc7b931ae2dc2529442994c9f74d79aa25026d8e7e3873d12fb38edff0b109ec6a64f38aa6fae5dc7b613fbd0c9104e5317e1810e58b326bf59d1 SHA512 a4e3eb59a3542457e6c42ee1eb3ed8a34b5d270e3ec7346d555a2769f9b6f344724ff7857825a68651ca85473dde1ecf86aad9d7041cc4c577636a156a880057
+DIST powerstat-0.02.20.tar.gz 59127 BLAKE2B 893637b3b2ebb2969dcea34a02ff9c90aa1d08b2bb5fafcb80b6d41520e03b5696acc6020a337afaac676eb29e48e5449f718a40d88535d114766d77f70f6fca SHA512 1bfe33cb06d4647c8552ee4b85e12f55475b3a0aa77aaa9cbd72ba11c9c67bb087d64dbda2b6362fb60440e30060e670eb6ba4b7f164f7ab306320994e54fabe
 EBUILD powerstat-0.02.18.ebuild 553 BLAKE2B 17bf6c3d17e60e5bf12dbc0b6803aedbeb1bbc30b154ae39dbe70c3f73b622494d409f56977cb9fd1fad8e9b0e9e46ca90ef7f736b1e0dbb34e48baa3bb066de SHA512 4496f0de0283beeffab6c6fbfb1a8ecccd5cf09e22bed6e5f1e4dba049cb22cc5efa28f7a7322e7bd5164e7e22a18f6c49c2664cfadeda946dff68b1e5bdbc27
-EBUILD powerstat-9999.ebuild 534 BLAKE2B 64f7af80b27ce9233766d6772def12720f29d0c6bef7d531e7b99e0520ddc9203c70fd38704e23ce7fac35ce3bb2bf7ff852c9b0608c03aeab7de8c98ec0d700 SHA512 bd722e97c60b9e1c15c3587b1952c311c74cf95b063dfae0a6d2bf6bc59ce4bbb0b0695c9d03d7b255f5de9d631efd4f70c467c3969eeed0155e950bcf3f5f6a
+EBUILD powerstat-0.02.20.ebuild 550 BLAKE2B ed53a9fc2ad8a40eb4f45c9a19dfda3a77701d4c28c1bfa8ab004488c6fc20613587ec438b35b6f98bb51d8ae54086d4165ec34158ae6a6a0176620d95f25fc9 SHA512 e02f7061f81f66901cd5a388dc319dae9ee66dec404c68b0382f83b858db6e0b505d78f3ae0adaf2575048345b07f208e076cbcd6f9ff3ddd30f6b27cb6d1491
+EBUILD powerstat-9999.ebuild 531 BLAKE2B 2fc562f4da1d7a9261fbb429eac189375d7047296b6fd33f1c3596f32034b7e0457f5fbd60f3f33303d091fd4f82d5b177b1c4938012cfdf8148c1235079d61a SHA512 dd7e7f083efc2775ffa29e5ec1cf2b362f3d9949cbd565e5c07d8337d4a3eb29c24e13e8883d0a48089ae923cf29e62d8848d1621c4004ea490740daebcc8eb0
 MISC metadata.xml 858 BLAKE2B 75ca9db98e72e80d14d2f17970fe65183bca67ff52fa19e61101de1cad8bd8c5119b9cfe3286a67282c5cbdcdfe821b627dbffee7a04ceae0a158f2fb3f50462 SHA512 59311c93c878c4dd09141428ccfb72fa030b72538978ddd2b44c505c0e083a5a0dfe017c865dfaff27fdd3edf3abb9a78fd938e2e0d32ff92fa121ad27a84f1f
diff --git a/sys-power/powerstat/powerstat-0.02.15.ebuild b/sys-power/powerstat/powerstat-0.02.15.ebuild
deleted file mode 100644
index 2d3546fc1d32..000000000000
--- a/sys-power/powerstat/powerstat-0.02.15.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Laptop power measuring tool"
-HOMEPAGE="https://launchpad.net/ubuntu/+source/${PN} https://github.com/ColinIanKing/${PN}"
-SRC_URI="https://github.com/ColinIanKing/${PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_compile() {
-	emake CC=$(tc-getCC)
-}
diff --git a/sys-power/powerstat/powerstat-0.02.17.ebuild b/sys-power/powerstat/powerstat-0.02.20.ebuild
index 4d2dc7ae7ca7..9a3027b8978c 100644
--- a/sys-power/powerstat/powerstat-0.02.17.ebuild
+++ b/sys-power/powerstat/powerstat-0.02.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 # Don't compress manpages
-PATCHES=( "${FILESDIR}"/"${P}"-makefile.patch )
+PATCHES=( "${FILESDIR}"/"${PN}"-0.02.17-makefile.patch )
 
 src_compile() {
 	emake CC="$(tc-getCC)"
diff --git a/sys-power/powerstat/powerstat-9999.ebuild b/sys-power/powerstat/powerstat-9999.ebuild
index 502040bb982d..d86952ed42b3 100644
--- a/sys-power/powerstat/powerstat-9999.ebuild
+++ b/sys-power/powerstat/powerstat-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index d1083bd4c9c8..b4eddd3c3cc8 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -1,5 +1,7 @@
 AUX upower-0.99.9-pending-charge1.patch 1351 BLAKE2B 719581956d7bed9efb148bb84a83b0b90cabadf1113fece846416b980c1919895bd1e85575bba0198d856d5a39209ab7c919e2142361ee2cf6361f631f312fc9 SHA512 f100c9cb06c8407fdb8cc2ea27651f3e1eb563e40b98b2a0d7589577652d5c14d824a4de3d503cb858fa5d4360993f63da49cd5f4c8caaec43fde4f20e075f47
 AUX upower-0.99.9-pending-charge2.patch 2016 BLAKE2B 87a3078acf6c95dd8237f894aa25dbf803d42f766682e3e53f5ec30fcd7725178ebab94111945fbf0b4d0e16b656e8723240b14358d1c6e5285086b30da541d2 SHA512 15aa04bcd892feec125508d6a9edb8df98cd5317fce27d9c8907994f1d735be32934c5010566f0a38221ef20b48d8faf73841df6e35447ef0efccdaab371fb0b
+DIST upower-0.99.11.tar.xz 430128 BLAKE2B 77604d02a69de98e4c7b268d11d189aa42ace2d62b982fda9bc41131ce383ede32953ada31eae0bbfd1121600af5863924d48c636e60a28f505a6998dcac227c SHA512 67219a0beb98c97ac4512e4fe8ba83fc80a1035d1edb5367dda6911da50c672b047051f2f528e8703be29ab47547d92b6c71a7ef695226a1bdb5bc33e6d18803
 DIST upower-0.99.9.tar.xz 448408 BLAKE2B 5fa2436f33c94cffb736d8e3fad433acf58954cf06ccd403a0361214be5afc45d79ea279f3c5c48dcd58b92ccaf995777c95987d1749fd8c8c8958317e439570 SHA512 45eb587b0e5ffcce88bad8c56bc5efa30559748913016a55d58313280f5159378e5fbb4a9842c3a6409257bb97822d235f96b03704268b8471455c93eb05fe2f
-EBUILD upower-0.99.9-r1.ebuild 2351 BLAKE2B 3d40a0b40667d5dbebab4cb38191cc04b0a6d390da70746c991ac29a1d142febd4a9319ed49065e886bd0e942e8704e64b5dab60edc7c9aa926997369646c373 SHA512 88bec5851a4ef85d01460e4333b50ab57e30e3f205d501db13e9eedc476800d1387e21edb7995fbf5d46dfe897bd5422658d2741a3db5201fd90f8a789814806
+EBUILD upower-0.99.11.ebuild 2127 BLAKE2B 7be67f38e0de5cf7da2e3747583bcf4ebcaccf4311a05305d015e53d82156b37958190964beffa4e318076ab7c8045adc4e168a9ca80ee547d4f117c26eba546 SHA512 b10fe52bc8ea5ddfc7070c2644e77dcec9af7bf827461847de7e10cd3e115d3774759e22f5f44f3a2dcc9e95b7ecfebbf1b7792513924ef490b5200338173b84
+EBUILD upower-0.99.9-r1.ebuild 2341 BLAKE2B 634c9e8e4a2bf1c67277fc8e76f054df17c166d962d5c6650e0c20f2aae84d365a6c9555111e28ee6621acba52ed9ede86f60b8cc0fbe5ea9b6d8fe58ac41508 SHA512 4a8ea435c8117bc2baee03b6d8cf0d4627313bee62d2fdf79b87ee7db56a998637a3fc8f2ce4e703a160da46bb8b756c6d73a398f629c3858ccdc706fdd4ff59
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/sys-power/upower/upower-0.99.11.ebuild b/sys-power/upower/upower-0.99.11.ebuild
new file mode 100644
index 000000000000..a6aeeafc5c55
--- /dev/null
+++ b/sys-power/upower/upower-0.99.11.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd xdg-utils
+
+DESCRIPTION="D-Bus abstraction for enumerating power devices, querying history and statistics"
+HOMEPAGE="https://upower.freedesktop.org/"
+
+# No tarball released, use the same commit as Fedora
+#SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
+COMMIT="93cfe7c8d66ed486001c4f3f55399b7a"
+SRC_URI="https://gitlab.freedesktop.org/upower/upower/uploads/${COMMIT}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/3" # based on SONAME of libupower-glib.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+# gtk-doc files are not available as prebuilt in the tarball
+IUSE="doc +introspection ios kernel_FreeBSD kernel_linux selinux"
+
+COMMON_DEPS="
+	>=dev-libs/glib-2.38:2
+	sys-apps/dbus:=
+	introspection? ( dev-libs/gobject-introspection:= )
+	kernel_linux? (
+		virtual/libusb:1
+		virtual/libgudev:=
+		virtual/udev
+		ios? (
+			>=app-pda/libimobiledevice-1:=
+			>=app-pda/libplist-1:=
+			)
+		)
+"
+RDEPEND="
+	${COMMON_DEPS}
+	selinux? ( sec-policy/selinux-devicekit )
+"
+DEPEND="${COMMON_DEPS}
+	doc? ( dev-util/gtk-doc )
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+QA_MULTILIB_PATHS="usr/lib/${PN}/.*"
+
+DOCS=( AUTHORS HACKING NEWS README )
+
+src_prepare() {
+	default
+	xdg_environment_reset
+	sed -i -e '/DISABLE_DEPRECATED/d' configure || die
+}
+
+src_configure() {
+	local backend
+
+	if use kernel_linux ; then
+		backend=linux
+	elif use kernel_FreeBSD ; then
+		backend=freebsd
+	else
+		backend=dummy
+	fi
+
+	local myeconfargs=(
+		--disable-static
+		--disable-tests
+		--enable-man-pages
+		--libexecdir="${EPREFIX}"/usr/lib/${PN}
+		--localstatedir="${EPREFIX}"/var
+		--with-backend=${backend}
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-systemdutildir="$(systemd_get_utildir)"
+		$(use_enable doc gtk-doc)
+		$(use_enable introspection)
+		$(use_with ios idevice)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+	keepdir /var/lib/upower #383091
+}
diff --git a/sys-power/upower/upower-0.99.9-r1.ebuild b/sys-power/upower/upower-0.99.9-r1.ebuild
index 70d4b2d6f155..c313d30cee94 100644
--- a/sys-power/upower/upower-0.99.9-r1.ebuild
+++ b/sys-power/upower/upower-0.99.9-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.freedesktop.org/upower/upower/uploads/${COMMIT}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0/3" # based on SONAME of libupower-glib.so
-KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86"
 
 # gtk-doc files are not available as prebuilt in the tarball
 IUSE="doc +introspection ios kernel_FreeBSD kernel_linux selinux"