commit: 5e34f9942fe2cbb7320ec0ea9dc91e92ce4f3f75 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Sat Jul 27 10:13:46 2019 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Sat Jul 27 10:13:46 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e34f994
net-misc/networkmanager: relax nss vs gnutls requirement just default to nss for now when both are set, as the configure passing logic already does. Closes: https://bugs.gentoo.org/686408 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> net-misc/networkmanager/networkmanager-1.18.2.ebuild | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net-misc/networkmanager/networkmanager-1.18.2.ebuild b/net-misc/networkmanager/networkmanager-1.18.2.ebuild index b0be3d5fd13..f5a8fca5e85 100644 --- a/net-misc/networkmanager/networkmanager-1.18.2.ebuild +++ b/net-misc/networkmanager/networkmanager-1.18.2.ebuild @@ -22,7 +22,7 @@ REQUIRED_USE=" iwd? ( wifi ) vala? ( introspection ) wext? ( wifi ) - ^^ ( nss gnutls ) + || ( nss gnutls ) ?? ( consolekit elogind systemd ) " @@ -50,14 +50,14 @@ COMMON_DEPEND=" dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( net-misc/dhcpcd ) elogind? ( >=sys-auth/elogind-219 ) - gnutls? ( - dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}] - >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] ) + !nss? ( gnutls? ( + dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}] + >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
