Merge branch 'testing'

# By James Meyer (1091) and others
# Via James Meyer (5) and others
* testing: (1148 commits)
  LinHES-config: during install don't kill off lirc.  This keeps the remote active all the way to the finish
  Change version numbers to 8.0  to match the release number. LinHES-conifg LinHES-system mythdb-initial runit-scripts supplemental-web
  LinHES-conifig: mv_install.py  for the last partition don't go all the way to the end.  Gotta leave room for gpt tables.
  xf86-video-ati: xorg ati driver.
  LinHES-config: timezip.py  add syncing up of parental lvl passwords and starting level with MBE.
  LinHES-system: correct the logic for breaking out of the wmctrl loop.   As written it would break out of the inner loop..but not the 60 iteration loop.
  e16_theme_settings:  remove slide-in prop for new windows.   For whatever reason this was preventing mplayer from being positioned correctly for appletrailers.
  LinHES-config, mythinstall:  change  case of hd_pvr and   serial to all lower refs #902
  zilog-firmware:   firmware for TX support of the hdpvr and pvr-150 In general I can't recommend anybody using these transmitters  but including the firmware just in case someone really wants to
  linhes-udev-rules:  added hdprv_lirc rule. All of these lirc rules are limited to exactly one device.  If more then one device is present then only the last device in init will get the symlink
  runit-scripts:  fix logging for igdeamon,   add support to remote init script so that the blaster is always the first device in the chain. added support specificly for hd_pvr
  LinHES-system:   add lh_system_restore and lh_system_backup.  These scripts are called from the mythmenu. refs #900
  iguanair: rebuild with python 2.7
  LinHES-system: msg_daemon.py fix  init and nasty bug related to timeout. In a nutshell timeout wouldn't work unless a msg without a timeout was called first.
  linhes-udev-rules:  add rules for mce,streamzap,serial  lirc devices.
  mythinstall: recompile for matching libs
  mythtv:  latest .25-fixes  and change mythbackup/restore call lh_system_$op   to replace mythbackup/mythrestore.  mythbackup no longer works correctly with the new windowmanager
  linhes-scripts: myth2mp3, myth2x264, myth2xvid: use mythutil to get cutlist
  LinHES-config, supplimental-web:  Fix proxy numbering for Ceton infiniTV
  linhes-system:  add additional stuff to the system backup and also introduced an exclude file. The exclude/include files are locate in /home/mythtv/backup_config/
  ...

7 files changed, 64 insertions, 99 deletions

diff --git a/abs/core/avahi/ChangeLog b/abs/core/avahi/ChangeLog
deleted file mode 100644
index 57984a3..0000000
--- a/abs/core/avahi/ChangeLog
+++ /dev/null
@@ -1,17 +0,0 @@
-
-2009-04-23  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 0.6.25
-
-2009-03-21  Eric Belanger  <eric@archlinux.org>
-
-	* Added optdepends for avahi-discover (close FS#11250)
-
-2009-01-04  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 0.6.24
-
-2008-07-22  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 0.6.23
-
diff --git a/abs/core/avahi/PKGBUILD b/abs/core/avahi/PKGBUILD
index 3ab5c8b..424bf2c 100644
--- a/abs/core/avahi/PKGBUILD
+++ b/abs/core/avahi/PKGBUILD
@@ -1,15 +1,18 @@
-# $Id: PKGBUILD 94183 2010-10-05 07:08:54Z bisson $
+# $Id: PKGBUILD 156451 2012-04-18 12:14:05Z bisson $
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=avahi
-pkgver=0.6.27
-pkgrel=8
-pkgdesc='A multicast/unicast DNS-SD framework'
-arch=('i686' 'x86_64')
+pkgver=0.6.31
+pkgrel=3
+pkgdesc='Multicast/unicast DNS-SD framework'
 url='http://www.avahi.org/'
 license=('LGPL')
+arch=('i686' 'x86_64')
+options=('!libtool' '!emptydirs')
 depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm')
-optdepends=('gtk2: avahi-discover-standalone'
+optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
+            'gtk2: gtk2 bindings'
             'qt3: qt3 bindings'
             'qt: qt bindings'
             'pygtk: avahi-bookmarks, avahi-discover'
@@ -17,62 +20,59 @@ optdepends=('gtk2: avahi-discover-standalone'
             'mono: mono bindings'
             'dbus-python: avahi-discover'
             'nss-mdns: NSS support for mDNS')
-makedepends=('qt' 'pygtk' 'mono' 'intltool' 'dbus-python' 'gtk-sharp-2' 'gobject-introspection>=0.9.10')
-backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service)
-install=avahi.install
+makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python'
+             'gtk-sharp-2' 'gobject-introspection' 'gtk3')
+backup=('etc/avahi/hosts'
+        '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=('7e05bd78572c9088b03b1207a0ad5aba38490684'
+          'cf56387c88aed246b9f435efc182ef44de4d52f3'
+          '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9')
+
 conflicts=('howl' 'mdnsresponder')
 provides=('howl' 'mdnsresponder')
-replaces=('howl' 'mdnsresponder')
-options=('!libtool')
-source=(http://www.avahi.org/download/avahi-${pkgver}.tar.gz
-        avahi-daemon-dbus.patch
-        gnome-nettool.png
-        introspection.patch)
-sha1sums=('e763bbeba92fd5b3ba3e2af5fc85aaf99b406c8b'
-          '41e9f23efa0b5a5f7b0f14a86cfb0677ece84c61'
-          'cf56387c88aed246b9f435efc182ef44de4d52f3'
-          '999d71add829ab9bb55262855dfe04126ac7975c')
+
+install=install
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+	cd "${srcdir}/${pkgname}-${pkgver}"
 
