gentoo resync : 17.02.2021

12 files changed, 18 insertions, 76 deletions

diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index 2e1a6b5cda4d..46f627dcc858 100644
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
diff --git a/app-laptop/mbpfan/Manifest b/app-laptop/mbpfan/Manifest
index fce8785bc3ad..53c1b976a693 100644
--- a/app-laptop/mbpfan/Manifest
+++ b/app-laptop/mbpfan/Manifest
@@ -1,6 +1,6 @@
 DIST mbpfan-2.1.1.tar.gz 40637 BLAKE2B bdd17a9a883cc9af3cb7d55a2c8594c435fb367f0c6b5dec2b3da85747e2c2af591ed1dabf082cbbc31ac92ce5b2dc5194d8a50836c87cd784f238322ab09d9f SHA512 c1bf81c5e2f2f4f710a8455c65f10dc2dc2255319a7dbf4367c31884eece8d9909d28f3a00e5fc4d964d65254b36202a2a2b666d0ef04ea04153baded6039449
 DIST mbpfan-2.2.1.tar.gz 40455 BLAKE2B 0932919b4808fa41d64c326f0d202650be25798ca692b4c17cc94a88f3287ccdd10d74c27f95ac8ef7d900f0067b3c40dc8798d99210b89c01b8cb0d63187b98 SHA512 ce358047910bd6996e1d47fe08e1825863e043fc9a33b3c4922ea537e58dd7508fc45c651816125e7b32472cbb3d06afa4a487daba5b910a8580623def938a71
-EBUILD mbpfan-2.1.1.ebuild 1172 BLAKE2B 08745fc73fc8840ad822add77d481cf3c21f56f438c942153ec90e103384cc0f0d478e2f0c60d27a38304b26f21eb3e16379b3971fbc833b7cdbf9459878e25c SHA512 edaaa734d39d913aa534814d47936858f3ca67a9bf0dae17a9869c1a8c0ff9dba641f4abfa2567cd5c914a325278c38292e467e4999ef2873a5e381a9906b479
-EBUILD mbpfan-2.2.1.ebuild 1285 BLAKE2B feeb61d49f29970bfb4f6b67b14160d153f7c356a1a78d72d1a208aa7da8a1b3205f6721bc56a91e81f9fc48da4f9c1c0549e85ea449113030c1e30bd89c264a SHA512 ee60fbc1b9d081641a12718fbd62275317ea1481de83b1b43e238cb74bc4aaddddd573b044dc92c856b34602fd5e0a7ad842f8770df206a757a74cc20434804d
-EBUILD mbpfan-9999.ebuild 1285 BLAKE2B feeb61d49f29970bfb4f6b67b14160d153f7c356a1a78d72d1a208aa7da8a1b3205f6721bc56a91e81f9fc48da4f9c1c0549e85ea449113030c1e30bd89c264a SHA512 ee60fbc1b9d081641a12718fbd62275317ea1481de83b1b43e238cb74bc4aaddddd573b044dc92c856b34602fd5e0a7ad842f8770df206a757a74cc20434804d
+EBUILD mbpfan-2.1.1.ebuild 1159 BLAKE2B b732fd2d324cd270af00564df237896b6651074c4aa4b499f62ee789288be470be9d14581ca4e44bb25aaa92ea48f3e50a68fce24b4bf83d6dbcfc22b3cd330f SHA512 16fac95a2daf9ae4a6dd5d342c0a396a7152b9b2be861636ee57fe3699d18abb143c635287103276668696e91d5ce390d706f4657ee7c89130316602c3c9b388
+EBUILD mbpfan-2.2.1.ebuild 1272 BLAKE2B 1ee6390cd18d42b15408b825403a531da829eb71ed914a93a2c476c9b44be7de66cdeb545dafb55d072cef77779c0229c26e19808533ac6fc421c2484c12ac55 SHA512 0a12fd5703c1eee437efd224068a362eccdf036a9f3496b0b94e36be1e4b09bcaab8aceb4ce36f5dc33a1ee542d19fe4ae5dff23043fc460776c5842f8fc7eb5
+EBUILD mbpfan-9999.ebuild 1272 BLAKE2B 1ee6390cd18d42b15408b825403a531da829eb71ed914a93a2c476c9b44be7de66cdeb545dafb55d072cef77779c0229c26e19808533ac6fc421c2484c12ac55 SHA512 0a12fd5703c1eee437efd224068a362eccdf036a9f3496b0b94e36be1e4b09bcaab8aceb4ce36f5dc33a1ee542d19fe4ae5dff23043fc460776c5842f8fc7eb5
 MISC metadata.xml 689 BLAKE2B 27fd22350963186cbee04938bcd8e14e7662ea0d0d432c45ae1a6d352588e13d33cee3f461ffcef5b0c7fd0dccee8b63eb806ca05c8887d4f8c98940d93521b3 SHA512 8edd05f68f3781e684706e61cc28a1d8d5877746c7022ed5a247bb5e686de7f75cbcca2253962b51ccfc06d47445d553399e90b465a9ae466d45cd47d7d05c36
