gentoo resync : 17.02.2021

1 files changed, 47 insertions, 55 deletions

diff --git a/media-gfx/imv/imv-9999.ebuild b/media-gfx/imv/imv-9999.ebuild
index 65f50d9221c2..735366ed5332 100644
--- a/media-gfx/imv/imv-9999.ebuild
+++ b/media-gfx/imv/imv-9999.ebuild
@@ -1,89 +1,81 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit git-r3 meson xdg-utils
+inherit xdg meson
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/eXeC64/imv.git"
+else
+	SRC_URI="https://github.com/eXeC64/imv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 DESCRIPTION="Minimal image viewer designed for tiling window manager users"
-LICENSE="MIT-with-advertising"
 HOMEPAGE="https://github.com/eXeC64/imv"
-EGIT_REPO_URI="https://github.com/eXeC64/imv"
 
-KEYWORDS=""
+LICENSE="MIT-with-advertising"
 SLOT="0"
-IUSE="X +freeimage +png jpeg svg gif heif test tiff wayland"
+IUSE="+X +freeimage gif heif jpeg png svg test tiff wayland"
+REQUIRED_USE="|| ( X wayland )"
 RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	|| ( X wayland )
-"
 
 RDEPEND="
-	!sys-apps/renameutils
 	dev-libs/icu:=
-	media-libs/fontconfig
-	media-libs/libsdl2
-	media-libs/sdl2-ttf
+	dev-libs/inih
+	media-libs/libglvnd[X?]
+	x11-libs/libxkbcommon[X?]
+	x11-libs/pango
 	X? (
-		virtual/glu
 		x11-libs/libX11
-		x11-libs/libxcb
-		x11-libs/libxkbcommon[X]
-		x11-libs/pango
-	)
-	freeimage? ( media-libs/freeimage[png?,jpeg?,tiff?] )
-	!freeimage? (
-		jpeg? ( media-libs/libjpeg-turbo )
-		png? ( media-libs/libpng )
-		tiff? ( media-libs/tiff )
+		x11-libs/libxcb:=
 	)
+	freeimage? ( media-libs/freeimage )
 	gif? ( media-libs/libnsgif )
-	heif? ( media-libs/libheif )
+	heif? ( media-libs/libheif:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	png? ( media-libs/libpng:= )
 	svg? ( >=gnome-base/librsvg-2.44 )
+	tiff? ( media-libs/tiff )
 	wayland? ( dev-libs/wayland )
-"
-BDEPEND="
-	app-text/asciidoc
-	test? ( dev-util/cmocka )
+	!sys-apps/renameutils
 "
 DEPEND="
 	${RDEPEND}
+	test? ( dev-util/cmocka )
+"
+BDEPEND="
+	app-text/asciidoc
 "
 
-src_configure() {
-	local WINDOWS
-	if use X; then
-		if ! use wayland; then
-			WINDOWS=x11
-		else
-			WINDOWS=all
-		fi
-	else
-		if use wayland; then
-			WINDOWS=wayland
-		fi
-	fi
+src_prepare() {
+	default
 
-	if ! use test; then
-		sed -i -e '/^dep_cmocka/,/^endforeach$/d' meson.build || die
+	# allow building with libglvnd[-X]
+	if ! use X; then
+		sed -i "/dependency('gl')/s/gl/opengl/" meson.build || die
 	fi
 
+	# glu isn't used by anything
+	sed -i "/dependency('glu')/d" meson.build || die
+}
+
+src_configure() {
+	local windows=all
+	use X || windows=wayland
+	use wayland || windows=x11
+
 	local emesonargs=(
 		$(meson_feature freeimage)
 		$(meson_feature gif libnsgif)
 		$(meson_feature heif libheif)
+		$(meson_feature jpeg libjpeg)
+		$(meson_feature png libpng)
 		$(meson_feature svg librsvg)
-		$(usex freeimage -Dlibjpeg=disabled -Dlibjpeg=enabled)
-		$(usex freeimage -Dlibpng=disabled -Dlibjpeg=enabled)
-		$(usex freeimage -Dlibtiff=disabled -Dlibjpeg=enabled)
-		-Dwindows=$WINDOWS
+		$(meson_feature test)
+		$(meson_feature tiff libtiff)
+		-Dwindows=${windows}
 	)
 	meson_src_configure
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}