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 61E0A13835A for ; Sat, 5 Dec 2020 15:00:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A1208E085E; Sat, 5 Dec 2020 15:00:06 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 8B9B8E085E for ; Sat, 5 Dec 2020 15:00:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 9CCE23410EF for ; Sat, 5 Dec 2020 15:00:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B9374474 for ; Sat, 5 Dec 2020 15:00:02 +0000 (UTC) From: "Sergey Popov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergey Popov" Message-ID: <1607180323.936f3aef981b99b77e8b1d0c71ad8546f27e8dd4.pinkbyte@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/frr/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/frr/frr-7.5.ebuild X-VCS-Directories: net-misc/frr/ X-VCS-Committer: pinkbyte X-VCS-Committer-Name: Sergey Popov X-VCS-Revision: 936f3aef981b99b77e8b1d0c71ad8546f27e8dd4 X-VCS-Branch: master Date: Sat, 5 Dec 2020 15:00:02 +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: 62042105-2461-461c-a985-14fb739938e7 X-Archives-Hash: 814e2e83ebc2dc65300cc8489a6db0ce commit: 936f3aef981b99b77e8b1d0c71ad8546f27e8dd4 Author: Sergey Popov gentoo org> AuthorDate: Sat Dec 5 14:50:34 2020 +0000 Commit: Sergey Popov gentoo org> CommitDate: Sat Dec 5 14:58:43 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=936f3aef net-misc/frr: correct dependencies Add missing dependencies for tests Fix collision with net-libs/libsmi Reported-by: Toralf Förster gentoo.org> Closes: https://bugs.gentoo.org/758383 Closes: https://bugs.gentoo.org/758389 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Sergey Popov gentoo.org> net-misc/frr/frr-7.5.ebuild | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/net-misc/frr/frr-7.5.ebuild b/net-misc/frr/frr-7.5.ebuild index 1ed14a42b73..425a5994403 100644 --- a/net-misc/frr/frr-7.5.ebuild +++ b/net-misc/frr/frr-7.5.ebuild @@ -14,9 +14,10 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc fpm grpc ipv6 kernel_linux nhrp ospfapi pam rpki snmp systemd" +IUSE="doc fpm grpc ipv6 kernel_linux nhrp ospfapi pam rpki snmp systemd test" COMMON_DEPEND=" + ${PYTHON_DEPS} acct-user/frr dev-libs/json-c:0= >=net-libs/libyang-1.0.184 @@ -30,19 +31,18 @@ COMMON_DEPEND=" " BDEPEND=" - ${COMMON_DEPEND} doc? ( dev-python/sphinx ) sys-devel/flex virtual/yacc " DEPEND=" - ${PYTHON_DEPS} ${COMMON_DEPEND} + test? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') ) " RDEPEND=" - ${DEPEND} + ${COMMON_DEPEND} $(python_gen_cond_dep 'dev-python/ipaddr[${PYTHON_USEDEP}]') !!net-misc/quagga " @@ -53,6 +53,8 @@ PATCHES=( REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="!test? ( test )" + # FRR tarballs have weird format. S="${WORKDIR}/frr-${P}" @@ -142,4 +144,7 @@ src_install() { # Install init scripts systemd_dounit tools/frr.service newinitd "${FILESDIR}/frr-openrc-v1" frr + + # Conflict files, installed by net-libs/libsmi, bug #758383 + rm "${D}/usr/share/yang/ietf-interfaces.yang" || die }