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

Conflicts:
	community/calf/PKGBUILD
	community/geany-plugins/PKGBUILD
	community/noip/PKGBUILD
	core/procps-ng/PKGBUILD

7 files changed, 49 insertions, 33 deletions

diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD
index 3c39c107e..74dce4dd6 100644
--- a/extra/cmake/PKGBUILD
+++ b/extra/cmake/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 165140 2012-08-11 16:15:35Z andrea $
+# $Id: PKGBUILD 170091 2012-11-01 08:20:49Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=cmake
-pkgver=2.8.9
+pkgver=2.8.10
 pkgrel=1
 pkgdesc="A cross-platform open-source make system"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,10 +14,10 @@ makedepends=('qt')
 optdepends=('qt: cmake-gui')
 install="${pkgname}.install"
 source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz")
-md5sums=('801f4c87f8b604f727df5bf1f05a59e7')
+md5sums=('d4aef1eab859df61d2664721a72732c0')
 
 build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
 
   ./bootstrap --prefix=/usr \
     --mandir=/share/man \
@@ -29,13 +29,15 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
-  vimpath="$pkgdir/usr/share/vim/vimfiles"
-  install -Dm644 Docs/cmake-indent.vim ${vimpath}/indent/cmake-indent.vim
-  install -Dm644 Docs/cmake-syntax.vim ${vimpath}/syntax/cmake-syntax.vim
-  install -Dm644 Docs/cmake-mode.el ${pkgdir}/usr/share/emacs/site-lisp/cmake-mode.el
+  vimpath="${pkgdir}/usr/share/vim/vimfiles"
+  install -Dm644 Docs/cmake-indent.vim "${vimpath}"/indent/cmake-indent.vim
+  install -Dm644 Docs/cmake-syntax.vim "${vimpath}"/syntax/cmake-syntax.vim
+  install -Dm644 Docs/cmake-mode.el \
+    "${pkgdir}"/usr/share/emacs/site-lisp/cmake-mode.el
 
