From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D99031382C5 for ; Fri, 28 May 2021 15:32:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 31E06E09FD; Fri, 28 May 2021 15:32:28 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1C61BE09FD for ; Fri, 28 May 2021 15:32:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 915F6340E2D for ; Fri, 28 May 2021 15:32:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0366F78B for ; Fri, 28 May 2021 15:32:25 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1622215916.50b908503ff65ef2ea96b09b7a21c6b46935ffa2.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/avahi/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-dns/avahi/avahi-0.8-r3.ebuild net-dns/avahi/avahi-0.8-r4.ebuild X-VCS-Directories: net-dns/avahi/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 50b908503ff65ef2ea96b09b7a21c6b46935ffa2 X-VCS-Branch: master Date: Fri, 28 May 2021 15:32:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b7243887-945e-4aab-8c40-79efdee96fe3 X-Archives-Hash: c61983ab4f35b0814e3404fc584a8ef5 commit: 50b908503ff65ef2ea96b09b7a21c6b46935ffa2 Author: Sam James gentoo org> AuthorDate: Fri May 28 15:31:56 2021 +0000 Commit: David Seifert gentoo 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 gentoo.org> Signed-off-by: David Seifert 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