gentoo resync : 22.12.2021

7 files changed, 61 insertions, 4 deletions

diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index cbef29dcbf13..45ce41d91064 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index 474bab359078..37ad9752323d 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -11,5 +11,5 @@ AUX apcupsd.init 804 BLAKE2B 7afd83a6be8b068133f6221cc2396a1fe4cab23f6dec68957b4
 AUX apcupsd.powerfail.init 397 BLAKE2B 472512906536753d3054d275707764a98094c14866da63fbc8d2d62e16a9099fdce0b61cf572a4ba862f0be13e1ed3407821ed07ec90f9c77fb8d95f18aafc2f SHA512 cd0ed9d24a8371de7920bf0ce2e89bb63c0bee58da1ac782ed2b929068f95b2af47458529223a33ecea4e8f73ddfe3a7b9591af6f64828de7ed1d91e2edbb6e1
 AUX apcupsd.service 111 BLAKE2B bf2ac8161af5b971642298c30b08ad78d289044bb2452bdef39b31119b60eceb0a14add7c00262132bb80dbf1964103242452cb8d9b815d6ec82c204100ea184 SHA512 011e3e52e7909f36fb73b6064277a69e5db41263cfc72bda07e326172396d5318cd2b050f1fb84c4cc6da7a247c0035c36c55322ffb234a1cfa7bf13ba492889
 DIST apcupsd-3.14.14.tar.gz 1843409 BLAKE2B 48a3b249780064d699d86b658584aa222ce9f3b46a81209110b4684bf737cca7492b87b063154864ce76478f29f73cda83ab96b47f4a7aa7aa91e29a8abbf4a8 SHA512 c953bbf3e08f809748a7978a3952604176390d1cd276f187fe096d9bc3c8993b52127e8350c0363387da41318e24b4d1e00ea58df71f3bb8f50c9a5a64cd2d7f
-EBUILD apcupsd-3.14.14-r3.ebuild 4300 BLAKE2B 711a267e3cd6436d21c1eebaa874c9bdfb69dbd1d75536ec07b967e45d8cc522a23133e528a05ec85f5720f7928c79e379bb0e7b6ea8919b62457ca3052fd03a SHA512 ccb8084cd15878f9a696b9f21a2d5ce1d02e6a2ba864fb25aa21c67b2ebb7a20aac9dd1a508df31e2c361c9efeb758dc2f6c51e4d1625cfb53fb39a76ffa4178
+EBUILD apcupsd-3.14.14-r3.ebuild 4307 BLAKE2B e9b718ba8867c06b2a03113012563009be118d68276198a067adbbc6309a92fa08c3266ec440882d9724a8d6c81a8b7ea47d5b362aa8c3b9009e4e288f650f4f SHA512 2dd2aca2949841f2ecec0ec9cd7a7240c97b11ea0f8bc0506a6344a4bc1750aa6750c192ea964d1acd6eb5dae3a3d570eaa25dd62035f36cb32be06f272fe5e3
 MISC metadata.xml 1162 BLAKE2B ff0f026e800ae6f2985d46fdcc2f756e46706b3a1910a3032215996636de9839e0936c5ff88cc7d9e709caf2ad53c9d9b8beca73ca17b8bd4b408c039a0d5696 SHA512 aae2a1aaf01a2412d5e054f8ed93fafb912f8a4cf48d2790615746751091f412f9bf3e19c2d857506ba50ef2a312ad5eec7c2dac770eb0b1130e062af856ab36
diff --git a/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild b/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
index a3e5b6e73c79..492824ced834 100644
--- a/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~riscv x86"
 IUSE="snmp +usb +modbus cgi gnome kernel_linux"
 
 DEPEND=">=sys-apps/util-linux-2.23[tty-helpers(-)]
