Merge branch 'master' of gparabola:abslibre/abslibre-pre-mips64el

Conflicts:
	community/almanah/PKGBUILD
	community/audit/PKGBUILD
	community/bird/PKGBUILD
	community/blobby2/PKGBUILD
	community/blueman/PKGBUILD
	community/bomberclone/PKGBUILD
	community/botan/PKGBUILD
	community/cantata/PKGBUILD
	community/cinnamon-desktop/PKGBUILD
	community/cinnamon-settings-daemon/PKGBUILD
	community/cinnamon/PKGBUILD
	community/clearsilver/PKGBUILD
	community/clinica/PKGBUILD
	community/confuse/PKGBUILD
	community/deadbeef/PKGBUILD
	community/dvdrtools/PKGBUILD
	community/etl/PKGBUILD
	community/extremetuxracer/PKGBUILD
	community/fcitx-mozc/PKGBUILD
	community/flashrom/PKGBUILD
	community/freedroidrpg/PKGBUILD
	community/gcolor2/PKGBUILD
	community/geary/PKGBUILD
	community/glob2/PKGBUILD
	community/gnash/PKGBUILD
	community/gnome-commander/PKGBUILD
	community/gnome-settings-daemon-updates/PKGBUILD
	community/gnuchess/PKGBUILD
	community/haskell-bytestring-show/PKGBUILD
	community/haskell-hslogger/PKGBUILD
	community/haskell-vector/PKGBUILD
	community/hedgewars/PKGBUILD
	community/hitori/PKGBUILD
	community/inputattach/PKGBUILD
	community/jack2/PKGBUILD
	community/kid3/PKGBUILD
	community/lcdproc/PKGBUILD
	community/libcec/PKGBUILD
	community/libvirt/PKGBUILD
	community/libwww/PKGBUILD
	community/lightdm/PKGBUILD
	community/lincity-ng/PKGBUILD
	community/linux-tools/PKGBUILD
	community/linuxtv-dvb-apps/PKGBUILD
	community/lockdev/PKGBUILD
	community/log4cpp/PKGBUILD
	community/love/PKGBUILD
	community/luajit/PKGBUILD
	community/lxc/PKGBUILD
	community/metamail/PKGBUILD
	community/mingw32-binutils/PKGBUILD
	community/mingw32-gcc/PKGBUILD
	community/mingw32-pthreads/PKGBUILD
	community/mongodb/PKGBUILD
	community/nemo/PKGBUILD
	community/par2cmdline/PKGBUILD
	community/pdfedit/PKGBUILD
	community/perl-json-xs/PKGBUILD
	community/pidgin-talkfilters/PKGBUILD
	community/pokerth/PKGBUILD
	community/setconf/PKGBUILD
	community/stfl/PKGBUILD
	community/talkfilters/PKGBUILD
	community/tre/PKGBUILD
	community/ubuntuone-client-gnome/PKGBUILD
	community/ubuntuone-client/PKGBUILD
	community/vor/PKGBUILD
	community/warmux/PKGBUILD
	community/wdm/PKGBUILD
	community/xbmc-pvr-addons/PKGBUILD
	core/gcc/PKGBUILD
	core/lvm2/PKGBUILD
	core/systemd/PKGBUILD
	core/sysvinit-tools/PKGBUILD
	extra/aubio/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/bluez4/PKGBUILD
	extra/boost/PKGBUILD
	extra/calligra/PKGBUILD
	extra/caribou/PKGBUILD
	extra/chemtool/PKGBUILD
	extra/cinepaint/PKGBUILD
	extra/conky/PKGBUILD
	extra/cups/PKGBUILD
	extra/enlightenment16/PKGBUILD
	extra/exo/PKGBUILD
	extra/fakechroot/PKGBUILD
	extra/farstream-0.1/PKGBUILD
	extra/ffmpeg-compat/PKGBUILD
	extra/fltk/PKGBUILD
	extra/git/PKGBUILD
	extra/gpart/PKGBUILD
	extra/gstreamer0.10-base/PKGBUILD
	extra/gstreamer0.10-ffmpeg/PKGBUILD
	extra/gstreamer0.10-good/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/gtk-vnc/PKGBUILD
	extra/haveged/PKGBUILD
	extra/icewm/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/kactivities/PKGBUILD
	extra/kdeaccessibility-jovie/PKGBUILD
	extra/kdeaccessibility-kaccessible/PKGBUILD
	extra/kdeaccessibility-kmag/PKGBUILD
	extra/kdeaccessibility-kmousetool/PKGBUILD
	extra/kdeaccessibility-kmouth/PKGBUILD
	extra/kdeadmin-kcron/PKGBUILD
	extra/kdeadmin-ksystemlog/PKGBUILD
	extra/kdeadmin-kuser/PKGBUILD
	extra/kdeartwork/PKGBUILD
	extra/kdebase-konsole/PKGBUILD
	extra/kdebase-workspace/PKGBUILD
	extra/kdebase/PKGBUILD
	extra/kdebindings-kimono/PKGBUILD
	extra/kdebindings-korundum/PKGBUILD
	extra/kdebindings-kross/PKGBUILD
	extra/kdebindings-perlkde/PKGBUILD
	extra/kdebindings-perlqt/PKGBUILD
	extra/kdebindings-python/PKGBUILD
	extra/kdebindings-qtruby/PKGBUILD
	extra/kdebindings-qyoto/PKGBUILD
	extra/kdebindings-smokegen/PKGBUILD
	extra/kdebindings-smokekde/PKGBUILD
	extra/kdebindings-smokeqt/PKGBUILD
	extra/kdeedu-analitza/PKGBUILD
	extra/kdeedu-blinken/PKGBUILD
	extra/kdeedu-cantor/PKGBUILD
	extra/kdeedu-kalgebra/PKGBUILD
	extra/kdeedu-kalzium/PKGBUILD
	extra/kdeedu-kanagram/PKGBUILD
	extra/kdeedu-kbruch/PKGBUILD
	extra/kdeedu-kgeography/PKGBUILD
	extra/kdeedu-khangman/PKGBUILD
	extra/kdeedu-kig/PKGBUILD
	extra/kdeedu-kiten/PKGBUILD
	extra/kdeedu-klettres/PKGBUILD
	extra/kdeedu-kmplot/PKGBUILD
	extra/kdeedu-kstars/PKGBUILD
	extra/kdeedu-ktouch/PKGBUILD
	extra/kdeedu-kturtle/PKGBUILD
	extra/kdeedu-kwordquiz/PKGBUILD
	extra/kdeedu-marble/PKGBUILD
	extra/kdeedu-pairs/PKGBUILD
	extra/kdeedu-parley/PKGBUILD
	extra/kdeedu-rocs/PKGBUILD
	extra/kdeedu-step/PKGBUILD
	extra/kdegames-bomber/PKGBUILD
	extra/kdegames-bovo/PKGBUILD
	extra/kdegames-granatier/PKGBUILD
	extra/kdegames-kapman/PKGBUILD
	extra/kdegames-katomic/PKGBUILD
	extra/kdegames-kblackbox/PKGBUILD
	extra/kdegames-kblocks/PKGBUILD
	extra/kdegames-kbounce/PKGBUILD
	extra/kdegames-kbreakout/PKGBUILD
	extra/kdegames-kdiamond/PKGBUILD
	extra/kdegames-kfourinline/PKGBUILD
	extra/kdegames-kgoldrunner/PKGBUILD
	extra/kdegames-kigo/PKGBUILD
	extra/kdegames-killbots/PKGBUILD
	extra/kdegames-kiriki/PKGBUILD
	extra/kdegames-kjumpingcube/PKGBUILD
	extra/kdegames-klickety/PKGBUILD
	extra/kdegames-klines/PKGBUILD
	extra/kdegames-kmahjongg/PKGBUILD
	extra/kdegames-kmines/PKGBUILD
	extra/kdegames-knavalbattle/PKGBUILD
	extra/kdegames-knetwalk/PKGBUILD
	extra/kdegames-kolf/PKGBUILD
	extra/kdegames-kollision/PKGBUILD
	extra/kdegames-konquest/PKGBUILD
	extra/kdegames-kpatience/PKGBUILD
	extra/kdegames-kreversi/PKGBUILD
	extra/kdegames-kshisen/PKGBUILD
	extra/kdegames-ksirk/PKGBUILD
	extra/kdegames-ksnakeduel/PKGBUILD
	extra/kdegames-kspaceduel/PKGBUILD
	extra/kdegames-ksquares/PKGBUILD
	extra/kdegames-ksudoku/PKGBUILD
	extra/kdegames-ktuberling/PKGBUILD
	extra/kdegames-kubrick/PKGBUILD
	extra/kdegames-lskat/PKGBUILD
	extra/kdegames-palapeli/PKGBUILD
	extra/kdegames-picmi/PKGBUILD
	extra/kdegraphics-gwenview/PKGBUILD
	extra/kdegraphics-kamera/PKGBUILD
	extra/kdegraphics-kcolorchooser/PKGBUILD
	extra/kdegraphics-kgamma/PKGBUILD
	extra/kdegraphics-kolourpaint/PKGBUILD
	extra/kdegraphics-kruler/PKGBUILD
	extra/kdegraphics-ksaneplugin/PKGBUILD
	extra/kdegraphics-ksnapshot/PKGBUILD
	extra/kdegraphics-mobipocket/PKGBUILD
	extra/kdegraphics-okular/PKGBUILD
	extra/kdegraphics-strigi-analyzer/PKGBUILD
	extra/kdegraphics-svgpart/PKGBUILD
	extra/kdegraphics-thumbnailers/PKGBUILD
	extra/kdemultimedia-audiocd-kio/PKGBUILD
	extra/kdemultimedia-dragonplayer/PKGBUILD
	extra/kdemultimedia-ffmpegthumbs/PKGBUILD
	extra/kdemultimedia-juk/PKGBUILD
	extra/kdemultimedia-kmix/PKGBUILD
	extra/kdemultimedia-kscd/PKGBUILD
	extra/kdemultimedia-mplayerthumbs/PKGBUILD
	extra/kdenetwork-filesharing/PKGBUILD
	extra/kdenetwork-kdnssd/PKGBUILD
	extra/kdenetwork-kget/PKGBUILD
	extra/kdenetwork-kppp/PKGBUILD
	extra/kdenetwork-krdc/PKGBUILD
	extra/kdenetwork-krfb/PKGBUILD
	extra/kdenetwork-strigi-analyzers/PKGBUILD
	extra/kdepim-runtime/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/kdepimlibs/PKGBUILD
	extra/kdeplasma-addons/PKGBUILD
	extra/kdesdk-cervisia/PKGBUILD
	extra/kdesdk-dev-scripts/PKGBUILD
	extra/kdesdk-dev-utils/PKGBUILD
	extra/kdesdk-dolphin-plugins/PKGBUILD
	extra/kdesdk-kapptemplate/PKGBUILD
	extra/kdesdk-kate/PKGBUILD
	extra/kdesdk-kcachegrind/PKGBUILD
	extra/kdesdk-kioslaves/PKGBUILD
	extra/kdesdk-kompare/PKGBUILD
	extra/kdesdk-lokalize/PKGBUILD
	extra/kdesdk-okteta/PKGBUILD
	extra/kdesdk-poxml/PKGBUILD
	extra/kdesdk-strigi-analyzers/PKGBUILD
	extra/kdesdk-thumbnailers/PKGBUILD
	extra/kdesdk-umbrello/PKGBUILD
	extra/kdetoys-amor/PKGBUILD
	extra/kdetoys-kteatime/PKGBUILD
	extra/kdetoys-ktux/PKGBUILD
	extra/kdeutils-filelight/PKGBUILD
	extra/kdeutils-kcalc/PKGBUILD
	extra/kdeutils-kcharselect/PKGBUILD
	extra/kdeutils-kdf/PKGBUILD
	extra/kdeutils-kfloppy/PKGBUILD
	extra/kdeutils-kgpg/PKGBUILD
	extra/kdeutils-kremotecontrol/PKGBUILD
	extra/kdeutils-ktimer/PKGBUILD
	extra/kdeutils-kwallet/PKGBUILD
	extra/kdeutils-print-manager/PKGBUILD
	extra/kdeutils-superkaramba/PKGBUILD
	extra/kdeutils-sweeper/PKGBUILD
	extra/kdewebdev/PKGBUILD
	extra/kino/PKGBUILD
	extra/libdrm/PKGBUILD
	extra/libiec61883/PKGBUILD
	extra/libkcddb/PKGBUILD
	extra/libkcompactdisc/PKGBUILD
	extra/libkdcraw/PKGBUILD
	extra/libkdeedu/PKGBUILD
	extra/libkdegames/PKGBUILD
	extra/libkexiv2/PKGBUILD
	extra/libkipi/PKGBUILD
	extra/libkmahjongg/PKGBUILD
	extra/libksane/PKGBUILD
	extra/libmikmod/PKGBUILD
	extra/libmp4v2/PKGBUILD
	extra/libnet/PKGBUILD
	extra/libpst/PKGBUILD
	extra/libsidplay/PKGBUILD
	extra/libsigsegv/PKGBUILD
	extra/libvpx/PKGBUILD
	extra/libxmi/PKGBUILD
	extra/lua51/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/maxima/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mjpegtools/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	extra/nepomuk-core/PKGBUILD
	extra/nepomuk-widgets/PKGBUILD
	extra/obexd/PKGBUILD
	extra/opencv/PKGBUILD
	extra/perl-dbd-mysql/PKGBUILD
	extra/phonon-gstreamer/PKGBUILD
	extra/phonon-vlc/PKGBUILD
	extra/phonon/PKGBUILD
	extra/plotutils/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/pycrypto/PKGBUILD
	extra/python/PKGBUILD
	extra/qt4/PKGBUILD
	extra/qt5/PKGBUILD
	extra/rcs/PKGBUILD
	extra/rdesktop/PKGBUILD
	extra/rtmpdump/PKGBUILD
	extra/ruby/PKGBUILD
	extra/signon/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/vigra/PKGBUILD
	extra/vim/PKGBUILD
	extra/vlc/PKGBUILD
	extra/w3m/PKGBUILD
	extra/wcslib/PKGBUILD
	extra/windowmaker/PKGBUILD
	extra/x264/PKGBUILD
	extra/xaos/PKGBUILD
	extra/xmlto/PKGBUILD
	libre/angband-libre/PKGBUILD
	libre/hplip-libre/PKGBUILD
	libre/kdebase-konqueror-libre/PKGBUILD
	libre/kdebase-runtime-libre/PKGBUILD
	libre/kdelibs-libre/PKGBUILD
	libre/kdenetwork-kopete-libre/PKGBUILD
	libre/kdepim-libre/PKGBUILD
	libre/kdeutils-ark-libre/PKGBUILD
	libre/linux-libre/PKGBUILD
	libre/mc-libre/PKGBUILD
	libre/xbmc-libre/PKGBUILD
	nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
	nonprism/kdepim-runtime-nonprism/PKGBUILD
	pcr/libquvi-scripts-current/PKGBUILD

