media-gfx/utsushi: update

media-gfx/utsushi/Manifest

@@ -1 +1,2 @@
 DIST utsushi-20210116.tar.gz 5977031 BLAKE2B 0461cd2148cf1b7f41641f5b23994ac755743ca312c02519c03c33c762b5b967e1dadcd2a2d46a96c23023c5e3846bd8b99ea2e388a2cfd3d627d5133f1f1e4d SHA512 0dd798593e82b4308fa9b01920061dc3f91cfb0383b6061430b68700928a13cc1719d289e95fa375647bccb059a6a95b83d99eed080cd2ef8d1f383b71627bea
+DIST utsushi-20210526.tar.gz 5984192 BLAKE2B e5dffc3a481548365d63623ae2963c18f07350ab8e52b56dd35ec47b0bb4e8d1f9fa0effe06b6d27074d6cc2dfaedb71d2bc5db6fdc5fb0550fe4bdd0f37ce10 SHA512 82f20e0c03a1fc9217caab30e18e77a42b353e37c8432d671d1e9b0296a665e03c5b0db015d024480b3a138499ace0d48a66c6776ee7c9b49919eace34d6de59

media-gfx/utsushi/files/utsushi-uint.patch

@@ -0,0 +1,28 @@
+diff --git a/outputs/tiff.cpp b/outputs/tiff.cpp
+index c3b8cd1..21e7b74 100644
+--- a/outputs/tiff.cpp
++++ b/outputs/tiff.cpp
+@@ -273,7 +273,7 @@ tiff_odevice::boi (const context& ctx)
+ 
+   TIFFSetField (tiff_, TIFFTAG_SAMPLESPERPIXEL, ctx.comps ());
+ 
+-  uint16 pm = 0;                // uint16 is courtesy of tiffio.h
++  uint16_t pm = 0;                // uint16 is courtesy of tiffio.h
+   if (8 == ctx.depth())
+     {
+       if (3 == ctx.comps())
+diff --git a/outputs/tiff.hpp b/outputs/tiff.hpp
+index 8402174..8fcd30f 100644
+--- a/outputs/tiff.hpp
++++ b/outputs/tiff.hpp
+@@ -53,8 +53,8 @@ protected:
+ 
+ private:
+   TIFF   *tiff_;
+-  uint32  page_;
+-  uint32  row_;
++  uint32_t  page_;
++  uint32_t  row_;
+ 
+   boost::scoped_array< octet > partial_line_;
+   streamsize                   partial_size_;

media-gfx/utsushi/utsushi-20210526.ebuild

@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils multilib toolchain-funcs udev
+
+COMMIT="7d9d76ad783b567028ff06aa971d348447bd4b28"
+DESCRIPTION="SANE backend driver for newer Epson scanners (DS, ET, PX, etc)"
+HOMEPAGE="https://gitlab.com/utsushi/utsushi"
+SRC_URI="https://gitlab.com/${PN}/${PN}/-/archive/${COMMIT}/${PN}-${COMMIT}.tar.gz -> ${PN}-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~x86 amd64"
+IUSE="gtk jpeg +network nls openmp tiff udev"
+
+# These are needed by utsushi's 'bootstrap':
+#   dev-libs/gnulib
+#   sys-devel/autoconf-archive
+#   sys-devel/autoconf-wrapper
+#   sys-devel/automake-wrapper
+#   sys-devel/gettext
+#   sys-devel/libtool
+#   sys-devel/patch
+DEPEND="
+	sys-devel/autoconf-archive
+	sys-devel/autoconf-wrapper
+	sys-devel/automake-wrapper
+	sys-devel/gettext
+	media-gfx/imagemagick
+	media-gfx/sane-backends
+	>=dev-libs/libusb-1.0.22
+	>=dev-libs/boost-1.50.0
+	gtk?          ( dev-cpp/gtkmm:2.4 )
+	jpeg?         ( virtual/jpeg:0 )
+	tiff?         ( media-libs/tiff:0= )
+	udev?         ( virtual/udev )
+"
+
+RDEPEND="
+	${DEPEND}
+	network?     ( media-gfx/epson-ds-plugins )
+"
+
+PATCHES=(
+	# Fixes building on boost 1.73
+	#   https://bugs.gentoo.org/721696
+	"${FILESDIR}/${PN}-uint.patch"
+	"${FILESDIR}/${PN}-9999-boost-1.73.patch"
+)
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_prepare() {
+	default
+
+	sed -i "s/m4_esyscmd_s(\[git describe --always\])/${PV}/"  ${S}/configure.ac
+
+	# utsushi requires using this bootstrap wrapper in lieu of autotools
+	${S}/bootstrap || die
+
+	# Create SANE configuration directory (used by sane/Makefile.am to create
+	# utsushi backend config)
+	dodir /etc/sane.d/dll.d
+}
+
+src_configure() {
+	econf \
+		--with-boost-system                         \
+		--with-sane                                 \
+		--with-sane-confdir="${EPREFIX}"/etc/sane.d \
+		--with-magick                               \
+		--with-magick-pp                            \
+		$(use_with gtk gtkmm)                       \
+		$(use_with jpeg)                            \
+		$(use_enable nls)                           \
+		$(use_enable openmp)                        \
+		$(use_with tiff)                            \
+		$(use_enable udev udev-config)              \
+		$(use_with udev udev-confdir "$(get_udevdir)")
+		#$(use_with udev udev-confdir "${EPREFIX}"/lib/udev)
+}