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

Conflicts:
	community/comix/PKGBUILD
	community/geany/PKGBUILD
	community/gnome-do-docklets/PKGBUILD
	community/gnome-do-plugins/PKGBUILD
	community/gnome-system-tools/PKGBUILD
	community/gnustep-make/PKGBUILD
	community/gtweakui/PKGBUILD
	community/hwinfo/PKGBUILD
	community/kungfu/PKGBUILD
	community/liboauth/PKGBUILD
	community/liboobs/PKGBUILD
	community/lua-lzlib/PKGBUILD
	community/mcdp/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-runtime/PKGBUILD
	community/mplayer2/PKGBUILD
	community/pdf2svg/PKGBUILD
	community/perl-data-dumper/PKGBUILD
	community/perl-digest-md5/PKGBUILD
	community/perl-perlio-eol/PKGBUILD
	community/perl-xml-libxslt/PKGBUILD
	community/python-cherrypy/PKGBUILD
	community/python-pexpect/PKGBUILD
	community/python-pyro/PKGBUILD
	community/python2-cherrypy/PKGBUILD
	community/rexima/PKGBUILD
	community/shp2svg/PKGBUILD
	community/system-tools-backends/PKGBUILD
	community/tracker/PKGBUILD
	community/virtualbox/PKGBUILD
	core/bridge-utils/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/beagle/PKGBUILD
	extra/bug-buddy/PKGBUILD
	extra/dssi/PKGBUILD
	extra/evolution-sharp/PKGBUILD
	extra/evolution-webcal/PKGBUILD
	extra/feh/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/gnome-mag/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gok/PKGBUILD
	extra/gpsd/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/hyphen/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/keytouch-editor/PKGBUILD
	extra/keytouch/PKGBUILD
	extra/koffice/PKGBUILD
	extra/krusader/PKGBUILD
	extra/libbeagle/PKGBUILD
	extra/libffi/PKGBUILD
	extra/libgnomeuimm/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/m17n-lib/PKGBUILD
	extra/mtr/PKGBUILD
	extra/openbabel/PKGBUILD
	extra/poppler/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/rox/PKGBUILD
	extra/transmission/PKGBUILD
	extra/xf86-input-synaptics/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xorg-xinit/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	libre/icecat/PKGBUILD
	libre/linux-libre/PKGBUILD
	multilib/lib32-ncurses/PKGBUILD
	multilib/lib32-openssl/PKGBUILD
	multilib/lib32-talloc/PKGBUILD
	multilib/wine/PKGBUILD

1 files changed, 18 insertions, 4 deletions

diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD
index ab0bb8702..585e37179 100644
--- a/community/gambas3/PKGBUILD
+++ b/community/gambas3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 55911 2011-09-24 19:25:08Z lcarlier $
+# $Id: PKGBUILD 56945 2011-10-17 08:20:48Z ibiru $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 
 pkgbase=gambas3
@@ -12,7 +12,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba
          'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit'
          'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal'
          'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') 
-pkgver=2.99.4
+pkgver=2.99.5
 pkgrel=1
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64' 'mips64el')
@@ -27,7 +27,7 @@ makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils
 options=('!emptydirs' '!makeflags')
 source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2"
         'gambas3-script.install' 'gambas3-runtime.install')
-md5sums=('4f918a701a862c7755b35d6eba988dad'
+md5sums=('dfa16f5208463e81ba8ca801948c353a'
          'b284be39d147ec799f1116a6abc068b4'
          'b5cc403990f31b8ea1c5cf37366d3d29')
 
@@ -424,6 +424,8 @@ package_gambas3-gb-form() {
   make XDG_UTILS='' DESTDIR="${pkgdir}" install
   cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
   make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
   ##
 
   cd ${srcdir}/${pkgbase}-${pkgver}/comp
@@ -434,6 +436,8 @@ package_gambas3-gb-form() {
   make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
   cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
   make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
   rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form.*,gb.report}
   rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}}
   rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}}
@@ -449,6 +453,8 @@ package_gambas3-gb-form-dialog() {
   make XDG_UTILS='' DESTDIR="${pkgdir}" install
   cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
   make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
   ##
 
   cd ${srcdir}/${pkgbase}-${pkgver}/comp
@@ -459,6 +465,8 @@ package_gambas3-gb-form-dialog() {
   make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
   cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
   make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
   rm -r ${pkgdir}/usr/share/gambas3/control
   rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,g*,m*,s*}}
   rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,m*,s*}}
@@ -474,6 +482,8 @@ package_gambas3-gb-form-mdi() {
   make XDG_UTILS='' DESTDIR="${pkgdir}" install
   cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
   make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
   ##
 
   cd ${srcdir}/${pkgbase}-${pkgver}/comp
@@ -484,6 +494,8 @@ package_gambas3-gb-form-mdi() {
   make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
   cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
   make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
   rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form,gb.report}
   rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,d*,g*,s*}}
   rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,d*,s*}}
@@ -497,6 +509,8 @@ package_gambas3-gb-form-stock() {
   ## Workaround for splitting
   cd ${srcdir}/${pkgbase}-${pkgver}/main
   make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
   ##
 
   cd ${srcdir}/${pkgbase}-${pkgver}/comp
@@ -505,7 +519,7 @@ package_gambas3-gb-form-stock() {
   ## Workaround for splitting
   cd ${srcdir}/${pkgbase}-${pkgver}/main
   make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
   make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
   rm -r ${pkgdir}/usr/lib/gambas3/gb.{eval*,[m-w]*}
   rm -r ${pkgdir}/usr/share/gambas3/info/gb.{eval*,[m-w]*}