[gentoo-commits] repo/gentoo:master commit in: media-gfx/xli/, media-gfx/xli/files/

[Sam James]

commit:     22193d0cc7756daa0ccc0c075214a7516ed3f836
Author:     Ionen Wolkens <sudinave <AT> gmail <DOT> com>
AuthorDate: Thu Apr 15 19:09:27 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 16 04:46:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22193d0c

media-gfx/xli: EAPI-7 bump, eutils drop, tidy

EPATCH_OPTS="-F3 -l" wasn't needed, patch applies entirely cleanly.

Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/xli/files/xli-1.17.0-libpng14.patch |  4 +--
 media-gfx/xli/xli-1.17.0-r5.ebuild            | 47 +++++++++++++++------------
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/media-gfx/xli/files/xli-1.17.0-libpng14.patch b/media-gfx/xli/files/xli-1.17.0-libpng14.patch
index afb4b24208d..992a0cc79ff 100644
--- a/media-gfx/xli/files/xli-1.17.0-libpng14.patch
+++ b/media-gfx/xli/files/xli-1.17.0-libpng14.patch
@@ -1,8 +1,8 @@
 http://aur.archlinux.org/packages.php?ID=1676
 http://archwyrm.net/~me/xli-libpng.diff
 
---- png.c
-+++ png.c
+--- a/png.c
++++ b/png.c
 @@ -27,7 +27,7 @@
  	if (ret != 8)
  		return 0;

diff --git a/media-gfx/xli/xli-1.17.0-r5.ebuild b/media-gfx/xli/xli-1.17.0-r5.ebuild
index d68f42ffcf6..c04527ac7b8 100644
--- a/media-gfx/xli/xli-1.17.0-r5.ebuild
+++ b/media-gfx/xli/xli-1.17.0-r5.ebuild
@@ -1,34 +1,43 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 SNAPSHOT="2005-02-27"
 DESCRIPTION="X Load Image: view images or load them to root window"
 HOMEPAGE="ftp://ftp.ibiblio.org/pub/Linux/apps/graphics/viewers/X/xli-1.16.README"
 SRC_URI="http://pantransit.reptiles.org/prog/xli/xli-${SNAPSHOT}.tar.gz"
+S="${WORKDIR}/${PN}-${SNAPSHOT}"
 
 LICENSE="HPND"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
-RDEPEND="app-arch/bzip2
-	>=media-libs/libpng-1.0.5
-	>=sys-libs/zlib-1.1.4
+RDEPEND="
+	app-arch/bzip2:=
+	>=media-libs/libpng-1.0.5:=
+	>=sys-libs/zlib-1.1.4:=
 	virtual/jpeg:0
-	x11-libs/libXext"
-
-DEPEND="${RDEPEND}
+	x11-libs/libXext
+	!media-gfx/xloadimage"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-text/rman
 	x11-base/xorg-proto
-	>=x11-misc/imake-1.0.8-r1
-	!media-gfx/xloadimage"
+	>=x11-misc/imake-1.0.8-r1"
 
-S=${WORKDIR}/${PN}-${SNAPSHOT}
+PATCHES=(
+	"${FILESDIR}"/xli-security-gentoo.diff
+	"${FILESDIR}"/${P}-fix-scale-zoom.patch #282979
+	"${FILESDIR}"/${P}-libpng14.patch
+)
+DOCS=( README README.xloadimage ABOUTGAMMA TODO chkgamma.jpg )
 
 src_prepare() {
+	default
+
 	# avoid conflicts on systems that have zopen in system headers
 	sed -i -e "s:zopen:xli_zopen:g" *
 
@@ -44,13 +53,6 @@ src_prepare() {
 	# This hack will allow xli to compile using gcc-3.3
 	sed -i rlelib.c \
 		-e 's/#include <varargs.h>//'
-
-	# fix potential security issues.
-	EPATCH_OPTS="-F3 -l" epatch "${FILESDIR}"/xli-security-gentoo.diff
-
-	# Fix scale per bug 282979
-	epatch "${FILESDIR}"/${P}-fix-scale-zoom.patch \
-		"${FILESDIR}"/${P}-libpng14.patch
 }
 
 src_configure() {
@@ -59,7 +61,12 @@ src_configure() {
 }
 
 src_compile() {
-	emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" EXTRA_LDOPTIONS="${LDFLAGS}"
+	local myemakeargs=(
+		CC="$(tc-getCC)"
+		CDEBUGFLAGS="${CFLAGS}"
+		EXTRA_LDOPTIONS="${LDFLAGS}"
+	)
+	emake "${myemakeargs[@]}"
 }
 
 src_install() {
@@ -68,10 +75,10 @@ src_install() {
 	dosym xli /usr/bin/xsetbg
 	dosym xli /usr/bin/xview
 
-	dodoc README README.xloadimage ABOUTGAMMA TODO chkgamma.jpg
 	newman xli.man xli.1
 	newman xliguide.man xliguide.1
 	newman xlito.man xlito.1
+	einstalldocs
 
 	insinto /etc/X11/app-defaults
 	newins "${FILESDIR}"/Xli.ad Xli