[gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan-plugin-gt-f720/

[Sam James]

commit:     695203894eb9bd0d7be99ec381fadf50ff48a027
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 24 21:19:20 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 25 19:11:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69520389

media-gfx/iscan-plugin-gt-f720: port to EAPI 7

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../iscan-plugin-gt-f720-0.0.1.2.ebuild                 | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/media-gfx/iscan-plugin-gt-f720/iscan-plugin-gt-f720-0.0.1.2.ebuild b/media-gfx/iscan-plugin-gt-f720/iscan-plugin-gt-f720-0.0.1.2.ebuild
index a09a64ceb97..89786f1de27 100644
--- a/media-gfx/iscan-plugin-gt-f720/iscan-plugin-gt-f720-0.0.1.2.ebuild
+++ b/media-gfx/iscan-plugin-gt-f720/iscan-plugin-gt-f720-0.0.1.2.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit multilib versionator rpm
+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 -)"
 MY_P="esci-interpreter-gt-f720-${MY_PVR}"
 
 DESCRIPTION="Epson Perfection V300 PHOTO 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/${MY_P}.x86_64.rpm )
 	x86? ( https://dev.gentoo.org/~flameeyes/avasys/${MY_P}.i386.rpm )"
+S="${WORKDIR}"
 
 LICENSE="AVASYS"
 SLOT="0"
@@ -21,8 +22,6 @@ KEYWORDS="-* amd64 x86"
 DEPEND=">=media-gfx/iscan-2.21.0"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}"
-
 QA_PREBUILT="usr/lib64/esci/libesci-interpreter-gt-f720.so*"
 
 src_install() {
@@ -42,7 +41,7 @@ pkg_postinst() {
 	local MY_LIB="/usr/$(get_libdir)"
 
 	# Needed for scaner to work properly.
-	iscan-registry --add interpreter usb 0x04b8 0x0131 "${MY_LIB}/esci/libesci-interpreter-gt-f720 /usr/share/esci/esfw8b.bin"
+	iscan-registry --add interpreter usb 0x04b8 0x0131 "${MY_LIB}/esci/libesci-interpreter-gt-f720 /usr/share/esci/esfw8b.bin" || die
 	elog
 	elog "Firmware file esfw8b.bin for Epson Perfection V300 PHOTO"
 	elog "has been installed in /usr/share/esci and registered for use."
@@ -52,5 +51,5 @@ pkg_postinst() {
 pkg_prerm() {
 	local MY_LIB="/usr/$(get_libdir)"
 
-	iscan-registry --remove interpreter usb 0x04b8 0x0131 "${MY_LIB}/esci/libesci-interpreter-gt-f720 /usr/share/esci/esfw8b.bin"
+	iscan-registry --remove interpreter usb 0x04b8 0x0131 "${MY_LIB}/esci/libesci-interpreter-gt-f720 /usr/share/esci/esfw8b.bin" || die
 }