Updated package iscan-plugin-gt-f720 2.30.4-1

2 files changed, 24 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3a3c8e0b6f96..14b598a9898a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,14 @@
-# Generated by mksrcinfo v8
-# Wed Nov  1 18:48:14 UTC 2017
 pkgbase = iscan-plugin-gt-f720
 	pkgdesc = EPSON Image Scan! plugin for Epson scanners (GT-F720, GT-S620, Perfection V30, Perfection V300 Photo)
-	pkgver = 1.0.1
-	pkgrel = 2
+	pkgver = 2.30.4
+	pkgrel = 1
 	url = http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
 	install = iscan-plugin-gt-f720.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-f720/deb/x86/iscan-gt-f720-bundle-1.0.0.x86.deb.tar.gz
-	sha256sums_i686 = 594523472475bf2c822f77b3f60b78a0eaa2e0affb263e8e1a7c82b43bc94e0c
-	source_x86_64 = https://download2.ebz.epson.net/iscan/plugin/gt-f720/deb/x64/iscan-gt-f720-bundle-1.0.0.x64.deb.tar.gz
-	sha256sums_x86_64 = c8b36fa3b68ba244cec9f9026bffcfc6d39f5b5a4d9c69f396e83b44b7c9108c
+	source = https://download2.ebz.epson.net/iscan/plugin/gt-f720/deb/x64/iscan-gt-f720-bundle-2.30.4.x64.deb.tar.gz
+	sha256sums = 9e4b56994d83241472e15f1c9c1f37646a12809921aea912724a07b152d5437b
 
 pkgname = iscan-plugin-gt-f720
 
diff --git a/PKGBUILD b/PKGBUILD
index cfb1971de566..a17b89d01fd6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,53 +6,41 @@
 # Contributor: Andrew Kotsyuba <avallach2000@gmail.com>
 
 pkgname=iscan-plugin-gt-f720
-pkgver=1.0.1
-pkgrel=2
+pkgver=2.30.4
+pkgrel=1
 pkgdesc="EPSON Image Scan! plugin for Epson scanners (GT-F720, GT-S620, Perfection V30, Perfection V300 Photo)"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-license=('custom:AVASYSPL')
+license=('custom:EPSON EULA')
 depends=('iscan')
-_plugin=${pkgname/iscan-plugin-/}
-_iscan_ver=1.0.0
-_plugin_rel=2
-_file_ver=0.1.1
-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=('594523472475bf2c822f77b3f60b78a0eaa2e0affb263e8e1a7c82b43bc94e0c')
-sha256sums_x86_64=('c8b36fa3b68ba244cec9f9026bffcfc6d39f5b5a4d9c69f396e83b44b7c9108c')
+source=("https://download2.ebz.epson.net/iscan/plugin/gt-f720/deb/x64/iscan-gt-f720-bundle-${pkgver}.x64.deb.tar.gz")
+sha256sums=('9e4b56994d83241472e15f1c9c1f37646a12809921aea912724a07b152d5437b')
 install="${pkgname}.install"
 
-if [ "$CARCH" = 'x86_64' ]
-then
-  _filearch=x64
-  _debarch=amd64
-else
-  _filearch=x86
-  _debarch=i386
-fi
-
-build() {
-  cd "iscan-${_plugin}-bundle-${_iscan_ver}.${_filearch}.deb/plugins"
-  bsdtar -xf "esci-interpreter-${_plugin}_${_file_ver}-${_plugin_rel}_${_debarch}.deb"
+prepare() {
+  cd "iscan-gt-f720-bundle-${pkgver}.x64.deb/plugins"
+  bsdtar -xf "esci-interpreter-gt-f720_1.0.0-1_amd64.deb"
   bsdtar -xf data.tar.gz
-  gzip -fkd "usr/share/doc/esci-interpreter-${_plugin}/NEWS.gz"
+  gzip -fkd "usr/share/doc/esci-interpreter-gt-f720/NEWS.gz"
+  gzip -fkd "usr/share/doc/esci-interpreter-gt-f720/COPYING.EPSON.en.txt.gz"
 }
 
 package() {
-  cd "iscan-${_plugin}-bundle-${_iscan_ver}.${_filearch}.deb/plugins/usr"
+  cd "iscan-gt-f720-bundle-${pkgver}.x64.deb/plugins/usr"
   # Install plugins
   install -m 755 -d "${pkgdir}/usr/lib/iscan"
-  install -m 644 -t "${pkgdir}/usr/lib/iscan" "lib/esci/libesci-interpreter-${_plugin}.so.0.0.0"
-  ln -s "libesci-interpreter-${_plugin}.so.0.0.0" "${pkgdir}/usr/lib/iscan/libesci-interpreter-${_plugin}.so"
-  ln -s "libesci-interpreter-${_plugin}.so.0.0.0" "${pkgdir}/usr/lib/iscan/libesci-interpreter-${_plugin}.so.0"
+  install -m 644 -t "${pkgdir}/usr/lib/iscan" "lib/esci/libesci-interpreter-gt-f720.so.0.0.0"
+  ln -s "libesci-interpreter-gt-f720.so.0.0.0" "${pkgdir}/usr/lib/iscan/libesci-interpreter-gt-f720.so"
+  ln -s "libesci-interpreter-gt-f720.so.0.0.0" "${pkgdir}/usr/lib/iscan/libesci-interpreter-gt-f720.so.0"
   # Install firmwares
   install -m 755 -d "${pkgdir}/usr/share/esci"
   install -m 644 -t "${pkgdir}/usr/share/esci" "share/esci/esfw8b.bin"
   # Install documentation
   install -m 755 -d "${pkgdir}/usr/share/doc/${pkgname}"
-  install -m 644 -t "${pkgdir}/usr/share/doc/${pkgname}" "share/doc/esci-interpreter-${_plugin}/NEWS"
+  install -m 644 -t "${pkgdir}/usr/share/doc/${pkgname}" \
+    "share/doc/esci-interpreter-gt-f720/NEWS"
   # Install licenses
   install -m 755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m 644 "share/doc/esci-interpreter-gt-f720/AVASYSPL.en.txt" "${pkgdir}/usr/share/licenses/${pkgname}/AVASYSPL"
+  install -m 644 -t "${pkgdir}/usr/share/licenses/${pkgname}" \
+    "share/doc/esci-interpreter-gt-f720/COPYING.EPSON.en.txt"
 }