gentoo resync : 21.01.2018

3 files changed, 35 insertions, 46 deletions

diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index af0a6f3308f0..c8b69f1de45b 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -1,12 +1,11 @@
-AUX iscan-2.28.1.3+libpng-1.5.patch 1466 BLAKE2B 474069046d0ff5037bfdba4f7ab138cbc153b8cc0b1fb8fd8fa14ac55b5afe6dd3e3fc088aab83114c607a3ae6da72e90fc68abafea80b7008046cd40cb0db0f SHA512 914861963db02f1a330a7e2f90bfc545fb411d6a418567811452454ad14ff912f504beba8a30fa668e6e7e83aaf826cae142adf9433adf0d3e972e72e0147714
+AUX iscan-2.28.1.3+libpng-1.5.patch 1330 BLAKE2B 61fb5c3237157ac0759b4efbb531ecbdc20af6fd655f96ecd787aa8ed9568adcd5dd2665a8aeb91cf9ed7eb7e8233bdeb4a0832d45f2b50c362e13e78fbecb94 SHA512 083d086c1c3fdb680263f3c1d626366faba53776ba7bc8d8b20115ac9cfb40f975a815caf8bcce21f3dd3d47c700e983c1c086bfb54296e21b8d0b823c650c8d
 AUX iscan-2.29.1-drop-ltdl.patch 2107 BLAKE2B ebb47c8148d3b1baaec17606bb85d98ed5b8c68ba79c1f8a3d165281a4b3d2514e13021de4d5806c4313308f297a4b876d6bb41515b79735a1e9cf9e44a8f7cb SHA512 593f9a8c7a85ed4e379553c63a75eec09965e803f2785456a4416895cb2d13048db8c7d731bd427cfb4049386a1270b676edad5cc92c354c7e2eaa4542d930dd
 AUX iscan-2.29.1-png-libs.patch 1309 BLAKE2B debdebb6753d3f71ec5af8a16082dcb8b9fda301a63b690cf4bba92dff2b559aeeaab8fcc9149bd4334f411e7f68aa514c986541eb99ced01bb14df7a141dd68 SHA512 ea2347e169118cfa2916f9ef3f0715d2322763715198714271fc611203a37cec5977ec0de5de0e737a5dd8cf223f2e23198faf52d79671b85173f4a02d3982c5
 AUX iscan-2.30.1-fix-g++-test.patch 1394 BLAKE2B 6ff018b0be888d4415a40f0d94ab3482590a4b3f627b00f6f1fdd17cbf2aea57b52715eebda678833ec2ea9543470a4b7a5c9f07fced84808b337edd43c11c5e SHA512 b11667e6698955b482c9cffd88413180d77b700ca040bf70969ce10be652cfa38fe2fb3de930519bdfe098f18ce258f24859ab79a93032dbe5052e0e1059ce63
 AUX iscan-2.30.1.1-gcc6.patch 564 BLAKE2B a80e24742c9d142ea88c2884c061efda09391aaa75885ac53de85594c5fa0c5f4b3b8f008165b647647658bbd420bcfb9a631deae3211b01f4848e3d7e22a390 SHA512 4c0ef22323f26282596d5705b0a3982bc8bca17e84f54ad9b1a23290cadbc617ae55492fd3d25e9edd283509e0a8ea1de047b18fd98fdfaf8bb22fd90c096e32
-DIST iscan_2.30.1-1.tar.gz 1217985 BLAKE2B a469b455566bb249044d1cc7994d233393139756135f2fec0b91325fe0f793eeb90df0fe5b512766993d480b5b2e1b2360067bf3b44ff9132c3bc61baac91133 SHA512 0562be739b637ee78a5bf2612e7b148de60709c32550742383b76750688d48e42834acbe050c5f2fad26bd9063c9faff425bf906dcebc3e4160d17cd5481850a
 DIST iscan_2.30.2-2.tar.gz 1216875 BLAKE2B 73a0de2b8432df026c5755df610205085c351ef586c1225d17f3f1ceb1404dae0449aaf2e6f0dbe18b98c0c1dc793fb184c17479fa08b195e6342d53bea3512e SHA512 bc5e871fa5e3baa62eee7b8b0a73abf2640a38f71f98248b1c9e1cace17c2a32de2f64c2a7527e8618f20e9913a16d0f55a8a94b3aea88ae8a157339e8bcf8e9
 DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1d0914116f7ec4ae002d896853b99488eec71e5f8cb150e6b63d353efb9be11977de26d017701bc051014a SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc
 DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f9b36f92b8f11bd42b5281fc7bfbec108703f327fb538868c530418406d37505e6eb6afa621d2d49d007ba SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90
