avahi-discover: rebuild for Python 3.9, drop noarch

srcpkgs/avahi-discover/template

@@ -5,7 +5,7 @@
 #
 pkgname=avahi-discover
 version=0.8
-revision=2
+revision=3
 wrksrc="avahi-${version}"
 build_style=gnu-configure
 build_helper="gir"
@@ -80,10 +80,7 @@ do_install() {
 	mv ${wrksrc}/tmpinstall/usr/include/avahi-ui* ${DESTDIR}/usr/include
 	mv ${wrksrc}/tmpinstall/usr/include/avahi-qt* ${DESTDIR}/usr/include
 	mv ${wrksrc}/tmpinstall/usr/include/avahi-libevent* ${DESTDIR}/usr/include
-	mv ${wrksrc}/tmpinstall/usr/lib/python3.8 ${DESTDIR}/usr/lib
-	# Python files are compatible with both 2.7 and 3.x, make both subpackages
-	vmkdir ${py2_lib}
-	vcopy ${DESTDIR}/${py3_sitelib} ${py2_lib}
+	mv ${wrksrc}/tmpinstall/${py3_lib} ${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/*avahi-qt* ${DESTDIR}/usr/lib
@@ -103,7 +100,6 @@ do_install() {
 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
@@ -114,25 +110,14 @@ avahi-python3-utils_package() {
 avahi-python-utils_package() {
 	short_desc="Avahi python utilities - transitional dummy pkg"
 	depends="avahi-python3-utils>=${version}_${revision}"
-	archs=noarch
 	build_style=meta
 }
 
-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
+		vmove ${py3_sitelib}
 	}
 }