public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Mart Raudsepp" <leio@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/networkmanager/
Date: Sat, 27 Jul 2019 10:14:23 +0000 (UTC)	[thread overview]
Message-ID: <1564222426.5e34f9942fe2cbb7320ec0ea9dc91e92ce4f3f75.leio@gentoo> (raw)

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] )


             reply	other threads:[~2019-07-27 10:14 UTC|newest]

Thread overview: 297+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-27 10:14 Mart Raudsepp [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-07-17 12:12 [gentoo-commits] repo/gentoo:master commit in: net-misc/networkmanager/ Pacho Ramos
2024-04-13 10:37 Mart Raudsepp
2024-04-09 19:59 Arthur Zamarin
2024-04-07 10:33 Arthur Zamarin
2024-04-07  9:14 Arthur Zamarin
2024-03-16 22:07 Mart Raudsepp
2024-03-01 19:31 Patrick McLean
2024-01-24 11:11 Sam James
2024-01-12 19:08 Michał Górny
2023-10-03 21:08 Mart Raudsepp
2023-10-03  2:04 Sam James
2023-08-16 22:32 Matt Turner
2023-08-14 13:59 Matt Turner
2023-07-06 21:26 Matt Turner
2023-05-17 21:55 Matt Turner
2023-05-05  8:01 Arthur Zamarin
2023-05-05  6:36 Arthur Zamarin
2023-05-02 19:57 Arthur Zamarin
2023-05-02 19:07 Arthur Zamarin
2023-05-02 18:13 Arthur Zamarin
2023-05-02 18:03 Arthur Zamarin
2023-04-23  4:46 Sam James
2023-04-21 14:00 Matt Turner
2023-04-02  0:57 Matt Turner
2023-04-01 19:01 Arthur Zamarin
2023-03-31 12:04 Arthur Zamarin
2023-03-30 17:44 Arthur Zamarin
2023-03-12  2:01 Matt Turner
2023-02-23 18:07 Matt Turner
2023-02-23 18:07 Matt Turner
2023-02-23 13:56 Pacho Ramos
2023-02-20 17:32 Matt Turner
2023-02-16 18:39 Arthur Zamarin
2023-02-16 18:39 Arthur Zamarin
2023-02-10 19:18 Matt Turner
2023-01-12 19:37 Matt Turner
2023-01-03 14:08 Matt Turner
2022-12-22 11:13 Arthur Zamarin
2022-12-17  6:45 Arthur Zamarin
2022-12-16 20:57 Arthur Zamarin
2022-12-16 19:44 Matt Turner
2022-12-04  2:41 Matt Turner
2022-11-21 15:13 Matt Turner
2022-11-05 18:45 Matt Turner
2022-11-05  9:58 Arthur Zamarin
2022-11-05  9:44 Arthur Zamarin
2022-10-31 17:58 Matt Turner
2022-10-18 18:10 Matt Turner
2022-10-14 14:29 Matt Turner
2022-09-28 16:29 Arthur Zamarin
2022-09-28 16:29 Arthur Zamarin
2022-09-19  1:38 Sam James
2022-09-12 16:01 Sam James
2022-09-12 16:00 Sam James
2022-09-01  1:20 Matt Turner
2022-09-01  1:20 Matt Turner
2022-08-12  2:50 Matt Turner
2022-07-21  2:04 Matt Turner
2022-07-21  0:13 Sam James
2022-07-18 17:44 Sam James
2022-06-25 15:02 Mike Gilbert
2022-06-20  0:06 Kenton Groombridge
2022-06-20  0:00 Kenton Groombridge
2022-06-17 17:45 Matt Turner
2022-06-17 13:21 Matt Turner
2022-05-31 18:24 Matt Turner
2022-05-31  9:24 Jakov Smolić
2022-05-28  5:05 Sam James
2022-05-24 11:14 WANG Xuerui
2022-05-13 15:47 Matt Turner
2022-03-23  6:14 Matt Turner
2022-03-18 19:24 Matt Turner
2022-03-09  1:57 Sam James
2022-03-08 18:41 Sam James
2022-02-18 22:58 Sam James
2022-01-13 22:34 Matt Turner
2022-01-04 10:30 David Seifert
2021-12-29 17:52 Arthur Zamarin
2021-12-29 17:51 Arthur Zamarin
2021-12-29  9:30 Sam James
2021-12-29  9:30 Sam James
2021-12-29  9:29 Sam James
2021-12-29  9:29 Sam James
2021-12-07  6:26 Agostino Sarubbo
2021-12-07  6:22 Agostino Sarubbo
2021-12-07  2:17 Sam James
2021-12-07  0:32 Sam James
2021-12-07  0:31 Sam James
2021-12-07  0:31 Sam James
2021-12-05 18:33 Sam James
2021-11-06  3:58 Sam James
2021-10-28  3:22 Sam James
2021-10-20  1:54 Sam James
2021-10-04  1:24 Sam James
2021-09-25 19:08 Sam James
2021-08-22 20:24 Matt Turner
2021-08-22 19:35 Matt Turner
2021-08-20 23:51 Sam James
2021-08-20 23:51 Sam James
2021-08-20  9:35 Yixun Lan
2021-08-20  1:50 Sam James
2021-08-19  2:10 Sam James
2021-08-12 21:32 Matt Turner
2021-07-29 19:50 Matt Turner
2021-07-26  5:59 Matt Turner
2021-07-06  2:33 Matt Turner
2021-07-05 20:20 Matt Turner
2021-05-29 15:27 Sam James
2021-05-28 19:20 Sam James
2021-05-28 19:11 Sam James
2021-04-27 12:36 Thomas Deutschmann
2021-04-12 22:12 Sam James
2021-04-12 22:12 Sam James
2021-03-12 15:28 Sam James
2021-03-12  8:04 Mikle Kolyada
2021-03-11  2:35 Sam James
2021-02-06  9:59 Mart Raudsepp
2021-01-08 15:26 Sam James
2021-01-08  2:34 Matt Turner
2020-12-17  6:44 Sam James
2020-12-16 22:33 Sam James
2020-12-14  1:24 Sam James
2020-12-14  1:02 Sam James
2020-12-10 21:41 Thomas Deutschmann
2020-12-08 10:05 Mart Raudsepp
2020-11-05  2:43 Thomas Deutschmann
2020-11-05  2:43 Thomas Deutschmann
2020-10-09  3:38 Sam James
2020-10-08 19:15 Mikle Kolyada
2020-09-24  6:52 Agostino Sarubbo
2020-09-06 22:04 Sam James
2020-08-23 20:13 Sam James
2020-08-22  7:21 Mart Raudsepp
2020-08-17 13:50 Agostino Sarubbo
2020-08-17 10:01 Agostino Sarubbo
2020-08-17  9:57 Agostino Sarubbo
2020-07-15  9:06 Mart Raudsepp
2020-06-11  8:31 Agostino Sarubbo
2020-06-08 16:34 Mart Raudsepp
2020-06-07  9:49 Mart Raudsepp
2020-06-07  8:48 Agostino Sarubbo
2020-06-07  8:47 Agostino Sarubbo
2020-06-07  8:46 Agostino Sarubbo
2020-06-07  8:44 Agostino Sarubbo
2020-06-06 22:24 Mart Raudsepp
2020-06-06  8:32 Mart Raudsepp
2020-04-26  8:09 Mart Raudsepp
2020-04-19 12:03 Mart Raudsepp
2020-04-19 12:03 Mart Raudsepp
2020-04-19 12:03 Mart Raudsepp
2020-04-17 19:50 Mart Raudsepp
2020-04-17 18:55 Andreas Sturmlechner
2020-04-14 17:05 Mart Raudsepp
2020-03-13 12:47 Joonas Niilola
2020-02-11 10:52 Agostino Sarubbo
2020-01-28  7:41 Agostino Sarubbo
2020-01-27 14:28 Agostino Sarubbo
2020-01-27  9:45 Mikle Kolyada
2020-01-26 22:39 Thomas Deutschmann
2020-01-21  8:47 Mart Raudsepp
2019-11-30 13:25 Mart Raudsepp
2019-11-28 10:57 Agostino Sarubbo
2019-11-28 10:55 Agostino Sarubbo
2019-11-27 13:17 Mikle Kolyada
2019-11-26 12:27 Agostino Sarubbo
2019-11-26  0:58 Thomas Deutschmann
2019-11-24 21:14 Aaron Bauman
2019-10-21 19:43 Matt Turner
2019-10-12 21:38 Mart Raudsepp
2019-09-13 12:58 Michał Górny
2019-09-08 10:47 Mart Raudsepp
2019-09-08  1:13 Thomas Deutschmann
2019-09-03  0:16 Aaron Bauman
2019-09-02 10:11 Agostino Sarubbo
2019-09-02  9:32 Agostino Sarubbo
2019-09-01 18:20 Mikle Kolyada
2019-08-31  5:26 Mikle Kolyada
2019-08-01 17:47 Robin H. Johnson
2019-07-28 17:41 Mart Raudsepp
2019-07-27  8:36 Mart Raudsepp
2019-06-09 13:51 Pacho Ramos
2019-05-23  6:59 Aaron Bauman
2019-04-28 20:17 Mikle Kolyada
2019-04-28 14:41 Mart Raudsepp
2019-04-28 13:03 Sergei Trofimovich
2019-04-28  7:42 Sergei Trofimovich
2019-04-27 16:25 Sergei Trofimovich
2019-04-27 16:03 Sergei Trofimovich
2019-04-24 21:33 Thomas Deutschmann
2019-04-23 19:23 Mikle Kolyada
2019-03-23 12:58 Mike Gilbert
2019-03-16  9:07 Mart Raudsepp
2019-03-16  9:07 Mart Raudsepp
2019-03-02 15:35 Mikle Kolyada
2019-02-24 19:01 Thomas Deutschmann
2019-02-24  9:03 Agostino Sarubbo
2019-02-23 14:11 Mart Raudsepp
2018-12-05 14:07 Mart Raudsepp
2018-12-05  7:34 Mikle Kolyada
2018-12-05  7:07 Mikle Kolyada
2018-12-04 16:27 Mikle Kolyada
2018-12-02 14:29 Mikle Kolyada
2018-12-02 10:12 Mikle Kolyada
2018-11-29 20:24 Mart Raudsepp
2018-11-25 10:03 Mikle Kolyada
2018-11-15  6:42 Mike Gilbert
2018-10-24 16:21 Mart Raudsepp
2018-10-20 11:39 Pacho Ramos
2018-10-20 11:39 Pacho Ramos
2018-10-07  0:16 Matt Turner
2018-09-18 14:41 Mart Raudsepp
2018-09-18 14:41 Mart Raudsepp
2018-09-07  9:51 Mart Raudsepp
2018-07-25 17:36 Mike Gilbert
2018-07-22  1:39 Mikle Kolyada
2018-07-14 20:10 Sergei Trofimovich
2018-07-09 16:14 Mikle Kolyada
2018-07-06 13:43 Thomas Deutschmann
2018-06-16 17:56 Pacho Ramos
2018-06-16 17:56 Pacho Ramos
2018-04-29 17:45 Mike Gilbert
2017-12-25 16:30 Mike Gilbert
2017-11-26 20:10 Mike Gilbert
2017-11-18 17:52 Sergei Trofimovich
2017-11-13 22:37 Sergei Trofimovich
2017-11-13 15:33 Manuel Rüger
2017-11-11 18:00 Thomas Deutschmann
2017-09-20 22:40 Mike Gilbert
2017-09-03  1:15 Mike Gilbert
2017-08-16 22:31 Gilles Dartiguelongue
2017-07-25 20:24 Mike Gilbert
2017-06-25 18:03 Mike Gilbert
2017-06-01  1:17 Mike Gilbert
2017-05-27 22:15 Mike Gilbert
2017-05-27 22:06 Mike Gilbert
2017-05-27 21:57 Mike Gilbert
2017-05-27 15:39 Mike Gilbert
2017-05-27 15:09 Andreas Sturmlechner
2017-05-23 18:47 Mike Gilbert
2017-05-23 18:04 Mike Gilbert
2017-02-24 21:29 Michael Weber
2017-02-24 14:07 Agostino Sarubbo
2017-02-16  0:17 Mart Raudsepp
2017-02-11 18:31 Pacho Ramos
2017-01-26 11:18 Mart Raudsepp
2017-01-16 22:05 Pacho Ramos
2017-01-16 17:30 Mike Gilbert
2017-01-16  2:39 Mike Gilbert
2017-01-15 16:44 Pacho Ramos
2017-01-15 16:00 Pacho Ramos
2016-12-06 20:46 Markus Meier
2016-09-29 18:31 Pacho Ramos
2016-09-19 13:17 Lars Wendler
2016-09-11 15:50 Mike Gilbert
2016-09-11 11:28 Gilles Dartiguelongue
2016-08-10 19:06 Pacho Ramos
2016-08-10 19:06 Pacho Ramos
2016-08-08 14:28 Mike Gilbert
2016-08-08  1:15 Mike Gilbert
2016-08-04 17:27 Mike Gilbert
2016-08-04  1:26 Mike Gilbert
2016-07-30 16:41 Pacho Ramos
2016-07-15 17:48 Mike Gilbert
2016-07-09 18:39 Pacho Ramos
2016-07-08 11:02 Agostino Sarubbo
2016-07-08  7:53 Agostino Sarubbo
2016-07-08  1:46 Jonathan Callen
2016-07-07 19:18 Pacho Ramos
2016-07-07 19:18 Pacho Ramos
2016-07-07 19:18 Pacho Ramos
2016-06-11 19:39 Pacho Ramos
2016-06-08 19:59 Markus Meier
2016-05-03 20:29 Markus Meier
2016-04-20  8:55 Agostino Sarubbo
2016-04-19 15:50 Markus Meier
2016-04-11 10:39 Agostino Sarubbo
2016-04-11 10:21 Agostino Sarubbo
2016-04-07 10:17 Jeroen Roovers
2016-04-03 12:42 Pacho Ramos
2016-04-03 12:42 Pacho Ramos
2016-04-02 20:38 Pacho Ramos
2016-01-16 10:48 Pacho Ramos
2015-12-26 14:20 Pacho Ramos
2015-11-19 10:04 Agostino Sarubbo
2015-11-13  9:12 Agostino Sarubbo
2015-11-12 11:07 Agostino Sarubbo
2015-11-11  8:20 Agostino Sarubbo
2015-11-10 17:02 Agostino Sarubbo
2015-10-03 11:53 Pacho Ramos
2015-09-28  4:44 Jeroen Roovers
2015-09-11  2:13 Alexandre Rostovtsev
2015-09-07 21:55 Mikle Kolyada
2015-09-05 10:30 Pacho Ramos
2015-09-05 10:28 Pacho Ramos
2015-09-05 10:26 Pacho Ramos
2015-09-05 10:23 Pacho Ramos

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1564222426.5e34f9942fe2cbb7320ec0ea9dc91e92ce4f3f75.leio@gentoo \
    --to=leio@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox