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

diff --git a/community-testing/stone-soup/PKGBUILD b/community-testing/stone-soup/PKGBUILD
deleted file mode 100644
index 17177714b..000000000
--- a/community-testing/stone-soup/PKGBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# Maintainer: Jakob Gruber <jakob.gruber@gmail.com>
-
-pkgname=stone-soup
-pkgver=0.11.0
-pkgrel=2
-pkgdesc='Open-source, single-player, role-playing roguelike game of exploration and treasure-hunting'
-arch=('i686' 'x86_64')
-url='http://crawl.develz.org/'
-depends=('lua' 'ncurses' 'sdl_image' 'sqlite' 'libgl' 'mesa' 'glu' 'freetype2' 'ttf-dejavu')
-makedepends=('bison' 'flex' 'gendesk')
-conflicts=('crawl' 'stone-soup-tile' 'stone-soup-git')
-license=('custom')
-install=stone-soup.install
-source=("http://downloads.sourceforge.net/sourceforge/crawl-ref/stone_soup-${pkgver}-nodeps.tar.xz")
-
-# used by gendesk to create .desktop file
-_exec=('crawl-tiles')
-_name=('Dungeon Crawl Stone Soup')
-
-build() {
-    cd "$srcdir"
-    gendesk -n
-
-    cd "stone_soup-${pkgver}/source"
-
-    # adjust makefile to use /usr/bin, owner root:root,
-    # disable setgid on executable
-
-    sed -i 's|bin_prefix    := bin|bin_prefix    := usr/bin|' Makefile
-    sed -i 's/INSTALL_UGRP := games:games/INSTALL_UGRP := root:root/' Makefile
-    sed -i 's|MCHMOD := 2755|MCHMOD := 755|' Makefile
-
-    # first build and install tiles version
-
-    make DESTDIR="${pkgdir}" \
-         SAVEDIR="~/.crawl/" \
-         DATADIR="/usr/share/${pkgname}/data" \
-         USE_UNICODE=y \
-         TILES=y \
-         install
-
-    # rename tiles executable to avoid clashing with console crawl
-
-    mv "${pkgdir}/usr/bin/crawl" "${pkgdir}/usr/bin/crawl-tiles"
-
-    # then build and install console version
-
-    make DESTDIR="${pkgdir}" \
-         SAVEDIR="~/.crawl/" \
-         DATADIR="/usr/share/${pkgname}/data" \
-         USE_UNICODE=y \
-         install
-
-    # install crawl license
-
-    install -D -m644 ../licence.txt \
-        "${pkgdir}/usr/share/licenses/${pkgname}/license.txt"
-
-    # install icon and .desktop file
-
-    install -D -m644 dat/tiles/stone_soup_icon-32x32.png \
-        "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-    install -D -m644 "${srcdir}/${pkgname}.desktop" \
-        "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-
-}
-
-md5sums=('715d800410a7251499bf8efcc8675ca6')
diff --git a/community-testing/stone-soup/stone-soup.install b/community-testing/stone-soup/stone-soup.install
deleted file mode 100644
index 2320123e2..000000000
--- a/community-testing/stone-soup/stone-soup.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_upgrade() {
-
-    # return if old pkgver >= 0.9.0-2
-    [[ $(vercmp $2 0.9.0-2) -ge 0 ]] && return
-
-    echo "---------------------------------------------------------------------
-    stone-soup saves have moved to ~/.crawl.
-    If you want to keep your old saves, move ~/.stone-soup to
-    ~/.crawl.
----------------------------------------------------------------------"
-}