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

Conflicts:
	community/acpi/PKGBUILD
	community/alure/PKGBUILD
	community/ario/PKGBUILD
	community/cantata/PKGBUILD
	community/cgit/PKGBUILD
	community/chntpw/PKGBUILD
	community/clamz/PKGBUILD
	community/deadbeef/PKGBUILD
	community/dunst/PKGBUILD
	community/erlang/PKGBUILD
	community/ettercap/PKGBUILD
	community/fcitx-mozc/PKGBUILD
	community/gnome-commander/PKGBUILD
	community/gq/PKGBUILD
	community/gtkimageview/PKGBUILD
	community/i3status/PKGBUILD
	community/iasl/PKGBUILD
	community/krename/PKGBUILD
	community/libesmtp/PKGBUILD
	community/liblinebreak/PKGBUILD
	community/libmilter/PKGBUILD
	community/libpaper/PKGBUILD
	community/libvirt/PKGBUILD
	community/libx86emu/PKGBUILD
	community/libxdg-basedir/PKGBUILD
	community/lightdm-gtk2-greeter/PKGBUILD
	community/lightdm-gtk3-greeter/PKGBUILD
	community/lightdm/PKGBUILD
	community/luakit/PKGBUILD
	community/lxtask/PKGBUILD
	community/marisa/PKGBUILD
	community/megaglest/PKGBUILD
	community/mumble/PKGBUILD
	community/opencolorio/PKGBUILD
	community/openssh-askpass/PKGBUILD
	community/pdf2svg/PKGBUILD
	community/pidgin-toobars/PKGBUILD
	community/powerdns/PKGBUILD
	community/python-numexpr/PKGBUILD
	community/python-pybox2d/PKGBUILD
	community/python-pytables/PKGBUILD
	community/python2-imaging/PKGBUILD
	community/python2-pybluez/PKGBUILD
	community/remmina/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	community/ruby-iconv/PKGBUILD
	community/scummvm-tools/PKGBUILD
	community/shapelib/PKGBUILD
	community/sshfs/PKGBUILD
	community/subtle/PKGBUILD
	community/teeworlds/PKGBUILD
	community/uget/PKGBUILD
	community/wireshark/PKGBUILD
	community/wxcam/PKGBUILD
	community/wxgtk2.9/PKGBUILD
	community/xchm/PKGBUILD
	community/xdelta3/PKGBUILD
	community/zynaddsubfx/PKGBUILD
	core/gcc/PKGBUILD
	core/gcc/gcc_mips64el_lib.patch
	core/gdbm/PKGBUILD
	core/ldns/PKGBUILD
	core/pth/PKGBUILD
	core/systemd/PKGBUILD
	core/wireless_tools/PKGBUILD
	elementary/gtk-engine-equinox/PKGBUILD
	elementary/postler/PKGBUILD
	elementary/vala-010/PKGBUILD
	extra/aubio/PKGBUILD
	extra/audacity/PKGBUILD
	extra/bc/PKGBUILD
	extra/cagibi/PKGBUILD
	extra/calligra/PKGBUILD
	extra/chmlib/PKGBUILD
	extra/clamav/PKGBUILD
	extra/clisp/PKGBUILD
	extra/crypto++/PKGBUILD
	extra/cups/PKGBUILD
	extra/dhcp/PKGBUILD
	extra/ecore/PKGBUILD
	extra/edje/PKGBUILD
	extra/eet/PKGBUILD
	extra/eeze/PKGBUILD
	extra/efreet/PKGBUILD
	extra/eina/PKGBUILD
	extra/eio/PKGBUILD
	extra/embryo/PKGBUILD
	extra/emotion/PKGBUILD
	extra/enlightenment17/PKGBUILD
	extra/ethumb/PKGBUILD
	extra/evas/PKGBUILD
	extra/festival/PKGBUILD
	extra/ffcall/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/git/PKGBUILD
	extra/gmetadom/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/graphviz/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/gtkmathview/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/hugin/PKGBUILD
	extra/i8kutils/PKGBUILD
	extra/id3lib/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/jack/PKGBUILD
	extra/ktorrent/PKGBUILD
	extra/libaccounts-qt/PKGBUILD
	extra/libdvdnav/PKGBUILD
	extra/libdvdread/PKGBUILD
	extra/libetpan/PKGBUILD
	extra/libgadu/PKGBUILD
	extra/libmikmod/PKGBUILD
	extra/libpst/PKGBUILD
	extra/libsecret/PKGBUILD
	extra/libssh/PKGBUILD
	extra/libvorbis/PKGBUILD
	extra/lilv/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/maxima/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	extra/msmtp/PKGBUILD
	extra/obex-data-server/PKGBUILD
	extra/openbabel/PKGBUILD
	extra/opencv/PKGBUILD
	extra/opengtl/PKGBUILD
	extra/perl-net-dns/PKGBUILD
	extra/perl-socket6/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/poppler/PKGBUILD
	extra/postfix/PKGBUILD
	extra/purple-plugin-pack/PKGBUILD
	extra/pycurl/PKGBUILD
	extra/python-geoip/PKGBUILD
	extra/qt5/PKGBUILD
	extra/redland/PKGBUILD
	extra/ruby/PKGBUILD
	extra/shared-mime-info/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/texmacs/PKGBUILD
	extra/v4l-utils/PKGBUILD
	extra/vigra/PKGBUILD
	extra/vim/PKGBUILD
	extra/wildmidi/PKGBUILD
	extra/wxpython/PKGBUILD
	extra/x2goclient/PKGBUILD
	extra/xf86-video-siliconmotion/0001-Remove-miInitializeBackingStore.patch
	extra/xf86-video-siliconmotion/PKGBUILD
	extra/xfce4-taskmanager/PKGBUILD
	extra/xine-lib/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xsane/PKGBUILD
	extra/zsh/PKGBUILD
	libre-testing/unace-libre/PKGBUILD
	libre/abuse-libre/PKGBUILD
	libre/audacity-libre/PKGBUILD
	libre/audex-libre/PKGBUILD
	libre/blackbox-libre/PKGBUILD
	libre/bogofilter-libre/PKGBUILD
	libre/bumblebee-libre/PKGBUILD
	libre/crosstool-ng/PKGBUILD
	libre/dvdrip-libre/PKGBUILD
	libre/ecasound-libre/PKGBUILD
	libre/enscript/PKGBUILD
	libre/epdfview-libre/PKGBUILD
	libre/hardinfo/PKGBUILD
	libre/kile-libre/PKGBUILD
	libre/lesspipe-libre/PKGBUILD
	libre/libquicktime-libre/PKGBUILD
	libre/linux-libre-tools/PKGBUILD
	libre/linux-libre/PKGBUILD
	libre/mc-libre/PKGBUILD
	libre/mesa-demos-libre/PKGBUILD
	libre/midori-libre/PKGBUILD
	libre/oss-libre/PKGBUILD
	libre/p7zip-libre/PKGBUILD
	libre/python2-reportlab-libre/PKGBUILD
	libre/sdl-libre/PKGBUILD
	libre/seamonkey-libre/PKGBUILD
	libre/unzip-libre/PKGBUILD
	libre/xarchiver-libre/PKGBUILD
	libre/xmlstarlet/PKGBUILD
	pcr/a2jmidid/PKGBUILD
	pcr/amsynth/PKGBUILD
	pcr/anyremote/PKGBUILD
	pcr/azr3-jack/PKGBUILD
	pcr/bambus/PKGBUILD
	pcr/bamf2/PKGBUILD
	pcr/barnyard2/PKGBUILD
	pcr/bison++/PKGBUILD
	pcr/bup/PKGBUILD
	pcr/din/PKGBUILD
	pcr/django-tagging/PKGBUILD
	pcr/doxymacs/PKGBUILD
	pcr/emacs-js2-mode/PKGBUILD
	pcr/eterm/PKGBUILD
	pcr/frame/PKGBUILD
	pcr/freeipmi/PKGBUILD
	pcr/geis/PKGBUILD
	pcr/ginn/PKGBUILD
	pcr/grail/PKGBUILD
	pcr/libast/PKGBUILD
	pcr/libdshconfig/PKGBUILD
	pcr/networkmanager-openswan/PKGBUILD
	pcr/networkmanager-strongswan/PKGBUILD
	pcr/openswan/PKGBUILD
	pcr/par/PKGBUILD
	pcr/snort/PKGBUILD
	pcr/strongswan/PKGBUILD
	social/batctl/PKGBUILD
	social/bip/PKGBUILD
	social/bitcoin-daemon/PKGBUILD
	social/dropbear/PKGBUILD
	social/ffingerd/PKGBUILD
	social/haveged/PKGBUILD
	social/inadyn-opendns/PKGBUILD
	social/liblockfile/PKGBUILD
	social/libowfat/PKGBUILD
	social/lockfile-progs/PKGBUILD
	social/netatalk/PKGBUILD
	social/olsrd/PKGBUILD
	social/poco/PKGBUILD
	social/spectrum/PKGBUILD
	social/squirm/PKGBUILD
	social/tokyotyrant/PKGBUILD
	social/tomoyo-tools/PKGBUILD

