gentoo resync : 25.11.2020

5 files changed, 39 insertions, 94 deletions

diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 99ff9b14da90..373a8e317dab 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -13,12 +13,11 @@ AUX iscan-3.62.0-gcc-10.patch 503 BLAKE2B 53a351f439f43003e668cad1b8f05231b58137
 AUX iscan-3.62.0-tests-boost.patch 2819 BLAKE2B 8c11f7bd80c5cbc0c34c0aacf605a914e908f4a9d3cf18b4e105c4a2c6fddefd414bd7e77015d1992e53dad6df6a797d6bdc4ee534ced9e17eb0091afae4306b SHA512 4bcdd5a747c3e2608bf8b7fb0e4e7354474dccd727d3bd11b0911ffe8ea050a412f241687a15524a479a3f13b87c95c04092b8cf15f922f5f95cc234fe8736d4
 AUX iscan-3.62.0-tests-linkage.patch 3921 BLAKE2B 0dedae75fbbe387d2db900eb88b0e839746cfcbfa2b2ed7d52f9fd1b6756f14aa8fc53708ab2d1e461dff25ebe4e73e97f647ba4792bd263021f9b94f7b50139 SHA512 0b84829871ef45acf0ac209a0ba315b88409429c454b4655a4004c9d1afddf88d1ae0b1fff891078f5cf68541f7a8d896d50a550b650f1157517d5dbc99bfbd4
 AUX iscan-3.62.0-tests-tesseract.patch 3825 BLAKE2B ee16bab5f36e866d2a212f832f90b8fa078cfea51dd81ae8175086ce896b718c52f2dd5c56ba15ddf89427abde6231b93672a71467d18fc47c45fdd166efce54 SHA512 63cf6b7f42f6cc1dfc05e9a5d333514aa56ba658e96a860b753d9a120df79a41abbd0fcc04070e103908bf05648dcdff96eab343981fa0f5293aee4258309980
-DIST imagescan_3.62.0.orig.tar.gz 12650003 BLAKE2B 732283eb8370192fdd0fba8939bc81e277a7a227b024f14856b8d3d5c562b7320c7b40aa48cfa627e23dc654544c9bac27d35add5e10bf0ca65ab0279290b90c SHA512 3b6188013d162c605a3ce1bcac9e5a7b16b1af6363bc7ef4b257aed1c0d3e3dfd402a048ec699b6b6cc42883d0b26f50f0c6f1bd0ddc917baed4ce8902a9d8fa
+AUX iscan-3.63.0-autoconf-2.70.patch 1147 BLAKE2B d87e32fa8510096fe965ec24a21276e0c7ba0b838cb2eb5228bb0a336db037dd77240895d61eb574abbc03334d44b0c1467c4bf1dc48a69c72518cfd64d90a51 SHA512 6a58a0df2cd579ea85ea30c263d4538dae8abbfc65d3e102ac546e282bbc8ef72762894c926fc0500322b99364b815f29eb86a098989e4c67675d5d92efa304a
 DIST imagescan_3.63.0.orig.tar.gz 12776113 BLAKE2B d1a9f1d60ba4a2239c6ed74f7f9e0da078e2743e78e0abb67a69506bf90ac35b069f84b5a092a6eb8fd73f60eb668e78b4c7fae56b3a65b6b3d8600f082c064a SHA512 3c9b18e630d6fb1c042244542675e89a8b467469d7212ab684f72100810d1f7d0ec16d13c472a83ca05a3a4fc44e366f692a36cd6b0e81c9a332dd3b40de9535
 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
-EBUILD iscan-2.30.4.2.ebuild 3958 BLAKE2B 3e1284c43d52dd91a6b9e88c2c8d5aef7ee76ed2c7b7a1e0d35781db6f5882efe1ea6c1b1152df86bf0b831941a271bf8c5a9c75fb2fe26646e99d2f73d17da8 SHA512 9b23f93cc94371c33036fec992c96baec8e94b743e732c8579755eec94cfc35ec79c95b879df664783818e03cff648c932e23217b856537a3875bab9c38a228a
-EBUILD iscan-3.62.0.ebuild 2332 BLAKE2B efe846efa66cc80dc3675dc4e1cff7c20eb7902a8523e251bff906c694c0585f34a8f0779235339bdb58442deb8c3e03ae0fef425ca7c6b90ca0d56113da6ca0 SHA512 53ae2081a1956a68deb8dfa3f7b4312ff6b2239300a5cecb3d9aaf8e170906097ca056bf8e7c3c4e5cf566bd0336500305f1dcb85cf429513ecb50cd45a80049
-EBUILD iscan-3.63.0.ebuild 2851 BLAKE2B c4214d99f21980e76534285aaefa4b4ba19f9e9dd6f2dbd4c1509cd48b80b081c1a23ec8cb6c32b3a3840ded05d46faf28e499ffc483b4798cdc26fc864974c2 SHA512 67645e77b4df636edcf60e68777f114165715238cfefd22285305d2fdb04565b42ed4cd3efff3ede9c6b2a8b6faac25c291e0e8a8f572e717124c920b3419efe
+EBUILD iscan-2.30.4.2-r1.ebuild 3960 BLAKE2B ae1797ba1ca4f7bb8c5b0c6397425965f651dfb63f45cd8c350e93c0a99c854ca12065fb8d5da10f9ea1ec5e9b52d362a4306de9b3d125558380752b95e939e2 SHA512 081a5d83837300553c17ac16b09e0c8f0ffd2d8686df67023f5bd77e6b095612428331f7354d151eaf90943708b5efb9e80d8914d1c95998a6edb5c609a42ab5
+EBUILD iscan-3.63.0.ebuild 2899 BLAKE2B fa560b7857120e9180165b2d72161cdd3705fa8002b93022ef675a2df1ed22852453a72199e67e2bbe3ec08402860700eff9c76f6d0bd406441dfd64a57ea150 SHA512 72991e80c75e6d86362adedf76c63827b0752da2815ccdbbe72ecd84c621a5f733f3a8491b07a0452ac09f236fd24c866f52a03d46dca5b72e200c29bfe3ed30
 MISC metadata.xml 930 BLAKE2B d2cf4fae5cdcb660357ffe5566ad8d99eef6287f565a45f1824c810b3979e9d2930f458766ff524b231ef8dfd793062ff23cf4bfc2a78a36c5393a6c4224feea SHA512 d609a5cd8f8bbc7653e784d153757849eafb9c772355d0928325a6ecf673e8aa055623601d957f912709f9f16acfde5ca0b0480a1f2a17bfc24825895d861fc0