diff --git a/sys-power/bbswitch/Manifest b/sys-power/bbswitch/Manifest
index 196ffe05fcd3..7075fb47a209 100644
--- a/sys-power/bbswitch/Manifest
+++ b/sys-power/bbswitch/Manifest
@@ -1,5 +1,7 @@
 AUX bbswitch.modprobe 46 BLAKE2B e76506e79adc57bedd68f038293257e7c70f1f3bc924776741e152b7c95c691f5241066b742583af063a4bdde90134005949ce28715d0b8f0c51f59c582223c8 SHA512 a4fa992d66b401e039c995b64ac5f3b2491c3ccf4412e211d50d1e514253f9341dc77a6d8da808f03988735e44a97bb973f3303ed3c0eeed6f4e21794d3545b6
 DIST bbswitch-0.8_p20200526.tar.gz 15869 BLAKE2B cdeaf539a0996f53d3add215fca1127321b7183526a248340177f4320171b92a5ce531eeedfb1da2f0d9f07c6b61e8cfb635a457406e477640f2e7090b29b655 SHA512 487bcd845d1f462e77b5b9e3f304cd28d0ddfd391ecc36de530a3d18d9d4932bc895ed29972e27006b6f3eeb50c37b523ef786a26b6ee75c19fa55288a496d4a
+DIST bbswitch-0.8_p20211129.tar.gz 15889 BLAKE2B f81343529957603734bc29453ae9513eb5e19a87425adb8975c621357c7caa0f353e06367cc186230adb28f75ae48330a58ba904854415bc118c8573f71566a0 SHA512 e7873ae34aed13e8f4d5709fede763552c28528e853ad02ee4a4377c043f1ce2ae5f7fc3e831ea1dc65f5a1c0a5ddded93b451258b539ed72b0e1c196676a677
 EBUILD bbswitch-0.8_p20200526.ebuild 1155 BLAKE2B cf4f4914b11e0d132d7f333bad291e12df6109efbae5a569e20994ea5c8936a4e71754d8e3fffade9d1bd761f4f0a11064e17a9eaf98e2f3ba6127b276f36fbf SHA512 028378100271cf8cbbb61b1cedd1d196e1de3927147c874be16fb6bb69ba8beebb676a93449f354f1f3f4c1e8186c567ebc4d08c30005dc7b3599fdc06c7ec9e
+EBUILD bbswitch-0.8_p20211129.ebuild 1157 BLAKE2B e983acc931af01609cdddfdeb711b0fff8e06cd50053dc8896f59325266cb08df44ddd58d7a7bada2e87129e1d6fa97edfe0e033027d31d73469988c83806ceb SHA512 c1c71a9932d083a262fb9e2404ccac8af366cbc8e50780fe9ceef09707e7dd175287e0a7046075fe263652750875e99b39a4225783ded585859506996248fc44
 EBUILD bbswitch-9999.ebuild 1157 BLAKE2B b6b77f0ecaf7ac94cc370d498929a8597572c9ecabcda1b817d9e4ceb01d5028d2e7d79f3ee0f5020fbe1d7d7a6fedba9e9daa16cbcf48e60b4a062eaa65e800 SHA512 3c7484b57111e6a78236e75a480472f68a68222e02dd763462197424812d301d0d2ada87290f0b226f2f9825fdc3e583809adceac348a8e6c49dd5816fe10e92
 MISC metadata.xml 999 BLAKE2B 9d2751b5928195f96c509147b5f6093a0fb3fd39762fb2c4b4509cde94258f35bada1009dae271b06f376e80a544f976495b8a4610ff9044d7cbd3658d942bde SHA512 d715f175dff0e5d5e34b23c5633469f2cdfbc64796cfb2c88c2fa02c39c6ab23b17d93b727ec900a0edc3bd8dccb09a27e598e8705d30b12e4c0a4ed423c9d42
