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

Conflicts:
	community/ncdu/PKGBUILD
	extra/gcin/PKGBUILD
	extra/maxima/PKGBUILD
	extra/sbcl/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD

5 files changed, 22 insertions, 31 deletions

diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD
index c1d48b9b3..121bfc29e 100644
--- a/extra/gcin/PKGBUILD
+++ b/extra/gcin/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 140668 2011-10-18 00:42:56Z bisson $
+# $Id: PKGBUILD 143496 2011-11-25 03:20:54Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=gcin
-pkgver=1.7.0
+pkgver=2.1.0
 pkgrel=1
 pkgdesc='Input method server supporting various input methods'
-arch=('i686' 'x86_64' 'mips64el')
-license=('LGPL')
 url='http://hyperrate.com/dir.php?eid=67'
+license=('LGPL')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('gtk2' 'libxtst')
 makedepends=('qt' 'gtk3' 'anthy' 'libchewing')
 optdepends=('qt: support for qt4 input method'
@@ -18,8 +18,8 @@ optdepends=('qt: support for qt4 input method'
             'libchewing: support for chewing input method')
 source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz"
         'qt4-lib64.patch')
-sha1sums=('151d1286dc54d7f7fa230d37e89d3d0fe0845258'
-          '4307b0d7d6dc10f15909c94973c4357caf31de7e')
+sha1sums=('9ab09afece8d94faacdcadb150f87c0337108857'
+          '4b121e9a86a2ca25869c69b7d4d9623a0c8f55fc')
 
 install=install
 
diff --git a/extra/gcin/qt4-lib64.patch b/extra/gcin/qt4-lib64.patch
index 13cb3dc15..abc15950e 100644
--- a/extra/gcin/qt4-lib64.patch
+++ b/extra/gcin/qt4-lib64.patch
@@ -1,15 +1,6 @@
 diff -aur old/configure new/configure
---- old/configure	2011-06-08 16:00:37.000000000 +0200
-+++ new/configure	2011-07-05 08:02:33.223601351 +0200
-@@ -164,7 +164,7 @@
- 
- LIB='lib'
- if [ -d /lib64 ]; then
--LIB='lib64'
-+LIB='lib'
- fi
- 
- QT_IM='N'
+--- old/configure	2011-11-07 06:51:12.000000000 +1100
++++ new/configure	2011-11-25 14:02:10.819256960 +1100
 @@ -188,7 +188,7 @@
  
  
@@ -20,8 +11,8 @@ diff -aur old/configure new/configure
  pkg-config --libs QtCore QtGui > /dev/null 2> /dev/null
  if [ $? = 0 ]; then
 diff -aur old/qt4-im/Makefile new/qt4-im/Makefile
---- old/qt4-im/Makefile	2011-06-08 15:03:50.000000000 +0200
-+++ new/qt4-im/Makefile	2011-07-05 08:04:15.717731695 +0200
+--- old/qt4-im/Makefile	2011-06-08 23:03:50.000000000 +1000
++++ new/qt4-im/Makefile	2011-11-25 14:05:28.844110772 +1100
 @@ -1,5 +1,5 @@
  include ../config.mak
 -QT=qt4
diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD
index c83528dd4..e0ce6b0e1 100644
--- a/extra/maxima/PKGBUILD
+++ b/extra/maxima/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142503 2011-11-10 20:08:23Z ronald $
+# $Id: PKGBUILD 143491 2011-11-24 21:29:37Z juergen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir@archlinux.org>
 
 pkgname=maxima
 pkgver=5.25.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Maxima - a sophisticated computer algebra system"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -12,7 +12,7 @@ url="http://maxima.sourceforge.net"
 if [ "${CARCH}" == "mips64el" ] ; then
     depends=('clisp' 'texinfo' 'sh')
 else
-    depends=('sbcl=1.0.52' 'texinfo' 'sh')
+    depends=('sbcl=1.0.53' 'texinfo' 'sh')
 fi
 makedepends=('python2')
 optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface')
@@ -43,11 +43,11 @@ build() {
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
-  
+
   # install some freedesktop.org compatibility
   install -Dm644 ${srcdir}/${pkgname}.desktop \
   	${pkgdir}/usr/share/applications/${pkgname}.desktop
-  
+
   # make sure, we have a nice icon for the desktop file at the right place ;)
   install -d ${pkgdir}/usr/share/pixmaps/
   ln -s /usr/share/maxima/${pkgver}/xmaxima/maxima-new.png \
diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD
index af721f337..4be16689a 100644
--- a/extra/mysql/PKGBUILD
+++ b/extra/mysql/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 141055 2011-10-22 18:07:50Z andrea $
+# $Id: PKGBUILD 143260 2011-11-24 07:38:10Z 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.17
+pkgver=5.5.18
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-url="http://www.mysql.com/"
+url="https://www.mysql.com/products/community/"
 makedepends=('cmake' 'openssl' 'zlib')
 options=('!libtool')
 source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz"
         'mysqld'
         'my.cnf')
-md5sums=('dcb6a06e68c5e8f30f57b15300730c9c'
+md5sums=('38b65815249f3bcacf3b0ee85171c486'
          '2234207625baa29b2ff7d7b4f088abce'
          '1c949c0dbea5206af0db14942d9927b6')
 
diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD
index 70ea00d74..ef51d1d45 100644
--- a/extra/sbcl/PKGBUILD
+++ b/extra/sbcl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 141251 2011-10-27 12:54:01Z juergen $
+# $Id: PKGBUILD 143489 2011-11-24 20:44:47Z juergen $
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: Daniel White <daniel@whitehouse.id.au>
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Leslie Polzer (skypher)
 
 pkgname=sbcl
-pkgver=1.0.52
+pkgver=1.0.53
 pkgrel=1
 pkgdesc="Steel Bank Common Lisp"
 url="http://www.sbcl.org/"
@@ -20,7 +20,7 @@ install=sbcl.install
 source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2"
         "arch-fixes.lisp"
         "mips-arch.h.diff")
-md5sums=('e9e186637155184ec662b5a37634b457'
+md5sums=('28bdb8d65b240bcc45370f19b781f9b8'
          '7ac0c1936547f4278198b8bf7725204d'
          'a456535d65d6c5b85b1b646f11455fce')