gentoo Easter resync : 12.04.2020

4 files changed, 5 insertions, 146 deletions

diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 5f076ca90fc6..e9a1565cc658 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -8,11 +8,9 @@ AUX iscan-2.30.4.2-sscanf.patch 779 BLAKE2B 8e8255c0558e225b3c1bcb5faaf42f0d7941
 AUX iscan-3.61.0-ijg-libjpeg.patch 1145 BLAKE2B 781c0c9a40848f9c10ddb3418c55b6c4a145f1590c5ec41e22e371830d3d7d63c4e013d8fa69a1f15f24d4883d569c0645df66b3c6120eb724f3a1f9643e3813 SHA512 b570bc0e6aa73f74750aaab4d3ca84838864c8723b14fbf5a45fe9163be3e7819035a12bd058587a4b4964325ba4af99673e78647b11d2a7b1bcf96039522191
 AUX iscan-3.61.0-imagemagick-7.patch 1965 BLAKE2B 14685cc9540ccfda87587b5ff2df7b8c4755dd08bb428f33ce853c32baaf6ab7e6b2d3368df9153fa5f5b39d9ef17b8e468ea59530ac89098107542db2638f05 SHA512 d5545570865370229f2b132aef7131cbbfabd7e929795bee6ce1e0d791c2c623eefabdd0ec265c6cadcc41072049d61e07d5fca46a1f51c621323a38112dc316
 DIST imagescan_3.61.0.orig.tar.gz 12649835 BLAKE2B 32c31dcc6bdd9bbff7763e8f671642f586ebc4cb6ce1e3d532b3889b314d39c14253ec7d0547cded0b5bce95d45e8ea1d9586f11cbe101592f6fd73902408cec SHA512 276a3ca69aee7449c9ebc0c1a0364514db3d5f73d4d2cb2c5380b09463e6ba4adf077ca52d403563d68fc4e714ece1ddca1d7310349926e6017a54a371c09612
-DIST iscan_2.30.3-1.tar.gz 1216848 BLAKE2B 8a5f485c1dd814248c46aec6accedd331105c3ccc0f70a582e60dfb62b1cc1f1ebab358f0896b15cbf842ea06f8a35447d91f76391b10bad07df371512856c32 SHA512 5f68b2f7b7c1d1b5d3d65a55c3a80538fda5d2bdf9cd50fbf942e0eb49dcb84983ede66ed2f6354f9591692808df54415400fe02ed47e7373082869612a47872
 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.3.1.ebuild 3517 BLAKE2B f2097ee00fab3de458f2c8f4320765844c5a78cf23b85c0b880356695b9d2027ea5df2cf03d7f7829d3d42a9d49adfc22bc062a418131ea8d83ce015088dbdce SHA512 9a058f3d2a604c4a08e6f48d3b98b4eca7fac74ae8807f5fff77c73754a44f6207a6eef051d34fc78e5984a67a009ba51d38f73d3a4c05ecc0bfdda995dc9ef4
