| 1 |
commit: 1b636741c5d5a793b49abfa914f2d11241fec178 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 7 22:41:44 2020 +0000 |
| 4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 8 19:15:41 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b636741 |
| 7 |
|
| 8 |
net-misc/networkmanager: drop USE=consolekit |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
| 13 |
|
| 14 |
net-misc/networkmanager/metadata.xml | 2 -- |
| 15 |
...4-r3.ebuild => networkmanager-1.18.4-r4.ebuild} | 21 ++++++++++++++------- |
| 16 |
...18.6.ebuild => networkmanager-1.18.6-r1.ebuild} | 22 +++++++++++++++------- |
| 17 |
....12.ebuild => networkmanager-1.20.12-r1.ebuild} | 22 +++++++++++++++------- |
| 18 |
...11.ebuild => networkmanager-1.22.10-r12.ebuild} | 11 +++-------- |
| 19 |
....14.ebuild => networkmanager-1.22.14-r1.ebuild} | 22 +++++++++++++++------- |
| 20 |
...24.2.ebuild => networkmanager-1.24.2-r1.ebuild} | 22 +++++++++++++++------- |
| 21 |
...26.0.ebuild => networkmanager-1.26.0-r1.ebuild} | 22 +++++++++++++++------- |
| 22 |
...26.2.ebuild => networkmanager-1.26.2-r1.ebuild} | 22 +++++++++++++++------- |
| 23 |
9 files changed, 107 insertions(+), 59 deletions(-) |
| 24 |
|
| 25 |
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml |
| 26 |
index 91e9ff45256..808f71c5128 100644 |
| 27 |
--- a/net-misc/networkmanager/metadata.xml |
| 28 |
+++ b/net-misc/networkmanager/metadata.xml |
| 29 |
@@ -9,8 +9,6 @@ |
| 30 |
<flag name="concheck">Enable connectivity checking support</flag> |
| 31 |
<flag name="connection-sharing">Use <pkg>net-dns/dnsmasq</pkg> and |
| 32 |
<pkg>net-firewall/iptables</pkg> for connection sharing</flag> |
| 33 |
- <flag name="consolekit">Use <pkg>sys-auth/consolekit</pkg> for session |
| 34 |
- tracking</flag> |
| 35 |
<flag name="dhclient">Use dhclient from <pkg>net-misc/dhcp</pkg> for |
| 36 |
getting ip</flag> |
| 37 |
<flag name="dhcpcd">Use <pkg>net-misc/dhcpcd</pkg> for getting ip</flag> |
| 38 |
|
| 39 |
diff --git a/net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild b/net-misc/networkmanager/networkmanager-1.18.4-r4.ebuild |
| 40 |
similarity index 93% |
| 41 |
rename from net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild |
| 42 |
rename to net-misc/networkmanager/networkmanager-1.18.4-r4.ebuild |
| 43 |
index 453af4ab92a..3025d516e40 100644 |
| 44 |
--- a/net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild |
| 45 |
+++ b/net-misc/networkmanager/networkmanager-1.18.4-r4.ebuild |
| 46 |
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" |
| 47 |
LICENSE="GPL-2+" |
| 48 |
SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version |
| 49 |
|
| 50 |
-IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" |
| 51 |
+IUSE="audit bluetooth connection-sharing +dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" |
| 52 |
RESTRICT="!test? ( test )" |
| 53 |
|
| 54 |
REQUIRED_USE=" |
| 55 |
@@ -24,7 +24,7 @@ REQUIRED_USE=" |
| 56 |
vala? ( introspection ) |
| 57 |
wext? ( wifi ) |
| 58 |
|| ( nss gnutls ) |
| 59 |
- ?? ( consolekit elogind systemd ) |
| 60 |
+ ?? ( elogind systemd ) |
| 61 |
" |
| 62 |
|
| 63 |
KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86" |
| 64 |
@@ -47,7 +47,6 @@ COMMON_DEPEND=" |
| 65 |
connection-sharing? ( |
| 66 |
net-dns/dnsmasq[dbus,dhcp] |
| 67 |
net-firewall/iptables ) |
| 68 |
- consolekit? ( >=sys-auth/consolekit-1.0.0 ) |
| 69 |
dhclient? ( >=net-misc/dhcp-4[client] ) |
| 70 |
dhcpcd? ( net-misc/dhcpcd ) |
| 71 |
elogind? ( >=sys-auth/elogind-219 ) |
| 72 |
@@ -185,10 +184,6 @@ multilib_src_configure() { |
| 73 |
--with-ebpf=yes |
| 74 |
$(multilib_native_enable concheck) |
| 75 |
--with-crypto=$(usex nss nss gnutls) |
| 76 |
- --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no))) |
| 77 |
- # ConsoleKit has no build-time dependency, so use it as the default case. |
| 78 |
- # There is no off switch, and we do not support upower. |
| 79 |
- --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) |
| 80 |
$(multilib_native_use_with audit libaudit) |
| 81 |
$(multilib_native_use_enable bluetooth bluez5-dun) |
| 82 |
$(use_with dhclient) |
| 83 |
@@ -215,6 +210,18 @@ multilib_src_configure() { |
| 84 |
$(multilib_native_use_enable wifi) |
| 85 |
) |
| 86 |
|
| 87 |
+ if use systemd; then |
| 88 |
+ myconf+=( |
| 89 |
+ --with-session-tracking=systemd |
| 90 |
+ --with-suspend-resume=systemd |
| 91 |
+ ) |
| 92 |
+ elif use elogind; then |
| 93 |
+ myconf+=( |
| 94 |
+ --with-session-tracking=elogind |
| 95 |
+ --with-suspend-resume=elogind |
| 96 |
+ ) |
| 97 |
+ fi |
| 98 |
+ |
| 99 |
# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 |
| 100 |
if use ppp; then |
| 101 |
local PPPD_VER=`best_version net-dialup/ppp` |
| 102 |
|
| 103 |
diff --git a/net-misc/networkmanager/networkmanager-1.18.6.ebuild b/net-misc/networkmanager/networkmanager-1.18.6-r1.ebuild |
| 104 |
similarity index 93% |
| 105 |
rename from net-misc/networkmanager/networkmanager-1.18.6.ebuild |
| 106 |
rename to net-misc/networkmanager/networkmanager-1.18.6-r1.ebuild |
| 107 |
index 070ae215d27..5dc2574c7f3 100644 |
| 108 |
--- a/net-misc/networkmanager/networkmanager-1.18.6.ebuild |
| 109 |
+++ b/net-misc/networkmanager/networkmanager-1.18.6-r1.ebuild |
| 110 |
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" |
| 111 |
LICENSE="GPL-2+" |
| 112 |
SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version |
| 113 |
|
| 114 |
-IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" |
| 115 |
+IUSE="audit bluetooth connection-sharing +dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" |
| 116 |
RESTRICT="!test? ( test )" |
| 117 |
|
| 118 |
REQUIRED_USE=" |
| 119 |
@@ -24,7 +24,7 @@ REQUIRED_USE=" |
| 120 |
vala? ( introspection ) |
| 121 |
wext? ( wifi ) |
| 122 |
|| ( nss gnutls ) |
| 123 |
- ?? ( consolekit elogind systemd ) |
| 124 |
+ ?? ( elogind systemd ) |
| 125 |
" |
| 126 |
|
| 127 |
KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86" |
| 128 |
@@ -47,7 +47,6 @@ COMMON_DEPEND=" |
| 129 |
connection-sharing? ( |
| 130 |
net-dns/dnsmasq[dbus,dhcp] |
| 131 |
net-firewall/iptables ) |
| 132 |
- consolekit? ( >=sys-auth/consolekit-1.0.0 ) |
| 133 |
dhclient? ( >=net-misc/dhcp-4[client] ) |
| 134 |
dhcpcd? ( net-misc/dhcpcd ) |
| 135 |
elogind? ( >=sys-auth/elogind-219 ) |
| 136 |
@@ -185,10 +184,6 @@ multilib_src_configure() { |
| 137 |
--with-ebpf=yes |
| 138 |
$(multilib_native_enable concheck) |
| 139 |
--with-crypto=$(usex nss nss gnutls) |
| 140 |
- --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no))) |
| 141 |
- # ConsoleKit has no build-time dependency, so use it as the default case. |
| 142 |
- # There is no off switch, and we do not support upower. |
| 143 |
- --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) |
| 144 |
$(multilib_native_use_with audit libaudit) |
| 145 |
$(multilib_native_use_enable bluetooth bluez5-dun) |
| 146 |
$(use_with dhclient) |
| 147 |
@@ -215,6 +210,19 @@ multilib_src_configure() { |
| 148 |
$(multilib_native_use_enable wifi) |
| 149 |
) |
| 150 |
|
| 151 |
+ # There is no off switch, and we do not support upower. |
| 152 |
+ if use systemd; then |
| 153 |
+ myconf+=( |
| 154 |
+ --with-session-tracking=systemd |
| 155 |
+ --with-suspend-resume=systemd |
| 156 |
+ ) |
| 157 |
+ elif use elogind; then |
| 158 |
+ myconf+=( |
| 159 |
+ --with-session-tracking=elogind |
| 160 |
+ --with-suspend-resume=elogind |
| 161 |
+ ) |
| 162 |
+ fi |
| 163 |
+ |
| 164 |
# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 |
| 165 |
if use ppp; then |
| 166 |
local PPPD_VER=`best_version net-dialup/ppp` |
| 167 |
|
| 168 |
diff --git a/net-misc/networkmanager/networkmanager-1.20.12.ebuild b/net-misc/networkmanager/networkmanager-1.20.12-r1.ebuild |
| 169 |
similarity index 93% |
| 170 |
rename from net-misc/networkmanager/networkmanager-1.20.12.ebuild |
| 171 |
rename to net-misc/networkmanager/networkmanager-1.20.12-r1.ebuild |
| 172 |
index 81c6f70ed90..df04d0e8e17 100644 |
| 173 |
--- a/net-misc/networkmanager/networkmanager-1.20.12.ebuild |
| 174 |
+++ b/net-misc/networkmanager/networkmanager-1.20.12-r1.ebuild |
| 175 |
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" |
| 176 |
LICENSE="GPL-2+" |
| 177 |
SLOT="0" |
| 178 |
|
| 179 |
-IUSE="audit bluetooth connection-sharing consolekit dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" |
| 180 |
+IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" |
| 181 |
RESTRICT="!test? ( test )" |
| 182 |
|
| 183 |
REQUIRED_USE=" |
| 184 |
@@ -24,7 +24,7 @@ REQUIRED_USE=" |
| 185 |
vala? ( introspection ) |
| 186 |
wext? ( wifi ) |
| 187 |
|| ( nss gnutls ) |
| 188 |
- ?? ( consolekit elogind systemd ) |
| 189 |
+ ?? ( elogind systemd ) |
| 190 |
" |
| 191 |
|
| 192 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
| 193 |
@@ -45,7 +45,6 @@ COMMON_DEPEND=" |
| 194 |
connection-sharing? ( |
| 195 |
net-dns/dnsmasq[dbus,dhcp] |
| 196 |
net-firewall/iptables ) |
| 197 |
- consolekit? ( >=sys-auth/consolekit-1.0.0 ) |
| 198 |
dhclient? ( >=net-misc/dhcp-4[client] ) |
| 199 |
dhcpcd? ( net-misc/dhcpcd ) |
| 200 |
elogind? ( >=sys-auth/elogind-219 ) |
| 201 |
@@ -175,10 +174,6 @@ multilib_src_configure() { |
| 202 |
--with-ebpf=yes |
| 203 |
$(multilib_native_enable concheck) |
| 204 |
--with-crypto=$(usex nss nss gnutls) |
| 205 |
- --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no))) |
| 206 |
- # ConsoleKit has no build-time dependency, so use it as the default case. |
| 207 |
- # There is no off switch, and we do not support upower. |
| 208 |
- --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) |
| 209 |
$(multilib_native_use_with audit libaudit) |
| 210 |
$(multilib_native_use_enable bluetooth bluez5-dun) |
| 211 |
--without-dhcpcanon |
| 212 |
@@ -207,6 +202,19 @@ multilib_src_configure() { |
| 213 |
$(multilib_native_use_enable wifi) |
| 214 |
) |
| 215 |
|
| 216 |
+ # There is no off switch, and we do not support upower. |
| 217 |
+ if use systemd; then |
| 218 |
+ myconf+=( |
| 219 |
+ --with-session-tracking=systemd |
| 220 |
+ --with-suspend-resume=systemd |
| 221 |
+ ) |
| 222 |
+ elif use elogind; then |
| 223 |
+ myconf+=( |
| 224 |
+ --with-session-tracking=elogind |
| 225 |
+ --with-suspend-resume=elogind |
| 226 |
+ ) |
| 227 |
+ fi |
| 228 |
+ |
| 229 |
# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 |
| 230 |
if use ppp; then |
| 231 |
local PPPD_VER=`best_version net-dialup/ppp` |
| 232 |
|
| 233 |
diff --git a/net-misc/networkmanager/networkmanager-1.22.10-r11.ebuild b/net-misc/networkmanager/networkmanager-1.22.10-r12.ebuild |
| 234 |
similarity index 96% |
| 235 |
rename from net-misc/networkmanager/networkmanager-1.22.10-r11.ebuild |
| 236 |
rename to net-misc/networkmanager/networkmanager-1.22.10-r12.ebuild |
| 237 |
index b2cd3babde3..7fb85f509cd 100644 |
| 238 |
--- a/net-misc/networkmanager/networkmanager-1.22.10-r11.ebuild |
| 239 |
+++ b/net-misc/networkmanager/networkmanager-1.22.10-r12.ebuild |
| 240 |
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/archive/ |
| 241 |
LICENSE="GPL-2+" |
| 242 |
SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version |
| 243 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
| 244 |
-IUSE="audit bluetooth +concheck connection-sharing consolekit +dhclient dhcpcd " |
| 245 |
+IUSE="audit bluetooth +concheck connection-sharing +dhclient dhcpcd " |
| 246 |
IUSE+="debug elogind examples +gnutls gtk-doc introspection iwd json kernel_linux " |
| 247 |
IUSE+="libpsl lto modemmanager nss ofono ovs +policykit ppp resolvconf selinux " |
| 248 |
IUSE+="syslog systemd teamd test +tools vala wext +wifi" |
| 249 |
@@ -24,7 +24,7 @@ REQUIRED_USE=" |
| 250 |
iwd? ( wifi ) |
| 251 |
vala? ( introspection ) |
| 252 |
^^ ( gnutls nss ) |
| 253 |
- ?? ( consolekit elogind systemd ) |
| 254 |
+ ?? ( elogind systemd ) |
| 255 |
?? ( dhclient dhcpcd ) |
| 256 |
?? ( syslog systemd ) |
| 257 |
" |
| 258 |
@@ -43,7 +43,6 @@ DEPEND=" |
| 259 |
net-dns/dnsmasq[dbus,dhcp] |
| 260 |
net-firewall/iptables |
| 261 |
) |
| 262 |
- consolekit? ( sys-auth/consolekit ) |
| 263 |
dhclient? ( net-misc/dhcp[client] ) |
| 264 |
dhcpcd? ( net-misc/dhcpcd ) |
| 265 |
elogind? ( sys-auth/elogind ) |
| 266 |
@@ -235,11 +234,7 @@ src_configure() { |
| 267 |
$(meson_use lto b_lto) |
| 268 |
) |
| 269 |
|
| 270 |
- if use consolekit; then |
| 271 |
- emesonargs+=( -D session_tracking_consolekit=true ) |
| 272 |
- emesonargs+=( -D session_tracking=no ) |
| 273 |
- emesonargs+=( -D suspend_resume=consolekit ) |
| 274 |
- elif use systemd; then |
| 275 |
+ if use systemd; then |
| 276 |
emesonargs+=( -D session_tracking_consolekit=false ) |
| 277 |
emesonargs+=( -D session_tracking=systemd ) |
| 278 |
emesonargs+=( -D suspend_resume=systemd ) |
| 279 |
|
| 280 |
diff --git a/net-misc/networkmanager/networkmanager-1.22.14.ebuild b/net-misc/networkmanager/networkmanager-1.22.14-r1.ebuild |
| 281 |
similarity index 93% |
| 282 |
rename from net-misc/networkmanager/networkmanager-1.22.14.ebuild |
| 283 |
rename to net-misc/networkmanager/networkmanager-1.22.14-r1.ebuild |
| 284 |
index c7d5376f75d..d95b52bcbde 100644 |
| 285 |
--- a/net-misc/networkmanager/networkmanager-1.22.14.ebuild |
| 286 |
+++ b/net-misc/networkmanager/networkmanager-1.22.14-r1.ebuild |
| 287 |
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" |
| 288 |
LICENSE="GPL-2+" |
| 289 |
SLOT="0" |
| 290 |
|
| 291 |
-IUSE="audit bluetooth connection-sharing consolekit dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" |
| 292 |
+IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" |
| 293 |
RESTRICT="!test? ( test )" |
| 294 |
|
| 295 |
REQUIRED_USE=" |
| 296 |
@@ -24,7 +24,7 @@ REQUIRED_USE=" |
| 297 |
vala? ( introspection ) |
| 298 |
wext? ( wifi ) |
| 299 |
|| ( nss gnutls ) |
| 300 |
- ?? ( consolekit elogind systemd ) |
| 301 |
+ ?? ( elogind systemd ) |
| 302 |
" |
| 303 |
|
| 304 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
| 305 |
@@ -45,7 +45,6 @@ COMMON_DEPEND=" |
| 306 |
connection-sharing? ( |
| 307 |
net-dns/dnsmasq[dbus,dhcp] |
| 308 |
net-firewall/iptables ) |
| 309 |
- consolekit? ( >=sys-auth/consolekit-1.0.0 ) |
| 310 |
dhclient? ( >=net-misc/dhcp-4[client] ) |
| 311 |
dhcpcd? ( net-misc/dhcpcd ) |
| 312 |
elogind? ( >=sys-auth/elogind-219 ) |
| 313 |
@@ -177,10 +176,6 @@ multilib_src_configure() { |
| 314 |
$(multilib_native_enable concheck) |
| 315 |
--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no) |
| 316 |
--with-crypto=$(usex nss nss gnutls) |
| 317 |
- --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no))) |
| 318 |
- # ConsoleKit has no build-time dependency, so use it as the default case. |
| 319 |
- # There is no off switch, and we do not support upower. |
| 320 |
- --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) |
| 321 |
$(multilib_native_use_with audit libaudit) |
| 322 |
$(multilib_native_use_enable bluetooth bluez5-dun) |
| 323 |
--without-dhcpcanon |
| 324 |
@@ -209,6 +204,19 @@ multilib_src_configure() { |
| 325 |
$(multilib_native_use_enable wifi) |
| 326 |
) |
| 327 |
|
| 328 |
+ # There is no off switch, and we do not support upower. |
| 329 |
+ if use systemd; then |
| 330 |
+ myconf+=( |
| 331 |
+ --with-session-tracking=systemd |
| 332 |
+ --with-suspend-resume=systemd |
| 333 |
+ ) |
| 334 |
+ elif use elogind; then |
| 335 |
+ myconf+=( |
| 336 |
+ --with-session-tracking=elogind |
| 337 |
+ --with-suspend-resume=elogind |
| 338 |
+ ) |
| 339 |
+ fi |
| 340 |
+ |
| 341 |
# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 |
| 342 |
if use ppp; then |
| 343 |
local PPPD_VER=`best_version net-dialup/ppp` |
| 344 |
|
| 345 |
diff --git a/net-misc/networkmanager/networkmanager-1.24.2.ebuild b/net-misc/networkmanager/networkmanager-1.24.2-r1.ebuild |
| 346 |
similarity index 93% |
| 347 |
rename from net-misc/networkmanager/networkmanager-1.24.2.ebuild |
| 348 |
rename to net-misc/networkmanager/networkmanager-1.24.2-r1.ebuild |
| 349 |
index 91ce0e3aeda..bedfb4ef0ed 100644 |
| 350 |
--- a/net-misc/networkmanager/networkmanager-1.24.2.ebuild |
| 351 |
+++ b/net-misc/networkmanager/networkmanager-1.24.2-r1.ebuild |
| 352 |
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" |
| 353 |
LICENSE="GPL-2+" |
| 354 |
SLOT="0" |
| 355 |
|
| 356 |
-IUSE="audit bluetooth connection-sharing consolekit dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" |
| 357 |
+IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" |
| 358 |
RESTRICT="!test? ( test )" |
| 359 |
|
| 360 |
REQUIRED_USE=" |
| 361 |
@@ -24,7 +24,7 @@ REQUIRED_USE=" |
| 362 |
vala? ( introspection ) |
| 363 |
wext? ( wifi ) |
| 364 |
|| ( nss gnutls ) |
| 365 |
- ?? ( consolekit elogind systemd ) |
| 366 |
+ ?? ( elogind systemd ) |
| 367 |
" |
| 368 |
|
| 369 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
| 370 |
@@ -45,7 +45,6 @@ COMMON_DEPEND=" |
| 371 |
connection-sharing? ( |
| 372 |
net-dns/dnsmasq[dbus,dhcp] |
| 373 |
net-firewall/iptables ) |
| 374 |
- consolekit? ( >=sys-auth/consolekit-1.0.0 ) |
| 375 |
dhclient? ( >=net-misc/dhcp-4[client] ) |
| 376 |
dhcpcd? ( net-misc/dhcpcd ) |
| 377 |
elogind? ( >=sys-auth/elogind-219 ) |
| 378 |
@@ -177,10 +176,6 @@ multilib_src_configure() { |
| 379 |
$(multilib_native_enable concheck) |
| 380 |
--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no) |
| 381 |
--with-crypto=$(usex nss nss gnutls) |
| 382 |
- --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no))) |
| 383 |
- # ConsoleKit has no build-time dependency, so use it as the default case. |
| 384 |
- # There is no off switch, and we do not support upower. |
| 385 |
- --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) |
| 386 |
$(multilib_native_use_with audit libaudit) |
| 387 |
$(multilib_native_use_enable bluetooth bluez5-dun) |
| 388 |
--without-dhcpcanon |
| 389 |
@@ -208,6 +203,19 @@ multilib_src_configure() { |
| 390 |
$(multilib_native_use_enable wifi) |
| 391 |
) |
| 392 |
|
| 393 |
+ # There is no off switch, and we do not support upower. |
| 394 |
+ if use systemd; then |
| 395 |
+ myconf+=( |
| 396 |
+ --with-session-tracking=systemd |
| 397 |
+ --with-suspend-resume=systemd |
| 398 |
+ ) |
| 399 |
+ elif use elogind; then |
| 400 |
+ myconf+=( |
| 401 |
+ --with-session-tracking=elogind |
| 402 |
+ --with-suspend-resume=elogind |
| 403 |
+ ) |
| 404 |
+ fi |
| 405 |
+ |
| 406 |
# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 |
| 407 |
if use ppp; then |
| 408 |
local PPPD_VER=`best_version net-dialup/ppp` |
| 409 |
|
| 410 |
diff --git a/net-misc/networkmanager/networkmanager-1.26.0.ebuild b/net-misc/networkmanager/networkmanager-1.26.0-r1.ebuild |
| 411 |
similarity index 93% |
| 412 |
rename from net-misc/networkmanager/networkmanager-1.26.0.ebuild |
| 413 |
rename to net-misc/networkmanager/networkmanager-1.26.0-r1.ebuild |
| 414 |
index e3cf77c51fe..4df3b435f25 100644 |
| 415 |
--- a/net-misc/networkmanager/networkmanager-1.26.0.ebuild |
| 416 |
+++ b/net-misc/networkmanager/networkmanager-1.26.0-r1.ebuild |
| 417 |
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" |
| 418 |
LICENSE="GPL-2+" |
| 419 |
SLOT="0" |
| 420 |
|
| 421 |
-IUSE="audit bluetooth connection-sharing consolekit dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" |
| 422 |
+IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" |
| 423 |
RESTRICT="!test? ( test )" |
| 424 |
|
| 425 |
REQUIRED_USE=" |
| 426 |
@@ -24,7 +24,7 @@ REQUIRED_USE=" |
| 427 |
vala? ( introspection ) |
| 428 |
wext? ( wifi ) |
| 429 |
|| ( nss gnutls ) |
| 430 |
- ?? ( consolekit elogind systemd ) |
| 431 |
+ ?? ( elogind systemd ) |
| 432 |
" |
| 433 |
|
| 434 |
KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86" |
| 435 |
@@ -45,7 +45,6 @@ COMMON_DEPEND=" |
| 436 |
connection-sharing? ( |
| 437 |
net-dns/dnsmasq[dbus,dhcp] |
| 438 |
net-firewall/iptables ) |
| 439 |
- consolekit? ( >=sys-auth/consolekit-1.0.0 ) |
| 440 |
dhclient? ( >=net-misc/dhcp-4[client] ) |
| 441 |
dhcpcd? ( net-misc/dhcpcd ) |
| 442 |
elogind? ( >=sys-auth/elogind-219 ) |
| 443 |
@@ -177,10 +176,6 @@ multilib_src_configure() { |
| 444 |
$(multilib_native_enable concheck) |
| 445 |
--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no) |
| 446 |
--with-crypto=$(usex nss nss gnutls) |
| 447 |
- --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no))) |
| 448 |
- # ConsoleKit has no build-time dependency, so use it as the default case. |
| 449 |
- # There is no off switch, and we do not support upower. |
| 450 |
- --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) |
| 451 |
$(multilib_native_use_with audit libaudit) |
| 452 |
$(multilib_native_use_enable bluetooth bluez5-dun) |
| 453 |
--without-dhcpcanon |
| 454 |
@@ -208,6 +203,19 @@ multilib_src_configure() { |
| 455 |
$(multilib_native_use_enable wifi) |
| 456 |
) |
| 457 |
|
| 458 |
+ # There is no off switch, and we do not support upower. |
| 459 |
+ if use systemd; then |
| 460 |
+ myconf+=( |
| 461 |
+ --with-session-tracking=systemd |
| 462 |
+ --with-suspend-resume=systemd |
| 463 |
+ ) |
| 464 |
+ elif use elogind; then |
| 465 |
+ myconf+=( |
| 466 |
+ --with-session-tracking=elogind |
| 467 |
+ --with-suspend-resume=elogind |
| 468 |
+ ) |
| 469 |
+ fi |
| 470 |
+ |
| 471 |
# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 |
| 472 |
if use ppp; then |
| 473 |
local PPPD_VER=`best_version net-dialup/ppp` |
| 474 |
|
| 475 |
diff --git a/net-misc/networkmanager/networkmanager-1.26.2.ebuild b/net-misc/networkmanager/networkmanager-1.26.2-r1.ebuild |
| 476 |
similarity index 93% |
| 477 |
rename from net-misc/networkmanager/networkmanager-1.26.2.ebuild |
| 478 |
rename to net-misc/networkmanager/networkmanager-1.26.2-r1.ebuild |
| 479 |
index 91ce0e3aeda..bedfb4ef0ed 100644 |
| 480 |
--- a/net-misc/networkmanager/networkmanager-1.26.2.ebuild |
| 481 |
+++ b/net-misc/networkmanager/networkmanager-1.26.2-r1.ebuild |
| 482 |
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" |
| 483 |
LICENSE="GPL-2+" |
| 484 |
SLOT="0" |
| 485 |
|
| 486 |
-IUSE="audit bluetooth connection-sharing consolekit dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" |
| 487 |
+IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" |
| 488 |
RESTRICT="!test? ( test )" |
| 489 |
|
| 490 |
REQUIRED_USE=" |
| 491 |
@@ -24,7 +24,7 @@ REQUIRED_USE=" |
| 492 |
vala? ( introspection ) |
| 493 |
wext? ( wifi ) |
| 494 |
|| ( nss gnutls ) |
| 495 |
- ?? ( consolekit elogind systemd ) |
| 496 |
+ ?? ( elogind systemd ) |
| 497 |
" |
| 498 |
|
| 499 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
| 500 |
@@ -45,7 +45,6 @@ COMMON_DEPEND=" |
| 501 |
connection-sharing? ( |
| 502 |
net-dns/dnsmasq[dbus,dhcp] |
| 503 |
net-firewall/iptables ) |
| 504 |
- consolekit? ( >=sys-auth/consolekit-1.0.0 ) |
| 505 |
dhclient? ( >=net-misc/dhcp-4[client] ) |
| 506 |
dhcpcd? ( net-misc/dhcpcd ) |
| 507 |
elogind? ( >=sys-auth/elogind-219 ) |
| 508 |
@@ -177,10 +176,6 @@ multilib_src_configure() { |
| 509 |
$(multilib_native_enable concheck) |
| 510 |
--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no) |
| 511 |
--with-crypto=$(usex nss nss gnutls) |
| 512 |
- --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no))) |
| 513 |
- # ConsoleKit has no build-time dependency, so use it as the default case. |
| 514 |
- # There is no off switch, and we do not support upower. |
| 515 |
- --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) |
| 516 |
$(multilib_native_use_with audit libaudit) |
| 517 |
$(multilib_native_use_enable bluetooth bluez5-dun) |
| 518 |
--without-dhcpcanon |
| 519 |
@@ -208,6 +203,19 @@ multilib_src_configure() { |
| 520 |
$(multilib_native_use_enable wifi) |
| 521 |
) |
| 522 |
|
| 523 |
+ # There is no off switch, and we do not support upower. |
| 524 |
+ if use systemd; then |
| 525 |
+ myconf+=( |
| 526 |
+ --with-session-tracking=systemd |
| 527 |
+ --with-suspend-resume=systemd |
| 528 |
+ ) |
| 529 |
+ elif use elogind; then |
| 530 |
+ myconf+=( |
| 531 |
+ --with-session-tracking=elogind |
| 532 |
+ --with-suspend-resume=elogind |
| 533 |
+ ) |
| 534 |
+ fi |
| 535 |
+ |
| 536 |
# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 |
| 537 |
if use ppp; then |
| 538 |
local PPPD_VER=`best_version net-dialup/ppp` |
Archives