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

Conflicts:
	extra/php-apc/PKGBUILD
	testing/glibmm/PKGBUILD
	testing/gtkmm3/PKGBUILD
	testing/udisks2/PKGBUILD

7 files changed, 63 insertions, 40 deletions

diff --git a/extra/consolekit/PKGBUILD b/extra/consolekit/PKGBUILD
index c1cf54b15..1b09c3d24 100644
--- a/extra/consolekit/PKGBUILD
+++ b/extra/consolekit/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 145880 2012-01-03 17:21:38Z ibiru $
+# $Id: PKGBUILD 156074 2012-04-12 21:13:25Z tomegun $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: onestep_ua <onestep@ukr.net>
 
 pkgname=consolekit
-pkgver=0.4.5
+pkgver=0.4.6
 pkgrel=2
 pkgdesc="A framework for defining and tracking users, login sessions, and seats"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,12 +12,10 @@ license=('GPL')
 depends=('polkit' 'zlib' 'libx11' 'dbus-glib')
 makedepends=('pkgconfig' 'xmlto' 'docbook-xsl')
 options=(!libtool)
-source=(http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-$pkgver.tar.bz2
+#source=(http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-$pkgver.tar.bz2
+# this has not been released yet, so this is a snapshot
+source=(ftp://ftp.archlinux.org/other/${pkgname}/ConsoleKit-${pkgver}.tar.bz2
         pam-foreground-compat.ck consolekit.logrotate consolekit.tmpfiles.conf)
-md5sums=('f2657f93761206922d558471a936fbc3'
-         'a8a4de71d9b0549b8143e5f6c2a36fc7'
-         '6fefa451d9fe2fc6d6269629d3529793'
-         '8c5a8059db515d40fae1379daf084094')
 
 build() {
   cd "$srcdir/ConsoleKit-$pkgver"
@@ -25,9 +23,10 @@ build() {
       --sysconfdir=/etc \
       --localstatedir=/var \
       --libexecdir=/usr/lib/ConsoleKit \
-      --with-systemdsystemunitdir=/lib/systemd/system \
+      --with-systemdsystemunitdir=/usr/lib/systemd/system \
       --enable-pam-module \
-      --enable-docbook-docs
+      --enable-docbook-docs \
+      --enable-udev-acl
   make
 }
 
@@ -43,3 +42,7 @@ package() {
 
   rm -rf "${pkgdir}/var/run"
 }
+md5sums=('810990b607e338f06a6396c92b8a4a06'
+         'a8a4de71d9b0549b8143e5f6c2a36fc7'
+         '6fefa451d9fe2fc6d6269629d3529793'
+         '8c5a8059db515d40fae1379daf084094')
diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD
index 0b844a996..0bc839ac8 100644
--- a/extra/emacs/PKGBUILD
+++ b/extra/emacs/PKGBUILD
@@ -1,24 +1,28 @@
-# $Id: PKGBUILD 148704 2012-02-05 11:47:36Z ibiru $
+# $Id: PKGBUILD 156054 2012-04-12 12:20:45Z juergen $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
 
 pkgname=emacs
 pkgver=23.4
-pkgrel=1
+pkgrel=2
 pkgdesc="The extensible, customizable, self-documenting real-time display editor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/emacs/emacs.html"
 license=('GPL3')
 depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib')
 install=emacs.install
-source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig} emacs-subversion17.patch)
+source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig}
+  emacs-subversion17.patch
+  emacs-23.3-xgselect_init.patch)
 md5sums=('070c68ad8e3c31fb3cb2414feaf5e6f0'
          '55eb16eb48b44987693c0e3ea5ab8075'
-         '12e2e7a66df5cc5ded54e1d30083a1fb')
+         '12e2e7a66df5cc5ded54e1d30083a1fb'
+	 '0d3b3d701ba1295613ace30e8d67ca88')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
   patch -p1 -i ../emacs-subversion17.patch
+  patch -p1 -i ../emacs-23.3-xgselect_init.patch
   ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
     --localstatedir=/var --with-x-toolkit=gtk --with-xft
   make