2 files changed, 6 insertions, 82 deletions

diff --git a/community/glabels/PKGBUILD b/community/glabels/PKGBUILD
index b0a2f5db4..d59115a86 100644
--- a/community/glabels/PKGBUILD
+++ b/community/glabels/PKGBUILD
@@ -1,27 +1,23 @@
-# $Id: PKGBUILD 99761 2013-10-30 23:33:09Z allan $
+# $Id: PKGBUILD 101750 2013-11-30 17:42:47Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: yugrotavele <yugrotavele at archlinux dot us>
 # Contributor: Damir Perisa <damir@archlinux.org>
 
 pkgname=glabels
-pkgver=3.0.1
-pkgrel=3
+pkgver=3.2.0
+pkgrel=1
 pkgdesc="Creating labels and business cards the very easy way"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://glabels.org/"
 license=('GPL' 'LGPL')
 depends=('librsvg' 'evolution-data-server' 'qrencode' 'iec16022' 'dconf' 'desktop-file-utils' 'xdg-utils')
-makedepends=('barcode' 'intltool' 'gnome-doc-utils')
+makedepends=('intltool' 'itstool')
 install=$pkgname.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        glabels-3.0.0-new-eds.patch)
-sha256sums=('99810705b9fcb234f085ed4ac6dbea50cc5b232c6d8ca05ab2c0634673fb9bd2'
-            'f02ecf12e10b1d406607bad65f81e53ebd5d56fabe46035a47bd6fe1ec8bf70b')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('c4c5b2c911be7b6513ee5cfeda6cd78434623c24dd741bd29cc3573f90b374c9')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/glabels-3.0.0-new-eds.patch"
-
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
               --disable-static --disable-schemas-compile
   make