diff --git a/media-gfx/iscan/files/iscan-3.63.0-autoconf-2.70.patch b/media-gfx/iscan/files/iscan-3.63.0-autoconf-2.70.patch
new file mode 100644
index 000000000000..bda932904ac5
--- /dev/null
+++ b/media-gfx/iscan/files/iscan-3.63.0-autoconf-2.70.patch
@@ -0,0 +1,34 @@
+--- a/configure.ac	2020-10-19 22:50:43.160537331 +0200
++++ b/configure.ac	2020-10-19 22:56:41.724847150 +0200
+@@ -352,7 +352,7 @@
+ AM_CONDITIONAL([have_libusb], [test x != "x$LIBUSB_LIBS"])
+ 
+ AS_IF([test xno != "x$with_magick_pp"],
+-   AS_CASE("x$with_magick_pp",
++   [AS_CASE("x$with_magick_pp",
+      [xGraphicsMagick],
+        [PKG_CHECK_MODULES([LIBMAGICK_PP], [GraphicsMagick++],
+           [AC_DEFINE([HAVE_GRAPHICS_MAGICK_PP], [1])])
+@@ -373,11 +373,11 @@
+        ],
+      [dnl default case
+       AC_MSG_ERROR([unknown value: --with-magick-pp=$with_magick_pp])
+-     ]))
++     ])])
+ AM_CONDITIONAL([have_libmagick_pp], [test x != "x$LIBMAGICK_PP_LIBS"])
+ 
+ AS_IF([test xno != "x$with_magick"],
+-   AS_CASE("x$with_magick",
++   [AS_CASE("x$with_magick",
+      [xGraphicsMagick],
+        [AC_CHECK_PROGS([MAGICK_CONVERT], [gm])
+         AS_IF([test xgm != x$MAGICK_CONVERT],
+@@ -408,7 +408,7 @@
+        ],
+      [dnl default case
+       AC_MSG_ERROR([unknown value: --with-magick=$with_magick])
+-     ]))
++     ])])
+ AC_DEFINE_UNQUOTED([MAGICK_CONVERT], ["$MAGICK_CONVERT"])
+ AM_CONDITIONAL([have_magick], [test x != "x$MAGICK_CONVERT"])
+ 
diff --git a/media-gfx/iscan/iscan-2.30.4.2.ebuild b/media-gfx/iscan/iscan-2.30.4.2-r1.ebuild
index b4014ba2ccb7..333d41b9b1c7 100644
--- a/media-gfx/iscan/iscan-2.30.4.2.ebuild
+++ b/media-gfx/iscan/iscan-2.30.4.2-r1.ebuild
@@ -39,7 +39,7 @@ DEPEND="
 	media-gfx/sane-backends
 	virtual/libusb:1
 	virtual/udev
-	gimp? ( media-gfx/gimp:2 )
+	gimp? ( media-gfx/gimp:0/2 )
 	X? (
 		dev-libs/glib:2
 		media-libs/libpng:=
diff --git a/media-gfx/iscan/iscan-3.62.0.ebuild b/media-gfx/iscan/iscan-3.62.0.ebuild
deleted file mode 100644
index 92b606786000..000000000000
--- a/media-gfx/iscan/iscan-3.62.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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
-	"${FILESDIR}"/${PN}-3.62.0-gcc-10.patch
-	"${FILESDIR}"/${PN}-3.62.0-boost-1.73.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|="-Werror -Wno-error=deprecated-declarations"|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)
-	# https://bugs.gentoo.org/720994
-	append-ldflags -pthread
-	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
-}
diff --git a/media-gfx/iscan/iscan-3.63.0.ebuild b/media-gfx/iscan/iscan-3.63.0.ebuild
index 3d5f0e15b002..aa9f572ec9db 100644
--- a/media-gfx/iscan/iscan-3.63.0.ebuild
+++ b/media-gfx/iscan/iscan-3.63.0.ebuild
@@ -45,6 +45,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.62.0-tests-boost.patch
 	"${FILESDIR}"/${PN}-3.62.0-tests-tesseract.patch
 	"${FILESDIR}"/${PN}-3.62.0-tests-linkage.patch
+	"${FILESDIR}"/${PN}-3.63.0-autoconf-2.70.patch
 )
 
 src_prepare() {