gentoo resync : 25.11.2020

6 files changed, 9 insertions, 98 deletions

diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index cb579525d901..cad52f6d359f 100644
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
diff --git a/app-laptop/msi-keyboard/Manifest b/app-laptop/msi-keyboard/Manifest
index 1eac2382151e..4f02fc0ce730 100644
--- a/app-laptop/msi-keyboard/Manifest
+++ b/app-laptop/msi-keyboard/Manifest
@@ -1,4 +1,4 @@
 AUX msi-keyboard-1.0-makefile.patch 506 BLAKE2B 43d593b380383db71fd02b0a8c6378c76b614f90122744d2d776c69f1d16f105de6320a171820f4a19a5b41e61ebe71e501fa8e53e8b058c3424b9702c1a6eae SHA512 2c75593ad02c59950b341d95da5b7d6385614cae8d25519eb2f01ee7b0ca76b88bee5dccef9f34efc0ba496e5052f04aac6b58735446404ce28546d8ddf8c238
 DIST msi-keyboard-1.0.tar.gz 15182 BLAKE2B 4c084e1522da926e541b18d0e59044aeb83873516b3ec5b5bd980883b923acee21842c3612910d84008f66556b6c9e2f9d0c7e588f6aecf242a0e54d72e9c3a3 SHA512 542f74b8eb77db4ef0b26fc5c671bc7446d37b88e13855927d5cdd68c688f933e46b5a377d0f5ec496c1e35694789ae82694d31fc70f04d5059fe60f2ea9d24a
 EBUILD msi-keyboard-1.0.ebuild 532 BLAKE2B abd05b50043a59bfc77f56ace32f05766668faaa875ee1fae6950d18872e2d5d1d8ecb1f480318f199bbc452446ee5ab275c864cb74b657c57541a1342ea46df SHA512 e1da804f019d48395724fda98a2dd3621c00efe4315e0d1802588e29aabb5657766ffefff186c7b2ca68c6eaba5597788fe7bff8763907bbad5ee84fd2d084e4
-MISC metadata.xml 168 BLAKE2B 95e3160d1d6abb3e5510581fe45ddcd9ad526f89bbc0d3ad226e2782d148a0c71e50426809a87fb45e6fc9356e597a1d271002764caebc79be8846301eb82d5e SHA512 5edd6cda32972ff5e53cf5f883928bd1887b4a45572657f99101284a909ea04ff906b8f4068d247d1b3367bde813dbb37ba11565aaff880d9b500685b0f5a33d
+MISC metadata.xml 341 BLAKE2B 6a76dc7caa6869f96d10087412f04b6e951af45125bccb7e8fe96a634d649339f71cab41e384cab224285e8b7433b68256cb43ae1a15af335d6dbf51b1365cf6 SHA512 04a91fcb9f8d5b46fa91a2a777839a6cb12df692866114529344c5f017de0a460dde4a88cfdf3572e7d60c06e9b2b45f2a5b373be5c5d898d4e69cedc4597729
diff --git a/app-laptop/msi-keyboard/metadata.xml b/app-laptop/msi-keyboard/metadata.xml
index 585b0dc75dda..5c41b33f0a4b 100644
--- a/app-laptop/msi-keyboard/metadata.xml
+++ b/app-laptop/msi-keyboard/metadata.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	</pkgmetadata>
+	<maintainer type="person">
+		<email>zohran.londais@gmail.com</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-laptop/tpacpi-bat/Manifest b/app-laptop/tpacpi-bat/Manifest
index 563daea132fa..97e9a4a8b443 100644
--- a/app-laptop/tpacpi-bat/Manifest
+++ b/app-laptop/tpacpi-bat/Manifest
@@ -1,6 +1,4 @@
-AUX tpacpi-bat.confd.0 587 BLAKE2B 642637e9dfa6473e78cf9426d89132b1ec77cac9e02cf2db6764d4de59f25e5eaf2ec18a2f87d37c90af433a6760b522dc4a0556f3b6f74d9a27a884f278fb53 SHA512 a2131a32123e649cd5958aea67d4c96a9bd35ba19bc2c5eef794be7f7e386085e0eb825517783999d6da7abd025b004e357daa024f39d71ea6f653b4ed934271
 AUX tpacpi-bat.confd.1 668 BLAKE2B 88ebd00838e2ed0febbd1321e2ab13dfc4bea292f3f7f665b045370b960d5c462e1d4c139dfbf1061d1692d7acf79b8b794f3c51d4c3e626c9ca7ef515fc6c78 SHA512 570824184f85e9f4b687e67131165671389b836d94f15edbd4bd14c77b0c6546c2991da25bc0172ccdee03cc8c0ad82c378e982e147334e9cb83334d0382038b
