[arch-commits] Commit in iscan/trunk (PKGBUILD)

[Fabio Castelli]

    Date: Sunday, March 29, 2015 @ 22:52:54
  Author: muflone
Revision: 130210

upgpkg: iscan 2.30.1-6

Modified:
  iscan/trunk/PKGBUILD

----------+
 PKGBUILD |   31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-29 20:35:07 UTC (rev 130209)
+++ PKGBUILD	2015-03-29 20:52:54 UTC (rev 130210)
@@ -3,22 +3,26 @@
 # Contributor: Frederic Bezies < fredbezies at gmail dot com>
 # Contributor: garion < garion @ mailoo.org >
 # Contributor: Alessio Sergi <asergi at archlinux dot us>
-# Contributor: mutlu_inek <mutlu_inek at yahoo.de>
 
-pkgbase=iscan
-pkgname=('iscan' 'gimp-plugin-iscan')
+pkgname='iscan'
 pkgver=2.30.1
 pkgrel=6
 pkgdesc="EPSON Image Scan! front-end for scanners and all-in-ones"
 arch=('i686' 'x86_64')
 url="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-makedepends=('gettext' 'sane' 'gimp')
-source=("https://download3.ebz.epson.net/dsc/f/03/00/03/61/59/a3f8b8d60e8702a1c5bf3977d018cc2336e308a8/${pkgbase}_${pkgver}-1.tar.gz"
+license=('GPL2' 'custom:AVASYSPL')
+depends=('gtk2' 'sane')
+makedepends=('gettext' 'gimp')
+optdepends=('iscan-data: Image Scan! data files required for some devices'
+            'gimp-plugin-iscan: plug-in to scan directly from GIMP')
+source=("https://download3.ebz.epson.net/dsc/f/03/00/03/61/59/a3f8b8d60e8702a1c5bf3977d018cc2336e308a8/${pkgname}_${pkgver}-1.tar.gz"
         "libpng15.patch"
         "epkowa.conf")
 sha256sums=('79aa9a9f81a7146beb22a382bbaf840fbce61b1bdb82660e541946a471e48426'
             '1a75b8df945a813a297dfd6e3dabae3bc8b51898f23af31640091e31b901f0ba'
             '8e9e90fa50f1bd476b13766b19f100470c41dd253dc0605fbb1d0ac346a0beff')
+install="${pkgname}.install"
+backup=("etc/sane.d/epkowa.conf")
 
 prepare() {
   cd "${pkgname}-${pkgver}"
@@ -40,14 +44,7 @@
   make
 }
 
-package_iscan() {
-  depends=('gtk2' 'sane')
-  optdepends=('iscan-data: Image Scan! data files required for some devices'
-              'gimp-plugin-iscan: plug-in to scan directly from GIMP')
-  install="${pkgname}.install"
-  backup=("etc/sane.d/epkowa.conf")
-  license=('GPL2' 'custom:AVASYSPL')
-
+package() {
   cd "${pkgname}-${pkgver}"
 
   # install files
@@ -68,11 +65,3 @@
   install -m 644 "non-free/AVASYSPL.en.txt" "${pkgdir}/usr/share/licenses/${pkgname}/AVASYSPL"
 }
 
-package_gimp-plugin-iscan() {
-  pkgdesc='GIMP plugin to launch Image Scan! and to scan an image directly from GIMP'
-  arch=('any')
-  depends=('iscan' 'gimp')
-  license=('GPL2')
-  install -m 755 -d "${pkgdir}/usr/lib/gimp/2.0/plug-ins"
-  ln -s "/usr/bin/iscan" "${pkgdir}/usr/lib/gimp/2.0/plug-ins/iscan"
-}