avahi 0.6.30-3 split avahi-gtk 0.6.30-1 et avahi-qt4 0.6.30-1 + correction deps

4 files changed, 11 insertions, 99 deletions

diff --git a/avahi/.footprint.i686 b/avahi/.footprint.i686
index beeec7a..46ea540 100644
--- a/avahi/.footprint.i686
+++ b/avahi/.footprint.i686
@@ -16,8 +16,6 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/avahi-bookmarks
 -rwxr-xr-x	root/root	usr/bin/avahi-browse
 lrwxrwxrwx	root/root	usr/bin/avahi-browse-domains -> avahi-browse
--rwxr-xr-x	root/root	usr/bin/avahi-discover
--rwxr-xr-x	root/root	usr/bin/avahi-discover-standalone
 -rwxr-xr-x	root/root	usr/bin/avahi-publish
 lrwxrwxrwx	root/root	usr/bin/avahi-publish-address -> avahi-publish
 lrwxrwxrwx	root/root	usr/bin/avahi-publish-service -> avahi-publish
@@ -25,9 +23,6 @@ lrwxrwxrwx	root/root	usr/bin/avahi-publish-service -> avahi-publish
 lrwxrwxrwx	root/root	usr/bin/avahi-resolve-address -> avahi-resolve
 lrwxrwxrwx	root/root	usr/bin/avahi-resolve-host-name -> avahi-resolve
 -rwxr-xr-x	root/root	usr/bin/avahi-set-host-name
-lrwxrwxrwx	root/root	usr/bin/bshell -> bssh
--rwxr-xr-x	root/root	usr/bin/bssh
-lrwxrwxrwx	root/root	usr/bin/bvnc -> bssh
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/avahi-client/
 -rw-r--r--	root/root	usr/include/avahi-client/client.h
@@ -92,10 +87,6 @@ drwxr-xr-x	root/root	usr/include/avahi-gobject/
 -rw-r--r--	root/root	usr/include/avahi-gobject/ga-record-browser.h
 -rw-r--r--	root/root	usr/include/avahi-gobject/ga-service-browser.h
 -rw-r--r--	root/root	usr/include/avahi-gobject/ga-service-resolver.h
-drwxr-xr-x	root/root	usr/include/avahi-qt4/
--rw-r--r--	root/root	usr/include/avahi-qt4/qt-watch.h
-drwxr-xr-x	root/root	usr/include/avahi-ui/
--rw-r--r--	root/root	usr/include/avahi-ui/avahi-ui.h
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/avahi/
 -rw-r--r--	root/root	usr/lib/avahi/service-types.db
@@ -127,21 +118,6 @@ lrwxrwxrwx	root/root	usr/lib/libavahi-glib.so.1 -> libavahi-glib.so.1.0.2
 lrwxrwxrwx	root/root	usr/lib/libavahi-gobject.so -> libavahi-gobject.so.0.0.4
 lrwxrwxrwx	root/root	usr/lib/libavahi-gobject.so.0 -> libavahi-gobject.so.0.0.4
 -rwxr-xr-x	root/root	usr/lib/libavahi-gobject.so.0.0.4
--rw-r--r--	root/root	usr/lib/libavahi-qt4.a
--rwxr-xr-x	root/root	usr/lib/libavahi-qt4.la
-lrwxrwxrwx	root/root	usr/lib/libavahi-qt4.so -> libavahi-qt4.so.1.0.2
-lrwxrwxrwx	root/root	usr/lib/libavahi-qt4.so.1 -> libavahi-qt4.so.1.0.2
--rwxr-xr-x	root/root	usr/lib/libavahi-qt4.so.1.0.2
--rw-r--r--	root/root	usr/lib/libavahi-ui-gtk3.a
--rwxr-xr-x	root/root	usr/lib/libavahi-ui-gtk3.la
-lrwxrwxrwx	root/root	usr/lib/libavahi-ui-gtk3.so -> libavahi-ui-gtk3.so.0.1.4
-lrwxrwxrwx	root/root	usr/lib/libavahi-ui-gtk3.so.0 -> libavahi-ui-gtk3.so.0.1.4
--rwxr-xr-x	root/root	usr/lib/libavahi-ui-gtk3.so.0.1.4
--rw-r--r--	root/root	usr/lib/libavahi-ui.a
--rwxr-xr-x	root/root	usr/lib/libavahi-ui.la
-lrwxrwxrwx	root/root	usr/lib/libavahi-ui.so -> libavahi-ui.so.0.1.4
-lrwxrwxrwx	root/root	usr/lib/libavahi-ui.so.0 -> libavahi-ui.so.0.1.4
--rwxr-xr-x	root/root	usr/lib/libavahi-ui.so.0.1.4
 -rw-r--r--	root/root	usr/lib/libdns_sd.a
 -rwxr-xr-x	root/root	usr/lib/libdns_sd.la
 lrwxrwxrwx	root/root	usr/lib/libdns_sd.so -> libdns_sd.so.1.0.0
