From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 28 Apr 2021 20:21:43 +0100
Subject: gentoo resync : 28.04.2021

---
 app-misc/hexcompare/Manifest                         |  4 ++--
 .../hexcompare/files/hexcompare-1.0.4-Makefile.patch |  6 +++---
 app-misc/hexcompare/hexcompare-1.0.4.ebuild          | 20 ++++++++++++--------
 3 files changed, 17 insertions(+), 13 deletions(-)

(limited to 'app-misc/hexcompare')

diff --git a/app-misc/hexcompare/Manifest b/app-misc/hexcompare/Manifest
index f2b807a10077..aae80c5fa5ef 100644
--- a/app-misc/hexcompare/Manifest
+++ b/app-misc/hexcompare/Manifest
@@ -1,4 +1,4 @@
-AUX hexcompare-1.0.4-Makefile.patch 445 BLAKE2B 68b34176c976109a2c9b7cc17b88b92f877f2f05784bc726907ae2c28b4923d8f0649fd3fefa987e04c0b996ac2da1ab4789f90162c4eed7b3db3b70add229df SHA512 8f66e5b080d41906ea9301c066a51f5869a7274e29a6a1391ea81d129dfc88682f035c1ab57319199d5e82020fac7e96e2666fec362a5605d562dc5826448a4b
+AUX hexcompare-1.0.4-Makefile.patch 421 BLAKE2B 1a53eaef556230f59294f94492ce848e722bc3600d3d70fd1ad7b7e26ae061e3fc34b5ef6175e605a1b98fa226b1e2935c8c8cec2adae18bfd5b55cfaae59cd8 SHA512 b32d3eb656bd7c5021e0d4fb98fb5b1b4338d9ecd7e1efaa7f7ff4f8de536df53aaa1edd344653d65535524b9287d65e85938eb6de42998b7113c0f4f31626ad
 DIST hexcompare-1.0.4.tar.gz 9686 BLAKE2B 930004101504ec2bce1aaadac03a221e29e4668cf58591292510d3c66effbdd5f91fc405fc4d55d9116ec3ba260c91927371c8768e01ccf4169cb6d955642128 SHA512 847bf7e26f27aa0ff56e38b3fe95ad7940a0226e0c496963530fa405d8a3a50f8288a4c7f28d48d4cce05e52c1f69180917a7f10da0943cabf977f78b62eb5fe
-EBUILD hexcompare-1.0.4.ebuild 533 BLAKE2B d937143767bad3cefbf91c9533bf4411b6202b9372a335e230e2f99070597031fdeaa3051cb0ce460ae97e40bd2c2277e297bf6636e62bcbbc762b5c72deeb7d SHA512 3718883457b7dc577392c254d7d4345aee25c0a56e33051383247a40b01f0da8adccea3ce3802f20398f8362ad5154ab615c76a5456365f3f366ac57d628d181
+EBUILD hexcompare-1.0.4.ebuild 572 BLAKE2B 3f782625dc21ef157c69c131df6711ff32944247c34c51672ca34b8fd9ea2fd13f1398e88e53e14f58cf399fb80361e1e6884c8f93ffd3a9c2ba3ebe03c6da61 SHA512 29f0f62942b94b746381aa81285a3a40ad6543273281678dd718dde9916630c8e324b7eccf599d490ce1c341dae969ea95ec2773f672153c7eefc7cb1337e438
 MISC metadata.xml 247 BLAKE2B 3362ea9ddb31607fa1426a03bc8be5d5a0b41d13ee83d637244cd31e1a92a894c9cd49b540d3e8a640947386b60ad100ad480bdd0222bbb89357c59bb2aad23d SHA512 1d627a295a24a74a48994cb68bf025f3a945fce6933ec14f9ca0bdf962839d40c31820e27fd70e8119dd75f6c02cb2303c558a9e3a818b96988670f4a2bc16dd
diff --git a/app-misc/hexcompare/files/hexcompare-1.0.4-Makefile.patch b/app-misc/hexcompare/files/hexcompare-1.0.4-Makefile.patch
index 5ccef2047bc7..2af79a1d2967 100644
--- a/app-misc/hexcompare/files/hexcompare-1.0.4-Makefile.patch
+++ b/app-misc/hexcompare/files/hexcompare-1.0.4-Makefile.patch
@@ -1,5 +1,5 @@
---- hexcompare-1.0.4/Makefile
-+++ hexcompare-1.0.4/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -1,9 +1,9 @@
 -CFLAGS = -O3 -Wall -Wextra -pedantic -Wformat-security -std=gnu89
 +CFLAGS += -Wall -Wextra -pedantic -Wformat-security -std=gnu89
@@ -8,7 +8,7 @@
  
  hexcompare: main.c gui.c
 -	$(CC) $(CFLAGS) -o hexcompare main.c gui.c -lncurses
-+	$(CC) $(CFLAGS) `pkg-config --cflags ncurses` -o hexcompare main.c gui.c `pkg-config --libs ncurses`
++	$(CC) $(CFLAGS) `${PKG_CONFIG} --cflags ncurses` -o hexcompare main.c gui.c `${PKG_CONFIG} --libs ncurses`
  
  clean:
  	rm -f *.o
diff --git a/app-misc/hexcompare/hexcompare-1.0.4.ebuild b/app-misc/hexcompare/hexcompare-1.0.4.ebuild
index 7b11bccd5ad8..597e96bc2ffb 100644
--- a/app-misc/hexcompare/hexcompare-1.0.4.ebuild
+++ b/app-misc/hexcompare/hexcompare-1.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="ncurses-based visual comparison of binary files"
 HOMEPAGE="http://hexcompare.sourceforge.net/"
@@ -12,14 +12,18 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND="sys-libs/ncurses:0"
+RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-Makefile.patch
-	tc-export CC
+PATCHES=(
+	"${FILESDIR}"/${P}-Makefile.patch
+)
+
+src_configure() {
+	tc-export CC PKG_CONFIG
+	default
 }
 
 src_install() {
-- 
cgit v1.2.3