| 1 |
commit: 0ec6403b337eda926de8bd81d257deb0fd7fefba |
| 2 |
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 10 01:01:52 2020 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 10 01:01:52 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=0ec6403b |
| 7 |
|
| 8 |
net-misc/networkmanager: sync consolekit change from ::gentoo |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
| 11 |
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> |
| 12 |
|
| 13 |
net-misc/networkmanager/metadata.xml | 2 -- |
| 14 |
...ager-1.26.0.ebuild => networkmanager-1.26.0-r1.ebuild} | 15 ++++++++------- |
| 15 |
2 files changed, 8 insertions(+), 9 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml |
| 18 |
index 3345447..855614f 100644 |
| 19 |
--- a/net-misc/networkmanager/metadata.xml |
| 20 |
+++ b/net-misc/networkmanager/metadata.xml |
| 21 |
@@ -8,8 +8,6 @@ |
| 22 |
<use> |
| 23 |
<flag name="connection-sharing">Use <pkg>net-dns/dnsmasq</pkg> and |
| 24 |
<pkg>net-firewall/iptables</pkg> for connection sharing</flag> |
| 25 |
- <flag name="consolekit">Use <pkg>sys-auth/consolekit</pkg> for session |
| 26 |
- tracking</flag> |
| 27 |
<flag name="dhclient">Use dhclient from <pkg>net-misc/dhcp</pkg> for |
| 28 |
getting ip</flag> |
| 29 |
<flag name="dhcpcd">Use <pkg>net-misc/dhcpcd</pkg> for getting ip</flag> |
| 30 |
|
| 31 |
diff --git a/net-misc/networkmanager/networkmanager-1.26.0.ebuild b/net-misc/networkmanager/networkmanager-1.26.0-r1.ebuild |
| 32 |
similarity index 94% |
| 33 |
rename from net-misc/networkmanager/networkmanager-1.26.0.ebuild |
| 34 |
rename to net-misc/networkmanager/networkmanager-1.26.0-r1.ebuild |
| 35 |
index 89691ae..243c99d 100644 |
| 36 |
--- a/net-misc/networkmanager/networkmanager-1.26.0.ebuild |
| 37 |
+++ b/net-misc/networkmanager/networkmanager-1.26.0-r1.ebuild |
| 38 |
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" |
| 39 |
LICENSE="GPL-2+" |
| 40 |
SLOT="0" |
| 41 |
|
| 42 |
-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" |
| 43 |
+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" |
| 44 |
RESTRICT="!test? ( test )" |
| 45 |
|
| 46 |
REQUIRED_USE=" |
| 47 |
@@ -24,10 +24,10 @@ REQUIRED_USE=" |
| 48 |
vala? ( introspection ) |
| 49 |
wext? ( wifi ) |
| 50 |
|| ( nss gnutls ) |
| 51 |
- ?? ( consolekit elogind systemd ) |
| 52 |
+ ?? ( elogind systemd ) |
| 53 |
" |
| 54 |
|
| 55 |
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86" |
| 56 |
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86" |
| 57 |
|
| 58 |
# gobject-introspection-0.10.3 is needed due to gnome bug 642300 |
| 59 |
# wpa_supplicant-0.7.3-r3 is needed due to bug 359271 |
| 60 |
@@ -45,7 +45,6 @@ COMMON_DEPEND=" |
| 61 |
connection-sharing? ( |
| 62 |
net-dns/dnsmasq[dbus,dhcp] |
| 63 |
net-firewall/iptables ) |
| 64 |
- consolekit? ( >=sys-auth/consolekit-1.0.0 ) |
| 65 |
dhclient? ( >=net-misc/dhcp-4[client] ) |
| 66 |
dhcpcd? ( net-misc/dhcpcd ) |
| 67 |
elogind? ( >=sys-auth/elogind-219 ) |
| 68 |
@@ -187,9 +186,11 @@ multilib_src_configure() { |
| 69 |
$(multilib_native_enable concheck) |
| 70 |
--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no) |
| 71 |
--with-crypto=$(usex nss nss gnutls) |
| 72 |
- --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no))) |
| 73 |
- # ConsoleKit has no build-time dependency, so use it as the default case. |
| 74 |
- # There is no off switch, and we do not support upower. |
| 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) |
Archives