diff --git a/app-laptop/mbpfan/mbpfan-2.1.1.ebuild b/app-laptop/mbpfan/mbpfan-2.1.1.ebuild
index 9a83fb13fa83..565655fb2b27 100644
--- a/app-laptop/mbpfan/mbpfan-2.1.1.ebuild
+++ b/app-laptop/mbpfan/mbpfan-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,6 @@ RESTRICT="test" # will fail if the hardware is unavailable, not useful
 if [[ "${PV}" = 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dgraziotin/${PN}.git"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/dgraziotin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
diff --git a/app-laptop/mbpfan/mbpfan-2.2.1.ebuild b/app-laptop/mbpfan/mbpfan-2.2.1.ebuild
index b530d9569fa7..e1a4cb35e935 100644
--- a/app-laptop/mbpfan/mbpfan-2.2.1.ebuild
+++ b/app-laptop/mbpfan/mbpfan-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,6 @@ RESTRICT="test" # will fail if the hardware is unavailable, not useful
 if [[ "${PV}" = 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dgraziotin/${PN}.git"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/dgraziotin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
diff --git a/app-laptop/mbpfan/mbpfan-9999.ebuild b/app-laptop/mbpfan/mbpfan-9999.ebuild
index b530d9569fa7..e1a4cb35e935 100644
--- a/app-laptop/mbpfan/mbpfan-9999.ebuild
+++ b/app-laptop/mbpfan/mbpfan-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,6 @@ RESTRICT="test" # will fail if the hardware is unavailable, not useful
 if [[ "${PV}" = 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dgraziotin/${PN}.git"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/dgraziotin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
diff --git a/app-laptop/thinkfan/Manifest b/app-laptop/thinkfan/Manifest
index b12bab282298..34e77b3402b5 100644
--- a/app-laptop/thinkfan/Manifest
+++ b/app-laptop/thinkfan/Manifest
@@ -1,5 +1,3 @@
-DIST thinkfan-0.9.3.tar.gz 39527 BLAKE2B e6a6d09493d94b4de9ada20dcc4b0251c5f2c148f7faa7f69c04fe2a279a9cfe253a0ea1a01fe94ed108e8731e2ba01edef5df10dfb887ea961a356dff733854 SHA512 d2a29f9cae636c22b66958f8ec50cb60a162d745c3967257bb5e20cc9e152894d4e8a66f897ffa4e49353eba4a42e3499bb9e554719974284089a46cfc6280d7
 DIST thinkfan-1.0.2.tar.gz 77653 BLAKE2B 1b40553380f9b873883f0dc587665f24cd2e07de7a7e743cb9f99a3282f380da2258265a612b1c97d2945fed31aee0d6cbc30ea2a18c0b212e877e7635eda336 SHA512 d9133538096a7c5757f599adfebc8217aa7334a102573d6757f03b5c012a09d600be923930fd9d62f4afa591f5eb7a70a1c328004bddef85494d1a7ce56b648f
-EBUILD thinkfan-0.9.3.ebuild 1069 BLAKE2B 0e4862e477f197efc30f9c72330e8153327325a733277220a0e65725483762e700515dc3204712d8f6af2b06c576cf17f114683993c0385383cc92c58e211318 SHA512 ffec534bfe1c1eb08c1de3858347781d6f0dc349d7f3de39196a47166e65142d649e0e889141e9c90ce193f0f984ac386ce39cc45f6e70ff971278c3b6560247
-EBUILD thinkfan-1.0.2.ebuild 924 BLAKE2B 3a99d05583446f1bb15130ac2c0faa32c93c6d10a5fbfb97e2dae1a21b157dad4d80cbc3628fd4bad98760f77cff2d99fddb0aad4008b3bc4cb6653376d34c28 SHA512 3381a2a57cd39759bb76d8a786dfd568da51b7e497d8ad270d7f173dde132c0746884cc117868ecb926d31af4064e65cc8120c40ddfc7d25a17ad0845b664907
+EBUILD thinkfan-1.0.2.ebuild 905 BLAKE2B 6a6b067772ec24f50be8a8a998ec7910b8ca3c48674405c813f75a281bbac013f385689baf1aa5aeba38b94b96ccd30aef335df490dc07e2f48a53db592de8fc SHA512 54a0c916068ebb4e898947767260bfe4f1a33afdd448e450978383ae82cb16e8b375131873c8dba2266a1980aff731c8301565b7f625b1781f51ecdc8e1ba940
 MISC metadata.xml 505 BLAKE2B 8b6b4100f0b839473a7f3b09bcc2f8ed896076e4a815d69035fe5e5ee26c11100ad7c90c1be8dd15b8616012ccdaf7359ba926cf526f45427279d2a731d0c328 SHA512 fa6a9f4d5218fa6911d445439eaf5d01e58636f0063721646112d028b30ced234c3c39a69ccc876a5c28df5e01b5eaa067dc92a7802c06a2afd395c9b7fd9d5c
diff --git a/app-laptop/thinkfan/thinkfan-0.9.3.ebuild b/app-laptop/thinkfan/thinkfan-0.9.3.ebuild
deleted file mode 100644
index ca8dc1c15153..000000000000
--- a/app-laptop/thinkfan/thinkfan-0.9.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils readme.gentoo-r1 systemd
-
-DESCRIPTION="simple fan control program for thinkpads"
-HOMEPAGE="http://thinkfan.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="atasmart"
-
-DEPEND="atasmart? ( dev-libs/libatasmart )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e "s:#!/sbin/runscript:#!/sbin/openrc-run:" \
-		-i rcscripts/thinkfan.gentoo
-
-	sed -e "s:share/doc/${PN}:share/doc/${PF}:" \
-	    -e "s:thinkfan.1:src/thinkfan.1:" \
-		-i CMakeLists.txt
-}
-
-src_configure() {
-	local mycmakeargs+=(
-		"-DCMAKE_BUILD_TYPE:STRING=Debug"
-		"-DUSE_ATASMART=$(usex atasmart)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newinitd rcscripts/${PN}.gentoo ${PN}
-	systemd_dounit rcscripts/${PN}.service
-
-	readme.gentoo_create_doc
-}
-
-DOC_CONTENTS="Please read the documentation and copy an
-appropriate file to /etc/thinkfan.conf."
diff --git a/app-laptop/thinkfan/thinkfan-1.0.2.ebuild b/app-laptop/thinkfan/thinkfan-1.0.2.ebuild
index 59f5d7fce4b9..e08e6101e57b 100644
--- a/app-laptop/thinkfan/thinkfan-1.0.2.ebuild
+++ b/app-laptop/thinkfan/thinkfan-1.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils readme.gentoo-r1
+inherit cmake readme.gentoo-r1
 
 DESCRIPTION="simple fan control program for thinkpads"
 HOMEPAGE="http://thinkfan.sourceforge.net"
@@ -25,18 +25,18 @@ DOC_CONTENTS="
 "
 
 src_configure() {
-	local mycmakeargs+=(
+	local mycmakeargs=(
 		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
 		-DUSE_NVML="$(usex nvidia)"
 		-DUSE_ATASMART="$(usex atasmart)"
 		-DUSE_YAML="$(usex yaml)"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	readme.gentoo_create_doc
 }
diff --git a/app-laptop/tpacpi-bat/Manifest b/app-laptop/tpacpi-bat/Manifest
index 97e9a4a8b443..9d84a1d81676 100644
--- a/app-laptop/tpacpi-bat/Manifest
+++ b/app-laptop/tpacpi-bat/Manifest
@@ -2,7 +2,7 @@ AUX tpacpi-bat.confd.1 668 BLAKE2B 88ebd00838e2ed0febbd1321e2ab13dfc4bea292f3f7f
 AUX tpacpi-bat.initd.2 1488 BLAKE2B 43e196ae490ba367edc15b1b9a0ef81cc7f56fec33b7ee8e91251f66705d1c5e38caa65a803e8872344149e384ae0b162c6b30e540c38aeceb12958fa0386b86 SHA512 ccd84bc4cd44ed8a3b2c101501ae220d8add3b189f172e4ba5fe9532ba5a64a188b90054696cc60b7bc1b3d72f636649e4678c020c789933d0b4d25f6ffd386d
 DIST tpacpi-bat-3.0.tar.gz 18137 BLAKE2B db0db2c06d5bc78eb028cb0db2532e5500cce2370c23ab3bf1e49433b83ed2be7cfffe080e46c3699838ff00025d516dd37e071081f79c7d5d6293f4f49730d4 SHA512 2beab3e5495f028b53d673a4243a2128f4ff85e19e18ac7d53663a1d62e20b271442d6c2c8f19cb41d618ddf7ebb4d9b8390f7f185f77bdca33c69bb19463128
 DIST tpacpi-bat-3.1.tar.gz 18584 BLAKE2B 5f1e890f33be4e0d176bda486d9e4363d56a7a933677eb69bedca9ec42e8af5a0e5494f8447702d33ffecda3d1d4a447a56f7aeb9480a3b855a24bce45028d38 SHA512 cdc9e0c0ded96281678199783b4c48ff85a497c90b244a7ce2276b54d7ae4bfa7eb430214bcdb6fabd7478796507b0fbe7fed4b1ab4bc4cdd7bd5ae25f943a77
-EBUILD tpacpi-bat-3.0-r1.ebuild 789 BLAKE2B e29bb0916b2d4f43ecdc97b366c07e48fc54fde2fbace42d01b27c91f8a0e6b7ccbced748477c3c83f0140f0ebe0b172add09c0ec6fac8277e7ba7c8f87751b3 SHA512 21e9be8dd04c70e67b68e82ac9c416e7589c5b074e0cd0b1974592e56ab98f1669b0c59085678a3b45df0d3dd02c68d5d288634a60f7ea9e5300b3d3e0123aa1
-EBUILD tpacpi-bat-3.1.ebuild 829 BLAKE2B e6a07ad049035d1d1a89a01a7c77c0481bfbd7ae6528ed4b8a83df704cca53b6c4f0b05a95ce917555b7e3c21a56e04d6f002dcc492e9345071fc82d35061b4f SHA512 de3f25f6c612b61db7951eee048a757b107d8f2486f5f5c101a30e33b844d57106f379764bc407c1a65de1ed7362a66a401de74a9eb5e031b455b0a838b5fc75
-EBUILD tpacpi-bat-9999.ebuild 829 BLAKE2B e6a07ad049035d1d1a89a01a7c77c0481bfbd7ae6528ed4b8a83df704cca53b6c4f0b05a95ce917555b7e3c21a56e04d6f002dcc492e9345071fc82d35061b4f SHA512 de3f25f6c612b61db7951eee048a757b107d8f2486f5f5c101a30e33b844d57106f379764bc407c1a65de1ed7362a66a401de74a9eb5e031b455b0a838b5fc75
+EBUILD tpacpi-bat-3.0-r1.ebuild 773 BLAKE2B da68abf31c6568a011261d1e8b70672483eb5fa8470a1d203588f282c725c884fe123e98ef8a906cff1894caaf07b92466b6e249fe098ddd2d1ae9d59a5b8775 SHA512 17a7917cb3e96d98be9143072e8a50016b5d6794c51c2e59784403e24d64ea75c2ba11c3386e63f375c92659c456a49907e34a47c0f146f3eb2fc7b0d206eb51
+EBUILD tpacpi-bat-3.1.ebuild 813 BLAKE2B e4072b3ec336ff4616e2c877b26db2af2861ab4af951b2efc2ca9c482aee90a62939497902b7fb315ea447ffa27d8ac11f568e6fb138e0e22de0a0ae992507af SHA512 15fcb6a1c24dc78173d4279e86df9112b3363b1857c2924aafe19307f6159c8057446b20ca3f3083005fc0dd2b571f65dc72d8a8a23775a4262180e4ffcb858c
+EBUILD tpacpi-bat-9999.ebuild 813 BLAKE2B e4072b3ec336ff4616e2c877b26db2af2861ab4af951b2efc2ca9c482aee90a62939497902b7fb315ea447ffa27d8ac11f568e6fb138e0e22de0a0ae992507af SHA512 15fcb6a1c24dc78173d4279e86df9112b3363b1857c2924aafe19307f6159c8057446b20ca3f3083005fc0dd2b571f65dc72d8a8a23775a4262180e4ffcb858c
 MISC metadata.xml 338 BLAKE2B 612018ee773059fbd8492aa11f53aa5c99190b9189b864365d06bc309950c11747fae5c0b4b0e2e2915981a4642523ac439988bcaa8003c1394eb58af5ebdcad SHA512 e6cb10546e9a71a1c5fbcea24b4ca97c5eed95e4553d3cd4bbedbf1180da9533a0e570fa674ccf12574825cb369d6197e51969361945958f4322d6cb91e25714
diff --git a/app-laptop/tpacpi-bat/tpacpi-bat-3.0-r1.ebuild b/app-laptop/tpacpi-bat/tpacpi-bat-3.0-r1.ebuild
index 350f9db837ce..0751d72324c5 100644
--- a/app-laptop/tpacpi-bat/tpacpi-bat-3.0-r1.ebuild
+++ b/app-laptop/tpacpi-bat/tpacpi-bat-3.0-r1.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
@@ -8,7 +8,6 @@ inherit systemd
 if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/teleshoes/tpacpi-bat.git"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/teleshoes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
diff --git a/app-laptop/tpacpi-bat/tpacpi-bat-3.1.ebuild b/app-laptop/tpacpi-bat/tpacpi-bat-3.1.ebuild
index 6364a4ee745f..39f5df050623 100644
--- a/app-laptop/tpacpi-bat/tpacpi-bat-3.1.ebuild
+++ b/app-laptop/tpacpi-bat/tpacpi-bat-3.1.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
@@ -8,7 +8,6 @@ inherit systemd
 if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/teleshoes/tpacpi-bat.git"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/teleshoes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
diff --git a/app-laptop/tpacpi-bat/tpacpi-bat-9999.ebuild b/app-laptop/tpacpi-bat/tpacpi-bat-9999.ebuild
index 6364a4ee745f..39f5df050623 100644
--- a/app-laptop/tpacpi-bat/tpacpi-bat-9999.ebuild
+++ b/app-laptop/tpacpi-bat/tpacpi-bat-9999.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
@@ -8,7 +8,6 @@ inherit systemd
 if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/teleshoes/tpacpi-bat.git"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/teleshoes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"