gentoo resync : 28.04.2021

4 files changed, 70 insertions, 16 deletions

diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 3d2bec4c0ece..e2c7cf60c178 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,5 +1,6 @@
 AUX autoipd-openrc.sh 700 BLAKE2B e71e5583db890f8ee1bbe9c03fc42285871089b2ea2d4549d553f14a20a3aa97c519b298bfaaccf02346c911f65f8e3f8bab7b2dc8270a5d35c471cc6bf31f6b SHA512 a5dbbac4d6d1959db3a07a63acb7569dbeba33d2274a1dd3253dc27687549371611cf08bad3998d89efb3ace63b5541a4d225e484274450e0c82661f5a1dbc32
 AUX autoipd.sh 1271 BLAKE2B 815c5776afff71489826eb8338535df1af6fbf02f3d42eedb6ebb69e5fff181e7252060818dd2dd67141a40c097ded8b7ac4210cb9929bab4b68ea99533bcf26 SHA512 0bff9ca7e32212aef0246db5baf10ee4f7e93a987b7c591b21ed9f116a1c662a84be9d784fc919205c1fecb5cd8421b81a0eb590c3cc066c6b1b9265b98f1ea3
+AUX avahi-0.8-disable-avahi-ui-sharp.patch 1397 BLAKE2B b04324648b09fdd69f017d0be068556ed443f888b56a0567c3f9647c80f959ddcaa7d2ee0022d6a9a8d6bdd60673ffe7086ae4f5065a47d7b62f5aa287931306 SHA512 1d824f16fffcc41015b507e8210f4daa127c9915387b0695d2e27a46a2d480783b679735ea1ffdd198f52470300e4ae9cfc731c62496ad6a3d7c8408c3ffd8dd
 DIST avahi-0.8.tar.gz 953319 BLAKE2B ddede1b8790ff3057ea5f4bb710e95578229e078a7abac83121e043017dda1ab3d971c723f920fdd4f3d98b88bd2cf21f9645bec1b7bbd2ea194cb399a5f5b46 SHA512 27bba9a551152dfc7e721f326042e7bfce55d227044a6cbaee04d6fb0e3f59c36e159c2b7a4dd42d1c955cdf37cc1c303e91991c08928bbded91d796e9a22abe
-EBUILD avahi-0.8-r2.ebuild 5275 BLAKE2B 20a25360d64fe3d6fcf07657bac0d42097095600c13703766d997a7f3cc64fc8cc3d75a85a4810664f0ee5159295e98f7a7b50691acac9321129c0cd74f3580a SHA512 f97c115e522b3318d5d212ce897078761442a45f6e6e198414947e50acd5986aa776c50bd262ef004d2bebb5b621919c106a70463a4392347b31027fadc8176f
-MISC metadata.xml 1002 BLAKE2B 5da5858bd8f074d636e9d08eaa3b91504fa1741def8e09a6c0234e0ac24734288971f502d7a894ffbf2fefdfc247336675b20e22ba46bf3d572f0db0d731152e SHA512 bd79bbb98f43867b91f5b8a5046beec5b91e66c72134ebc794e651f256c65f2efe964d40f641dbc544fd036bb98831a20280f5ffecbf07d349d9d5f7e4e93e58
+EBUILD avahi-0.8-r3.ebuild 5223 BLAKE2B bc45ca99ac5ba317aa20c23ac301982fd64aa682f9873e7231723a883d09feebfacb90851b46c5afea52feb141ebb1d9eb268aba5bb4d025afac3817ac12cfd9 SHA512 74eda66378f9437f9fe1b793ff3b5bf6d03c9f05bb5fef36811d8a682cc4d5fef8e49d66592f791d3ea589b70e9667244270dbb0c974aff69dbc4ef5e65a532c
+MISC metadata.xml 865 BLAKE2B 59950f0a850c79160f02f7a0d8f5af6a7b1f6813982bdc39244bd435d5f098d79a77fe918dfb6c81ac0d6673f90c70aa7378194f7086c6d6a89cae69590ea667 SHA512 ab1aefa11c59add17cabe4693ff44594ead164cb8d5cb3aa1193f48350bb74ffbb8f7a520d605ed52d3bd83e08d7b3a4a42a59cf55d8336c8fb4db431e8e28f1
diff --git a/net-dns/avahi/avahi-0.8-r2.ebuild b/net-dns/avahi/avahi-0.8-r3.ebuild
index 9571bd2d62fb..8c9e10456e2d 100644
--- a/net-dns/avahi/avahi-0.8-r2.ebuild
+++ b/net-dns/avahi/avahi-0.8-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/lathiat/avahi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="autoipd bookmarks +dbus doc gdbm gtk gtk2 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt5 selinux systemd test"
+IUSE="autoipd bookmarks +dbus doc gdbm gtk howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt5 selinux systemd test"
 
 REQUIRED_USE="
 	python? ( dbus gdbm ${PYTHON_REQUIRED_USE} )
@@ -33,15 +33,11 @@ DEPEND="
 	dev-libs/glib:2[${MULTILIB_USEDEP}]
 	gdbm? ( sys-libs/gdbm:=[${MULTILIB_USEDEP}] )
 	qt5? ( dev-qt/qtcore:5 )
-	gtk2? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
 	gtk?  ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
 	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	kernel_linux? ( sys-libs/libcap )
 	introspection? ( dev-libs/gobject-introspection:= )
