Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bwbar/PKGBUILD
	community/dosbox/PKGBUILD
	community/extremetuxracer/PKGBUILD
	community/fbgrab/PKGBUILD
	community/fbv/PKGBUILD
	community/flam3/PKGBUILD
	community/freedroidrpg/PKGBUILD
	community/gdk-pixbuf/PKGBUILD
	community/ghemical/PKGBUILD
	community/gmic/PKGBUILD
	community/gnash/PKGBUILD
	community/gnustep-base/PKGBUILD
	community/guvcview/PKGBUILD
	community/keepassx/PKGBUILD
	community/kvpnc/PKGBUILD
	community/libghemical/PKGBUILD
	community/liboglappth/PKGBUILD
	community/png2ico/PKGBUILD
	community/shapelib/PKGBUILD
	community/sloccount/PKGBUILD
	community/tmw/PKGBUILD
	community/xmoto/PKGBUILD
	core/links/PKGBUILD
	extra/amule/PKGBUILD
	extra/cairomm/PKGBUILD
	extra/calligra/PKGBUILD
	extra/evas/PKGBUILD
	extra/fltk/PKGBUILD
	extra/gd/PKGBUILD
	extra/gif2png/PKGBUILD
	extra/glhack/PKGBUILD
	extra/graphviz/PKGBUILD
	extra/gstreamer0.10-good/PKGBUILD
	extra/imlib/PKGBUILD
	extra/imlib2/PKGBUILD
	extra/lbreakout2/PKGBUILD
	extra/libgdiplus/PKGBUILD
	extra/libkate/PKGBUILD
	extra/libpano13/PKGBUILD
	extra/libwebp/PKGBUILD
	extra/libwmf/PKGBUILD
	extra/libxslt/PKGBUILD
	extra/mjpegtools/PKGBUILD
	extra/ntp/PKGBUILD
	extra/nx/PKGBUILD
	extra/openjpeg/PKGBUILD
	extra/php/PKGBUILD
	extra/plotutils/PKGBUILD
	extra/poppler/PKGBUILD
	extra/qrencode/PKGBUILD
	extra/qt4/PKGBUILD
	extra/qt5/PKGBUILD
	extra/qtiplot/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/samba/PKGBUILD
	extra/sdl_image/PKGBUILD
	extra/vice/PKGBUILD
	extra/vigra/PKGBUILD
	extra/vlc/PKGBUILD
	extra/webkitgtk/PKGBUILD
	extra/webkitgtk2/PKGBUILD
	extra/wv/PKGBUILD
	extra/wxgtk/PKGBUILD
	extra/xaos/PKGBUILD
	extra/xsane/PKGBUILD
	extra/zvbi/PKGBUILD

2 files changed, 12 insertions, 33 deletions

diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD
index 47da491d8..262f68908 100644
--- a/extra/system-config-printer/PKGBUILD
+++ b/extra/system-config-printer/PKGBUILD
@@ -1,37 +1,34 @@
-# $Id: PKGBUILD 178008 2013-02-13 13:30:36Z andrea $
+# $Id: PKGBUILD 184759 2013-05-07 22:59:56Z eric $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=system-config-printer
-pkgver=1.3.12
-pkgrel=2
+pkgver=1.4.0
+pkgrel=1
 pkgdesc="A CUPS printer configuration tool and status applet"
 url="http://cyberelk.net/tim/software/system-config-printer/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-depends=('udev' 'pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'libusb-compat'
-         'gnome-icon-theme' 'python2-notify')
+depends=('systemd' 'pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'libusb-compat'
+         'gnome-icon-theme' 'python2-notify' 'python2-gobject' 'dbus-glib' 'gtk3')
 makedepends=('intltool' 'xmlto' 'docbook-xsl' 'desktop-file-utils')
 optdepends=('gnome-keyring: password management')
 replaces=('system-config-printer-common' 'system-config-printer-gnome')
 conflicts=('system-config-printer-common' 'system-config-printer-gnome')
-source=(http://cyberelk.net/tim/data/${pkgname}/1.3/${pkgname}-${pkgver}.tar.xz{,.sig}
-        'fix-typo-in-service.patch')
-md5sums=('0775647e1c34ef25364de3c178a4ed36'
-         '1aa2246047b424e2d23473749368b8c6'
-         'd30d14aeb6d2bfeac0679d28704473ec')
+source=(http://cyberelk.net/tim/data/${pkgname}/${pkgver%*.*}/${pkgname}-${pkgver}.tar.xz{,.sig})
+md5sums=('3267c2eac454f470c0659034196d2668'
+         'SKIP')
 
-build() {
+prepare() {
   cd ${pkgname}-${pkgver}
-
-  # Fixed upstream
-  patch -p1 -i "${srcdir}"/fix-typo-in-service.patch
-
   sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
     -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
     $(find . -name '*.py')
   sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" udev/udev-add-printer
+}
 
+build() {
+  cd ${pkgname}-${pkgver}
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
     --sbindir=/usr/bin \
     --sysconfdir=/etc \
diff --git a/extra/system-config-printer/fix-typo-in-service.patch b/extra/system-config-printer/fix-typo-in-service.patch
deleted file mode 100644
index 56f17dcec..000000000
--- a/extra/system-config-printer/fix-typo-in-service.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From 1e48d0a6404c6660bbf3f456e5ec48bed8fe7b80 Mon Sep 17 00:00:00 2001
-From: Tim Waugh <twaugh@redhat.com>
-Date: Tue, 23 Oct 2012 13:55:12 +0000
-Subject: Fixed typo in systemd config file.
-
----
-diff --git a/udev/configure-printer@.service.in b/udev/configure-printer@.service.in
-index 8a20967..5898c79 100644
---- a/udev/configure-printer@.service.in
-+++ b/udev/configure-printer@.service.in
-@@ -4,4 +4,4 @@ Requires=cups.socket
- After=cups.socket
- 
- [Service]
--ExecStart=@udevhelperdir@/configure-printer add "%i"
-+ExecStart=@udevhelperdir@/udev-configure-printer add "%i"
---
-cgit v0.9.1