3 files changed, 35 insertions, 24 deletions
diff --git a/media-gfx/xli/Manifest b/media-gfx/xli/Manifest
index e90a2e216b97..4ac04f0a5637 100644
--- a/media-gfx/xli/Manifest
+++ b/media-gfx/xli/Manifest
@@ -1,7 +1,7 @@
 AUX Xli.ad 123 BLAKE2B 4ea6d6b8b4e0ddf53ac1e5fb1fc67c000b48843e114b3349a9021096ee27af135c998f2013377c2b31cc2885f2eaf627ce343d25fd5cad407a4def92a87bb192 SHA512 a37a8054e1533bc46f0e24b88137bf2ea8a7294f16e37edd6c323f42d28bfa0dc93b74d41fb1cb3df3488754db42fb5a269c42ae08dade61f22b8c42c8cd9c8b
 AUX xli-1.17.0-fix-scale-zoom.patch 1942 BLAKE2B fefbcbec8d9dba30fc1435fc998e37116ffa22ccb752840e999d95aa227d74b16f76dd704840be404910c5d1bc340de57e8108b8a7e4edc58cd5fc6dce4299a2 SHA512 b77348b83e26b0684cf7292100bbdbbd2c3f7b025f14588f7b52935d997b7ca51c3aad70479ce74cd9193a045436b39233b7ebb1fea6abcdf3d3a9dc21c8b84f
-AUX xli-1.17.0-libpng14.patch 241 BLAKE2B c4894ae4a5b879d8ac961d064da80d1518d0ed9a47946c21f9a701b89361e94f0d4d2b05926f6c14be4a558707601e84352bb689847a1f01d83cae6eb25c9d02 SHA512 e5a2de3525198d323ae6c89ab9b0455559761cd4f6b86b719934bc77e31582cd557090766875d97512cb60a42e88653f5dc204dffa9ae1370695c73bfc2231b1
+AUX xli-1.17.0-libpng14.patch 245 BLAKE2B 681fd31f8d7f812272e54dc67de31ece9a936f4608d339e9d63fe7bdc2ba257d20d7ce01fb00b120662557bdfa44b908bbeb4e136665abdadeb062c1425e7af7 SHA512 079162bfd639994ea6553b49f9370faf5becee8ec1e99a1e71f43e32968f244c5a393433fba8920a399a9eb8bc4a3ec6097903bd2eaff46bdeef55f1f90d1fcf
 AUX xli-security-gentoo.diff 6940 BLAKE2B 907fd85a2b248083380ae2210665dd9c251a7d528a93b1e2dffd149827f4900cab54b84b8a0be67c198a73d180cf31f4c8cdd7c4a37a3a8c5b30718babd5b1bf SHA512 b992219eb4b89bfee57429afbf67be6d6a04051b50de6e814c84c1adb209494d2faff15a228b43a992530fbeac83f15a94e9c1988982f98eabf287c26716671e
 DIST xli-2005-02-27.tar.gz 201011 BLAKE2B c16f40368a7c55cb7d31777662e4e9c1515232904df4f6f0e7fdc4daf44fdafaa0a3d9d8298493dac9352fa10eaf5d2984f9e66832ca0bfd07d9e6d551f4dca5 SHA512 132b28396ebf3832dc35ff5fa7c102539ef30a194512fe6577ce1432bb84ecd7b4368e75eaf59f26a806900f63e1bfb9a93487ce1ebe3cfef2199256a783ccf7
-EBUILD xli-1.17.0-r5.ebuild 1952 BLAKE2B 5ab86022919ffd8a3310873f34570e99df53b92b6ee30ed7282ef0239447aea7e3cfcf0578cb0ad399d6cfbefa83e8eda55eaa2e1339cb313a0ba1323434378c SHA512 2a78201598ecddc731f1c5aac8c52de98f5e408c74165c0b42c3d85fa14ce1cc8fed0151eb3def6e64c805d53c45e94e417847572b0be28ec2ffc1ec5a0cf73f
+EBUILD xli-1.17.0-r5.ebuild 2070 BLAKE2B 924a33bcab38adf00affd98b624a622b1972731d1ba29febe8ab4a03b733cd9e37f2a04facc68c9a2d34274d269c36217ce05a5b0518edc52561b30d403e55e3 SHA512 5e86436169daab208443f43119c8823d3bc3a82525c25c1211333e0d23a22d9901c7b5acd6211d16ac1982cca3e4405c4fa49546f0bd11318cb0ece5dc25caaa
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
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 afb4b24208d7..992a0cc79ff9 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 9439e0b09532..c04527ac7b8b 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
-	!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,18 +53,20 @@ 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() {
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
 }
 
 src_compile() {
-	xmkmf || die
-	emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" EXTRA_LDOPTIONS="${LDFLAGS}"
+	local myemakeargs=(
+		CC="$(tc-getCC)"
+		CDEBUGFLAGS="${CFLAGS}"
+		EXTRA_LDOPTIONS="${LDFLAGS}"
+	)
+	emake "${myemakeargs[@]}"
 }
 
 src_install() {
@@ -64,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