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

Conflicts:
	community/sword/PKGBUILD
	extra/imagemagick/PKGBUILD
	gnome-unstable/empathy/PKGBUILD
	gnome-unstable/gcr/PKGBUILD
	gnome-unstable/gnome-dictionary/PKGBUILD
	gnome-unstable/gnome-keyring/PKGBUILD
	gnome-unstable/gnome-screenshot/PKGBUILD
	gnome-unstable/gnome-terminal/PKGBUILD
	gnome-unstable/gucharmap/PKGBUILD
	gnome-unstable/gucharmap/gucharmap.install
	gnome-unstable/libgnome-keyring/PKGBUILD
	gnome-unstable/librsvg/PKGBUILD
	gnome-unstable/mousetweaks/PKGBUILD
	gnome-unstable/pygobject/PKGBUILD
	gnome-unstable/seahorse/PKGBUILD
	testing/gcc/PKGBUILD

9 files changed, 41 insertions, 43 deletions

diff --git a/extra/garcon/PKGBUILD b/extra/garcon/PKGBUILD
index 98c07df7c..b943786ca 100644
--- a/extra/garcon/PKGBUILD
+++ b/extra/garcon/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 150129 2012-02-13 08:08:25Z foutrelis $
+# $Id: PKGBUILD 154452 2012-03-28 18:46:15Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Xavier Devlamynck <magicrhesus@ouranos.be>
 
 pkgname=garcon
-pkgver=0.1.10
+pkgver=0.1.11
 pkgrel=1
 pkgdesc="Implementation of the freedesktop.org menu specification"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ makedepends=('pkgconfig' 'intltool' 'xfce4-dev-tools')
 replaces=('libxfce4menu')
 options=('!libtool' '!makeflags')
 source=(http://archive.xfce.org/src/xfce/garcon/0.1/garcon-$pkgver.tar.bz2)
-sha256sums=('c2497a2991101fc1e621dc712ef72aba7c238f6e5f5a1733c9572f9b23761316')
+sha256sums=('272c1207a3449ce969a86ebdc61c6afcad05003f0a986e222bb90c01c1692dfc')
 
 build() {
   cd "$srcdir/garcon-$pkgver"
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index aaab9b555..911ba9b54 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 153440 2012-03-14 01:50:29Z eric $
+# $Id: PKGBUILD 154479 2012-03-29 01:47:21Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.7.6.1
+pkgver=6.7.6.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.imagemagick.org/"
@@ -12,7 +12,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
              'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper')
 source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
         perlmagick.rpath.patch)
