gentoo resync : 27.03.2021

5 files changed, 13 insertions, 112 deletions

diff --git a/media-gfx/imv/Manifest b/media-gfx/imv/Manifest
index 71ea7c5ae0ae..7266f2684743 100644
--- a/media-gfx/imv/Manifest
+++ b/media-gfx/imv/Manifest
@@ -1,8 +1,6 @@
 AUX imv-4.2.0-add-string-inc.patch 275 BLAKE2B 40e46bd1e7531477d6701ac14013405ee37562305286223a4b5800f3f644f63d366bb1ae08a0ee575b088351013605c9ecaf0356a046976d6a520d55dcaaf2c0 SHA512 2ef9ae3e8a6543476000a2e19fee4f383e01a25b5ed6ffb674f12f843761f9d8fa6ae394e2043260ba88d88fa300ebe3bb03027a02aa3afde5d4cdf897174958
 AUX imv-4.2.0-wayland-roundtrip-after-scale.patch 583 BLAKE2B b71b428bc7c3fd566ab9fa650cb714a2abc455df0512aa7372f82e1c331530bf8515cd0f005d54aa9d20de2156eddf7a0fb3b892775825a4a8af64a0bc66735a SHA512 c081fa2656d2611ef78df072826718ccca56fc376860277f74a9248e0b9771547af28e9379dbf820c4e67f33ffad021c10b5e178f1da2c309e33d25692a38218
-DIST imv-4.1.0.tar.gz 77341 BLAKE2B d6735feba4d3e958db70eddea72bbbeb60731cf550680320448ba226ba74eb467617ad295f9094995e0bf31c99473f067ff41f16689ce21fb87d7a9fd2e0946a SHA512 92d7551bda55185b29724e90230dac608a82f4a45cd3cb9c7a5d261f65eede6dcdde78f5c16eecfc1242533ec8e155204189fab3cacf31ddc088707af5131b2a
 DIST imv-4.2.0.tar.gz 77809 BLAKE2B a0c8aeb4d50d252818f4a4bedc145a8e2ffffa3ae14d888ef4623fe17a714bd17397399064019b32a48e6ebe3613f592428b075988ed533166c06c2b885d245b SHA512 7b64c6d4e5e484fd2ef4e28e2ba5cc74e4d28f8e2fa329ae7c744bd77ce8a345123f9cc3c77e015ff780938d5add97cfe9ed4e5a3a52b03a91b7bb6bb50e7115
