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

diff --git a/community-testing/xlockmore/LICENSE b/community-testing/xlockmore/LICENSE
deleted file mode 100644
index f0b9aa9c6..000000000
--- a/community-testing/xlockmore/LICENSE
+++ /dev/null
@@ -1,18 +0,0 @@
-/*-
- * xscreensaver compatibility layer for xlockmore modules.
- * xscreensaver, Copyright (c) 1997, 1998 Jamie Zawinski <jwz@jwz.org>
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation.  No representations are made about the suitability of this
- * software for any purpose.  It is provided "as is" without express or
- * implied warranty.
- *
- * This file, along with xlockmore.h, make it possible to compile an xlockmore
- * module into a standalone program, and thus use it with xscreensaver.
- * By Jamie Zawinski <jwz@jwz.org> on 10-May-97; based on the ideas
- * in the older xlock.h by Charles Hannum <mycroft@ai.mit.edu>.  (I had
- * to redo it, since xlockmore has diverged so far from xlock...)
- */
diff --git a/community-testing/xlockmore/PKGBUILD b/community-testing/xlockmore/PKGBUILD
deleted file mode 100644
index fc3d8b336..000000000
--- a/community-testing/xlockmore/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 77304 2012-10-08 15:13:08Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: dorphell <dorphell@archlinux.org>
-
-pkgname=xlockmore
-pkgver=5.40
-pkgrel=2
-pkgdesc="screen saver / locker for the X Window System"
-arch=(i686 x86_64)
-license=('BSD')
-depends=(freetype2 gtk2 libxpm lesstif pam mesa libxmu glu)
-url="http://www.tux.org/~bagleyd/xlockmore.html"
-options=('!makeflags')
-source=(http://www.tux.org/~bagleyd/xlock/xlockmore-$pkgver/xlockmore-$pkgver.tar.bz2
-	LICENSE)
-md5sums=('47a8e16c485da7b0ebfa3f3e43300189'
-         'a64afab4283f53972a6702c2e59850d7')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --disable-setuid \
-	      --enable-appdefaultdir=/usr/share/X11/app-defaults \
-	      --enable-pam --with-gtk2 --without-esound --without-ftgl
-  make
-  make xapploaddir=$pkgdir/usr/share/X11/app-defaults \
-       mandir=$pkgdir/usr/man/man1 \
-       prefix=$pkgdir/usr install
-  install -D -m644 ../LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-  mv $pkgdir/usr/man $pkgdir/usr/share/
-}