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 8A17F138334 for ; Sat, 27 Jul 2019 10:14:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C9F36E0855; Sat, 27 Jul 2019 10:14:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 AFBFEE0855 for ; Sat, 27 Jul 2019 10:14:26 +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 B00E73485DC for ; Sat, 27 Jul 2019 10:14:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5B82E734 for ; Sat, 27 Jul 2019 10:14:23 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1564222426.5e34f9942fe2cbb7320ec0ea9dc91e92ce4f3f75.leio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/networkmanager/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/networkmanager/networkmanager-1.18.2.ebuild X-VCS-Directories: net-misc/networkmanager/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: 5e34f9942fe2cbb7320ec0ea9dc91e92ce4f3f75 X-VCS-Branch: master Date: Sat, 27 Jul 2019 10:14:23 +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: 90ef1ec1-5b79-4241-9139-469c824eb54e X-Archives-Hash: 724563234bfa935d0978e29c816f4ae8 commit: 5e34f9942fe2cbb7320ec0ea9dc91e92ce4f3f75 Author: Mart Raudsepp gentoo org> AuthorDate: Sat Jul 27 10:13:46 2019 +0000 Commit: Mart Raudsepp gentoo 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 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] )