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

Conflicts:
	community/fcitx/PKGBUILD
	extra/graphite/PKGBUILD
	extra/subversion/PKGBUILD

5 files changed, 93 insertions, 13 deletions

diff --git a/community/fcitx-mozc/PKGBUILD b/community/fcitx-mozc/PKGBUILD
index cd1413842..456ff25ea 100644
--- a/community/fcitx-mozc/PKGBUILD
+++ b/community/fcitx-mozc/PKGBUILD
@@ -5,7 +5,7 @@
 ## Mozc compile option
 _bldtype=Release
 
-_zipcoderel=201208
+_zipcoderel=201211
 _protobuf_ver=2.4.1
 
 _pkgbase=mozc
@@ -13,14 +13,14 @@ pkgname=fcitx-mozc
 pkgdesc="Fcitx Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)"
 pkgver=1.6.1187.102
 _patchver=${pkgver}.2
-pkgrel=3
+pkgrel=4
 groups=('mozc-im')
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/mozc/"
 license=('custom')
 depends=('qt' 'fcitx' 'zinnia')
 makedepends=('pkg-config' 'python2' 'gtest' 'qt' 'curl' 'fcitx' 'gtk2')
-replaces=('mozc' 'mozc-server' 'mozc-utils-gui' 'mozc-fcitx')
+replaces=('mozc-fcitx')
 conflicts=('mozc' 'mozc-server' 'mozc-utils-gui' 'mozc-fcitx')
 source=(http://mozc.googlecode.com/files/mozc-${pkgver}.tar.bz2
         http://downloads.sourceforge.net/pnsft-aur/ken_all-${_zipcoderel}.zip
@@ -94,7 +94,7 @@ package() {
 }
 
 md5sums=('e5246d17a81d2e942e9e8de0c3240c95'
-         'd1df91ca1fc0cf2b0ffe4eb4ddcf09ca'
-         '0f7eff544b256eb643ef309678742e09'
+         'e61df4b5754f3869ca504d269dc9641d'
+         '59c5f7e9c734b40197454318f228859f'
          'ed436802019c9e1f40cc750eaf78f318'
          'a70fa7d5cef505c14f61e739b0502444')
diff --git a/community/fcitx-ui-light/PKGBUILD b/community/fcitx-ui-light/PKGBUILD
new file mode 100644
index 000000000..6ffa8a1d5
--- /dev/null
+++ b/community/fcitx-ui-light/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 81498 2012-12-22 12:52:08Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Author: CSSlayer <wengxt@gmail.com>
+# Contributor: Yangtse <yangtsesu@gmail.com> 
+
+pkgname=fcitx-ui-light
+pkgver=0.1.3
+pkgrel=2
+pkgdesc="Light weight xlib and xft based ui for fcitx."
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/fcitx"
+license=('GPL2')
+depends=('fcitx>=4.1.0' 'libxpm')
+makedepends=('cmake' 'intltool')
+source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2")
+
+build(){
+    cd "$srcdir/${pkgname}-${pkgver}"
+
+    rm -rf build
+    mkdir build
+    cd build
+    
+    cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
+    make
+}
+
+package ()
+{
+    cd "$srcdir/${pkgname}-${pkgver}/build"
+    make DESTDIR="${pkgdir}" install
+}
+md5sums=('633e8b018da9c8f09f99567b5479cf18')
diff --git a/community/fcitx/PKGBUILD b/community/fcitx/PKGBUILD
index d1f4460aa..d21a0fe9c 100644
--- a/community/fcitx/PKGBUILD
+++ b/community/fcitx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 80275 2012-11-19 02:35:00Z fyan $
+# $Id: PKGBUILD 81502 2012-12-22 13:42:19Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: csslayer <wengxt AT gmail com>
@@ -6,7 +6,8 @@
 pkgbase=fcitx
 pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt')
 pkgver=4.2.6.1
-pkgrel=3
+pkgrel=4
+groups=('fcitx-im')
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/fcitx/"
 license=('GPL')
@@ -36,11 +37,31 @@ check() {
 }
 
 package_fcitx() {
-  pkgdesc="Free Chinese Input Toy of X - Input Method Server for X window system"
+  pkgdesc="Flexible Context-aware Input Tool with eXtension"
   depends=('pango' 'libxinerama' 'gtk-update-icon-cache' 'shared-mime-info' \
            'hicolor-icon-theme' 'desktop-file-utils' 'libxkbfile' \
            'libxfixes' 'dbus-core' 'icu')
-  optdepends=('enchant: for word predication support')
+  optdepends=('enchant: for word predication support'
+  	      'fcitx-anthy: Hiragana text to Kana Kanji mixed text Japanese input method'
+	      'fcitx-chewing: Intelligent Zhuyin input method library for traditional Chinese'
+	      'fcitx-cloudpinyin: Standalone module for fcitx that uses pinyin API on the internet to provide additional input candidates'
+	      'fcitx-configtool: GTK based config tool for Fcitx'
+	      'fcitx-fbterm: Fbterm support for Fcitx'
+	      'fcitx-googlepinyin: A fork from google pinyin on android for Fcitx'
+	      'fcitx-gtk2: GTK2 IM Module for fcitx'
+	      'fcitx-gtk3: GTK3 IM Module for fcitx'
+	      'fcitx-hangul: Hangul (Korean) support for fcitx'
+	      'fcitx-libpinyin: Fcitx Wrapper for libpinyin, Library to deal with pinyin'
+	      'fcitx-m17n: Multilingual text processing library'
+	      'fcitx-mozc: Fcitx Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)'
+	      'fcitx-qt: QT IM Module for fcitx'
+	      'fcitx-rime: Rime input method engine (Traditional Chinese)'
+  	      'fcitx-sunpinyin: Statistical Language Model based pinyin IME by Sun'
+	      'fcitx-table-extra: Extra tables for Fcitx, including Boshiamy, Zhengma, Cangjie3, Cangjie5'
+	      'fcitx-table-other: Provides some other tables for Fcitx, fork from ibus-table-others, scim-tables'
+	      'fcitx-ui-light: Light weight xlib and xft based ui for fcitx'
+	      'fcitx-unikey: Fcitx Wrapper for unikey'
+	      'kcm-fcitx: KDE Config Module for Fcitx')
   install=fcitx.install
 
   cd "${srcdir}"/build
diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD
index 2c42ff610..01afab866 100644
--- a/community/intellij-idea-libs/PKGBUILD
+++ b/community/intellij-idea-libs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 80913 2012-12-06 17:28:21Z stativ $
+# $Id: PKGBUILD 81483 2012-12-22 10:23:17Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=intellij-idea-libs
-pkgver=12.0
-_pkgver=123.72
+pkgver=12.0.1
+_pkgver=123.94
 pkgrel=1
 pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE"
 arch=('i686' 'x86_64' 'mips64el')
@@ -10,7 +10,7 @@ url="http://www.jetbrains.org/"
 license=('apache')
 depends=('glibc')
 source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz)
-md5sums=('d684a654b38285504fdc8a923d604d89')
+md5sums=('0641de81781cfb2f122df3b327a902fb')
 
 build() {
   cd "$srcdir"
diff --git a/community/libxkbcommon/PKGBUILD b/community/libxkbcommon/PKGBUILD
new file mode 100644
index 000000000..04bacedb1
--- /dev/null
+++ b/community/libxkbcommon/PKGBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Daniel Micay <danielmicay@gmail.com>
+# Contributor: Mladen Pejakovic <pejakm@gmail.com>
+
+pkgname=libxkbcommon
+pkgver=0.2.0
+pkgrel=3
+pkgdesc="Keyboard handling library using XKB data"
+arch=(i686 x86_64)
+url="http://xkbcommon.org/"
+license=('custom')
+depends=(glibc)
+makedepends=(doxygen xorg-util-macros)
+source=("http://xkbcommon.org/download/$pkgname-$pkgver.tar.bz2")
+md5sums=('2be3d4a255d02c7d46fc6a9486f21f6a')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}