-	mono? (
-		dev-lang/mono
-		gtk2? ( dev-dotnet/gtk-sharp:2 )
-	)
+	mono? ( dev-lang/mono )
 	python? (
 		${PYTHON_DEPS}
 		dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
@@ -73,16 +69,17 @@ BDEPEND="
 
 MULTILIB_WRAPPED_HEADERS=( /usr/include/avahi-qt5/qt-watch.h )
 
+PATCHES=(
+	"${FILESDIR}/${P}-disable-avahi-ui-sharp.patch" # bug 769062
 # These patches do not apply cleanly but may need to be re-instated.
 # I'll leave them commented out for now.
-#PATCHES=(
 #	"${FILESDIR}/${PN}-0.7-qt5.patch"
 #	"${FILESDIR}/${PN}-0.7-CVE-2017-6519.patch"
 #	"${FILESDIR}/${PN}-0.7-remove-empty-avahi_discover.patch"
 #	"${FILESDIR}/${PN}-0.7-python3.patch"
 #	"${FILESDIR}/${PN}-0.7-python3-unittest.patch"
 #	"${FILESDIR}/${PN}-0.7-python3-gdbm.patch"
-#)
+)
 
 pkg_setup() {
 	use mono && mono-env_pkg_setup
@@ -110,6 +107,7 @@ src_prepare() {
 
 multilib_src_configure() {
 	local myconf=(
+		--disable-gtk
 		--disable-monodoc
 		--disable-python-dbus
 		--disable-qt3
@@ -124,8 +122,7 @@ multilib_src_configure() {
 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
 		$(use_enable dbus)
 		$(use_enable gdbm)
-		$(use_enable gtk2 gtk)
-		$(use_enable gtk  gtk3)
+		$(use_enable gtk gtk3)
 		$(use_enable howl-compat compat-howl)
 		$(use_enable mdnsresponder-compat compat-libdns_sd)
 		$(use_enable nls)
@@ -169,7 +166,7 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	emake install DESTDIR="${D}"
-	use bookmarks && use python && use dbus && use gtk2 || \
+	use bookmarks && use python && use dbus || \
 		rm -f "${ED}"/usr/bin/avahi-bookmarks
 
 	# https://github.com/lathiat/avahi/issues/28
diff --git a/net-dns/avahi/files/avahi-0.8-disable-avahi-ui-sharp.patch b/net-dns/avahi/files/avahi-0.8-disable-avahi-ui-sharp.patch
new file mode 100644
index 000000000000..31b361d4e17f
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.8-disable-avahi-ui-sharp.patch
@@ -0,0 +1,57 @@
+From ebd2a01a7b5e88f3be35b2f803d5adbd36ae6593 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 27 Mar 2021 22:49:08 +0100
+Subject: [PATCH] Disable avahi-ui-sharp
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ Makefile.am  | 6 ++----
+ configure.ac | 1 -
+ 2 files changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 33c51f5..0e12120 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -46,7 +46,6 @@ EXTRA_DIST = \
+ 	avahi-qt4.pc.in \
+ 	avahi-qt5.pc.in \
+ 	avahi-sharp.pc.in \
+-	avahi-ui-sharp.pc.in \
+ 	avahi-compat-libdns_sd.pc.in \
+ 	avahi-compat-howl.pc.in \
+ 	avahi-ui.pc.in \
+@@ -77,7 +76,6 @@ SUBDIRS = \
+ 	avahi-compat-howl \
+ 	avahi-autoipd \
+ 	avahi-ui \
+-	avahi-ui-sharp \
+ 	avahi-libevent \
+ 	po
+ 
+@@ -188,8 +186,8 @@ CLEANFILES += avahi-compat-libdns_sd.pc
+ endif
+ 
+ if HAVE_MONO
+-pkgconfig_DATA += avahi-sharp.pc avahi-ui-sharp.pc
+-CLEANFILES += avahi-sharp.pc avahi-ui-sharp.pc
++pkgconfig_DATA += avahi-sharp.pc
++CLEANFILES += avahi-sharp.pc
+ endif
+ 
+ endif
+diff --git a/configure.ac b/configure.ac
+index 58db8c7..844360f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1166,7 +1166,6 @@ man/Makefile
+ tests/Makefile
+ service-type-database/Makefile
+ avahi-sharp/Makefile
+-avahi-ui-sharp/Makefile
+ avahi-compat-libdns_sd/Makefile
+ avahi-compat-howl/Makefile
+ avahi-compat-howl/samples/Makefile
+-- 
+2.31.1
+
diff --git a/net-dns/avahi/metadata.xml b/net-dns/avahi/metadata.xml
index 403d3fbd5a5f..c357c4fa1982 100644
--- a/net-dns/avahi/metadata.xml
+++ b/net-dns/avahi/metadata.xml
@@ -8,9 +8,8 @@
 	<use>
 		<flag name="autoipd">Build and install the IPv4LL (RFC3927) network address configuration daemon</flag>
 		<flag name="bookmarks">Install the avahi-bookmarks application (requires <pkg>dev-python/twisted</pkg>)</flag>
+		<flag name="gtk">Use gtk3 for the avahi utilities to build the avahi-ui-gtk3 library</flag>
 		<flag name="howl-compat">Enable compat libraries for howl</flag>
-		<flag name="gtk2">Use gtk2 for the avahi utilities (overridden by USE=gtk) and build the avahi-ui library</flag>
-		<flag name="gtk">Use gtk3 for the avahi utilities (overrides USE=gtk2) and build the avahi-ui-gtk3 library</flag>
 		<flag name="mdnsresponder-compat">Enable compat libraries for mDNSResponder</flag>
 	</use>
 	<upstream>