diff --git a/extra/emacs/emacs-23.3-xgselect_init.patch b/extra/emacs/emacs-23.3-xgselect_init.patch
new file mode 100644
index 000000000..f3168e0e2
--- /dev/null
+++ b/extra/emacs/emacs-23.3-xgselect_init.patch
@@ -0,0 +1,13 @@
+diff -up emacs-23.3/src/xgselect.c.xgselect_init emacs-23.3/src/xgselect.c
+--- emacs-23.3/src/xgselect.c.xgselect_init	2011-01-08 18:45:14.000000000 +0100
++++ emacs-23.3/src/xgselect.c	2011-11-11 13:00:53.211765255 +0100
+@@ -55,6 +55,9 @@ xg_select (max_fds, rfds, wfds, efds, ti
+   do {
+     if (n_gfds > gfds_size) 
+       {
++        if (gfds_size == 0)
++          xgselect_initialize ();
++
+         while (n_gfds > gfds_size) 
+           gfds_size *= 2;
+         xfree (gfds);
diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD
index 6c03e97bc..3c3de23bd 100644
--- a/extra/libtorrent-rasterbar/PKGBUILD
+++ b/extra/libtorrent-rasterbar/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 152216 2012-03-05 08:56:15Z ibiru $
+# $Id: PKGBUILD 156047 2012-04-12 08:06:44Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=libtorrent-rasterbar
-pkgver=0.15.10
+pkgver=0.16.0
 pkgrel=1
 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
 url="http://www.rasterbar.com/products/libtorrent/"
@@ -13,12 +13,10 @@ depends=('boost-libs' 'geoip' 'python2')
 makedepends=('boost')
 options=('!libtool' '!emptydirs')
 source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('3e461d9ede5fab3fb59be6a9f0cbc52121d536c4')
+sha1sums=('212d910f6c06f06ef1b54d7e2dd68de18f6d9c73')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  export CFLAGS+=" -fvisibility=hidden"
-  export CXXFLAGS+=" -fvisibility=hidden"
+  cd "$pkgname-$pkgver"
   ./configure --prefix=/usr \
       --enable-python-binding \
       --with-libgeoip=system
@@ -26,7 +24,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
   install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD
index 309c17dac..49238012b 100644
--- a/extra/llvm/PKGBUILD
+++ b/extra/llvm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 151494 2012-02-26 18:15:27Z foutrelis $
+# $Id: PKGBUILD 156067 2012-04-12 16:34:12Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Sebastian Nowicki <sebnow@gmail.com>
@@ -104,8 +104,11 @@ package_llvm() {
   # We move the clang directory out of the tree so it won't get installed and
   # then we bring it back in for the clang package
   mv tools/clang "$srcdir"
+
   # Copy missing file into the expected location
-  cp bindings/ocaml/llvm/META.llvm bindings/ocaml/llvm/Release/
+  [[ $(check_option strip) == y ]] && _build_type=Release || _build_type=Debug
+  cp bindings/ocaml/llvm/META.llvm bindings/ocaml/llvm/$_build_type/
+
   # -j1 is due to race conditions during the installation of the OCaml bindings
   make -j1 DESTDIR="$pkgdir" install
   mv "$srcdir/clang" tools
diff --git a/extra/php-apc/PKGBUILD b/extra/php-apc/PKGBUILD
index 0d9027829..3e2013369 100644
--- a/extra/php-apc/PKGBUILD
+++ b/extra/php-apc/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 135862 2011-08-19 20:05:54Z pierre $
+# $Id: PKGBUILD 156069 2012-04-12 18:41:47Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=php-apc
-pkgver=3.1.9
-pkgrel=3
+pkgver=3.1.10
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='A free, open, and robust framework for caching and optimizing PHP intermediate code'
 url='http://pecl.php.net/package/APC'
 depends=('php')
-license="PHP"
+license=('PHP')
 source=("http://pecl.php.net/get/APC-${pkgver}.tgz")
 backup=('etc/php/conf.d/apc.ini')
-md5sums=('a2cf7fbf6f3a87f190d897a53260ddaa')
+md5sums=('f4a6b91903d6ba9dce89fc87bb6f26c9')
 
 build() {
 	cd $srcdir/APC-$pkgver
@@ -20,6 +20,11 @@ build() {
 	make
 }
 
+# check() {
+# 	cd $srcdir/APC-$pkgver
+# 	make test
+# }
+
 package() {
 	cd $srcdir/APC-$pkgver
 	make INSTALL_ROOT=$pkgdir install
diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD
index a0e7b5d5a..4c02876de 100644
--- a/extra/transmission/PKGBUILD
+++ b/extra/transmission/PKGBUILD
@@ -1,25 +1,22 @@
-# $Id: PKGBUILD 150701 2012-02-20 20:48:33Z ibiru $
+# $Id: PKGBUILD 156045 2012-04-12 07:21:32Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=transmission
 pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt')
-pkgver=2.50
+pkgver=2.51
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.transmissionbt.com/"
 license=('MIT')
 makedepends=('gtk3' 'intltool' 'curl' 'qt' 'libevent')
 source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz
-        transmissiond transmissiond.conf
-	0001-gtk-conf-set-correct-download-dir-default.patch)
-md5sums=('07606789fab2f9730fa454cfc7a04b2d'
+        transmissiond transmissiond.conf)
+md5sums=('47bfbb133f5f997a48b54f7a350d84ea'
          '08875299e3fbb68fc546c1f350ac1f06'
-         'be39806c35b7544856fa4070b00fc960'
-         'f9fae46f5aa9ed3a22af64091604c6d0')
-build() {
-  cd "$srcdir/$pkgbase-$pkgver"
+         'be39806c35b7544856fa4070b00fc960')
 
-  patch -Np1 -i "$srcdir/0001-gtk-conf-set-correct-download-dir-default.patch"
+build() {
+  cd "$pkgbase-$pkgver"
 
   ./configure --prefix=/usr
   make
@@ -33,7 +30,7 @@ package_transmission-cli() {
   backup=('etc/conf.d/transmissiond')
   install=transmission-cli.install
 
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd "$pkgbase-$pkgver"
 
   for dir in daemon cli web utils
   do
@@ -52,7 +49,7 @@ package_transmission-gtk() {
   	      'transmission-cli: daemon and web support')
   install=transmission-gtk.install
 
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd "$pkgbase-$pkgver"
 
   make -C gtk DESTDIR="$pkgdir" install
   make -C po DESTDIR="$pkgdir" install
@@ -65,7 +62,7 @@ package_transmission-qt() {
   optdepends=('transmission-cli: daemon and web support')
   install=transmission-qt.install
 
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd "$pkgbase-$pkgver"
 
   make -C qt INSTALL_ROOT="$pkgdir"/usr install