From e9d044d4b9b71200a96adfa280848858c0f468c9 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sat, 13 Nov 2021 13:10:00 +0000
Subject: gentoo resync : 13.11.2021

---
 net-dns/avahi/Manifest            |   2 +-
 net-dns/avahi/avahi-0.8-r4.ebuild | 214 --------------------------------------
 net-dns/avahi/avahi-0.8-r5.ebuild | 214 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 215 insertions(+), 215 deletions(-)
 delete mode 100644 net-dns/avahi/avahi-0.8-r4.ebuild
 create mode 100644 net-dns/avahi/avahi-0.8-r5.ebuild

(limited to 'net-dns/avahi')

diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 2baa2d552d90..8e393d4d195e 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -2,5 +2,5 @@ AUX autoipd-openrc.sh 700 BLAKE2B e71e5583db890f8ee1bbe9c03fc42285871089b2ea2d45
 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-r4.ebuild 5329 BLAKE2B 2d8dc626e3f9490d2cf1ed3d551593a63815faa6f1c82e71647d70c2c88b38eac1aa98708c40f380d0bffe3f4391b80d17a4fa71b572ec68957a107c105b7ca5 SHA512 e0c0ee1febdb50396b004fe691968f8eb33ddc5902faf5f60c8bef3da866a83919e468280c578a2049340140922cf194a2b1234ce6e471bbf50ba7950f5dbe0e
+EBUILD avahi-0.8-r5.ebuild 5329 BLAKE2B a94542ec6e9190008a888c35cd6ea80836240c86283fbb2551761e522838be14acb349adaa94ea5e076603cc3c831c165b319e0604746f69e2d215fbd1d20f21 SHA512 7b13ec7a9ef088cc6fe92bef3a3748777cac7ed59e55051e36e1f8d8c17f3d46361070b230fee5faf1f4730448614d5604027ab23f8eec0af79a6ca1c819b83a
 MISC metadata.xml 866 BLAKE2B 1bbb5863a98c0f5aa6b3b7337c7f8c3ae21b5701f780fb53fa036dde754582462f2bc09d3999bdda524616951c3dcef5153ed77a27ec0877673cab782f480691 SHA512 775872c0491b4b7c448a70336d112e2c7435baddc18c851bb93bd3e2aa0138290e9952b3cb2abff60df78d03c7aad23d4ee5d704ba6afe30f489b76e5ba2e132
