From: Marcin Deranek <marcin.deranek@slonko.net>
Date: Mon, 9 Mar 2020 17:54:37 +0000 (+0100)
Subject: media-gfx/iscan: version bump to 3.62.0
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fa1150d2cd23ec945e0d71c105d132b98ea3524a;p=gentoo.git

media-gfx/iscan: version bump to 3.62.0

Closes: https://bugs.gentoo.org/711866
Bug: https://bugs.gentoo.org/713554
Signed-off-by: Marcin Deranek <marcin.deranek@slonko.net>
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
---

diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 90c14e226430..6ae81763e14b 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -1,4 +1,5 @@
 DIST imagescan_3.61.0.orig.tar.gz 12649835 BLAKE2B 32c31dcc6bdd9bbff7763e8f671642f586ebc4cb6ce1e3d532b3889b314d39c14253ec7d0547cded0b5bce95d45e8ea1d9586f11cbe101592f6fd73902408cec SHA512 276a3ca69aee7449c9ebc0c1a0364514db3d5f73d4d2cb2c5380b09463e6ba4adf077ca52d403563d68fc4e714ece1ddca1d7310349926e6017a54a371c09612
+DIST imagescan_3.62.0.orig.tar.gz 12650003 BLAKE2B 732283eb8370192fdd0fba8939bc81e277a7a227b024f14856b8d3d5c562b7320c7b40aa48cfa627e23dc654544c9bac27d35add5e10bf0ca65ab0279290b90c SHA512 3b6188013d162c605a3ce1bcac9e5a7b16b1af6363bc7ef4b257aed1c0d3e3dfd402a048ec699b6b6cc42883d0b26f50f0c6f1bd0ddc917baed4ce8902a9d8fa
 DIST iscan_2.30.4-2.tar.gz 1236167 BLAKE2B 598e55aa7099f7973b38f5c3227415c8ddfa7e8c645521981b4e8979047ab692427f5c1719fd83fe0635f2d4604f32f0baff8542f3e1a333298799c4cad7b980 SHA512 b12f374ff8ee1e1879fc6dbc579de39d7bcd4777ec7ad6e4345046f77b4ec13ae45ebdc2803d6907bc2747776aa7e32c313866138c7b8c7bcb53110a214154d2
 DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1d0914116f7ec4ae002d896853b99488eec71e5f8cb150e6b63d353efb9be11977de26d017701bc051014a SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc
 DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f9b36f92b8f11bd42b5281fc7bfbec108703f327fb538868c530418406d37505e6eb6afa621d2d49d007ba SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90
diff --git a/media-gfx/iscan/iscan-3.62.0.ebuild b/media-gfx/iscan/iscan-3.62.0.ebuild
new file mode 100644
index 000000000000..2a2c97d15125
--- /dev/null
+++ b/media-gfx/iscan/iscan-3.62.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop flag-o-matic udev xdg-utils
+
+DESCRIPTION="EPSON Image Scan v3 for Linux"
+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"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	dev-libs/boost:=
+	media-gfx/sane-backends
+	media-libs/tiff
+	virtual/jpeg
+	virtual/libusb:1
+	graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+	gui? ( dev-cpp/gtkmm:2.4 )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/utsushi-0.$(ver_cut 2-3)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.61.0-ijg-libjpeg.patch
+	"${FILESDIR}"/${PN}-3.61.0-imagemagick-7.patch
+)
+
+src_prepare() {
+	default
+
+	# Remove vendored libraries
+	rm -r upstream/boost || die
+	# Workaround for deprecation warnings:
+	# https://gitlab.com/utsushi/utsushi/issues/90
+	sed -e 's|-Werror||g' -i configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	# Workaround for:
+	# /usr/lib64/utsushi/libutsushi.so.0: undefined symbol: libcnx_usb_LTX_factory
+	append-ldflags $(no-as-needed)
+	local myconf=(
+		$(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[@]}"
+}
+
+src_install() {
+	default
+	dodoc lib/devices.conf
+	find "${ED}" -name '*.la' -delete || die
+	if use gui; then
+		newicon -s scalable doc/icon.svg "${PN}".svg
+		make_desktop_entry utsushi "Image Scan"
+	fi
+}
+
+pkg_postinst() {
+	use gui && xdg_icon_cache_update
+	elog "If you encounter problems with media-gfx/xsane when scanning (e.g., bad resolution),"
+	elog "please try the built-in GUI and kde-misc/skanlite first before reporting bugs."
+}
+
+pkg_postrm() {
+	use gui && xdg_icon_cache_update
+}