Update to 2.30.4

3 files changed, 34 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 314b0b5d2661..f88a33978f26 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = iscan-plugin-gt-f700
 	pkgdesc = EPSON Image Scan! plugin for Epson scanners (Perfection V350 Photo)
-	pkgver = 1.0.0
+	pkgver = 2.30.4
 	pkgrel = 1
 	url = https://epson.com/Support/Scanners/Perfection-Series/Epson-Perfection-V350-Photo/s/SPT_B11B185011
 	install = iscan-plugin-gt-f700.install
 	arch = i686
 	arch = x86_64
-	license = custom:AVASYSPL
+	license = custom:EPSON EULA
 	depends = iscan
-	source_i686 = https://download2.ebz.epson.net/iscan/plugin/gt-f700/deb/x86/iscan-gt-f700-bundle-1.0.0.x86.deb.tar.gz
-	sha256sums_i686 = 6d8caea316a8731898871cfb0c5a063479d94435c0bb1f34ffe3e2dde374f729
-	source_x86_64 = https://download2.ebz.epson.net/iscan/plugin/gt-f700/deb/x64/iscan-gt-f700-bundle-1.0.0.x64.deb.tar.gz
-	sha256sums_x86_64 = effffe4a78d5abe7d4148186f15ad50fe96459e9083968a8c7d3ee1b4688b6f2
+	source_i686 = https://download2.ebz.epson.net/iscan/plugin/gt-f700/deb/x86/iscan-gt-f700-bundle-2.30.4.x86.deb.tar.gz
+	sha256sums_i686 = 726f2be09354654de027beb48c84aa3096af2511d4a3f943f7cca6c8ba91dc11
+	source_x86_64 = https://download2.ebz.epson.net/iscan/plugin/gt-f700/deb/x64/iscan-gt-f700-bundle-2.30.4.x64.deb.tar.gz
+	sha256sums_x86_64 = 2bc95e5972b83e05fef0dbc60731312941c8239509b1e251cc5a55e62c842e00
 
 pkgname = iscan-plugin-gt-f700
 
diff --git a/PKGBUILD b/PKGBUILD
index c780d7b0afbc..05df6e928ada 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,18 @@
 # Maintainer: Jean-Marc Lenoir <archlinux "at" jihemel "dot" com>
 
 pkgname=iscan-plugin-gt-f700
-pkgver=1.0.0
+pkgver=2.30.4
 pkgrel=1
 pkgdesc="EPSON Image Scan! plugin for Epson scanners (Perfection V350 Photo)"
 arch=('i686' 'x86_64')
 url="https://epson.com/Support/Scanners/Perfection-Series/Epson-Perfection-V350-Photo/s/SPT_B11B185011"
-license=('custom:AVASYSPL')
+license=('custom:EPSON EULA')
 depends=('iscan')
-_plugin=${pkgname/iscan-plugin-/}
-_iscan_ver=1.0.0
-_plugin_rel=1
-_file_ver=2.1.2
-source_i686=("https://download2.ebz.epson.net/iscan/plugin/${_plugin}/deb/x86/iscan-${_plugin}-bundle-${_iscan_ver}.x86.deb.tar.gz")
-source_x86_64=("https://download2.ebz.epson.net/iscan/plugin/${_plugin}/deb/x64/iscan-${_plugin}-bundle-${_iscan_ver}.x64.deb.tar.gz")
-sha256sums_i686=('6d8caea316a8731898871cfb0c5a063479d94435c0bb1f34ffe3e2dde374f729')
-sha256sums_x86_64=('effffe4a78d5abe7d4148186f15ad50fe96459e9083968a8c7d3ee1b4688b6f2')
 install="${pkgname}.install"
 
+_plugin=${pkgname/iscan-plugin-/}
+_plugin_rel=1
+_plugin_ver=2.1.3
 if [ "$CARCH" = 'x86_64' ]
 then
   _filearch=x64
@@ -26,24 +21,31 @@ else
   _filearch=x86
   _debarch=i386
 fi
+source_i686=("https://download2.ebz.epson.net/iscan/plugin/${_plugin}/deb/x86/iscan-${_plugin}-bundle-${pkgver}.x86.deb.tar.gz")
+source_x86_64=("https://download2.ebz.epson.net/iscan/plugin/${_plugin}/deb/x64/iscan-${_plugin}-bundle-${pkgver}.x64.deb.tar.gz")
+sha256sums_i686=('726f2be09354654de027beb48c84aa3096af2511d4a3f943f7cca6c8ba91dc11')
+sha256sums_x86_64=('2bc95e5972b83e05fef0dbc60731312941c8239509b1e251cc5a55e62c842e00')
+
 