diff --git a/net-dns/avahi/avahi-0.8-r4.ebuild b/net-dns/avahi/avahi-0.8-r4.ebuild
deleted file mode 100644
index 9d623e4c624c..000000000000
--- a/net-dns/avahi/avahi-0.8-r4.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="gdbm"
-inherit autotools flag-o-matic multilib-minimal mono-env python-single-r1 systemd
-
-DESCRIPTION="System which facilitates service discovery on a local network"
-HOMEPAGE="https://avahi.org/"
-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 ~riscv ~s390 sparc x86"
-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} )
-	bookmarks? ( python )
-	mono? ( dbus )
-	howl-compat? ( dbus )
-	mdnsresponder-compat? ( dbus )
-	systemd? ( dbus )
-"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/libdaemon
-	dev-libs/libevent:=[${MULTILIB_USEDEP}]
-	dev-libs/expat
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	gdbm? ( sys-libs/gdbm:=[${MULTILIB_USEDEP}] )
-	qt5? ( dev-qt/qtcore:5 )
-	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 )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			bookmarks? ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] )
-			dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-			introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )
-		')
-	)
-"
-RDEPEND="
-	acct-user/avahi
-	acct-group/avahi
-	acct-group/netdev
-	autoipd? (
-		acct-user/avahi-autoipd
-		acct-group/avahi-autoipd
-	)
-	${DEPEND}
-	selinux? ( sec-policy/selinux-avahi )
-"
-BDEPEND="
-	dev-util/glib-utils
-	doc? ( app-doc/doxygen )
-	app-doc/xmltoman
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-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.
-#	"${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
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if ! use ipv6; then
-		sed -i \
-			-e "s/use-ipv6=yes/use-ipv6=no/" \
-			avahi-daemon/avahi-daemon.conf || die
-	fi
-
-	sed -i \
-		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
-		doxygen_to_devhelp.xsl || die
-
-	eautoreconf
-
-	# bundled manpages
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-gtk
-		--disable-monodoc
-		--disable-python-dbus
-		--disable-qt3
-		--disable-qt4
-		--disable-static
-		--enable-manpages
-		--enable-glib
-		--enable-gobject
-		--enable-xmltoman
-		--localstatedir="${EPREFIX}/var"
-		--with-distro=gentoo
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		$(use_enable dbus)
-		$(use_enable gdbm)
-		$(use_enable gtk gtk3)
-		$(use_enable howl-compat compat-howl)
-		$(use_enable mdnsresponder-compat compat-libdns_sd)
-		$(use_enable nls)
-		$(multilib_native_use_enable autoipd)
-		$(multilib_native_use_enable doc doxygen-doc)
-		$(multilib_native_use_enable introspection)
-		$(multilib_native_use_enable mono)
-		$(multilib_native_use_enable python)
-		$(multilib_native_use_enable test tests)
-	)
-
-	if use python; then
-		myconf+=(
-			$(multilib_native_use_enable dbus python-dbus)
-			$(multilib_native_use_enable introspection pygobject)
-		)
-	fi
-
-	if use mono; then
-		myconf+=( $(multilib_native_use_enable doc monodoc) )
-	fi
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# used by daemons only
-			--disable-libdaemon
-			--with-xml=none
-		)
-	fi
-
-	myconf+=( $(multilib_native_use_enable qt5) )
-
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake
-
-	multilib_is_native_abi && use doc && emake avahi.devhelp
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	if ! use bookmarks || ! use python || ! use dbus; then
-		rm -f "${ED}"/usr/bin/avahi-bookmarks || die
-	fi
-
-	# https://github.com/lathiat/avahi/issues/28
-	use howl-compat && dosym avahi-compat-howl.pc /usr/$(get_libdir)/pkgconfig/howl.pc
-	use mdnsresponder-compat && dosym avahi-compat-libdns_sd/dns_sd.h /usr/include/dns_sd.h
-
-	if multilib_is_native_abi && use doc; then
-		docinto html
-		dodoc -r doxygen/html/.
-		insinto /usr/share/devhelp/books/avahi
-		doins avahi.devhelp
-	fi
-
-	# The build system creates an empty "/run" directory, so we clean it up here
-	rmdir "${ED}"/run || die
-}
-
-multilib_src_install_all() {
-	use python && python_optimize
-
-	if use autoipd; then
-		insinto /lib/rcscripts/net
-		doins "${FILESDIR}"/autoipd.sh
-
-		insinto /lib/netifrc/net
-		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh
-	fi
-
-	dodoc docs/{AUTHORS,NEWS,README,TODO}
-
-	find "${ED}" -name '*.la' -type f -delete || die
-}
-
-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
-
-	systemd_reenable avahi-daemon.service
-}
diff --git a/net-dns/avahi/avahi-0.8-r5.ebuild b/net-dns/avahi/avahi-0.8-r5.ebuild
new file mode 100644
index 000000000000..f2ba57953f04
--- /dev/null
+++ b/net-dns/avahi/avahi-0.8-r5.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="gdbm"
+inherit autotools flag-o-matic multilib-minimal mono-env python-single-r1 systemd
+
+DESCRIPTION="System which facilitates service discovery on a local network"
+HOMEPAGE="https://avahi.org/"
+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 ~riscv ~s390 sparc x86"
+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} )
+	bookmarks? ( python )
+	mono? ( dbus )
+	howl-compat? ( dbus )
+	mdnsresponder-compat? ( dbus )
+	systemd? ( dbus )
+"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/libdaemon
+	dev-libs/libevent:=[${MULTILIB_USEDEP}]
+	dev-libs/expat
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	gdbm? ( sys-libs/gdbm:=[${MULTILIB_USEDEP}] )
+	qt5? ( dev-qt/qtcore:5 )
+	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 )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			bookmarks? ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] )
+			dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+			introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )
+		')
+	)
+"
+RDEPEND="
+	acct-user/avahi
+	acct-group/avahi
+	acct-group/netdev
+	autoipd? (
+		acct-user/avahi-autoipd
+		acct-group/avahi-autoipd
+	)
+	${DEPEND}
+	selinux? ( sec-policy/selinux-avahi )
+"
+BDEPEND="
+	dev-util/glib-utils
+	doc? ( app-doc/doxygen )
+	app-doc/xmltoman
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+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.
+#	"${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
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if ! use ipv6; then
+		sed -i \
+			-e "s/use-ipv6=yes/use-ipv6=no/" \
+			avahi-daemon/avahi-daemon.conf || die
+	fi
+
+	sed -i \
+		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
+		doxygen_to_devhelp.xsl || die
+
+	eautoreconf
+
+	# bundled manpages
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-gtk
+		--disable-monodoc
+		--disable-python-dbus
+		--disable-qt3
+		--disable-qt4
+		--disable-static
+		--enable-manpages
+		--enable-glib
+		--enable-gobject
+		--enable-xmltoman
+		--localstatedir="${EPREFIX}/var"
+		--with-distro=gentoo
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		$(use_enable dbus)
+		$(use_enable gdbm)
+		$(use_enable gtk gtk3)
+		$(use_enable howl-compat compat-howl)
+		$(use_enable mdnsresponder-compat compat-libdns_sd)
+		$(use_enable nls)
+		$(multilib_native_use_enable autoipd)
+		$(multilib_native_use_enable doc doxygen-doc)
+		$(multilib_native_use_enable introspection)
+		$(multilib_native_use_enable mono)
+		$(multilib_native_use_enable python)
+		$(multilib_native_use_enable test tests)
+	)
+
+	if use python; then
+		myconf+=(
+			$(multilib_native_use_enable dbus python-dbus)
+			$(multilib_native_use_enable introspection pygobject)
+		)
+	fi
+
+	if use mono; then
+		myconf+=( $(multilib_native_use_enable doc monodoc) )
+	fi
+
+	if ! multilib_is_native_abi; then
+		myconf+=(
+			# used by daemons only
+			--disable-libdaemon
+			--with-xml=none
+		)
+	fi
+
+	myconf+=( $(multilib_native_use_enable qt5) )
+
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake
+
+	multilib_is_native_abi && use doc && emake avahi.devhelp
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+
+	if ! use bookmarks || ! use python || ! use dbus; then
+		rm -f "${ED}"/usr/bin/avahi-bookmarks || die
+	fi
+
+	# https://github.com/lathiat/avahi/issues/28
+	use howl-compat && dosym avahi-compat-howl.pc /usr/$(get_libdir)/pkgconfig/howl.pc
+	use mdnsresponder-compat && dosym avahi-compat-libdns_sd/dns_sd.h /usr/include/dns_sd.h
+
+	if multilib_is_native_abi && use doc; then
+		docinto html
+		dodoc -r doxygen/html/.
+		insinto /usr/share/devhelp/books/avahi
+		doins avahi.devhelp
+	fi
+
+	# The build system creates an empty "/run" directory, so we clean it up here
+	rmdir "${ED}"/run || die
+}
+
+multilib_src_install_all() {
+	use python && python_optimize
+
+	if use autoipd; then
+		insinto /lib/rcscripts/net
+		doins "${FILESDIR}"/autoipd.sh
+
+		insinto /lib/netifrc/net
+		newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh
+	fi
+
+	dodoc docs/{AUTHORS,NEWS,README,TODO}
+
+	find "${ED}" -name '*.la' -type f -delete || die
+}
+
+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
+
+	systemd_reenable avahi-daemon.service
+}
-- 
cgit v1.2.3