diff --git a/common/shlibs b/common/shlibs
index 3f0f0052b6..f5c5bed6b9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -390,8 +390,6 @@ libdns_sd.so.1 avahi-compat-libs-0.6.25_1
 libhowl.so.0 avahi-compat-libs-0.6.25_1
 libavahi-ui.so.0 avahi-ui-libs-0.6.25_1
 libavahi-ui-gtk3.so.0 avahi-ui-libs-gtk3-0.6.25_1
-libavahi-libevent.so.1 avahi-libevent-libs-0.8_1
-libavahi-qt5.so.1 avahi-qt5-libs-0.8_1
 libmp4v2.so.2 libmp4v2-2.0.0_1
 libfaac.so.0 faac-1.28_1
 libfaad.so.2 faad2-2.7_1
diff --git a/srcpkgs/avahi-discover b/srcpkgs/avahi-discover
deleted file mode 120000
index 3d497a7274..0000000000
--- a/srcpkgs/avahi-discover
+++ /dev/null
@@ -1 +0,0 @@
-avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
new file mode 100644
index 0000000000..4387c1d584
--- /dev/null
+++ b/srcpkgs/avahi-discover/template
@@ -0,0 +1,169 @@
+# Template file for 'avahi-discover'
+#
+# WARNING: THIS TEMPLATE MUST BE SYNCHRONIZED WITH AVAHI. IT IS SPLITTED TO DROP
+# ADDITIONAL DEPENDENCIES LIKE GTK3 AND PyGI.
+#
+pkgname=avahi-discover
+version=0.7
+revision=8
+wrksrc="avahi-${version}"
+build_style=gnu-configure
+build_helper="gir"
+configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
+ --disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl
+ --with-xml=expat --with-avahi-user=avahi --with-avahi-group=avahi
+ --with-avahi-priv-access-group=network --with-autoipd-user=avahi
+ --with-autoipd-group=avahi --with-distro=none --disable-xmltoman
+ --disable-dbm --without-systemdsystemunitdir
+ --disable-static ssp_cv_lib=no --enable-python
+ --enable-glib --enable-gobject --enable-gtk --enable-gtk3
+ $(vopt_enable gir introspection) $(vopt_enable gir pygobject)"
+short_desc="Service discover user interface for avahi"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/lathiat/avahi"
+distfiles="${homepage}/releases/download/v${version}/avahi-${version}.tar.gz"
+checksum=57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804
+
+hostmakedepends="automake libtool pkg-config intltool
+ python-dbus gobject-introspection glib-devel"
+makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel
+ python-dbus gtk+-devel gtk+3-devel $(vopt_if gir python-gobject-devel)"
+depends="avahi>=${version} avahi-python>=${version}
+ $(vopt_if gir 'gtk+3 python-gobject') desktop-file-utils"
+pycompile_module="avahi_discover"
+
+# Package build options
+build_options="gir"
+build_options_default="gir"
+
+pre_configure() {
+	autoreconf -fi
+	sed -e 's,-Werror,,g' -i configure
+}
+
+do_install() {
+	mkdir -p ${wrksrc}/tmpinstall/usr/lib
+	ln -s lib ${wrksrc}/tmpinstall/usr/lib32
+
+	make DESTDIR=${wrksrc}/tmpinstall install
+
+	# Move all required files to ${DESTDIR} now...
+	vmkdir usr/bin
+	vmkdir usr/share/man/man1
+	vmkdir usr/share/applications
+	vmkdir usr/include
+	vmkdir usr/lib/pkgconfig
+	vmkdir usr/share/avahi/interfaces
+
+	for f in bvnc bssh bshell avahi-bookmarks $(vopt_if gir avahi-discover) $(vopt_if gir avahi-discover-standalone); do
+		mv ${wrksrc}/tmpinstall/usr/bin/${f} ${DESTDIR}/usr/bin
+		if [ -f ${wrksrc}/tmpinstall/usr/share/man/man1/${f}.1 ]; then
+			mv ${wrksrc}/tmpinstall/usr/share/man/man1/${f}.1 ${DESTDIR}/usr/share/man/man1
+		fi
+		if [ -f ${wrksrc}/tmpinstall/usr/share/applications/${f}.desktop ]; then
+			mv ${wrksrc}/tmpinstall/usr/share/applications/${f}.desktop ${DESTDIR}/usr/share/applications
+		fi
+	done
+	mv ${wrksrc}/tmpinstall/usr/include/avahi-g* ${DESTDIR}/usr/include
+	mv ${wrksrc}/tmpinstall/usr/include/avahi-ui* ${DESTDIR}/usr/include
+	mv ${wrksrc}/tmpinstall/usr/lib/python2.7 ${DESTDIR}/usr/lib
+	mv ${wrksrc}/tmpinstall/usr/lib/*avahi-g* ${DESTDIR}/usr/lib
+	mv ${wrksrc}/tmpinstall/usr/lib/*avahi-ui* ${DESTDIR}/usr/lib
+	mv ${wrksrc}/tmpinstall/usr/lib/pkgconfig/avahi-g* ${DESTDIR}/usr/lib/pkgconfig
+	mv ${wrksrc}/tmpinstall/usr/lib/pkgconfig/avahi-ui* ${DESTDIR}/usr/lib/pkgconfig
+	mv ${wrksrc}/tmpinstall/usr/share/avahi/interfaces/*.ui ${DESTDIR}/usr/share/avahi/interfaces
+	if [ "$build_option_gir" ]; then
+		mv ${wrksrc}/tmpinstall/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib
+		mv ${wrksrc}/tmpinstall/usr/share/gir-1.0 ${DESTDIR}/usr/share
+	fi
+}
+
+avahi-python-utils_package() {
+	depends="avahi-python>=$version"
+	short_desc="Avahi python utilities"
+	archs=noarch
+	pkg_install() {
+		vmove usr/bin/avahi-bookmarks
+		vmove "usr/share/man/man1/avahi-bookmarks*"
+	}
+}
+
+avahi-python_package() {
+	depends="python-dbus"
+	short_desc="Python utility package for Avahi"
+	archs=noarch
+	pycompile_module="avahi"
+	pkg_install() {
+		vmove usr/lib/python2.7/site-packages/avahi
+	}
+}
+
+avahi-glib-libs-devel_package() {
+	depends="avahi-libs-devel>=${version}_${revision} avahi-glib-libs>=${version}_${revision}"
+	short_desc="Avahi glib libraries - development files"
+	pkg_install() {
+		vmove "usr/include/avahi-g*"
+		vmove "usr/lib/pkgconfig/avahi-g*"
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+		fi
+		vmove usr/lib/libavahi-glib.so
+		vmove usr/lib/libavahi-gobject.so
+	}
+}
+
+avahi-glib-libs_package() {
+	short_desc="Avahi glib shared libraries"
+	pkg_install() {
+		vmove "usr/lib/libavahi-glib.so.*"
+		vmove "usr/lib/libavahi-gobject.so.*"
+		if [ "$build_option_gir" ]; then
+			vmove usr/lib/girepository-1.0
+		fi
+	}
+}
+
+avahi-ui-libs-devel_package() {
+	depends="gtk+-devel gtk+3-devel avahi-libs-devel>=${version}_${revision}
+		avahi-ui-libs>=${version}_${revision} avahi-ui-libs-gtk3>=${version}_${revision}"
+	short_desc="Avahi UI libraries - development files"
+	pkg_install() {
+		vmove usr/include/avahi-ui/avahi-ui.h
+		vmove usr/lib/pkgconfig/avahi-ui.pc
+		vmove usr/lib/pkgconfig/avahi-ui-gtk3.pc
+		vmove usr/lib/libavahi-ui-gtk3.so
+		vmove usr/lib/libavahi-ui.so
+	}
+}
+
+avahi-ui-libs-gtk3_package() {
+	short_desc="Avahi UI GTK+3 shared libraries"
+	pkg_install() {
+		vmove "usr/lib/libavahi-ui-gtk3.so.*"
+	}
+}
+
+avahi-ui-libs_package() {
+	short_desc="Avahi UI shared libraries"
+	pkg_install() {
+		vmove "usr/lib/libavahi-ui.so.*"
+	}
+}
+
+avahi-ui-utils_package() {
+	depends="desktop-file-utils avahi>=$version"
+	short_desc="Avahi GTK+ utilities"
+	pkg_install() {
+		vmove usr/share/applications/bvnc.desktop
+		vmove usr/share/applications/bssh.desktop
+		vmove usr/share/man/man1/bssh.1
+		if [ "$build_option_gir" ]; then
+			vmove usr/bin/avahi-discover-standalone
+		fi
+		vmove usr/bin/bssh
+		vmove usr/share/man/man1/bvnc.1
+		vmove usr/bin/bvnc
+		vmove usr/bin/bshell
+	}
+}
diff --git a/srcpkgs/avahi-discover/update b/srcpkgs/avahi-discover/update
new file mode 100644
index 0000000000..b8bee1a9ab
--- /dev/null
+++ b/srcpkgs/avahi-discover/update
@@ -0,0 +1 @@
+pkgname="avahi"
diff --git a/srcpkgs/avahi-glib-libs b/srcpkgs/avahi-glib-libs
index 3d497a7274..19fb54cd09 120000
--- a/srcpkgs/avahi-glib-libs
+++ b/srcpkgs/avahi-glib-libs
@@ -1 +1 @@
-avahi
\ No newline at end of file
+avahi-discover
\ No newline at end of file
diff --git a/srcpkgs/avahi-glib-libs-devel b/srcpkgs/avahi-glib-libs-devel
index 3d497a7274..19fb54cd09 120000
--- a/srcpkgs/avahi-glib-libs-devel
+++ b/srcpkgs/avahi-glib-libs-devel
@@ -1 +1 @@
-avahi
\ No newline at end of file
+avahi-discover
\ No newline at end of file
diff --git a/srcpkgs/avahi-libevent-libs b/srcpkgs/avahi-libevent-libs
deleted file mode 120000
index 3d497a7274..0000000000
--- a/srcpkgs/avahi-libevent-libs
+++ /dev/null
@@ -1 +0,0 @@
-avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-libevent-libs-devel b/srcpkgs/avahi-libevent-libs-devel
deleted file mode 120000
index 3d497a7274..0000000000
--- a/srcpkgs/avahi-libevent-libs-devel
+++ /dev/null
@@ -1 +0,0 @@
-avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-python b/srcpkgs/avahi-python
index 3d497a7274..19fb54cd09 120000
--- a/srcpkgs/avahi-python
+++ b/srcpkgs/avahi-python
@@ -1 +1 @@
-avahi
\ No newline at end of file
+avahi-discover
\ No newline at end of file
diff --git a/srcpkgs/avahi-python-utils b/srcpkgs/avahi-python-utils
index 3d497a7274..19fb54cd09 120000
--- a/srcpkgs/avahi-python-utils
+++ b/srcpkgs/avahi-python-utils
@@ -1 +1 @@
-avahi
\ No newline at end of file
+avahi-discover
\ No newline at end of file
diff --git a/srcpkgs/avahi-python3 b/srcpkgs/avahi-python3
deleted file mode 120000
index 3d497a7274..0000000000
--- a/srcpkgs/avahi-python3
+++ /dev/null
@@ -1 +0,0 @@
-avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-python3-utils b/srcpkgs/avahi-python3-utils
deleted file mode 120000
index 3d497a7274..0000000000
--- a/srcpkgs/avahi-python3-utils
+++ /dev/null
@@ -1 +0,0 @@
-avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-qt5-libs b/srcpkgs/avahi-qt5-libs
deleted file mode 120000
index 3d497a7274..0000000000
--- a/srcpkgs/avahi-qt5-libs
+++ /dev/null
@@ -1 +0,0 @@
-avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-qt5-libs-devel b/srcpkgs/avahi-qt5-libs-devel
deleted file mode 120000
index 3d497a7274..0000000000
--- a/srcpkgs/avahi-qt5-libs-devel
+++ /dev/null
@@ -1 +0,0 @@
-avahi
\ No newline at end of file
diff --git a/srcpkgs/avahi-ui-libs b/srcpkgs/avahi-ui-libs
index 3d497a7274..19fb54cd09 120000
--- a/srcpkgs/avahi-ui-libs
+++ b/srcpkgs/avahi-ui-libs
@@ -1 +1 @@
-avahi
\ No newline at end of file
+avahi-discover
\ No newline at end of file
diff --git a/srcpkgs/avahi-ui-libs-devel b/srcpkgs/avahi-ui-libs-devel
index 3d497a7274..19fb54cd09 120000
--- a/srcpkgs/avahi-ui-libs-devel
+++ b/srcpkgs/avahi-ui-libs-devel
@@ -1 +1 @@
-avahi
\ No newline at end of file
+avahi-discover
\ No newline at end of file
diff --git a/srcpkgs/avahi-ui-libs-gtk3 b/srcpkgs/avahi-ui-libs-gtk3
index 3d497a7274..19fb54cd09 120000
--- a/srcpkgs/avahi-ui-libs-gtk3
+++ b/srcpkgs/avahi-ui-libs-gtk3
@@ -1 +1 @@
-avahi
\ No newline at end of file
+avahi-discover
\ No newline at end of file
diff --git a/srcpkgs/avahi-ui-utils b/srcpkgs/avahi-ui-utils
index 3d497a7274..19fb54cd09 120000
--- a/srcpkgs/avahi-ui-utils
+++ b/srcpkgs/avahi-ui-utils
@@ -1 +1 @@
-avahi
\ No newline at end of file
+avahi-discover
\ No newline at end of file
diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template
index f472ddb28b..199cbd4e05 100644
--- a/srcpkgs/avahi/template
+++ b/srcpkgs/avahi/template
@@ -1,38 +1,26 @@
 # Template file for 'avahi'
 pkgname=avahi
-version=0.8
-revision=1
+version=0.7
+revision=9
 build_style=gnu-configure
-build_helper="gir"
 configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
-	--disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl
-	--with-xml=expat --with-avahi-user=avahi --with-avahi-group=avahi
-	--with-avahi-priv-access-group=network --with-autoipd-user=avahi
-	--with-autoipd-group=avahi --with-distro=none --enable-xmltoman
-	--disable-static ssp_cv_lib=no --disable-dbm --enable-python
-	--enable-glib --enable-gobject --enable-qt5 --enable-gtk --enable-gtk3
-	--sbindir=/usr/bin --without-systemdsystemunitdir
-	--with-dbus-system-address=unix:path=/run/dbus/system_bus_socket
-	$(vopt_enable gir introspection) $(vopt_enable gir pygobject)"
+ --disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl
+ --with-xml=expat --with-avahi-user=avahi --with-avahi-group=avahi
+ --with-avahi-priv-access-group=network --with-autoipd-user=avahi
+ --with-autoipd-group=avahi --with-distro=none --disable-xmltoman
+ --disable-static ssp_cv_lib=no --enable-python
+ --disable-glib --disable-python-dbus --disable-gobject --disable-gtk
+ --disable-gtk3 --disable-dbm --disable-introspection --sbindir=/usr/bin
+ --disable-pygobject"
 short_desc="Multicast DNS Service Discovery"
-maintainer="Andrew J. Hesford <ajh@sideband.org>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/lathiat/avahi"
-### NOTE: The Avahi 0.8 release tarball is broken; it is missing the build-db
-### script. Fetching and manipulation of this file in post_extract should be
-### undone in a future release that fixes this oversight.
-distfiles="${homepage}/releases/download/v${version}/avahi-${version}.tar.gz
-	https://raw.githubusercontent.com/lathiat/${pkgname}/v${version}/service-type-database/build-db>build-db.txt"
-checksum="060309d7a333d38d951bc27598c677af1796934dbd98e1024e7ad8de798fedda
-	83edd888ccc464ab032134a45b7ded3bc43cb1dda2cd921ff47b01949d98ed7c"
-skip_extraction="build-db.txt"
+distfiles="${homepage}/releases/download/v${version}/avahi-${version}.tar.gz"
+checksum=57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804
 
-hostmakedepends="pkg-config intltool xmltoman glib-devel automake
-	libtool gettext-devel python3 python3-dbus qt5-host-tools
-	$(vopt_if gir gobject-introspection)"
-makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel
-	libevent-devel glib-devel python3-dbus gtk+-devel
-	gtk+3-devel qt5-devel $(vopt_if gir python-gobject-devel)"
+hostmakedepends="pkg-config intltool python"
+makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel"
 conf_files="
 	/etc/avahi/services/ssh.service
 	/etc/avahi/services/sftp-ssh.service
@@ -41,28 +29,22 @@ conf_files="
 	/etc/avahi/avahi-dnsconfd.action"
 system_accounts="avahi:23"
 
-build_options="gir"
-build_options_default="gir"
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" automake libtool glib-devel"
+	pre_configure() {
+		autoreconf -if
+	}
+fi
 
 post_extract() {
-	# Avahi 0.8 release mistaken left build-db out of release tarball
-	cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/build-db.txt service-type-database/build-db
+	# Switch to /run to not depend on /var/run being a symlink.
+	sed -e 's,\(avahi_runtime_dir=\).*,\1\"/run\",' -i ${wrksrc}/configure
 }
-
-pre_configure() {
-	# Without reconfiguration, gtk3 deps are not fully recognized
-	autoreconf -if
-	vsed -e 's,-Werror,,g' -i configure
-}
-
 post_install() {
+	rm -rf ${DESTDIR}/usr/lib/python*
 	# Set 'enable-dbus=warn' option by default to not require dbus.
-	vsed -e 's,\#\(enable-dbus\).*,\1=warn,' -i ${DESTDIR}/etc/avahi/avahi-daemon.conf
+	sed -e 's,\#\(enable-dbus\).*,\1=warn,' -i ${DESTDIR}/etc/avahi/avahi-daemon.conf
 	vsv avahi-daemon
-
-	# Python files are compatible with both 2.7 and 3.x, make both subpackages
-	vmkdir ${py2_lib}
-	vcopy ${DESTDIR}/${py3_sitelib} ${py2_lib}
 }
 
 avahi-autoipd_package() {
@@ -74,7 +56,6 @@ avahi-autoipd_package() {
 		vmove etc/avahi/avahi-autoipd.action
 	}
 }
-
 avahi-compat-libs-devel_package() {
 	depends="avahi-libs-devel-${version}_${revision} avahi-compat-libs-${version}_${revision}"
 	short_desc="Avahi compat libraries - development files"
@@ -85,7 +66,6 @@ avahi-compat-libs-devel_package() {
 		vmove usr/lib/libdns_sd.so
 	}
 }
-
 avahi-compat-libs_package() {
 	short_desc="Avahi compatiblity shared libraries"
 	pkg_install() {
@@ -93,7 +73,6 @@ avahi-compat-libs_package() {
 		vmove "usr/lib/libdns_sd.so.*"
 	}
 }
-
 avahi-libs-devel_package() {
 	depends="dbus-devel avahi-libs-${version}_${revision}"
 	short_desc="Avahi core libraries - development files"
@@ -108,7 +87,6 @@ avahi-libs-devel_package() {
 		vmove usr/lib/libavahi-common.so
 	}
 }
-
 avahi-libs_package() {
 	short_desc="Avahi shared libraries"
 	pkg_install() {
@@ -117,7 +95,6 @@ avahi-libs_package() {
 		vmove "usr/lib/libavahi-common.so.*"
 	}
 }
-
 avahi-utils_package() {
 	short_desc="Avahi browsing, publishing and discovery utilities"
 	pkg_install() {
@@ -127,157 +104,3 @@ avahi-utils_package() {
 		vmove usr/share/man/man1
 	}
 }
-
-avahi-libevent-libs_package() {
-	short_desc="Avahi libevent integration libraries"
-	pkg_install() {
-		vmove "usr/lib/libavahi-libevent.so.*"
-	}
-}
-
-avahi-libevent-libs-devel_package() {
-	depends="avahi-libs-devel-${version}_${revision} avahi-libevent-libs-${version}_${revision}"
-	short_desc="Avahi libevent integration libraries - development files"
-	pkg_install() {
-		vmove usr/lib/libavahi-libevent.so
-		vmove "usr/include/avahi-libevent*"
-		vmove "usr/lib/pkgconfig/avahi-libevent*"
-	}
-}
-
-avahi-discover_package() {
-	short_desc="Avahi service-discovery user interface"
-	depends="avahi>=${version}_${revision} avahi-python3>=${version}_${revision}
-		$(vopt_if gir 'gtk+3 python3-gobject')"
-	python_version=3
-	pkg_install() {
-		if [ "$build_option_gir" ]; then
-			vmove usr/bin/avahi-discover
-			vmove usr/share/applications/avahi-discover.desktop
-		fi
-		vmove usr/share/avahi/interfaces/avahi-discover.ui
-		vmove usr/share/man/man1/avahi-discover.1
-	}
-}
-
-avahi-python-utils_package() {
-	build_style=meta
-	archs=noarch
-	short_desc+="Avahi python utilities - transitional dummy pkg"
-	depends="avahi-python3-utils-${version}_${revision}"
-}
-
-avahi-python3-utils_package() {
-	depends="avahi-python3>=${version}_${revision}"
-	short_desc="Avahi python utilities"
-	archs=noarch
-	python_version=3
-	pkg_install() {
-		vmove usr/bin/avahi-bookmarks
-		vmove usr/share/man/man1/avahi-bookmarks.1
-	}
-}
-
-avahi-python_package() {
-	depends="python-dbus"
-	short_desc="Python utility package for Avahi"
-	archs=noarch
-	pkg_install() {
-		vmove ${py2_sitelib}/avahi
-	}
-}
-
-avahi-python3_package() {
-	depends="python3-dbus"
-	short_desc="Python3 utility package for Avahi"
-	archs=noarch
-	pkg_install() {
-		vmove ${py3_sitelib}/avahi
-	}
-}
-
-avahi-glib-libs-devel_package() {
-	depends="avahi-libs-devel>=${version}_${revision} avahi-glib-libs>=${version}_${revision}"
-	short_desc="Avahi glib libraries - development files"
-	pkg_install() {
-		vmove "usr/include/avahi-g*"
-		vmove "usr/lib/pkgconfig/avahi-g*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
-		vmove usr/lib/libavahi-glib.so
-		vmove usr/lib/libavahi-gobject.so
-	}
-}
-
-avahi-glib-libs_package() {
-	short_desc="Avahi glib shared libraries"
-	pkg_install() {
-		vmove "usr/lib/libavahi-glib.so.*"
-		vmove "usr/lib/libavahi-gobject.so.*"
-		if [ "$build_option_gir" ]; then
-			vmove usr/lib/girepository-1.0
-		fi
-	}
-}
-
-avahi-ui-libs-devel_package() {
-	depends="gtk+-devel gtk+3-devel avahi-libs-devel>=${version}_${revision}
-		avahi-ui-libs>=${version}_${revision} avahi-ui-libs-gtk3>=${version}_${revision}"
-	short_desc="Avahi UI libraries - development files"
-	pkg_install() {
-		vmove usr/include/avahi-ui/avahi-ui.h
-		vmove usr/lib/pkgconfig/avahi-ui.pc
-		vmove usr/lib/pkgconfig/avahi-ui-gtk3.pc
-		vmove usr/lib/libavahi-ui-gtk3.so
-		vmove usr/lib/libavahi-ui.so
-	}
-}
-
-avahi-qt5-libs_package() {
-	short_desc="Avahi Qt5 shared libraries"
-	pkg_install() {
-		vmove "usr/lib/libavahi-qt5.so.*"
-	}
-}
-
-avahi-qt5-libs-devel_package() {
-	depends="qt5-devel avahi-libs-devel>=${version}_${revision} avahi-qt5-libs>=${version}_${revision}"
-	short_desc="Avahi QT5 shared libraries - development files"
-	pkg_install() {
-		vmove usr/lib/pkgconfig/avahi-qt5.pc
-		vmove usr/lib/libavahi-qt5.so
-		vmove usr/include/avahi-qt5
-	}
-}
-
-avahi-ui-libs-gtk3_package() {
-	short_desc="Avahi UI GTK+3 shared libraries"
-	pkg_install() {
-		vmove "usr/lib/libavahi-ui-gtk3.so.*"
-	}
-}
-
-avahi-ui-libs_package() {
-	short_desc="Avahi UI shared libraries"
-	pkg_install() {
-		vmove "usr/lib/libavahi-ui.so.*"
-	}
-}
-
-avahi-ui-utils_package() {
-	depends="desktop-file-utils avahi>=$version"
-	short_desc="Avahi GTK+ utilities"
-	pkg_install() {
-		vmove usr/share/applications/bvnc.desktop
-		vmove usr/share/applications/bssh.desktop
-		vmove usr/share/man/man1/bssh.1
-		if [ "$build_option_gir" ]; then
-			vmove usr/bin/avahi-discover-standalone
-		fi
-		vmove usr/bin/bssh
-		vmove usr/share/man/man1/bvnc.1
-		vmove usr/bin/bvnc
-		vmove usr/bin/bshell
-	}
-}