Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-staging/projectm/PKGBUILD
	community-testing/evas_generic_loaders-svn/PKGBUILD
	community-testing/gambas2/PKGBUILD
	community-testing/gambas3/PKGBUILD
	community-testing/libextractor/PKGBUILD
	community-testing/pdf2djvu/PKGBUILD
	community-testing/qtcreator/PKGBUILD
	community-testing/qtcreator/qtcreator.desktop
	community/galculator/PKGBUILD
	community/ristretto/PKGBUILD
	core/systemd/PKGBUILD
	extra/llvm/PKGBUILD
	extra/pyqt/PKGBUILD
	extra/python-lxml/PKGBUILD
	multilib/lib32-util-linux/PKGBUILD
	staging/glew/PKGBUILD
	staging/xine-lib/PKGBUILD
	testing/calligra/PKGBUILD
	testing/gdk-pixbuf2/PKGBUILD
	testing/gdm/PKGBUILD
	testing/gdm/fix_external_program_directories.patch
	testing/glib2/PKGBUILD
	testing/gnome-color-manager/PKGBUILD
	testing/gthumb/PKGBUILD
	testing/gtk3/PKGBUILD
	testing/gvfs/PKGBUILD
	testing/inkscape/PKGBUILD
	testing/kdebase-workspace/PKGBUILD
	testing/libreoffice/PKGBUILD
	testing/networkmanager/PKGBUILD
	testing/polkit/PKGBUILD
	testing/poppler/PKGBUILD
	testing/rhythmbox/PKGBUILD
	testing/xorg-server/PKGBUILD
	testing/xorg-xdm/PKGBUILD

1 files changed, 0 insertions, 94 deletions

diff --git a/testing/qtiplot/PKGBUILD b/testing/qtiplot/PKGBUILD
deleted file mode 100644
index d4779fcb7..000000000
--- a/testing/qtiplot/PKGBUILD
+++ /dev/null
@@ -1,94 +0,0 @@
-# $Id: PKGBUILD 168491 2012-10-12 17:58:46Z andyrtr $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: damir <damir.archlinux.org>
-# Contributor: Gergely Imreh <imrehg@gmail.com>
-
-pkgname=qtiplot
-pkgver=0.9.8.9
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://soft.proindependent.com/qtiplot.html"
-pkgdesc="Data analysis and scientific plotting - free clone of Origin"
-depends=('muparser' 'gsl' 'python2-pyqt' 'boost-libs' 'shared-mime-info' 'glu' 'liborigin2' 'qt-assistant-compat' 'tamu-anova')
-# build against qwtplot3d provided in the package ...
-# build against qwt provided in the package ...
-# as systemwide one doesn't provide all needed functions
-makedepends=('pkg-config' 'boost' 'mesa')
-license=('GPL2')
-install=${pkgname}.install
-source=(http://download.berlios.de/qtiplot/qtiplot-${pkgver}.tar.bz2
-        $pkgname.desktop
-        $pkgname.png
-        build.conf.archlinux
-        qwtplot3d_gcc.patch
-        qtiplot.xml
-	qtiplot-0.9.8.6-gold.patch
-	qtiplot-0.9.8.6-kde.patch
-	qtiplot-0.9.8.6-tamuanova.patch
-        qwtplot3d-qt-4.8.0.patch
-        qwtplot3d-libpng15.patch)
-sha1sums=('73b17dd9195c3d86750d5f1f5bdd4d5483c5fe30'
-          '4d5d7cf3965a0a1b1aa9cafc34e70ee207700bc8'
-          '4301cb2a36024a10108b689990d28c4fe5c7416e'
-          '326ee6bc623a637d058ab7ee9f65fede40a23a09'
-          '301bf6f70e8c1bb9ffd55eb49eedde7b29a12909'
-          '285f57d865956d93250ec548288c5bface096b6b'
-          'b534a609f317cf3117d6495909854cdacea20124'
-          'a1d4bec744c9b8fe29bf177851e66c97cdd9d975'
-          '830b518e3ef63625df84363a8047417124f243b0'
-          '3d4c471dda29a04d432f8e0a4c5b977068cdae72'
-          '4a45ee21f028f34da75d83c0d3e1d08c5f928892')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-   # gentoo fixes  
-   patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-gold.patch"
-   patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-kde.patch"
-#   patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-tamuanova.patch"
-
-   # build also static qwtplot3d lib
-   echo "unix:CONFIG += staticlib" >> 3rdparty/qwtplot3d/qwtplot3d.pro
-
-  # install build configuration file
-  install -Dm644 "${srcdir}/build.conf.archlinux" build.conf
-
-  # Make qwt
-  sed -i "s:elif:else:g" qtiplot/src/scripting/ScriptEdit.cpp
-  patch -Np1 -i "${srcdir}/qwtplot3d_gcc.patch"
-  cd ./3rdparty/qwt
-  qmake
-  make
-
-  # Make qwtplot3d
-  cd ../qwtplot3d
-  patch -Np3 -i "${srcdir}/qwtplot3d-qt-4.8.0.patch"
-  patch -Np0 -i "${srcdir}/qwtplot3d-libpng15.patch"
-  qmake
-  make
-
-  # Make qtiplot
-  cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}"
-
-  # fix stuff
-  sed -i 's|/usr/local/|/usr/share/|' qtiplot.pro
-  sed -i 's|<QAssistantClient>|<QtAssistant/qassistantclient.h>|' src/core/ApplicationWindow.cpp
-  sed -i 's#d_python_config_folder + "#"/usr/share/qtiplot#' src/core/ApplicationWindow.cpp
-
-  qmake qtiplot.pro QMAKESPEC=linux-g++
-  make QTDIR=/usr/ QMAKESPEC=linux-g++
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}"
-
-  INSTALL_ROOT="${pkgdir}" make install
-
-  # make it nice:
-  install -D -m644 "${srcdir}/${pkgname}.png" \
-  	"${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-  install -D -m644 "${srcdir}/${pkgname}.desktop" \
-  	"${pkgdir}/usr/share/applications/${pkgname}.desktop"
-  install -D -m644 "${srcdir}/${pkgname}.xml" \
-        "${pkgdir}/usr/share/mime/packages/${pkgname}.xml"
-}