From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1212972-garchives=archives.gentoo.org@lists.gentoo.org>
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 E82AD138359
for <garchives@archives.gentoo.org>; Fri, 9 Oct 2020 03:38:34 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 1FE60E082D;
Fri, 9 Oct 2020 03:38:34 +0000 (UTC)
Received: from smtp.gentoo.org (mail.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 9C4D5E082D
for <gentoo-commits@lists.gentoo.org>; Fri, 9 Oct 2020 03:38:33 +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 CB191340E47
for <gentoo-commits@lists.gentoo.org>; Fri, 9 Oct 2020 03:38:31 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id C7890379
for <gentoo-commits@lists.gentoo.org>; Fri, 9 Oct 2020 03:38:29 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1602214699.90701330ab4b859f2e1d57124bd092a85ba7d8cb.sam@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.4-r4.ebuild net-misc/networkmanager/networkmanager-1.18.6-r1.ebuild net-misc/networkmanager/networkmanager-1.20.12-r1.ebuild net-misc/networkmanager/networkmanager-1.22.14-r1.ebuild net-misc/networkmanager/networkmanager-1.24.2-r1.ebuild net-misc/networkmanager/networkmanager-1.26.0-r1.ebuild net-misc/networkmanager/networkmanager-1.26.2-r1.ebuild
X-VCS-Directories: net-misc/networkmanager/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 90701330ab4b859f2e1d57124bd092a85ba7d8cb
X-VCS-Branch: master
Date: Fri, 9 Oct 2020 03:38:29 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 3004e880-e7c6-4b1c-9ab3-a6c6ab745a02
X-Archives-Hash: ee3c2acb5d3008af63ef71f536a1a840
commit: 90701330ab4b859f2e1d57124bd092a85ba7d8cb
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 9 03:38:19 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 9 03:38:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90701330
net-misc/networkmanager: drop USE=consolekit again
Two problems with the initial draft PR:
1) elogind does not have multilib, so...
2) we must (ab)use 'consolekit' as a dummy option
for the build system in the non-native multilib
case.
Fixes: 1b636741c5d5a793b49abfa914f2d11241fec178
Closes: https://bugs.gentoo.org/747358
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../networkmanager/networkmanager-1.18.4-r4.ebuild | 18 ++++++------------
.../networkmanager/networkmanager-1.18.6-r1.ebuild | 19 ++++++-------------
.../networkmanager/networkmanager-1.20.12-r1.ebuild | 19 ++++++-------------
.../networkmanager/networkmanager-1.22.14-r1.ebuild | 19 ++++++-------------
.../networkmanager/networkmanager-1.24.2-r1.ebuild | 19 ++++++-------------
.../networkmanager/networkmanager-1.26.0-r1.ebuild | 19 ++++++-------------
.../networkmanager/networkmanager-1.26.2-r1.ebuild | 19 ++++++-------------
7 files changed, 42 insertions(+), 90 deletions(-)
diff --git a/net-misc/networkmanager/networkmanager-1.18.4-r4.ebuild b/net-misc/networkmanager/networkmanager-1.18.4-r4.ebuild
index 3025d516e40..baec49b2cdb 100644
--- a/net-misc/networkmanager/networkmanager-1.18.4-r4.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.18.4-r4.ebuild
@@ -184,6 +184,12 @@ multilib_src_configure() {
--with-ebpf=yes
$(multilib_native_enable concheck)
--with-crypto=$(usex nss nss gnutls)
+ # elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option
+ # This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime.
+ # (There is no off switch, and we do not support upower.)
+ # bug #747358
+ --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+ --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
$(multilib_native_use_with audit libaudit)
$(multilib_native_use_enable bluetooth bluez5-dun)
$(use_with dhclient)
@@ -210,18 +216,6 @@ multilib_src_configure() {
$(multilib_native_use_enable wifi)
)
- if use systemd; then
- myconf+=(
- --with-session-tracking=systemd
- --with-suspend-resume=systemd
- )
- elif use elogind; then
- myconf+=(
- --with-session-tracking=elogind
- --with-suspend-resume=elogind
- )
- fi
-
# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
if use ppp; then
local PPPD_VER=`best_version net-dialup/ppp`
diff --git a/net-misc/networkmanager/networkmanager-1.18.6-r1.ebuild b/net-misc/networkmanager/networkmanager-1.18.6-r1.ebuild
index 5dc2574c7f3..2f8cca8565b 100644
--- a/net-misc/networkmanager/networkmanager-1.18.6-r1.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.18.6-r1.ebuild
@@ -184,6 +184,12 @@ multilib_src_configure() {
--with-ebpf=yes
$(multilib_native_enable concheck)
--with-crypto=$(usex nss nss gnutls)
+ # elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option
+ # This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime.
+ # (There is no off switch, and we do not support upower.)
+ # bug #747358
+ --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+ --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
$(multilib_native_use_with audit libaudit)
$(multilib_native_use_enable bluetooth bluez5-dun)
$(use_with dhclient)
@@ -210,19 +216,6 @@ multilib_src_configure() {
$(multilib_native_use_enable wifi)
)
- # There is no off switch, and we do not support upower.
- if use systemd; then
- myconf+=(
- --with-session-tracking=systemd
- --with-suspend-resume=systemd
- )
- elif use elogind; then
- myconf+=(
- --with-session-tracking=elogind
- --with-suspend-resume=elogind
- )
- fi
-
# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
if use ppp; then
local PPPD_VER=`best_version net-dialup/ppp`
diff --git a/net-misc/networkmanager/networkmanager-1.20.12-r1.ebuild b/net-misc/networkmanager/networkmanager-1.20.12-r1.ebuild
index df04d0e8e17..3ec06c3aefc 100644
--- a/net-misc/networkmanager/networkmanager-1.20.12-r1.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.20.12-r1.ebuild
@@ -174,6 +174,12 @@ multilib_src_configure() {
--with-ebpf=yes
$(multilib_native_enable concheck)
--with-crypto=$(usex nss nss gnutls)
+ # elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option
+ # This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime.
+ # (There is no off switch, and we do not support upower.)
+ # bug #747358
+ --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+ --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
$(multilib_native_use_with audit libaudit)
$(multilib_native_use_enable bluetooth bluez5-dun)
--without-dhcpcanon
@@ -202,19 +208,6 @@ multilib_src_configure() {
$(multilib_native_use_enable wifi)
)
- # There is no off switch, and we do not support upower.
- if use systemd; then
- myconf+=(
- --with-session-tracking=systemd
- --with-suspend-resume=systemd
- )
- elif use elogind; then
- myconf+=(
- --with-session-tracking=elogind
- --with-suspend-resume=elogind
- )
- fi
-
# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
if use ppp; then
local PPPD_VER=`best_version net-dialup/ppp`
diff --git a/net-misc/networkmanager/networkmanager-1.22.14-r1.ebuild b/net-misc/networkmanager/networkmanager-1.22.14-r1.ebuild
index d95b52bcbde..a956d94131e 100644
--- a/net-misc/networkmanager/networkmanager-1.22.14-r1.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.22.14-r1.ebuild
@@ -176,6 +176,12 @@ multilib_src_configure() {
$(multilib_native_enable concheck)
--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no)
--with-crypto=$(usex nss nss gnutls)
+ # elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option
+ # This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime.
+ # (There is no off switch, and we do not support upower.)
+ # bug #747358
+ --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+ --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
$(multilib_native_use_with audit libaudit)
$(multilib_native_use_enable bluetooth bluez5-dun)
--without-dhcpcanon
@@ -204,19 +210,6 @@ multilib_src_configure() {
$(multilib_native_use_enable wifi)
)
- # There is no off switch, and we do not support upower.
- if use systemd; then
- myconf+=(
- --with-session-tracking=systemd
- --with-suspend-resume=systemd
- )
- elif use elogind; then
- myconf+=(
- --with-session-tracking=elogind
- --with-suspend-resume=elogind
- )
- fi
-
# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
if use ppp; then
local PPPD_VER=`best_version net-dialup/ppp`
diff --git a/net-misc/networkmanager/networkmanager-1.24.2-r1.ebuild b/net-misc/networkmanager/networkmanager-1.24.2-r1.ebuild
index bedfb4ef0ed..3c513d596fc 100644
--- a/net-misc/networkmanager/networkmanager-1.24.2-r1.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.24.2-r1.ebuild
@@ -176,6 +176,12 @@ multilib_src_configure() {
$(multilib_native_enable concheck)
--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no)
--with-crypto=$(usex nss nss gnutls)
+ # elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option
+ # This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime.
+ # (There is no off switch, and we do not support upower.)
+ # bug #747358
+ --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+ --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
$(multilib_native_use_with audit libaudit)
$(multilib_native_use_enable bluetooth bluez5-dun)
--without-dhcpcanon
@@ -203,19 +209,6 @@ multilib_src_configure() {
$(multilib_native_use_enable wifi)
)
- # There is no off switch, and we do not support upower.
- if use systemd; then
- myconf+=(
- --with-session-tracking=systemd
- --with-suspend-resume=systemd
- )
- elif use elogind; then
- myconf+=(
- --with-session-tracking=elogind
- --with-suspend-resume=elogind
- )
- fi
-
# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
if use ppp; then
local PPPD_VER=`best_version net-dialup/ppp`
diff --git a/net-misc/networkmanager/networkmanager-1.26.0-r1.ebuild b/net-misc/networkmanager/networkmanager-1.26.0-r1.ebuild
index 4df3b435f25..021a54dfe6a 100644
--- a/net-misc/networkmanager/networkmanager-1.26.0-r1.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.26.0-r1.ebuild
@@ -176,6 +176,12 @@ multilib_src_configure() {
$(multilib_native_enable concheck)
--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no)
--with-crypto=$(usex nss nss gnutls)
+ # elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option
+ # This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime.
+ # (There is no off switch, and we do not support upower.)
+ # bug #747358
+ --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+ --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
$(multilib_native_use_with audit libaudit)
$(multilib_native_use_enable bluetooth bluez5-dun)
--without-dhcpcanon
@@ -203,19 +209,6 @@ multilib_src_configure() {
$(multilib_native_use_enable wifi)
)
- # There is no off switch, and we do not support upower.
- if use systemd; then
- myconf+=(
- --with-session-tracking=systemd
- --with-suspend-resume=systemd
- )
- elif use elogind; then
- myconf+=(
- --with-session-tracking=elogind
- --with-suspend-resume=elogind
- )
- fi
-
# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
if use ppp; then
local PPPD_VER=`best_version net-dialup/ppp`
diff --git a/net-misc/networkmanager/networkmanager-1.26.2-r1.ebuild b/net-misc/networkmanager/networkmanager-1.26.2-r1.ebuild
index bedfb4ef0ed..3c513d596fc 100644
--- a/net-misc/networkmanager/networkmanager-1.26.2-r1.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.26.2-r1.ebuild
@@ -176,6 +176,12 @@ multilib_src_configure() {
$(multilib_native_enable concheck)
--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no)
--with-crypto=$(usex nss nss gnutls)
+ # elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option
+ # This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime.
+ # (There is no off switch, and we do not support upower.)
+ # bug #747358
+ --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+ --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
$(multilib_native_use_with audit libaudit)
$(multilib_native_use_enable bluetooth bluez5-dun)
--without-dhcpcanon
@@ -203,19 +209,6 @@ multilib_src_configure() {
$(multilib_native_use_enable wifi)
)
- # There is no off switch, and we do not support upower.
- if use systemd; then
- myconf+=(
- --with-session-tracking=systemd
- --with-suspend-resume=systemd
- )
- elif use elogind; then
- myconf+=(
- --with-session-tracking=elogind
- --with-suspend-resume=elogind
- )
- fi
-
# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
if use ppp; then
local PPPD_VER=`best_version net-dialup/ppp`