[gentoo-commits] repo/proj/guru:dev commit in: media-gfx/nsxiv/

["Nickolas Raymond Kaczynski" <nrk@disroot.org>]

commit:     023867cdbde34eb3c61780f109456305473d21be
Author:     Nickolas Raymond Kaczynski <nrk <AT> disroot <DOT> org>
AuthorDate: Sat Jan 28 16:26:52 2023 +0000
Commit:     Nickolas Raymond Kaczynski <nrk <AT> disroot <DOT> org>
CommitDate: Sat Jan 28 16:32:04 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=023867cd

media-gfx/nsxiv: add v31, drop v29

Signed-off-by: Nickolas Raymond Kaczynski <nrk <AT> disroot.org>

 media-gfx/nsxiv/Manifest                             |  2 +-
 media-gfx/nsxiv/{nsxiv-29.ebuild => nsxiv-31.ebuild} | 17 ++++++-----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/media-gfx/nsxiv/Manifest b/media-gfx/nsxiv/Manifest
index 28b502a3d..cec12c781 100644
--- a/media-gfx/nsxiv/Manifest
+++ b/media-gfx/nsxiv/Manifest
@@ -1,2 +1,2 @@
-DIST nsxiv-29.tar.gz 64012 BLAKE2B 1b964736619a56cc8fb4092979f12749389fa347e3fda7a40fcfdc1b07a72e101c61d99fb12b10f4ea7ab6459c8068d5c64d754e3e988ec6bfd4504813bcc485 SHA512 d891fc0885f280a622401e105dc1ed9ba39e40f3e760e3e0cd34ae79fdb32187b1d3dc15590bbefd68a18db2aa12795433907e6e744561cc891fc03e7a1f1e94
 DIST nsxiv-30.tar.gz 65642 BLAKE2B 910d1afe2c32e729bf5f848255d5b5d31658b4027f1a44d0e9812e5aac992fe3bb5bc0662aa70aca4f49fba5f3d769c83d5afb098d3ab662883c0b0ccffdb6b0 SHA512 2c852790c5940a8995a5c8a152b6f74198de4640e3827164c8e99855dc06b921c4601ac712a16c801071c656da4a6cd839a6590894f6ab86af35e90b30a8f5af
+DIST nsxiv-31.tar.gz 73821 BLAKE2B f5a5f16d82fb78ce9ae5da341cb481f653dd28db7138529f20b76b4f0a73415e9c5ffa9a8c2dee23ec754d1d7f5451ae631e786a535799b6542ef55ed3548c5a SHA512 f6814f337763f23b569f12ad6d2aa33380b1f5dec0890f0bedb54620a725330fa6518acd6ddabe79c420f0feab01c307bdc91e4ea6141ce1a4528ea0a96addd8

diff --git a/media-gfx/nsxiv/nsxiv-29.ebuild b/media-gfx/nsxiv/nsxiv-31.ebuild
similarity index 80%
rename from media-gfx/nsxiv/nsxiv-29.ebuild
rename to media-gfx/nsxiv/nsxiv-31.ebuild
index 6aa11c535..aef44e615 100644
--- a/media-gfx/nsxiv/nsxiv-29.ebuild
+++ b/media-gfx/nsxiv/nsxiv-31.ebuild
@@ -18,15 +18,13 @@ HOMEPAGE="https://codeberg.org/nsxiv/nsxiv"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+statusbar exif +inotify +gif webp"
+IUSE="+statusbar +inotify exif"
 
 RDEPEND="
 	x11-libs/libX11
-	media-libs/imlib2[X]
+	>=media-libs/imlib2-1.8.0[X]
 	statusbar? ( x11-libs/libXft )
 	exif? ( media-libs/libexif )
-	gif? ( media-libs/giflib:0= )
-	webp? ( media-libs/libwebp )
 "
 DEPEND="${RDEPEND}"
 
@@ -45,17 +43,14 @@ src_prepare() {
 }
 
 src_configure() {
-	sed -i -e '/^install: / s|: all|:|' \
-		-e 's|^CFLAGS =|CFLAGS +=|' \
-		Makefile || die "sed failed"
+	sed -i -e '/^install: / s|: all|:|' Makefile || die "sed failed"
+	sed -i -e 's|^CFLAGS =|CFLAGS +=|' config.mk || die "sed failed"
 }
 
 src_compile() {
 	emake CC="$(tc-getCC)" OPT_DEP_DEFAULT=0 \
 		HAVE_INOTIFY="$(usex inotify 1 0)" \
 		HAVE_LIBFONTS="$(usex statusbar 1 0)" \
-		HAVE_LIBGIF="$(usex gif 1 0)" \
-		HAVE_LIBWEBP="$(usex webp 1 0)" \
 		HAVE_LIBEXIF="$(usex exif 1 0)"
 }
 
@@ -66,7 +61,7 @@ src_install() {
 		EGPREFIX="/usr/share/doc/${P}/examples" \
 		install install-icon
 	dodoc README.md
-	domenu nsxiv.desktop
+	domenu etc/nsxiv.desktop
 
 	save_config config.h
 }
@@ -77,7 +72,7 @@ pkg_postinst() {
 
 	einfo "${PN} uses media-libs/imlib2 for loading images."
 	einfo "To enable/disable support for specific image formats,"
-	einfo "toggle the necessary USE flag for imlib2."
+	einfo "toggle the necessary USE flag for media-libs/imlib2."
 }
 
 pkg_postrm() {