-EBUILD iscan-2.30.1.1.ebuild 4734 BLAKE2B e38cffcc890e1cf995f5949da8549ea85e234cb2e1b3b70ac7b8bcec8d9e0ac0003aa36f6ca0666e305b85c929078fa97a2df0531421b3d4e72d2cdeb4b70b21 SHA512 d217114d62a2d5c71b91fb93291ea339c40b31e97072837e063488ea980f33883be8ffe48432223dfa72cd8d23772e8d1732939a72138c07fb90d4c86cef954b
+EBUILD iscan-2.30.2.2-r1.ebuild 4489 BLAKE2B ed29cfe8ed1f9394e12051b00ed32b86def372a6b04a185bf827e4851e3b386cbf892dd4e5ec82b17658964de8d3a9d2288daaff09955ac7179989b3d1c6405f SHA512 adb0808b9a1be643d18913b08d207cef5f732ee233628446772452dadf99967c1e339018029804cc7d967e52d77232a85146144a055272cb6b5336bc8497d7e0
 EBUILD iscan-2.30.2.2.ebuild 4582 BLAKE2B 27c48a10f7e146aa94e90b8827ac1fc08044e2a2fb38bddfa56946ea2c7ab5631da428b17a6e19c1537caec096c60ed360c9f489a15b6a32b032f35192848df2 SHA512 42aee5ac19f6c46d4d59bfd32db3a43235013a53d8205089401c6459069d474df1e967bc03a2e08a9bff8fbf6e4f48cbb03f847ea031dadd963724cb4a6480ae
 MISC metadata.xml 779 BLAKE2B 715d705e7775dc8aefea2c58afaf0520819abe2508ee9dde67298a2acdd847b953ac46750bc711e018eea5ddceef2ef3e7f16308c32fade334622cb9a16f745e SHA512 9ead68d2de8d4b5e09e2d478b6f198d8a83985eaa779e941189f1017beb081910fcc6c7d3c1f41db84b91df55399e5e005c326c7bb2841b2ef745d735aef562f
diff --git a/media-gfx/iscan/files/iscan-2.28.1.3+libpng-1.5.patch b/media-gfx/iscan/files/iscan-2.28.1.3+libpng-1.5.patch
index 7205028d8248..50b948891907 100644
--- a/media-gfx/iscan/files/iscan-2.28.1.3+libpng-1.5.patch
+++ b/media-gfx/iscan/files/iscan-2.28.1.3+libpng-1.5.patch
@@ -1,5 +1,5 @@
---- lib/pngstream.cc	2011-12-01 02:30:53.000000000 +0100
-+++ lib/pngstream.cc	2012-02-06 03:06:22.000000000 +0100
+--- a/lib/pngstream.cc
++++ b/lib/pngstream.cc
 @@ -83,7 +83,12 @@
  #if HAVE_PNG_H
      set_error_handler (_png, _info);
@@ -33,8 +33,8 @@
          && lib->write_info
          && lib->write_row
          && lib->write_flush