-AUX tpacpi-bat.initd.1 1498 BLAKE2B 31af866602be78366e7ff967424929f630e9b28fd7c313b707f36c77b86010781203b95c2cc7977fda41378b34f12c80f150b3126774ec0499d148643c35f850 SHA512 1e06d2f4c4356f97c40752d532ea448db9ca39186028bddbe58125fce0e236ed3abd262621c16152b8c44ff24a160c62a51097a37c02dba191403ec71ee005ac
 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
diff --git a/app-laptop/tpacpi-bat/files/tpacpi-bat.confd.0 b/app-laptop/tpacpi-bat/files/tpacpi-bat.confd.0
deleted file mode 100644
index 94da0a3eb12a..000000000000
--- a/app-laptop/tpacpi-bat/files/tpacpi-bat.confd.0
+++ /dev/null
@@ -1,15 +0,0 @@
-# /etc/conf.d/tpacpi-bat: config file for /etc/init.d/tpacpi-bat
-
-# use '/etc/init.d/tpacpi-bat info' at any time to check the thresholds
-# currently used by the driver
-
-# default thresholds for '/etc/init.d/tpacpi-bat start'
-TPACPI_BAT_THRESH_START="30"
-TPACPI_BAT_THRESH_STOP="85"
-# values to be used for '/etc/init.d/tpacpi-bat low'
-TPACPI_BAT_LOW_THRESH_START="${TPACPI_BAT_THRESH_START}"
-TPACPI_BAT_LOW_THRESH_STOP="${TPACPI_BAT_THRESH_STOP}"
-
-# values to be used for '/etc/init.d/tpacpi-bat high'
-TPACPI_BAT_HIGH_THRESH_START="95"
-TPACPI_BAT_HIGH_THRESH_STOP="99" #see bug #485526
diff --git a/app-laptop/tpacpi-bat/files/tpacpi-bat.initd.1 b/app-laptop/tpacpi-bat/files/tpacpi-bat.initd.1
deleted file mode 100644
index d9f5de7fb3dd..000000000000
--- a/app-laptop/tpacpi-bat/files/tpacpi-bat.initd.1
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/sbin/openrc-run
-# Copyright (C) 2012-2016 Christoph Junghans <junghans@gentoo.org>
-#
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-extra_started_commands="low high info"
-
-BATS="1"
-
-depend() {
-	after modules
-}
-
-start() {
-	local state1
-
-	ebegin "Making sure that module 'acpi_call' is loaded"
-	modprobe acpi_call
-	state1=$?
-	eend ${state1}
-
-	[ "${state1}" -ne "0" ] && return 1
-
-	ebegin "Starting ${SVCNAME}"
-	set_all ${TPACPI_BAT_THRESH_START} ${TPACPI_BAT_THRESH_STOP}
-	eend $?
-}
-
-stop() {
-	einfo "Nothing required to be done to stop ${SVCNAME}"
-}
-
-require_started() {
-	if ! service_started; then
-		"${RC_SERVICE}" start || return $?
-	fi
-}
-
-high() {
-	require_started
-
-	einfo "Switching ${SVCNAME} to high thesholds"
-	set_all ${TPACPI_BAT_HIGH_THRESH_START} ${TPACPI_BAT_HIGH_THRESH_STOP}
-}
-
-low() {
-	require_started
-
-	einfo "Switching ${SVCNAME} to low thesholds"
-	set_all ${TPACPI_BAT_LOW_THRESH_START} ${TPACPI_BAT_LOW_THRESH_STOP}
-}
-
-set_all() {
-	local tstart=$1
-	local tstop=$2
-	local bat
-
-	for bat in ${BATS}; do
-		ebegin "  setting thresholds for ${bat}: $tstart $tstop"
-		/usr/bin/tpacpi-bat -s startThreshold ${bat} ${tstart}
-		/usr/bin/tpacpi-bat -s stopThreshold ${bat} ${tstop}
-		eend $?
-	done
-}
-
-info() {
-	local tstart
-	local tstop
-	local bat
-
-	require_started
-
-	for bat in ${BATS}; do
-		tstart=$(/usr/bin/tpacpi-bat -g startThreshold ${bat})
-		tstop=$(/usr/bin/tpacpi-bat -g stopThreshold ${bat})
-		einfo "Battery ${bat}: ${tstart} ${tstop}"
-	done
-}