-EBUILD imv-4.1.0-r1.ebuild 1767 BLAKE2B fe2541d3bce172e6fc1c559ed0593a4c52b1536b907459d2e5842db5c14ec356e7523cf3d91225ab6b5d3261b8ff3fa4ab9724c8d95979e88078b5b7617d897f SHA512 7484d434a44818bd131ccecd484bd88e6ed8867eacf48f94e863b9dc480f197005a5f8bc519207afd82f3fca7d02416dbd7fc7ff966520b7a57c726317af4cdd
-EBUILD imv-4.2.0.ebuild 1897 BLAKE2B 8fa164e9e1eb6b8856774c7e863a725749b4316ff3dda0a8906540910c371625406a2ef0b0b4fd281032970f07e764bb7feb899d819c30e1bc35839cdfd031cb SHA512 611ad4cdc876fa7e36a84ffad250d76e291df8fdb0dc4b1f78b9ded7c097708f41a2f9f9ab6fa5e3536a98acd80940b1cf46e6163f1e120abedafd2da6ad73d5
-EBUILD imv-9999.ebuild 1773 BLAKE2B 8e12bc1176341dd3aeafc8cc3347d673e79f154e699fd423967f0841930fa02efd17d601220b3688791cb9d753a69da25ca007c130967e4bfab94c5d08c75cbe SHA512 b5be092d1e4b1acd2542e5a19881f2a4c836e040df6bedbade6022e06db2af21971c167e9162ee72c61c27bd83ce258ff7aa353c711c438960e056afd5816c9d
-MISC metadata.xml 692 BLAKE2B 075c4adcd3f302d2aa23e6e67213baf23ebf4665b1fb40b6e3de390715bbbde163ff3e596785b74840db74f3cdf24324c2e718de19d4ea5f280130320fe586d9 SHA512 65f74a9aac990f9977534b2ea39fbdf1499f5b5645bda71ea26cb78efa3cd92f22ba38261b272bd64176e1d8528a8639aedc24e96e4a1444d00ca6c6936e24b3
+EBUILD imv-4.2.0.ebuild 1934 BLAKE2B 923576182f4d8756bd7d9afc2c718674fbd9c95a386b99d2bac370a87c9cc03558f8e1f8833ccefa735fc0299984dd3d7f2823be51a1fa0ad915756a87d2c6a5 SHA512 ba9014b318ecc18b2473dfe92b25c208b6f8ce4cd329f0482c925e3fd86b3cab7aef43a71ccaa89e01294b5d877ba42617b70b7dc27d7f7da21e90648418faa8
+EBUILD imv-9999.ebuild 1810 BLAKE2B e3601453c416eb35d202cfef4916bd8a6e078ed3a6c9aec7a1871b3ba70522f35a67356842b164ed3f721298ee0c9bf9bf63237ca5f777188d7d0a1677b18bbc SHA512 b618911f0c0797be3cacc06474b4d87ffb975aec79b9439f7530dbcd127db01a110fffdc539c666aaccbcbe71c66d09623745027168f489fe01cbda461f6e046
+MISC metadata.xml 636 BLAKE2B 0baddac56141b71f8534e57dfdfc2a2e5bb3b31516712c259e48aa1bc31403011272176dc80aa734e8f225bb025c8d2ce51199cfef8c18be38bdf4d9493309ac SHA512 8028f1ee17864d3eb3c6ca4b53ca980e927689d77a8b396caa543533f3c61f09767eb16128840899e17c7c1e5057c711362d64d35422138723882b9dc8da1823
diff --git a/media-gfx/imv/imv-4.1.0-r1.ebuild b/media-gfx/imv/imv-4.1.0-r1.ebuild
deleted file mode 100644
index eb2681a4e709..000000000000
--- a/media-gfx/imv/imv-4.1.0-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="Minimal image viewer designed for tiling window manager users"
-HOMEPAGE="https://github.com/eXeC64/imv"
-SRC_URI="https://github.com/eXeC64/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X +freeimage jpeg libnsgif png +svg test tiff 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
-	X? (
-		virtual/glu
-		x11-libs/libX11
-		x11-libs/libxcb
-		x11-libs/libxkbcommon[X]
-		x11-libs/pango
-	)
-	freeimage? ( media-libs/freeimage )
-	jpeg? ( media-libs/libjpeg-turbo )
-	libnsgif? ( media-libs/libnsgif )
-	png? ( media-libs/libpng )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff )
-	wayland? ( dev-libs/wayland )
-"
-BDEPEND="
-	app-text/asciidoc
-	test? ( dev-util/cmocka )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-src_prepare() {
-	default
-	sed -i -e 's|pkg-config|$(PKG_CONFIG)|g' Makefile || die
-}
-
-src_configure() {
-	tc-export PKG_CONFIG
-	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
-
-	BACKENDS=(
-		BACKEND_FREEIMAGE=$(usex freeimage)
-		BACKEND_JPEG=$(usex jpeg)
-		BACKEND_LIBNSGIF=$(usex libnsgif)
-		BACKEND_LIBPNG=$(usex png)
-		BACKEND_LIBRSVG=$(usex svg)
-		BACKEND_LIBTIFF=$(usex tiff)
-		WINDOWS=${WINDOWS}
-	)
-}
-
-src_compile() {
-	emake ${BACKENDS[@]}
-}
-
-src_install() {
-	emake ${BACKENDS[@]} DESTDIR="${D}" install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/imv/imv-4.2.0.ebuild b/media-gfx/imv/imv-4.2.0.ebuild
index 25863200b0b2..c3beeda396a8 100644
--- a/media-gfx/imv/imv-4.2.0.ebuild
+++ b/media-gfx/imv/imv-4.2.0.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit xdg meson
+
+inherit meson xdg
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -39,15 +40,13 @@ RDEPEND="
 	svg? ( >=gnome-base/librsvg-2.44 )
 	tiff? ( media-libs/tiff )
 	wayland? ( dev-libs/wayland )
-	!sys-apps/renameutils
-"
+	!sys-apps/renameutils"
 DEPEND="
 	${RDEPEND}
-	test? ( dev-util/cmocka )
-"
+	test? ( dev-util/cmocka )"
 BDEPEND="
 	app-text/asciidoc
-"
+	wayland? ( dev-util/wayland-scanner )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.2.0-add-string-inc.patch"
diff --git a/media-gfx/imv/imv-9999.ebuild b/media-gfx/imv/imv-9999.ebuild
index 735366ed5332..9b3b3c026ab9 100644
--- a/media-gfx/imv/imv-9999.ebuild
+++ b/media-gfx/imv/imv-9999.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit xdg meson
+
+inherit meson xdg
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -39,15 +40,13 @@ RDEPEND="
 	svg? ( >=gnome-base/librsvg-2.44 )
 	tiff? ( media-libs/tiff )
 	wayland? ( dev-libs/wayland )
-	!sys-apps/renameutils
-"
+	!sys-apps/renameutils"
 DEPEND="
 	${RDEPEND}
-	test? ( dev-util/cmocka )
-"
+	test? ( dev-util/cmocka )"
 BDEPEND="
 	app-text/asciidoc
-"
+	wayland? ( dev-util/wayland-scanner )"
 
 src_prepare() {
 	default
diff --git a/media-gfx/imv/metadata.xml b/media-gfx/imv/metadata.xml
index f403e4f5cf5f..3cca373fbbad 100644
--- a/media-gfx/imv/metadata.xml
+++ b/media-gfx/imv/metadata.xml
@@ -12,7 +12,6 @@
 	<use>
 		<flag name="freeimage">Use <pkg>media-libs/freeimage</pkg> for additional image support</flag>
 		<flag name="heif">Add HEIF/HEIC image support</flag>
-		<flag name="libnsgif">Add animated GIF support</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">eXeC64/imv</remote-id>