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

Conflicts:
	community/adns/PKGBUILD
	community/afpfs-ng/PKGBUILD
	community/aqbanking/PKGBUILD
	community/arp-scan/PKGBUILD
	community/arpack/PKGBUILD
	community/bind/PKGBUILD
	community/bird/PKGBUILD
	community/cairo-dock/PKGBUILD
	community/cinnamon-control-center/PKGBUILD
	community/commoncpp2/PKGBUILD
	community/cuetools/PKGBUILD
	community/erlang/PKGBUILD
	community/fxdesktop/PKGBUILD
	community/gavl/PKGBUILD
	community/google-gadgets/PKGBUILD
	community/gpicview/PKGBUILD
	community/gtk-aurora-engine/PKGBUILD
	community/icewm-utils/PKGBUILD
	community/inotify-tools/PKGBUILD
	community/jack2/PKGBUILD
	community/judy/PKGBUILD
	community/lash/PKGBUILD
	community/libdlna/PKGBUILD
	community/libgexiv2/PKGBUILD
	community/libgig/PKGBUILD
	community/liblinebreak/PKGBUILD
	community/liblockfile/PKGBUILD
	community/libopenraw/PKGBUILD
	community/librcd/PKGBUILD
	community/librsync/PKGBUILD
	community/libvirt/PKGBUILD
	community/libyaml/PKGBUILD
	community/linux-tools/PKGBUILD
	community/lomoco/PKGBUILD
	community/luasec/PKGBUILD
	community/luasocket/PKGBUILD
	community/lwp/PKGBUILD
	community/lxappearance-obconf/PKGBUILD
	community/lxappearance/PKGBUILD
	community/lxsplit/PKGBUILD
	community/metamail/PKGBUILD
	community/mg/PKGBUILD
	community/nemo-fileroller/PKGBUILD
	community/nsd/PKGBUILD
	community/obby/PKGBUILD
	community/openarena/PKGBUILD
	community/opensc/PKGBUILD
	community/osmo/PKGBUILD
	community/perl-json-xs/PKGBUILD
	community/pyqt3/PKGBUILD
	community/python-pymongo/PKGBUILD
	community/python-pytables/PKGBUILD
	community/qscintilla-qt3/PKGBUILD
	community/qtcurve-gtk2/PKGBUILD
	community/qtcurve-kde4/PKGBUILD
	community/rxvt-unicode/PKGBUILD
	community/smalltalk/PKGBUILD
	community/xmlrpc-c/PKGBUILD
	community/xpad/PKGBUILD
	community/xsettings-client/PKGBUILD
	community/yaws/PKGBUILD
	core/bzip2/PKGBUILD
	core/gcc/PKGBUILD
	core/glibc/PKGBUILD
	core/keyutils/PKGBUILD
	core/ldns/PKGBUILD
	core/libmpc/PKGBUILD
	core/librpcsecgss/PKGBUILD
	core/libtool/PKGBUILD
	core/lvm2/PKGBUILD
	core/lzo2/PKGBUILD
	core/openssl/PKGBUILD
	core/systemd/PKGBUILD
	core/sysvinit-tools/PKGBUILD
	cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
	extra/aalib/PKGBUILD
	extra/aiksaurus/PKGBUILD
	extra/alsa-oss/PKGBUILD
	extra/alsa-tools/PKGBUILD
	extra/apache/PKGBUILD
	extra/autopano-sift-c/PKGBUILD
	extra/avahi/PKGBUILD
	extra/cfitsio/PKGBUILD
	extra/clamav/PKGBUILD
	extra/compface/PKGBUILD
	extra/dotconf/PKGBUILD
	extra/enca/PKGBUILD
	extra/eventlog/PKGBUILD
	extra/exiv2/PKGBUILD
	extra/faad2/PKGBUILD
	extra/fcgi/PKGBUILD
	extra/ffcall/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/flac/PKGBUILD
	extra/fltk/PKGBUILD
	extra/freealut/PKGBUILD
	extra/freetds/PKGBUILD
	extra/gc/PKGBUILD
	extra/gdome2/PKGBUILD
	extra/giblib/PKGBUILD
	extra/gmime/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnome-python-extras/PKGBUILD
	extra/gnome-speech/PKGBUILD
	extra/graphviz/PKGBUILD
	extra/gsasl/PKGBUILD
	extra/gsl/PKGBUILD
	extra/gtkspell/PKGBUILD
	extra/gupnp-igd/PKGBUILD
	extra/htdig/PKGBUILD
	extra/hugin/PKGBUILD
	extra/id3lib/PKGBUILD
	extra/ilmbase/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/iptraf-ng/PKGBUILD
	extra/jade/PKGBUILD
	extra/jasper/PKGBUILD
	extra/kdesdk-thumbnailers/PKGBUILD
	extra/kdevelop-php/PKGBUILD
	extra/lablgtk/PKGBUILD
	extra/lame/PKGBUILD
	extra/lcms2/PKGBUILD
	extra/lesstif/PKGBUILD
	extra/libaio/PKGBUILD
	extra/libart-lgpl/PKGBUILD
	extra/libass/PKGBUILD
	extra/libasyncns/PKGBUILD
	extra/libavc1394/PKGBUILD
	extra/libbluray/PKGBUILD
	extra/libcaca/PKGBUILD
	extra/libcddb/PKGBUILD
	extra/libchamplain/PKGBUILD
	extra/libdca/PKGBUILD
	extra/libdv/PKGBUILD
	extra/libglade/PKGBUILD
	extra/libgtkhtml/PKGBUILD
	extra/libice/PKGBUILD
	extra/libid3tag/PKGBUILD
	extra/libidl2/PKGBUILD
	extra/libieee1284/PKGBUILD
	extra/libjpeg-turbo/PKGBUILD
	extra/liblo/PKGBUILD
	extra/libmad/PKGBUILD
	extra/libmikmod/PKGBUILD
	extra/libmowgli/PKGBUILD
	extra/libmpd/PKGBUILD
	extra/libmpdclient/PKGBUILD
	extra/libofa/PKGBUILD
	extra/liboil/PKGBUILD
	extra/libotf/PKGBUILD
	extra/libpeas/PKGBUILD
	extra/libqalculate/PKGBUILD
	extra/libraw1394/PKGBUILD
	extra/libsndfile/PKGBUILD
	extra/libstroke/PKGBUILD
	extra/libvncserver/PKGBUILD
	extra/libxkbui/PKGBUILD
	extra/libxss/PKGBUILD
	extra/libytnef/PKGBUILD
	extra/libzvt/PKGBUILD
	extra/lynx/PKGBUILD
	extra/lzo/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mhash/PKGBUILD
	extra/musicbrainz/PKGBUILD
	extra/ocaml/PKGBUILD
	extra/openal/PKGBUILD
	extra/openmpi/PKGBUILD
	extra/pavucontrol/PKGBUILD
	extra/perl-dbi/PKGBUILD
	extra/phonon-vlc/PKGBUILD
	extra/phonon/PKGBUILD
	extra/ppl/PKGBUILD
	extra/progsreiserfs/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/pycurl/PKGBUILD
	extra/pyopenssl/PKGBUILD
	extra/pyxml/PKGBUILD
	extra/qt4/PKGBUILD
	extra/qt5/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/schroedinger/PKGBUILD
	extra/sdl_gfx/PKGBUILD
	extra/signon/PKGBUILD
	extra/slang/PKGBUILD
	extra/sofia-sip/PKGBUILD
	extra/spandsp/PKGBUILD
	extra/speech-dispatcher/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/t1lib/PKGBUILD
	extra/taglib/PKGBUILD
	extra/tidyhtml/PKGBUILD
	extra/totem/PKGBUILD
	extra/unixodbc/PKGBUILD
	extra/vigra/PKGBUILD
	extra/virtuoso/PKGBUILD
	extra/wavpack/PKGBUILD
	extra/webkitgtk/PKGBUILD
	extra/webrtc-audio-processing/PKGBUILD
	extra/xfce4-mailwatch-plugin/PKGBUILD
	extra/xine-lib/PKGBUILD
	extra/xmms/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/yajl/PKGBUILD
	extra/yasm/PKGBUILD
	extra/zenity/PKGBUILD
	extra/zziplib/PKGBUILD
	libre/blackbox-libre/PKGBUILD
	libre/linux-libre/PKGBUILD
	libre/sdl-libre/PKGBUILD

