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, 6 insertions, 14 deletions

diff --git a/community/sunpinyin/PKGBUILD b/community/sunpinyin/PKGBUILD
index 02e4e25dc..ca1ba26bc 100644
--- a/community/sunpinyin/PKGBUILD
+++ b/community/sunpinyin/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 79672 2012-11-11 01:07:47Z fyan $
+# $Id: PKGBUILD 79715 2012-11-11 14:12:03Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 
-pkgname=('sunpinyin' 'sunpinyin-data')
-pkgbase=sunpinyin
+pkgname=sunpinyin
 pkgver=2.0.3.20121107
 _commit=cf3fe3d7aa5bb7aa6aa5b870a759af468b6d5b2b
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
-url="http://sunpinyin.googlecode.com"
+pkgdesc="Statistical Language Model based pinyin IME by Sun"
 license=('LGPL' 'APACHE')
+url="http://sunpinyin.googlecode.com"
+depends=('sqlite' 'make' 'gcc-libs')
 makedepends=('git' 'scons' 'intltool')
 source=('http://open-gram.googlecode.com/files/lm_sc.t3g.arpa-20121025.tar.bz2'
         'http://open-gram.googlecode.com/files/dict.utf8-20120830.tar.bz2')
@@ -53,23 +54,14 @@ build() {
   make
 }
 
-package_sunpinyin() {
-  pkgdesc="Statistical Language Model based pinyin IME by Sun"
-  depends=('sqlite' 'make' 'gcc-libs' "sunpinyin-data")
-  arch=('i686' 'x86_64')
+package() {
   cd "$srcdir/$__gitname-build"
 
   scons \
     --prefix=/usr \
     --install-sandbox="$pkgdir" \
     install
-}
 
-package_sunpinyin-data() {
-  pkgver=2.0.3.20121025
-  pkgdesc="Statistical Language Model based pinyin IME by Sun - Data files"
-  depends=("sunpinyin")
-  arch=('any')
   cd "$srcdir/$__gitname-build/raw"
   make DESTDIR="$pkgdir" install
 }