gentoo resync : 15.01.2020

6 files changed, 263 insertions, 53 deletions

diff --git a/media-gfx/imv/Manifest b/media-gfx/imv/Manifest
index 83d71d0cd60e..7b14c1375c90 100644
--- a/media-gfx/imv/Manifest
+++ b/media-gfx/imv/Manifest
@@ -1,4 +1,6 @@
-DIST imv-2.1.3.tar.gz 27664 BLAKE2B f873863d897161675b4cfbcc3c4136eebd0176317f30d656dd4c7a92615c926d1a0410d6c80283bb3a25055f3a9b710fa0763ffb86ff63ed1dd919ad3f0dfe8c SHA512 0ecdaad9b4518c2107a14969cf9348542c2ef88707be7b2b5eed435915292687d63e4ebd29cb42297cbc3dfee408ec29fd019ad6ae4f0cd789753aad84aa8128
-EBUILD imv-2.1.3.ebuild 683 BLAKE2B ca632af6611a4ee973fc3483116ab91a8c4be599de54028bba4160b5d6d57d55e5f4016d21051985b6cb487bee301f33e766256240a4e8a0d38bda57b122d82b SHA512 634da620f23dc321e976ed2a75374832e11a503cb30138aa6124f3c1c01d61031c6bbf902e9e9c84a129d7bddae04d7e8b67e6f5866f0db31ffd18aa04a13850
-EBUILD imv-9999.ebuild 650 BLAKE2B 31cb4b77b875bbe24dc50fa9046746c7aef512b69291accd7501700d9efe7f73a89199636058fe424ccfe97c8209a312fb13e30c28efcaea61e27192999ee499 SHA512 415189ec612e1b288a799c0d37113c9aef2592eb135d02d4e6b78c6f47316defa97389ad25f0ef25d9d3cefe10ab71de93cb08095b064e6e79017c430404089e
-MISC metadata.xml 242 BLAKE2B a66b698c79419467b610a75590ee09e217a9b54de470c963269438ca410e7ca224feb08636610af377a388be317aafdf9d7ea647c30be96705da00d5f07e21e5 SHA512 e0d5b53af8e82f684d21217559b6e832935670c8186c6514ca9f3af14b024f39421f297cf23127af2ef3f1874b732f963e88bb180403cae7ac1834a1808664f4
+DIST imv-4.0.1.tar.gz 74982 BLAKE2B 5ff7f093307fdf6114e56f0e5d5a47a4320607eea12daa9a9c89c679f558b4d31f206f7eb03a8b0435a3f05974949029ebfc6e1b1fe4d7d2859bbd722ecb6366 SHA512 f946346638d4314956e86f0e7dfa38baf0ebbb80970f1738749e6c7b80642c2315256738b94ab04d45784c0930edadfc7cc339d2bcfd6eb80fd2e1e98b2d9b28
+DIST imv-4.1.0.tar.gz 77341 BLAKE2B d6735feba4d3e958db70eddea72bbbeb60731cf550680320448ba226ba74eb467617ad295f9094995e0bf31c99473f067ff41f16689ce21fb87d7a9fd2e0946a SHA512 92d7551bda55185b29724e90230dac608a82f4a45cd3cb9c7a5d261f65eede6dcdde78f5c16eecfc1242533ec8e155204189fab3cacf31ddc088707af5131b2a
+EBUILD imv-4.0.1-r1.ebuild 1654 BLAKE2B 055e24b606921a91090433933f4e712a4b48d5ba9efb72523477842d9f4231a264590f3c483588426e4396e5256ecb7939fccb203e4cb1a1735f308cd0598cc0 SHA512 5fdcdbc94e234bb0c5c48625e41d2be7a5ce3fa5bb34499cbc54382535f2adaf8cfa592309c7ab6991925eb95a2d86c5ae9e4c367578bb829079a474e2883213
+EBUILD imv-4.1.0.ebuild 1734 BLAKE2B 21553e17d1fc8945a23496d21b91978cdb6eccec7681cca93f139d29ad8c87453f3969f433f5b8dcf691ab5697196a5ae0143443840f5f867573efdd25b1e401 SHA512 3a891d89e757a2cdedb14f8caf0257f06a84e8fdc40ea11a2540b14dc6129ae99419decc27511aded2628495ad3c33738a904eaa8dc17024d974482d10690137
+EBUILD imv-9999.ebuild 1697 BLAKE2B ee07d54ff94b00950dcba8a4e0bde3808af430921b359904d2a61f82a5457f6f26bb34952858c86de096ac97c5e5eec469720619b8d63b2cf7ed8ba38b825593 SHA512 c8ae62e79b2f9781e31cf221a96e922a3f7537b12d2211cc65d5ad05c4d22262b5b8179e442f46a878d6a245e46009483fd5daca123b6295add58c8f18269b1c
+MISC metadata.xml 456 BLAKE2B 90f9ddfeb2d7135d1cd5bf96cf234f1f56db6581d60340df16b33fcc640bd700d0425156b18755cf41c00ad127802d822933e10220bd4a857cac8d88b3a8691e SHA512 e926970f4155a6d9759bf37f43f91e616de74fa2f276144947b632f07bde0c94dcc17ddb4b079ea6c3535461c3ad682a83746083749ea1a5aaa4c9503ffe0fd8
diff --git a/media-gfx/imv/imv-2.1.3.ebuild b/media-gfx/imv/imv-2.1.3.ebuild
deleted file mode 100644
index a9a06397207d..000000000000
--- a/media-gfx/imv/imv-2.1.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!sys-apps/renameutils
-	media-libs/fontconfig
-	media-libs/libsdl2
-	media-libs/sdl2-ttf
-	media-libs/freeimage
-"
-
-DEPEND="${RDEPEND}
-	test? ( dev-util/cmocka )"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/imv/imv-4.0.1-r1.ebuild b/media-gfx/imv/imv-4.0.1-r1.ebuild
new file mode 100644
index 000000000000..dab63717b9c3
--- /dev/null
+++ b/media-gfx/imv/imv-4.0.1-r1.ebuild
@@ -0,0 +1,90 @@
+# 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 png +svg test tiff wayland"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	|| ( X wayland )
+"
+
+RDEPEND="
+	!sys-apps/renameutils
+	media-libs/fontconfig
+	media-libs/libsdl2
+	media-libs/sdl2-ttf
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/libxkbcommon
+		x11-libs/pango
+	)
+	freeimage? ( media-libs/freeimage )
+	jpeg? ( media-libs/libjpeg-turbo )
+	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_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.1.0.ebuild b/media-gfx/imv/imv-4.1.0.ebuild
new file mode 100644
index 000000000000..4987f5a28049
--- /dev/null
+++ b/media-gfx/imv/imv-4.1.0.ebuild
@@ -0,0 +1,92 @@
+# 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
+	media-libs/fontconfig
+	media-libs/libsdl2
+	media-libs/sdl2-ttf
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/libxkbcommon
+		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-9999.ebuild b/media-gfx/imv/imv-9999.ebuild
index 275366fe87f1..5fc4052027f6 100644
--- a/media-gfx/imv/imv-9999.ebuild
+++ b/media-gfx/imv/imv-9999.ebuild
@@ -1,30 +1,87 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit xdg-utils git-r3
+EAPI=7
+inherit git-r3 toolchain-funcs xdg-utils
 
 DESCRIPTION="Minimal image viewer designed for tiling window manager users"
 HOMEPAGE="https://github.com/eXeC64/imv"
