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

Conflicts:
	community/distcc/PKGBUILD
	community/haskell-x11-xft/PKGBUILD
	community/libtorrent/PKGBUILD
	community/picard/PKGBUILD
	community/rtorrent/PKGBUILD
	community/ushare/PKGBUILD
	extra/catdoc/PKGBUILD
	extra/curl/PKGBUILD
	extra/ethstatus/PKGBUILD
	extra/ffcall/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/gimp-dbp/PKGBUILD
	extra/gimp-refocus/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/haskell-cgi/PKGBUILD
	extra/haskell-deepseq/PKGBUILD
	extra/haskell-haskell-src/PKGBUILD
	extra/haskell-html/PKGBUILD
	extra/haskell-http/PKGBUILD
	extra/haskell-hunit/PKGBUILD
	extra/haskell-mtl/PKGBUILD
	extra/haskell-network/PKGBUILD
	extra/haskell-opengl/PKGBUILD
	extra/haskell-parallel/PKGBUILD
	extra/haskell-parsec/PKGBUILD
	extra/haskell-platform/PKGBUILD
	extra/haskell-quickcheck/PKGBUILD
	extra/haskell-regex-base/PKGBUILD
	extra/haskell-regex-compat/PKGBUILD
	extra/haskell-regex-posix/PKGBUILD
	extra/haskell-stm/PKGBUILD
	extra/haskell-syb/PKGBUILD
	extra/haskell-text/PKGBUILD
	extra/haskell-transformers/PKGBUILD
	extra/haskell-xhtml/PKGBUILD
	extra/haskell-zlib/PKGBUILD
	extra/metacity/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/x2x/PKGBUILD
	kde-unstable/kdeaccessibility/PKGBUILD
	kde-unstable/kdeadmin/PKGBUILD
	kde-unstable/kdeartwork/PKGBUILD
	kde-unstable/kdebase-konsole/PKGBUILD
	kde-unstable/kdebase-runtime/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	kde-unstable/kdebase/PKGBUILD
	kde-unstable/kdebindings-kimono/PKGBUILD
	kde-unstable/kdebindings-korundum/PKGBUILD
	kde-unstable/kdebindings-perlkde/PKGBUILD
	kde-unstable/kdebindings-perlqt/PKGBUILD
	kde-unstable/kdebindings-python/PKGBUILD
	kde-unstable/kdebindings-qtruby/PKGBUILD
	kde-unstable/kdebindings-qyoto/PKGBUILD
	kde-unstable/kdebindings-smokegen/PKGBUILD
	kde-unstable/kdebindings-smokekde/PKGBUILD
	kde-unstable/kdebindings-smokeqt/PKGBUILD
	kde-unstable/kdeedu-blinken/PKGBUILD
	kde-unstable/kdeedu-cantor/PKGBUILD
	kde-unstable/kdeedu-kalgebra/PKGBUILD
	kde-unstable/kdeedu-kalzium/PKGBUILD
	kde-unstable/kdeedu-kanagram/PKGBUILD
	kde-unstable/kdeedu-kbruch/PKGBUILD
	kde-unstable/kdeedu-kgeography/PKGBUILD
	kde-unstable/kdeedu-khangman/PKGBUILD
	kde-unstable/kdeedu-kig/PKGBUILD
	kde-unstable/kdeedu-kiten/PKGBUILD
	kde-unstable/kdeedu-klettres/PKGBUILD
	kde-unstable/kdeedu-kmplot/PKGBUILD
	kde-unstable/kdeedu-kstars/PKGBUILD
	kde-unstable/kdeedu-ktouch/PKGBUILD
	kde-unstable/kdeedu-kturtle/PKGBUILD
	kde-unstable/kdeedu-kwordquiz/PKGBUILD
	kde-unstable/kdeedu-marble/PKGBUILD
	kde-unstable/kdeedu-parley/PKGBUILD
	kde-unstable/kdeedu-rocs/PKGBUILD
	kde-unstable/kdeedu-step/PKGBUILD
	kde-unstable/kdegames/PKGBUILD
	kde-unstable/kdegraphics-gwenview/PKGBUILD
	kde-unstable/kdegraphics-kamera/PKGBUILD
	kde-unstable/kdegraphics-kcolorchooser/PKGBUILD
	kde-unstable/kdegraphics-kgamma/PKGBUILD
	kde-unstable/kdegraphics-kolourpaint/PKGBUILD
	kde-unstable/kdegraphics-kruler/PKGBUILD
	kde-unstable/kdegraphics-ksaneplugin/PKGBUILD
	kde-unstable/kdegraphics-ksnapshot/PKGBUILD
	kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD
	kde-unstable/kdegraphics-svgpart/PKGBUILD
	kde-unstable/kdegraphics-thumbnailers/PKGBUILD
	kde-unstable/kdelibs/PKGBUILD
	kde-unstable/kdemultimedia/PKGBUILD
	kde-unstable/kdenetwork/PKGBUILD
	kde-unstable/kdepim-runtime/PKGBUILD
	kde-unstable/kdepim/PKGBUILD
	kde-unstable/kdepimlibs/PKGBUILD
	kde-unstable/kdeplasma-addons/PKGBUILD
	kde-unstable/kdesdk-kate/PKGBUILD
	kde-unstable/kdesdk/PKGBUILD
	kde-unstable/kdetoys/PKGBUILD
	kde-unstable/kdeutils/PKGBUILD
	kde-unstable/kdewebdev/PKGBUILD
	kde-unstable/libkdcraw/PKGBUILD
	kde-unstable/libkdeedu/PKGBUILD
	kde-unstable/libkexiv2/PKGBUILD
	kde-unstable/libkipi/PKGBUILD
	kde-unstable/libksane/PKGBUILD
	libre/kernel26-libre/PKGBUILD
	libre/libretools/PKGBUILD
	multilib/lib32-libpulse/PKGBUILD
	multilib/wine/PKGBUILD
	testing/alex/PKGBUILD
	testing/ghc/PKGBUILD
	testing/haskell-cgi/PKGBUILD
	testing/haskell-deepseq/PKGBUILD
	testing/haskell-fgl/PKGBUILD
	testing/haskell-glut/PKGBUILD
	testing/haskell-haskell-src/PKGBUILD
	testing/haskell-html/PKGBUILD
	testing/haskell-http/PKGBUILD
	testing/haskell-hunit/PKGBUILD
	testing/haskell-mtl/PKGBUILD
	testing/haskell-network/PKGBUILD
	testing/haskell-opengl/PKGBUILD
	testing/haskell-parallel/PKGBUILD
	testing/haskell-parsec/PKGBUILD
	testing/haskell-platform/PKGBUILD
	testing/haskell-quickcheck/PKGBUILD
	testing/haskell-regex-base/PKGBUILD
	testing/haskell-regex-compat/PKGBUILD
	testing/haskell-regex-posix/PKGBUILD
	testing/haskell-stm/PKGBUILD
	testing/haskell-syb/PKGBUILD
	testing/haskell-text/PKGBUILD
	testing/haskell-transformers/PKGBUILD
	testing/haskell-xhtml/PKGBUILD
	testing/haskell-zlib/PKGBUILD
	testing/perl/ChangeLog
	testing/perl/PKGBUILD
	testing/perl/perlbin.sh
	testing/pidgin/PKGBUILD
	testing/spamassassin/PKGBUILD

