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

Conflicts:
	core/dbus/PKGBUILD
	extra/opus/PKGBUILD
	extra/ypbind-mt/PKGBUILD

6 files changed, 27 insertions, 50 deletions

diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD
index d67f341e3..f365c0205 100644
--- a/community/converseen/PKGBUILD
+++ b/community/converseen/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 88356 2013-04-16 16:20:52Z giovanni $
+# $Id: PKGBUILD 89888 2013-05-04 21:16:10Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: archtux <antonio.arias99999 at gmail.com>
 
 pkgname=converseen
-pkgver=0.6
+pkgver=0.6.1
 pkgrel=1
 pkgdesc="The batch image converter and resizer"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('imagemagick' 'qt4' 'libwmf' 'openexr')
 makedepends=('cmake')
 install=converseen.install
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('fbb618d313980ed5ad754ba9ca06a05f')
+md5sums=('15bf5783d3df2c0063b5c5b37d5c495c')
 
 build() {
   cd "${srcdir}"
diff --git a/community/fcitx-libpinyin/PKGBUILD b/community/fcitx-libpinyin/PKGBUILD
index 0cb8172f4..61bad23d0 100644
--- a/community/fcitx-libpinyin/PKGBUILD
+++ b/community/fcitx-libpinyin/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 86914 2013-03-24 12:50:46Z fyan $
+# $Id: PKGBUILD 89876 2013-05-04 04:07:04Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: poplarch <poplarch@gmail.com>
 
 pkgname=fcitx-libpinyin
-pkgver=0.2.91
+pkgver=0.2.92
 pkgrel=1
 pkgdesc="Fcitx Wrapper for libpinyin, Library to deal with pinyin"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ url="https://github.com/fcitx/fcitx-libpinyin"
 license=('GPL')
 depends=('fcitx' 'libpinyin')
 makedepends=('cmake' 'intltool' 'wget')
-source=("https://github.com/fcitx/$pkgname/archive/$pkgver.tar.gz")
+source=("https://fcitx.googlecode.com/files/${pkgname}-${pkgver}_dict.tar.xz")
 install=$pkgname.install
 
 build() {
@@ -31,4 +31,4 @@ package() {
   cd "$srcdir/${pkgname}-${pkgver}/build"
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('060707cb5a296b2cc10542a01fe40de9')
+sha512sums=('bea86b1041fa311a9bbcd2a6d74ab36d9659ebb6c92122307d3bd4dc44bcb0567d4aeafe62f3b6fe6a85160b369722f391063b47765dc88ec9a9b569cfca640f')
diff --git a/community/ibus-libpinyin/PKGBUILD b/community/ibus-libpinyin/PKGBUILD
index 2d26691f2..551020f0b 100644
--- a/community/ibus-libpinyin/PKGBUILD
+++ b/community/ibus-libpinyin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 86672 2013-03-21 01:30:22Z fyan $
+# $Id: PKGBUILD 89875 2013-05-04 04:07:03Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor:  Yangtse Su<yangtsesu@gmail.com>
 # Contributor:  Jekyll Wu<adaptee [at] gmail [dot] com>
@@ -7,13 +7,13 @@
 # Contributor: Lee.MaRS<leemars at gmail.com>
 
 pkgname=ibus-libpinyin
-pkgver=1.5.92
+pkgver=1.6.91
 pkgrel=1
 pkgdesc="Intelligent Pinyin engine based on libpinyin for IBus"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
-url="https://github.com/libpinyin"
-depends=('ibus>=1.4' 'libpinyin')
+url="https://github.com/libpinyin/ibus-libpinyin"
+depends=('ibus' 'libpinyin')
 makedepends=('git' 'intltool' 'gnome-common')
 source=(https://github.com/libpinyin/ibus-libpinyin/archive/$pkgver.tar.gz
 	automake-1.13.patch)
@@ -49,5 +49,6 @@ package() {
   cd "$srcdir/$pkgname-build"
   make NO_INDEX=true DESTDIR="$pkgdir" install
 }
-md5sums=('2a355713221df7e47354f81cb14e183f'
-         '2a743114537a03830d5b4cd71226cfd0')
+
+sha512sums=('6e1fb4f1fe3c5c6c37e60c8228b79728c388ffd171b68cea87bc2131e27430cdad6eff174a41111cb0694559f6307be3578ea1c960629bbfc99c41f4dbfc344e'
+            'fbb30cddd1ec140860ce0d5a5a42ad644ae6a1794fb2e805f782fdb43436ad13d2f6f8149b5b68540bbb9beba16dbbdb1d14153cef7fb805de342a8d1bb77965')
diff --git a/community/libpinyin/00fec992f5c760f546a1db933fb08325fc9cccbf.patch b/community/libpinyin/00fec992f5c760f546a1db933fb08325fc9cccbf.patch
deleted file mode 100644
index c895adf4c..000000000
--- a/community/libpinyin/00fec992f5c760f546a1db933fb08325fc9cccbf.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 00fec992f5c760f546a1db933fb08325fc9cccbf Mon Sep 17 00:00:00 2001
-From: Peng Wu <alexepico@gmail.com>
-Date: Sat, 23 Mar 2013 09:52:46 +0800
-Subject: [PATCH] fixes import dict
-
----
- src/storage/phrase_large_table2.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/storage/phrase_large_table2.h b/src/storage/phrase_large_table2.h
-index 368d03d..34bb12d 100644
---- a/src/storage/phrase_large_table2.h
-+++ b/src/storage/phrase_large_table2.h
-@@ -133,7 +133,7 @@ static inline int reduce_tokens(const PhraseTokens tokens,
-     }
- 
-     /* the following line will be removed in future after code are verified. */
--    assert(0 == num || 1 == num);
-+    assert(0 <= num && num <= 3);
- 
-     return num;
- }
--- 
-1.8.1.5
-
diff --git a/community/libpinyin/PKGBUILD b/community/libpinyin/PKGBUILD
index 2243af6c0..7c697afde 100644
--- a/community/libpinyin/PKGBUILD
+++ b/community/libpinyin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 88087 2013-04-11 09:30:02Z fyan $
+# $Id: PKGBUILD 89874 2013-05-04 04:07:02Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Yangtse <yangtsesu@gmail.com> 
 # Contributor: WU Jun <quark at lihdd dot net>
 
 pkgname=libpinyin
-pkgver=0.9.0
+pkgver=0.9.91
 pkgrel=1
 pkgdesc="Library to deal with pinyin"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,14 +13,14 @@ license=('GPL')
 depends=('db' 'glib2')
 options=(!libtool)
 source=("https://github.com/libpinyin/libpinyin/archive/${pkgver}.tar.gz"
-        "http://downloads.sourceforge.net/libpinyin/model5.text.tar.gz")
-noextract=("model5.text.tar.gz")
+        "http://downloads.sourceforge.net/libpinyin/model6.text.tar.gz")
+noextract=("model6.text.tar.gz")
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  cp "${srcdir}/model5.text.tar.gz" "${srcdir}/${pkgname}-${pkgver}/data/"
-  sed -i '/wget.*model5\.text\.tar\.gz/ d' ${srcdir}/${pkgname}-${pkgver}/data/Makefile.am
+  cp "${srcdir}/model6.text.tar.gz" "${srcdir}/${pkgname}-${pkgver}/data/"
+  sed -i '/wget.*model6\.text\.tar\.gz/ d' ${srcdir}/${pkgname}-${pkgver}/data/Makefile.am
 
   aclocal && libtoolize --force && autoheader && automake -a && autoconf
   ./configure --prefix=/usr && make
@@ -30,5 +30,5 @@ package() {
   cd "${srcdir}/libpinyin-$pkgver"
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('e2237be88c6b9f1ed4f7c6e75a1738b4'
-         'a83812e2d3be5695be54f95d9d7a3aa0')
+sha512sums=('40263ff3b0e4ac6f68ed51d90b07c9431beec70d2b93ab3c0fec36a35b662380a022478bf15d81305a5e84c0eb95d662fed70c7213ff5c0d11a964b232bf1be2'
+            '8719d99b2efb22438ec067c046f8d45addb3e0d336e8d6ec4b8ed22370fe81366d19a34934bb059230f86e74c379acb62822ee3458850437880d531de8ff3e0e')
diff --git a/community/perl-xml-libxml/PKGBUILD b/community/perl-xml-libxml/PKGBUILD
index 55cf37bb5..040e569df 100644
--- a/community/perl-xml-libxml/PKGBUILD
+++ b/community/perl-xml-libxml/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 86667 2013-03-21 00:57:39Z eric $
-# Maintainer: Justin "juster" Davis <jrcd83@gmail.com>
+# $Id: PKGBUILD 89886 2013-05-04 19:42:51Z jsteel $
+# Maintainer: Jonathan Steel <jsteel@aur.archlinux.org>
+# Contributor: Justin "juster" Davis <jrcd83@gmail.com>
 # Contributor: François Charette <francois.archlinux.org>
 
 pkgname=perl-xml-libxml
-pkgver=2.0014
+pkgver=2.0016
 pkgrel=1
 pkgdesc="Interface to the libxml library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +17,7 @@ conflicts=('perl-libxml' 'perl-xml-libxml-common')
 options=('!emptydirs')
 install=perl-xml-libxml.install
 source=(http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXML-$pkgver.tar.gz)
-md5sums=('a146e20c122b074dbb0d953fb8f65ca0')
+md5sums=('d3bbc3437f6b39eca5825e9d0b0c187a')
 
 build() {
   cd XML-LibXML-$pkgver