-EGIT_REPO_URI="https://github.com/eXeC64/imv.git"
+EGIT_REPO_URI="https://github.com/eXeC64/imv"
 
-LICENSE="GPL-2+"
+LICENSE="MIT-with-advertising"
 SLOT="0"
 KEYWORDS=""
-IUSE="test"
+IUSE="X +freeimage jpeg libnsgif png +svg test tiff wayland"
 RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	|| ( X wayland )
+"
 
 RDEPEND="
 	!sys-apps/renameutils
 	media-libs/fontconfig
 	media-libs/libsdl2
 	media-libs/sdl2-ttf
-	media-libs/freeimage
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/libxkbcommon
+		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
+}
 
-DEPEND="${RDEPEND}
-	test? ( dev-util/cmocka )"
+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
diff --git a/media-gfx/imv/metadata.xml b/media-gfx/imv/metadata.xml
index 457f62f9ff76..39258bf23daf 100644
--- a/media-gfx/imv/metadata.xml
+++ b/media-gfx/imv/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">eXeC64/imv</remote-id>
-	</upstream>
+<maintainer type='person'><email>jer@gentoo.org</email></maintainer>
+<use>
+<flag name='freeimage'>Use <pkg>media-libs/freeimage</pkg> as image library</flag>
+<flag name='libnsgif'>Use <pkg>media-libs/libnsgif</pkg> as image library</flag>
+</use>
+<upstream>
+<remote-id type="github">eXeC64/imv</remote-id>
+</upstream>
 </pkgmetadata>