1 files changed, 20 insertions, 12 deletions

diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD
index 410a7e18c..737c386a7 100644
--- a/community/qtcreator/PKGBUILD
+++ b/community/qtcreator/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 49861 2011-06-21 12:55:45Z svenstaro $
+# $Id: PKGBUILD 50126 2011-06-25 11:05:26Z svenstaro $
 # Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
@@ -11,34 +11,33 @@ pkgbase=qtcreator
 #pkgname=('qtcreator' 'qtcreator-todo-plugin' 'qtcreator-artisticstyle-plugin')
 pkgname=('qtcreator' 'qtcreator-todo-plugin')
 pkgver=2.2.1
-pkgrel=1
+pkgrel=3
 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')
+makedepends=('qt-private-headers>=4.7.3' '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'
-	    "https://gitorious.org/qt-creator-todo-plugin/qt-creator-todo-plugin/archive-tarball/88f8fc50"
         'qtcreator.desktop')
 md5sums=('35d74837e48b12ee58379e1c029a9a6c'
          '4dab1bb07ba5c39ae4c975a333d32ec1'
-         '734a6f375e595de796f9802087845dfe'
          '2c3ffbd66845b37be9804f2966815a10')
 
 build() {
   cd ${srcdir}
-  mkdir build
-  cd build
+  [[ -d build ]] && rm -r 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-qt-creator-todo-plugin
+  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
@@ -66,12 +65,21 @@ package_qtcreator() {
 
   # qt already fixed this
   if [[ -f "$pkgdir/usr/bin/qmlpuppet" ]]; then
-      echo "Remove this manual install as it is now unnecessary (probably qtcreator 2.2.1)"
+      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
+  fi
+  mkdir "$pkgdir/usr/lib/qmldesigner"
+  cp lib/qmldesigner/*.so "$pkgdir/usr/lib/qmldesigner/"
+  # remove it soon
+
   install -Dm644 ${srcdir}/qtcreator.desktop \
     ${pkgdir}/usr/share/applications/qtcreator.desktop
   install -Dm644 ${srcdir}/qt-creator-${pkgver}-src/LGPL_EXCEPTION.TXT \
@@ -80,7 +88,7 @@ package_qtcreator() {
 
 package_qtcreator-todo-plugin() {
   license=('BSD')
-  depends=('qtcreator=2.2.0')
+  depends=("qtcreator=$pkgver")
   pkgdesc='TODO plugin for QtCreator'
   url='http://gitorious.org/qt-creator-tod
   install -Dm644 ${srcdir}/qtcreator.desktop \
@@ -88,7 +96,7 @@ package_qtcreator-todo-plugin() {
   install -Dm644 ${srcdir}/qt-creator-${pkgver}-src/LGPL_EXCEPTION.TXT \
  o-plugin'
   
-  cd $srcdir/qt-creator-todo-plugin-qt-creator-todo-plugin
+  cd $srcdir/qt-creator-todo-plugin
   make INSTALL_ROOT=$pkgdir/usr/ install
 
   install -Dm644 LICENSE.BSD \
@@ -97,7 +105,7 @@ package_qtcreator-todo-plugin() {
 
 #package_qtcreator-artisticstyle-plugin() {
 #  license=('GPL3' 'LGPL')
-#  depends=('qtcreator=2.2.0')
+#  depends=("qtcreator=$pkgver")
 #  pkgdesc='ArtisticStyle plugin for QtCreator'
 #  url='http://astyleplugin.berlios.de/index.php'
 #