-  install -Dm644 Copyright.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm644 Copyright.txt \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/extra/dconf/PKGBUILD b/extra/dconf/PKGBUILD
index 3d762b76f..576dc22b9 100644
--- a/extra/dconf/PKGBUILD
+++ b/extra/dconf/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 169859 2012-10-30 22:24:44Z heftig $
+# $Id: PKGBUILD 170097 2012-11-01 16:50:36Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=dconf
-pkgver=0.14.0
+pkgver=0.14.1
 pkgrel=1
 pkgdesc="A low-level configuration system."
 arch=(i686 x86_64 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('vala' 'gtk3' 'intltool' 'docbook-xsl')
 optdepends=('gtk3: for dconf-editor')
 install=dconf.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('9ae848bf25c3de0fb8c0157679630ddf39be1c10ed2f3beb2b8f0165d768da33')
+sha256sums=('59c58c5eafa0ebd616287d078f4441d5342870a44634445d324e88fc0287f0b8')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/fprintd/PKGBUILD b/extra/fprintd/PKGBUILD
index 292af2d28..ebb8ee844 100644
--- a/extra/fprintd/PKGBUILD
+++ b/extra/fprintd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 158562 2012-05-04 23:57:03Z allan $
+# $Id: PKGBUILD 170104 2012-11-01 20:54:41Z heftig $
 # Maintainer:
 # Contributor: Nikolay Rysev <mad.f3ka@gmail.com>
 
 pkgname=fprintd
 pkgver=0.4.1
-pkgrel=4
+pkgrel=5
 pkgdesc="D-Bus service to access fingerprint readers"
 arch=(i686 x86_64)
 url="http://www.freedesktop.org/wiki/Software/fprint/fprintd"
@@ -13,18 +13,22 @@ depends=(libfprint dbus-glib polkit)
 makedepends=(intltool gtk-doc)
 groups=(fprint)
 options=(!libtool)
+backup=(etc/pam.d/fingerprint-auth)
 _snap=V_${pkgver//./_}
-source=(http://cgit.freedesktop.org/libfprint/$pkgname/snapshot/$_snap.tar.bz2)
-md5sums=('58fcac035c181dce8f49c374181aa2ae')
+source=(http://cgit.freedesktop.org/libfprint/$pkgname/snapshot/$_snap.tar.bz2
+        fingerprint-auth)
+md5sums=('58fcac035c181dce8f49c374181aa2ae'
+         '8c7da9ccd28ec87dd2572ddfb85d563e')
 
 build() {
-  cd "$srcdir/$_snap"
+  cd $_snap
   ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
     --disable-static
   make
 }
 
 package() {
-  cd "$srcdir/$_snap"
+  cd $_snap
   make DESTDIR="$pkgdir" pammoddir="/usr/lib/security" install
+  install -Dm644 ../fingerprint-auth "$pkgdir/etc/pam.d/fingerprint-auth"
 }
diff --git a/extra/fprintd/fingerprint-auth b/extra/fprintd/fingerprint-auth
new file mode 100644
index 000000000..b0652c1ec
--- /dev/null
+++ b/extra/fprintd/fingerprint-auth
@@ -0,0 +1,6 @@
+auth  required    pam_tally.so    onerr=succeed file=/var/log/faillog
+auth  required    pam_shells.so
+auth  requisite   pam_nologin.so
+auth  required    pam_env.so
+auth  required    pam_fprintd.so
+auth  optional    pam_permit.so
diff --git a/extra/konversation/PKGBUILD b/extra/konversation/PKGBUILD
index 4ccc6a798..c69944aff 100644
--- a/extra/konversation/PKGBUILD
+++ b/extra/konversation/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 168997 2012-10-17 10:19:30Z allan $
+# $Id: PKGBUILD 170102 2012-11-01 18:41:11Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: James Rayner <iphitus@gmail.com>
@@ -6,13 +6,14 @@
 
 pkgname=konversation
 pkgver=1.4
-pkgrel=3
+pkgrel=4
 pkgdesc="A user friendly IRC client for KDE"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://konversation.kde.org"
 depends=('kdebase-runtime' 'kdepimlibs')
 makedepends=('automoc4' 'cmake' 'pkgconfig' 'docbook-xml')
-optdepends=('python: python scripting support')
+optdepends=('python: python scripting support'
+            'kdebase-konsole: open a terminal in konversation')
 license=('GPL2' 'FDL')
 install=${pkgname}.install
 options=('!makeflags')
diff --git a/extra/obexd/PKGBUILD b/extra/obexd/PKGBUILD
index d5d87e527..2f851ddfb 100644
--- a/extra/obexd/PKGBUILD
+++ b/extra/obexd/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 164647 2012-08-01 18:37:45Z andrea $
+# $Id: PKGBUILD 170095 2012-11-01 11:22:52Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 
 pkgbase=obexd
 pkgname=('obexd-client' 'obexd-server')
-pkgver=0.47
+epoch=1
+pkgver=0.46
 pkgrel=1
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 makedepends=('bluez' 'libical')
 source=("http://www.kernel.org/pub/linux/bluetooth/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('af721152055c40a226e374c2dd989901')
+md5sums=('625f0417d119437429c9cce29479cfa4')
 
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd ${pkgbase}-${pkgver}
   ./configure --prefix=/usr \
     --libexecdir=/usr/lib/obexd
   make
@@ -27,7 +28,7 @@ package_obexd-client() {
   replaces=('obexd')
   conflicts=('obexd')
 
-  cd "${srcdir}/${pkgbase}-${pkgver}/client"
+  cd ${pkgbase}-${pkgver}/client
   install -m755 -d "${pkgdir}/usr/lib/obexd"
   install -m755 -d "${pkgdir}/usr/share/dbus-1/services"
   install -m755 obex-client "${pkgdir}/usr/lib/obexd/"
@@ -39,7 +40,7 @@ package_obexd-server() {
   depends=('bluez' 'libical')
   conflicts=('obex-data-server')
 
-  cd "${srcdir}/${pkgbase}-${pkgver}/src"
+  cd ${pkgbase}-${pkgver}/src
   install -m755 -d "${pkgdir}/usr/lib/obexd"
   install -m755 -d "${pkgdir}/usr/share/dbus-1/services"
   install -m755 obexd "${pkgdir}/usr/lib/obexd/"
diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD
index 5593c9bad..015548280 100644
--- a/extra/tracker/PKGBUILD
+++ b/extra/tracker/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 169959 2012-10-30 22:47:11Z heftig $
+# $Id: PKGBUILD 170100 2012-11-01 18:21:54Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
 pkgbase=tracker
 pkgname=(tracker libtracker-sparql)
-pkgver=0.14.3
+pkgver=0.14.4
 _tver=${pkgver%.*}
 pkgrel=1
 pkgdesc="All-in-one indexer, search tool and metadata database"
@@ -15,11 +15,12 @@ makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi'
              'poppler-glib' 'libgsf' 'icu' 'enca' 'networkmanager' 'gtk3'
              'desktop-file-utils' 'hicolor-icon-theme' 'gobject-introspection'
              'intltool' 'giflib' 'gstreamer0.10-base' 'totem-plparser'
-             'taglib' 'nautilus' 'gnome-panel' 'libvorbis' 'flac' 'vala')
+             'taglib' 'nautilus' 'gnome-panel' 'libvorbis' 'flac' 'vala'
+             'libgxps')
 url="http://www.gnome.org"
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz)
-sha256sums=('7c1ecf3705ecbd2a0278d04277cd1bd8c89d5838913de922fef32321ce67abe4')
+sha256sums=('b818ee42b9007a94b2f8046edc4706bb2036187d5fd304e7ae23e5d2fcf85918')
 
 build() {
   cd $pkgbase-$pkgver
@@ -49,7 +50,8 @@ package_tracker() {
               'libvorbis: Vorbis metadata extractor'
               'flac: FLAC metadata extractor'
               'taglib: writeback for audio files'
-              'gnome-panel: tracker-search-bar')
+              'gnome-panel: tracker-search-bar'
+              'libgxps: XPS extractor')
   groups=('gnome-extra')
   install=tracker.install