gentoo resync : 25.11.2020

2 files changed, 16 insertions, 31 deletions

diff --git a/media-gfx/iscan-plugin-gt-f500/Manifest b/media-gfx/iscan-plugin-gt-f500/Manifest
index 53e472d5e3a2..b52971932503 100644
--- a/media-gfx/iscan-plugin-gt-f500/Manifest
+++ b/media-gfx/iscan-plugin-gt-f500/Manifest
@@ -1,3 +1,3 @@
 DIST iscan-plugin-gt-f500-1.0.0-1.c2.i386.rpm 126130 BLAKE2B 619dad6d7a93f96a962dbbcfa1095544245c1bfaf1525125fa872bfbf45bca1579759673cfdca3a342a96101967d397da38a12f1d326080aa42bcb130642e61a SHA512 efecbb6e3f4fe3f498ebf9bb68a1755405c675d67c52042dcfc2e4e7f98903a870f969b4453d110c9f774452c6ae44042482ee954762c5f5a559e2d3e52a98d0
-EBUILD iscan-plugin-gt-f500-1.0.0.1-r1.ebuild 2044 BLAKE2B fa1a14db0403e80f7f030aa2125f30112ae373d677fa5a8438ad33e05320571c0d190a85d2818385534ff24d9eee6be759461d6cf523e2bc7ad5c92cb13b6ed8 SHA512 13cd13f9ce2fb9190afe00116af1c469e76caca24572e0bf0db2f23c2abd1ec4129cc9020fef52a7062dd2f3a8d5d3c57bef700eb3ae1c114fa3ecaac7226e82
+EBUILD iscan-plugin-gt-f500-1.0.0.1-r1.ebuild 2035 BLAKE2B 0d188c91873f35fbe752a858dcf1d23779dc5c2a2501aad89b96f5d6bbd2d84188b0d4933eebef31e3255c2491e996eef2b96e9891cd0cacfa4720cfe346b19a SHA512 c8dde7e196ddfd27c753b0f9b9a3c1579800c1fb876a9dd19eaf68a15be30cbc0bee239fe13a7f72c958b1ac30de44faf295939d54dc862693ec2d7e81c4c542
 MISC metadata.xml 745 BLAKE2B 10d7bdff900b0a44b044d84683c2c013ad25a9a20cb6bab454aec00e949635615af71498e09d1b5c431f0257d224bbae40c445599378f00574684cf6c6b6ef00 SHA512 08f9ff794990e46bc9debea0455ba309626ad4014c8e832e6da750b8618cede462adee0f37ddbdeed2875a431a4316a60c73aca2195dbff6abd4c3fa1893d822
diff --git a/media-gfx/iscan-plugin-gt-f500/iscan-plugin-gt-f500-1.0.0.1-r1.ebuild b/media-gfx/iscan-plugin-gt-f500/iscan-plugin-gt-f500-1.0.0.1-r1.ebuild
index ec4ff46f4fda..dc9d71820484 100644
--- a/media-gfx/iscan-plugin-gt-f500/iscan-plugin-gt-f500-1.0.0.1-r1.ebuild
+++ b/media-gfx/iscan-plugin-gt-f500/iscan-plugin-gt-f500-1.0.0.1-r1.ebuild
@@ -1,27 +1,25 @@
-# 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 multilib rpm versionator
+inherit rpm
 
-MY_P="${PN}-$(replace_version_separator 3 -)"
+MY_P="${PN}-$(ver_rs 3 -)"
 
 DESCRIPTION="Epson Perfection 2480/2580 PHOTO scanner plugin for SANE 'epkowa' backend"
 HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
 SRC_URI="https://dev.gentoo.org/~flameeyes/avasys/${MY_P}.c2.i386.rpm"
+S="${WORKDIR}"
 
 LICENSE="EPSON EAPL"
 SLOT="0"
 KEYWORDS="-* ~amd64"
-
 IUSE="minimal"
 
 DEPEND="minimal? ( >=media-gfx/iscan-2.21.0 )"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}"
-
 src_configure() { :; }
 src_compile() { :; }
 
@@ -38,47 +36,34 @@ src_install() {
 	doexe "${WORKDIR}/usr/$(get_libdir)/iscan/"*
 }
 
-pkg_setup() {
-	basecmds=(
-		"iscan-registry --COMMAND interpreter usb 0x04b8 0x0121 '/opt/iscan/esci/libesint41.so.2 /usr/share/iscan/esfw41.bin'"
-	)
-}
-
 pkg_postinst() {
 	elog
 	elog "Firmware file esfw41.bin for Epson Perfection 2480/2580 PHOTO"
-	elog "has been installed in /usr/share/iscan."
+	elog "has been installed in ${EROOT}/usr/share/iscan."
 	elog
+
 	use minimal && return
-	[[ -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 0x0121 '/opt/iscan/esci/libesint41.so.2 /usr/share/iscan/esfw41.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/add}"
-		done
+		ewarn "iscan-registry --add interpreter usb 0x04b8 0x0121 '/opt/iscan/esci/libesint41.so.2 /usr/share/iscan/esfw41.bin'"
 	fi
 }
 
 pkg_prerm() {
 	use minimal && return
-	[[ -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 0x0121 '/opt/iscan/esci/libesint41.so.2 /usr/share/iscan/esfw41.bin' || die
 	else
 		ewarn "Unable to de-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 0x0121 '/opt/iscan/esci/libesint41.so.2 /usr/share/iscan/esfw41.bin'"
 	fi
 }