Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/cantata/PKGBUILD
	community/ffmpeg-compat/PKGBUILD
	community/v8/PKGBUILD
	core/e2fsprogs/PKGBUILD
	core/groff/PKGBUILD
	core/openssl/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/glpk/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/mediastreamer/PKGBUILD
	extra/netcdf/PKGBUILD
	extra/octave/PKGBUILD
	extra/opal/PKGBUILD
	extra/sox/PKGBUILD
	extra/x264/PKGBUILD

3 files changed, 3 insertions, 76 deletions

diff --git a/community/libsignon-glib/PKGBUILD b/community/libsignon-glib/PKGBUILD
index 18b2d0d2d..d09fba005 100644
--- a/community/libsignon-glib/PKGBUILD
+++ b/community/libsignon-glib/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 83004 2013-01-26 14:44:32Z bgyorgy $
+# $Id: PKGBUILD 84337 2013-02-16 20:27:53Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=libsignon-glib
-pkgver=1.8
+pkgver=1.9
 pkgrel=1
 pkgdesc="GLib-based client library for applications handling account authentication through the Online Accounts Single Sign-On service"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('signon')
 makedepends=('python2-gobject')
 options=('!libtool')
 source=(http://accounts-sso.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('74c2718ea5423747c68b47e52b85a6e273cac085')
+sha1sums=('09e0b8da14f4ea9450e33eb5f6808afeefdbbe03')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/libsignon-glib/fix-docdir.patch b/community/libsignon-glib/fix-docdir.patch
deleted file mode 100644
index b42c7faf8..000000000
--- a/community/libsignon-glib/fix-docdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur libsignon-glib-1.6.orig/Makefile.am libsignon-glib-1.6/Makefile.am
---- libsignon-glib-1.6.orig/Makefile.am	2012-08-13 10:09:23.000000000 +0200
-+++ libsignon-glib-1.6/Makefile.am	2012-10-16 22:04:28.805736477 +0200
-@@ -11,7 +11,7 @@
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libsignon-glib.pc
- 
--libsignondocdir = ${prefix}/doc/reference
-+libsignondocdir = ${docdir}
- libsignondoc_DATA= README COPYING AUTHORS ChangeLog INSTALL NEWS
- 
- EXTRA_DIST = \
diff --git a/community/libsignon-glib/make-tests-optional.patch b/community/libsignon-glib/make-tests-optional.patch
deleted file mode 100644
index cc1e72848..000000000
--- a/community/libsignon-glib/make-tests-optional.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-commit 65e1948097695f26aa13f4104336a8a76a678b87
-Author: David King <david.king@canonical.com>
-Date:   Tue Oct 30 09:24:27 2012 +0000
-
-    Make tests optional at configure time
-    
-    http://code.google.com/p/accounts-sso/issues/detail?id=124
-
-diff --git a/Makefile.am b/Makefile.am
-index 86b3a55..5740d45 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,12 +2,16 @@ ACLOCAL_AMFLAGS = -I m4
- DISTCHECK_CONFIGURE_FLAGS = \
- 	--enable-gtk-doc \
- 	--enable-introspection=yes
--SUBDIRS = libsignon-glib docs tests
-+SUBDIRS = libsignon-glib docs
- 
- if ENABLE_PYTHON
- SUBDIRS += pygobject
- endif
- 
-+if ENABLE_TESTS
-+SUBDIRS += tests
-+endif
-+
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libsignon-glib.pc
- 
-diff --git a/configure.ac b/configure.ac
-index af5e663..d09661e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -19,7 +19,25 @@ PKG_CHECK_MODULES(
- AC_SUBST(DEPS_CFLAGS)
- AC_SUBST(DEPS_LIBS)
- 
--PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
-+# Build tests.
-+
-+CHECK_REQUIRED="check >= 0.9.4"
-+
-+AC_ARG_ENABLE([tests],
-+  [AS_HELP_STRING([--disable-tests], [build with testing support disabled])])
-+
-+AS_IF([test "x$enable_tests" != "xno"],
-+  [PKG_CHECK_EXISTS([$CHECK_REQUIRED], [have_check=yes], [have_check=no])],
-+  [have_check=no])
-+
-+AS_IF([test "x$have_check" = "xyes"],
-+  [PKG_CHECK_MODULES([CHECK], [$CHECK_REQUIRED])
-+   AC_SUBST([CHECK_CFLAGS])
-+   AC_SUBST([CHECK_LIBS])],
-+  [AS_IF([test "x$enable_tests" = "xyes"],
-+    [AC_MSG_ERROR([tests enabled but required dependencies were not found])])])
-+
-+AM_CONDITIONAL([ENABLE_TESTS], [test "x$have_check" = "xyes"])
- 
- AC_ISC_POSIX
- AC_PROG_CC