| 1 |
commit: 90701330ab4b859f2e1d57124bd092a85ba7d8cb |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 9 03:38:19 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 9 03:38:19 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90701330 |
| 7 |
|
| 8 |
net-misc/networkmanager: drop USE=consolekit again |
| 9 |
|
| 10 |
Two problems with the initial draft PR: |
| 11 |
1) elogind does not have multilib, so... |
| 12 |
2) we must (ab)use 'consolekit' as a dummy option |
| 13 |
for the build system in the non-native multilib |
| 14 |
case. |
| 15 |
|
| 16 |
Fixes: 1b636741c5d5a793b49abfa914f2d11241fec178 |
| 17 |
Closes: https://bugs.gentoo.org/747358 |
| 18 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
| 19 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 20 |
|
| 21 |
.../networkmanager/networkmanager-1.18.4-r4.ebuild | 18 ++++++------------ |
| 22 |
.../networkmanager/networkmanager-1.18.6-r1.ebuild | 19 ++++++------------- |
| 23 |
.../networkmanager/networkmanager-1.20.12-r1.ebuild | 19 ++++++------------- |
| 24 |
.../networkmanager/networkmanager-1.22.14-r1.ebuild | 19 ++++++------------- |
| 25 |
.../networkmanager/networkmanager-1.24.2-r1.ebuild | 19 ++++++------------- |
| 26 |
.../networkmanager/networkmanager-1.26.0-r1.ebuild | 19 ++++++------------- |
| 27 |
.../networkmanager/networkmanager-1.26.2-r1.ebuild | 19 ++++++------------- |
| 28 |
7 files changed, 42 insertions(+), 90 deletions(-) |
| 29 |
|
| 30 |
diff --git a/net-misc/networkmanager/networkmanager-1.18.4-r4.ebuild b/net-misc/networkmanager/networkmanager-1.18.4-r4.ebuild |
| 31 |
index 3025d516e40..baec49b2cdb 100644 |
| 32 |
--- a/net-misc/networkmanager/networkmanager-1.18.4-r4.ebuild |
| 33 |
+++ b/net-misc/networkmanager/networkmanager-1.18.4-r4.ebuild |
| 34 |
@@ -184,6 +184,12 @@ multilib_src_configure() { |
| 35 |
--with-ebpf=yes |
| 36 |
$(multilib_native_enable concheck) |
| 37 |
--with-crypto=$(usex nss nss gnutls) |
| 38 |
+ # elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option |
| 39 |
+ # This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime. |
| 40 |
+ # (There is no off switch, and we do not support upower.) |
| 41 |
+ # bug #747358 |
| 42 |
+ --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) |
| 43 |
+ --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) |
| 44 |
$(multilib_native_use_with audit libaudit) |
| 45 |
$(multilib_native_use_enable bluetooth bluez5-dun) |
| 46 |
$(use_with dhclient) |
| 47 |
@@ -210,18 +216,6 @@ multilib_src_configure() { |
| 48 |
$(multilib_native_use_enable wifi) |
| 49 |
) |
| 50 |
|
| 51 |
- if use systemd; then |
| 52 |
- myconf+=( |
| 53 |
- --with-session-tracking=systemd |
| 54 |
- --with-suspend-resume=systemd |
| 55 |
- ) |
| 56 |
- elif use elogind; then |
| 57 |
- myconf+=( |
| 58 |
- --with-session-tracking=elogind |
| 59 |
- --with-suspend-resume=elogind |
| 60 |
- ) |
| 61 |
- fi |
| 62 |
- |
| 63 |
# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 |
| 64 |
if use ppp; then |
| 65 |
local PPPD_VER=`best_version net-dialup/ppp` |
| 66 |
|
| 67 |
diff --git a/net-misc/networkmanager/networkmanager-1.18.6-r1.ebuild b/net-misc/networkmanager/networkmanager-1.18.6-r1.ebuild |
| 68 |
index 5dc2574c7f3..2f8cca8565b 100644 |
| 69 |
--- a/net-misc/networkmanager/networkmanager-1.18.6-r1.ebuild |
| 70 |
+++ b/net-misc/networkmanager/networkmanager-1.18.6-r1.ebuild |
| 71 |
@@ -184,6 +184,12 @@ multilib_src_configure() { |
| 72 |
--with-ebpf=yes |
| 73 |
$(multilib_native_enable concheck) |
| 74 |
--with-crypto=$(usex nss nss gnutls) |
| 75 |
+ # elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option |
| 76 |
+ # This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime. |
| 77 |
+ # (There is no off switch, and we do not support upower.) |
| 78 |
+ # bug #747358 |
| 79 |
+ --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) |
| 80 |
+ --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) |
| 81 |
$(multilib_native_use_with audit libaudit) |
| 82 |
$(multilib_native_use_enable bluetooth bluez5-dun) |
| 83 |
$(use_with dhclient) |
| 84 |
@@ -210,19 +216,6 @@ multilib_src_configure() { |
| 85 |
$(multilib_native_use_enable wifi) |
| 86 |
) |
| 87 |
|
| 88 |
- # There is no off switch, and we do not support upower. |
| 89 |
- if use systemd; then |
| 90 |
- myconf+=( |
| 91 |
- --with-session-tracking=systemd |
| 92 |
- --with-suspend-resume=systemd |
| 93 |
- ) |
| 94 |
- elif use elogind; then |
| 95 |
- myconf+=( |
| 96 |
- --with-session-tracking=elogind |
| 97 |
- --with-suspend-resume=elogind |
| 98 |
- ) |
| 99 |
- fi |
| 100 |
- |
| 101 |
# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 |
| 102 |
if use ppp; then |
| 103 |
local PPPD_VER=`best_version net-dialup/ppp` |
| 104 |
|
| 105 |
diff --git a/net-misc/networkmanager/networkmanager-1.20.12-r1.ebuild b/net-misc/networkmanager/networkmanager-1.20.12-r1.ebuild |
| 106 |
index df04d0e8e17..3ec06c3aefc 100644 |
| 107 |
--- a/net-misc/networkmanager/networkmanager-1.20.12-r1.ebuild |
| 108 |
+++ b/net-misc/networkmanager/networkmanager-1.20.12-r1.ebuild |
| 109 |
@@ -174,6 +174,12 @@ multilib_src_configure() { |
| 110 |
--with-ebpf=yes |
| 111 |
$(multilib_native_enable concheck) |
| 112 |
--with-crypto=$(usex nss nss gnutls) |
| 113 |
+ # elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option |
| 114 |
+ # This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime. |
| 115 |
+ # (There is no off switch, and we do not support upower.) |
| 116 |
+ # bug #747358 |
| 117 |
+ --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) |
| 118 |
+ --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) |
| 119 |
$(multilib_native_use_with audit libaudit) |
| 120 |
$(multilib_native_use_enable bluetooth bluez5-dun) |
| 121 |
--without-dhcpcanon |
| 122 |
@@ -202,19 +208,6 @@ multilib_src_configure() { |
| 123 |
$(multilib_native_use_enable wifi) |
| 124 |
) |
| 125 |
|
| 126 |
- # There is no off switch, and we do not support upower. |
| 127 |
- if use systemd; then |
| 128 |
- myconf+=( |
| 129 |
- --with-session-tracking=systemd |
| 130 |
- --with-suspend-resume=systemd |
| 131 |
- ) |
| 132 |
- elif use elogind; then |
| 133 |
- myconf+=( |
| 134 |
- --with-session-tracking=elogind |
| 135 |
- --with-suspend-resume=elogind |
| 136 |
- ) |
| 137 |
- fi |
| 138 |
- |
| 139 |
# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 |
| 140 |
if use ppp; then |
| 141 |
local PPPD_VER=`best_version net-dialup/ppp` |
| 142 |
|
| 143 |
diff --git a/net-misc/networkmanager/networkmanager-1.22.14-r1.ebuild b/net-misc/networkmanager/networkmanager-1.22.14-r1.ebuild |
| 144 |
index d95b52bcbde..a956d94131e 100644 |
| 145 |
--- a/net-misc/networkmanager/networkmanager-1.22.14-r1.ebuild |
| 146 |
+++ b/net-misc/networkmanager/networkmanager-1.22.14-r1.ebuild |
| 147 |
@@ -176,6 +176,12 @@ multilib_src_configure() { |
| 148 |
$(multilib_native_enable concheck) |
| 149 |
--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no) |
| 150 |
--with-crypto=$(usex nss nss gnutls) |
| 151 |
+ # elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option |
| 152 |
+ # This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime. |
| 153 |
+ # (There is no off switch, and we do not support upower.) |
| 154 |
+ # bug #747358 |
| 155 |
+ --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) |
| 156 |
+ --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) |
| 157 |
$(multilib_native_use_with audit libaudit) |
| 158 |
$(multilib_native_use_enable bluetooth bluez5-dun) |
| 159 |
--without-dhcpcanon |
| 160 |
@@ -204,19 +210,6 @@ multilib_src_configure() { |
| 161 |
$(multilib_native_use_enable wifi) |
| 162 |
) |
| 163 |
|
| 164 |
- # There is no off switch, and we do not support upower. |
| 165 |
- if use systemd; then |
| 166 |
- myconf+=( |
| 167 |
- --with-session-tracking=systemd |
| 168 |
- --with-suspend-resume=systemd |
| 169 |
- ) |
| 170 |
- elif use elogind; then |
| 171 |
- myconf+=( |
| 172 |
- --with-session-tracking=elogind |
| 173 |
- --with-suspend-resume=elogind |
| 174 |
- ) |
| 175 |
- fi |
| 176 |
- |
| 177 |
# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 |
| 178 |
if use ppp; then |
| 179 |
local PPPD_VER=`best_version net-dialup/ppp` |
| 180 |
|
| 181 |
diff --git a/net-misc/networkmanager/networkmanager-1.24.2-r1.ebuild b/net-misc/networkmanager/networkmanager-1.24.2-r1.ebuild |
| 182 |
index bedfb4ef0ed..3c513d596fc 100644 |
| 183 |
--- a/net-misc/networkmanager/networkmanager-1.24.2-r1.ebuild |
| 184 |
+++ b/net-misc/networkmanager/networkmanager-1.24.2-r1.ebuild |
| 185 |
@@ -176,6 +176,12 @@ multilib_src_configure() { |
| 186 |
$(multilib_native_enable concheck) |
| 187 |
--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no) |
| 188 |
--with-crypto=$(usex nss nss gnutls) |
| 189 |
+ # elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option |
| 190 |
+ # This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime. |
| 191 |
+ # (There is no off switch, and we do not support upower.) |
| 192 |
+ # bug #747358 |
| 193 |
+ --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) |
| 194 |
+ --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) |
| 195 |
$(multilib_native_use_with audit libaudit) |
| 196 |
$(multilib_native_use_enable bluetooth bluez5-dun) |
| 197 |
--without-dhcpcanon |
| 198 |
@@ -203,19 +209,6 @@ multilib_src_configure() { |
| 199 |
$(multilib_native_use_enable wifi) |
| 200 |
) |
| 201 |
|
| 202 |
- # There is no off switch, and we do not support upower. |
| 203 |
- if use systemd; then |
| 204 |
- myconf+=( |
| 205 |
- --with-session-tracking=systemd |
| 206 |
- --with-suspend-resume=systemd |
| 207 |
- ) |
| 208 |
- elif use elogind; then |
| 209 |
- myconf+=( |
| 210 |
- --with-session-tracking=elogind |
| 211 |
- --with-suspend-resume=elogind |
| 212 |
- ) |
| 213 |
- fi |
| 214 |
- |
| 215 |
# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 |
| 216 |
if use ppp; then |
| 217 |
local PPPD_VER=`best_version net-dialup/ppp` |
| 218 |
|
| 219 |
diff --git a/net-misc/networkmanager/networkmanager-1.26.0-r1.ebuild b/net-misc/networkmanager/networkmanager-1.26.0-r1.ebuild |
| 220 |
index 4df3b435f25..021a54dfe6a 100644 |
| 221 |
--- a/net-misc/networkmanager/networkmanager-1.26.0-r1.ebuild |
| 222 |
+++ b/net-misc/networkmanager/networkmanager-1.26.0-r1.ebuild |
| 223 |
@@ -176,6 +176,12 @@ multilib_src_configure() { |
| 224 |
$(multilib_native_enable concheck) |
| 225 |
--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no) |
| 226 |
--with-crypto=$(usex nss nss gnutls) |
| 227 |
+ # elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option |
| 228 |
+ # This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime. |
| 229 |
+ # (There is no off switch, and we do not support upower.) |
| 230 |
+ # bug #747358 |
| 231 |
+ --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) |
| 232 |
+ --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) |
| 233 |
$(multilib_native_use_with audit libaudit) |
| 234 |
$(multilib_native_use_enable bluetooth bluez5-dun) |
| 235 |
--without-dhcpcanon |
| 236 |
@@ -203,19 +209,6 @@ multilib_src_configure() { |
| 237 |
$(multilib_native_use_enable wifi) |
| 238 |
) |
| 239 |
|
| 240 |
- # There is no off switch, and we do not support upower. |
| 241 |
- if use systemd; then |
| 242 |
- myconf+=( |
| 243 |
- --with-session-tracking=systemd |
| 244 |
- --with-suspend-resume=systemd |
| 245 |
- ) |
| 246 |
- elif use elogind; then |
| 247 |
- myconf+=( |
| 248 |
- --with-session-tracking=elogind |
| 249 |
- --with-suspend-resume=elogind |
| 250 |
- ) |
| 251 |
- fi |
| 252 |
- |
| 253 |
# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 |
| 254 |
if use ppp; then |
| 255 |
local PPPD_VER=`best_version net-dialup/ppp` |
| 256 |
|
| 257 |
diff --git a/net-misc/networkmanager/networkmanager-1.26.2-r1.ebuild b/net-misc/networkmanager/networkmanager-1.26.2-r1.ebuild |
| 258 |
index bedfb4ef0ed..3c513d596fc 100644 |
| 259 |
--- a/net-misc/networkmanager/networkmanager-1.26.2-r1.ebuild |
| 260 |
+++ b/net-misc/networkmanager/networkmanager-1.26.2-r1.ebuild |
| 261 |
@@ -176,6 +176,12 @@ multilib_src_configure() { |
| 262 |
$(multilib_native_enable concheck) |
| 263 |
--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no) |
| 264 |
--with-crypto=$(usex nss nss gnutls) |
| 265 |
+ # elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option |
| 266 |
+ # This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime. |
| 267 |
+ # (There is no off switch, and we do not support upower.) |
| 268 |
+ # bug #747358 |
| 269 |
+ --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) |
| 270 |
+ --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) |
| 271 |
$(multilib_native_use_with audit libaudit) |
| 272 |
$(multilib_native_use_enable bluetooth bluez5-dun) |
| 273 |
--without-dhcpcanon |
| 274 |
@@ -203,19 +209,6 @@ multilib_src_configure() { |
| 275 |
$(multilib_native_use_enable wifi) |
| 276 |
) |
| 277 |
|
| 278 |
- # There is no off switch, and we do not support upower. |
| 279 |
- if use systemd; then |
| 280 |
- myconf+=( |
| 281 |
- --with-session-tracking=systemd |
| 282 |
- --with-suspend-resume=systemd |
| 283 |
- ) |
| 284 |
- elif use elogind; then |
| 285 |
- myconf+=( |
| 286 |
- --with-session-tracking=elogind |
| 287 |
- --with-suspend-resume=elogind |
| 288 |
- ) |
| 289 |
- fi |
| 290 |
- |
| 291 |
# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 |
| 292 |
if use ppp; then |
| 293 |
local PPPD_VER=`best_version net-dialup/ppp` |
Archives