media-gfx/nsxiv: drop v28 and some useflags

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Nickolas Raymond Kaczynski <nrk@disroot.org>

5 files changed, 16 insertions, 90 deletions

diff --git a/media-gfx/nsxiv/Manifest b/media-gfx/nsxiv/Manifest
index 6969ab8c5..420b5ad97 100644
--- a/media-gfx/nsxiv/Manifest
+++ b/media-gfx/nsxiv/Manifest
@@ -1,2 +1 @@
-DIST nsxiv-28.tar.gz 60699 BLAKE2B d52d5933005492c55b0133b594a2b9613443324aca22ffe48dff90bdc62afc6cd48eac14ed578db9fcff5d147b5b6020edaf538335f9b26499232d0670935a3e SHA512 a1d61dc57f41e5b50225dd1e8120b8f1e31b042d43f7443ec27d2fc227e8eb98e96116357e8329011b7ca9aac10e7f0f2259bad3b57fbb1b2951a8fe4d8930bf
 DIST nsxiv-29.tar.gz 64012 BLAKE2B 1b964736619a56cc8fb4092979f12749389fa347e3fda7a40fcfdc1b07a72e101c61d99fb12b10f4ea7ab6459c8068d5c64d754e3e988ec6bfd4504813bcc485 SHA512 d891fc0885f280a622401e105dc1ed9ba39e40f3e760e3e0cd34ae79fdb32187b1d3dc15590bbefd68a18db2aa12795433907e6e744561cc891fc03e7a1f1e94
diff --git a/media-gfx/nsxiv/metadata.xml b/media-gfx/nsxiv/metadata.xml
index 69904dd36..9b518bd51 100644
--- a/media-gfx/nsxiv/metadata.xml
+++ b/media-gfx/nsxiv/metadata.xml
@@ -9,5 +9,7 @@
 	</upstream>
 	<use>
 		<flag name="statusbar">Add statusbar support</flag>
+		<flag name="gif">Add animated gif support</flag>
+		<flag name="webp">Add animated webp support</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-gfx/nsxiv/nsxiv-28.ebuild b/media-gfx/nsxiv/nsxiv-28.ebuild
deleted file mode 100644
index 6c5bd08ad..000000000
--- a/media-gfx/nsxiv/nsxiv-28.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg-utils savedconfig toolchain-funcs linux-info
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/nsxiv/nsxiv.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/nsxiv/nsxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Neo (or New or Not) Simple (or Small or Suckless) X Image Viewer"
-HOMEPAGE="https://github.com/nsxiv/nsxiv"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+statusbar exif +inotify +gif +jpeg +png webp tiff"
-
-RDEPEND="
-	statusbar? ( x11-libs/libXft )
-	exif? ( media-libs/libexif )
-	gif? ( media-libs/giflib:0= )
-	webp? ( media-libs/libwebp )
-	media-libs/imlib2[X,gif?,jpeg?,png?,webp?,tiff?]
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	if use inotify; then
-		CONFIG_CHECK+=" ~INOTIFY_USER"
-		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	restore_config config.h
-}
-
-src_configure() {
-	sed -i  -e '/^install: / s|: all|:|' \
-		-e 's|^CFLAGS ?=|CFLAGS +=|' \
-		Makefile || 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)"
-}
-
-src_install() {
-	export DESTDIR="${ED}"
-	export PREFIX="/usr"
-	export EGPREFIX="${PREFIX}/share/doc/${P}/examples"
-
-	emake install
-	emake install-icon
-	dodoc README.md
-	domenu nsxiv.desktop
-
-	save_config config.h
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/media-gfx/nsxiv/nsxiv-29.ebuild b/media-gfx/nsxiv/nsxiv-29.ebuild
index 615ed9c70..20d5ea1cc 100644
--- a/media-gfx/nsxiv/nsxiv-29.ebuild
+++ b/media-gfx/nsxiv/nsxiv-29.ebuild
@@ -18,15 +18,15 @@ HOMEPAGE="https://github.com/nsxiv/nsxiv"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+statusbar exif +inotify +gif +jpeg +png webp tiff"
+IUSE="+statusbar exif +inotify +gif webp"
 
 RDEPEND="
+	x11-libs/libX11
+	media-libs/imlib2[X]
 	statusbar? ( x11-libs/libXft )
 	exif? ( media-libs/libexif )
 	gif? ( media-libs/giflib:0= )
 	webp? ( media-libs/libwebp )
-	media-libs/imlib2[X,gif?,jpeg?,png?,webp?,tiff?]
-	x11-libs/libX11
 "
 DEPEND="${RDEPEND}"
 
@@ -74,6 +74,10 @@ src_install() {
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_icon_cache_update
+
+	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."
 }
 
 pkg_postrm() {
diff --git a/media-gfx/nsxiv/nsxiv-9999.ebuild b/media-gfx/nsxiv/nsxiv-9999.ebuild
index 615ed9c70..20d5ea1cc 100644
--- a/media-gfx/nsxiv/nsxiv-9999.ebuild
+++ b/media-gfx/nsxiv/nsxiv-9999.ebuild
@@ -18,15 +18,15 @@ HOMEPAGE="https://github.com/nsxiv/nsxiv"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+statusbar exif +inotify +gif +jpeg +png webp tiff"
+IUSE="+statusbar exif +inotify +gif webp"
 
 RDEPEND="
+	x11-libs/libX11
+	media-libs/imlib2[X]
 	statusbar? ( x11-libs/libXft )
 	exif? ( media-libs/libexif )
 	gif? ( media-libs/giflib:0= )
 	webp? ( media-libs/libwebp )
-	media-libs/imlib2[X,gif?,jpeg?,png?,webp?,tiff?]
-	x11-libs/libX11
 "
 DEPEND="${RDEPEND}"
 
@@ -74,6 +74,10 @@ src_install() {
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_icon_cache_update
+
+	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."
 }
 
 pkg_postrm() {