-EBUILD iscan-2.30.4.2.ebuild 3960 BLAKE2B 9cb40b7213717045476cd6b4c43039df725721ee18ff79b487d11ca2edd1c9752d8a222ad4cfdd03c83048e87e6a4b6b88e6fb44b3382a0a9e21634ce229fea3 SHA512 c715ad28dd6e44123804f5bfcd0fc92dd4d7fca3a5487a1c16c6c23dd96c37b7211686897263931c9511c0923ba434cebe22acdac65a4213c055d376200f4dfc
-EBUILD iscan-3.61.0.ebuild 1250 BLAKE2B cb63fcc67fd5424f970f5f7100afa29e8ecc532cb45302a52a81b61ece434fdecf3ce719fd7900c7f59703841ac71cdd8f6c62360e534bcb85cb52554ae9c435 SHA512 5d6bf78b213762aa016c8604b81fe31c571682979c452b3bea21604bac538e19e0697c6e7e22b49894067d9ee0ea40b0fd7fbda6e57bf34cf21cd0e59a09fb6e
+EBUILD iscan-2.30.4.2.ebuild 3958 BLAKE2B 3e1284c43d52dd91a6b9e88c2c8d5aef7ee76ed2c7b7a1e0d35781db6f5882efe1ea6c1b1152df86bf0b831941a271bf8c5a9c75fb2fe26646e99d2f73d17da8 SHA512 9b23f93cc94371c33036fec992c96baec8e94b743e732c8579755eec94cfc35ec79c95b879df664783818e03cff648c932e23217b856537a3875bab9c38a228a
+EBUILD iscan-3.61.0.ebuild 1255 BLAKE2B f53c28e464316597f197032e1ec70517f2566524dac2bb83536de90e003c855b5414786c954d10ba7aa66ba4cb55d535ea9221d577dfa8436b722ae795e9be56 SHA512 d9cefb9929b3f04969ca434dbedd075a65e7235d4d2e5b6fbd808acc626e571c422231240b2c8cf00e89b7a51945bb811538fb40f840547ac94f341a80376ec5
 MISC metadata.xml 923 BLAKE2B b9035c8d418ac3993d4103cf53657da8bbb829aed4bf010241f4f781984ff9450779ca6aa196f604d52680378761635a2ad868c3dbb7d8b87774f5231d251cd9 SHA512 004b33e1d57943fb6ed8319def74938a98dc323dabbb695ff145adff01d84a026311a44a735bc621be6e68e3c3f4e06c1274449d6e2ad30e37f2952c0bacd6ef