@@ -159,9 +135,6 @@ drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/avahi-core.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/avahi-glib.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/avahi-gobject.pc
--rw-r--r--	root/root	usr/lib/pkgconfig/avahi-qt4.pc
--rw-r--r--	root/root	usr/lib/pkgconfig/avahi-ui-gtk3.pc
--rw-r--r--	root/root	usr/lib/pkgconfig/avahi-ui.pc
 drwxr-xr-x	root/root	usr/lib/python2.7/
 drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/
 drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/avahi/
@@ -169,19 +142,11 @@ drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/avahi/
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/avahi/__init__.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/avahi/__init__.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/avahi/__init__.pyo
-drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/avahi_discover/
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/avahi_discover/__init__.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/avahi_discover/__init__.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/avahi_discover/__init__.pyo
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
--rw-r--r--	root/root	usr/share/applications/avahi-discover.desktop
--rw-r--r--	root/root	usr/share/applications/bssh.desktop
--rw-r--r--	root/root	usr/share/applications/bvnc.desktop
 drwxr-xr-x	root/root	usr/share/avahi/
 -rw-r--r--	root/root	usr/share/avahi/avahi-service.dtd
 drwxr-xr-x	root/root	usr/share/avahi/interfaces/
--rw-r--r--	root/root	usr/share/avahi/interfaces/avahi-discover.ui
 -rw-r--r--	root/root	usr/share/avahi/service-types
 drwxr-xr-x	root/root	usr/share/dbus-1/
 drwxr-xr-x	root/root	usr/share/dbus-1/interfaces/
@@ -208,7 +173,6 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/avahi-bookmarks.1.gz
 lrwxrwxrwx	root/root	usr/share/man/man1/avahi-browse-domains.1.gz -> avahi-browse.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/avahi-browse.1.gz
--rw-r--r--	root/root	usr/share/man/man1/avahi-discover.1.gz
 lrwxrwxrwx	root/root	usr/share/man/man1/avahi-publish-address.1.gz -> avahi-publish.1.gz
 lrwxrwxrwx	root/root	usr/share/man/man1/avahi-publish-service.1.gz -> avahi-publish.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/avahi-publish.1.gz
@@ -216,8 +180,6 @@ lrwxrwxrwx	root/root	usr/share/man/man1/avahi-resolve-address.1.gz -> avahi-reso
 lrwxrwxrwx	root/root	usr/share/man/man1/avahi-resolve-host-name.1.gz -> avahi-resolve.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/avahi-resolve.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/avahi-set-host-name.1.gz
--rw-r--r--	root/root	usr/share/man/man1/bssh.1.gz
-lrwxrwxrwx	root/root	usr/share/man/man1/bvnc.1.gz -> bssh.1.gz
 drwxr-xr-x	root/root	usr/share/man/man5/
 -rw-r--r--	root/root	usr/share/man/man5/avahi-daemon.conf.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/avahi.hosts.5.gz
diff --git a/avahi/.footprint.x86_64 b/avahi/.footprint.x86_64
index beeec7a..46ea540 100644
--- a/avahi/.footprint.x86_64
+++ b/avahi/.footprint.x86_64
@@ -16,8 +16,6 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/avahi-bookmarks
 -rwxr-xr-x	root/root	usr/bin/avahi-browse
 lrwxrwxrwx	root/root	usr/bin/avahi-browse-domains -> avahi-browse
--rwxr-xr-x	root/root	usr/bin/avahi-discover
--rwxr-xr-x	root/root	usr/bin/avahi-discover-standalone
 -rwxr-xr-x	root/root	usr/bin/avahi-publish
 lrwxrwxrwx	root/root	usr/bin/avahi-publish-address -> avahi-publish
 lrwxrwxrwx	root/root	usr/bin/avahi-publish-service -> avahi-publish
@@ -25,9 +23,6 @@ lrwxrwxrwx	root/root	usr/bin/avahi-publish-service -> avahi-publish
 lrwxrwxrwx	root/root	usr/bin/avahi-resolve-address -> avahi-resolve
 lrwxrwxrwx	root/root	usr/bin/avahi-resolve-host-name -> avahi-resolve
 -rwxr-xr-x	root/root	usr/bin/avahi-set-host-name