@@ -29,6 +25,5 @@ build() {
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-
   make DESTDIR="$pkgdir/" install
 }
diff --git a/community/glabels/glabels-3.0.0-new-eds.patch b/community/glabels/glabels-3.0.0-new-eds.patch
deleted file mode 100644
index 9cae4c076..000000000
--- a/community/glabels/glabels-3.0.0-new-eds.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -up glabels-3.0.0/src/merge-evolution.c.new-eds glabels-3.0.0/src/merge-evolution.c
---- glabels-3.0.0/src/merge-evolution.c.new-eds 2011-04-04 01:02:48.000000000 +0200
-+++ glabels-3.0.0/src/merge-evolution.c 2012-08-29 11:54:20.240577838 +0200
-@@ -29,7 +29,7 @@
- 
- #include "merge-evolution.h"
- 
--#include <libebook/e-book.h>
-+#include <libebook/libebook.h>
- #include <glib/gi18n.h>
- #include <stdio.h>
- #include <string.h>
-@@ -297,6 +297,31 @@ static gint sort_contact_by_file_as(gcon
- /*--------------------------------------------------------------------------*/
- /* Open merge source.                                                       */
- /*--------------------------------------------------------------------------*/
-+static EBook *
-+gl_open_system_addressbook (GError **error)
-+{
-+   ESourceRegistry *registry;
-+   EBook *book = NULL;
-+   ESource *source;
-+
-+   registry = e_source_registry_new_sync (NULL, error);
-+   if (!registry)
-+       return NULL;
-+
-+   source = e_source_registry_ref_builtin_address_book (registry);
-+   if (!source) {
-+       g_object_unref (registry);
-+       return NULL;
-+   }
-+
-+   book = e_book_new (source, error);
-+
-+   g_object_unref (source);
-+   g_object_unref (registry);
-+
-+   return book;
-+}
-+
- static void
- gl_merge_evolution_open (glMerge *merge)
- {
-@@ -317,12 +342,12 @@ gl_merge_evolution_open (glMerge *merge)
-                 return;
-         }
- 
--        merge_evolution->priv->book = e_book_new_system_addressbook(&error);
-+        merge_evolution->priv->book = gl_open_system_addressbook(&error);
-         if (!merge_evolution->priv->book) {
-                 g_warning ("Couldn't open addressbook.");
-                 if (error)
-                 {
--                        g_warning ("e_book_new_system_addressbook: %s", error->message);
-+                        g_warning ("gl_open_system_addressbook: %s", error->message);
-                         g_error_free (error);
-                 }
-                 e_book_query_unref(query);
-diff -up glabels-3.0.0/src/merge-vcard.c.new-eds glabels-3.0.0/src/merge-vcard.c
---- glabels-3.0.0/src/merge-vcard.c.new-eds 2011-04-04 01:02:48.000000000 +0200
-+++ glabels-3.0.0/src/merge-vcard.c 2012-08-29 11:54:20.241577849 +0200
-@@ -27,7 +27,7 @@
- 
- #include "merge-vcard.h"
- 
--#include <libebook/e-contact.h>
-+#include <libebook/libebook.h>
- #include <stdio.h>
- #include <string.h>
- #include <errno.h>