diff --git a/media-gfx/iscan/iscan-2.30.3.1.ebuild b/media-gfx/iscan/iscan-2.30.3.1.ebuild
deleted file mode 100644
index 4421e8e40180..000000000000
--- a/media-gfx/iscan/iscan-2.30.3.1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_DOC="userg_revQ"
-inherit autotools desktop flag-o-matic
-
-# HINTS:
-# -> non-free modules are x86 and amd64 only
-# -> iscan frontend needs non-free modules
-# -> sane-epkowa should be usable on every arch
-# -> ${P}-${SRC_REV}.tar.gz    (for gcc 3.2/3.3)
-# -> ${P}-${SRC_REV}.c2.tar.gz (for gcc 3.4 or later)
-
-# FIXME:
-# iscan doesn't compile w/o libusb, this should be fixed somehow.
-
-# TODO:
-# (re)add closed-source binary modules which are needed for some scanners.
-
-DESCRIPTION="EPSON Image Scan! for Linux (including sane-epkowa backend)"
-HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-SRC_URI="http://support.epson.net/linux/src/scanner/iscan/${PN}_$(ver_rs 3 -).tar.gz
-	doc? (
-		https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_e.pdf
-		l10n_ja? ( https://dev.gentoo.org/~flameeyes/avasys/${MY_DOC}_j.pdf )
-	)"
-
-LICENSE="GPL-2 AVASYS"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc gimp l10n_ja X"
-
-REQUIRED_USE="gimp? ( X )"
-
-DEPEND="
-	dev-libs/libxml2
-	media-gfx/sane-backends
-	virtual/libusb:1
-	virtual/udev
-	gimp? ( media-gfx/gimp )
-	X? (
-		dev-libs/glib:2
-		media-libs/libpng:=
-		media-libs/tiff:=
-		virtual/jpeg:=
-		x11-libs/gtk+:2
-	)
-"
-RDEPEND="${DEPEND}
-	media-gfx/iscan-data
-"
-BDEPEND="
-	virtual/pkgconfig
-	X? ( sys-devel/gettext )
-"
-
-# Upstream ships broken sanity test
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
-
-DOCS=( AUTHORS NEWS README )
-
-PATCHES=(
-	"${FILESDIR}"/iscan-2.29.1-drop-ltdl.patch
-	"${FILESDIR}"/iscan-2.28.1.3+libpng-1.5.patch
-	"${FILESDIR}"/iscan-2.29.1-png-libs.patch
-	"${FILESDIR}"/iscan-2.30.1-fix-g++-test.patch
-	"${FILESDIR}"/iscan-2.30.1.1-gcc6.patch
-	"${FILESDIR}"/iscan-2.30.3.1-fix-x86-unknown-types.patch
-)
-
-QA_PRESTRIPPED="usr/lib.*/libesmod.so.*"
-QA_TEXTRELS="${QA_PRESTRIPPED}"
-QA_FLAGS_IGNORED="${QA_PRESTRIPPED}"
-
-src_prepare() {
-	default
-
-	if ! use X; then
-		sed -i -e "s:PKG_CHECK_MODULES(GTK,.*):AC_DEFINE([HAVE_GTK_2], 0):g" \
-			-e "s:\(PKG_CHECK_MODULES(GDK_IMLIB,.*)\):#\1:g" configure.ac || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -D_GNU_SOURCE	# needed for 'strndup'
-	replace-flags "-O[0-9s]" "-O1"	# fix selector box bug 388073
-
-	local myeconfargs=(
-		--enable-dependency-reduction
-		--disable-static
-		$(use_enable gimp)
-		$(use_enable X frontend)
-		$(use_enable X jpeg)
-		$(use_enable X png)
-		$(use_enable X tiff)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	use l10n_ja && DOCS+=( {NEWS,README}.ja )
-	use doc && DOCS+=( "${DISTDIR}/${MY_DOC}_$(usex l10n_ja j e).pdf" )
-	default
-
-	# install sane config
-	insinto /etc/sane.d
-	doins backend/epkowa.conf
-
-	# link iscan so it is seen as a plugin in gimp
-	if use gimp; then
-		local plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
-		dodir "${plugindir}"
-		dosym ../../../../bin/iscan "${plugindir}"/iscan
-	fi
-
-	use X && make_desktop_entry iscan "Image Scan! for Linux ${PV}" scanner
-}
-
-pkg_postinst() {
-	local DLL_CONF="${EPREFIX}/etc/sane.d/dll.conf"
-	local EPKOWA_CONF="${EPREFIX}/etc/sane.d/epkowa.conf"
-
-	if grep -q "^[ \t]*\<epkowa\>" ${DLL_CONF}; then
-		elog "Please edit ${EPKOWA_CONF} to suit your needs."
-	elif grep -q "\<epkowa\>" ${DLL_CONF}; then
-		elog "Hint: to enable the backend, add 'epkowa' to ${DLL_CONF}"
-		elog "Then edit ${EPKOWA_CONF} to suit your needs."
-	else
-		echo "epkowa" >> ${DLL_CONF} || die
-		elog "A new entry 'epkowa' was added to ${DLL_CONF}"
-		elog "Please edit ${EPKOWA_CONF} to suit your needs."
-	fi
-}
diff --git a/media-gfx/iscan/iscan-2.30.4.2.ebuild b/media-gfx/iscan/iscan-2.30.4.2.ebuild
index 4be72d181288..b4014ba2ccb7 100644
--- a/media-gfx/iscan/iscan-2.30.4.2.ebuild
+++ b/media-gfx/iscan/iscan-2.30.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,7 @@ SRC_URI="http://support.epson.net/linux/src/scanner/iscan/${PN}_$(ver_rs 3 -).ta
 
 LICENSE="GPL-2 AVASYS"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc gimp l10n_ja nls X"
 
 REQUIRED_USE="gimp? ( X )"
diff --git a/media-gfx/iscan/iscan-3.61.0.ebuild b/media-gfx/iscan/iscan-3.61.0.ebuild
index 8d372ec8a73e..7947405c941c 100644
--- a/media-gfx/iscan/iscan-3.61.0.ebuild
+++ b/media-gfx/iscan/iscan-3.61.0.ebuild
@@ -20,7 +20,7 @@ DEPEND="
 	virtual/jpeg
 	gui? ( dev-cpp/gtkmm:= )
 	imagemagick? (
-		!graphicsmagick? ( media-gfx/imagemagick:= )
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
 		graphicsmagick? ( media-gfx/graphicsmagick:= )
 	)
 "