From 6e7b806af2d9326b13e24c649df1c368f5ec447b Mon Sep 17 00:00:00 2001 From: Marcin Deranek Date: Fri, 20 Mar 2020 21:47:56 +0100 Subject: More fixes --- media-gfx/iscan/iscan-3.62.0.ebuild | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'media-gfx/iscan/iscan-3.62.0.ebuild') 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