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

Conflicts:
	core/sed/PKGBUILD
	extra/tcl/PKGBUILD
	extra/transmission/PKGBUILD

10 files changed, 35 insertions, 41 deletions

diff --git a/community/geany-plugins/PKGBUILD b/community/geany-plugins/PKGBUILD
index 1c6f29bdb..35c7e297d 100644
--- a/community/geany-plugins/PKGBUILD
+++ b/community/geany-plugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 81106 2012-12-12 00:47:32Z eric $
+# $Id: PKGBUILD 81735 2012-12-27 22:27:45Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>  
 # Contributor: djgera
@@ -6,12 +6,12 @@
 
 pkgname=geany-plugins
 pkgver=1.22
-pkgrel=4
+pkgrel=5
 pkgdesc='Combined plugins release for Geany'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://plugins.geany.org/'
 license=('GPL')
-depends=('geany=1.22' 'lua' 'gtkspell' 'libwebkit' 'ctpl' 'gpgme' 'vte' 'desktop-file-utils' 'gtk-update-icon-cache')
+depends=('geany=1.22' 'lua51' 'gtkspell' 'libwebkit' 'ctpl' 'gpgme' 'vte' 'desktop-file-utils' 'gtk-update-icon-cache')
 makedepends=('intltool' 'vala' 'gdb' 'cppcheck')
 optdepends=('hspell: hebrew spell checker')
 options=('!libtool')
@@ -22,7 +22,8 @@ sha256sums=('a0dcf0cb00ac260670ef8fae682aade60c7c3075c88121fd21f3aecdff84e1ce')
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --prefix=/usr --libexecdir=/usr/lib --disable-geanylua
+  # the geanylua plugin currently doesn't work with lua 5.2, only 5.1
+  ./configure --prefix=/usr --libexecdir=/usr/lib # --disable-geanylua
   make 
 }
 
