gentoo resync : 25.11.2020

5 files changed, 32 insertions, 29 deletions

diff --git a/media-gfx/zgv/Manifest b/media-gfx/zgv/Manifest
index 999cb9f038f7..d11f7812fab6 100644
--- a/media-gfx/zgv/Manifest
+++ b/media-gfx/zgv/Manifest
@@ -1,6 +1,6 @@
-AUX zgv-5.9-Makefile-QA.patch 1906 BLAKE2B a0179372591660f8186b7d7f302819a01bfd44280f616f8e564e3a9ba4a5a0faec14aef2c0f42c54899017918e1d8b239277288f0834c5fff303ea85a16941f4 SHA512 a266ccb673475c2a520c4a28f1859522a3fe9be626080c45fb5f2bdd200d3eeb9f22dab74456910f60369e48d4ed1d5a5a8c9faa3e3a5bda7d9ca82807dba9f0
-AUX zgv-5.9-cmyk-yccl-fix.diff 1554 BLAKE2B df243b6744b73142437a586f2da929a9647b715e59c15332277722ce154dafeacded631ee188380750a2b34a6c5ecb1912e74fd1f248f81fe22eb5732db6c381 SHA512 b2ed44029d87038139137deb068ea55503ca4bb10cb6bf61880115dd913427cdded4e7808eec9947a1b35760efa7547420ea5fa2f0416266d0d307ce6b10cfd3
-AUX zgv-5.9-libpng15.patch 468 BLAKE2B 9567c3bbba21cd7878f7962248ceaab81977a28a347a5eb22bd78c6db4a02ccccd689c82a84b6b5de2a6726d2cdb878edaa34bc7f3848612b9a05f0b1d847672 SHA512 ff7ec6258960381d9cb9c061af67bfb9984a1bae70c0c902a0837787c82bd60ed699e8aa9d76f35a993a76aaf8ea5a9740cffa88fdb0bb654f9b3b09ba3cac00
+AUX zgv-5.9-Makefile-QA.patch 1823 BLAKE2B 95e54001dcc7006b37b72779004e2a3fb9e0ac9d21b34f9906538e722334f1de7a4582f78be2219a8fac3fd5bd802647181a15c2608195e79e1ca51d1c8fa387 SHA512 1d164cc196bc15310db327d65b98de4ef60006bdc69180635b497687941da37e88ae210a62a77bfc0512c7f652cd8f046d337304a237c9ae0f0ffeeb2f3703dc
+AUX zgv-5.9-cmyk-yccl-fix.diff 1546 BLAKE2B 6c06094647394ba0ccef409c58e439a03cc01057611c11052223fb79045da35318c09402be3401c5c8f7f736b519f612311395aae41667ae11ac56c0ad18c410 SHA512 eee145236a4b4499009c2cf8a442d4dfcde22c63281586e4a6b14fdff9ae50976bfe85561f5f3c927697878e9dfe82d73bbe98ee26662bcef1b6948bb7eca45c
+AUX zgv-5.9-libpng15.patch 472 BLAKE2B 7b32e3ad4caaeaf4ea4d9594b14d9d0bdf2aaefaf40b6aea2420a8bade7562755ede5c8a5a8950a2a308a32e5aff1e8919dfa182327732d4d1b8adbe2df310b4 SHA512 845e6304d273df86c71f889be429cfdf66aa075abe0065d395151b3bc4707b63e00ad1fe95a445dcf73952d0368ee72dc46b3ae558a7076b9de0dad13a12f985
 DIST zgv-5.9.tar.gz 395525 BLAKE2B 2b28802c1e5437778d1e65bac1281caf5b783959af0534a99f733c11c2910189439235a11b38214cd229b42f912dc8cdb71cc2a789a5166b09a7cba2cc6d7e45 SHA512 f78d43c1703559f28961d8ce9ed6fc21cbb28b33885f824cc682591bf659d234b6c641f1677d42c592bcb22843854cbbac32ce0911bd1092f76a7ef5bfe31ddf
-EBUILD zgv-5.9.ebuild 1157 BLAKE2B 3cddb4c3ce95cf024c1e620a600735f3d2e6d2fe438d74c695100c9196b80b6107f904e3acfe770df7b17a5796c7cf82df034a21b99ec4ff25a8a4f838f4ad34 SHA512 9471aca8f6be313a79c9b27fc148ce35db5d2b1c1dea99904bbad2f054a5848fc7322874518ae9ac15305a359a00f7831c7f78c5bcdfbb7316e4da1cb015fb48
+EBUILD zgv-5.9.ebuild 1171 BLAKE2B 843310ebb66a10bad90337125e769d69236a7e53f10a386582fc42eff34a53a43c32ba62f847191b82a1c2251ee721bd330b4823705d985d7785844065009253 SHA512 df712de4bacd1b4077c462a4178fbf536f20f718f462b7b9042c4231eed983887f53fb119a067985916486c0586e03650d4b75298d676ff1fddad1d6e2c4091d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/zgv/files/zgv-5.9-Makefile-QA.patch b/media-gfx/zgv/files/zgv-5.9-Makefile-QA.patch
index e4569547d175..6d3a1341ecb5 100644
--- a/media-gfx/zgv/files/zgv-5.9-Makefile-QA.patch
+++ b/media-gfx/zgv/files/zgv-5.9-Makefile-QA.patch
@@ -1,6 +1,5 @@
-diff -NrU5 zgv-5.9.original/src/Makefile zgv-5.9/src/Makefile
---- zgv-5.9.original/src/Makefile	2009-09-28 15:31:29.000000000 -0600
-+++ zgv-5.9/src/Makefile	2009-09-28 15:56:26.000000000 -0600
+--- a/src/Makefile	2009-09-28 15:31:29.000000000 -0600
++++ b/src/Makefile	2009-09-28 15:56:26.000000000 -0600
 @@ -45,11 +45,11 @@
  	readbmp.o readtga.o readpng.o readpcx.o \
  	readxvpic.o readmrf.o readxbm.o readxpm.o \
