gentoo resync : 28.04.2021

1 files changed, 27 insertions, 14 deletions

diff --git a/games-util/datutil/datutil-2.46.ebuild b/games-util/datutil/datutil-2.46.ebuild
index 8f8c17302ff6..01efdab6239f 100644
--- a/games-util/datutil/datutil-2.46.ebuild
+++ b/games-util/datutil/datutil-2.46.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit toolchain-funcs
 
 DL_PV=2.36
@@ -9,32 +10,44 @@ DESCRIPTION="Converter for dat files for Rom Managers"
 HOMEPAGE="http://www.logiqx.com/Tools/DatUtil/"
 SRC_URI="http://www.logiqx.com/Tools/DatUtil/dutil${PV//.}.zip
 	http://www.logiqx.com/Tools/DatLib/datlib${DL_PV//.}.zip"
+S="${WORKDIR}"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 RESTRICT="mirror bindist"
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S=${WORKDIR}
+BDEPEND="app-arch/unzip"
 
 src_unpack() {
 	unpack dutil${PV//.}.zip
-	cd "${S}"
-	mkdir -p dev/datlib
-	cd dev/datlib
+
+	cd "${S}" || die
+	mkdir -p dev/datlib || die
+	cd dev/datlib || die
+
 	unpack datlib${DL_PV//.}.zip
 }
 
 src_compile() {
 	# Parallel make issue, see bug #244879 (so make the dirs first)
-	emake -j1 CC="$(tc-getCC)" LD="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" \
-	CFLAGS="${CFLAGS} -Idev" LOGIQX=. EXT= UPX=@# dlmaketree maketree || die "emake failed"
-	emake CC="$(tc-getCC)" LD="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" \
-	CFLAGS="${CFLAGS} -Idev" LOGIQX=. EXT= UPX=@# || die "emake failed"
+	emake -j1 \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" \
+		CFLAGS="${CFLAGS} -Idev" \
+		LOGIQX=. \
+		EXT= \
+		UPX=@# \
+		dlmaketree maketree || die "emake failed"
+
+	emake \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" \
+		CFLAGS="${CFLAGS} -Idev" \
+		LOGIQX=. \
+		EXT= \
+		UPX=@# \
+		|| die "emake failed"
 }
 
 src_install() {