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

Conflicts:
	community-testing/openscenegraph/PKGBUILD
	community-testing/speed-dreams/PKGBUILD
	community-testing/speed-dreams/speed-dreams.desktop
	community-testing/xemacs/PKGBUILD
	community/ibus/PKGBUILD
	extra/kdebase-konsole/PKGBUILD
	extra/virtuoso/PKGBUILD
	multilib-testing/lib32-gdk-pixbuf2/PKGBUILD
	multilib-testing/lib32-pango/PKGBUILD
	multilib-testing/wine/PKGBUILD
	multilib/lib32-e2fsprogs/PKGBUILD
	multilib/lib32-gmp/PKGBUILD
	multilib/lib32-libidn/PKGBUILD
	multilib/lib32-pixman/PKGBUILD
	testing/fontforge/PKGBUILD
	testing/java7-openjdk/PKGBUILD
	testing/kdebase-workspace/PKGBUILD
	testing/kdegraphics-okular/PKGBUILD
	testing/kdegraphics-strigi-analyzer/PKGBUILD
	testing/libreoffice/PKGBUILD
	testing/libreoffice/PKGBUILD.next_stable
	testing/opencv/PKGBUILD
	testing/php/PKGBUILD
	testing/php/php-fpm.conf.in.patch
	testing/php/php.ini.patch
	testing/xine-ui/PKGBUILD

2 files changed, 34 insertions, 35 deletions

diff --git a/community/ibus/PKGBUILD b/community/ibus/PKGBUILD
index 30708fafe..290c9b43e 100644
--- a/community/ibus/PKGBUILD
+++ b/community/ibus/PKGBUILD
@@ -1,3 +1,4 @@
+# $Id: PKGBUILD 63348 2012-01-30 21:56:05Z ebelanger $
 # Contributor: Rainy <rainylau(at)gmail(dot)com>
 # Contributor: Lee.MaRS <leemars at gmail dot com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -5,45 +6,43 @@
 
 pkgname=ibus
 pkgver=1.4.0
-pkgrel=1
-pkgdesc='Next Generation Input Bus for Linux.'
+pkgrel=2
+pkgdesc="Next Generation Input Bus for Linux"
 arch=('i686' 'x86_64' 'mips64el')
+url="http://ibus.googlecode.com"
 license=('LGPL')
-url='http://ibus.googlecode.com'
-depends=('dbus-python>=0.84.0' 'gconf' 'dconf' 'python2' 'pygtk' 'pyxdg' 'iso-codes' 'librsvg' 'python-notify' 'hicolor-icon-theme' 'gtk3')
+depends=('dbus-python>=0.84.0' 'gconf' 'dconf' 'pyxdg' \
+         'iso-codes' 'librsvg' 'python-notify' 'hicolor-icon-theme')
+makedepends=('intltool' 'gobject-introspection')
 optdepends=('notification-daemon')
-makedepends=('intltool')
 options=('!libtool')
 install=ibus.install
 source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
 md5sums=('b4f063794e89c71eb1f8cb543210da30')
 
 build() {
-  	cd ${pkgname}-${pkgver}
-
-  	export PYTHON=python2
-
-  	./configure \
-    		--prefix=/usr \
-    		--libexecdir=/usr/lib/ibus \
-    		--sysconfdir=/etc \
-    		--with-gconf-schema-file-dir=/usr/share/gconf/schemas \
-    		--enable-gtk3
-
-  	# python2 fix
-  	for file in setup/ibus-setup.in ui/gtk/ibus-ui-gtk.in; do
-    		sed -i 's_exec python_exec python2_' $file
-  	done
-
-  	make
+  cd ${pkgname}-${pkgver}
+  export PYTHON=python2
+  ./configure \
+    --prefix=/usr \
+    --libexecdir=/usr/lib/ibus \
+    --sysconfdir=/etc \
+    --with-gconf-schema-file-dir=/usr/share/gconf/schemas \
+    --enable-gtk3
+
+# python2 fix
+  for file in setup/ibus-setup.in ui/gtk/ibus-ui-gtk.in; do
+    sed -i 's_exec python_exec python2_' $file
+  done
+
+  make
 }
 
 package() {
-  	cd ${pkgname}-${pkgver}
-
-  	export PYTHON=python2
-
-  	make DESTDIR=${pkgdir} install
-
-  	find ${pkgdir} -type f -exec sed -i 's_exec /usr/bin/python_exec /usr/bin/python2_' {} \;
+  cd ${pkgname}-${pkgver}
+  export PYTHON=python2
+  make DESTDIR="${pkgdir}" install
+  install -d "${pkgdir}/etc/xdg/autostart"
+  ln -s /usr/share/applications/ibus.desktop "${pkgdir}/etc/xdg/autostart/ibus.desktop"
+  find "${pkgdir}" -type f -exec sed -i 's_exec /usr/bin/python_exec /usr/bin/python2_' {} \;
 }
diff --git a/community/ibus/ibus.install b/community/ibus/ibus.install
index 439f00b29..c55665c27 100644
--- a/community/ibus/ibus.install
+++ b/community/ibus/ibus.install
@@ -1,10 +1,10 @@
 post_install() {
     echo "Updating gtk.immodules..."
-    /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+    gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
     echo "Done."
 
-    /usr/sbin/gconfpkg --install ibus
-    gtk-update-icon-cache -fq -t /usr/share/icons/hicolor
+    gconfpkg --install ibus
+    gtk-update-icon-cache -fq -t usr/share/icons/hicolor
 
     # update for gkt3
     gtk-query-immodules-3.0 --update-cache 
@@ -19,12 +19,12 @@ post_upgrade() {
 }
 
 pre_remove() {
-    /usr/sbin/gconfpkg --uninstall ibus
+    gconfpkg --uninstall ibus
 }
 
 post_remove() {
-    /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-    gtk-update-icon-cache -fq -t /usr/share/icons/hicolor
+    gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
+    gtk-update-icon-cache -fq -t usr/share/icons/hicolor
 
     # update for gkt3
     gtk-query-immodules-3.0 --update-cache