gentoo resync : 22.01.2021

17 files changed, 65 insertions, 258 deletions

diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 9bf3103adb6a..678f2699bc73 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/acpi_call/Manifest b/sys-power/acpi_call/Manifest
index d7a688ae2040..ff38d9daeb3b 100644
--- a/sys-power/acpi_call/Manifest
+++ b/sys-power/acpi_call/Manifest
@@ -1,12 +1,4 @@
-AUX acpi_call-1.1.0-linux-3.17.patch 607 BLAKE2B 1b253abd5a3a8124637313ddf44eba179011f96def5a2127b3fd4da0270ccd2c4d55947b8de3c1760b60d7c40797ffc66337b8041ac6bc685d861347c94179c3 SHA512 dec605256d0eab24542e550abec19ba64bc49c58ab84f23593f1cd835cd0db8e2da89fa7020881501ef7a4f4a00dc04c116f77fc70e0c1036554055272ed2137
-AUX acpi_call-1.1.0-linux-4.12.patch 315 BLAKE2B 49c7e3145e367169ac028dbc854659b3f7826eb494e15f54c2432f7d33f7796168145fdeade2051cd450504efd3ca50c6dd6deaee21291e8b97355a9406c299d SHA512 ce8d7c04508eb396c8633376cf21dcbfb9b7ec6110143666300ab66e1d30563b4e687d07a86dfe92566dd8be47ac43f295e7244317bdc12449b6426048edac4f
-AUX acpi_call-1.1.0-linux-4.14.patch 317 BLAKE2B f1d5067511174466d551e9747f7160c12eff6e6a83473c98b51baf80206c2b8e5045ab2c2085451794b8ccc1fe6820c7bfa38de9c280cdb248971f965d64bab8 SHA512 3c823712a59b0bf739fe06cc5dffe6b895ff869dd78457615452a13ef810976a27b7a9ef5bf61189135b8d278e2df340199f36e8016d6e90b040317d468b9b39
-AUX acpi_call-3.17-linux-4.12.patch 256 BLAKE2B ed94570d4e815c92ec5228ef5d6caefe55649902105cf071c4c1c83fa8b2240b9ace2c25c6a66528a50be0998aaf17b16e83a254b87de4b77365497a3f1a2b5d SHA512 49c12db4eefa721599096947faadc48e328f5d3a37eba5ee6f833124e228632e2cc0a871d7ee8427c1e798a1adf67df75674061c2cc6c05ffca1a3b02cffd742
-AUX acpi_call-3.17-linux-4.14.patch 341 BLAKE2B 8402c22a3f016f8b2b00805f6ce1db3b3a6005e4ce83ee43764ef248eaa5b49ba368b9dcb11ca923dd84f1bede7a1c39d64f72a09f882e53d2f3e59c1fa9e1a3 SHA512 d49ab94daf00cad83226060d8b884ba00f1d970fc1f3872ef5f47ef3ff657dc6f4d7d6656b76f8a685f6b865fb1b4d338f96f16cada5672f0e9560d6c0565dab
-AUX acpi_call-3.17-linux-5.6.patch 1002 BLAKE2B ac5ddd5a3375aff549117cb0410d1a3d0468e07f11eb9456b89809e2d6481ab0f63a33d4b5447a8de868ee3aa3b908ea1530b2ba59a9f551c59a5839f46b8220 SHA512 31aba84449ea18511914c7bc05124cbeefbb51ce34736b84b0bf83bf7f6ab9dc3d6df74e2f87ac09d7a6117f9839573b6602c0f94e8b56184af7695d9a4db389
-DIST acpi_call-1.1.0.tar.gz 10470 BLAKE2B 000c5e6f1eb968bdea3d8dfb6d6bf7b18daffe8baa75ff32e8c6c4b98cafe0a72a67a65a17994a1c8efa16f528bdfbf2b27686a146730c319a5195dfa9ec0d51 SHA512 d5cf13c15f9057e3a27aaacfee6dcdb17b6a79194bdc8fd57b8140c07a532e2e58151bea881aa158c1183ac3bbe89f83fcfc2279ffd9e945a72331b6ddbf2c70
-DIST acpi_call-3.17.tar.gz 10470 BLAKE2B e1a4912f4b92532aa8496e668541975b7e563dfd7613d41f33503d5eecad786b84ba98b205f27c4a4fbd3b37b034a467cf7c9a73f2995539d2117f50751df682 SHA512 39f8f924995ba4e5490e93f03c33db083ced224699b1028102294b2cc99edebd1eea04d33b50beed9dea86939c124682ef8d013c990d5611471b104be3200cb1
-EBUILD acpi_call-1.1.0-r5.ebuild 832 BLAKE2B fa8a5377ffd2d5e7f9b2b2ac86b1709c5630f6720023e73a6bf598962a7b63011b75d94e25a108c216a6121e92918217c527d638fcdceca7d3af48ff9d136e67 SHA512 a29a162870bacf966f8036fd2c079803ad2037798c5ee9b06dcf1f5e550cbdfc4387538a477ad90d5a7fc7a98d407e6575287146e77cc2628b3236cb7123b201
-EBUILD acpi_call-3.17-r2.ebuild 808 BLAKE2B 35076a597e1fc879b8d11d0a121cd01a43c8fdb6774c00de9eb9b32ebe3a58130fd3b207af8fd7fe54fa70005c7a5c0567d705aeaad95fb3ab1f0c9b8f0276f4 SHA512 1e9e521ea51e0ebc9863d963dea0310d34ad1a47afa23eca29cf7c8492347799ae73d21881c61836b80c29e5faa92c8ef7de3689a530ef87a7614a2efd23ee5e
-EBUILD acpi_call-9999.ebuild 685 BLAKE2B c562b75f62f68ebf5df42851fd8d330aaa86416dfa1fcf695ae278e15890505dbdb2cb463afd18e4c38eb721a4d37613488c92427c727f0115cdbc3ed9814414 SHA512 fec83bf1b8af54c3c0f0dc66ed373da4d6f40ec97ccaaa2d85b4e069d9ad4ae34af5c41db9369881f5d0cd6be46683e0d29decd81c2e88a8b7a001eb00807a16
-MISC metadata.xml 304 BLAKE2B e9ebd649d5b044096dfa71d43332fb12c6577abdff31ae880ab30f7d5bf83e244afa2a57d9ca135b5378dae1c45f7b8422c08caf24e5c0a604f76c3fe1774e01 SHA512 024d05a8863a152a45a50bc42018182781d46b83c0b83dc24f844909432f7a90c2e041a6aca6b57932a773082749639500e6a8a9823fcb64b54705cb753801ce
+DIST acpi_call-1.2.1.tar.gz 12340 BLAKE2B e113f8c150c8e2f4f75ca1dd81cc4399f24bedcd716c9158561e8cb9f5e63e77cade18e6543ade4ec383690bf7041a583e297948789773db8ad9b63a957e61e8 SHA512 91553cf70a6b0173a6bfec38fcfb62ecd17614c91a888933704bb57d788592ce6981b01fb7c5e4bb8efdbe7fe229860c9f2be4b549dd71b232704c8bf0b3cfee
+EBUILD acpi_call-1.2.1.ebuild 696 BLAKE2B 1be076aa6f346966a56ed82e46029949510b3359e9cea3d23cd7ab4badc088f2ab7e7531702d27cb644e06dbe1556dd09f876fca28f2ab538cb7623ba22f5e88 SHA512 93b59851ff940a0f3231590b5afc608acc2f8f91cea627963ef551fbc82f5e554f4bdc46257fcb51b41a1eb005c28cc89e060fcc70373dd7985720e11cf8a81a
+EBUILD acpi_call-9999.ebuild 670 BLAKE2B 02dd23b77eb28cf9425e3039c61f594a044c0dd7bd4ded1c91d70bb2a970e0b7b5adebe4c6ead52ec3fdabeae1ff5bb69c5cb980d452804e1966ed6c2d510a63 SHA512 7ee0c7e030b5494c94b4e74c85c29bb31a579db2f9a3bb67e0c5ca4edd3da5511a6aba1a8ee78ab430440a58a23ea1e3afc8e8b0f5bdaae1738c77c29aaf626f
+MISC metadata.xml 409 BLAKE2B 83af55b1f34e736097e70109b4e6f42929a25104f8d26c75ddce26d33a68669add53a47854a817ba3b5201743f02f25e5e23309efa5463752c6cc0b52f31eeaa SHA512 d1a9ecd438eaf4f7e19bb224c4d86dae71ba3bf42f9f4cdab63dbe8246228c2ed348988ed1cde0dc418c6a952264ba8be0940555c63ac270116ca2aba4988c48
diff --git a/sys-power/acpi_call/acpi_call-1.1.0-r5.ebuild b/sys-power/acpi_call/acpi_call-1.1.0-r5.ebuild
deleted file mode 100644
index 4dd39fb95a87..000000000000
--- a/sys-power/acpi_call/acpi_call-1.1.0-r5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info linux-mod
-
-if [ "${PV}" = "9999" ]; then
-	inherit git-2
-	EGIT_REPO_URI="https://github.com/mkottman/acpi_call.git"
-	KEYWORDS=""
-else
-	inherit vcs-snapshot
-	SRC_URI="https://github.com/mkottman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="A kernel module that enables you to call ACPI methods"
-HOMEPAGE="https://github.com/mkottman/acpi_call"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-CONFIG_CHECK="ACPI"
-MODULE_NAMES="acpi_call(misc:${S})"
-BUILD_TARGETS="default"
-
-PATCHES=(
-	"${FILESDIR}/${P}-linux-3.17.patch"
-	"${FILESDIR}/${P}-linux-4.12.patch"
-	"${FILESDIR}/${P}-linux-4.14.patch"
-)
-
-src_compile() {
-	BUILD_PARAMS="KDIR=${KV_OUT_DIR} M=${S}"
-	linux-mod_src_compile
-}
diff --git a/sys-power/acpi_call/acpi_call-1.2.1.ebuild b/sys-power/acpi_call/acpi_call-1.2.1.ebuild
new file mode 100644
index 000000000000..781cbf2fc3af
--- /dev/null
+++ b/sys-power/acpi_call/acpi_call-1.2.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info linux-mod
+
+DESCRIPTION="A linux kernel module that enables calls to ACPI"
+HOMEPAGE="https://github.com/nix-community/acpi_call"
+SRC_URI="https://github.com/nix-community/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples"
+
+BUILD_TARGETS="default"
+CONFIG_CHECK="ACPI"
+MODULE_NAMES="acpi_call(misc:${S})"
+
+src_compile() {
+	BUILD_PARAMS="KDIR=${KV_OUT_DIR} M=${S}"
+
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+
+	if use examples; then
+		insinto /usr/share/acpi_call
+		doins examples/*.sh
+	fi
+}
diff --git a/sys-power/acpi_call/acpi_call-3.17-r2.ebuild b/sys-power/acpi_call/acpi_call-3.17-r2.ebuild
deleted file mode 100644
index 87ae13124e96..000000000000
--- a/sys-power/acpi_call/acpi_call-3.17-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info linux-mod
-
-HOMEPAGE="https://github.com/teleshoes/acpi_call"
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/teleshoes/acpi_call.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/teleshoes/acpi_call/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="A kernel module that enables you to call ACPI methods"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-BUILD_TARGETS="default"
-CONFIG_CHECK="ACPI"
-MODULE_NAMES="acpi_call(misc:${S})"
-
-PATCHES=(
-	"${FILESDIR}/${P}-linux-4.12.patch"
-	"${FILESDIR}/${P}-linux-4.14.patch"
-	"${FILESDIR}/${P}-linux-5.6.patch"
-)
-
-src_compile() {
-	BUILD_PARAMS="KDIR=${KV_OUT_DIR} M=${S}"
-	linux-mod_src_compile
-}
diff --git a/sys-power/acpi_call/acpi_call-9999.ebuild b/sys-power/acpi_call/acpi_call-9999.ebuild
index ba87b06a3dcf..ba449334ffc0 100644
--- a/sys-power/acpi_call/acpi_call-9999.ebuild
+++ b/sys-power/acpi_call/acpi_call-9999.ebuild
@@ -1,24 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit linux-info linux-mod
+inherit git-r3 linux-info linux-mod
 
-HOMEPAGE="https://github.com/teleshoes/acpi_call"
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/teleshoes/acpi_call.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/teleshoes/acpi_call/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
+DESCRIPTION="A linux kernel module that enables calls to ACPI"
+HOMEPAGE="https://github.com/nix-community/acpi_call"
+EGIT_REPO_URI="https://github.com/teleshoes/acpi_call.git"
 
-DESCRIPTION="A kernel module that enables you to call ACPI methods"
-
-LICENSE="GPL-2"
+LICENSE="GPL-3+"
 SLOT="0"
+KEYWORDS=""
+IUSE="examples"
 
 BUILD_TARGETS="default"
 CONFIG_CHECK="ACPI"
@@ -26,5 +20,15 @@ MODULE_NAMES="acpi_call(misc:${S})"
 
 src_compile() {
 	BUILD_PARAMS="KDIR=${KV_OUT_DIR} M=${S}"
+
 	linux-mod_src_compile
 }
+
+src_install() {
+	linux-mod_src_install
+
+	if use examples; then
+		insinto /usr/share/acpi_call
+		doins examples/*.sh
+	fi
+}
diff --git a/sys-power/acpi_call/files/acpi_call-1.1.0-linux-3.17.patch b/sys-power/acpi_call/files/acpi_call-1.1.0-linux-3.17.patch
deleted file mode 100644
index 0db7d37e2fa6..000000000000
--- a/sys-power/acpi_call/files/acpi_call-1.1.0-linux-3.17.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c5b7a4bf93a28e6ce68beb54b48d3745db943e54 Mon Sep 17 00:00:00 2001
-From: Christoph Junghans <junghans@gentoo.org>
-Date: Mon, 27 Oct 2014 21:57:10 -0600
-Subject: [PATCH] fix build with linux-3.17
-
-https://bugs.gentoo.org/show_bug.cgi?id=524614
----
- acpi_call.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/acpi_call.c b/acpi_call.c
-index 3025d97..fa4f2c6 100644
---- a/acpi_call.c
-+++ b/acpi_call.c
-@@ -6,7 +6,7 @@
- #include <linux/proc_fs.h>
- #include <linux/slab.h>
- #include <asm/uaccess.h>
--#include <acpi/acpi.h>
-+#include <linux/acpi.h>
- 
- MODULE_LICENSE("GPL");
- 
--- 
-2.0.4
-
diff --git a/sys-power/acpi_call/files/acpi_call-1.1.0-linux-4.12.patch b/sys-power/acpi_call/files/acpi_call-1.1.0-linux-4.12.patch
deleted file mode 100644
index ef9fde9f2958..000000000000
--- a/sys-power/acpi_call/files/acpi_call-1.1.0-linux-4.12.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- acpi_call-1.1.0.orig/acpi_call.c	2017-07-03 22:44:38.111270788 +0200
-+++ acpi_call-1.1.0/acpi_call.c	2017-07-03 22:44:31.010270815 +0200
-@@ -6,6 +6,7 @@
- #include <linux/proc_fs.h>
- #include <linux/slab.h>
- #include <asm/uaccess.h>
-+#include <linux/uaccess.h>
- #include <linux/acpi.h>
- 
- MODULE_LICENSE("GPL");
diff --git a/sys-power/acpi_call/files/acpi_call-1.1.0-linux-4.14.patch b/sys-power/acpi_call/files/acpi_call-1.1.0-linux-4.14.patch
deleted file mode 100644
index f69561637344..000000000000
--- a/sys-power/acpi_call/files/acpi_call-1.1.0-linux-4.14.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- acpi_call-1.1.0.orig/acpi_call.c	2017-11-24 22:30:59.000000000 +0100
-+++ acpi_call-1.1.0/acpi_call.c	2017-11-24 22:30:01.000000000 +0100
-@@ -5,7 +5,6 @@
- #include <linux/version.h>
- #include <linux/proc_fs.h>
- #include <linux/slab.h>
--#include <asm/uaccess.h>
- #include <linux/uaccess.h>
- #include <linux/acpi.h>
diff --git a/sys-power/acpi_call/files/acpi_call-3.17-linux-4.12.patch b/sys-power/acpi_call/files/acpi_call-3.17-linux-4.12.patch
deleted file mode 100644
index ac64ba5efaf3..000000000000
--- a/sys-power/acpi_call/files/acpi_call-3.17-linux-4.12.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/acpi_call.c b/acpi_call.c
-index 35bfe12..c059511 100644
---- a/acpi_call.c
-+++ b/acpi_call.c
-@@ -7,6 +7,7 @@
- #include <linux/proc_fs.h>
- #include <linux/slab.h>
- #include <asm/uaccess.h>
-+#include <linux/uaccess.h>
- 
- MODULE_LICENSE("GPL");
- 
diff --git a/sys-power/acpi_call/files/acpi_call-3.17-linux-4.14.patch b/sys-power/acpi_call/files/acpi_call-3.17-linux-4.14.patch
deleted file mode 100644
index ddea4fafc695..000000000000
--- a/sys-power/acpi_call/files/acpi_call-3.17-linux-4.14.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/acpi_call.c b/acpi_call.c
-index c059511..b622bf7 100644
---- a/acpi_call.c
-+++ b/acpi_call.c
-@@ -6,7 +6,9 @@
- #include <linux/version.h>
- #include <linux/proc_fs.h>
- #include <linux/slab.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
- #include <asm/uaccess.h>
-+#endif
- #include <linux/uaccess.h>
- 
- MODULE_LICENSE("GPL");
diff --git a/sys-power/acpi_call/files/acpi_call-3.17-linux-5.6.patch b/sys-power/acpi_call/files/acpi_call-3.17-linux-5.6.patch
deleted file mode 100644
index c05c7e3c337e..000000000000
--- a/sys-power/acpi_call/files/acpi_call-3.17-linux-5.6.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From d128d10c5f1554254ce55f3c79ca08390279d628 Mon Sep 17 00:00:00 2001
-From: "Jason A. Donenfeld" <Jason@zx2c4.com>
-Date: Sun, 8 Mar 2020 13:04:55 +0800
-Subject: [PATCH] Support newer proc_ops interface for 5.6
-
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
----
- acpi_call.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/acpi_call.c b/acpi_call.c
-index 801798b..65eb344 100644
---- a/acpi_call.c
-+++ b/acpi_call.c
-@@ -348,11 +348,18 @@ static ssize_t acpi_proc_read( struct file *filp, char __user *buff,
-     return ret;
- }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)
- static struct file_operations proc_acpi_operations = {
-         .owner    = THIS_MODULE,
-         .read     = acpi_proc_read,
-         .write    = acpi_proc_write,
- };
-+#else
-+static const struct proc_ops proc_acpi_operations = {
-+        .proc_read  = acpi_proc_read,
-+        .proc_write = acpi_proc_write,
-+};
-+#endif
- 
- #else
- static int acpi_proc_read(char *page, char **start, off_t off,
--- 
-2.25.1
-
diff --git a/sys-power/acpi_call/metadata.xml b/sys-power/acpi_call/metadata.xml
index 64e830cdff96..56373b80bb10 100644
--- a/sys-power/acpi_call/metadata.xml
+++ b/sys-power/acpi_call/metadata.xml
@@ -2,9 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>maksbotan@gentoo.org</email>
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">teleshoes/acpi_call</remote-id>
+		<bugs-to>https://github.com/nix-community/acpi_call/issues</bugs-to>
+		<remote-id type="github">nix-community/acpi_call</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-power/bbswitch/Manifest b/sys-power/bbswitch/Manifest
index 50b0b1ddd502..24a3b335a3b0 100644
--- a/sys-power/bbswitch/Manifest
+++ b/sys-power/bbswitch/Manifest
@@ -5,4 +5,4 @@ DIST bbswitch-0.8.tar.gz 15800 BLAKE2B d9a16d2ca8baebcbc7ad1d8c1daeb9822ed4ea797
 EBUILD bbswitch-0.8-r4.ebuild 1058 BLAKE2B 73a1b0f973f4775c794a6aa1065d04b6a64d1baa11ea16c0f3f303c9dfeca94d9e675f0fab7c3f2f481167958f1f9ca92194b264e2418968ca29ec36b4efb6b2 SHA512 2c00a60517b571aceaad6a49ab3c9a43b4d107acad2bf76e4c08dca432578c2c6d3b4610419a10ba417f8527ecaa7c30692d2685c00cbcc297f50f75c481b7f0
 EBUILD bbswitch-0.8-r5.ebuild 1135 BLAKE2B ddb38409e9e6222deaf4fabe96b19ec744cfd8a7d6c94a8d3bd66996c1a6e87b19a69a2313a549fac3995743e0c9c38b9146eae7e07b79230a37588bedb056b0 SHA512 fde0d208777d494e3f8f8deacf5fc63185c16caaf2ff5e5f240faf51554b3ea08690275a208d2b4d248514050bb3a9e72a8ef9da167b57a5c932c296b68f188e
 EBUILD bbswitch-9999.ebuild 1137 BLAKE2B f76f3505d8f64c195dfe5cd9335ae9e49ccb1e8500f203899122016605505d37a84a03e202115a65d94855b93a34954d71d0344b81c9b3260d11347e0a63222f SHA512 32a0912adbca5994fb59ead90815d4b6c66fa2c6968a8f23d668a49e0d1b402a81481ffdf4c929ae6d62b4601e677ed99b21e80e5318cf5235a69f2782fa5c38
-MISC metadata.xml 862 BLAKE2B b9cde1fc00008511f7041373cc6ce62d1857987f236a0d86eb1a4eb9b4703bb2284f45ea7d03c901177e1354126e076f28d5f6f9f28e9da1b9afcb48f90f5dac SHA512 ab056cdc492303449c7cc9e54165efc9f41f237ee8645ea6dea6f71270500b5ddbab05e49faabcdbb54a0c0d39d57751e9b8bf63e5f70364465b17f5a6169838
+MISC metadata.xml 966 BLAKE2B 096cb37170595f2e45b77f655a6b7ba536ca03eec125f079ec5b461e3cf32b0ca1abc3c8729ef115d578d1f22a4022f5b765c346a63b6c02a5395c453256e4af SHA512 0196cceb9865cffdf0bc640004d08782001cf914e4e2f300b84056edd11d4a94d04abb756dd11e07fd231ff7b4f920191038746486316438f5b2ea3432b2ba3f
diff --git a/sys-power/bbswitch/metadata.xml b/sys-power/bbswitch/metadata.xml
index 064e91c9f00b..8ee153cee09c 100644
--- a/sys-power/bbswitch/metadata.xml
+++ b/sys-power/bbswitch/metadata.xml
@@ -6,6 +6,10 @@
 		<name>NP-Hardass</name>
 	</maintainer>
 	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+		<name>Pacho Ramos</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>mva@gentoo.org</email>
 		<name>Vadim Misbakh-Soloviov</name>
 	</maintainer>
diff --git a/sys-power/thermald/Manifest b/sys-power/thermald/Manifest
index 1cadc575bb27..564c5758a7e0 100644
--- a/sys-power/thermald/Manifest
+++ b/sys-power/thermald/Manifest
@@ -1,8 +1,6 @@
 AUX thermald 374 BLAKE2B 2ea9775b75acb7797c078c8c7786d442bd9c98102cd53073e1c040a0972dfd6be8424a62889a666573ee72ce5273bc53169fae5762bc0005a1c899324a699d27 SHA512 17f1c2133e47e897c4a5407ef622adfebb8498fce7ea9bf17cfd177269a3d869bdc21c3d2558010e9669ddc53e69e521bb4c1e112c51010168aa3c074c259e02
-DIST thermald-2.2.tar.gz 435659 BLAKE2B 500189b924594e5b1d68adc776b3ad0c1d531d4259c65dd77f9166648c9b4273c52e1f8222254ec6500b3d37e39deb4ec862443728d50e9be95dee8e43496645 SHA512 f2c691061436699aef5bb7d9681370306dc7a64c453208911077c9a4af50e35b32247fc0a35853bb314d0e4289dd07f6116a3ade7fa278b521ed9b7b13db949b
 DIST thermald-2.3.tar.gz 452790 BLAKE2B caef87d670b14bfa0dbe6ca4873ebea4b0a9960a9bad48ddb10abb348e25cafdbdf5dad831a1c3ad38e71ab61d7f123df99046dec1e5ce2c32be506bc4b1312f SHA512 0d722c35e3638bb917994b8a123e1226b737b120f0946cfc604eb3bb4bd501121b1f196833f8cb3aceee73a8bb3566ef1d176d81143b84423f89d20966e91ed8
 DIST thermald-2.4.1.tar.gz 455735 BLAKE2B ee4d6bc590bc50639c0b19adbba7e243358174a837b2ff155dea060b1cd09171d4fb77b18b785dc9f64a633f680358cb1d7b36e3bd438e5267e0a0a27e18497e SHA512 2dab7d57e028037208034ab4be95dc138ce028d4a47a0151c69816e1502065d801d52990641544b5d246144e654c15c663fa78af6cea094cf9a107f2fb29c1ef
-EBUILD thermald-2.2.ebuild 922 BLAKE2B d5481f4bf46b429ce06e194fab8665d7edc46ec73c15ca16479b33455fc6d71f51c204e01cadbfe39dd970f386168c4ec33d1b8edbc8e74fbd31d5830e5f2c1d SHA512 3f4bef46cf1ec58ee2da8f243102ef7710efde6357d60e150d4ada0310111d49a7c176e844799b9763d33ef484dae84db60261fd9b269b09ae2f0caf21073450
 EBUILD thermald-2.3-r1.ebuild 1175 BLAKE2B db3921e80b361f3cffdfb0c862d082c72d9a5667e0db3e1a63d3b37a92ae7125be057f8cb21821db550c1edcd12735061220ab6b973cb0635a4e078dd3413f34 SHA512 183d32830b88b78bebd1c3fd546cb42a9b39ee61a1711cfe9b15aa1b1bc04be7955ff0c5d98af3cd23fdb473258075868d0f4959872b99d5a6c0c987120b57da
 EBUILD thermald-2.4.1.ebuild 1161 BLAKE2B 3268fe644270fab7c48a53134eeee51ad33d8abd782bae5d41714c34d1a99a57d7ed4091b32f180c7b49f957ecdeaf945d8e9c955bc20c57d90b718e3a7fc6b1 SHA512 56e5375a288cd3ca46e275e8912c7bc76011b0a7a4c73b1816fadd30a374564573ce1e0efffdc85f39c296248d9ff46c1ca6f1e42b903517484f59831e509f4c
 MISC metadata.xml 643 BLAKE2B 92fe71631920f61dd6667c2dc8b4e27d2ea1e9bfb64509a9b4a9b0a72e9b4a11b7ae06febf120564c28272b9e079cf71a114bca620ce2651ec615439dd5ff9b3 SHA512 bad363023e01da0232632d54b2cb65dce89a7c70441f05fc873640a29f6fd4ec4ea30b00f94f723a786de1eef87b94673dad455102bc57a11573346e3a8ae2e8
diff --git a/sys-power/thermald/thermald-2.2.ebuild b/sys-power/thermald/thermald-2.2.ebuild
deleted file mode 100644
index fefc84b2d488..000000000000
--- a/sys-power/thermald/thermald-2.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic out-of-source systemd
-
-DESCRIPTION="Thermal daemon for Intel architectures"
-HOMEPAGE="https://01.org/linux-thermal-daemon"
-SRC_URI="https://github.com/01org/thermal_daemon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/dbus-glib:=
-	dev-libs/glib:=
-	dev-libs/libxml2:=
-	sys-apps/dbus:="
-DEPEND="${RDEPEND}
-	dev-util/glib-utils"
-
-S=${WORKDIR}/thermal_daemon-${PV}
-DOCS=( thermal_daemon_usage.txt README.txt )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-my_src_configure() {
-	# bug 618948
-	append-cxxflags -std=c++14
-
-	ECONF_SOURCE="${S}" econf \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-}
-
-my_src_install_all() {
-	einstalldocs
-
-	rm -rf "${ED}"/etc/init || die
-	doinitd "${FILESDIR}"/thermald
-}