-  sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
-  patch -Np0 -i "${srcdir}/avahi-daemon-dbus.patch"
-  patch -Np1 -i "${srcdir}/introspection.patch"
+	sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
+	patch -p1 -i ../rc.d.patch
 
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --disable-gtk3 \
-    --disable-qt3 \
-    --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 \
-    --with-systemdsystemunitdir=/lib/systemd/system # See FS#20999
+	# pygtk requires python2; make it explicit in case other python are installed: FS#21865
+	PYTHON=python2 \
+	PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--disable-static \
+		--disable-monodoc \
+		--enable-compat-libdns_sd \
+		--enable-compat-howl \
+		--with-distro=archlinux \
+		--with-avahi-priv-access-group=network \
+		--with-autoipd-user=avahi \
+		--with-autoipd-group=avahi \
+		--with-systemdsystemunitdir=/usr/lib/systemd/system \
 
-  make || return 1
+	make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install || return 1
-
-  # howl and mdnsresponder compatability
-  cd "${pkgdir}"/usr/include
-  ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h
-  ln -s avahi-compat-howl howl
-  cd "${pkgdir}"/usr/lib/pkgconfig
-  ln -s avahi-compat-howl.pc howl.pc
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+	install -Dm644 ../gnome-nettool.png "${pkgdir}"/usr/share/pixmaps/gnome-nettool.png
 
-  sed -i '1c #!/usr/bin/python2' "$pkgdir"/usr/bin/avahi-{bookmarks,discover}
+	cd "${pkgdir}"
+	sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover}
 
-  install -D -m 644 "${srcdir}"/gnome-nettool.png "${pkgdir}"/usr/share/pixmaps/gnome-nettool.png
+	# 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)
 }
diff --git a/abs/core/avahi/__changelog b/abs/core/avahi/__changelog
index f8fec40..07b29bb 100644
--- a/abs/core/avahi/__changelog
+++ b/abs/core/avahi/__changelog
@@ -1 +1 @@
-disable qt3 in configure and remove make and optdepends on it.
+removed php
diff --git a/abs/core/avahi/avahi-daemon-dbus.patch b/abs/core/avahi/avahi-daemon-dbus.patch
deleted file mode 100644
index a168f03..0000000
--- a/abs/core/avahi/avahi-daemon-dbus.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- initscript/archlinux/avahi-daemon.in	2010-08-17 22:23:46.510293144 +0200
-+++ initscript/archlinux/avahi-daemon.in	2010-08-17 22:46:58.110163026 +0200
-@@ -33,6 +35,8 @@
- 
- case "$1" in
-     start)
-+        ck_daemon dbus && /etc/rc.d/dbus start
-+        modprobe capability &> /dev/null
-         stat_busy "Starting $DESC"
-         $DAEMON -D > /dev/null 2>&1
-         if [ $? -gt 0 ]; then
diff --git a/abs/core/avahi/avahi.install b/abs/core/avahi/install
index 7c75c3d..7c75c3d 100644
--- a/abs/core/avahi/avahi.install
+++ b/abs/core/avahi/install
diff --git a/abs/core/avahi/introspection.patch b/abs/core/avahi/introspection.patch
deleted file mode 100644
index 88a7a73..0000000
--- a/abs/core/avahi/introspection.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -aur avahi-0.6.27/avahi-gobject/AvahiCore-0.6.gir avahi-0.6.27-introspection/avahi-gobject/AvahiCore-0.6.gir
---- avahi-0.6.27/avahi-gobject/AvahiCore-0.6.gir	2010-06-27 02:38:43.018291433 +0200
-+++ avahi-0.6.27-introspection/avahi-gobject/AvahiCore-0.6.gir	2010-09-30 16:16:41.260000339 +0200
-@@ -1,10 +1,12 @@
- <?xml version="1.0"?>
--<repository version="1.0"
-+<repository version="1.2"
-             xmlns="http://www.gtk.org/introspection/core/1.0"
-             xmlns:c="http://www.gtk.org/introspection/c/1.0"
-             xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
-   <namespace name="AvahiCore" version="0.6" shared-library="avahi-core">
--    <alias name="IfIndex" target="int" c:type="AvahiIfIndex"/>
-+    <alias name="IfIndex" target="int">
-+      <type name="AvahiIfIndex" c:type="AvahiIfIndex"/>
-+    </alias>
-     <enumeration name="Protocol" c:type="AvahiProtocol">
-       <member name="inet"
-               value="0"
diff --git a/abs/core/avahi/rc.d.patch b/abs/core/avahi/rc.d.patch
new file mode 100644
index 0000000..fd73573
--- /dev/null
+++ b/abs/core/avahi/rc.d.patch
@@ -0,0 +1,11 @@
+diff -aur old/initscript/archlinux/avahi-daemon.in new/initscript/archlinux/avahi-daemon.in
+--- old/initscript/archlinux/avahi-daemon.in	2011-06-24 03:07:00.916170590 +0200
++++ new/initscript/archlinux/avahi-daemon.in	2011-06-24 03:16:32.220596377 +0200
+@@ -33,6 +33,7 @@
+ 
+ case "$1" in
+     start)
++        ck_daemon dbus && { echo -n "Start dbus first." >&2; stat_die; }
+         stat_busy "Starting $DESC"
+         $DAEMON -D > /dev/null 2>&1
+         if [ $? -gt 0 ]; then