net-dns/avahi: Drop old, IUSE=gtk3->gtk, drop pygtk dependency

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

6 files changed, 13 insertions, 650 deletions

diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index f8ec6574..65254438 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,3 +1 @@
-DIST avahi-0.6.28.tar.gz 1238660 SHA256 a0d80aac88212b9f9d5331c248091d3c9c9209f0e41985421636ebd14230fc91
-DIST avahi-0.6.30.tar.gz 1243534 SHA256 f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f SHA512 1b0ad0d509fd5e18c651ebe432d4cc85a62cb96e0b240a769ea2f600944eb90d143e4e5abb9057f7bc1a421b4aa743cf483fe8a888b4f63cab61577eda08d7f4 WHIRLPOOL 0c503606adb07741c5ef30b0f8af858cac97e5bf6e36549ed41bb1c76884e27fe234dffe1f8320e7c5570a3cf0032351d6b4c3d2c8905a1be832cb1bdce562e9
-DIST avahi-0.6.31.tar.gz 1268686 SHA256 8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48 SHA512 53eb00d570a274d841e1e6ad07da077950089ae39b4f7aa21fcd21cc5320b30b506b43e7e57e56198e155cc7bd289b779a48b2b2fc002dc6194a946110451858 WHIRLPOOL a6d97b87dfbb81be359ee03d8f32ebafdbb311bd596d686aeb55a2952ecb6c7c84466b1230e70392ffe23a20a56da7e0a5bd00c8dc1812b2156c0b4a8022144f
+DIST avahi-0.6.31.tar.gz 1268686 BLAKE2B 959526c69855495948222709227c7c0d07653bb91f223d80e3d1b6ee16b03952015634984fe754c2c828f76035cd966131eeb047fe4c922493c129a77b14d2be SHA512 53eb00d570a274d841e1e6ad07da077950089ae39b4f7aa21fcd21cc5320b30b506b43e7e57e56198e155cc7bd289b779a48b2b2fc002dc6194a946110451858
diff --git a/net-dns/avahi/avahi-0.6.28-r1.ebuild b/net-dns/avahi/avahi-0.6.28-r1.ebuild
deleted file mode 100644
index f9120d68..00000000
--- a/net-dns/avahi/avahi-0.6.28-r1.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.28-r1.ebuild,v 1.7 2011/03/05 13:42:05 armin76 Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="python? 2"
-PYTHON_USE_WITH="gdbm"
-PYTHON_USE_WITH_OPT="python"
-
-inherit eutils mono python multilib flag-o-matic
-
-DESCRIPTION="System which facilitates service discovery on a local network"
-HOMEPAGE="http://avahi.org/"
-SRC_URI="http://avahi.org/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 s390 ~sparc x86"
-IUSE="autoipd bookmarks dbus doc gdbm gtk howl-compat ipv6 kernel_linux mdnsresponder-compat mono python qt3 qt4 test "
-
-DBUS_DEPEND=">=sys-apps/dbus-0.30"
-RDEPEND=">=dev-libs/libdaemon-0.14
-	dev-libs/expat
-	>=dev-libs/glib-2
-	gdbm? ( sys-libs/gdbm )
-	qt3? ( dev-qt/qt-meta:3 )
-	qt4? ( dev-qt/qtcore:4 )
-	gtk? (
-		>=x11-libs/gtk+-2.14.0:2
-	)
-	dbus? (
-		${DBUS_DEPEND}
-		python? ( dev-python/dbus-python )
-	)
-	mono? (
-		>=dev-lang/mono-1.1.10
-		gtk? ( >=dev-dotnet/gtk-sharp-2 )
-	)
-	howl-compat? (
-		!net-misc/howl
-		${DBUS_DEPEND}
-	)
-	mdnsresponder-compat? (
-		!net-misc/mDNSResponder
-		${DBUS_DEPEND}
-	)
-	python? (
-		gtk? ( >=dev-python/pygtk-2 )
-	)
-	bookmarks? (
-		dev-python/twisted
-		dev-python/twisted-web
-	)
-	kernel_linux? ( sys-libs/libcap )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40.5
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		mono? ( >=virtual/monodoc-1.1.8 )
-	)"
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-
-	if use python && ! use dbus && ! use gtk; then
-		ewarn "For proper python support you should also enable the dbus and gtk USE flags!"
-	fi
-}
-
-pkg_preinst() {
-	enewgroup netdev
-	enewgroup avahi
-	enewuser avahi -1 -1 -1 avahi
-
-	if use autoipd; then
-		enewgroup avahi-autoipd
-		enewuser avahi-autoipd -1 -1 -1 avahi-autoipd
-	fi
-}
-
-src_prepare() {
-	if use ipv6; then
-		sed -i \
-			-e s/use-ipv6=no/use-ipv6=yes/ \
-			avahi-daemon/avahi-daemon.conf || die
-	fi
-
-	sed -i\
-		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
-		doxygen_to_devhelp.xsl || die
-
-	epatch "${FILESDIR}"/netlink-request-all-matches-when-requesting-interface.patch
-	epatch "${FILESDIR}"/${P}-CVE-2011-1002.patch
-}
-
-src_configure() {
-	use sh && replace-flags -O? -O0
-
-	local myconf=""
-
-	if use python; then
-		myconf+="
-			$(use_enable dbus python-dbus)
-			$(use_enable gtk pygtk)
-		"
-	fi
-
-	if use mono; then
-		myconf+=" $(use_enable doc monodoc)"
-	fi
-
-	# these require dbus enabled
-	if use mdnsresponder-compat || use howl-compat || use mono; then
-		myconf+=" --enable-dbus"
-	fi
-
-	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
-	unset DISPLAY
-
-	# Upstream ships a gir file (AvahiCore.gir) which does not work with
-	# >=gobject-introspection-0.9, so we disable introspection for now.
-	# http://avahi.org/ticket/318
-	econf \
-		--localstatedir=/var \
-		--with-distro=gentoo \
-		--disable-python-dbus \
-		--disable-pygtk \
-		--disable-xmltoman \
-		--disable-monodoc \
-		--disable-introspection \
-		--enable-glib \
-		$(use_enable test tests) \
-		$(use_enable autoipd) \
-		$(use_enable mdnsresponder-compat compat-libdns_sd) \
-		$(use_enable howl-compat compat-howl) \
-		$(use_enable doc doxygen-doc) \
-		$(use_enable mono) \
-		$(use_enable dbus) \
-		$(use_enable python) \
-		--disable-gtk3 \
-		$(use_enable gtk) \
-		$(use_enable qt3) \
-		$(use_enable qt4) \
-		$(use_enable gdbm) \
-		${myconf}
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	use doc && { emake avahi.devhelp || die ; }
-}
-
-src_install() {
-	emake install py_compile=true DESTDIR="${D}" || die "make install failed"
-	use bookmarks && use python && use dbus && use gtk || \
-		rm -f "${D}"/usr/bin/avahi-bookmarks
-
-	use howl-compat && ln -s avahi-compat-howl.pc "${D}"/usr/$(get_libdir)/pkgconfig/howl.pc
-	use mdnsresponder-compat && ln -s avahi-compat-libdns_sd/dns_sd.h "${D}"/usr/include/dns_sd.h
-
-	if use autoipd; then
-		insinto /$(get_libdir)/rcscripts/net
-		doins "${FILESDIR}"/autoipd.sh || die
-
-		insinto /$(get_libdir)/rc/net
-		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh || die
-	fi
-
-	dodoc docs/{AUTHORS,NEWS,README,TODO} || die
-
-	if use doc; then
-		dohtml -r doxygen/html/. || die
-		insinto /usr/share/devhelp/books/avahi
-		doins avahi.devhelp || die
-	fi
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup avahi $(use dbus && use gtk && echo avahi_discover)
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize avahi $(use dbus && use gtk && echo avahi_discover)
-
-	if use autoipd; then
-		echo
-		elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
-		elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
-	fi
-
-	if use dbus; then
-		echo
-		elog "If this is your first install of avahi please reload your dbus config"
-		elog "with /etc/init.d/dbus reload before starting avahi-daemon!"
-	fi
-}
diff --git a/net-dns/avahi/avahi-0.6.30-r1.ebuild b/net-dns/avahi/avahi-0.6.30-r1.ebuild
deleted file mode 100644
index f6b8998e..00000000
--- a/net-dns/avahi/avahi-0.6.30-r1.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.30-r1.ebuild,v 1.1 2011/08/14 12:52:06 nirbheek Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="python? 2"
-PYTHON_USE_WITH="gdbm"
-PYTHON_USE_WITH_OPT="python"
-
-inherit autotools eutils mono python multilib flag-o-matic
-
-DESCRIPTION="System which facilitates service discovery on a local network"
-HOMEPAGE="http://avahi.org/"
-SRC_URI="http://avahi.org/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-~x86-linux"
-IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6
-kernel_linux mdnsresponder-compat mono python qt3 qt4 test utils"
-
-DBUS_DEPEND=">=sys-apps/dbus-0.30"
-COMMON_DEPEND=">=dev-libs/libdaemon-0.14
-	dev-libs/expat
-	dev-libs/glib:2
-	gdbm? ( sys-libs/gdbm )
-	qt3? ( dev-qt/qt-meta:3 )
-	qt4? ( dev-qt/qtcore:4 )
-	gtk? ( >=x11-libs/gtk+-2.14.0:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	dbus? (
-		${DBUS_DEPEND}
-		python? ( dev-python/dbus-python )
-	)
-	mono? (
-		>=dev-lang/mono-1.1.10
-		gtk? ( >=dev-dotnet/gtk-sharp-2 )
-	)
-	howl-compat? ( ${DBUS_DEPEND} )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	mdnsresponder-compat? ( ${DBUS_DEPEND} )
-	python? (
-		gtk? ( >=dev-python/pygtk-2 )
-	)
-	bookmarks? (
-		dev-python/twisted
-		dev-python/twisted-web
-	)
-	kernel_linux? ( sys-libs/libcap )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.5
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		mono? ( >=virtual/monodoc-1.1.8 )
-	)"
-RDEPEND="${COMMON_DEPEND}
-	howl-compat? ( !net-misc/howl )
-	mdnsresponder-compat? ( !net-misc/mDNSResponder )"
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-
-	if use python && ! use dbus && ! use gtk; then
-		ewarn "For proper python support you should also enable the dbus and gtk USE flags!"
-	fi
-
-	# FIXME: Use REQUIRED_USE once python.eclass gets EAPI 4 support, bug 372255
-	if use utils && ! { use gtk || use gtk3; }; then
-		ewarn "To install the avahi utilities, USE='gtk utils' or USE='gtk3 utils''"
-	fi
-}
-
-pkg_preinst() {
-	enewgroup netdev
-	enewgroup avahi
-	enewuser avahi -1 -1 -1 avahi
-
-	if use autoipd; then
-		enewgroup avahi-autoipd
-		enewuser avahi-autoipd -1 -1 -1 avahi-autoipd
-	fi
-}
-
-src_prepare() {
-	if use ipv6; then
-		sed -i \
-			-e s/use-ipv6=no/use-ipv6=yes/ \
-			avahi-daemon/avahi-daemon.conf || die
-	fi
-
-	sed -i\
-		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
-		doxygen_to_devhelp.xsl || die
-
-	# Make gtk utils optional
-	epatch "${FILESDIR}/${PN}-0.6.30-optional-gtk-utils.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	use sh && replace-flags -O? -O0
-
-	local myconf="--disable-static"
-
-	if use python; then
-		myconf+="
-			$(use_enable dbus python-dbus)
-			$(use_enable gtk pygtk)
-		"
-	fi
-
-	if use mono; then
-		myconf+=" $(use_enable doc monodoc)"
-	fi
-
-	# these require dbus enabled
-	if use mdnsresponder-compat || use howl-compat || use mono; then
-		myconf+=" --enable-dbus"
-	fi
-
-	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
-	unset DISPLAY
-
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		--with-distro=gentoo \
-		--disable-python-dbus \
-		--disable-pygtk \
-		--disable-xmltoman \
-		--disable-monodoc \
-		--enable-glib \
-		--enable-gobject \
-		$(use_enable test tests) \
-		$(use_enable autoipd) \
-		$(use_enable mdnsresponder-compat compat-libdns_sd) \
-		$(use_enable howl-compat compat-howl) \
-		$(use_enable doc doxygen-doc) \
-		$(use_enable mono) \
-		$(use_enable dbus) \
-		$(use_enable python) \
-		$(use_enable gtk) \
-		$(use_enable gtk3) \
-		$(use_enable introspection) \
-		$(use_enable utils gtk-utils) \
-		$(use_enable qt3) \
-		$(use_enable qt4) \
-		$(use_enable gdbm) \
-		${myconf}
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	use doc && { emake avahi.devhelp || die ; }
-}
-
-src_install() {
-	emake install py_compile=true DESTDIR="${D}" || die "make install failed"
-	use bookmarks && use python && use dbus && use gtk || \
-		rm -f "${ED}"/usr/bin/avahi-bookmarks
-
-	use howl-compat && ln -s avahi-compat-howl.pc "${ED}"/usr/$(get_libdir)/pkgconfig/howl.pc
-	use mdnsresponder-compat && ln -s avahi-compat-libdns_sd/dns_sd.h "${ED}"/usr/include/dns_sd.h
-
-	if use autoipd; then
-		insinto /$(get_libdir)/rcscripts/net
-		doins "${FILESDIR}"/autoipd.sh || die
-
-		insinto /$(get_libdir)/rc/net
-		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh || die
-	fi
-
-	dodoc docs/{AUTHORS,NEWS,README,TODO} || die
-
-	if use doc; then
-		dohtml -r doxygen/html/. || die
-		insinto /usr/share/devhelp/books/avahi
-		doins avahi.devhelp || die
-	fi
-
-	# Remove .la files
-	find "${D}" -name '*.la' -exec rm -f {} + || die
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup avahi $(use dbus && use gtk && echo avahi_discover)
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize avahi $(use dbus && use gtk && echo avahi_discover)
-
-	if use autoipd; then
-		echo
-		elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
-		elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
-	fi
-
-	if use dbus; then
-		echo
-		elog "If this is your first install of avahi please reload your dbus config"
-		elog "with /etc/init.d/dbus reload before starting avahi-daemon!"
-	fi
-}
diff --git a/net-dns/avahi/avahi-0.6.31-r2.ebuild b/net-dns/avahi/avahi-0.6.31-r2.ebuild
deleted file mode 100644
index 11d20fc1..00000000
--- a/net-dns/avahi/avahi-0.6.31-r2.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.31-r2.ebuild,v 1.14 2013/10/12 12:14:46 pacho Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="gdbm"
-
-WANT_AUTOMAKE=1.11
-
-inherit autotools eutils mono python-r1 multilib flag-o-matic user systemd
-
-DESCRIPTION="System which facilitates service discovery on a local network"
-HOMEPAGE="http://avahi.org/"
-SRC_URI="http://avahi.org/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 s390 ~sparc x86 ~x86-linux"
-IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono python qt3 qt4 test utils"
-
-REQUIRED_USE="
-	utils? ( || ( gtk gtk3 ) )
-	python? ( dbus gdbm )
-	mono? ( dbus )
-	howl-compat? ( dbus )
-	mdnsresponder-compat? ( dbus )
-"
-
-COMMON_DEPEND="
-	dev-libs/libdaemon
-	dev-libs/expat
-	dev-libs/glib:2
-	gdbm? ( sys-libs/gdbm )
-	qt3? ( dev-qt/qt-meta:3 )
-	qt4? ( dev-qt/qtcore:4 )
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	dbus? ( sys-apps/dbus )
-	kernel_linux? ( sys-libs/libcap )
-	introspection? ( dev-libs/gobject-introspection )
-	mono? (
-		dev-lang/mono
-		gtk? ( dev-dotnet/gtk-sharp )
-	)
-	python? (
-		gtk? ( dev-python/pygtk )
-		dbus? ( dev-python/dbus-python )
-	)
-	bookmarks? (
-		dev-python/twisted-core
-		dev-python/twisted-web
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-	)
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	howl-compat? ( !net-misc/howl )
-	mdnsresponder-compat? ( !net-misc/mDNSResponder )
-"
-
-pkg_preinst() {
-	enewgroup netdev
-	enewgroup avahi
-	enewuser avahi -1 -1 -1 avahi
-
-	if use autoipd; then
-		enewgroup avahi-autoipd
-		enewuser avahi-autoipd -1 -1 -1 avahi-autoipd
-	fi
-}
-
-src_prepare() {
-	if use ipv6; then
-		sed -i \
-			-e s/use-ipv6=no/use-ipv6=yes/ \
-			avahi-daemon/avahi-daemon.conf || die
-	fi
-
-	sed -i\
-		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
-		doxygen_to_devhelp.xsl || die
-
-	# Make gtk utils optional
-	epatch "${FILESDIR}"/${PN}-0.6.30-optional-gtk-utils.patch
-
-	# Fix init scripts for >=openrc-0.9.0, bug #383641
-	epatch "${FILESDIR}"/${PN}-0.6.x-openrc-0.9.x-init-scripts-fixes.patch
-
-	# install-exec-local -> install-exec-hook
-	epatch "${FILESDIR}"/${P}-install-exec-hook.patch
-
-	# Backport host-name-from-machine-id patch, bug #466134
-	epatch "${FILESDIR}"/${P}-host-name-from-machine-id.patch
-
-	# Don't install avahi-discover unless ENABLE_GTK_UTILS, bug #359575
-	epatch "${FILESDIR}"/${P}-fix-install-avahi-discover.patch
-
-	# Drop DEPRECATED flags, bug #384743
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED=1::g' avahi-ui/Makefile.am || die
-
-	# Fix references to Lennart's home directory, bug #466210
-	sed -i -e 's/\/home\/lennart\/tmp\/avahi//g' man/* || die
-
-	# Prevent .pyc files in DESTDIR
-	>py-compile
-
-	eautoreconf
-}
-
-src_configure() {
-	use sh && replace-flags -O? -O0
-
-	local myconf="--disable-static"
-
-	if use python; then
-		python_export_best
-		myconf+="
-			$(use_enable dbus python-dbus)
-			$(use_enable gtk pygtk)
-		"
-	fi
-
-	if use mono; then
-		myconf+=" $(use_enable doc monodoc)"
-	fi
-
-	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
-	unset DISPLAY
-
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		--with-distro=gentoo \
-		--disable-python-dbus \
-		--disable-pygtk \
-		--disable-xmltoman \
-		--disable-monodoc \
-		--enable-glib \
-		--enable-gobject \
-		$(use_enable test tests) \
-		$(use_enable autoipd) \
-		$(use_enable mdnsresponder-compat compat-libdns_sd) \
-		$(use_enable howl-compat compat-howl) \
-		$(use_enable doc doxygen-doc) \
-		$(use_enable mono) \
-		$(use_enable dbus) \
-		$(use_enable python) \
-		$(use_enable gtk) \
-		$(use_enable gtk3) \
-		$(use_enable introspection) \
-		$(use_enable utils gtk-utils) \
-		$(use_enable qt3) \
-		$(use_enable qt4) \
-		$(use_enable gdbm) \
-		$(systemd_with_unitdir) \
-		${myconf}
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	use doc && { emake avahi.devhelp || die ; }
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
-	use bookmarks && use python && use dbus && use gtk || \
-		rm -f "${ED}"/usr/bin/avahi-bookmarks
-
-	use howl-compat && ln -s avahi-compat-howl.pc "${ED}"/usr/$(get_libdir)/pkgconfig/howl.pc
-	use mdnsresponder-compat && ln -s avahi-compat-libdns_sd/dns_sd.h "${ED}"/usr/include/dns_sd.h
-
-	if use autoipd; then
-		insinto /$(get_libdir)/rcscripts/net
-		doins "${FILESDIR}"/autoipd.sh || die
-
-		insinto /$(get_libdir)/rc/net
-		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh || die
-	fi
-
-	dodoc docs/{AUTHORS,NEWS,README,TODO} || die
-
-	if use doc; then
-		dohtml -r doxygen/html/. || die
-		insinto /usr/share/devhelp/books/avahi
-		doins avahi.devhelp || die
-	fi
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
-
-pkg_postinst() {
-	if use autoipd; then
-		elog
-		elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)"
-		elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!"
-		elog
-	fi
-}
diff --git a/net-dns/avahi/avahi-0.6.31-r6.ebuild b/net-dns/avahi/avahi-0.6.31-r6.ebuild
index e4b38704..b140ed6d 100644
--- a/net-dns/avahi/avahi-0.6.31-r6.ebuild
+++ b/net-dns/avahi/avahi-0.6.31-r6.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/avahi-0.6.31-r6.ebuild,v 1.11 2015/04/08 18:16:54 mgorny Exp $
 
 EAPI="5"
 
@@ -19,10 +18,10 @@ SRC_URI="http://avahi.org/download/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa m68k ~mips ~ppc ~ppc64 s390 ~sparc x86 ~x86-linux"
-IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt3 qt4 selinux test utils"
+IUSE="autoipd bookmarks dbus doc gdbm gtk howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt3 qt4 selinux test utils"
 
 REQUIRED_USE="
-	utils? ( || ( gtk gtk3 ) )
+	utils? ( gtk )
 	python? ( dbus gdbm )
 	mono? ( dbus )
 	howl-compat? ( dbus )
@@ -36,33 +35,23 @@ COMMON_DEPEND="
 	gdbm? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
 	qt3? ( dev-qt/qt-meta:3 )
 	qt4? ( dev-qt/qtcore:4 )
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
+	gtk? ( x11-libs/gtk+:3 )
 	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
 	kernel_linux? ( sys-libs/libcap )
 	introspection? ( dev-libs/gobject-introspection )
-	mono? (
-		dev-lang/mono
-		gtk? ( dev-dotnet/gtk-sharp )
-	)
+	mono? ( dev-lang/mono )
 	python? (
 		${PYTHON_DEPS}
-		gtk? ( dev-python/pygtk )
 		dbus? ( dev-python/dbus-python )
 	)
-	bookmarks? (
-		dev-python/twisted-core
-		dev-python/twisted-web
-	)
+	bookmarks? ( dev-python/twisted )
 "
 
 DEPEND="
 	${COMMON_DEPEND}
 	dev-util/intltool
 	>=virtual/pkgconfig-0-r1
-	doc? (
-		app-doc/doxygen
-	)
+	doc? ( app-doc/doxygen )
 "
 
 RDEPEND="
@@ -159,7 +148,7 @@ multilib_src_configure() {
 	if use python; then
 		myconf+=(
 			$(multilib_native_use_enable dbus python-dbus)
-			$(multilib_native_use_enable gtk pygtk)
+			--disable-pygtk
 		)
 	fi
 
@@ -192,8 +181,8 @@ multilib_src_configure() {
 		$(multilib_native_use_enable mono) \
 		$(use_enable dbus) \
 		$(multilib_native_use_enable python) \
-		$(multilib_native_use_enable gtk) \
-		$(multilib_native_use_enable gtk3) \
+		--disable-gtk \
+		$(multilib_native_use_enable gtk gtk3) \
 		$(use_enable nls) \
 		$(multilib_native_use_enable introspection) \
 		$(multilib_native_use_enable utils gtk-utils) \
@@ -212,7 +201,7 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	emake install DESTDIR="${D}"
-	use bookmarks && use python && use dbus && use gtk || \
+	use bookmarks && use python && use dbus || \
 		rm -f "${ED}"/usr/bin/avahi-bookmarks
 
 	use howl-compat && dosym avahi-compat-howl.pc /usr/$(get_libdir)/pkgconfig/howl.pc
diff --git a/net-dns/avahi/metadata.xml b/net-dns/avahi/metadata.xml
index d7665549..626558ea 100644
--- a/net-dns/avahi/metadata.xml
+++ b/net-dns/avahi/metadata.xml
@@ -2,16 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
-<maintainer>
-	<email>swegener@gentoo.org</email>
-</maintainer>
 <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='howl-compat'>Enable compat libraries for howl</flag>
-	<flag name="gtk3">Build the avahi-ui-gtk3 library, and use gtk3 for the
+	<flag name="gtk">Build the avahi-ui-gtk3 library, and use gtk3 for the
 		avahi utilities under USE=utils</flag>
 	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
 		for introspection</flag>