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

Conflicts:
	community/gtkdatabox/PKGBUILD
	community/ibus-sunpinyin/PKGBUILD
	community/sunpinyin/PKGBUILD
	extra/php-xcache/PKGBUILD
	extra/sdl_mixer/PKGBUILD
	extra/xorg-server/PKGBUILD

1 files changed, 34 insertions, 14 deletions

diff --git a/community/ibus-sunpinyin/PKGBUILD b/community/ibus-sunpinyin/PKGBUILD
index 059a7a78b..d15c4ae9c 100644
--- a/community/ibus-sunpinyin/PKGBUILD
+++ b/community/ibus-sunpinyin/PKGBUILD
@@ -1,32 +1,52 @@
-# $Id: PKGBUILD 79175 2012-10-31 06:11:42Z ebelanger $
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+# $Id: PKGBUILD 79729 2012-11-11 16:11:46Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=ibus-sunpinyin
-pkgver=2.0.3
-pkgrel=3
-pkgdesc='The SunPinYin Engine for IBus Input Framework. SunPinYin is a Statistical Language Model based pinyin IME by Sun.'
+pkgver=2.0.3.20121107
+_commit=cf3fe3d7aa5bb7aa6aa5b870a759af468b6d5b2b
+pkgrel=2
+pkgdesc="IBus Wrapper for sunpinyin."
 arch=('i686' 'x86_64' 'mips64el')
-url='http://sunpinyin.googlecode.com'
+url="http://sunpinyin.googlecode.com"
 license=('LGPL')
-depends=('ibus' 'sunpinyin')
-makedepends=('scons')
-source=("http://sunpinyin.googlecode.com/files/ibus-sunpinyin-${pkgver}.tar.gz")
-md5sums=('e678b2e1ac70c325cfc64c02fef7041f')
+depends=('sunpinyin>2.0.3' 'ibus')
+makedepends=('git' 'scons')
+
+__gitroot=git://github.com/sunpinyin/sunpinyin.git
+__gitname=sunpinyin
 
 build() {
-  cd "${srcdir}/ibus-sunpinyin-${pkgver}"
+  cd "$srcdir"
+  msg "Connecting to GIT server...."
+
+  if [ -d $__gitname ] ; then
+    cd $__gitname && git pull origin
+    msg "The local files are updated."
+  else
+    git clone $__gitroot
+  fi
+
+  msg "GIT checkout done or server timeout"
+  msg "Starting make..."
 
-  sed -i 's/python/&2/' setup/ibus-setup-sunpinyin.in
+  rm -rf "$srcdir/$__gitname-build"
+  git clone "$srcdir/$__gitname" "$srcdir/$__gitname-build"
+  cd "$srcdir/$__gitname-build"
+  git checkout "$_commit"
 
+  cd "$srcdir/$__gitname-build/wrapper/ibus"
+  sed -i -e "s|python|python2|" setup/ibus-setup-sunpinyin.in
+  
   scons \
     --prefix=/usr
 }
 
 package() {
-  cd "${srcdir}/ibus-sunpinyin-${pkgver}"
+  cd "$srcdir/$__gitname-build/wrapper/ibus"
 
   scons \
     --prefix=/usr \
-    --install-sandbox="${pkgdir}" \
+    --install-sandbox="$pkgdir" \
     install
 }