diff --git a/community/geany-plugins/geany-plugins.install b/community/geany-plugins/geany-plugins.install
index bce670aff..c7a5da359 100644
--- a/community/geany-plugins/geany-plugins.install
+++ b/community/geany-plugins/geany-plugins.install
@@ -10,3 +10,5 @@ post_upgrade() {
 post_remove() {
   post_install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/highlight/PKGBUILD b/community/highlight/PKGBUILD
index 497291cc2..77b142f7a 100644
--- a/community/highlight/PKGBUILD
+++ b/community/highlight/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 81109 2012-12-12 00:47:35Z eric $
+# $Id: PKGBUILD 81704 2012-12-27 07:55:09Z bluewind $
 # Maintainer: Florian Pritz <flo@xinu.at>
 # Contributor: Jan Fader <jan.fader@web.de>
 pkgbase=highlight
 pkgname=(highlight highlight-gui)
 pkgver=3.12
-pkgrel=2
+pkgrel=3
 url="http://www.andre-simon.de/doku/highlight/highlight.html"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
@@ -26,7 +26,7 @@ build() {
 
 package_highlight() {
   pkgdesc="Fast and flexible source code highlighter (CLI version)"
-  depends=('lua')
+  depends=('lua51')
   cd "$srcdir/$pkgbase-$pkgver"
 
   make DESTDIR="$pkgdir" install
diff --git a/community/libaccounts-glib/PKGBUILD b/community/libaccounts-glib/PKGBUILD
index 5ff11d482..23340fed6 100644
--- a/community/libaccounts-glib/PKGBUILD
+++ b/community/libaccounts-glib/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 79487 2012-11-06 04:11:07Z bgyorgy $
+# $Id: PKGBUILD 81730 2012-12-27 21:37:34Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=libaccounts-glib
-pkgver=1.3
+pkgver=1.4
 pkgrel=1
 pkgdesc="Glib-based client library for accessing the online accounts database"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,22 +14,13 @@ options=('!libtool')
 source=(http://accounts-sso.googlecode.com/files/$pkgname-$pkgver.tar.gz
         fix-docdir.patch
         make-tests-optional.patch)
-sha1sums=('a2bd07082e9e9235103051f6574b154182745aee'
+sha1sums=('d5c9683a6d48b977fc85523575f00b9e9cd3daa0'
           '94291a58dbbd36f524538adbf6d0c5a55024a34c'
           '35732dc134c32af6ad1684d6388bad8ffe3f4dcc')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # Use the standard docdir location
-  # http://code.google.com/p/accounts-sso/issues/detail?id=123
-  patch -Np1 -i "$srcdir/fix-docdir.patch"
-
-  # Build tests optionally
-  # http://code.google.com/p/accounts-sso/issues/detail?id=124
-  patch -Np1 -i "$srcdir/make-tests-optional.patch"
-
-  autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
               --disable-static \
               PYTHON=python2
diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD
index 9dc92493a..c7cce110c 100644
--- a/community/libmicrohttpd/PKGBUILD
+++ b/community/libmicrohttpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 80762 2012-12-03 10:11:15Z spupykin $
+# $Id: PKGBUILD 81709 2012-12-27 13:15:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Norberto Lopes <shelika@mail.telepac.pt>
 # Contributor: Kao Dome <kaodome@gmail.com>
@@ -6,8 +6,8 @@
 # Contributor: Mathias Rohnstock <linksoft@gmx.de>
 
 pkgname=libmicrohttpd
-pkgver=0.9.23
-pkgrel=2
+pkgver=0.9.24
+pkgrel=1
 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/libmicrohttpd/"
@@ -16,7 +16,7 @@ options=('!libtool')
 depends=('gnutls' 'libgcrypt')
 install=libmicrohttpd.install
 source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz)
-md5sums=('efd038d93836adc0149beaa1c2927f61')
+md5sums=('2891c82cc85a92e6944cacf9ae413f7c')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/community/rxvt-unicode/PKGBUILD b/community/rxvt-unicode/PKGBUILD
index f9f20d47d..cdcd4c69c 100644
--- a/community/rxvt-unicode/PKGBUILD
+++ b/community/rxvt-unicode/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 71847 2012-06-02 10:32:52Z bluewind $
+# $Id: PKGBUILD 81737 2012-12-28 00:16:43Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: tobias <tobias@archlinux.org>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 
 pkgname=rxvt-unicode
-pkgver=9.15
-pkgrel=3
+pkgver=9.16
+pkgrel=1
 pkgdesc='An unicode enabled rxvt-clone terminal emulator (urxvt)'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://software.schmorp.de/pkg/rxvt-unicode.html'
@@ -19,7 +19,7 @@ source=(
   'urxvtc.desktop'
   'urxvt-tabbed.desktop'
 )
-md5sums=('15595aa326167ac5eb68c28d95432faf'
+md5sums=('2e2942e8367624affebc0568e3671b66'
          '88d8786d74b819450adf722180db09fd'
          'bebf5b6b399b74b557fcedbdb47cc387'
          '2604896bb107fbb5511bfd6f46d65894')
diff --git a/community/rygel/PKGBUILD b/community/rygel/PKGBUILD
index 681e3500a..40be1228e 100644
--- a/community/rygel/PKGBUILD
+++ b/community/rygel/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 80273 2012-11-18 23:53:28Z bgyorgy $
+# $Id: PKGBUILD 81715 2012-12-27 20:10:52Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=rygel
-pkgver=0.16.3
+pkgver=0.16.4
 pkgrel=1
 pkgdesc="UPnP AV MediaServer and MediaRenderer that allows you to easily share audio, video and pictures, and control of media player on your home network"
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,7 +19,7 @@ backup=('etc/rygel.conf')
 options=('!libtool')
 install=$pkgname.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a0325afabb6a91cbe958864183adce80ad88bcaa0fc8f8ed3f434ee0d09935bf')
+sha256sums=('3cf338c120751ea068c90f65bfb2a63c436cdf59b02ce159b6376a349717ed7a')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/signon-plugin-oauth2/PKGBUILD b/community/signon-plugin-oauth2/PKGBUILD
index a1d895fc1..4e95f1cb2 100644
--- a/community/signon-plugin-oauth2/PKGBUILD
+++ b/community/signon-plugin-oauth2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 80671 2012-11-29 00:06:53Z bgyorgy $
+# $Id: PKGBUILD 81732 2012-12-27 21:40:51Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=signon-plugin-oauth2
 _pkgname=signon-oauth2
-pkgver=0.13
+pkgver=0.14
 pkgrel=1
 pkgdesc="OAuth 2 plugin for signon"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('LGPL')
 depends=('signon-ui' 'qjson')
 makedepends=('signon')
 source=(http://accounts-sso.googlecode.com/files/$_pkgname-$pkgver.tar.bz2)
-sha1sums=('74b4c31fcadf35b19c058c85b2e8f5566fcb281d')
+sha1sums=('348c59af181c28ab3ac7b5fc76cd6758fc6b63e6')
 
 build() {
   cd "$srcdir/$_pkgname-$pkgver"
diff --git a/community/virtkey/PKGBUILD b/community/virtkey/PKGBUILD
index 4db74b450..a29c75190 100644
--- a/community/virtkey/PKGBUILD
+++ b/community/virtkey/PKGBUILD
@@ -4,14 +4,14 @@
 
 pkgbase=virtkey
 pkgname=('python2-virtkey' 'python-virtkey')
-pkgver=0.62.0
+pkgver=0.63.0
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/virtkey"
 license=('LGPL')
-makedepends=('python2' 'python' 'libxtst' 'gtk2')
+makedepends=('python2' 'python' 'libxtst' 'libxkbfile' 'gtk2')
 source=(http://launchpad.net/$pkgbase/${pkgver%.*}/$pkgver/+download/$pkgbase-$pkgver.tar.gz)
-md5sums=('2c6f2e5941501f74d754554c545a2186')
+md5sums=('c1569fbb143692aafba00758041fad98')
 
 build() {
   cd "$srcdir"
@@ -29,7 +29,7 @@ build() {
 
 package_python2-virtkey() {
   pkgdesc="Python 2 extension for emulating keypresses and getting layout information from the X server"
-  depends=('python2' 'libxtst' 'gtk2')
+  depends=('python2' 'libxtst' 'libxkbfile' 'gtk2')
 
   cd "$srcdir/python2-$pkgbase-$pkgver"
 
@@ -38,7 +38,7 @@ package_python2-virtkey() {
 
 package_python-virtkey() {
   pkgdesc="Python extension for emulating keypresses and getting layout information from the X server"
-  depends=('python' 'libxtst' 'gtk2')
+  depends=('python' 'libxtst' 'libxkbfile' 'gtk2')
 
   cd "$srcdir/$pkgbase-$pkgver"
 
diff --git a/community/xmlstarlet/PKGBUILD b/community/xmlstarlet/PKGBUILD
index f10c67071..7b95c0191 100644
--- a/community/xmlstarlet/PKGBUILD
+++ b/community/xmlstarlet/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 79551 2012-11-07 10:18:04Z spupykin $
+# $Id: PKGBUILD 81711 2012-12-27 13:15:34Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: PyroPeter <abi1789@googlemail.com>
 # Contributor: BlackEagle <ike.devolder@scarlet.be>
 # Contributor: chochem <chochem@gmail.com>
 
 pkgname=xmlstarlet
-pkgver=1.4.0
+pkgver=1.4.1
 pkgrel=1
 pkgdesc="A set of tools to transform, query, validate, and edit XML documents"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ url="http://xmlstar.sourceforge.net/"
 license=('MIT')
 depends=('libxslt>=1.1.9')
 source=("xmlstarlet-$pkgver.tar.gz::http://sourceforge.net/projects/xmlstar/files/xmlstarlet/$pkgver/xmlstarlet-$pkgver.tar.gz/download")
-md5sums=('9f1d8e23f6f3d4a688fe0c05610caff4')
+md5sums=('fd78564417634583692b04193bc0bbc6')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"