2.1.2-5 : New location for sources (and provided as bundle).

3 files changed, 23 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 808c288e9446..0450c026dd73 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by makepkg 4.2.1
-# Sun Apr  5 08:37:23 UTC 2015
 pkgbase = iscan-plugin-gt-f670
 	pkgdesc = iscan plugin for Epson Perfection Photo V200 scanners and similar
 	pkgver = 2.1.2
-	pkgrel = 4
+	pkgrel = 5
 	url = http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
 	install = gt-f670.install
 	changelog = ChangeLog
@@ -11,8 +9,6 @@ pkgbase = iscan-plugin-gt-f670
 	arch = x86_64
 	license = custom:AVASYSPL
 	depends = iscan
-	source = http://a1227.g.akamai.net/f/1227/40484/1d/download.ebz.epson.net/dsc/f/01/00/01/58/37/2057b553c5adcfd11876c3bd7e7da0974ad1b733/iscan-plugin-gt-f670_2.1.2-1_amd64.deb
-	md5sums = 1492419f92b89be08be3e4438986bead
 
 pkgname = iscan-plugin-gt-f670
 
diff --git a/ChangeLog b/ChangeLog
index fb2609530552..7fffa6b5cf5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-26 FoolEcho <foolecho at gmail dot com>
+
+	* 2.1.2-5 :
+	New location for sources + bundle.
+
 2013-10-14 FoolEcho <foolecho at gmail dot com>
 
 	* 2.1.2-4 :
diff --git a/PKGBUILD b/PKGBUILD
index f3a6ae990022..5ed530fd2afe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,10 @@
 # Contributor: garion < garion at mailoo.org >
 
 pkgname=iscan-plugin-gt-f670
+_pkgname=iscan-gt-f670-bundle
 pkgver=2.1.2
-pkgrel=4
+_pkgver=1.0.0
+pkgrel=5
 pkgdesc="iscan plugin for Epson Perfection Photo V200 scanners and similar"
 arch=('i686' 'x86_64')
 url="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
@@ -14,27 +16,30 @@ changelog=ChangeLog
 
 if [ "$CARCH" = "i686" ]; then
   _ARCH=i386
-  source=("http://a1227.g.akamai.net/f/1227/40484/1d/download.ebz.epson.net/dsc/f/01/00/01/58/37/ded8c1c031fd402e8f99f5ed9c8ca1cbefe1cdde/$pkgname"_"$pkgver-1_$_ARCH.deb")
-  md5sums=('99edc10ae8c5712abdc8bf21ad99ade1')
+  _ARCH2=x86
+  source=("https://download2.ebz.epson.net/iscan/plugin/gt-f670/deb/x86/iscan-gt-f670-bundle-$_pkgver.x86.deb.tar.gz")
+  md5sums=('5c5029414f00bbc0bfa461711a170fdc')
 elif [ "$CARCH" = "x86_64" ]; then
   _ARCH=amd64
-  source=("http://a1227.g.akamai.net/f/1227/40484/1d/download.ebz.epson.net/dsc/f/01/00/01/58/37/2057b553c5adcfd11876c3bd7e7da0974ad1b733/$pkgname"_"$pkgver-1_$_ARCH.deb")
-  md5sums=('1492419f92b89be08be3e4438986bead')
+  _ARCH2=x64
+  source=("https://download2.ebz.epson.net/iscan/plugin/gt-f670/deb/x64/iscan-gt-f670-bundle-$_pkgver.x64.deb.tar.gz")
+  md5sums=('abaae6c367bdcde8113b5e12d1fd1ca8')
 fi
 
 build(){
-  cd $srcdir
-  ar vx $pkgname"_"$pkgver-1_$_ARCH.deb
+  cd $srcdir/$_pkgname-$_pkgver.$_ARCH2.deb/plugins/
+  ar vx $pkgname"_"$pkgver"-1_"$_ARCH.deb
   tar -zxvf data.tar.gz
 }
 
 package(){
+ cd $srcdir/$_pkgname-$_pkgver.$_ARCH2.deb/plugins/
   install -d $pkgdir/usr/lib/iscan
-  install -m755 $srcdir/usr/lib/iscan/libesint7A.so.2.0.1 $pkgdir/usr/lib/iscan/
-  install -m755 $srcdir/usr/lib/iscan/libesint7A.so.2 $pkgdir/usr/lib/iscan/
-  install -m755 $srcdir/usr/lib/iscan/libesint7A.so $pkgdir/usr/lib/iscan/
+  install -m755 usr/lib/iscan/libesint7A.so.2.0.1 $pkgdir/usr/lib/iscan/
+  install -m755 usr/lib/iscan/libesint7A.so.2 $pkgdir/usr/lib/iscan/
+  install -m755 usr/lib/iscan/libesint7A.so $pkgdir/usr/lib/iscan/
   install -d $pkgdir/usr/share/iscan
-  install -m644 $srcdir/usr/share/iscan/esfw7A.bin $pkgdir/usr/share/iscan
+  install -m644 usr/share/iscan/esfw7A.bin $pkgdir/usr/share/iscan
   install -d $pkgdir/usr/share/licenses/$pkgname/
-  install -m644 $srcdir/usr/share/doc/$pkgname/{AVASYSPL.en.txt,AVASYSPL.ja.txt,copyright} $pkgdir/usr/share/licenses/$pkgname/
+  install -m644 usr/share/doc/$pkgname/{AVASYSPL.en.txt,AVASYSPL.ja.txt,copyright} $pkgdir/usr/share/licenses/$pkgname/
 }