gentoo resync : 28.04.2021

25 files changed, 97 insertions, 258 deletions

diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index 23b9bb98e29c..0f75a5575708 100644
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
diff --git a/app-laptop/hdapsd/Manifest b/app-laptop/hdapsd/Manifest
index 05418c9ff662..4211834f4d07 100644
--- a/app-laptop/hdapsd/Manifest
+++ b/app-laptop/hdapsd/Manifest
@@ -1,5 +1,5 @@
 AUX hdapsd.conf-20141024 739 BLAKE2B ebd52e9bc5d4849b842cb579ca4ea0892227c94c483d9ec0b9b1dbcf975bfdfb0079460a29dedb6e60236cf9a37814efdd900c6e8c8d4791deb2e81f37dfbbd6 SHA512 e03c7f02af2789a784284f10eed10e10edb82e2ad16d3794299cc9622c00a047f30df7f7d553ef572e265815684d1e783932e0f3b219cca44f0e1f74dc045944
 AUX hdapsd.init-20141024 2177 BLAKE2B c790b9899ca67ecee13a3af54dc821020f551ec35e94866328e28b00ea79eb2f8ba88e618d6b1d854add6024abb75f7fdc1393bfff853f16e2ab4bfb16e03799 SHA512 e45b7e6fafd047c6fe7b172ad552c23b0000b90099a9a12e5a09133258e90d5f121bfa5e8a638f1dcd35110e54fc1da2462cdd501ebb65878286f623c7baa6dc
 DIST hdapsd-20141203.tar.gz 128818 BLAKE2B 0219e30e032032dfd729e97f526eb7402fe4cb72245589ef03cca28f75a6e1f2cbfa55c5aa5599b24f496bbe662467077415fbec47caa1db17d6108e07292daa SHA512 19c1a8b362f15864b71f4fb221c0993b43b3b2d965d5826af06fb9f6b0e345e5da99181493e13e230c7fe77060ae5b373027e8ec90a511566a6ccaef43998178
-EBUILD hdapsd-20141203-r1.ebuild 2159 BLAKE2B 9f6a089e3495fb1568c1799f26d6329c3bf9b88e76bbb277f45fa093ff058aaaf0c7ddb02f0c7c0b5823884528319a7469d07786fe20e93c29fef1e3f708c547 SHA512 37efbeab2f59de16efcb530cd95a54a6331aa6c7ce314fa587b30ad3a23505bee2f339900cc8c4bc6c122faaedc1bb99387868d5c63ac47e84a9100b755e67ff
+EBUILD hdapsd-20141203-r2.ebuild 2183 BLAKE2B ebbebdd87b20ed6a4681d1b270ba69b462da528e0e7c5e553c7cda28c8dae71744089de747f4e9e03890cb35560eb6e23a163c855a622870e25637a87c36b583 SHA512 2b154fd3c40fa8e46822ee0cd8da3b554cf579c46f572ad0a0b9873f0402a826165a49dd8bec9179a5763f31fed758c211e952134b086978ab446d1dc56870e6
 MISC metadata.xml 673 BLAKE2B d0dd1b8ff7d65cf628b0bd9841072a578953fec9d343a87ff91666de3f74079e911ce578a732b32cd6a3709c92ae6dcf13ac899d635f84e67c770af6212a315a SHA512 296b864ed6a816faa8dd2e65471cb74a0b8a99b29dcf315bc4d31cb81f77a1c7982cc1f1929b2331ae57d0bef3a73273793b0b8da04142d0df13d364c3ab6545
diff --git a/app-laptop/hdapsd/hdapsd-20141203-r1.ebuild b/app-laptop/hdapsd/hdapsd-20141203-r2.ebuild
index d3cea62d792d..831a25bcbe7e 100644
--- a/app-laptop/hdapsd/hdapsd-20141203-r1.ebuild
+++ b/app-laptop/hdapsd/hdapsd-20141203-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit linux-info readme.gentoo systemd
+EAPI=7
+inherit linux-info readme.gentoo-r1 systemd
 
 DESCRIPTION="IBM ThinkPad Hard Drive Active Protection System (HDAPS) daemon"
 HOMEPAGE="https://github.com/evgeni/hdapsd/"
@@ -13,6 +13,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="libconfig"
 
+BDEPEND=""
 DEPEND="libconfig? ( dev-libs/libconfig:= )"
 RDEPEND="${DEPEND}"
 
