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

2 files changed, 0 insertions, 42 deletions

diff --git a/community-testing/python-numarray/LICENSE b/community-testing/python-numarray/LICENSE
deleted file mode 100644
index 30ff57fc4..000000000
--- a/community-testing/python-numarray/LICENSE
+++ /dev/null
@@ -1,9 +0,0 @@
-Copyright (C) 2005 Association of Universities for Research in Astronomy (AURA)
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-3. The name of AURA and its representatives may not be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY AURA ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AURA BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
diff --git a/community-testing/python-numarray/PKGBUILD b/community-testing/python-numarray/PKGBUILD
deleted file mode 100644
index 327b286b5..000000000
--- a/community-testing/python-numarray/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 78090 2012-10-16 11:52:56Z allan $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Douglas Soares de Andrade <dsandrade@gmail.com>
-
-pkgbase=python-numarray
-pkgname=python2-numarray
-pkgver=1.5.2
-pkgrel=6
-pkgdesc='Provides array manipulation and computational capabilities.'
-arch=('i686' 'x86_64')
-url='http://numpy.scipy.org/'
-license=('BSD')
-depends=('python2')
-conflicts=('python2-numarray<=1.5.2-6')
-replaces=('python2-numarray<=1.5.2-6')
-source=("http://downloads.sourceforge.net/sourceforge/numpy/numarray-${pkgver}.tar.gz"
-        'LICENSE')
-md5sums=('d2ecfc60fe4869c328b872540d04e0f7'
-         'e32b4466453e530d7fb0dbeee0ca1044')
-
-build() {
-  cd "${srcdir}/numarray-${pkgver}"
-
-  # python2 fix
-  sed -i 's_#! /usr/bin/env python_#! /usr/bin/env python2_' Examples/convolve/benchmark.py
-}
-
-package_python2-numarray() {
-  cd "${srcdir}/numarray-${pkgver}"
-
-  python2 setup.py install --root="${pkgdir}"
-  install -D ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}