gentoo resync : 28.04.2021

5 files changed, 35 insertions, 27 deletions

diff --git a/games-util/dzip/Manifest b/games-util/dzip/Manifest
index a96497afb2ff..6b12967a7e83 100644
--- a/games-util/dzip/Manifest
+++ b/games-util/dzip/Manifest
@@ -1,6 +1,6 @@
-AUX dzip-2.9-scrub-names.patch 1816 BLAKE2B e56b4086e70ff682e8163dc8f6c7620882f7b4ee9245111da93faca8a5cee1fb0aa9422dc03451ff1c147664adc6dec34da0a1a99ec31c4f56179b37fcd6ea10 SHA512 94fceecee4538bb0d0aac460d864ebb4bbbb3ad3aa6be7593115bc850e19b1630bceb2df9268e569a30457e8b2483b3678199629b78d192dcdf3bee0b00178c8
-AUX dzip-2.9-system-zlib-r2.patch 1844 BLAKE2B ebaa30eb9100cd616c4986240d6ba2c360a2cbd17d16aa67172bbae41da1be92aeb77ec3af942a8f0c86029c29ad92900ba991020388a43eab050ca28d799a5f SHA512 04e95334b03b1590bfd73cd5905186a8ba28a36655b9c829dcd913842c0f2c2802133d453134080f3a4664ec106e7693482b43981c5849ecc1a781a7f37b0625
-AUX dzip-amd64.diff 643 BLAKE2B 6752ccdab94f080cc0905bceabfe4d49fdd007c366fb10f833e5d85935ce1f206c5ba39be7f7414ed1dd0f01f16995ed17e36c341e8accc4530ff75a5c88f43f SHA512 30a381f95807cc61b8c393f3e5fb5c1f250e4578b1601f5ee8944c7b94a3d3f983478075cee3c76858b5d0df768b6bd3e91578e6679f443fb8d6f7fa30b48f18
+AUX dzip-2.9-scrub-names.patch 1824 BLAKE2B c8e9b3129608fde1cc8fb19c07bfda5ef2c1b5e9ac0c9e9917b77503a8ed8a28a5aba309e932f142143d8b55ae38a3bebcfea0861521e2117aad2d8ca8652013 SHA512 09308ba2025076c576f7dc50cae685c9ec411833603d9ed5004b363576a7c5422592adbf1de558a1d7a66772dcba2a19f6d19815cc06e62bb3d53281fb0a8309
+AUX dzip-2.9-system-zlib-r2.patch 1779 BLAKE2B 95072d4db4780c2be65740166a30c050bf51f8552af3eb2b45c0c8d15fa14a0a9c76264ec791dbfc21dd5800c7d3529a84a16d7637e62ab903b0980909db3468 SHA512 24c5394b8bfc09db5b69aead8031bef6d6e476072227f713e5c657d1acf75908a638c5c437aade17501fd88f92d10fb28f0163c8a36682a90770438ab6932d4c
+AUX dzip-amd64.diff 567 BLAKE2B 0318e1e1b76e4bb07f462efd9faa308f33b6d2c0f53d68e36b6e379da3ee1847681bcdfce9dda66466e03104ff4c7d7849bc393282ec90687207657c1f1a0551 SHA512 d8fe92e011c34c6ec7812c29d55fe508d704cc3d0430f5de10c9f242580af9f101a3c8d2f94db43b85ba1ad60c3d3b7b8b79530ef7fe6caf7c93829159142818
 DIST dz29src.zip 100354 BLAKE2B 1b0ab969daa030c135dab049f9950079f0337ca64636765298316e699614dfe3c139b0b88321c29278aadbe6b93ca75f2d656e82ae2dbf54b98f19d9fd3053d9 SHA512 3e1071da6ae5c9064b7222f1bb553b787ded4acbfe8463a7a94f17e60748b68cdfc17672ef7220deddd394c6709efe632e53e61508fd48bfa9001e43a37e788f
-EBUILD dzip-2.9-r3.ebuild 644 BLAKE2B cb5e42252c4e6d7e2b9a217c4ff609779b1d0e9b13b35021d5d9363dfe1bb9b90d03622751d08115747cff4baf2e18b2223173445ce77389dd59dfe370972c2b SHA512 824033ed7bd9ec819a257078cb0f510fee4435131960984efd136d0b0838475b2a1bcb29317beb0dbf9257280bfc6cc75c8d800c822d6b5d59d4e3c7f82de55e
+EBUILD dzip-2.9-r3.ebuild 680 BLAKE2B f899af8102b35e45d3923e795b033d9386792a3e0c05d5eb5f381f72fcf7e4f871ab473aacf0068d4de6f8a7db569e661405c54d88179630b34223c8d43eba3f SHA512 09707b1a5068df0a2544bc5195e79d6efa752488740d77317fda6fe84e260004f37fccef601ae623791d465c189637af0b91d03ef601a3552d815432481fc418
 MISC metadata.xml 326 BLAKE2B 24ee80a289a9dc670ba0592e623568a083bff065c740db1dfeb877329aa2f12b59eb20491f488f6311afd3e8df849c123013503fdf2ef739ee9c357f965e5797 SHA512 a1550e2953010f4593e3c7cbe54783f4e0a5859f58e756b6cde50c0d404ca10f8eb0f43df223c6f7df454429d90f496a99aee08f68c8830a1aa396e1febcbe7c
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>
 +