Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/comix/PKGBUILD
	community/geany/PKGBUILD
	community/gnome-do-docklets/PKGBUILD
	community/gnome-do-plugins/PKGBUILD
	community/gnome-system-tools/PKGBUILD
	community/gnustep-make/PKGBUILD
	community/gtweakui/PKGBUILD
	community/hwinfo/PKGBUILD
	community/kungfu/PKGBUILD
	community/liboauth/PKGBUILD
	community/liboobs/PKGBUILD
	community/lua-lzlib/PKGBUILD
	community/mcdp/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-runtime/PKGBUILD
	community/mplayer2/PKGBUILD
	community/pdf2svg/PKGBUILD
	community/perl-data-dumper/PKGBUILD
	community/perl-digest-md5/PKGBUILD
	community/perl-perlio-eol/PKGBUILD
	community/perl-xml-libxslt/PKGBUILD
	community/python-cherrypy/PKGBUILD
	community/python-pexpect/PKGBUILD
	community/python-pyro/PKGBUILD
	community/python2-cherrypy/PKGBUILD
	community/rexima/PKGBUILD
	community/shp2svg/PKGBUILD
	community/system-tools-backends/PKGBUILD
	community/tracker/PKGBUILD
	community/virtualbox/PKGBUILD
	core/bridge-utils/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/beagle/PKGBUILD
	extra/bug-buddy/PKGBUILD
	extra/dssi/PKGBUILD
	extra/evolution-sharp/PKGBUILD
	extra/evolution-webcal/PKGBUILD
	extra/feh/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/gnome-mag/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gok/PKGBUILD
	extra/gpsd/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/hyphen/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/keytouch-editor/PKGBUILD
	extra/keytouch/PKGBUILD
	extra/koffice/PKGBUILD
	extra/krusader/PKGBUILD
	extra/libbeagle/PKGBUILD
	extra/libffi/PKGBUILD
	extra/libgnomeuimm/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/m17n-lib/PKGBUILD
	extra/mtr/PKGBUILD
	extra/openbabel/PKGBUILD
	extra/poppler/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/rox/PKGBUILD
	extra/transmission/PKGBUILD
	extra/xf86-input-synaptics/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xorg-xinit/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	libre/icecat/PKGBUILD
	libre/linux-libre/PKGBUILD
	multilib/lib32-ncurses/PKGBUILD
	multilib/lib32-openssl/PKGBUILD
	multilib/lib32-talloc/PKGBUILD
	multilib/wine/PKGBUILD

2 files changed, 8 insertions, 47 deletions

diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD
index 20e557e94..083fc9414 100644
--- a/extra/system-config-printer/PKGBUILD
+++ b/extra/system-config-printer/PKGBUILD
@@ -1,26 +1,23 @@
-# $Id: PKGBUILD 134387 2011-08-03 14:53:04Z andrea $
+# $Id: PKGBUILD 140389 2011-10-12 04:35:30Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=system-config-printer
 pkgname=('system-config-printer-common'
 	'system-config-printer-gnome')
-pkgver=1.3.5
-pkgrel=2
+pkgver=1.3.7
+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')
-makedepends=('intltool' 'python2' 'xmlto' 'docbook-xsl' 'desktop-file-utils' 'libcups' 'libxml2')
-source=("http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz"
-        'no-packagekit.patch')
-md5sums=('9d806643f17dc65a492a1d4e8a60f2ec'
-         'e70a274c3cced39db1668e2a748e068f')
+makedepends=('udev' 'intltool' 'python2' 'xmlto' 'docbook-xsl' 'desktop-file-utils' 'libcups' 'libxml2')
+source=(http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz{,.sig})
+md5sums=('f579ba287403d8ae3028377c6641feed'
+         'a2ce58f4e612130b30e5c029e9afd31f')
 
 build() {
   cd "${srcdir}"/${pkgbase}-${pkgver}
 
-  patch -p1 -i "${srcdir}"/no-packagekit.patch
-  
   sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
     -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
     $(find . -name '*.py')
@@ -36,7 +33,7 @@ build() {
 
 package_system-config-printer-common() {
   pkgdesc='Pygtk CUPS Configuration'
-  depends=('pycups' 'dbus-python' 'pysmbc')
+  depends=('udev' 'pycups' 'dbus-python' 'pysmbc')
   optdepends=('system-config-printer-gnome: for the GTK frontend'
 	'kdeadmin-system-config-printer-kde: for the administration tool in KDE System Settings')
   replaces=('system-config-printer')
diff --git a/extra/system-config-printer/no-packagekit.patch b/extra/system-config-printer/no-packagekit.patch
deleted file mode 100644
index 8482ad823..000000000
--- a/extra/system-config-printer/no-packagekit.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- system-config-printer-1.3.5/cupshelpers/cupshelpers.py	2011-08-01 10:47:11.614519332 +0100
-+++ system-config-printer-1.3.5/cupshelpers/cupshelpers.py	2011-08-02 15:45:33.807623959 +0100
-@@ -21,7 +21,6 @@
- 
- import cups, pprint, os, tempfile, re, string
- import locale
--import packagekit.client, packagekit.enums
- from . import _debugprint
- 
- class Printer:
-@@ -829,24 +828,7 @@
-     missing executables
-     """
-     executables = missingExecutables(ppd)
--    packages = []
--    if executables:
--        unresolved_executables = []
--        client = packagekit.client.PackageKitClient ()
--        for executable in executables:
--            if not executable.startswith ("/"):
--                executable = "/usr/bin/" + executable
--
--            result = client.search_file ([executable],
--                                         packagekit.enums.FILTER_NOT_INSTALLED)
--            if result:
--                packages.extend (set (map (lambda x: x.name, result)))
--            else:
--                unresolved_executables.append (executable)
--
--        executables = unresolved_executables
--        
--    return (packages, executables)
-+    return ([], executables)
- 
- def _main():
-     c = cups.Connection()