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

Conflicts:
	community/fotoxx/PKGBUILD
	community/gtkdialog/PKGBUILD
	community/hubbub/PKGBUILD
	community/libgdamm/PKGBUILD
	community/libparserutils/PKGBUILD
	community/mingw32-binutils/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-gcc/PKGBUILD
	community/mtpaint/PKGBUILD
	community/netsurf/PKGBUILD
	community/patchage/PKGBUILD
	community/qgo/PKGBUILD
	community/tomoyo-tools/PKGBUILD
	community/tre/PKGBUILD
	community/virtualbox/PKGBUILD
	core/net-tools/PKGBUILD
	core/openldap/PKGBUILD
	extra/epiphany/PKGBUILD
	extra/evince/PKGBUILD
	extra/evolution-data-server/PKGBUILD
	extra/evolution/PKGBUILD
	extra/exiv2/PKGBUILD
	extra/folks/PKGBUILD
	extra/gimp-ufraw/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-power-manager/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnome-python-extras/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/jack/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/koffice/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/mutter/PKGBUILD
	extra/nautilus/PKGBUILD
	extra/openmpi/PKGBUILD
	extra/pavucontrol/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/pygobject2/PKGBUILD
	extra/swt/PKGBUILD
	extra/tomcat/PKGBUILD
	extra/totem/PKGBUILD
	extra/vigra/PKGBUILD
	extra/vte/PKGBUILD
	extra/xulrunner/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	multilib/lib32-atk/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-glew/PKGBUILD
	multilib/lib32-glib2/PKGBUILD
	multilib/lib32-jack/PKGBUILD
	multilib/lib32-libpulse/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	multilib/wine/PKGBUILD
	social/miniupnpc/PKGBUILD
	testing/icedtea-web-java7/PKGBUILD
	testing/sqlite3/PKGBUILD
	~xihh/abiword/PKGBUILD

2 files changed, 13 insertions, 13 deletions

diff --git a/community/ibus-pinyin/PKGBUILD b/community/ibus-pinyin/PKGBUILD
index 6e25c0402..26dc3b31a 100644
--- a/community/ibus-pinyin/PKGBUILD
+++ b/community/ibus-pinyin/PKGBUILD
@@ -1,28 +1,28 @@
-# $Id: PKGBUILD 31706 2010-11-04 13:42:40Z ibiru $
+# $Id: PKGBUILD 56127 2011-10-02 07:12:20Z ebelanger $
 # Contributor: Rainy <rainylau(at)gmail(dot)com>
 # Contributor: Lee.maRS<leemars at gmail.com>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=ibus-pinyin
-pkgver=1.3.11
-pkgrel=2
+pkgver=1.3.99.20110706
+pkgrel=1
 pkgdesc='The PinYin Engine for IBus Input Framework.'
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url='http://ibus.googlecode.com'
-depends=('ibus' 'libsigc++2.0' 'boost-libs')
-makedepends=('intltool' 'boost')
-install="${pkgname}.install"
+depends=('ibus')
+makedepends=('intltool')
+install=ibus-pinyin.install
 source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz"
         "http://ibus.googlecode.com/files/pinyin-database-1.2.99.tar.bz2")
-md5sums=('c49b2ccaae1f4e3c5cfbd25af6bea51a'
+md5sums=('0d9d5d78106c2d36c28a00b74aa9a6c3'
          'd0951b8daa7f56a2cbd3b6b4e42532e0')
 
 build() {
-  ln -sf ${srcdir}/pinyin-database-1.2.99.tar.bz2 \
-    ${srcdir}/${pkgname}-${pkgver}/data/db/open-phrase
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  cd ${pkgname}-${pkgver}
+  ln -sf "${srcdir}/pinyin-database-1.2.99.tar.bz2" \
+    "${srcdir}/${pkgname}-${pkgver}/data/db/open-phrase"
 
   sed -i -e "s|python|python2|" data/db/android/create_db.py \
       setup/ibus-setup-pinyin.in
@@ -36,7 +36,7 @@ build() {
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make NO_INDEX=true DESTDIR=${pkgdir} install
+  make NO_INDEX=true DESTDIR="${pkgdir}" install
 }
diff --git a/community/ibus-pinyin/ibus-pinyin.install b/community/ibus-pinyin/ibus-pinyin.install
index d9ad92426..3771d9bec 100644
--- a/community/ibus-pinyin/ibus-pinyin.install
+++ b/community/ibus-pinyin/ibus-pinyin.install
@@ -1,6 +1,6 @@
 post_install() {
     echo "Creating INDEX. Please wait..."
-    cd /usr/share/ibus-pinyin/db
+    cd usr/share/ibus-pinyin/db
     echo "Creating index for android.db..."
     sqlite3 android.db '.read create_index.sql'
     echo "Creating index for open-phrase.db..."