1 files changed, 195 insertions, 0 deletions

diff --git a/extra/gegl/gegl-0.2.0-remove-src-over-op.patch b/extra/gegl/gegl-0.2.0-remove-src-over-op.patch
new file mode 100644
index 000000000..a823580fd
--- /dev/null
+++ b/extra/gegl/gegl-0.2.0-remove-src-over-op.patch
@@ -0,0 +1,195 @@
+From 72168aba34445e4cd99aaed32d8e6a80e89ce729 Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils@redhat.com>
+Date: Mon, 1 Jul 2013 13:53:18 +0200
+Subject: [PATCH] patch: remove-src-over-op
+
+Squashed commit of the following:
+
+commit b766094d951bf1515a75408ee85d4e1af432e6bd
+Author: Daniel Sabo <DanielSabo@gmail.com>
+Date:   Tue Jun 4 20:57:03 2013 -0700
+
+    Remove auto-generated svg:src-over
+
+    It was already shadowed by gegl:over, which declares
+    svg:src-over as a compat-name.
+
+    (cherry picked from commit c1caf2401271e8a17fd1937bf84279c250bd8e2a)
+
+    Conflicts:
+    	po/POTFILES.in
+---
+ operations/generated/src-over.c            | 122 -----------------------------
+ operations/generated/svg-12-porter-duff.rb |   5 +-
+ po/POTFILES.in                             |   3 +-
+ 3 files changed, 4 insertions(+), 126 deletions(-)
+ delete mode 100644 operations/generated/src-over.c
+
+diff --git a/operations/generated/src-over.c b/operations/generated/src-over.c
+deleted file mode 100644
+index e586087..0000000
+--- a/operations/generated/src-over.c
++++ /dev/null
+@@ -1,122 +0,0 @@
+-
+-/* !!!! AUTOGENERATED FILE generated by svg-12-porter-duff.rb !!!!!
+- *
+- * This file is an image processing operation for GEGL
+- *
+- * GEGL is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 3 of the License, or (at your option) any later version.
+- *
+- * GEGL is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General Public
+- * License along with GEGL; if not, see <http://www.gnu.org/licenses/>.
+- *
+- *  Copyright 2006, 2007 Øyvind Kolås <pippin@gimp.org>
+- *            2007 John Marshall
+- *
+- * SVG rendering modes; see:
+- *     http://www.w3.org/TR/SVG12/rendering.html
+- *     http://www.w3.org/TR/2004/WD-SVG12-20041027/rendering.html#comp-op-prop
+- *
+- *     aA = aux(src) alpha      aB = in(dst) alpha      aD = out alpha
+- *     cA = aux(src) colour     cB = in(dst) colour     cD = out colour
+- *
+- * !!!! AUTOGENERATED FILE !!!!!
+- */
+-#include "config.h"
+-#include <glib/gi18n-lib.h>
+-
+-
+-#ifdef GEGL_CHANT_PROPERTIES
+-
+-/* no properties */
+-
+-#else
+-
+-#define GEGL_CHANT_TYPE_POINT_COMPOSER
+-#define GEGL_CHANT_C_FILE        "src-over.c"
+-
+-#include "gegl-chant.h"
+-
+-static void prepare (GeglOperation *operation)
+-{
+-  const Babl *format = babl_format ("RaGaBaA float");
+-
+-  gegl_operation_set_format (operation, "input", format);
+-  gegl_operation_set_format (operation, "aux", format);
+-  gegl_operation_set_format (operation, "output", format);
+-}
+-
+-static gboolean
+-process (GeglOperation        *op,
+-          void                *in_buf,
+-          void                *aux_buf,
+-          void                *out_buf,
+-          glong                n_pixels,
+-          const GeglRectangle *roi,
+-          gint                 level)
+-{
+-  gint i;
+-  gfloat * GEGL_ALIGNED in = in_buf;
+-  gfloat * GEGL_ALIGNED aux = aux_buf;
+-  gfloat * GEGL_ALIGNED out = out_buf;
+-
+-  if (aux==NULL)
+-    return TRUE;
+-
+-  for (i = 0; i < n_pixels; i++)
+-    {
+-      gint   j;
+-      gfloat aA G_GNUC_UNUSED, aB G_GNUC_UNUSED, aD G_GNUC_UNUSED;
+-
+-      aB = in[3];
+-      aA = aux[3];
+-      aD = aA + aB - aA * aB;
+-
+-      for (j = 0; j < 3; j++)
+-        {
+-          gfloat cA G_GNUC_UNUSED, cB G_GNUC_UNUSED;
+-
+-          cB = in[j];
+-          cA = aux[j];
+-          out[j] = cA + cB * (1.0f - aA);
+-        }
+-      out[3] = aD;
+-      in  += 4;
+-      aux += 4;
+-      out += 4;
+-    }
+-  return TRUE;
+-}
+-
+-
+-static void
+-gegl_chant_class_init (GeglChantClass *klass)
+-{
+-  GeglOperationClass              *operation_class;
+-  GeglOperationPointComposerClass *point_composer_class;
+-
+-  operation_class      = GEGL_OPERATION_CLASS (klass);
+-  point_composer_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
+-
+-  point_composer_class->process = process;
+-  operation_class->prepare = prepare;
+-
+-
+-  operation_class->compat_name = "gegl:src-over";
+-  gegl_operation_class_set_keys (operation_class,
+-    "name"      , "svg:src-over",
+-    "categories", "compositors:porter-duff",
+-    "description",
+-        _("Porter Duff operation src-over (d = cA + cB * (1.0f - aA))"),
+-        NULL);
+- 
+-
+-}
+-
+-#endif
+diff --git a/operations/generated/svg-12-porter-duff.rb b/operations/generated/svg-12-porter-duff.rb
+index 5516802..dab5d2f 100755
+--- a/operations/generated/svg-12-porter-duff.rb
++++ b/operations/generated/svg-12-porter-duff.rb
+@@ -1,4 +1,5 @@
+ #!/usr/bin/env ruby
++# encoding: utf-8
+ 
+ copyright = '
+ /* !!!! AUTOGENERATED FILE generated by svg-12-porter-duff.rb !!!!!
+@@ -38,8 +39,8 @@ a = [
+                         'aA'],
+       ['dst',           'cB',
+                         'aB'],
+-      ['src_over',      'cA + cB * (1.0f - aA)',
+-                        'aA + aB - aA * aB'],
++#      ['src_over',      'cA + cB * (1.0f - aA)',
++#                        'aA + aB - aA * aB'],
+       ['dst_over',      'cB + cA * (1.0f - aB)',
+                         'aA + aB - aA * aB'],
+       ['dst_in',        'cB * aA', # <- XXX: typo?
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index e309594..d36cbc2 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -115,10 +115,9 @@ operations/generated/plus.c
+ operations/generated/screen.c
+ operations/generated/soft-light.c
+ operations/generated/src-atop.c
++operations/generated/src.c
+ operations/generated/src-in.c
+ operations/generated/src-out.c
+-operations/generated/src-over.c
+-operations/generated/src.c
+ operations/generated/subtract.c
+ operations/generated/svg-multiply.c
+ operations/generated/xor.c
+-- 
+1.8.3.1
+