Tue Jul 31 00:02:29 UTC 2012

1 files changed, 19 insertions, 50 deletions

diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD
index ebe2a2b12..081942518 100644
--- a/community/gambas2/PKGBUILD
+++ b/community/gambas2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 72971 2012-06-25 18:51:13Z foutrelis $
+# $Id: PKGBUILD 74496 2012-07-29 17:53:21Z lcarlier $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Biru Ionut <ionut@archlinux.ro>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -12,7 +12,7 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2
          'gambas2-gb-db' 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql'
          'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' 
          'gambas2-gb-desktop' 'gambas2-gb-form' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi'
-         'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui'
+         'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg'
          'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl'
          'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre'
          'gambas2-gb-pdf' 'gambas2-gb-qt' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl'
@@ -20,7 +20,7 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2
          'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb'
          'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt')
 pkgver=2.24.0
-pkgrel=2
+pkgrel=4
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64')
 url="http://gambas.sourceforge.net"
@@ -40,7 +40,8 @@ source=(http://downloads.sourceforge.net/gambas/$pkgbase-$pkgver.tar.bz2
 md5sums=('b59072b6f57b681d586cc84c02333690'
          '9dda03a1bbfb7e7ba8b6a4ae91b6752b'
          '870ff5b4b33cd75aa9c290539e6fdd5d'
-         'ab5667175c4945282d2f40a35d0e9e5b')
+         'ab5667175c4945282d2f40a35d0e9e5b'
+         '5eb70afe712c0f8667a700df4d9a6735')
 _gbfiles="${srcdir}/$pkgbase-$pkgver/main/gbc"
 
 _buildgbcomp() {
@@ -88,7 +89,7 @@ package_gambas2-meta() {
            'gambas2-gb-db' 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql'
            'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' 
            'gambas2-gb-desktop' 'gambas2-gb-form' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi'
-           'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui'
+           'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg'
            'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl'
            'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre'
            'gambas2-gb-pdf' 'gambas2-gb-qt' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl'
@@ -101,6 +102,8 @@ package_gambas2-meta() {
 package_gambas2-runtime() {
   depends=('libffi' 'xdg-utils')
   pkgdesc="Gambas2 runtime environment"
+  provides=('gambas2-gb-gui')
+  conflicts=('gambas2-gb-gui')
   install=gambas2-runtime.install
 
   cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
@@ -116,8 +119,16 @@ package_gambas2-runtime() {
     ${pkgdir}/usr/lib/gambas2
   ln -s gbx2 ${pkgdir}/usr/bin/gbr2
   ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  rm -f ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
 
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
+  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
+
+  rm ${pkgdir}/usr/lib/gambas2/gb.{qt.*,so*,la}
+  rm ${pkgdir}/usr/share/gambas2/info/gb.qt*
+  
   ## needed for postinst with xdg-utils
   install -d -m755 ${pkgdir}/usr/share/gambas2/mime
   install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/mime/* \
@@ -192,7 +203,7 @@ package_gambas2-examples() {
            'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql'
            'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' 
            'gambas2-gb-desktop' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi'
-           'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui'
+           'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg'
            'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl'
            'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre'
            'gambas2-gb-pdf' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl'
@@ -200,7 +211,6 @@ package_gambas2-examples() {
            'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb'
            'gambas2-gb-web' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt')
   pkgdesc="Gambas2 examples"
-#  arch=('any')
 
   cd ${srcdir}/${pkgbase}-${pkgver}
   make XDG_UTILS='' DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
@@ -212,7 +222,6 @@ package_gambas2-examples() {
 package_gambas2-help() {
   depends=()
   pkgdesc="Gambas2 help files"
-#  arch=('any')
 
   cd ${srcdir}/${pkgbase}-${pkgver}/help
   make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
@@ -225,7 +234,6 @@ package_gambas2-script() {
   depends=('gambas2-devel')
   pkgdesc="Gambas2 scripter and server programs support"
   install=gambas2-script.install
-#  arch=('any')
 
   ## workaround for splitting
   cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
@@ -259,7 +267,6 @@ package_gambas2-script() {
 package_gambas2-gb-chart() {
   depends=('gambas2-gb-form')
   pkgdesc="Gambas2 chart component"
-#  arch=('any')
 
   ## workaround for splitting
   cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
@@ -332,7 +339,6 @@ package_gambas2-gb-db-firebird() {
 package_gambas2-gb-db-form() {
   depends=('gambas2-gb-db' 'gambas2-gb-form')
   pkgdesc="Gambas2 database form component"
-#  arch=('any')
 
   ## workaround for splitting
   cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
@@ -426,9 +432,8 @@ package_gambas2-gb-desktop() {
 }
 
 package_gambas2-gb-form() {
-  depends=('gambas2-gb-gui')
+  depends=('gambas2-gb-runtime')
   pkgdesc="Gambas2 form component"
-#  arch=('any')
 
   ## workaround for splitting
   cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
@@ -456,7 +461,6 @@ package_gambas2-gb-form() {
 package_gambas2-gb-form-dialog() {
   depends=('gambas2-gb-form')
   pkgdesc="Gambas2 form dialog component"
-#  arch=('any')
 
   ## workaround for splitting
   cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
@@ -485,7 +489,6 @@ package_gambas2-gb-form-dialog() {
 package_gambas2-gb-form-mdi() {
   depends=('gambas2-gb-form')
   pkgdesc="Gambas2 form MDI component"
-#  arch=('any')
 
   ## workaround for splitting
   cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
@@ -576,31 +579,6 @@ package_gambas2-gb-gtk-svg() {
   ##
 }
 
-package_gambas2-gb-gui() {
-  depends=('gambas2-gb-qt' 'gambas2-gb-gtk')
-  pkgdesc="Gambas2 automatic gui toolkit chooser"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la}}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
 package_gambas2-gb-image() {
   depends=('gambas2-runtime')
   pkgdesc="Gambas2 image processing component"
@@ -612,7 +590,6 @@ package_gambas2-gb-image() {
 package_gambas2-gb-info() {
   depends=('gambas2-runtime')
   pkgdesc="Gambas2 info component"
-#  arch=('any')
 
   ## workaround for splitting
   cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
@@ -773,7 +750,6 @@ package_gambas2-gb-qt-kde-html() {
 package_gambas2-gb-report() {
   depends=('gambas2-runtime' 'gambas2-gb-form')
   pkgdesc="Gambas2 report component"
-#  arch=('any')
 
   ## workaround for splitting
   cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
@@ -820,7 +796,6 @@ package_gambas2-gb-sdl-sound() {
 package_gambas2-gb-settings() {
   depends=('gambas2-runtime')
   pkgdesc="Gambas2 settings management component"
-#  arch=('any')
 
   ## workaround for splitting
   cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
@@ -857,7 +832,6 @@ package_gambas2-gb-vb() {
 package_gambas2-gb-web() {
   depends=('gambas2-runtime')
   pkgdesc="Gambas2 CGI component"
-#  arch=('any')
 
   ## workaround for splitting
   cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
@@ -947,8 +921,3 @@ package_gambas2-gb-xml-xslt() {
   rm -rf ${pkgdir}/usr/bin
   ##
 }
-md5sums=('b59072b6f57b681d586cc84c02333690'
-         '9dda03a1bbfb7e7ba8b6a4ae91b6752b'
-         '870ff5b4b33cd75aa9c290539e6fdd5d'
-         'ab5667175c4945282d2f40a35d0e9e5b'
-         '5eb70afe712c0f8667a700df4d9a6735')