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

Conflicts:
	community/notmuch/PKGBUILD
	extra/calligra/PKGBUILD
	libre/texlive-bin-libre/PKGBUILD

11 files changed, 38 insertions, 88 deletions

diff --git a/community/csfml/PKGBUILD b/community/csfml/PKGBUILD
index b6fe646a4..498410736 100644
--- a/community/csfml/PKGBUILD
+++ b/community/csfml/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 88191 2013-04-13 15:25:43Z svenstaro $
+# $Id: PKGBUILD 95028 2013-08-03 22:28:51Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 
 pkgname=csfml
-pkgver=2.0
+pkgver=2.1
 pkgrel=1
 pkgdesc='C bindings for sfml'
 arch=('i686' 'x86_64' 'mips64el')
@@ -10,8 +10,8 @@ url='http://www.sfml-dev.org/'
 license=('zlib')
 depends=("sfml=${pkgver}")
 makedepends=('cmake' 'doxygen')
-source=("csfml-${pkgver}::https://github.com/LaurentGomila/CSFML/archive/2.0.tar.gz")
-md5sums=('d609c9e3b115d480d8c61911d774472c')
+source=("${pkgname}-${pkgver}::https://github.com/LaurentGomila/CSFML/archive/${pkgver}.tar.gz")
+md5sums=('960085220e6978c720a62b02cc4a2ec4')
 
 build() {
   cd "$srcdir"/CSFML-${pkgver}
diff --git a/community/freeorion/PKGBUILD b/community/freeorion/PKGBUILD
index ae98e2068..64f5ab5b8 100644
--- a/community/freeorion/PKGBUILD
+++ b/community/freeorion/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94805 2013-07-30 20:37:58Z arodseth $
+# $Id: PKGBUILD 95055 2013-08-04 21:38:58Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Elmo Todurov <todurov@gmail.com>
 # Contributor: guini <sidtrun@googlemail.com>
@@ -7,8 +7,8 @@
 # Contributor: fana-m <geminin@gmx.net>
 
 pkgname=freeorion
-pkgver=0.4.2
-pkgrel=5
+pkgver=0.4.3
+pkgrel=1
 pkgdesc='Turn-based galactic conquest game inspired by Master of Orion'
 arch=('x86_64' 'i686')
 url='http://www.freeorion.org/'
@@ -27,7 +27,7 @@ install=$pkgname.install
 source=("$pkgname.sh"
         "$pkgname.png::https://a.fsdn.com/con/icons/fr/freeorion@sf.net/FO_Icon_256x256.png"
         "cmake_python.patch"
-        "$pkgname::svn+https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/#revision=6142")
+        "$pkgname::svn+https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/#revision=6281")
 sha256sums=('25b574af5397226373e24510ce59de94c5df5b31d94562fc0de387fd70731707'
             'a6a253eed31b77b00bf4f721f4b1c6bbd95505b9e4b38b736101e551dd12ff5f'
             '3dbe8df9c3a4a0d6451f42727ebf9bcb21fed41a08d1181d1cf77ef4ab5ee81a'
@@ -35,9 +35,6 @@ sha256sums=('25b574af5397226373e24510ce59de94c5df5b31d94562fc0de387fd70731707'
 _pyversion=2.7
 
 pkgver() {
-  #cd "$pkgname"
-
-  #svnversion | tr -d [A-z]
   echo "$pkgver"
 }
 
diff --git a/community/notmuch/PKGBUILD b/community/notmuch/PKGBUILD
index b41bcf521..4ca5f46c1 100644
--- a/community/notmuch/PKGBUILD
+++ b/community/notmuch/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92216 2013-06-02 21:17:12Z dwallace $
+# $Id: PKGBUILD 95030 2013-08-03 23:12:06Z dwallace $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: fauno <fauno at kiwwwi.com.ar>
 # Contributor: Olivier Ramonat <olivier at ramonat dot fr>
@@ -6,15 +6,15 @@
 
 pkgbase=notmuch
 pkgname=('notmuch' 'notmuch-vim' 'notmuch-mutt' 'notmuch-runtime')
-pkgver=0.15.2
-pkgrel=4
+pkgver=0.16
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://notmuchmail.org/"
 license=('GPL3')
 makedepends=('python2' 'python' 'emacs' 'gnupg' 'ruby' 'pkgconfig' 'xapian-core' 'gmime' 'talloc')
 options=(!distcc !makeflags)
 source=("http://notmuchmail.org/releases/${pkgname}-${pkgver}.tar.gz")
-md5sums=('e86968dfcd7ffaf162b7b87de56b7f18')
+md5sums=('9de9f8a91eb2323d8503872a059c7f11')
 
 prepare(){
     #cp -dpr --no-preserve=ownership "$srcdir/$pkgname-$pkgver" "$srcdir/$pkgname-runtime-$pkgver"
@@ -42,7 +42,7 @@ build() {
     make -C "contrib/${pkgbase}-mutt" "${pkgname}-mutt.1"
 
     cd bindings/ruby
-    ruby extconf.rb
+    ruby extconf.rb --vendor
 
 	cd "$srcdir/${pkgname}-${pkgver}/bindings/python"
 	python setup.py build
diff --git a/community/nss-pam-ldapd/PKGBUILD b/community/nss-pam-ldapd/PKGBUILD
index f4cec348c..57786e88f 100644
--- a/community/nss-pam-ldapd/PKGBUILD
+++ b/community/nss-pam-ldapd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id
+# $Id$
 # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org>
 
 pkgname=nss-pam-ldapd
 pkgver=0.8.13
-pkgrel=2
+pkgrel=4
 pkgdesc='LDAP module for NSS and PAM'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://arthurdejong.org/$pkgname/"
@@ -15,9 +15,11 @@ provides=('nss-pam-ldapd')
 install=nss-pam-ldapd.install
 backup=('etc/nslcd.conf')
 source=("http://arthurdejong.org/$pkgname/$pkgname-$pkgver.tar.gz"
-        "nslcd.service")
+        "nslcd.service"
+        "nslcd.tmpfiles")
 sha1sums=('0567cfea104defabeacd88a3a3200b311b8071ec'
-          'b564fa5738963a67a9240bf4ce63b2fa494cafb7')
+          'b564fa5738963a67a9240bf4ce63b2fa494cafb7'
+          '6e225e0d849a48e01b58adad493f017a34bdf70c')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -34,6 +36,7 @@ build() {
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  install -Dm644 "$srcdir/nslcd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/nslcd.conf"
   install -Dm644 "$srcdir/nslcd.service" "$pkgdir/usr/lib/systemd/system/nslcd.service"
   install -Dm644 "$srcdir/$pkgname-$pkgver/nslcd.conf" "$pkgdir/etc/nslcd.conf"
 
diff --git a/community/nss-pam-ldapd/nslcd.tmpfiles b/community/nss-pam-ldapd/nslcd.tmpfiles
new file mode 100644
index 000000000..ac4ee0ad8
--- /dev/null
+++ b/community/nss-pam-ldapd/nslcd.tmpfiles
@@ -0,0 +1 @@
+d /run/nslcd 0755 nslcd nslcd -
diff --git a/community/pidgin-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD
index 768c58981..9658f785b 100644
--- a/community/pidgin-lwqq/PKGBUILD
+++ b/community/pidgin-lwqq/PKGBUILD
@@ -1,10 +1,9 @@
-# $Id: PKGBUILD 94960 2013-08-01 15:24:00Z fyan $
+# $Id: PKGBUILD 95053 2013-08-04 16:26:37Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
 pkgname=pidgin-lwqq
-pkgver=0.2a.20130801
-_branch=dev
-_commit=3f1b9ecb6f38b8c8a58f2bea33684f40526b7e66
+pkgver=0.2a.20130802
+_commit=bccb4d20b65e504f6ae575f7cc55babb9c66ff8d
 pkgrel=1
 pkgdesc="A pidgin plugin based on lwqq, a excellent safe useful library for webqq protocol"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,13 +14,12 @@ optdepends=('pidgin: Multi-protocol instant messaging client'
 	    'telepathy-haze: Empathy plugin support')
 makedepends=('git' 'cmake')
 install=$pkgname.install
-source=("git://github.com/xiehuc/pidgin-lwqq.git#branch=$_branch"
+source=("git://github.com/xiehuc/pidgin-lwqq.git#commit=$_commit"
 #source=("git://github.com/xiehuc/pidgin-lwqq.git#tag=$pkgver"
         "git://github.com/xiehuc/lwqq.git")
 
 prepare() {
   cd "$srcdir/$pkgname"
-  git checkout $_commit
   git submodule init
   git config submodule."liblwqq".url "$srcdir/lwqq"
   git submodule update
diff --git a/community/powertop/PKGBUILD b/community/powertop/PKGBUILD
index 5600762f0..19afd3fe9 100644
--- a/community/powertop/PKGBUILD
+++ b/community/powertop/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 91995 2013-05-30 21:12:52Z lcarlier $
+# $Id: PKGBUILD 95046 2013-08-04 10:58:38Z lcarlier $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Xilon <xilonmu@gmail.com>
 
 pkgname=powertop
-pkgver=2.3
-pkgrel=2
+pkgver=2.4
+pkgrel=1
 pkgdesc='A tool to diagnose issues with power consumption and power management'
 arch=('i686' 'x86_64' 'mips64el')
 url='https://01.org/powertop/'
@@ -13,7 +13,7 @@ license=('GPL2')
 depends=('gcc-libs' 'libnl' 'ncurses' 'pciutils')
 changelog=$pkgname.changelog
 source=(https://01.org/powertop/sites/default/files/downloads/$pkgname-$pkgver.tar.gz)
-sha256sums=('b8c1add69afee28c77dca56fdcedb4a46820f3a71c86aae7891b0c5c595cd744')
+sha256sums=('42796c94546ae7f3d232e41b7fa09b2532396ca389908ff528870311db6327b7')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/python-sfml/PKGBUILD b/community/python-sfml/PKGBUILD
index 67bb13015..8f99b14db 100644
--- a/community/python-sfml/PKGBUILD
+++ b/community/python-sfml/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 pkgname=python-sfml
 pkgver=1.3
-pkgrel=1
+pkgrel=2
 pkgdesc="The unofficial Python binding for SFML"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://python-sfml.org"
diff --git a/community/supertux/PKGBUILD b/community/supertux/PKGBUILD
index ee913c57e..01e7e94be 100644
--- a/community/supertux/PKGBUILD
+++ b/community/supertux/PKGBUILD
@@ -1,33 +1,20 @@
-# $Id: PKGBUILD 94908 2013-08-01 06:55:39Z bpiotrowski $
+# $Id: PKGBUILD 95026 2013-08-03 22:26:22Z svenstaro $
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 # Contributor: Eric Bélanger <eric@archlinux.org>
 # Contributor: vande198
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=supertux
-pkgver=0.3.3
-pkgrel=9
+pkgver=0.3.4
+pkgrel=1
 pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://super-tux.sourceforge.net/"
 license=('GPL')
 depends=('sdl_image' 'curl' 'physfs' 'openal' 'libvorbis' 'glew')
 makedepends=('cmake' 'boost' 'mesa' 'optipng')
-source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2
-        supertux2-0.3.3-squirrel-gcc47.patch)
-md5sums=('f3f803e629ee51a9de0b366a036e393d'
-         'eb06315514be4f200428f14b927beb66')
-
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -p1 -i "${srcdir}/supertux2-0.3.3-squirrel-gcc47.patch"
-  sed -i '1i#include <cstddef>' src/supertux/screen_manager.hpp
-  sed -i '/types\.h/d' src/addon/addon_manager.cpp
-
-  # Fix invalid PNG image to work with libpng 1.6
-  optipng -quiet -force -fix data/images/creatures/flame_fish/left-0.png
-}
+source=(https://supertux.googlecode.com/files/supertux-${pkgver}.tar.bz2)
+md5sums=('108af4c1fd985e8842a15cd819b9b157')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/supertux/supertux2-0.3.3-squirrel-gcc47.patch b/community/supertux/supertux2-0.3.3-squirrel-gcc47.patch
deleted file mode 100644
index 16781b610..000000000
--- a/community/supertux/supertux2-0.3.3-squirrel-gcc47.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/sqmem.h supertux2-0.3.3/external/squirrel/squirrel/sqmem.h
---- supertux2-0.3.3.orig/external/squirrel/squirrel/sqmem.h	1970-01-01 01:00:00.000000000 +0100
-+++ supertux2-0.3.3/external/squirrel/squirrel/sqmem.h	2012-05-01 11:59:37.000000000 +0200
-@@ -0,0 +1,8 @@
-+/*	see copyright notice in squirrel.h */
-+#ifndef _SQMEM_H_
-+#define _SQMEM_H_
-+
-+void *sq_vm_malloc(SQUnsignedInteger size);
-+void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
-+void sq_vm_free(void *p,SQUnsignedInteger size);
-+#endif //_SQMEM_H_
-diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/sqstate.h supertux2-0.3.3/external/squirrel/squirrel/sqstate.h
---- supertux2-0.3.3.orig/external/squirrel/squirrel/sqstate.h	2010-03-01 13:40:58.000000000 +0100
-+++ supertux2-0.3.3/external/squirrel/squirrel/sqstate.h	2012-05-01 11:59:37.000000000 +0200
-@@ -136,8 +136,4 @@
- extern SQObjectPtr _minusone_;
- 
- bool CompileTypemask(SQIntVec &res,const SQChar *typemask);
--
--void *sq_vm_malloc(SQUnsignedInteger size);
--void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
--void sq_vm_free(void *p,SQUnsignedInteger size);
- #endif //_SQSTATE_H_
-diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/squtils.h supertux2-0.3.3/external/squirrel/squirrel/squtils.h
---- supertux2-0.3.3.orig/external/squirrel/squirrel/squtils.h	2010-03-01 13:40:58.000000000 +0100
-+++ supertux2-0.3.3/external/squirrel/squirrel/squtils.h	2012-05-01 11:59:37.000000000 +0200
-@@ -2,6 +2,8 @@
- #ifndef _SQUTILS_H_
- #define _SQUTILS_H_
- 
-+#include "sqmem.h"
-+
- #define sq_new(__ptr,__type) {__ptr=(__type *)sq_vm_malloc(sizeof(__type));new (__ptr) __type;}
- #define sq_delete(__ptr,__type) {__ptr->~__type();sq_vm_free(__ptr,sizeof(__type));}
- #define SQ_MALLOC(__size) sq_vm_malloc((__size));
diff --git a/community/tiled-qt/PKGBUILD b/community/tiled-qt/PKGBUILD
index c26c18726..22e3fc498 100644
--- a/community/tiled-qt/PKGBUILD
+++ b/community/tiled-qt/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase>
 # Collaborator: Jonathan Fine (were.Vire AT gmail DOT com)
 pkgname=tiled-qt
-pkgver=0.9.0
-pkgrel=6
+pkgver=0.9.1
+pkgrel=1
 pkgdesc='A general purpose tile map editor, built to be flexible and easy to use'
 arch=('i686' 'x86_64')
 url='http://mapeditor.org'
@@ -11,7 +11,7 @@ depends=('qt5-base' 'libgl' 'gtk-update-icon-cache')
 makedepends=('mesa' 'qt5-tools')
 install=${pkgname}.install
 source=(http://sourceforge.net/projects/tiled/files/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('e2e21a54ff17e34b49b8a330cc8b657e')
+md5sums=('d032b18e0ff7d5a4a843a1ac93a9f638')
 
 build() {
   cd $srcdir/$pkgname-$pkgver