From 6e7b806af2d9326b13e24c649df1c368f5ec447b Mon Sep 17 00:00:00 2001
From: Marcin Deranek <marcin.deranek@booking.com>
Date: Fri, 20 Mar 2020 21:47:56 +0100
Subject: More fixes

---
 media-gfx/iscan/Manifest            |  2 +-
 media-gfx/iscan/iscan-3.62.0.ebuild | 32 ++++++++++++++++----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 32ed04c..b3412cf 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -1,4 +1,4 @@
 AUX iscan-3.62.0-ijg-libjpeg.patch 1145 BLAKE2B 781c0c9a40848f9c10ddb3418c55b6c4a145f1590c5ec41e22e371830d3d7d63c4e013d8fa69a1f15f24d4883d569c0645df66b3c6120eb724f3a1f9643e3813 SHA512 b570bc0e6aa73f74750aaab4d3ca84838864c8723b14fbf5a45fe9163be3e7819035a12bd058587a4b4964325ba4af99673e78647b11d2a7b1bcf96039522191
 AUX iscan-3.62.0-imagemagick-7.patch 1965 BLAKE2B 14685cc9540ccfda87587b5ff2df7b8c4755dd08bb428f33ce853c32baaf6ab7e6b2d3368df9153fa5f5b39d9ef17b8e468ea59530ac89098107542db2638f05 SHA512 d5545570865370229f2b132aef7131cbbfabd7e929795bee6ce1e0d791c2c623eefabdd0ec265c6cadcc41072049d61e07d5fca46a1f51c621323a38112dc316
 DIST imagescan_3.62.0.orig.tar.gz 12650003 BLAKE2B 732283eb8370192fdd0fba8939bc81e277a7a227b024f14856b8d3d5c562b7320c7b40aa48cfa627e23dc654544c9bac27d35add5e10bf0ca65ab0279290b90c SHA512 3b6188013d162c605a3ce1bcac9e5a7b16b1af6363bc7ef4b257aed1c0d3e3dfd402a048ec699b6b6cc42883d0b26f50f0c6f1bd0ddc917baed4ce8902a9d8fa
-EBUILD iscan-3.62.0.ebuild 1914 BLAKE2B 20ba189eb192a2a3f88298acfaf3fcfffdf1d95fce7fd863ae08bb609cc7c4d1ae5a5811a803485dbd827045b642acc9766a04c7830c97cec5407d787b503027 SHA512 b6e9d1a091d777ec0b766a2ae93bd50e3698c6f3695558b4e32155615188a024cf877b3a8e1e719ad174933ec0d3589989bf879f1d1400bb537dfdfe3dd2e183
+EBUILD iscan-3.62.0.ebuild 1974 BLAKE2B 6d15be640a74f0d2740535849d990e69d003adc663f26cdbe32a11a79eb7b90c8d4ebd48e2de921c18e206d75233c680f4bd52128d345d4ce86dd545bbe9bc7c SHA512 ede65ed10e99aed47c13e595cae91bfa604b345ae67db4a3cc3934b2accdadcce7204fe372c2f09b0dfaae29d7030b86c66b2e31b64a92610ebfaacda068d53b
diff --git a/media-gfx/iscan/iscan-3.62.0.ebuild b/media-gfx/iscan/iscan-3.62.0.ebuild
index 8d40f7e..70ce96f 100644
--- a/media-gfx/iscan/iscan-3.62.0.ebuild
+++ b/media-gfx/iscan/iscan-3.62.0.ebuild
@@ -6,12 +6,12 @@ EAPI=7
 inherit autotools desktop udev xdg-utils
 
 DESCRIPTION="EPSON Image Scan v3 for Linux"
-HOMEPAGE="https://support.epson.net/linux/en/imagescanv3.php"
+HOMEPAGE="https://support.epson.net/linux/en/imagescanv3.php https://gitlab.com/utsushi/utsushi"
 SRC_URI="https://support.epson.net/linux/src/scanner/imagescanv3/common/imagescan_${PV}.orig.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="graphicsmagick gui imagemagick"
+IUSE="graphicsmagick gui"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="
@@ -21,10 +21,8 @@ DEPEND="
 	virtual/libusb:1
 	virtual/jpeg
 	gui? ( dev-cpp/gtkmm:2.4 )
-	imagemagick? (
-		!graphicsmagick? ( media-gfx/imagemagick:= )
-		graphicsmagick? ( media-gfx/graphicsmagick:= )
-	)
+	graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
 "
 RDEPEND="${DEPEND}"
 
@@ -48,15 +46,15 @@ src_prepare() {
 
 src_configure() {
 	local myconf=(
-		$(use_with gui gtkmm) \
-		$(use_with imagemagick magick) \
-		$(use_with imagemagick magick-pp) \
-		--enable-sane-config \
-		--enable-udev-config \
-		--with-boost=yes \
-		--with-jpeg \
-		--with-sane \
-		--with-tiff \
+		$(use_with gui gtkmm)
+		--enable-sane-config
+		--enable-udev-config
+		--with-boost=yes
+		--with-jpeg
+		--with-magick=$(usex graphicsmagick GraphicsMagick ImageMagick)
+		--with-magick-pp=$(usex graphicsmagick GraphicsMagick ImageMagick)
+		--with-sane
+		--with-tiff
 		--with-udev-confdir="$(get_udevdir)"
 	)
 	econf "${myconf[@]}"
@@ -78,4 +76,6 @@ pkg_postinst() {
 	elog "please try the built-in GUI and kde-misc/skanlite first before reporting bugs."
 }
 
-pkg_postrm() { use gui && xdg_icon_cache_update; }
+pkg_postrm() {
+	use gui && xdg_icon_cache_update
+}
-- 
cgit v1.2.3