gentoo resync : 22.05.2021

4 files changed, 14 insertions, 17 deletions

diff --git a/sys-apps/lnxhc/Manifest b/sys-apps/lnxhc/Manifest
index 76bf95baca6b..bbb351cd17c3 100644
--- a/sys-apps/lnxhc/Manifest
+++ b/sys-apps/lnxhc/Manifest
@@ -1,5 +1,5 @@
-AUX lnxhc-1.2-ifconfig-path.patch 654 BLAKE2B 6872b7412c63a1ca3e4d63831269c5a77062f5be777dfb63cd9090131dc045dd0e203ffdec7c5f805788518094b5047e30909e6a61c8d237f3cdf927f42f9adb SHA512 a29bc332e918e44fe3659f520c32df34ca293edc1545534853495a41182f7e28cb049e20e746f4cbf83c30140f4ae450d034e806a4c87e4d642f4ff2cce27cc1
-AUX lnxhc-1.2-usrlocal.patch 1455 BLAKE2B 8d154c43ba460a09366e0b7d93c4fb69309682a49a1346b94c4410e4b49098718c9bfcc3a8a1c5df9ce2dcbef485f65f28d6e6bea08920904dc7ee70ce25b444 SHA512 43be5d638f46caee028802e8675621a7e6ec8499f4490ed1f9df167a8b9b82a3002bac5a28ab3116507eb0eccaad33d865cb64f6cbc4b134717541cd2424087f
+AUX lnxhc-1.2-ifconfig-path.patch 526 BLAKE2B bfec8f4a559c2de09038d351c9e2f69d52cc7a0ef8a0934fcbc74b89937699ee5b6512a761493a8c670a17ba7e7290921f52341c0947dd8bb4648aac717b49e3 SHA512 e1232ceb50866c90b58a3df9ba724efa4748e33706e90402336da24bc41580e2c677af4763800c80e51045a646c0d4cfbd6e1fd6e2080de4d10bac55f5dd5616
+AUX lnxhc-1.2-usrlocal.patch 1303 BLAKE2B 89d1e234f2f88c5da9870f2bae9fbf4175e2eb655b813822a9fbf00ba1cdbd3683d55d02fddf00ab90e94d88c505fec728a5d786c87913d5f381794cddd88be7 SHA512 bcbfd0807446c8b0e1da2926a42ddac58de8572c3eda3a11d05faaa07acf3b86c8f73a2158993a35b6d9fa8bed8ac19e49580336db6b94f4dd5d6608ea70aa3f
 DIST lnxhc-1.2.tar.gz 360869 BLAKE2B d92321f02be65ea8aaacdc55d19c480031c03d162e80207b306ef70f512917c506a27075e9326ff4be67e1ddc233096fdd44cf0ab06073a6b29ff8255f49ead8 SHA512 200ab6443c3b8f4dd99928d2f18b31e8e05c1f9c1f976052017a643430ed87fa08a399e9e8430eafb2925126bd2d90fc4f65ce1c220d6100b71c31fc0505aab0
-EBUILD lnxhc-1.2-r1.ebuild 478 BLAKE2B 8a559080a0ffcc31d44a128aa2e9bd3a460e985d022bb4a0bfec18eb261bdb4fc37c5ed7e1acf6fc27f4956f03ab0ebfacea97bc06a498824ff07d1a2ec12635 SHA512 077981873855788cbcc11f684b8faea428919bd986c8e1d7336046769a8d5b645511bde5cd4c5b879e6afbb5177162a40784de3a72470688ea47a89ae5c94581
+EBUILD lnxhc-1.2-r1.ebuild 435 BLAKE2B 194ab064471a9b72bda2bd8dbc74739990736441c459057091b95b7c197f9d0b72317d2bcc758a3b2ea7f88578e127d1c91f4ec68b8f07851e52d28014380e52 SHA512 491a03eb7a4cef7513cd1a1e06f54578e45bb6ecb344d2669653f5aebcf7b3c3c8115635b55c2464f3ab1612372355a93b1e80d8491c5796b7362fa901465374
 MISC metadata.xml 242 BLAKE2B 869d8b0b4c7fa3b941911743f4a3c17d6a2c608cdbd3ae4cc1e3a84a12282f5197c263d99d1c5836f64c3868ad986d22d40e98f9083e24a8de41da5e305c8db5 SHA512 24a593f580269cba11ab3b8b83d8199b577480e448bbfe04cd2ee49da165537423dc4d38f9f2366a44605c8c70ca43ade3140da5718cc2cad01fc549d217f9c3
diff --git a/sys-apps/lnxhc/files/lnxhc-1.2-ifconfig-path.patch b/sys-apps/lnxhc/files/lnxhc-1.2-ifconfig-path.patch
index 89e184704857..3f6e9e2fd799 100644
--- a/sys-apps/lnxhc/files/lnxhc-1.2-ifconfig-path.patch
+++ b/sys-apps/lnxhc/files/lnxhc-1.2-ifconfig-path.patch
@@ -1,5 +1,5 @@
---- lnxhc-1.2/checks/net_hsi_outbound_errors/definitions
-+++ lnxhc-1.2-patched/checks/net_hsi_outbound_errors/definitions
+--- a/checks/net_hsi_outbound_errors/definitions
++++ b/checks/net_hsi_outbound_errors/definitions
 @@ -9,7 +9,7 @@
  default = "1"
  
@@ -10,8 +10,8 @@
  [exception slow_hsi_receivers]
  severity = medium
 
---- lnxhc-1.2/checks/net_inbound_errors/definitions     2013-02-06 04:08:55.000000000 -0500
-+++ lnxhc-1.2-patched/checks/net_inbound_errors/definitions     2013-05-22 17:13:56.088787813 -0400
+--- a/checks/net_inbound_errors/definitions
++++ b/checks/net_inbound_errors/definitions
 @@ -11,7 +11,7 @@
  # The above value in percentage
  
diff --git a/sys-apps/lnxhc/files/lnxhc-1.2-usrlocal.patch b/sys-apps/lnxhc/files/lnxhc-1.2-usrlocal.patch
index fe237502785f..56599771a7aa 100644
--- a/sys-apps/lnxhc/files/lnxhc-1.2-usrlocal.patch
+++ b/sys-apps/lnxhc/files/lnxhc-1.2-usrlocal.patch
@@ -1,6 +1,5 @@
-diff -ruN lnxhc-1.2/Makefile lnxhc-1.2-patched/Makefile
---- lnxhc-1.2/Makefile	2013-02-06 04:14:17.000000000 -0500
-+++ lnxhc-1.2-patched/Makefile	2013-02-09 13:39:25.096883794 -0500
+--- a/Makefile
++++ b/Makefile
 @@ -71,7 +71,6 @@
  pycheckdir	:= $(libdir)/python/check
  exampledir	:= $(docdir)/examples
diff --git a/sys-apps/lnxhc/lnxhc-1.2-r1.ebuild b/sys-apps/lnxhc/lnxhc-1.2-r1.ebuild
index e45de7621e9b..f2658d42fd1c 100644
--- a/sys-apps/lnxhc/lnxhc-1.2-r1.ebuild
+++ b/sys-apps/lnxhc/lnxhc-1.2-r1.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit epatch
 DESCRIPTION="Linux Health Checker"
 HOMEPAGE="http://lnxhc.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -11,12 +10,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="EPL-1.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND=">=dev-lang/perl-5.8"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.2-usrlocal.patch"
-	epatch "${FILESDIR}/${PN}-1.2-ifconfig-path.patch"
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2-usrlocal.patch
+	"${FILESDIR}"/${PN}-1.2-ifconfig-path.patch
+)