Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bacula/PKGBUILD
	community/clementine/PKGBUILD
	community/dbus-sharp-glib/PKGBUILD
	community/dockmanager/PKGBUILD
	community/docky/PKGBUILD
	community/flightgear-atlas/PKGBUILD
	community/libdesktop-agnostic/PKGBUILD
	community/openmovieeditor/PKGBUILD
	community/perl-crypt-openssl-bignum/PKGBUILD
	community/perl-crypt-openssl-random/PKGBUILD
	community/perl-crypt-openssl-rsa/PKGBUILD
	community/tucan/PKGBUILD
	core/btrfs-progs-unstable/PKGBUILD
	core/module-init-tools/PKGBUILD
	core/sqlite3/PKGBUILD.mips64el
	extra/bogofilter/PKGBUILD
	extra/dirmngr/PKGBUILD
	extra/gluezilla/PKGBUILD
	extra/gnupg/PKGBUILD
	extra/gnupg2/PKGBUILD
	extra/gpgme/PKGBUILD
	extra/kdeaccessibility/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/kdeutils/PKGBUILD
	extra/libassuan/PKGBUILD
	extra/libksba/PKGBUILD
	extra/oxygen-gtk/PKGBUILD
	extra/pinentry/PKGBUILD
	extra/pth/PKGBUILD
	extra/smplayer-themes/PKGBUILD
	libre/kdeutils-libre/PKGBUILD
	libre/linux-libre/linux-libre.preset.mips64el

1 files changed, 0 insertions, 79 deletions

diff --git a/extra/bluez/make-libcheck-optional.patch b/extra/bluez/make-libcheck-optional.patch
deleted file mode 100644
index a315a3898..000000000
--- a/extra/bluez/make-libcheck-optional.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From: Marcel Holtmann <marcel@holtmann.org>
-Date: Wed, 28 Dec 2011 04:09:56 +0000 (-0800)
-Subject: build: Move libcheck under TEST conditional
-X-Git-Url: http://git.kernel.org/?p=bluetooth%2Fbluez.git;a=commitdiff_plain;h=bf5d45f2fbd1b1463512f4eb8d30bffb3478ccc7;hp=ec632165d6707bece074dbba43d704e26346ab0a
-
-build: Move libcheck under TEST conditional
----
-
-diff --git a/Makefile.am b/Makefile.am
-index 9112483..5cf287c 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -449,6 +449,7 @@ endif
- 
- unit_objects =
- 
-+if TEST
- unit_tests = unit/test-eir
- 
- noinst_PROGRAMS += $(unit_tests)
-@@ -456,8 +457,10 @@ noinst_PROGRAMS += $(unit_tests)
- unit_test_eir_SOURCES = unit/test-eir.c src/eir.c src/glib-helper.c
- unit_test_eir_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@ @CHECK_LIBS@
- unit_test_eir_CFLAGS = $(AM_CFLAGS) @CHECK_CFLAGS@
--unit_test_eir_SHORTNAME = unit
- unit_objects += $(unit_test_eir_OBJECTS)
-+else
-+unit_tests =
-+endif
- 
- TESTS = $(unit_tests)
- 
-diff --git a/acinclude.m4 b/acinclude.m4
-index 2097d77..753b994 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -170,6 +170,12 @@ AC_DEFUN([AC_PATH_READLINE], [
- 		[])
- ])
- 
-+AC_DEFUN([AC_PATH_CHECK], [
-+	PKG_CHECK_MODULES(CHECK, check >= 0.9.4, check_found=yes, check_found=no)
-+	AC_SUBST(CHECK_CFLAGS)
-+	AC_SUBST(CHECK_LIBS)
-+])
-+
- AC_DEFUN([AC_PATH_OUI], [
- 	AC_ARG_WITH(ouifile,
- 		    AS_HELP_STRING([--with-ouifile=PATH],[Path to the oui.txt file @<:@auto@:>@]),
-@@ -422,7 +428,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [
- 	AM_CONDITIONAL(PAND, test "${pand_enable}" = "yes")
- 	AM_CONDITIONAL(DUND, test "${dund_enable}" = "yes")
- 	AM_CONDITIONAL(CUPS, test "${cups_enable}" = "yes")
--	AM_CONDITIONAL(TEST, test "${test_enable}" = "yes")
-+	AM_CONDITIONAL(TEST, test "${test_enable}" = "yes" && test "${check_found}" = "yes")
- 	AM_CONDITIONAL(TOOLS, test "${tools_enable}" = "yes")
- 	AM_CONDITIONAL(BCCMD, test "${bccmd_enable}" = "yes")
- 	AM_CONDITIONAL(PCMCIA, test "${pcmcia_enable}" = "yes")
-diff --git a/configure.ac b/configure.ac
-index 3a5dfde..a7670da 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -24,8 +24,6 @@ AC_PROG_YACC
- AM_PROG_LEX
- AM_PROG_MKDIR_P
- 
--PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
--
- m4_define([_LT_AC_TAGCONFIG], [])
- m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])])
- 
-@@ -50,6 +48,7 @@ AC_PATH_UDEV
- AC_PATH_SNDFILE
- AC_PATH_OUI
- AC_PATH_READLINE
-+AC_PATH_CHECK
- 
- AC_ARG_BLUEZ
-