gentoo resync : 25.11.2020

2 files changed, 16 insertions, 33 deletions

diff --git a/media-gfx/iscan-plugin-gt-x770/Manifest b/media-gfx/iscan-plugin-gt-x770/Manifest
index 642109f0833f..d50b2adac965 100644
--- a/media-gfx/iscan-plugin-gt-x770/Manifest
+++ b/media-gfx/iscan-plugin-gt-x770/Manifest
@@ -1,4 +1,4 @@
 DIST iscan-plugin-gt-x770-2.1.2-1.i386.rpm 462166 BLAKE2B 536bf2dfcf8d9ae7764e95b639aa5aa3a04d0f5b51c2884198d6d4d3105411ab9673bdf19006a4e2586d17dd74d673b57951fee69e3fba257a674234bcc4d883 SHA512 b8c16dd1c3d2d8f01956a72a170fa9b51520c78ab9d2d0cd581ee1b18760a28693d364e3bc3ac50a4f1c794fb4da777d452fe12ae3cf513a06eb5bedd2543b30
 DIST iscan-plugin-gt-x770-2.1.2-1.x86_64.rpm 196426 BLAKE2B 19641d3ef0742f2468df304ef0d151d3fd46408c9e4eb7e4c8ce27604fc5947e73f2448b474cde1a9aa545252561866a9ee61860430ede4ae68234204a5d71b8 SHA512 a69830fb35b2732351b35ef39a6863886bf6bc992242188e57d273444ea17e55294b5b9331c5e770b8af179e4f346e5be74c5fd79e1e6cefd2a1e975c3e68a43
-EBUILD iscan-plugin-gt-x770-2.1.2.1-r3.ebuild 2186 BLAKE2B ef5bd12a59a632b981c6a443567e994f9c297e615878f26ba8c72bc4a6133040c11b2fe137dc210a4c07f928080f22810ad48d1d18355835c561c7324764bfc4 SHA512 405c062938edb045612d4589e9a3d39b87826e931ca19a15ef7093ecfff9ee295c235deebc2581fa733928fbbc893c3a01b491b38449ada022349163143704a5
+EBUILD iscan-plugin-gt-x770-2.1.2.1-r3.ebuild 2127 BLAKE2B dcd0b55969739c064113c2153405b54b27320dfae2474f97f789ec297218dd74e64fccce61e3abf4885f8090087dc0bdf4decfc7403d0ea372654ae6799ef187 SHA512 32c6c7faeef7594d2b8f10760749c1f4ca0c9126a7cfd534a1f67fe4825470966758eff885b5dbedb7e069adf9c7d4f2712e40b87a3ecbd1b924923d050ebaf0
 MISC metadata.xml 458 BLAKE2B 3c055123ac3d559601ecbb0ad2a8fb18737c86e604f0f932744dec345ab4626e9734a5712888a4922380c6367b1003f812b63da815ff70cdbddb0b71c0fe9c29 SHA512 ade1af441c26e6f3b1c149fbb8a4f8530d425ff28e8d0525826f59985e08dec2cd3de02099ca1be2f3c8f9136d3aa482917b0636158ba46ba5f76649d12a572c
diff --git a/media-gfx/iscan-plugin-gt-x770/iscan-plugin-gt-x770-2.1.2.1-r3.ebuild b/media-gfx/iscan-plugin-gt-x770/iscan-plugin-gt-x770-2.1.2.1-r3.ebuild
index 380f3d1e59ea..e876f9536887 100644
--- a/media-gfx/iscan-plugin-gt-x770/iscan-plugin-gt-x770-2.1.2.1-r3.ebuild
+++ b/media-gfx/iscan-plugin-gt-x770/iscan-plugin-gt-x770-2.1.2.1-r3.ebuild
@@ -1,12 +1,12 @@
-# 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 V500 scanner plugin for SANE 'epkowa' backend"
 HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
@@ -14,19 +14,16 @@ SRC_URI="
 	x86? ( https://dev.gentoo.org/~flameeyes/avasys/${PN}/${MY_PV}/${PN}-${MY_PVR}.i386.rpm )
 	amd64? ( https://dev.gentoo.org/~flameeyes/avasys/${PN}/${MY_PV}/${PN}-${MY_PVR}.x86_64.rpm )
 "
+S="${WORKDIR}"
 
 LICENSE="AVASYS"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 
-IUSE=""
-
 DEPEND=">=media-gfx/iscan-2.21.0
 	!!<media-gfx/iscan-plugin-gt-x770-2.1.2.1-r2"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}"
-
 QA_PREBUILT="/opt/iscan/esci/libesint7C.so*"
 
 src_configure() { :; }
@@ -44,46 +41,32 @@ src_install() {
 	doexe "${WORKDIR}/usr/$(get_libdir)/iscan/"*
 }
 
-pkg_setup() {
-	basecmds=(
-		"iscan-registry --COMMAND interpreter usb 0x04b8 0x0130 /opt/iscan/esci/libesint7C /usr/share/iscan/esfw7C.bin"
-	)
-}
-
 pkg_postinst() {
 	elog
 	elog "Firmware file esfw41.bin for Epson Perfection V500"
-	elog "has been installed in /usr/share/iscan."
+	elog "has been installed in ${EROOT}/usr/share/iscan."
 	elog
 
-	[[ -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 0x0130 /opt/iscan/esci/libesint7C /usr/share/iscan/esfw7C.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 0x0130 /opt/iscan/esci/libesint7C /usr/share/iscan/esfw7C.bin"
 	fi
 }
 
 pkg_prerm() {
-	[[ -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 0x0130 /opt/iscan/esci/libesint7C /usr/share/iscan/esfw7C.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 0x0130 /opt/iscan/esci/libesint7C /usr/share/iscan/esfw7C.bin"
 	fi
 }