Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bitcoin/PKGBUILD
	community/ecryptfs-utils/PKGBUILD
	community/erlang/PKGBUILD
	community/esmtp/PKGBUILD
	community/gmic/PKGBUILD
	community/ibus-sunpinyin/PKGBUILD
	community/libev/PKGBUILD
	community/libmirage/PKGBUILD
	community/libraw/PKGBUILD
	community/lilypond/PKGBUILD
	community/luajit/PKGBUILD
	community/matchbox-window-manager/PKGBUILD
	community/miniupnpc/PKGBUILD
	community/mplayer2/PKGBUILD
	community/mumble/PKGBUILD
	community/oss/PKGBUILD
	community/pidgin-lwqq/PKGBUILD
	community/postgis/PKGBUILD
	community/python2-pytables/PKGBUILD
	community/qmc2/PKGBUILD
	community/qtfm/PKGBUILD
	community/ruby-gtk3/PKGBUILD
	community/tea/PKGBUILD
	community/yacpi/PKGBUILD
	core/bridge-utils/PKGBUILD
	core/gcc/PKGBUILD
	core/libsasl/PKGBUILD
	core/lvm2/PKGBUILD
	core/net-tools/PKGBUILD
	core/ppp/PKGBUILD
	core/pptpclient/PKGBUILD
	core/sdparm/PKGBUILD
	core/systemd/PKGBUILD
	core/sysvinit-tools/PKGBUILD
	extra/aisleriot/PKGBUILD
	extra/arora/PKGBUILD
	extra/bluez-hcidump/PKGBUILD
	extra/bluez/PKGBUILD
	extra/cups/PKGBUILD
	extra/cyrus-sasl/PKGBUILD
	extra/dhcp/PKGBUILD
	extra/gnome-bluetooth/PKGBUILD
	extra/gnome-desktop/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gts/PKGBUILD
	extra/guile/PKGBUILD
	extra/harfbuzz/PKGBUILD
	extra/iptraf-ng/PKGBUILD
	extra/json-c/PKGBUILD
	extra/kdenetwork/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/kdesdk-kate/PKGBUILD
	extra/libatasmart/PKGBUILD
	extra/libbsd/PKGBUILD
	extra/libdmtx/PKGBUILD
	extra/libhangul/PKGBUILD
	extra/libindi/PKGBUILD
	extra/libpeas/PKGBUILD
	extra/libsmbios/PKGBUILD
	extra/libspiro/PKGBUILD
	extra/libsrtp/PKGBUILD
	extra/libxml2/PKGBUILD
	extra/libxrender/PKGBUILD
	extra/libxvmc/PKGBUILD
	extra/llvm/PKGBUILD
	extra/maxima/PKGBUILD
	extra/msmtp/PKGBUILD
	extra/ortp/PKGBUILD
	extra/perl-dbd-sqlite/PKGBUILD
	extra/perl-yaml-syck/PKGBUILD
	extra/php/PKGBUILD
	extra/pm-utils/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/pyqt4/PKGBUILD
	extra/scim-anthy/PKGBUILD
	extra/scim-chewing/PKGBUILD
	extra/scim-m17n/PKGBUILD
	extra/scim/PKGBUILD
	extra/ssmtp/PKGBUILD
	extra/texmacs/PKGBUILD
	extra/v86d/PKGBUILD
	extra/vlc/PKGBUILD
	extra/webkitgtk/PKGBUILD
	extra/webkitgtk2/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/zsh/PKGBUILD
	libre/bogofilter-libre/PKGBUILD
	libre/ecasound-libre/PKGBUILD
	libre/libretools/libretools.install
	libre/mc-libre/PKGBUILD

1 files changed, 7 insertions, 25 deletions

diff --git a/community/sunpinyin/PKGBUILD b/community/sunpinyin/PKGBUILD
index a6adc1a1f..3f20cbf21 100644
--- a/community/sunpinyin/PKGBUILD
+++ b/community/sunpinyin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 81888 2013-01-03 05:18:11Z fyan $
+# $Id: PKGBUILD 92609 2013-06-10 02:29:07Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 
 pkgname=sunpinyin
-pkgver=2.0.3.20130103
-_commit=baf4da89ac04c3eb6ea3b8fb1a10f13bf23f3d87
+pkgver=2.0.3.20130307
+_commit=64e26d9ed1f617e59ff37c2efc0be97727c799a1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="Statistical Language Model based pinyin IME by Sun"
@@ -13,29 +13,11 @@ url="http://sunpinyin.googlecode.com"
 depends=('sqlite' 'make' 'gcc-libs')
 optdepends=('sunpinyin-data: Statistical language model data from open-gram project for sunpinyin')
 makedepends=('git' 'scons' 'intltool')
-
-__gitroot=git://github.com/sunpinyin/sunpinyin.git
-__gitname=$pkgname
+source=("git://github.com/sunpinyin/sunpinyin.git#commit=$_commit")
+md5sums=("SKIP")
 
 build() {
-  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..."
-
-  rm -rf "$srcdir/$__gitname-build"
-  git clone "$srcdir/$__gitname" "$srcdir/$__gitname-build"
-  cd "$srcdir/$__gitname-build"
-  git checkout "$_commit"
-
+  cd "$srcdir/$pkgname"
   sed -i -e "1s|python|python2|" python/*.py python/importer/*.py
 
   scons \
@@ -43,7 +25,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$__gitname-build"
+  cd "$srcdir/$pkgname"
 
   scons \
     --prefix=/usr \