2 files changed, 14 insertions, 37 deletions

diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD
index d648d2d5b..89e42554d 100644
--- a/extra/graphviz/PKGBUILD
+++ b/extra/graphviz/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 198050 2013-10-30 12:29:51Z allan $
+# $Id: PKGBUILD 205075 2014-02-04 11:31:25Z heftig $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=graphviz
-pkgver=2.34.0
+pkgver=2.36.0
 pkgrel=2
 pkgdesc='Graph visualization software'
 url='http://www.graphviz.org/'
 license=('CPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts')
-makedepends=('swig' 'guile' 'lua51' 'ocaml' 'perl' 'php' 'python2' 'ruby' 'tk' 'qt4')
+makedepends=('swig' 'guile' 'lua51' 'ocaml' 'perl' 'php' 'python2' 'tk' 'qt4' 'gtk2')
 optdepends=('guile: guile bindings'
             'lua51: lua bindings'
             'ocaml: ocaml bindings'
@@ -20,29 +20,21 @@ optdepends=('guile: guile bindings'
             'python2: python bindings'
             'ruby: ruby bindings'
             'tcl: tcl bindings'
-            'qt4: gvedit')
+            'qt4: gvedit'
+            'gtk2: gtk output plugin')
 if [ "$CARCH" != "mips64el" ]; then
   makedepends+=('mono' 'r')
   optdepends+=('mono: sharp bindings'
                'r: r bindings')
 fi