diff --git a/sys-power/bbswitch/bbswitch-0.8_p20211129.ebuild b/sys-power/bbswitch/bbswitch-0.8_p20211129.ebuild
new file mode 100644
index 000000000000..409b02bf015a
--- /dev/null
+++ b/sys-power/bbswitch/bbswitch-0.8_p20211129.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Bumblebee-Project/${PN}.git"
+	EGIT_BRANCH="develop"
+else
+	COMMIT="23891174a80ea79c7720bcc7048a5c2bfcde5cd9"
+	SRC_URI="https://github.com/Bumblebee-Project/bbswitch/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/bbswitch-${COMMIT}"
+fi
+
+DESCRIPTION="Toggle discrete NVIDIA Optimus graphics card"
+HOMEPAGE="https://github.com/Bumblebee-Project/bbswitch"
+
+SLOT="0"
+LICENSE="GPL-3+"
+IUSE=""
+
+DEPEND="
+	virtual/linux-sources
+	sys-kernel/linux-headers
+"
+RDEPEND=""
+
+MODULE_NAMES="bbswitch(acpi)"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	BUILD_TARGETS="default"
+	BUILD_PARAMS="KVERSION=${KV_FULL} CC=$(tc-getCC)"
+}
+
+src_prepare() {
+	# Fix build failure, bug #513542 and bug #761370
+	sed "s%^KDIR :=.*%KDIR := ${KV_OUT_DIR:-$KERNEL_DIR}%g" -i Makefile || die
+
+	default
+}
+
+src_install() {
+	einstalldocs
+
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}"/bbswitch.modprobe bbswitch.conf
+
+	linux-mod_src_install
+}
diff --git a/sys-power/thermald/Manifest b/sys-power/thermald/Manifest
index 16003335e41f..72879bdefd63 100644
--- a/sys-power/thermald/Manifest
+++ b/sys-power/thermald/Manifest
@@ -4,5 +4,5 @@ DIST thermald-2.4.5.tar.gz 455875 BLAKE2B f080dc065f5a0227cabed8e88d44c85c6e8ac9
 DIST thermald-2.4.6.tar.gz 455905 BLAKE2B 0e3eae24bd4de8f7adc9cb8cc6dec83907d8e8240bec87d752e4502c923e7b407546204af474fe32fa43ba85a60ba51bd3dc6f1ce7cf3a62dd60dc5b0235ed52 SHA512 e337b00ec7f4fa565927f047dbb17dc05b8513850f2488dd6cfc838e5123938fbfe7c39464fffb77c100073edfca9ea51708680eaa2cba537470326df9508d3a
 EBUILD thermald-2.4.3.ebuild 1066 BLAKE2B cd1b730da42dc13c6163a04a2c81df89c1dcf708af8fc1632340692fb0d12048ce02d3a7b76e8cf7a94d1fb73abd48246ef36dc3e058766a3c36ce66a5b8207b SHA512 dd8ec95a533add81a462c1d71496ccfa86acbcd9ca2ef92b881daf9557f73508403397bb91117b33b4975008339ad09cb0fbc67a60bd10a91146d386062aae5b
 EBUILD thermald-2.4.5.ebuild 1068 BLAKE2B effcb26eb7b0a7b0cd8a65d790434cc0d573bfea16b7b18bc4b33766b6eea5ce4856eee918ea6b1b1ebe3f299813eb71ea159b000188a58ffbc77541068efb8f SHA512 91ffe7fe9854aad92e060a8be221d4c8a54096b0e2dfd2a30dd7a8871da994cc8a59fc234aae5c537d8eae64a7f140a3c9ec6b337c73dc8b66026c2bbd97f108
-EBUILD thermald-2.4.6.ebuild 1068 BLAKE2B effcb26eb7b0a7b0cd8a65d790434cc0d573bfea16b7b18bc4b33766b6eea5ce4856eee918ea6b1b1ebe3f299813eb71ea159b000188a58ffbc77541068efb8f SHA512 91ffe7fe9854aad92e060a8be221d4c8a54096b0e2dfd2a30dd7a8871da994cc8a59fc234aae5c537d8eae64a7f140a3c9ec6b337c73dc8b66026c2bbd97f108
+EBUILD thermald-2.4.6.ebuild 1066 BLAKE2B cd1b730da42dc13c6163a04a2c81df89c1dcf708af8fc1632340692fb0d12048ce02d3a7b76e8cf7a94d1fb73abd48246ef36dc3e058766a3c36ce66a5b8207b SHA512 dd8ec95a533add81a462c1d71496ccfa86acbcd9ca2ef92b881daf9557f73508403397bb91117b33b4975008339ad09cb0fbc67a60bd10a91146d386062aae5b
 MISC metadata.xml 644 BLAKE2B 3ef4a9af01d461dcfcb83d7f17c024ee83eaa134e9b63ae00fe37d444ac626626af176581f010a397cb2fd91f00180c268e3e3b7371b454685b48b1ae76a2e93 SHA512 60e724e09ea9e7e21de4db80008b822070e8abd8cc72b9abf1ec4d486aa37fa9283f44bb7fd65a1d10d45e649073c4513cf0d4cad3ed25890b515f1053fbf4fa
diff --git a/sys-power/thermald/thermald-2.4.6.ebuild b/sys-power/thermald/thermald-2.4.6.ebuild
index a482dfef0ff9..b64a17ce7957 100644
--- a/sys-power/thermald/thermald-2.4.6.ebuild
+++ b/sys-power/thermald/thermald-2.4.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/intel/thermal_daemon/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="