-lrwxrwxrwx	root/root	usr/bin/bshell -> bssh
--rwxr-xr-x	root/root	usr/bin/bssh
-lrwxrwxrwx	root/root	usr/bin/bvnc -> bssh
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/avahi-client/
 -rw-r--r--	root/root	usr/include/avahi-client/client.h
@@ -92,10 +87,6 @@ drwxr-xr-x	root/root	usr/include/avahi-gobject/
 -rw-r--r--	root/root	usr/include/avahi-gobject/ga-record-browser.h
 -rw-r--r--	root/root	usr/include/avahi-gobject/ga-service-browser.h
 -rw-r--r--	root/root	usr/include/avahi-gobject/ga-service-resolver.h
-drwxr-xr-x	root/root	usr/include/avahi-qt4/
--rw-r--r--	root/root	usr/include/avahi-qt4/qt-watch.h
-drwxr-xr-x	root/root	usr/include/avahi-ui/
--rw-r--r--	root/root	usr/include/avahi-ui/avahi-ui.h
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/avahi/
 -rw-r--r--	root/root	usr/lib/avahi/service-types.db
@@ -127,21 +118,6 @@ lrwxrwxrwx	root/root	usr/lib/libavahi-glib.so.1 -> libavahi-glib.so.1.0.2
 lrwxrwxrwx	root/root	usr/lib/libavahi-gobject.so -> libavahi-gobject.so.0.0.4
 lrwxrwxrwx	root/root	usr/lib/libavahi-gobject.so.0 -> libavahi-gobject.so.0.0.4
 -rwxr-xr-x	root/root	usr/lib/libavahi-gobject.so.0.0.4
--rw-r--r--	root/root	usr/lib/libavahi-qt4.a
--rwxr-xr-x	root/root	usr/lib/libavahi-qt4.la
-lrwxrwxrwx	root/root	usr/lib/libavahi-qt4.so -> libavahi-qt4.so.1.0.2
-lrwxrwxrwx	root/root	usr/lib/libavahi-qt4.so.1 -> libavahi-qt4.so.1.0.2
--rwxr-xr-x	root/root	usr/lib/libavahi-qt4.so.1.0.2
--rw-r--r--	root/root	usr/lib/libavahi-ui-gtk3.a
--rwxr-xr-x	root/root	usr/lib/libavahi-ui-gtk3.la
-lrwxrwxrwx	root/root	usr/lib/libavahi-ui-gtk3.so -> libavahi-ui-gtk3.so.0.1.4
-lrwxrwxrwx	root/root	usr/lib/libavahi-ui-gtk3.so.0 -> libavahi-ui-gtk3.so.0.1.4
--rwxr-xr-x	root/root	usr/lib/libavahi-ui-gtk3.so.0.1.4
--rw-r--r--	root/root	usr/lib/libavahi-ui.a
--rwxr-xr-x	root/root	usr/lib/libavahi-ui.la
-lrwxrwxrwx	root/root	usr/lib/libavahi-ui.so -> libavahi-ui.so.0.1.4
-lrwxrwxrwx	root/root	usr/lib/libavahi-ui.so.0 -> libavahi-ui.so.0.1.4
--rwxr-xr-x	root/root	usr/lib/libavahi-ui.so.0.1.4
 -rw-r--r--	root/root	usr/lib/libdns_sd.a
 -rwxr-xr-x	root/root	usr/lib/libdns_sd.la
 lrwxrwxrwx	root/root	usr/lib/libdns_sd.so -> libdns_sd.so.1.0.0
@@ -159,9 +135,6 @@ drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/avahi-core.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/avahi-glib.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/avahi-gobject.pc
--rw-r--r--	root/root	usr/lib/pkgconfig/avahi-qt4.pc
--rw-r--r--	root/root	usr/lib/pkgconfig/avahi-ui-gtk3.pc
--rw-r--r--	root/root	usr/lib/pkgconfig/avahi-ui.pc
 drwxr-xr-x	root/root	usr/lib/python2.7/
 drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/
 drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/avahi/
@@ -169,19 +142,11 @@ drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/avahi/
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/avahi/__init__.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/avahi/__init__.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/avahi/__init__.pyo
-drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/avahi_discover/
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/avahi_discover/__init__.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/avahi_discover/__init__.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/avahi_discover/__init__.pyo
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
--rw-r--r--	root/root	usr/share/applications/avahi-discover.desktop
--rw-r--r--	root/root	usr/share/applications/bssh.desktop
--rw-r--r--	root/root	usr/share/applications/bvnc.desktop
 drwxr-xr-x	root/root	usr/share/avahi/
 -rw-r--r--	root/root	usr/share/avahi/avahi-service.dtd
 drwxr-xr-x	root/root	usr/share/avahi/interfaces/
