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

Conflicts:
	core/gcc/PKGBUILD
	extra/qt/PKGBUILD
	multilib/gcc-multilib/PKGBUILD
	testing/pidgin/PKGBUILD

1 files changed, 40 insertions, 32 deletions

diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD
index fbf6eae59..b0e514e57 100644
--- a/community/qtcreator/PKGBUILD
+++ b/community/qtcreator/PKGBUILD
@@ -1,29 +1,32 @@
-# $Id: PKGBUILD 43503 2011-03-26 23:39:42Z andrea $
+# $Id: PKGBUILD 48916 2011-06-07 16:02:27Z svenstaro $
 # Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org>
+# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 # Contributor: Dan Vratil <progdan@progdansoft.com>
 # Contributor: thotypous <matiasΘarchlinux-br·org>
 # Contributor: delor <bartekpiech gmail com>
 
 pkgbase=qtcreator
-pkgname=('qtcreator' 'qtcreator-todo-plugin' 'qtcreator-artisticstyle-plugin')
-pkgver=2.1.0
-pkgrel=3
+# 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.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.2')
-makedepends=('git' 'qt-private-headers')
+depends=('qt>=4.7.3')
+makedepends=('git' 'qt-private-headers>=4.7.3')
 options=('docs')
-source=("http://get.qt.nokia.com/qtcreator/qt-creator-${pkgver}-src.zip"
+source=("http://get.qt.nokia.com/qtcreator/qt-creator-${pkgver}-src.tar.gz"
 	    'http://download.berlios.de/astyleplugin/ArtisticStylePlugin-0.6-src.zip'
-	    "ftp://ftp.archlinux.org/other/community/${pkgbase}/qt-creator-todo-plugin-git20110323.tar.bz2"
+	    "https://gitorious.org/qt-creator-todo-plugin/qt-creator-todo-plugin/archive-tarball/88f8fc50"
         'qtcreator.desktop')
-md5sums=('a6e48b4347314fb2a92b77f40b4fc9a5'
-        '4dab1bb07ba5c39ae4c975a333d32ec1'
-        '3b0f89d7a1e7dd19208998a2ba84abe1'
-        '2c3ffbd66845b37be9804f2966815a10')
+md5sums=('4e02382db7b850f3a3b20c6a8707269e'
+         '4dab1bb07ba5c39ae4c975a333d32ec1'
+         '734a6f375e595de796f9802087845dfe'
+         '2c3ffbd66845b37be9804f2966815a10')
 
 #_gitroot_todo="git://gitorious.org/qt-creator-todo-plugin/qt-creator-todo-plugin.git"
 
@@ -33,26 +36,27 @@ build() {
   cd build
 
   qmake ${srcdir}/qt-creator-${pkgver}-src/qtcreator.pro
-  make
+  make --quiet
   
   # Building TODO plugin
   msg "Starting TODO plugin build...."
-  cd $srcdir/qt-creator-todo-plugin
-  sed -i "s|QTC_BUILD_DIR = /opt/qtcreator-2.0.92|QTC_BUILD_DIR = ${srcdir}/build|g" todoplugin.pro
-  sed -i "s|QTC_SOURCE_DIR = /home/vass/qt-creator-2.1.0-beta1-src|QTC_SOURCE_DIR  = $srcdir/qt-creator-${pkgver}-src/|g" todoplugin.pro
+  cd $srcdir/qt-creator-todo-plugin-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.0.92\"|\"${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
+#  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() {
   optdepends=('qt-doc: for the integrated Qt documentation'
               'gdb: for the debugger'
+              'cmake: for cmake project suppport'
               'openssh-askpass: for ssh support'
               'git: for git support'
               'mercurial: for mercurial support')
@@ -69,23 +73,27 @@ package_qtcreator() {
 
 package_qtcreator-todo-plugin() {
   license=('BSD')
-  depends=('qtcreator=2.1.0')
+  depends=('qtcreator=2.2.0')
   pkgdesc='TODO plugin for QtCreator'
-  url='http://gitorious.org/qt-creator-todo-plugin'
+  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
+  cd $srcdir/qt-creator-todo-plugin-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=2.1.0')
-  pkgdesc='ArtisticStyle plugin for QtCreator'
-  url='http://astyleplugin.berlios.de/index.php'
-  
-  cd $srcdir/ArtisticStylePlugin-0.6
-  make INSTALL_ROOT=$pkgdir/usr/ install
-}
+#package_qtcreator-artisticstyle-plugin() {
+#  license=('GPL3' 'LGPL')
+#  depends=('qtcreator=2.2.0')
+#  pkgdesc='ArtisticStyle plugin for QtCreator'
+#  url='http://astyleplugin.berlios.de/index.php'
+#  
+#  cd $srcdir/ArtisticStylePlugin-0.6
+#  make INSTALL_ROOT=$pkgdir/usr/ install
+#}