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

Conflicts:
	community/arp-scan/PKGBUILD
	community/curlftpfs/PKGBUILD
	community/dtach/PKGBUILD
	community/espeakup/PKGBUILD
	community/g2sc/PKGBUILD
	community/judy/PKGBUILD
	community/python-fuse/PKGBUILD
	community/sisctrl/PKGBUILD
	extra/avahi/PKGBUILD
	extra/kdesdk/PKGBUILD
	extra/nasm/PKGBUILD
	multilib/lib32-p11-kit/PKGBUILD
	multilib/lib32-pixman/PKGBUILD
	testing/xf86-input-synaptics/PKGBUILD

1 files changed, 23 insertions, 21 deletions

diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD
index f3da8fc19..fb4888e63 100644
--- a/extra/avahi/PKGBUILD
+++ b/extra/avahi/PKGBUILD
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD 148680 2012-02-05 11:46:41Z ibiru $
+# $Id: PKGBUILD 150782 2012-02-22 03:38:27Z bisson $
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=avahi
-pkgver=0.6.30
-pkgrel=7
-pkgdesc='A multicast/unicast DNS-SD framework'
-arch=('i686' 'x86_64' 'mips64el')
+pkgver=0.6.31
+pkgrel=1
+pkgdesc='Multicast/unicast DNS-SD framework'
 url='http://www.avahi.org/'
 license=('LGPL')
+arch=('i686' 'x86_64' 'mips64el')
+options=('!libtool' '!emptydirs')
 depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm')
 [ "$CARCH" = "mips64el" ] || {
 optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
@@ -23,7 +24,6 @@ optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
 makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python'
              'gtk-sharp-2' 'gobject-introspection' 'gtk3')
 }
-
 [ "$CARCH" = "mips64el" ] && {
 optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
             'gtk2: gtk2 bindings'
@@ -33,26 +33,29 @@ optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
             'dbus-python: avahi-discover'
             'nss-mdns: NSS support for mDNS')
 makedepends=('qt' 'pygtk' 'intltool' 'dbus-python'
-             'gobject-introspection' 'gtk3')
+            'gobject-introspection' 'gtk3')
 }
-backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service)
-install=install
-conflicts=('howl' 'mdnsresponder')
-provides=('howl' 'mdnsresponder')
-replaces=('howl' 'mdnsresponder')
-options=('!libtool')
+backup=('etc/avahi/avahi-daemon.conf'
+        'etc/avahi/services/ssh.service'
+        'etc/avahi/services/sftp-ssh.service')
 source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz"
         'gnome-nettool.png'
         'rc.d.patch')
-sha1sums=('5b77443537600a00770e4c77e3c443eeb5861d06'
+sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684'
           'cf56387c88aed246b9f435efc182ef44de4d52f3'
           '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9')
 
+conflicts=('howl' 'mdnsresponder')
+provides=('howl' 'mdnsresponder')
+replaces=('howl' 'mdnsresponder')
+
+install=install
+
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
 	sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
-	patch -p1 -i "../rc.d.patch"
+	patch -p1 -i ../rc.d.patch
 
   [ "$CARCH" = "mips64el" ] && \
     extra="--disable-qt3 --disable-mono"
@@ -60,22 +63,20 @@ build() {
 	# pygtk requires python2; make it explicit in case other python are installed: FS#21865
 	PYTHON=python2 \
 	PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \
-		./configure \
+	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--disable-static \
 		--disable-monodoc \
-		--disable-doxygen-doc \
-		--disable-xmltoman \
 		--enable-compat-libdns_sd \
 		--enable-compat-howl \
 		--with-distro=archlinux \
 		--with-avahi-priv-access-group=network \
 		--with-autoipd-user=avahi \
 		--with-autoipd-group=avahi \
-    $extra \
-		--with-systemdsystemunitdir=/lib/systemd/system # See FS#20999
+        $extra \
+		--with-systemdsystemunitdir=/lib/systemd/system \
 
 	make
 }
@@ -83,10 +84,11 @@ build() {
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
-	install -D -m 644 ../gnome-nettool.png "${pkgdir}"/usr/share/pixmaps/gnome-nettool.png
+	install -Dm644 ../gnome-nettool.png "${pkgdir}"/usr/share/pixmaps/gnome-nettool.png
 
 	cd "${pkgdir}"
 	sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover}
+
 	# howl and mdnsresponder compatability
 	(cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl)
 	(cd usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc)