commit: 50b908503ff65ef2ea96b09b7a21c6b46935ffa2 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri May 28 15:31:56 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Fri May 28 15:31:56 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50b90850
net-dns/avahi: use python-single-r1 instead of python-r1 * Only builds one Python implementation => python-single-r1 * Fix REQUIRED_USE logic. We need to have it all together for python_gen_cond_dep, so we move the bookmarks? (...) dep within the python? ( ... ) one. Closes: https://bugs.gentoo.org/705386 Closes: https://bugs.gentoo.org/710244 Closes: https://bugs.gentoo.org/788043 Signed-off-by: Sam James <sam <AT> gentoo.org> Signed-off-by: David Seifert <soap <AT> gentoo.org> .../{avahi-0.8-r3.ebuild => avahi-0.8-r4.ebuild} | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/net-dns/avahi/avahi-0.8-r3.ebuild b/net-dns/avahi/avahi-0.8-r4.ebuild similarity index 91% rename from net-dns/avahi/avahi-0.8-r3.ebuild rename to net-dns/avahi/avahi-0.8-r4.ebuild index 8c9e10456e2..b7310b994e3 100644 --- a/net-dns/avahi/avahi-0.8-r3.ebuild +++ b/net-dns/avahi/avahi-0.8-r4.ebuild @@ -5,7 +5,7 @@ EAPI="7" PYTHON_COMPAT=( python3_{7,8} ) PYTHON_REQ_USE="gdbm" -inherit autotools flag-o-matic multilib-minimal mono-env python-r1 systemd +inherit autotools flag-o-matic multilib-minimal mono-env python-single-r1 systemd DESCRIPTION="System which facilitates service discovery on a local network" HOMEPAGE="http://avahi.org/"; @@ -18,6 +18,7 @@ IUSE="autoipd bookmarks +dbus doc gdbm gtk howl-compat +introspection ipv6 kerne REQUIRED_USE=" python? ( dbus gdbm ${PYTHON_REQUIRED_USE} ) + bookmarks? ( python ) mono? ( dbus ) howl-compat? ( dbus ) mdnsresponder-compat? ( dbus ) @@ -40,12 +41,11 @@ DEPEND=" mono? ( dev-lang/mono ) python? ( ${PYTHON_DEPS} - dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) - introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] ) - ) - bookmarks? ( - ${PYTHON_DEPS} - >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] + $(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=" @@ -83,7 +83,7 @@ PATCHES=( pkg_setup() { use mono && mono-env_pkg_setup - use python || use bookmarks && python_setup + use python && python-single-r1_pkg_setup } src_prepare() { @@ -166,8 +166,10 @@ multilib_src_compile() { multilib_src_install() { emake install DESTDIR="${D}" - use bookmarks && use python && use dbus || \ - rm -f "${ED}"/usr/bin/avahi-bookmarks + + 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 @@ -185,6 +187,8 @@ multilib_src_install() { } multilib_src_install_all() { + use python && python_optimize + if use autoipd; then insinto /lib/rcscripts/net doins "${FILESDIR}"/autoipd.sh
