2 files changed, 17 insertions, 27 deletions
diff --git a/community/simple-scan/PKGBUILD b/community/simple-scan/PKGBUILD
index cc7906392..bc08d2ef9 100644
--- a/community/simple-scan/PKGBUILD
+++ b/community/simple-scan/PKGBUILD
@@ -2,31 +2,27 @@
 # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
 
 pkgname=simple-scan
-pkgver=2.32.0.2
+pkgver=3.2.0
 pkgrel=1
 pkgdesc='Simple scanning utility'
 arch=('i686' 'x86_64')
 url='http://launchpad.net/simple-scan'
 license=('GPL3')
-depends=('sane' 'gconf')
+depends=('sane' 'dconf' 'gtk3' 'colord' 'hicolor-icon-theme')
 makedepends=('gnome-doc-utils' 'intltool')
-install="${pkgname}.install"
-source=("http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('8435b0a31aba1255caf685eb57b18e06')
+install=simple-scan.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('175a852f132f85e861ded99d546137fb4299ad9ce2836eaac9d645fbfcbefbac')
 
 build() {
-  cd ${pkgname}-${pkgver}
-
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure \
     --prefix=/usr \
-    --with-gconf-schema-file-dir=/usr/share/gconf/schemas \
-    --disable-schemas-install
-
+    --disable-schemas-compile
   make
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
diff --git a/community/simple-scan/simple-scan.install b/community/simple-scan/simple-scan.install
index 9893818d9..5919c0b22 100644
--- a/community/simple-scan/simple-scan.install
+++ b/community/simple-scan/simple-scan.install
@@ -1,24 +1,18 @@
-pkgname=simple-scan
-
 post_install() {
-  echo -n "Installing GConf schemas..."
-  usr/sbin/gconfpkg --install ${pkgname}
-
-  [ $? -eq 0 ] && echo " Done." || echo " FAILED!"
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 pre_upgrade() {
-  pre_remove $1
+  if (( $(vercmp $2 3.1.3) < 0 )); then
+    usr/sbin/gconfpkg --uninstall simple-scan
+  fi
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
-pre_remove() {
-  echo -n "Removing GConf schemas..."
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-
-  [ $? -eq 0 ] && echo " Done." || echo " FAILED!"
+post_remove() {
+  post_install
 }
-