[gentoo-commits] repo/gentoo:master commit in: app-laptop/tpb/files/, app-laptop/tpb/

[Sam James]

commit:     f31d79bb72edfeeadb1b85a96159a045b2c774e5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 19 20:35:03 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 19 20:54:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f31d79bb

app-laptop/tpb: port to EAPI 7

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-laptop/tpb/files/tpb-0.6.4-nvram.patch  |  5 ++---
 app-laptop/tpb/files/tpb-configure-fix.diff |  5 ++---
 app-laptop/tpb/tpb-0.6.4-r1.ebuild          | 13 +++++++------
 3 files changed, 11 insertions(+), 12 deletions(-)

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 1ead9cbe592..c217b5300c9 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 7dc4683d158..32df36a1c11 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 ee68708eff7..660f250b7fc 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-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit linux-info epatch
+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 \