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

Conflicts:
	community/stone-soup/PKGBUILD
	extra/alsa-oss/PKGBUILD
	extra/habak/PKGBUILD
	extra/libmcrypt/PKGBUILD
	extra/mahjong/PKGBUILD
	extra/mcrypt/PKGBUILD

1 files changed, 9 insertions, 64 deletions

diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD
index 737c386a7..175c52652 100644
--- a/community/qtcreator/PKGBUILD
+++ b/community/qtcreator/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 50126 2011-06-25 11:05:26Z svenstaro $
+# $Id: PKGBUILD 55146 2011-09-04 05:13:28Z svenstaro $
 # Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
@@ -6,24 +6,19 @@
 # Contributor: thotypous <matiasΘarchlinux-br·org>
 # Contributor: delor <bartekpiech gmail com>
 
-pkgbase=qtcreator
-# artisticstyle plugin does currently not support qtcreator 2.2.0
-#pkgname=('qtcreator' 'qtcreator-todo-plugin' 'qtcreator-artisticstyle-plugin')
-pkgname=('qtcreator' 'qtcreator-todo-plugin')
-pkgver=2.2.1
-pkgrel=3
+pkgname="qtcreator"
+pkgver=2.3.0
+pkgrel=1
 pkgdesc='Lightweight, cross-platform integrated development environment'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://qt.nokia.com/products/developer-tools'
 license=('LGPL')
-depends=('qt>=4.7.3')
-makedepends=('qt-private-headers>=4.7.3' 'git')
+depends=('qt>=4.7.4')
+makedepends=('qt-private-headers>=4.7.4' 'git')
 options=('docs')
 source=("http://get.qt.nokia.com/qtcreator/qt-creator-${pkgver}-src.tar.gz"
-	    'http://download.berlios.de/astyleplugin/ArtisticStylePlugin-0.6-src.zip'
         'qtcreator.desktop')
-md5sums=('35d74837e48b12ee58379e1c029a9a6c'
-         '4dab1bb07ba5c39ae4c975a333d32ec1'
+md5sums=('b7ee1b779f9afe9190c5c72fb207650c'
          '2c3ffbd66845b37be9804f2966815a10')
 
 build() {
@@ -32,25 +27,10 @@ build() {
   mkdir build && cd build
 
   qmake ${srcdir}/qt-creator-${pkgver}-src/qtcreator.pro
-  make --quiet
-  
-  # Building TODO plugin
-  git clone git://gitorious.org/qt-creator-todo-plugin/qt-creator-todo-plugin.git $srcdir/qt-creator-todo-plugin
-  msg "Starting TODO plugin build...."
-  cd $srcdir/qt-creator-todo-plugin
-  sed -i "s|QTC_BUILD_DIR = .*|QTC_BUILD_DIR = ${srcdir}/build|g" todoplugin.pro
-  sed -i "s|QTC_SOURCE_DIR = .*|QTC_SOURCE_DIR  = $srcdir/qt-creator-${pkgver}-src/|g" todoplugin.pro
-  sed -i "s|\"2.1.81\"|\"${pkgver}\"|g" todo.pluginspec
-  qmake
   make
-  
-#  msg "Starting ArtisticStyle plugin build...."
-#  cd $srcdir/ArtisticStylePlugin-0.6
-#  qmake QTC_BUILD=$srcdir/build QTC_SOURCE=$srcdir/qt-creator-${pkgver}-src -config release
-#  make
 }
 
-package_qtcreator() {
+package() {
   optdepends=('qt-doc: for the integrated Qt documentation'
               'gdb: for the debugger'
               'cmake: for cmake project suppport'
@@ -63,18 +43,10 @@ package_qtcreator() {
 
   make INSTALL_ROOT="${pkgdir}/usr/" install
 
-  # qt already fixed this
-  if [[ -f "$pkgdir/usr/bin/qmlpuppet" ]]; then
-      echo "Remove this manual install as it is now unnecessary (probably qtcreator 2.3.0)"
-      return 1
-  fi
-  install -Dm755 bin/qmlpuppet "$pkgdir/usr/bin/qmlpuppet"
-  # remove it soon
-
   # qt already fixed this as well
   if [[ -f "$pkgdir/usr/lib/qmldesigner/libqtquickplugin.so" ]]; then
       echo "Remove this manual install as it is now unnecessary (probably qtcreator 2.3.0)"
-      return 1
+      exit 1
   fi
   mkdir "$pkgdir/usr/lib/qmldesigner"
   cp lib/qmldesigner/*.so "$pkgdir/usr/lib/qmldesigner/"
@@ -85,30 +57,3 @@ package_qtcreator() {
   install -Dm644 ${srcdir}/qt-creator-${pkgver}-src/LGPL_EXCEPTION.TXT \
     ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT
 }
-
-package_qtcreator-todo-plugin() {
-  license=('BSD')
-  depends=("qtcreator=$pkgver")
-  pkgdesc='TODO plugin for QtCreator'
-  url='http://gitorious.org/qt-creator-tod
-  install -Dm644 ${srcdir}/qtcreator.desktop \
-    ${pkgdir}/usr/share/applications/qtcreator.desktop
-  install -Dm644 ${srcdir}/qt-creator-${pkgver}-src/LGPL_EXCEPTION.TXT \
- o-plugin'
-  
-  cd $srcdir/qt-creator-todo-plugin
-  make INSTALL_ROOT=$pkgdir/usr/ install
-
-  install -Dm644 LICENSE.BSD \
-    $pkgdir/usr/share/licenses/${pkgname}/LICENSE
-}
-
-#package_qtcreator-artisticstyle-plugin() {
-#  license=('GPL3' 'LGPL')
-#  depends=("qtcreator=$pkgver")
-#  pkgdesc='ArtisticStyle plugin for QtCreator'
-#  url='http://astyleplugin.berlios.de/index.php'
-#  
-#  cd $srcdir/ArtisticStylePlugin-0.6
-#  make INSTALL_ROOT=$pkgdir/usr/ install
-#}