-sha1sums=('17f38e5c43041991ed1764b2ebeb7b5c4cb0bcb5'
+sha1sums=('5411be21304520ae6a24d3f3e6d5c60eabdd57af'
           '23405f80904b1de94ebd7bd6fe2a332471b8c283')
 
 build() {
diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD
index 497723778..ca4d4f1bb 100644
--- a/extra/mysql/PKGBUILD
+++ b/extra/mysql/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 150723 2012-02-21 07:30:13Z andrea $
+# $Id: PKGBUILD 154444 2012-03-28 18:29:19Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.21
+pkgver=5.5.22
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -15,7 +15,7 @@ options=('!libtool')
 source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz"
         'mysqld'
         'my.cnf')
-md5sums=('86d6bd335054a0aed1756ed60574c16d'
+md5sums=('c5b151a70e9ceed5308f108f1ece7b3b'
          '2234207625baa29b2ff7d7b4f088abce'
          '1c949c0dbea5206af0db14942d9927b6')
 
diff --git a/extra/pycups/PKGBUILD b/extra/pycups/PKGBUILD
index b6113fd99..b822b938a 100644
--- a/extra/pycups/PKGBUILD
+++ b/extra/pycups/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 140387 2011-10-12 02:51:45Z eric $
+# $Id: PKGBUILD 154446 2012-03-28 18:30:40Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: nesl247 <nesl247@gmail.com>
 
 pkgname=pycups
-pkgver=1.9.60
+pkgver=1.9.61
 pkgrel=1
 pkgdesc="Python CUPS Bindings"
 url="http://cyberelk.net/tim/software/pycups/"
@@ -11,8 +11,8 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libcups' 'python2')
 source=(http://cyberelk.net/tim/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.asc})
-md5sums=('083f3dd657df986e712a6fae36427457'
-         'cda91ca46362ba3423df2f08c33de5cb')
+md5sums=('7464093b349b907dcdefb913674e959b'
+         'cb780142a614300792a08d462e198589')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/python-lxml/PKGBUILD b/extra/python-lxml/PKGBUILD
index ec44b2d94..05a86ef31 100644
--- a/extra/python-lxml/PKGBUILD
+++ b/extra/python-lxml/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 153553 2012-03-15 23:11:41Z eric $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 154469 2012-03-28 22:33:23Z eric $
+# Maintainer:
 
 pkgname=('python-lxml' 'python2-lxml')
-pkgver=2.3.3
-pkgrel=2
+pkgver=2.3.4
+pkgrel=1
 pkgdesc="Python binding for the libxml2 and libxslt libraries"
 arch=('i686' 'x86_64' 'mips64el')
 license=('BSD' 'custom')
 url="http://lxml.de/"
 makedepends=('python2' 'python' 'libxslt')
 source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc})
-md5sums=('a7825793c69d004f388ec6600bad7a6f'
-         '5c4b1a05f6e46a4dd7ebed8b5ad9e32e')
+sha1sums=('90a226d8a2ee38de47fc3351445dab6df0e33a20'
+          '7962be7794d7f4c87d2fce0104c27990f48f1ce1')
 
 check() {
   cd "${srcdir}"/lxml-$pkgver
diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD
index cfc17bbf9..0fb108521 100644
--- a/extra/system-config-printer/PKGBUILD
+++ b/extra/system-config-printer/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 151614 2012-02-28 09:40:16Z andrea $
+# $Id: PKGBUILD 154448 2012-03-28 18:31:41Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=system-config-printer
 pkgname=('system-config-printer-common'
          'system-config-printer-gnome')
-pkgver=1.3.8
-pkgrel=3
+pkgver=1.3.9
+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=('udev' 'libcups' 'intltool' 'python2' 'xmlto' 'docbook-xsl' 'desktop-file-utils')
 source=(http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz{,.sig})
-md5sums=('ca04568dd7ff1ef7a381ad637d4e915b'
-         '67c103760f9b4227bc1d99204d8378cd')
+md5sums=('df424f127eede63965608e5ec5e27519'
+         'd105b7f7725c1ec538b6e6adb10667f3')
 
 build() {
   cd "${srcdir}"/${pkgbase}-${pkgver}
diff --git a/extra/thunar-volman/PKGBUILD b/extra/thunar-volman/PKGBUILD
index b1a421925..b6e2b112e 100644
--- a/extra/thunar-volman/PKGBUILD
+++ b/extra/thunar-volman/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 149177 2012-02-06 06:29:06Z foutrelis $
+# $Id: PKGBUILD 154456 2012-03-28 18:51:17Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=thunar-volman
-pkgver=0.6.0
-pkgrel=3
+pkgver=0.6.1
+pkgrel=1
 pkgdesc="Automatic management of removeable devices in Thunar"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://foo-projects.org/~benny/projects/thunar-volman"
@@ -15,12 +15,13 @@ makedepends=('intltool')
 options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/apps/$pkgname/0.6/$pkgname-$pkgver.tar.bz2)
-sha256sums=('b1afd2b3b285cfcf07c11caa3d37fa5ff1fc06f7dc68fcca07f9a0d70daa694f')
+sha256sums=('04918a9ccd576e7b19dae37af50ffe6de6f79ed66bf305c26dfe81c1ff652b27')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --prefix=/usr \
+  ./configure \
+    --prefix=/usr \
     --sysconfdir=/etc \
     --libexecdir=/usr/lib/xfce4 \
     --localstatedir=/var \
diff --git a/extra/tumbler/PKGBUILD b/extra/tumbler/PKGBUILD
index 167d910b3..41a6bd83d 100644
--- a/extra/tumbler/PKGBUILD
+++ b/extra/tumbler/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 148946 2012-02-05 11:57:15Z ibiru $
+# $Id: PKGBUILD 154454 2012-03-28 18:48:51Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Jan Jezek <honzin.jezek@gmail.com>
 
 pkgname=tumbler
-pkgver=0.1.23
-pkgrel=4
+pkgver=0.1.24
+pkgrel=1
 pkgdesc="D-Bus service for applications to request thumbnails"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://git.xfce.org/xfce/tumbler/"
@@ -22,7 +22,7 @@ optdepends=('ffmpegthumbnailer: for video thumbnails'
             'freetype2: for font thumbnails')
 options=('!libtool')
 source=(http://archive.xfce.org/src/apps/$pkgname/0.1/$pkgname-$pkgver.tar.bz2)
-sha256sums=('b3066d17b7e1fee5135eb876a7c2c50a1221bd0d447c3dd7c36efe6d7f3874cb')
+sha256sums=('18fe74900851211cbd10eff4e9e487229284d1701aa60f0c3d35cdd457c72566')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/xfce4-power-manager/PKGBUILD b/extra/xfce4-power-manager/PKGBUILD
index aed132843..401b390bd 100644
--- a/extra/xfce4-power-manager/PKGBUILD
+++ b/extra/xfce4-power-manager/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 149179 2012-02-06 06:31:48Z foutrelis $
+# $Id: PKGBUILD 154458 2012-03-28 18:59:06Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Tobias Kieslich <tobias funnychar archlinux.org>
 
 pkgname=xfce4-power-manager
-pkgver=1.0.10
-pkgrel=3
+pkgver=1.0.11
+pkgrel=1
 pkgdesc="Power manager for Xfce desktop"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xfce-goodies.berlios.de/"
@@ -15,17 +15,14 @@ depends=('xfce4-panel' 'upower' 'udisks' 'libnotify' 'hicolor-icon-theme'
 makedepends=('pkgconfig' 'intltool')
 options=('!libtool')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/apps/$pkgname/1.0/$pkgname-$pkgver.tar.bz2
-        xfce4-power-manager-1.0.10-libnotify-0.7.patch)
-sha256sums=('80e4bb44f81c485ec09654dde432d6e28667d49a787625632a4413aac30422f0'
-            '8bebb7830a4a7d9a49f5f06280aaf7bd703aceaecddcd9e2069e7c2c45dbc013')
+source=(http://archive.xfce.org/src/apps/$pkgname/1.0/$pkgname-$pkgver.tar.bz2)
+sha256sums=('cfa85d839458fa2e9c2ee874d7d64ab00a95d6d51e6acf0ac082ffc700fe4339')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  patch -Np1 -i "$srcdir/xfce4-power-manager-1.0.10-libnotify-0.7.patch"
-
-  ./configure --prefix=/usr \
+  ./configure \
+    --prefix=/usr \
     --sysconfdir=/etc \
     --libexecdir=/usr/lib \
     --localstatedir=/var \