From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 46A6D138359 for ; Sun, 4 Oct 2020 23:20:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6C04BE086E; Sun, 4 Oct 2020 23:20:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 41F22E086E for ; Sun, 4 Oct 2020 23:20:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5353E335DC3 for ; Sun, 4 Oct 2020 23:20:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BE78B343 for ; Sun, 4 Oct 2020 23:20:35 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1601853620.92286876cdcb2909101096daf5cd5b1515d89f40.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/zgv/, media-gfx/zgv/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/zgv/files/zgv-5.9-Makefile-QA.patch media-gfx/zgv/files/zgv-5.9-cmyk-yccl-fix.diff media-gfx/zgv/files/zgv-5.9-libpng15.patch media-gfx/zgv/zgv-5.9.ebuild X-VCS-Directories: media-gfx/zgv/ media-gfx/zgv/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 92286876cdcb2909101096daf5cd5b1515d89f40 X-VCS-Branch: master Date: Sun, 4 Oct 2020 23:20:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9c03b610-1cf1-4f7e-91c1-f72abd1a8c33 X-Archives-Hash: 397afda3669909a64c42cad907798282 commit: 92286876cdcb2909101096daf5cd5b1515d89f40 Author: Sam James gentoo org> AuthorDate: Sun Oct 4 23:20:20 2020 +0000 Commit: Sam James gentoo org> CommitDate: Sun Oct 4 23:20:20 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92286876 media-gfx/zgv: port to EAPI 7 Closes: https://bugs.gentoo.org/746023 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Sam James gentoo.org> media-gfx/zgv/files/zgv-5.9-Makefile-QA.patch | 5 ++-- media-gfx/zgv/files/zgv-5.9-cmyk-yccl-fix.diff | 4 +-- media-gfx/zgv/files/zgv-5.9-libpng15.patch | 4 +-- media-gfx/zgv/zgv-5.9.ebuild | 40 ++++++++++++++------------ 4 files changed, 28 insertions(+), 25 deletions(-) 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 e4569547d17..6d3a1341ecb 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 e510a4ba9ec..662838c57ee 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 2f12532831d..3d7e4ecb5df 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 c5761d43e5f..c22ba876d4a 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 }