diff --git a/media-gfx/zgv/files/zgv-5.9-cmyk-yccl-fix.diff b/media-gfx/zgv/files/zgv-5.9-cmyk-yccl-fix.diff
index e510a4ba9ec2..662838c57ee0 100644
--- a/media-gfx/zgv/files/zgv-5.9-cmyk-yccl-fix.diff
+++ b/media-gfx/zgv/files/zgv-5.9-cmyk-yccl-fix.diff
@@ -1,5 +1,5 @@
---- zgv-5.9/src/readjpeg.c	Sun Oct 31 14:54:26 2004
-+++ zgv/src/readjpeg.c	Wed Sep 21 21:03:22 2005
+--- a/src/readjpeg.c	Sun Oct 31 14:54:26 2004
++++ b/src/readjpeg.c	Wed Sep 21 21:03:22 2005
 @@ -92,11 +92,13 @@
  	int *real_width,int *real_height)
  {
diff --git a/media-gfx/zgv/files/zgv-5.9-libpng15.patch b/media-gfx/zgv/files/zgv-5.9-libpng15.patch
index 2f12532831de..3d7e4ecb5df1 100644
--- a/media-gfx/zgv/files/zgv-5.9-libpng15.patch
+++ b/media-gfx/zgv/files/zgv-5.9-libpng15.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/389591
 
---- src/readpng.c
-+++ src/readpng.c
+--- a/src/readpng.c
++++ b/src/readpng.c
 @@ -63,7 +63,7 @@
  use_errmsg=1;
  
diff --git a/media-gfx/zgv/zgv-5.9.ebuild b/media-gfx/zgv/zgv-5.9.ebuild
index c5761d43e5fa..c22ba876d4a3 100644
--- a/media-gfx/zgv/zgv-5.9.ebuild
+++ b/media-gfx/zgv/zgv-5.9.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="A svgalib console image viewer"
 HOMEPAGE="http://www.svgalib.org/rus/zgv/"
@@ -11,24 +12,27 @@ SRC_URI="http://www.svgalib.org/rus/zgv/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
-IUSE=""
 
-RDEPEND=">=media-libs/svgalib-1.4.2
-	virtual/jpeg
+RDEPEND="
 	media-libs/libpng
+	>=media-libs/svgalib-1.4.2
 	>=media-libs/tiff-3.5.5
+	sys-apps/gawk
 	>=sys-libs/zlib-1.1.4
-	sys-apps/gawk"
+	virtual/jpeg
+"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-Makefile-QA.patch
+	"${FILESDIR}"/${P}-cmyk-yccl-fix.diff
+	"${FILESDIR}"/${P}-libpng15.patch
+)
+
 src_prepare() {
 	sed -i -e "/^CFLAGS=/s:=.*:=${CFLAGS}:" config.mk || die
 	sed -i -e 's:$(RM):echo:' doc/Makefile || die
-
-	epatch \
-		"${FILESDIR}"/${P}-Makefile-QA.patch \
-		"${FILESDIR}"/${P}-cmyk-yccl-fix.diff \
-		"${FILESDIR}"/${P}-libpng15.patch
+	default
 }
 
 src_compile() {
@@ -39,18 +43,18 @@ src_install() {
 	dodir /usr/bin /usr/share/info /usr/share/man/man1
 
 	emake \
-		PREFIX="${D}"/usr \
-		INFODIR="${D}"/usr/share/info \
-		MANDIR="${D}"/usr/share/man/man1 \
+		PREFIX="${ED}"/usr \
+		INFODIR="${ED}"/usr/share/info \
+		MANDIR="${ED}"/usr/share/man/man1 \
 		install
 
 	dodoc AUTHORS ChangeLog INSTALL NEWS README* SECURITY TODO
 
 	# Fix info files
 	cd "${D}"/usr/share/info
-	rm dir*
-	mv zgv zgv.info
+	rm dir* || die
+	mv zgv zgv.info || die
 	for i in 1 2 3 4 ; do
-		mv zgv-$i zgv.info-$i
+		mv zgv-$i zgv.info-$i || die
 	done
 }