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

1 files changed, 7 insertions, 7 deletions

diff --git a/extra/xf86-input-synaptics/PKGBUILD b/extra/xf86-input-synaptics/PKGBUILD
index aea961639..fba8bfb65 100644
--- a/extra/xf86-input-synaptics/PKGBUILD
+++ b/extra/xf86-input-synaptics/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 201440 2013-12-11 17:08:28Z andyrtr $
+# $Id: PKGBUILD 203606 2014-01-13 17:12:42Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Powalowski  <tpowa@archlinux.org>
 # Contributor: Thomas Bächler <thomas@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xf86-input-synaptics
-pkgver=1.7.2
+pkgver=1.7.3
 pkgrel=1
 pkgdesc="Synaptics driver for notebook touchpads"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libxtst' 'mtdev')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=19' 'libxi' 'libx11' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.14.0' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=20' 'libxi' 'libx11' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.15.0' 'X-ABI-XINPUT_VERSION<20' 'X-ABI-XINPUT_VERSION>=21')
 replaces=('synaptics')
 provides=('synaptics')
 conflicts=('synaptics')
@@ -21,11 +21,11 @@ groups=('xorg-drivers' 'xorg')
 backup=('etc/X11/xorg.conf.d/50-synaptics.conf')
 source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
         add_tapbuttons.diff)
-sha256sums=('63957fa55f0d8662ef8c57f6325155c9884a854554d33921f0738e097f2a7dcd'
+sha256sums=('8b2a972043961195d056b84346317ec42bfa029095c9ee7aaf6deceba12e32d5'
             '5298d3e871db3768b34cf8516d3f53f9291202e2ea5de3300256e1cd9119a1ec')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   
   # * upstream disabled tapping by default if a physical left button is present - see FS#33282
   # * enable MatchDevicePath directive by default - FS#33291
@@ -36,7 +36,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
   install -m644 conf/50-synaptics.conf "${pkgdir}/etc/X11/xorg.conf.d/"