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

Conflicts:
	community/luajit/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/xorg-server/PKGBUILD

11 files changed, 54 insertions, 45 deletions

diff --git a/community/calcurse/PKGBUILD b/community/calcurse/PKGBUILD
index efeb56809..be65222f7 100644
--- a/community/calcurse/PKGBUILD
+++ b/community/calcurse/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 80897 2012-12-06 09:26:32Z lfleischer $
+# $Id: PKGBUILD 81291 2012-12-16 10:48:59Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 # Contributor: wain <wain.at.gmx.net>
 
 pkgname=calcurse
-pkgver=3.1.0
+pkgver=3.1.2
 pkgrel=1
 pkgdesc='A text-based personal organizer.'
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ license=('BSD')
 depends=('ncurses')
 install='calcurse.install'
 source=("http://calcurse.org/files/${pkgname}-${pkgver}.tar.gz"{,.asc})
-md5sums=('18184927a50ae288b8cbaca218633c15'
-         '619791500703af333b8eb22d6c60bf1e')
+md5sums=('9ad32bd0efa9c8ed1e1d7df49aef5663'
+         '484c86e82252d39917d00fe4f80d807f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -27,4 +27,3 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
-
diff --git a/community/fillets-ng/PKGBUILD b/community/fillets-ng/PKGBUILD
index b7673f12c..fbf9df50f 100644
--- a/community/fillets-ng/PKGBUILD
+++ b/community/fillets-ng/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 81105 2012-12-12 00:47:31Z eric $
+# $Id: PKGBUILD 81295 2012-12-16 16:14:21Z arodseth $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=fillets-ng
 pkgver=1.0.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Port of the wonderful puzzle game Fish Fillets"
 url="http://fillets.sf.net/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,6 +18,7 @@ source=("http://downloads.sourceforge.net/fillets/$pkgname-$pkgver.tar.gz"
 sha256sums=('329a4d9515d60bebdb657d070824933b993b85864b9d3e302e6361accab992da'
             '338c9e1b8ac4ef5bb167f4a6090c341897bd2c7f8b4e5afc3ac3131a57bb8c88'
             '849fb1410387dc7df0617e12a9472cfbe3b1179600011c0365f9099ff5af6214')
+_exec=('fillets')
 
 build() {
   gendesk
diff --git a/community/haveged/PKGBUILD b/community/haveged/PKGBUILD
index e662e6090..60be1b6d1 100644
--- a/community/haveged/PKGBUILD
+++ b/community/haveged/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 75053 2012-08-13 05:31:00Z bpiotrowski $
+# $Id: PKGBUILD 81287 2012-12-16 08:30:34Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: kfgz <kfgz at interia dot pl>
 # Contributor: pootzko <pootzko at gmail dot com>
 
 pkgname=haveged
-pkgver=1.5
+pkgver=1.6
 pkgrel=1
 pkgdesc='Entropy harvesting daemon using CPU timings'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.issihosts.com/haveged'
 license=('GPL')
 depends=('glibc')
-source=(${url}/${pkgname}-${pkgver}.tar.gz
+source=($url/$pkgname-$pkgver.tar.gz
         rc.d service)
-md5sums=('89ea7d79c76160f13065301d952091d7'
+md5sums=('5a386a530e89bfbc6c8d22717b16e2a8'
          '264b725be5271288b40f363d7cfc6b68'
          'fc62a480f520377364503aca9efff0b0')
 
diff --git a/community/kid3/PKGBUILD b/community/kid3/PKGBUILD
index e9cbc21d4..d61da8a27 100644
--- a/community/kid3/PKGBUILD
+++ b/community/kid3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 78979 2012-10-28 15:58:04Z jlichtblau $
+# $Id: PKGBUILD 81297 2012-12-16 18:48:19Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alois Nespor <alois.nespor@gmail.com>
 
 pkgname=kid3
-pkgver=2.2
+pkgver=2.2.1
 pkgrel=1
 pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor for KDE"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ options=('!makeflags')
 install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('edd665103d10e78542e99eac88f409c2dcfa9d257c0f774f91a006c55db92443')
+sha256sums=('2ac3ab6bbf8d2fdcc070a753ebdce868a5e9a2f0b3daddcc7c5b953ff39781b0')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/community/kid3/kid3.changelog b/community/kid3/kid3.changelog
index 1e516d68b..7d608279b 100644
--- a/community/kid3/kid3.changelog
+++ b/community/kid3/kid3.changelog
@@ -1,3 +1,6 @@
+2012-12-16 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* kid3 2.2.1-1
+
 2012-10-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* kid3 2.2-1
 
diff --git a/community/luajit/PKGBUILD b/community/luajit/PKGBUILD
index f9bae6792..e9a707102 100644
--- a/community/luajit/PKGBUILD
+++ b/community/luajit/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 81136 2012-12-12 00:57:15Z eric $
-# Maintainer:  Chris Brannon <chris@the-brannons.com>
-# Maintainer:  Bartłomiej Piotrowski 
+# $Id: PKGBUILD 81293 2012-12-16 11:27:38Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Contributor: Chris Brannon <chris@the-brannons.com>
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 # Contributor: Anders Bergh <anders1@gmail.com>
 
 pkgname=luajit
 pkgver=2.0.0
-pkgrel=2
-pkgdesc='A Just-In-Time Compiler for Lua'
+pkgrel=3
+pkgdesc='Just-in-time compiler and replacement for Lua 5.1'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://luajit.org/'
 license=('MIT')
@@ -17,7 +17,7 @@ md5sums=('97a2b87cc0490784f54b64cfb3b8f5ad')
 
 build() { 
   cd $srcdir/LuaJIT-$pkgver
-  make PREFIX=/usr
+  make amalg PREFIX=/usr
 }
 
 package() {
diff --git a/community/mariadb/PKGBUILD b/community/mariadb/PKGBUILD
index 91b606f4c..ffc414ab2 100644
--- a/community/mariadb/PKGBUILD
+++ b/community/mariadb/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 80718 2012-11-30 22:24:36Z bpiotrowski $
+# $Id: PKGBUILD 81289 2012-12-16 09:10:36Z bpiotrowski $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 
 pkgbase=mariadb
 pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb')
 pkgver=5.5.28.a
 _pkgver=${pkgver/.a/a}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://mariadb.org/"
diff --git a/community/mariadb/mariadb.install b/community/mariadb/mariadb.install
index 921147428..4ac50ec94 100644
--- a/community/mariadb/mariadb.install
+++ b/community/mariadb/mariadb.install
@@ -1,28 +1,35 @@
 post_install(){
   groupadd -g 89 mysql &>/dev/null
   useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
-  /usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
+  usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
   chown -R mysql:mysql var/lib/mysql &>/dev/null
+
+  if [[ ! -d run/mysqld ]]; then
+    usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/mysql.conf
+  fi
 }
 
 post_upgrade(){
   getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null
   getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
 
-  if [ "$(vercmp $2 5.5)" -lt 0 ]; then
-    echo " >> "
-    echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it."
-    echo " >> "
+  if [[ ! -d run/mysqld ]]; then
+    usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/mysql.conf
+  fi
+
+  if [[ "$(vercmp $2 5.5)" -lt 0 ]]; then
+    echo ">>> Major version update. Consider restart the service, and"
+    echo "    then running mysql_upgrade after it."
   fi
 
-  if [ "$(vercmp $2 5.5.25-4)" -lt 0 ] && [ -d /data ]; then
-    for x in /data/*; do
-      cp -r $x /var/lib/mysql/
+  if [[ "$(vercmp $2 5.5.25-4)" -lt 0 ]] && [[ -d /data ]]; then
+    for x in data/*; do
+      cp -r $x var/lib/mysql/
     done
-    rm -rf /data
+    rm -rf data
   fi
 
-  if [ "$(vercmp $2 5.5.25-5)" -lt 0 ]; then
+  if [[ "$(vercmp $2 5.5.25-5)" -lt 0 ]]; then
     echo ">>> mysql.service has been renamed to mysqld.service to keep"
     echo "    consistency with MySQL package." 
   fi
diff --git a/extra/pixman/PKGBUILD b/extra/pixman/PKGBUILD
index 0d5263c1e..3ff369e9a 100644
--- a/extra/pixman/PKGBUILD
+++ b/extra/pixman/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 170784 2012-11-11 10:23:18Z andyrtr $
+# $Id: PKGBUILD 173251 2012-12-16 17:45:49Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=pixman
-pkgver=0.28.0
+pkgver=0.28.2
 pkgrel=1
 pkgdesc="The pixel-manipulation library for X and cairo"
 arch=(i686 x86_64 'mips64el')
@@ -13,7 +13,7 @@ license=('custom')
 depends=('glibc')
 options=('!libtool')
 source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('cfc7a18a8811bf4ff0890f547c315bda8097f6ad')
+sha1sums=('9e9ede6e13061030f9c827219cb87f47e32ecdb4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD
index 537b4b933..2108aed7c 100644
--- a/extra/sqlite/PKGBUILD
+++ b/extra/sqlite/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 168022 2012-10-05 11:18:25Z andyrtr $
+# $Id: PKGBUILD 173255 2012-12-16 18:09:24Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase="sqlite"
 pkgname=('sqlite' 'sqlite-tcl')
-_amalgamationver=3071401
+_amalgamationver=3071500
 #_docver=${_amalgamationver}
-_docver=3071400
-pkgver=3.7.14.1
+_docver=3071500
+pkgver=3.7.15
 pkgrel=1
 pkgdesc="A C library that implements an SQL database engine"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with
 	http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz
 	license.txt)
 options=('!libtool' '!emptydirs')
-md5sums=('4cf3fd434bbb6e50777019ff3507bfa5'
+md5sums=('0d2a2d27b56ac73d49db76dcb6b4619c'
          'c1cdbc5544034d9012e421e75a5e4890')
 
 build() {
@@ -62,4 +62,3 @@ package_sqlite-tcl() {
   cd ${srcdir}/sqlite-autoconf-$_amalgamationver/tea
   make DESTDIR=${pkgdir} install
 }
-
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index 2ed5021e0..0ecb40fde 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 173032 2012-12-09 08:33:51Z andyrtr $
+# $Id: PKGBUILD 173249 2012-12-16 15:55:18Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.13.0.902
-pkgrel=2
+pkgver=1.13.1
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org"
@@ -23,7 +23,7 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         loongson.patch
         #git-fixes.patch
         use-pixman-glyph-cache.patch)
-sha256sums=('7164157ef3b4ef96499526aa6fea85abf7e1416adc2a4a86614dce09fe36fe8f'
+sha256sums=('c93540e2799df4655c6f1b67dc7d8d6db96df4f08ef1702fffbc5df843a43d00'
             '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
             'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
             'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'