-build() {
-  cd "iscan-${_plugin}-bundle-${_iscan_ver}.${_filearch}.deb/plugins"
-  bsdtar -xf "iscan-plugin-${_plugin}_${_file_ver}-${_plugin_rel}_${_debarch}.deb"
-  bsdtar -xf data.tar.gz
+prepare(){
+  cd "${srcdir}/iscan-${_plugin}-bundle-${pkgver}.${_filearch}.deb"/plugins
+  ar x "iscan-plugin-${_plugin}_${_plugin_ver}-${_plugin_rel}_${_debarch}.deb"
+  tar -zxf data.tar.gz
+  # licenses
+  gunzip -f "usr/share/doc/${pkgname}"/{COPYING.EPSON.en.txt,COPYING.EPSON.ja.txt}.gz
 }
 
-package() {
-  cd "iscan-${_plugin}-bundle-${_iscan_ver}.${_filearch}.deb/plugins/usr"
+package(){
+  cd "${srcdir}/iscan-${_plugin}-bundle-${pkgver}.${_filearch}.deb"/plugins
   # Install plugins
-  install -m 755 -d "${pkgdir}/usr/lib/iscan"
-  install -m 644 -t "${pkgdir}/usr/lib/iscan" "lib/iscan/libesint68.so.2.0.1"
-  ln -s "libesint68.so.2.0.1" "${pkgdir}/usr/lib/iscan/libesint68.so"
-  ln -s "libesint68.so.2.0.1" "${pkgdir}/usr/lib/iscan/libesint68.so.2"
+  install -m 755 -d "${pkgdir}"/usr/lib/iscan
+  install -m 755 -t "${pkgdir}"/usr/lib/iscan usr/lib/iscan/libesint68.so.2.0.1
+  ln -sf libesint68.so.2.0.1 "${pkgdir}"/usr/lib/iscan/libesint68.so.2
+  ln -sf libesint68.so.2.0.1 "${pkgdir}"/usr/lib/iscan/libesint68.so
   # Install firmwares
-  install -m 755 -d "${pkgdir}/usr/share/iscan"
-  install -m 644 -t "${pkgdir}/usr/share/iscan" "share/iscan/esfw68.bin"
+  install -m 755 -d "${pkgdir}"/usr/share/iscan
+  install -m 644 -t "${pkgdir}"/usr/share/iscan/ usr/share/iscan/esfw68.bin
   # Install licenses
-  install -m 755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m 644 "share/doc/${pkgname}/AVASYSPL.en.txt" "${pkgdir}/usr/share/licenses/${pkgname}/AVASYSPL"
+  install -m 755 -d "${pkgdir}"/usr/share/licenses/"${pkgname}"
+  install -m 644 usr/share/doc/"${pkgname}"/{COPYING.EPSON.en.txt,COPYING.EPSON.ja.txt,copyright} "${pkgdir}"/usr/share/licenses/"${pkgname}"/
 }
diff --git a/iscan-plugin-gt-f700.install b/iscan-plugin-gt-f700.install
index f042e0958d12..0b0bfd545144 100644
--- a/iscan-plugin-gt-f700.install
+++ b/iscan-plugin-gt-f700.install
@@ -1,13 +1,9 @@
 post_install() {
   echo "Registering iscan plugins and firmwares"
-  iscan-registry --add interpreter usb 0x04b8 0x012f \
-    /usr/lib/iscan/libesint68 \
-    /usr/share/iscan/esfw68.bin
+  iscan-registry --add interpreter usb 0x04b8 0x012f /usr/lib/iscan/libesint68 /usr/share/iscan/esfw68.bin
 }
 
 pre_remove() {
   echo "Unregistering iscan plugins and firmwares"
-  iscan-registry --remove interpreter usb 0x04b8 0x012f \
-    /usr/lib/iscan/libesint68 \
-    /usr/share/iscan/esfw68.bin
+  iscan-registry --remove interpreter usb 0x04b8 0x012f /usr/lib/iscan/libesint68 /usr/share/iscan/esfw68.bin
 }