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, 68 deletions

diff --git a/community-staging/python-bsddb/LICENSE b/community-staging/python-bsddb/LICENSE
deleted file mode 100644
index 7d6035775..000000000
--- a/community-staging/python-bsddb/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2008-2009 Jesus Cea Avion
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
diff --git a/community-staging/python-bsddb/PKGBUILD b/community-staging/python-bsddb/PKGBUILD
deleted file mode 100644
index 1f83cd005..000000000
--- a/community-staging/python-bsddb/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 77787 2012-10-14 18:15:13Z stephane $
-# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Douglas Soares de Andrade <dsandrade@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgbase=python-bsddb
-pkgname=('python2-bsddb' 'python-bsddb')
-pkgver=5.3.0
-pkgrel=3
-pkgdesc="Python interface for BerkeleyDB"
-license=('MIT')
-arch=('i686' 'x86_64')
-url="http://www.jcea.es/programacion/pybsddb.htm"
-makedepends=('python2-distribute' 'python-distribute')
-source=(http://pypi.python.org/packages/source/b/bsddb3/bsddb3-${pkgver}.tar.gz
-        LICENSE)
-sha1sums=('8743f6d7a2f5471094941a46859723aae88f3915'
-          'ef4e4caf618781104dbf5824279ed39d127b4713')
-
-build () {
-  cd "${srcdir}"
-
-  cp -r bsddb3-${pkgver}{,-python2}
-
-  # Build python 3 module
-  cd bsddb3-${pkgver}
-  python3 setup.py --berkeley-db=/usr build
-
-  # Build python 2 module
-  cd ../bsddb3-${pkgver}-python2
-  python2 setup.py --berkeley-db=/usr build
-}
-
-package_python2-bsddb() {
-  depends=('db' 'python2>=2.7')
-  cd "${srcdir}/bsddb3-${pkgver}-python2"
-
-  python2 setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1
-  install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
-
-package_python-bsddb() {
-  depends=('db' 'python>=3.3')
-  cd "${srcdir}/bsddb3-${pkgver}"
-
-  python3 setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1
-  install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}