---- lib/pngstream.hh	2011-12-01 02:30:53.000000000 +0100
-+++ lib/pngstream.hh	2012-02-06 03:09:09.000000000 +0100
+--- a/lib/pngstream.hh
++++ b/lib/pngstream.hh
 @@ -108,6 +108,10 @@
                 png_structp);
        fundecl (void, write_end,
diff --git a/media-gfx/iscan/iscan-2.30.1.1.ebuild b/media-gfx/iscan/iscan-2.30.2.2-r1.ebuild
index 1eed08b0673f..be96146638b0 100644
--- a/media-gfx/iscan/iscan-2.30.1.1.ebuild
+++ b/media-gfx/iscan/iscan-2.30.2.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-inherit eutils flag-o-matic autotools versionator
+inherit autotools desktop flag-o-matic versionator
 
 # HINTS:
 # -> non-free modules are x86 and amd64 only
@@ -20,37 +20,26 @@ inherit eutils flag-o-matic autotools versionator
 # TODO:
 # (re)add closed-source binary modules which are needed for some scanners.
 
-KEYWORDS="amd64 x86"
-
 MY_PV="$(get_version_component_range 1-3)"
 MY_PVR="$(replace_version_separator 3 -)"
 MY_DOC="userg_revQ"
 
 DESCRIPTION="EPSON Image Scan! for Linux (including sane-epkowa backend)"
 HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-# Use a gentoo hosted url since upstream uses a session based url that causes the
-# files to no longer be available after the session expires.
-SRC_URI="
-	https://dev.gentoo.org/~idella4/tarballs/${PN}_${MY_PVR}.tar.gz
-	https://dev.gentoo.org/~flameeyes/avasys/${PN}_${MY_PVR}.tar.gz
+SRC_URI="http://support.epson.net/linux/src/scanner/iscan/${PN}_${MY_PVR}.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="X doc gimp jpeg png tiff l10n_ja"
-
 REQUIRED_USE="gimp? ( X )
 	jpeg? ( X )
 	png? ( X )
 	tiff? ( X )"
-
-QA_PRESTRIPPED="usr/$(get_libdir)/libesmod.so.*"
-QA_TEXTRELS="${QA_PRESTRIPPED}"
-QA_FLAGS_IGNORED="${QA_PRESTRIPPED}"
-
 # Upstream ships broken sanity test
 RESTRICT="test"
 
@@ -71,14 +60,26 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
+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
+)
+
+QA_PRESTRIPPED="usr/lib*/libesmod.so.*"
+QA_TEXTRELS="${QA_PRESTRIPPED}"
+QA_FLAGS_IGNORED="${QA_PRESTRIPPED}"
+
 src_prepare() {
 	local i
 
 	# convert japanese docs to UTF-8
 	if use l10n_ja; then
 		for i in {NEWS,README}.ja non-free/*.ja.txt; do
-			if [ -f "${i}" ]; then
-				echo ">>> Converting ${i} to UTF-8"
+			if [[ -f ${i} ]]; then
+				elog ">>> Converting ${i} to UTF-8"
 				iconv -f eucjp -t utf8 -o "${i}~" "${i}" && mv -f "${i}~" "${i}" || rm -f "${i}~"
 			fi
 		done
@@ -90,11 +91,7 @@ src_prepare() {
 			-e "s:\(PKG_CHECK_MODULES(GDK_IMLIB,.*)\):#\1:g" configure.ac || die
 	fi
 
-	epatch "${FILESDIR}"/iscan-2.29.1-drop-ltdl.patch
-	epatch "${FILESDIR}"/iscan-2.28.1.3+libpng-1.5.patch
-	epatch "${FILESDIR}"/iscan-2.29.1-png-libs.patch
-	epatch "${FILESDIR}"/iscan-2.30.1-fix-g++-test.patch
-
+	default
 	eautoreconf
 }
 
@@ -112,12 +109,12 @@ src_configure() {
 		$(use_enable png)
 		$(use_enable tiff)
 	)
-	econf ${myconf[@]}
+	econf "${myconf[@]}"
 }
 
 src_install() {
-	local MY_LIB="/usr/$(get_libdir)"
-	emake DESTDIR="${D}" install || die "emake install failed"
+	local MY_LIB="${EPREFIX}/usr/$(get_libdir)"
+	emake DESTDIR="${D}" install
 
 	# install docs
 	dodoc AUTHORS NEWS README
@@ -128,21 +125,14 @@ src_install() {
 	doins backend/epkowa.conf
 
 	# install extra docs
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		if use l10n_ja; then
-			doins "${DISTDIR}/${MY_DOC}_j.pdf"
-		else
-			doins "${DISTDIR}/${MY_DOC}_e.pdf"
-		fi
-	fi
+	use doc && dodoc "${DISTDIR}"/${MY_DOC}_$(usex l10n_ja j e).pdf
 
 	# link iscan so it is seen as a plugin in gimp
 	if use X && use gimp; then
 		local plugindir
-		if [ -x /usr/bin/gimptool ]; then
+		if [[ -x ${EPREFIX}/usr/bin/gimptool ]]; then
 			plugindir="$(gimptool --gimpplugindir)/plug-ins" || die "Failed to get gimpplugindir"
-		elif [ -x /usr/bin/gimptool-2.0 ]; then
+		elif [[ -x ${EPREFIX}/usr/bin/gimptool-2.0 ]]; then
 			plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins" || die "Failed to get gimpplugindir"
 		else
 			die "Can't find GIMP plugin directory."
@@ -159,8 +149,8 @@ src_install() {
 
 pkg_postinst() {
 	local i
-	local DLL_CONF="/etc/sane.d/dll.conf"
-	local EPKOWA_CONF="/etc/sane.d/epkowa.conf"
+	local DLL_CONF="${EPREFIX}/etc/sane.d/dll.conf"
+	local EPKOWA_CONF="${EPREFIX}/etc/sane.d/epkowa.conf"
 
 	elog
 	if grep -q "^[ \t]*\<epkowa\>" ${DLL_CONF}; then
@@ -169,7 +159,7 @@ pkg_postinst() {
 		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}
+		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