--rw-r--r--	root/root	usr/share/avahi/interfaces/avahi-discover.ui
 -rw-r--r--	root/root	usr/share/avahi/service-types
 drwxr-xr-x	root/root	usr/share/dbus-1/
 drwxr-xr-x	root/root	usr/share/dbus-1/interfaces/
@@ -208,7 +173,6 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/avahi-bookmarks.1.gz
 lrwxrwxrwx	root/root	usr/share/man/man1/avahi-browse-domains.1.gz -> avahi-browse.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/avahi-browse.1.gz
--rw-r--r--	root/root	usr/share/man/man1/avahi-discover.1.gz
 lrwxrwxrwx	root/root	usr/share/man/man1/avahi-publish-address.1.gz -> avahi-publish.1.gz
 lrwxrwxrwx	root/root	usr/share/man/man1/avahi-publish-service.1.gz -> avahi-publish.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/avahi-publish.1.gz
@@ -216,8 +180,6 @@ lrwxrwxrwx	root/root	usr/share/man/man1/avahi-resolve-address.1.gz -> avahi-reso
 lrwxrwxrwx	root/root	usr/share/man/man1/avahi-resolve-host-name.1.gz -> avahi-resolve.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/avahi-resolve.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/avahi-set-host-name.1.gz
--rw-r--r--	root/root	usr/share/man/man1/bssh.1.gz
-lrwxrwxrwx	root/root	usr/share/man/man1/bvnc.1.gz -> bssh.1.gz
 drwxr-xr-x	root/root	usr/share/man/man5/
 -rw-r--r--	root/root	usr/share/man/man5/avahi-daemon.conf.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/avahi.hosts.5.gz
diff --git a/avahi/Pkgfile b/avahi/Pkgfile
index 3c30c04..e7b7ab7 100644
--- a/avahi/Pkgfile
+++ b/avahi/Pkgfile
@@ -2,13 +2,13 @@
 # URL: http://www.avahi.org/
 # Maintainer: NuTyX core team 
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: intltool, qt, libdaemon, pygtk, dbus, dbus-python,gtk3
-# Run on: libdaemon,dbus,dbus-python,libglade,gtk,gtk3,qt
+# Depends on: intltool, libdaemon, dbus, dbus-python
+# Run on: libdaemon,dbus,dbus-python,libglade
 
 name=avahi
 version=0.6.30
-release=2
-source=(http://www.avahi.org/download/avahi-$version.tar.gz\
+release=3
+source=(http://www.avahi.org/download/avahi-$version.tar.gz
 	network-wired.png)
 
 build() {
@@ -18,8 +18,11 @@ build() {
     		--prefix=/usr \
     		--sysconfdir=/etc \
     		--localstatedir=/var/lib \
-    		--enable-gtk3 \
+    		--disable-gtk \
+		--disable-gtk3 \
+		--disable-pygtk \
 		--disable-qt3 \
+		--disable-qt4 \
     		--disable-monodoc \
     		--disable-doxygen-doc \
     		--disable-xmltoman \
@@ -34,13 +37,9 @@ build() {
 	make
 	make DESTDIR=$PKG install
 
-	sed -i -e 's/netdev/network/g' \
-		$PKG/etc/dbus-1/system.d/avahi-dbus.conf
+	sed -i -e 's/netdev/network/g' $PKG/etc/dbus-1/system.d/avahi-dbus.conf
 	mkdir -v -p $PKG/usr/share/pixmaps
-	install -m 644 ../network-wired.png  \
-		$PKG/usr/share/pixmaps/network-wired.png
+	install -m 644 ../network-wired.png $PKG/usr/share/pixmaps/network-wired.png
 	rm -r $PKG/{etc/avahi,var,usr/share/man/man8,usr/sbin}
-	
-	sed -i '1c #!/usr/bin/python2' $PKG/usr/bin/avahi-{bookmarks,discover}	
+	sed -i '1c #!/usr/bin/python2' $PKG/usr/bin/avahi-bookmarks
 }
-  
diff --git a/avahi/avahi-0.6.28-daemon-dbus.patch b/avahi/avahi-0.6.28-daemon-dbus.patch
deleted file mode 100644
index a168f03..0000000
--- a/avahi/avahi-0.6.28-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