games-util/dzip: port to EAPI 7, eutils--

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

4 files changed, 31 insertions, 23 deletions

diff --git a/games-util/dzip/dzip-2.9-r3.ebuild b/games-util/dzip/dzip-2.9-r3.ebuild
index c5b3149a68d0..b91f030becb0 100644
--- a/games-util/dzip/dzip-2.9-r3.ebuild
+++ b/games-util/dzip/dzip-2.9-r3.ebuild
@@ -1,27 +1,35 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="compressor/uncompressor for demo recordings from id's Quake"
 HOMEPAGE="http://speeddemosarchive.com/dzip/"
 SRC_URI="http://speeddemosarchive.com/dzip/dz${PV/./}src.zip"
+S="${WORKDIR}"
 
 LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="app-arch/unzip"
-RDEPEND=""
 
-S="${WORKDIR}"
+BDEPEND="app-arch/unzip"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-system-zlib-r2.patch
+	"${FILESDIR}"/${P}-scrub-names.patch #93079
+	"${FILESDIR}"/dzip-amd64.diff
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-system-zlib-r2.patch
-	epatch "${FILESDIR}"/${P}-scrub-names.patch #93079
-	epatch "${FILESDIR}/dzip-amd64.diff"
-	mv -f Makefile{.linux,}
+	default
+
+	mv -f Makefile{.linux,} || die
+}
+
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
diff --git a/games-util/dzip/files/dzip-2.9-scrub-names.patch b/games-util/dzip/files/dzip-2.9-scrub-names.patch
index 079fae3fd070..01fbc53ec26c 100644
--- a/games-util/dzip/files/dzip-2.9-scrub-names.patch
+++ b/games-util/dzip/files/dzip-2.9-scrub-names.patch
@@ -9,8 +9,8 @@ we strip out all the components which ascend in the directory tree
 
 http://bugs.gentoo.org/93079
 
---- main.c
-+++ main.c
+--- a/main.c
++++ b/main.c
 @@ -77,6 +77,48 @@ int dzRead (int inlen)
  	return 1;

  }
@@ -68,8 +68,8 @@ http://bugs.gentoo.org/93079
  	if (de->pak && de->type != TYPE_PAK)
  		return 1;	/* dont mess with dirchar inside pakfiles */
  	do
---- v1code.c
-+++ v1code.c
+--- a/v1code.c
++++ b/v1code.c
 @@ -201,6 +201,7 @@ void demv1_dxentities(void)
  
  }
diff --git a/games-util/dzip/files/dzip-2.9-system-zlib-r2.patch b/games-util/dzip/files/dzip-2.9-system-zlib-r2.patch
index 4bf10f8b98f6..668ef369dfe0 100644
--- a/games-util/dzip/files/dzip-2.9-system-zlib-r2.patch
+++ b/games-util/dzip/files/dzip-2.9-system-zlib-r2.patch
@@ -1,5 +1,5 @@
---- dzip.h
-+++ dzip.h
+--- a/dzip.h
++++ b/dzip.h
 @@ -2,7 +2,7 @@
  #include <stdlib.h>

  #include <string.h>

@@ -16,8 +16,8 @@
 -#endif
 \ No newline at end of file
 +#endif

---- Makefile.linux
-+++ Makefile.linux
+--- a/Makefile.linux
++++ b/Makefile.linux
 @@ -1,18 +1,17 @@
  # Makefile for linux

  

@@ -50,8 +50,8 @@
 -v1code.o: v1code.c dzip.h dzipcon.h
 \ No newline at end of file
 +v1code.o: v1code.c dzip.h dzipcon.h

---- conmain.c.orig	2010-01-17 15:10:20.938605770 +0000
-+++ conmain.c	2010-01-17 15:10:34.180603846 +0000
+--- a/conmain.c
++++ b/conmain.c
 @@ -507,8 +507,8 @@
  		if (!strcmp(argv[i],"-o")) i++;

  	}

diff --git a/games-util/dzip/files/dzip-amd64.diff b/games-util/dzip/files/dzip-amd64.diff
index ef49ff330570..60d4a524b001 100644
--- a/games-util/dzip/files/dzip-amd64.diff
+++ b/games-util/dzip/files/dzip-amd64.diff
@@ -1,5 +1,5 @@
---- dzip/crc32.c	2002-07-12 06:07:54.000000000 +0200
-+++ dz/crc32.c	2010-01-20 23:23:43.000000000 +0100
+--- a/crc32.c
++++ b/crc32.c
 @@ -1,10 +1,12 @@
 +#include <stdint.h>
 +