@@ -30,7 +31,7 @@ pkg_setup() {
 src_configure() {
 	econf \
 		$(use_enable libconfig) \
-		--with-systemdsystemunitdir=$(systemd_get_unitdir) \
+		--with-systemdsystemunitdir=$(systemd_get_systemunitdir) \
 		--docdir="/usr/share/doc/${PF}"
 }
 
@@ -42,8 +43,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	[[ -z $(ls "${ROOT}"sys/block/*/queue/protect 2>/dev/null) ]] && \
-	[[ -z $(ls "${ROOT}"sys/block/*/device/unload_heads 2>/dev/null) ]] && \
+	[[ -z $(ls "${ROOT}"/sys/block/*/queue/protect 2>/dev/null) ]] && \
+	[[ -z $(ls "${ROOT}"/sys/block/*/device/unload_heads 2>/dev/null) ]] && \
 		ewarn "Your kernel does NOT support shock protection."
 
 	readme.gentoo_print_elog
@@ -55,9 +56,9 @@ ${PN} requires a kernel module to function properly. The recommended
 approach is to install app-laptop/tp_smapi[hdaps], but the in-tree
 module provided by CONFIG_SENSORS_HDAPS may work as well.
 
-Common daemon parameters can be set in ${EROOT}etc/conf.d/${PN}. If the
+Common daemon parameters can be set in ${EROOT}/etc/conf.d/${PN}. If the
 package was installed with USE=libconfig, then the parameters can also
-be set in ${EROOT}etc/${PN}.conf, although the former will take
+be set in ${EROOT}/etc/${PN}.conf, although the former will take
 precedence over the latter if both are used.
 
 You can change the default sampling rate by modifing
diff --git a/app-laptop/i8kutils/Manifest b/app-laptop/i8kutils/Manifest
index 5ce6675d9c9b..6905ab19fd86 100644
--- a/app-laptop/i8kutils/Manifest
+++ b/app-laptop/i8kutils/Manifest
@@ -1,11 +1,5 @@
-AUX i8k.conf 891 BLAKE2B 734a958f641396e103b6a018d983638d91c540267325b8057f23091e614b88e5eb45b9cf154e32a8aa00f219904227eaed3887f87c379e18d6475a945a065f19 SHA512 bc262f0014237abfc87efc60dabbb37e86c459077831b68c07ea13608d1174bd32cb695e74ca4597839f7b128cfc1b4860874cce0c6f511972569e5f0948526d
-AUX i8k.init-r1 1216 BLAKE2B b8e2dbb0cb343b751deaacda9a7f57646c27fc501669980e20e3b42302e87fb89001b48dcecb3d5866a06dd5cf538044ab3ff356c9dba18a7b57ebd3dc408fc1 SHA512 39282605172dac48c12819e5adeb080d3c73257d775fb8e53d2bdcf26e0510dd10055d8a51e17043f2a5d49da3ffb73f28a767fbfb44c0bb77feb621e25867cb
 AUX i8kmon.init 397 BLAKE2B 54d12165aa4d8cee50e4e73392d39f0064669f55e57e999dce4db98992e1ac762a87235a25d07822d143baf40d32bc4ab93ad5f53b2d719a54299069e9b7feb9 SHA512 e31b6aacea515735c96375094521a9c825660d7a19e40386f0afe93084fc51ba767afd5549101ca8dca217589dd75b0034952d20be9a15bec5a2a6e9e0012b38
 AUX i8kmon.service 158 BLAKE2B e567398b719557fffc6b4a244e4528d6147e8406db59d4cca39d531e88a04be5e4154971f15ed9db24d7f8ebfef103ea78cdaa4aeae356823045f7012782cf39 SHA512 77cbed13d4c1982a491faafe7e45da7a4fc06ea94e6b126405211f54a4bb5b4c794d94f6ca56d6d16ad0e0e62d8311bf90e0e6c60c74147ea12963c530c69529
-AUX i8kutils-1.42-Makefile.patch 1296 BLAKE2B cbcc827c1c93ebb4a597c642ed14110c92de701b7b094228924442c75806ecf2e35b43a65c7a39f412e9d10d24ea97c726c76cd9653ea090a0215a795ac47905 SHA512 3dd548cff896d3b14df0e55059f842cf3e04c0a9057f2c16eea7fb160882ceab4dc91782012d2243a4a78f9271c2effdb09109ffe889c27149a65940b69785d9
-AUX i8kutils-gcc5.patch 1161 BLAKE2B 12705e687c801a2863f2b8908473b1268bb3af474004ec1b317d03cb9ffb100dc4c4b2b5afeaeea76d047037b5ba5586a8629a1bbf5313b99e76dd7728679e1b SHA512 c789ef70244c59041308c5ff692c2bec6cf4fa5e673deeea9ec59cd1b6036e60f6ca4036dea04eaaa1b8172e3388b2f5e02227311e032c9c552e04ac50276616
 DIST i8kutils-1.43.tar.xz 29184 BLAKE2B 3489de1993267eb8aaca1dc00e6c19f68be14b5351715828eee9d4e6abbedbcd3faa58aba5e764de4bbf6cfa41e0a64d011d1d5ea904b261fa3f9842a4501bab SHA512 eed2db9e5864b0dc24e22302ce2abaa54415520a920cfa0be08068b8316a3c2c04b3565cc84164e36fb7ae5bb8b77be55ae179255e03ecd86ea664d85cece456
-DIST i8kutils_1.42.tar.xz 37544 BLAKE2B ca8ec63252f43b269ba2a5565fce275aaa6542ebe6f4824d12b194cb0ae8b09dbe354c743ad78af8bcb897e411f1739df464e6c5603d470842de4b59be753984 SHA512 148e8788c50cbaa22f1dd3b72867839f5bc2d91cda70aee74f7c9a3d8542386a44652c5eb8dd9eba0e30400fc6bb72855d3cc7f2dc4284c2529b9cba2eac485b
-EBUILD i8kutils-1.42.ebuild 1022 BLAKE2B 4248f6b20e56f8298a4fdfcfb28fb03e76c5d3da611a42dee4a0a1ad49678bcda1b547d6e4c3c0da47a1c1771b59cd7e7fdd3dc367e84e94f8560c3bcb1fd64b SHA512 a8d386ec9e17804dbf5dac188e7a6af2f943d40f6166972482a3fe970c42300a9cd137697b8b21018a23af8ce080db1c24f6b1b3b4011224559e1df749fedd1c
-EBUILD i8kutils-1.43.ebuild 1152 BLAKE2B 3e42ed12051ff979a009234c477bcd5b4b682584333aa1f39ea1be5f69e077e6725700764e3de03c05afa51e21dd369424508ee999623afabbf7624dfcda0b9d SHA512 b3f207556ff004ecee5d61ba68abc93a5c195d1eaf0323a1ccac0f868a0ff1072053ad0b2268e68bd6f7b0cb5f76b09cc04f3e252f69ecc82865e9a35c1ee55c
+EBUILD i8kutils-1.43.ebuild 1150 BLAKE2B a4fc7832095a20bab0267bfb2b95a4b2298eae3e272b115eee00cd1610016a2f6c0d7b2cf5d4a1da6314a773c2862d5578a25b36f74de12b49285b0261ba556e SHA512 c0bd9abc87d2b01253edc2af86c2f9ed5d91aed35c7f7a87d667c813498554996748b4cdffcab705e46dd0cd2f4b1bc25a356654405a84938332413171511e78
 MISC metadata.xml 485 BLAKE2B 75c334131b955002752321192acb3e3ae092e325e8d868477742a3a0c63d616cef83145d0abefce2a6b0c326295609a16700fdaa18bcebbff06e13e4fd6c0f3d SHA512 54f23399c9913a0cedc0d1f7db5a974b9f05827c30dd9ad95385b52807dfbbc75d72110659fa91613ee8a42893061f964675f53ed5a1e0415ad70fdbad45f48f
diff --git a/app-laptop/i8kutils/files/i8k.conf b/app-laptop/i8kutils/files/i8k.conf
deleted file mode 100644
index c5bd389b294a..000000000000
--- a/app-laptop/i8kutils/files/i8k.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-# Config file for /etc/init.d/i8k
-
-# Parameters:
-#
-# i8kbuttons Parameters
-# =====================
-# VOLUME_UP : command for i8kbuttons to run on volume up key
-# VOLUME_DOWN : command for i8kbuttons to run on volume down key
-# VOLUME_MUTE : command for i8kbuttons to run on mute key
-# BUTTON_REPEAT : repeat rate, in milliseconds, for i8kbuttons keypresses
-#
-# If VOLUME_* commands are not defined, i8kbuttons will not be started
-#
-# i8kmon Parameters
-# =================
-# NOMON : if set, i8kmon will not be started
-# NOAUTO : if set, i8kmon will not control the fans
-# TIMEOUT : timeout, in seconds, at which i8kmon will check/update status
-#			(default is 2)
-
-# for ALSA
-MIXER="/usr/bin/amixer -q set Master"
-VOLUME_UP="$MIXER 1+" 
-VOLUME_DOWN="$MIXER 1-" 
-VOLUME_MUTE="$MIXER toggle" 
-
-# for aumix (no mute support)
-#VOLUME_UP="aumix -v +4"
-#VOLUME_DOWN="aumix -v -4"
-
-BUTTON_REPEAT=100
diff --git a/app-laptop/i8kutils/files/i8k.init-r1 b/app-laptop/i8kutils/files/i8k.init-r1
deleted file mode 100644
index 1e1cb7ca0c94..000000000000
--- a/app-laptop/i8kutils/files/i8k.init-r1
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-	after alsasound
-	after modules
-}
-
-checkconfig() {
-	if [ ! -e /proc/i8k ] ; then
-		eerror "The i8k driver is not installed"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	if [ -n "$VOLUME_UP$VOLUME_DOWN$VOLUME_MUTE" ] ; then
-		ebegin "Starting i8kbuttons"
-		start-stop-daemon --start --quiet --pidfile /var/run/i8kbuttons.pid \
-			--make-pidfile --exec /usr/bin/i8kbuttons --background \
-			-- ${VOLUME_UP:+-u "${VOLUME_UP}"} \
-			   ${VOLUME_DOWN:+-d "$VOLUME_DOWN"} \
-			   ${VOLUME_MUTE:+-m "$VOLUME_MUTE"} \
-			   ${BUTTON_REPEAT:+-r "$BUTTON_REPEAT"}
-		eend $?
-	fi
-	if [ ! -n "$NOMON" ]; then
-		ebegin "Starting i8kmon"
-		start-stop-daemon --start -b --quiet  \
-			--pidfile /var/run/i8kmon.pid \
-			--make-pidfile \
-			--exec /usr/bin/i8kmon --background \
-			--name "tclsh /usr/bin/i8kmon" \
-			-- -d ${NOAUTO:+-na} ${TIMEOUT:+-t $TIMEOUT}
-		eend $?
-	fi
-}
-
-stop() {
-	if [ -n "$VOLUME_UP$VOLUME_DOWN$VOLUME_MUTE" ] ; then
-		ebegin "Stopping i8kbuttons"
-		start-stop-daemon --stop --quiet --pidfile /var/run/i8kbuttons.pid
-		eend $?
-	fi
-	if [ ! -n "$NOMON" ]; then
-		ebegin "Stopping i8kmon"
-		start-stop-daemon --stop --quiet --pidfile /var/run/i8kmon.pid
-		eend $?
-	fi
-}
diff --git a/app-laptop/i8kutils/files/i8kutils-1.42-Makefile.patch b/app-laptop/i8kutils/files/i8kutils-1.42-Makefile.patch
deleted file mode 100644
index 7dc56d91aa3e..000000000000
--- a/app-laptop/i8kutils/files/i8kutils-1.42-Makefile.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Fix a race condition causing parallel builds to sometimes fail.
-
-Both probe_i8k_calls_time and i8kctl contain a main() function, though
-i8kctl's is omitted when built with -DLIB so they can link without a
-conflict.  i8kctl is also a standalone exe so it is built twice, with
-and without -DLIB.  When building in parallel you can get into a 
-situation where the object file created by the probe_i8k_calls_time
-target gets overwritten with the one from i8kctl and bad things happen.
-Nothing actually uses the i8kctl.o that has main() so we can just not
-build it.
-
-Also move CFLAGS, CC, LDFLAGS respect out of the ebuild.
-
---- a/Makefile
-+++ b/Makefile
-@@ -17,13 +17,13 @@ ccflags-y = -Wall
- 
- all: i8kctl probe_i8k_calls_time
- 
--i8kctl: i8kctl.c i8kctl.o
--	gcc -Wall i8kctl.c -o i8kctl
-+i8kctl: i8kctl.c
-+	$(CC) -Wall ${CFLAGS} -o i8kctl i8kctl.c
- 
- probe_i8k_calls_time: probe_i8k_calls_time.c
--	gcc -Wall -c -g -DLIB i8kctl.c
--	gcc -Wall -c -g -DLIB probe_i8k_calls_time.c
--	gcc -o probe_i8k_calls_time i8kctl.o probe_i8k_calls_time.o
-+	$(CC) -Wall ${CFLAGS} -c -DLIB i8kctl.c
-+	$(CC) -Wall ${CFLAGS} -c -DLIB probe_i8k_calls_time.c
-+	$(CC) -Wall ${CFLAGS} ${LDFLAGS} -o probe_i8k_calls_time i8kctl.o probe_i8k_calls_time.o
- 
- i8k:
- 	make -C /lib/modules/$(shell uname -r)/build M=$(PWD) modules
diff --git a/app-laptop/i8kutils/files/i8kutils-gcc5.patch b/app-laptop/i8kutils/files/i8kutils-gcc5.patch
deleted file mode 100644
index 258b95f595f6..000000000000
--- a/app-laptop/i8kutils/files/i8kutils-gcc5.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Fix build with GCC 5.
-
-x86_64-pc-linux-gnu-gcc -O2 -march=native -g -pipe   -c -o i8kctl.o i8kctl.c
-gcc -Wall -c -Wl,--hash-style=gnu -Wl,-O1 -Wl,--as-needed -DLIB i8kctl.c
-gcc -Wall -c -Wl,--hash-style=gnu -Wl,-O1 -Wl,--as-needed -DLIB probe_i8k_calls_time.c
-gcc -o probe_i8k_calls_time i8kctl.o probe_i8k_calls_time.o
-probe_i8k_calls_time.o: In function `main':
-probe_i8k_calls_time.c:(.text+0x62): undefined reference to `timestamp'
-probe_i8k_calls_time.c:(.text+0x82): undefined reference to `timestamp'
-probe_i8k_calls_time.c:(.text+0xa2): undefined reference to `timestamp'
-probe_i8k_calls_time.c:(.text+0xbf): undefined reference to `timestamp'
-probe_i8k_calls_time.c:(.text+0xdc): undefined reference to `timestamp'
-probe_i8k_calls_time.o:probe_i8k_calls_time.c:(.text+0xf9): more undefined references to `timestamp' follow
-collect2: error: ld returned 1 exit status
-Makefile:24: recipe for target 'probe_i8k_calls_time' failed
-
-
---- a/probe_i8k_calls_time.c
-+++ b/probe_i8k_calls_time.c
-@@ -13,7 +13,7 @@ double t;
- 
- struct timespec tmst;
- 
--inline double timestamp()
-+double timestamp()
- {
- 	clock_gettime(CLOCK_REALTIME, &tmst);
- 	t = tmst.tv_nsec;
diff --git a/app-laptop/i8kutils/i8kutils-1.42.ebuild b/app-laptop/i8kutils/i8kutils-1.42.ebuild
deleted file mode 100644
index a18ef111995f..000000000000
--- a/app-laptop/i8kutils/i8kutils-1.42.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils systemd toolchain-funcs
-
-DESCRIPTION="Dell Inspiron and Latitude utilities"
-HOMEPAGE="https://launchpad.net/i8kutils"
-SRC_URI="https://launchpad.net/i8kutils/trunk/${PV}/+download/${P/-/_}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="tk"
-
-DEPEND="tk? ( dev-lang/tk:0 )"
-RDEPEND="${DEPEND}
-	sys-power/acpi"
-
-S="${WORKDIR}/${PN}"
-
-DOCS=( README.i8kutils )
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-gcc5.patch"
-	epatch "${FILESDIR}/${P}-Makefile.patch"
-
-	tc-export CC
-}
-
-src_install() {
-	dobin i8kctl i8kfan
-	doman i8kctl.1
-	dodoc README.i8kutils
-
-	newinitd "${FILESDIR}"/i8k.init-r1 i8k
-	newconfd "${FILESDIR}"/i8k.conf i8k
-
-	if use tk; then
-		dobin i8kmon
-		doman i8kmon.1
-		dodoc i8kmon.conf
-		systemd_dounit "${FILESDIR}"/i8kmon.service
-	else
-		cat >> "${ED}"/etc/conf.d/i8k <<- EOF
-
-		# i8kmon disabled because the package was installed without USE=tk
-		NOMON=1
-		EOF
-	fi
-}
diff --git a/app-laptop/i8kutils/i8kutils-1.43.ebuild b/app-laptop/i8kutils/i8kutils-1.43.ebuild
index d406bfcc3a0f..82620db160af 100644
--- a/app-laptop/i8kutils/i8kutils-1.43.ebuild
+++ b/app-laptop/i8kutils/i8kutils-1.43.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/i8kutils/trunk/${PV}/+download/${P/-/_}.tar.xz ->
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-lang/tcl
diff --git a/app-laptop/ibam/Manifest b/app-laptop/ibam/Manifest
index aa4d3c425687..edd3286d51b0 100644
--- a/app-laptop/ibam/Manifest
+++ b/app-laptop/ibam/Manifest
@@ -1,5 +1,5 @@
-AUX ibam-0.5.2-build.patch 1311 BLAKE2B 3e58e55331cf21e1f9bf7825d89c7c72a7fdb83decc1ba4942019de347facab1ef19534dadb079c13b7c9761ef864b7e3611e5f17d5e1c3411eda23ff1a8d3be SHA512 415d36b8d9b212ccc84728e83ce11ffea439542766d9ad6f53659618194a144dff491589a4ed49c0f3707ac37199773925eb357166915193c55e77e246e2d00e
+AUX ibam-0.5.2-build.patch 1314 BLAKE2B 86cac05680bc47dbf63b19f1d00c0306a5f4304c1f66eee2456475b923b7ddf775fb84a694d06a7ce0b783f7d028f361db0f35142a5863358ace9b9d406a35d3 SHA512 878aa0066a7acd22d797b8b6c17778960566d90dd794bfd95a2cc9bb71b328fdf099d3b1137cd8f9a10563405be3552a72f27c9b39da0b64656a4ae6e4d90fc0
 DIST ibam-0.5.2.tar.gz 22149 BLAKE2B a3d9398dc34004203643d3198a3994ef3b432b909bdf9713a91a1d938a19ab9d0345105a60f3357288c2f3d2a325498a0787138e50fb445f1ea11851f1d7de1c SHA512 c70d728a2f1250ed291e663bd9f4e9ba01308fce14edf1ffd1902057de7e5527548bd06e2e3caaaeabc064d0ee123f536a626fd50b84092f6fc9201fc6bdba58
 DIST ibam_0.5.2-2.1.diff.gz 6115 BLAKE2B 8a1ada53ed39a379f11158583b337166d74d17de808a44e3d3fb225eecef5e3f3b782088072f94dbad387b258254ccbe3fdce7d5655ff201c41d66dbeb7c6d61 SHA512 f6707e42626891aa87697bc28f124345f9f1d0dfb35620f6386dc1dca6b9c5e3a73571bf04e933091c1995d1156925029c0199c5caace497ff891c93f9011ac3
-EBUILD ibam-0.5.2-r4.ebuild 1175 BLAKE2B 4d2e45f591d7b7e713e4e8999fc28f4772d7cd9baa60b014d6630b70964c9f723c1bdd937aa54583a35679d929f08b4858912e95fe56e50ca025890381fdeebc SHA512 6056a58fdaa44212b2dac5e93281a2864d5586ddee4c970715281a69135364e33dae65c68bcc90c693cfc0d19bf632cf91bfa65f164fdb3b7aa149d50087128c
+EBUILD ibam-0.5.2-r4.ebuild 1177 BLAKE2B 91ca425a4724de80d530ad4ee14c771b4ffcfea5912403de38ce23ca39454b266ac764059ffb02b4a6fcb4e2a362d1a3980bfddec6243ecfb469240ba6ebba6c SHA512 34878a0c82aa491d5bb9809479baf856e841f2655cc1e6bf77c8e988a6d875de4cc09ce174af59ab1e0bd485853a45500eb20bc281536e58ef9737b4e2596ccf
 MISC metadata.xml 330 BLAKE2B 23b7606f4008dab2d8de06938cd2c36bda69bbc025bca0d2234224d37242359299a65b17b5c55b3080d7fcea4ac7a9e4c2359437e355f960b6c217b0931bccd6 SHA512 bc1e4eee7bc08f8e90b37ca0401fd7ad68645a6c50d22d22816ea944c50e47b1b00bc7da95eea38bd0e77f7c1c8baaea0a63c26cfbc9b6941a96612f145a9059
diff --git a/app-laptop/ibam/files/ibam-0.5.2-build.patch b/app-laptop/ibam/files/ibam-0.5.2-build.patch
index 665e50798b18..57459f544e5b 100644
--- a/app-laptop/ibam/files/ibam-0.5.2-build.patch
+++ b/app-laptop/ibam/files/ibam-0.5.2-build.patch
@@ -26,7 +26,7 @@
  
  ibam-krell.o: ibam-krell.cpp ibam.hpp ibam.inl
 -	$(CC) $(CFLAGS) -fPIC `pkg-config gtk+-2.0 --cflags` `gdk-pixbuf-config --cflags` -c ibam-krell.cpp
-+	$(CXX) $(CXXFLAGS) -fPIC `pkg-config gtk+-2.0 --cflags` `gdk-pixbuf-config --cflags` -c ibam-krell.cpp
++	$(CXX) $(CXXFLAGS) -fPIC `${PKG_CONFIG} gtk+-2.0 --cflags` `gdk-pixbuf-config --cflags` -c ibam-krell.cpp
  
  krell1:	ibam-krell1.so
  
diff --git a/app-laptop/ibam/ibam-0.5.2-r4.ebuild b/app-laptop/ibam/ibam-0.5.2-r4.ebuild
index 2076603b9f60..25d42e8d7193 100644
--- a/app-laptop/ibam/ibam-0.5.2-r4.ebuild
+++ b/app-laptop/ibam/ibam-0.5.2-r4.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 PATCH_LEVEL="2.1"
-
 inherit toolchain-funcs
 
 DESCRIPTION="Intelligent Battery Monitor"
@@ -27,20 +26,17 @@ DEPEND="
 	${RDEPEND}
 	gkrellm? ( virtual/pkgconfig )"
 
-src_prepare() {
-	eapply \
-		"${FILESDIR}"/${P}-build.patch \
-		"${WORKDIR}"/${PN}_${PV}-${PATCH_LEVEL}.diff
-
-	eapply debian/patches/02*.dpatch
-	eapply debian/patches/03*.dpatch
-	eapply debian/patches/05*.dpatch
-
-	eapply_user
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+	"${WORKDIR}"/${PN}_${PV}-${PATCH_LEVEL}.diff
+	"${S}"/debian/patches/02deviation.dpatch
+	"${S}"/debian/patches/03acpi-check.dpatch
+	"${S}"/debian/patches/05_sysfs_lenovo.dpatch
+)
 
 src_compile() {
-	tc-export CXX
+	tc-export CXX PKG_CONFIG
+
 	emake
 	use gkrellm && emake krell
 }
diff --git a/app-laptop/laptop-mode-tools/Manifest b/app-laptop/laptop-mode-tools/Manifest
index 5af4c2747a76..fda2c4d0f80f 100644
--- a/app-laptop/laptop-mode-tools/Manifest
+++ b/app-laptop/laptop-mode-tools/Manifest
@@ -3,5 +3,5 @@ AUX laptop_mode.init-1.4 1059 BLAKE2B 24dcf91d75df6cffe13cda1c8b9c85c016dae393f7
 DIST laptop-mode-tools_1.72.2.tar.gz 121437 BLAKE2B 1fdcdb88183156e4983b4561218164df5dde9fc91e85ab0ec1e6a401d3e5c5e70597a97e16c476949e80a674c34683eac6429e64e76c7921bd28f560e4ffe3cb SHA512 9a3960bad518aa73350b72ce30aeb80f3cbb1bf0fd6a11d5afe396b25c2b73f3b3d2fe7de0741eb94c9e3467c85a99741dc7acfd85339b9eb1daca09d3f8c56a
 DIST laptop-mode-tools_1.74.tar.gz 124163 BLAKE2B 5080a646b7e0ddd53709aa445abfdde2ea4a7643bf97f86c6d7ca612b6e46210c825df1c01389125ff2dd79e37d2421b76db28f7415454c77a776c3526a08d12 SHA512 70154c5833c02e2adf50bf03b3d05b98946cb7fc5acb73c05f105e3bc34d62e54e57db98be6877b8ebf2d1b951de73ad5afee9a5f7c85a76055ddc0868d5397d
 EBUILD laptop-mode-tools-1.72.2-r1.ebuild 2651 BLAKE2B 6029a915aa0984c9c7646291c8d733e1d7bffc46ed20690624eb386d2f4f75c95f2c65be8f0b1821c9d2b0bfec3f347bfbeac57024c04d3464be4f020bbcfe32 SHA512 2a5f2059ff323c87851600d2c8d14565cbb3e5abf3b767a471b4e74c1b024b4c0ce874cd52e90ac4812ac276f66b0717e324b377e057cb1e353992eece6f1e12
-EBUILD laptop-mode-tools-1.74.ebuild 2197 BLAKE2B 4579a866601898ee3e63ccddf38b7ecfe0734f26b649bee6824cdbc810fe53facd07ba4e6c16a898fac69c21cca67c45ef6b83fb054db785c24efb760df1e305 SHA512 7177970cf9577837b587d535b412fe69f831ea05f6033b1d7bc4cafc23bf2ae7eebb8cbc59bf892f4a3fc4a2e20d6f13b10e91146d74eeddd782209d0d78bcc2
+EBUILD laptop-mode-tools-1.74.ebuild 2194 BLAKE2B f3f0d4c0b1098100f80a2e3119b56c9278596c575ad76adf8984ec50f88e03b37cc638358567371d60a1da2b26fe80e584c5f989eb28a489140807a5611f2446 SHA512 399d7cff9d1647abf70e95984d541786eed205cff72f445a5da723aac98a9832df44f5919c81fce02bf6ee44677b104aab3fd16f245f45db800f5d47360375c1
 MISC metadata.xml 471 BLAKE2B e78c61ebdef3dba3257d29e1d8c05cc392ec9fdf0abda9ff606ce9b76e2b41fd82723f26d5c22bafdbcfb58233e051e9e14c9438299671a57ef63a93aafa9bb3 SHA512 a205fcdb7c635d58b94b1dec541b117534420c38135eaa5567814529c8effb00cbd3c17aa022b69d57adf48b3ab4115d4bc0ef3bdc1a26916ce9fcd05a6f8241
diff --git a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.74.ebuild b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.74.ebuild
index c90637e13ddb..c297be15304f 100644
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.74.ebuild
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.74.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="+acpi apm"
 
 RDEPEND="
diff --git a/app-laptop/pommed/Manifest b/app-laptop/pommed/Manifest
index b9222edfcfa8..35a03f71269c 100644
--- a/app-laptop/pommed/Manifest
+++ b/app-laptop/pommed/Manifest
@@ -1,5 +1,5 @@
 AUX pommed-1.39-fno-common.patch 496 BLAKE2B 5eecd8303fcbddccd12c2dd4ae24f8e46dbba5d1788fccae2ca47b8d3a7a680092460ec6e25422ad0332d1ac7b6ad249fe9ac75f33b57d83d57fc94f1c609f5a SHA512 b61449c21e73f42ff1487d9fff662f959e0707bed79826733a6cd4327cc92151caf974dc46c787b91934776461d7f1af83b5fc9574f902d9e2839159bf6f56fb
-AUX pommed-1.39.patch 3024 BLAKE2B 44ba221b8ba8e328ca322ecb9cf53dd8c10d9cfc82575d74d95cff929570086af0d4cb5d81532bf182f750615b59b05369ced1205cf8a7f0d6ca86a7606dcc21 SHA512 c048643afe0de01a161515963fc11fa330b39cd6304f139ab831032f51e2722d30c7e9b93e1de7d1150283bef570e44772e226f8c13e512d66b1ebe08a7892be
+AUX pommed-1.39.patch 2791 BLAKE2B cf4b4e0d62d04f9dcf0ea9a9e66403e7e62d8a1727c8f6ade398a1428fe5282d80c20bfae2926c4506f03459500d786f08a795bfc805675b622353f62980a20d SHA512 b04aaf842094ede0c5f370171ec6d134edb96f9a1837f1d9994652012a1523cbc38370f489a488d85d6ec3ecf417988546fce84b9da6baf8cb93efb2be686568
 AUX pommed.rc 383 BLAKE2B 96e43ba7a0d6e78ced0546f2d947cd2e150629ce9a9260029e97267ecf2c0012b6427b92dd8a3edee57f790ace13dc0688131544a50f9e3d315d1b2918693fca SHA512 54c3ee9242ab68f7a162e5892f4b5ee1064328f4b23c9da05f75acdb5c8c93245533af1320b6fa20f026f62060b5a0558eab1215c9c8491086545b7733c6c87b
 AUX pommed.service 155 BLAKE2B 5c99ee7f519f01c43a9cc4513b6a474aa5179482f48f687a796f5f8d49e71b3b67275de270decadfe1566a4b31f7f52ab59579e2d79e51de919064e6ec8c251d SHA512 00cfd3417ec09cef62e478ac7b5483b1857de2061106c8ae368dbaf0ff5c7b06e974ea85bba411601e76e5bbef53e4ab5b743aa7366c9d717d865a7fd3cd604d
 DIST pommed-1.39.tar.gz 995020 BLAKE2B b96169b3fa3f3f8cd8ce122af07ba6e13f2bd0969cd6f3aff8b2755dd1295ec581746ac3a5f692710bf8ad25ec1ca76819dcaa2d26681f5299548eb9693334f3 SHA512 26568e359d8ef853710b1d86f397981e87245a84b2ff006964035ea8643e97df44fe52b01841d085eb8dd1aee586e1c8b60c44089f463e2a64b2b95c010a9d10
diff --git a/app-laptop/pommed/files/pommed-1.39.patch b/app-laptop/pommed/files/pommed-1.39.patch
index 1215606c35cb..eba285a6831e 100644
--- a/app-laptop/pommed/files/pommed-1.39.patch
+++ b/app-laptop/pommed/files/pommed-1.39.patch
@@ -1,5 +1,3 @@
-diff --git a/gpomme/Makefile b/gpomme/Makefile
-index 0874b48..a3ab64a 100644
 --- a/gpomme/Makefile
 +++ b/gpomme/Makefile
 @@ -1,5 +1,3 @@
@@ -25,8 +23,6 @@ index 0874b48..a3ab64a 100644
  
  gpomme.o: gpomme.c gpomme.h theme.h ../client-common/dbus-client.h ../client-common/video-client.h
  
-diff --git a/pommed/Makefile b/pommed/Makefile
-index 5f3cbf9..3425a2a 100644
 --- a/pommed/Makefile
 +++ b/pommed/Makefile
 @@ -1,7 +1,5 @@
@@ -62,8 +58,6 @@ index 5f3cbf9..3425a2a 100644
  
  pommed.o: pommed.c pommed.h evloop.h kbd_backlight.h lcd_backlight.h cd_eject.h evdev.h conffile.h audio.h dbus.h beep.h
  
-diff --git a/wmpomme/Makefile b/wmpomme/Makefile
-index cc7a438..6c4bee1 100644
 --- a/wmpomme/Makefile
 +++ b/wmpomme/Makefile
 @@ -1,11 +1,9 @@
diff --git a/app-laptop/thinkfan/Manifest b/app-laptop/thinkfan/Manifest
index 34e77b3402b5..dccc5516b2bc 100644
--- a/app-laptop/thinkfan/Manifest
+++ b/app-laptop/thinkfan/Manifest
@@ -1,3 +1,5 @@
 DIST thinkfan-1.0.2.tar.gz 77653 BLAKE2B 1b40553380f9b873883f0dc587665f24cd2e07de7a7e743cb9f99a3282f380da2258265a612b1c97d2945fed31aee0d6cbc30ea2a18c0b212e877e7635eda336 SHA512 d9133538096a7c5757f599adfebc8217aa7334a102573d6757f03b5c012a09d600be923930fd9d62f4afa591f5eb7a70a1c328004bddef85494d1a7ce56b648f
-EBUILD thinkfan-1.0.2.ebuild 905 BLAKE2B 6a6b067772ec24f50be8a8a998ec7910b8ca3c48674405c813f75a281bbac013f385689baf1aa5aeba38b94b96ccd30aef335df490dc07e2f48a53db592de8fc SHA512 54a0c916068ebb4e898947767260bfe4f1a33afdd448e450978383ae82cb16e8b375131873c8dba2266a1980aff731c8301565b7f625b1781f51ecdc8e1ba940
-MISC metadata.xml 505 BLAKE2B 8b6b4100f0b839473a7f3b09bcc2f8ed896076e4a815d69035fe5e5ee26c11100ad7c90c1be8dd15b8616012ccdaf7359ba926cf526f45427279d2a731d0c328 SHA512 fa6a9f4d5218fa6911d445439eaf5d01e58636f0063721646112d028b30ced234c3c39a69ccc876a5c28df5e01b5eaa067dc92a7802c06a2afd395c9b7fd9d5c
+DIST thinkfan-1.2.1.tar.gz 84253 BLAKE2B 5a816b8cadbc72424384966b0bc6bcf17070eec703584c348bc28cf8ee59e4d67a56d351f0c1d9d55328326b21134f0158bf976f86336bb5d59b81c137b96c83 SHA512 27db9f54c26a85093ff7b9f8a0e26f679e413489f608b561b819a702fd077a33e62197e41a1f1f4495c66daa1ac70603c063e6ac4cdd09d13f4005f73685152d
+EBUILD thinkfan-1.0.2.ebuild 909 BLAKE2B 7f8eba1b6807270d6d9fd71c68163f8c4837053f23aa76b68b4d45adfe803988f6607bc556cfc10c4d6e6afadbd8a8e08af4c057bf2e88e8bd3dc56a2db7391c SHA512 0c452ffb9c5bb01ebd956a91f422073a1bc65f247590bab15c666a45d921da6138041ebdf5064cec2038cded4860c522760298802b33beea3f6470c0f5901d1b
+EBUILD thinkfan-1.2.1.ebuild 911 BLAKE2B 180fa96487602980c8fd6af469ca54bb30826907aa23660fa1eff483ef79441e4313fd60302319853158cdf4d72d331dfee08d9fe7ef81e8a32483bf9395101c SHA512 33c42c44ea7251eab3b8164a0e397f6de51729730f5b4f754fb0420e20686afe0b79367323f73248569410060387e09cedeb0b6aa5826f6a81a43d84a20c1abf
+MISC metadata.xml 744 BLAKE2B 7d5d7047bf3224b59f9336bff25a9d3a412267a8004c3f2b2c695c1eb780e201b8f73c47e90fd83229e1a09c36c8969a218b0edac6a4b47ac655b7faa1ca569d SHA512 ac6aee616147ebcaaceed19b22e22459a3dc8c725793428800ea3e03acd8cfb38b2076c155f036c07bc4e13faee8c4e4bacfa12d528442dbd25adae4fbe3ab9a
diff --git a/app-laptop/thinkfan/metadata.xml b/app-laptop/thinkfan/metadata.xml
index 134e69ff9e5d..8f49761db66c 100644
--- a/app-laptop/thinkfan/metadata.xml
+++ b/app-laptop/thinkfan/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>hfern@fernhout.info</email>
+		<name>Johannes Willem Fernhout</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="atasmart">include libatasmart support to get disc temperature</flag>
 		<flag name="nvidia">allow thinkfan to read GPU temperature from the proprietary nVidia driver</flag>
diff --git a/app-laptop/thinkfan/thinkfan-1.0.2.ebuild b/app-laptop/thinkfan/thinkfan-1.0.2.ebuild
index e08e6101e57b..a96062867700 100644
--- a/app-laptop/thinkfan/thinkfan-1.0.2.ebuild
+++ b/app-laptop/thinkfan/thinkfan-1.0.2.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 
 inherit cmake readme.gentoo-r1
 
-DESCRIPTION="simple fan control program for thinkpads"
-HOMEPAGE="http://thinkfan.sourceforge.net"
+DESCRIPTION="Simple fan control program for thinkpads"
+HOMEPAGE="https://github.com/vmatare/thinkfan"
 SRC_URI="https://github.com/vmatare/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/app-laptop/thinkfan/thinkfan-1.2.1.ebuild b/app-laptop/thinkfan/thinkfan-1.2.1.ebuild
new file mode 100644
index 000000000000..d59a97b5a27a
--- /dev/null
+++ b/app-laptop/thinkfan/thinkfan-1.2.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake readme.gentoo-r1
+
+DESCRIPTION="Simple fan control program for thinkpads"
+HOMEPAGE="https://github.com/vmatare/thinkfan"
+SRC_URI="https://github.com/vmatare/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="atasmart nvidia +yaml"
+
+DEPEND="atasmart? ( dev-libs/libatasmart )
+	yaml? ( dev-cpp/yaml-cpp )"
+
+RDEPEND="${DEPEND}
+	nvidia? ( x11-drivers/nvidia-drivers )"
+
+DOC_CONTENTS="
+	Please read the documentation and copy an appropriate
+	file to /etc/thinkfan.conf.
+"
+
+src_configure() {
+	local mycmakeargs+=(
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DUSE_NVML="$(usex nvidia)"
+		-DUSE_ATASMART="$(usex atasmart)"
+		-DUSE_YAML="$(usex yaml)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	readme.gentoo_create_doc
+}
diff --git a/app-laptop/tpb/Manifest b/app-laptop/tpb/Manifest
index bd23395c9922..c5627c552a3f 100644
--- a/app-laptop/tpb/Manifest
+++ b/app-laptop/tpb/Manifest
@@ -1,5 +1,5 @@
-AUX tpb-0.6.4-nvram.patch 2321 BLAKE2B 183d5a76ffda4d0da3b9e7f06add1c0258bd56fb651980599d6401bc914f3b95aa584ab7835d3a9a6a2865208a325e22f6ae07caa9790207b7212c813c15ab14 SHA512 0e59e3c01805c608738b6539e4cab78d7377b0550c08636b51f4df0ed02d3adb2d391d5e76bdf043a835fb523492dea8c0c7293915f0dc60df357dec4d759457
-AUX tpb-configure-fix.diff 478 BLAKE2B bb28bd7f2f0c0bf10904f97314323244999688726d96786e46b7c5e3b5d3e248f1f74a42cc6908eafce3fd97e7db073eb7497339eaf9849babad4b7762635511 SHA512 461088eb82e66976a6bf591e4bb0de43e76c8aa9e404448d862535a27acb2857fcf3b5830edc6ece650857eb0e1ed24e7366c83d77d2e91b427f96f68928b32a
+AUX tpb-0.6.4-nvram.patch 2174 BLAKE2B 2447519c4dba81ae15593dc7ab38dd63486014cc6536bc91d231fd3ca4ba816c185edb343429c80f60c9190c9b541a6c0e36e06b1ecc242ff71237143074b105 SHA512 1c11eac1578643e78c2ced59c40d9fc65dabbdf84972fc9d73ea6447235ec88e069477092c48cf8e7a0d3bd3877a9b5fe5231fac16f71a8b3434bef96b84a579
+AUX tpb-configure-fix.diff 324 BLAKE2B 67a11beb4ed0f52da1de194917eeb5043ee50c9867657a8fb56aff9c890b786b4b1fee7574a7aab5b5b8f717e00dcbe4a5e00cb7ceebc5bcbe51a40bb69de4ca SHA512 57ed816377f5030adc1ca37a70bf75ee8e7029b411a45a550a3a025c69d7fe45f2e0fcae175d4ed3ce51b4441115d865ac2dec44992fa0776cdfc67ed1c4d74a
 DIST tpb-0.6.4.tar.gz 280316 BLAKE2B c629840245d2e749f3669e274da72baffb2856f969346d1f1feed3e45b9909f1ba12d125e48baa4cd29d021a04cba9cddec35edad80bd3ccff1ffea1423157a3 SHA512 1a12f4231b86bc3da2867670d5800f8f99f347743cf40b229c92485b6fe52e12b0222356d95d071ec26162ac778d2fe40867b4e635701620bc52236dbdb7b76a
-EBUILD tpb-0.6.4-r1.ebuild 806 BLAKE2B 1667105c2af273a522cb695fa54090808b56ddfa41a8d9cc1707cb05b43c2829000a6b4d256089918cf382b7fddb3060965dd042475befd6dbbd4b1d3f65126c SHA512 ee233ff77a410ae38578e36787e462580c3fca7d6273c1965cf3da5cc09d84afe1f5f252863de79155235125f5440d6b1b482e632161255b93b0cb23ff848a55
+EBUILD tpb-0.6.4-r1.ebuild 777 BLAKE2B 90db4cd802893e58725e8a4e7c3e1f07670723cf7caff1cc59e5bcccdcc2165017156a4e55e03b6ab4784110836cf34b0f37c25b984602d9d4673fccd68a2bf7 SHA512 c6b5e86fd2ac5d0b32db41fa77be9b320ab6e0d77643e59572b4f5b071c6f0d91f0a8e655d83e8089d214b0505467311cb5315f82e37d11fe3d3171e571f255c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-laptop/tpb/files/tpb-0.6.4-nvram.patch b/app-laptop/tpb/files/tpb-0.6.4-nvram.patch
index 1ead9cbe5929..c217b5300c92 100644
--- a/app-laptop/tpb/files/tpb-0.6.4-nvram.patch
+++ b/app-laptop/tpb/files/tpb-0.6.4-nvram.patch
@@ -1,6 +1,5 @@
-diff -Naur tpb-0.6.4-org/src/tpb.c tpb-0.6.4/src/tpb.c
---- tpb-0.6.4-org/src/tpb.c	2005-07-18 16:15:59.000000000 +0200
-+++ tpb-0.6.4/src/tpb.c	2008-05-13 15:15:34.000000000 +0200
+--- a/src/tpb.c
++++ b/src/tpb.c
 @@ -523,10 +523,10 @@
      /* determine the state of the brightness buttons {{{ */
      if(thinkpad_state.brightness_level != last_thinkpad_state.brightness_level) {
diff --git a/app-laptop/tpb/files/tpb-configure-fix.diff b/app-laptop/tpb/files/tpb-configure-fix.diff
index 7dc4683d158b..32df36a1c119 100644
--- a/app-laptop/tpb/files/tpb-configure-fix.diff
+++ b/app-laptop/tpb/files/tpb-configure-fix.diff
@@ -1,6 +1,5 @@
-diff -aur tpb-0.5.1/configure tpb-0.5.1-patched/configure
---- tpb-0.5.1/configure	2003-04-10 04:06:26.000000000 -0400
-+++ tpb-0.5.1-patched/configure	2003-06-30 12:06:41.000000000 -0400
+--- a/configure
++++ b/configure
 @@ -790,10 +790,10 @@
  
  # additional options
diff --git a/app-laptop/tpb/tpb-0.6.4-r1.ebuild b/app-laptop/tpb/tpb-0.6.4-r1.ebuild
index f8bff7aa3280..660f250b7fc7 100644
--- a/app-laptop/tpb/tpb-0.6.4-r1.ebuild
+++ b/app-laptop/tpb/tpb-0.6.4-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit linux-info eutils
+EAPI=7
+
+inherit linux-info
 
 DESCRIPTION="IBM ThinkPad buttons utility"
 HOMEPAGE="https://savannah.nongnu.org/projects/tpb/"
@@ -21,10 +22,10 @@ DEPEND="${RDEPEND}"
 CONFIG_CHECK="~NVRAM"
 ERROR_NVRAM="${P} requires /dev/nvram support (CONFIG_NVRAM)"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-configure-fix.diff
-	epatch "${FILESDIR}"/${P}-nvram.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-configure-fix.diff
+	"${FILESDIR}"/${P}-nvram.patch
+)
 
 src_configure() {
 	econf \