-source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz"
-        'dotty.patch')
-sha1sums=('5a0c00bebe7f4c7a04523db21f40966dc9f0d441'
-          '31bc9f505c8b6470289a0d6ec31c237765cba239')
+source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('a41e9f1cbcc9a24651e14dd15a4cda3d912d7d19')
 
 install=install
 
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../dotty.patch
-	sed \
-		-e '/LIBPOSTFIX="64"/d' \
-		-i configure
-}
-
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+	export LIBPOSTFIX=/
 	export PYTHON=python2
 	export LUA=lua5.1
 
@@ -53,4 +45,10 @@ build() {
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
+
+	# Workaround symlink upgrade bug (fixed in pacman trunk)
+	# Also deduplicates the tcl libraries (upstream bug?)
+	# Might have been this commit: https://github.com/ellson/graphviz/commit/f11aead
+	rm -r "${pkgdir}/usr/lib/tcl8.6/graphviz"
+	ln -s ../graphviz/tcl "$pkgdir/usr/lib/tcl8.6/graphviz"
 }
diff --git a/extra/graphviz/dotty.patch b/extra/graphviz/dotty.patch
deleted file mode 100644
index 7c8ca1d7f..000000000
--- a/extra/graphviz/dotty.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur old/cmd/dotty/dotty_layout.lefty new/cmd/dotty/dotty_layout.lefty
---- old/cmd/dotty/dotty_layout.lefty	2013-09-06 15:07:52.000000000 -1000
-+++ new/cmd/dotty/dotty_layout.lefty	2013-10-22 15:23:50.153028328 -1000
-@@ -5,7 +5,7 @@
-     local fd;
- 
-     if (~dotty.lservers[lserver] | tablesize (dotty.lservers[lserver]) == 0) {
--        if (~((fd = openio ('pipe', lserver, 'r+', '%e -Txdot')) >= 0)) {
-+        if (~((fd = openio ('pipe', lserver, 'r+', '%e -Txdot1.2')) >= 0)) {
-             dotty.message (0, concat ('cannot start ', lserver));
-             return null;
-         }
-@@ -438,6 +438,8 @@
-             }
-         } else if (t[i] == 'I') {
-             i = i + 7;
-+        } else if (t[i] == 't') {
-+            i = i + 2;
-         } else {
-             dotty.message (0, concat ('draw language parser error: ', t[i]));
-             return null;