commit: 936f3aef981b99b77e8b1d0c71ad8546f27e8dd4 Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> AuthorDate: Sat Dec 5 14:50:34 2020 +0000 Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> 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 <toralf <AT> 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 <pinkbyte <AT> 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 }
