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

Conflicts:
	community/busybox/PKGBUILD
	community/glpng/PKGBUILD
	community/hercules/PKGBUILD
	community/libnetfilter_acct/PKGBUILD
	community/libvirt/PKGBUILD
	extra/crypto++/PKGBUILD
	extra/hexedit/PKGBUILD
	extra/kdesdk-kate/PKGBUILD
	extra/kdesdk/PKGBUILD
	extra/libmp3splt/PKGBUILD
	extra/ntfs-3g_ntfsprogs/PKGBUILD
	extra/opencv/PKGBUILD
	extra/qemu-kvm/PKGBUILD
	extra/xf86-input-wacom/PKGBUILD
	extra/xfce4-eyes-plugin/PKGBUILD
	extra/xfdesktop/PKGBUILD

3 files changed, 23 insertions, 53 deletions

diff --git a/community/deja-dup/PKGBUILD b/community/deja-dup/PKGBUILD
index 158a9ff8c..7c44a1aac 100644
--- a/community/deja-dup/PKGBUILD
+++ b/community/deja-dup/PKGBUILD
@@ -1,25 +1,27 @@
-# $Id: PKGBUILD 79462 2012-11-05 20:10:47Z bgyorgy $
+# $Id: PKGBUILD 85692 2013-03-05 09:07:44Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=deja-dup
 pkgver=24.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Simple backup tool, that hides the complexity of backing up the Right Way and uses duplicity as the backend"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/deja-dup"
 license=('GPL')
-depends=('duplicity' 'libgnome-keyring' 'libpeas' 'libnotify' 'python2-gobject2' 'dconf' 'xdg-utils')
+depends=('duplicity' 'libgnome-keyring' 'libpeas' 'libnotify' 'python2-gobject' 'gvfs' 'dconf' 'xdg-utils')
 makedepends=('vala' 'intltool' 'itstool' 'nautilus')
 optdepends=('nautilus: backup extension'
-            'ubuntuone-client: backup into Ubuntu One storage')
+            'python2-boto: Amazon S3 backend'
+            'python2-oauthlib: Ubuntu One backend'
+            'ubuntuone-client: Ubuntu One backend')
 options=('!libtool')
 install=$pkgname.install
 source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz
         new-u1backend-support.patch
-        not-check-ubuntuone-couch.patch)
+        update-u1-pythonchecker.patch)
 md5sums=('335131d1f3c85615339fa8b212db50ae'
          '944a4c62f042b240feba98f8d9a893b2'
-         '8d59798638982c2bdb55b2e415087245')
+         'd0893c17e3e61c3ada065a002a9ab419')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -28,8 +30,8 @@ build() {
   # Add support for the new Ubuntu One backend
   patch -Np0 -i "$srcdir/new-u1backend-support.patch"
 
-  # Now we don't need ubuntuone-couch for Ubuntu One support
-  patch -Np1 -i "$srcdir/not-check-ubuntuone-couch.patch"
+  # And update the PythonChecker check for the new U1 backend too
+  patch -Np0 -i "$srcdir/update-u1-pythonchecker.patch"
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
               --disable-static --disable-schemas-compile --without-unity
diff --git a/community/deja-dup/not-check-ubuntuone-couch.patch b/community/deja-dup/not-check-ubuntuone-couch.patch
deleted file mode 100644
index d7fb903a1..000000000
--- a/community/deja-dup/not-check-ubuntuone-couch.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Naur deja-dup-24.0.orig/common/BackendU1.vala deja-dup-24.0/common/BackendU1.vala
---- deja-dup-24.0.orig/common/BackendU1.vala	2012-08-07 00:20:51.000000000 +0200
-+++ deja-dup-24.0/common/BackendU1.vala	2012-11-05 16:39:34.140104977 +0100
-@@ -75,11 +75,14 @@
- 
- class U1Checker : Checker
- {
--  PythonChecker pyu1;
-   construct {
-     try {
-       var proxy = BackendU1.get_creds_proxy();
--      if (proxy.get_name_owner() == null) {
-+      if (proxy.get_name_owner() != null) {
-+        available = true;
-+        complete = true;
-+      }
-+      else {
-         available = false;
-         complete = true;
-       }
-@@ -89,24 +92,6 @@
-       available = false;
-       complete = true;
-     }
--
--    if (!complete) {
--      // A bit of abstraction leakage here; we have to keep these imports in
--      // line with what duplicity uses.  Maybe we should add to duplicity a way
--      // to ask 'can I use this backend?'
--      pyu1 = PythonChecker.get_checker("ubuntuone.platform.credentials, ubuntuone.couch.auth");
--      if (pyu1.complete) {
--        available = pyu1.available;
--        complete = pyu1.complete;
--      }
--      else {
--        pyu1.notify["complete"].connect(() => {
--          available = pyu1.available;
--          complete = pyu1.complete;
--          pyu1 = null;
--        });
--      }
--    }
-   }
- }
- 
diff --git a/community/deja-dup/update-u1-pythonchecker.patch b/community/deja-dup/update-u1-pythonchecker.patch
new file mode 100644
index 000000000..32d55966c
--- /dev/null
+++ b/community/deja-dup/update-u1-pythonchecker.patch
@@ -0,0 +1,13 @@
+=== modified file 'common/BackendU1.vala'
+--- common/BackendU1.vala	2012-11-05 15:10:54 +0000
++++ common/BackendU1.vala	2012-11-05 15:17:28 +0000
+@@ -94,7 +94,7 @@
+       // A bit of abstraction leakage here; we have to keep these imports in
+       // line with what duplicity uses.  Maybe we should add to duplicity a way
+       // to ask 'can I use this backend?'
+-      pyu1 = PythonChecker.get_checker("ubuntuone.platform.credentials, ubuntuone.couch.auth");
++      pyu1 = PythonChecker.get_checker("oauthlib, httplib2");
+       if (pyu1.complete) {
+         available = pyu1.available;
+         complete = pyu1.complete;
+