gentoo resync : 28.04.2021

4 files changed, 15 insertions, 16 deletions

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 \