gentoo resync : 25.11.2020

2 files changed, 16 insertions, 33 deletions

diff --git a/media-gfx/iscan-plugin-gt-x820/Manifest b/media-gfx/iscan-plugin-gt-x820/Manifest
index e3f2e8af020b..7c4f2c185184 100644
--- a/media-gfx/iscan-plugin-gt-x820/Manifest
+++ b/media-gfx/iscan-plugin-gt-x820/Manifest
@@ -1,4 +1,4 @@
 DIST iscan-plugin-gt-x820-2.2.0-1.i386.rpm 490641 BLAKE2B 7618023f7637a8684f928b07217d2fa5df2a6cc1f5331a53a9b57e58b9d1127061b0e14e9af4c7b93746d3511414658bae47b12bc0db505054e6459925bfd566 SHA512 37f72ce8d71d315f51f45cd08c8865a2e613b8a6c6a27e7f4671bd5a796d10f3f9cffb954dd5f3875395f49244b090f5a2a4f2749d6c5d080ce4766faf7ccdf1
 DIST iscan-plugin-gt-x820-2.2.0-1.x86_64.rpm 206774 BLAKE2B 3d3faf1c04742bfcfd96473fc5274423a458c4082526887d5164585274c1ee2fd7606fa351267a7b94b0f632634817dda8e4bd57dcc54a43c307b6a602646706 SHA512 342b034ae7cf1f2b346ffce8719a025e55df2295daaad896acb072e3e36b916f0503106293dc88340d4b1b732b8daa6f4d0681f843754824b757667940b5b545
-EBUILD iscan-plugin-gt-x820-2.2.0.1.ebuild 2241 BLAKE2B 7923a0dbb21e2535e56c05f8318cdeda066681774ba6d4e71bd50a4a1c39970ab64b9b0725fe41427f0e8237260a6eec87721ceecce5b4230144036a084e4295 SHA512 843cf78f8b5c874db81ede7a0a3e78f924ddcf66031bc093c2ec99d33db671b388d40351080b4afa610438f0abe6de9b28ff9fd43d6ee43498c9e2fcf52044bc
+EBUILD iscan-plugin-gt-x820-2.2.0.1.ebuild 2179 BLAKE2B 6ffc60c2f6541389c0ba7012908790f2523cc66d9669b00e410b9ee56eab16311b0058e0a418700c4bfdcd31adf2f093f37825f8c3f27c5ac069299dbcb746cd SHA512 faf33871e463f47fe8c04e88e75964237fac081d13086f0ad1d9cabf96581716348ddc72d523387afc726fdc429e174419ee564c2ed8b2a80d59ae23bfbf4589
 MISC metadata.xml 464 BLAKE2B 54e1ca2207c523fdc988369222b6f581807986d5f00206bcf2cd58a7b969c5677b8b1df6ec42a6aeaec7e7a32430f5c1bf4e3a4e583da4e93db45e73d6e1d565 SHA512 42f9ba42888fbd42fdf6197d3b9e59c96efd8b48fafd9eb54cba4aa6bc23df7d45f3a9f0c0157750234018e225560cb34c63cc8b9245fda12bdeb3ce25390871
diff --git a/media-gfx/iscan-plugin-gt-x820/iscan-plugin-gt-x820-2.2.0.1.ebuild b/media-gfx/iscan-plugin-gt-x820/iscan-plugin-gt-x820-2.2.0.1.ebuild
index ba7639fb7a51..a368e5a4192d 100644
--- a/media-gfx/iscan-plugin-gt-x820/iscan-plugin-gt-x820-2.2.0.1.ebuild
+++ b/media-gfx/iscan-plugin-gt-x820/iscan-plugin-gt-x820-2.2.0.1.ebuild
@@ -1,29 +1,26 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit rpm versionator multilib
+inherit rpm
 
-MY_PV="$(get_version_component_range 1-3)"
-MY_PVR="$(replace_version_separator 3 -)"
+MY_PV="$(ver_cut 1-3)"
+MY_PVR="$(ver_rs 3 -)"
 
 DESCRIPTION="Epson Perfection V600 scanner plugin for SANE 'epkowa' backend"
 HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
 SRC_URI="amd64? ( https://dev.gentoo.org/~flameeyes/avasys/${PN}-${MY_PVR}.x86_64.rpm )
 	x86? ( https://dev.gentoo.org/~flameeyes/avasys/${PN}-${MY_PVR}.i386.rpm )"
+S="${WORKDIR}"
 
 LICENSE="AVASYS"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 
-IUSE=""
-
 DEPEND=">=media-gfx/iscan-2.21.0"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}"
-
 QA_PREBUILT="/opt/iscan/lib/libesintA1.so*"
 
 src_configure() { :; }
@@ -41,50 +38,36 @@ src_install() {
 	doexe "${WORKDIR}/usr/$(get_libdir)/iscan/"*
 }
 
-pkg_setup() {
-	basecmds=(
-		"iscan-registry --COMMAND interpreter usb 0x04b8 0x013a /opt/iscan/lib/libesintA1 /usr/share/iscan/esfwA1.bin"
-	)
-}
-
 pkg_postinst() {
 	elog
 	elog "Firmware file esfwA1.bin for Epson Perfection V600"
-	elog "has been installed in /usr/share/iscan."
+	elog "has been installed in ${EROOT}/usr/share/iscan."
 	elog
 
 	# Only register scanner on new installs
-	[[ -n ${REPLACING_VERSIONS} ]] && return
+	[[ -n "${REPLACING_VERSIONS}" ]] && return
 
 	# Needed for scanner to work properly.
-	if [[ ${ROOT} == "/" ]]; then
-		for basecmd in "${basecmds[@]}"; do
-			eval ${basecmd/COMMAND/add}
-		done
+	if [[ -z "${EROOT}" ]]; then
+		iscan-registry --add interpreter usb 0x04b8 0x013a /opt/iscan/lib/libesintA1 /usr/share/iscan/esfwA1.bin || die
 		elog "New firmware has been registered automatically."
 		elog
 	else
 		ewarn "Unable to register the plugin and firmware when installing outside of /."
 		ewarn "execute the following command yourself:"
-		for basecmd in "${basecmds[@]}"; do
-			ewarn "${basecmd/COMMAND/add}"
-		done
+		ewarn "iscan-registry --add interpreter usb 0x04b8 0x013a /opt/iscan/lib/libesintA1 /usr/share/iscan/esfwA1.bin"
 	fi
 }
 
 pkg_prerm() {
 	# Only unregister on on uninstall
-	[[ -n ${REPLACED_BY_VERSION} ]] && return
+	[[ -n "${REPLACED_BY_VERSION}" ]] && return
 
-	if [[ ${ROOT} == "/" ]]; then
-		for basecmd in "${basecmds[@]}"; do
-			eval ${basecmd/COMMAND/remove}
-		done
+	if [[ -z "${EROOT}" ]]; then
+		iscan-registry --remove interpreter usb 0x04b8 0x013a /opt/iscan/lib/libesintA1 /usr/share/iscan/esfwA1.bin || die
 	else
 		ewarn "Unable to register the plugin and firmware when installing outside of /."
 		ewarn "execute the following command yourself:"
-		for basecmd in "${basecmds[@]}"; do
-			ewarn "${basecmd/COMMAND/remove}"
-		done
+		ewarn "iscan-registry --remove interpreter usb 0x04b8 0x013a /opt/iscan/lib/libesintA1 /usr/share/iscan/esfwA1.bin"
 	fi
 }