commit: 0ec6403b337eda926de8bd81d257deb0fd7fefba
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 10 01:01:52 2020 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sat Oct 10 01:01:52 2020 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=0ec6403b
net-misc/networkmanager: sync consolekit change from ::gentoo
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
net-misc/networkmanager/metadata.xml | 2 --
...ager-1.26.0.ebuild => networkmanager-1.26.0-r1.ebuild} | 15 ++++++++-------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/net-misc/networkmanager/metadata.xml
b/net-misc/networkmanager/metadata.xml
index 3345447..855614f 100644
--- a/net-misc/networkmanager/metadata.xml
+++ b/net-misc/networkmanager/metadata.xml
@@ -8,8 +8,6 @@
<use>
<flag name="connection-sharing">Use <pkg>net-dns/dnsmasq</pkg>
and
<pkg>net-firewall/iptables</pkg> for connection
sharing</flag>
- <flag name="consolekit">Use <pkg>sys-auth/consolekit</pkg> for
session
- tracking</flag>
<flag name="dhclient">Use dhclient from
<pkg>net-misc/dhcp</pkg> for
getting ip</flag>
<flag name="dhcpcd">Use <pkg>net-misc/dhcpcd</pkg> for getting
ip</flag>
diff --git a/net-misc/networkmanager/networkmanager-1.26.0.ebuild
b/net-misc/networkmanager/networkmanager-1.26.0-r1.ebuild
similarity index 94%
rename from net-misc/networkmanager/networkmanager-1.26.0.ebuild
rename to net-misc/networkmanager/networkmanager-1.26.0-r1.ebuild
index 89691ae..243c99d 100644
--- a/net-misc/networkmanager/networkmanager-1.26.0.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.26.0-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager";
LICENSE="GPL-2+"
SLOT="0"
-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"
+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"
RESTRICT="!test? ( test )"
REQUIRED_USE="
@@ -24,10 +24,10 @@ REQUIRED_USE="
vala? ( introspection )
wext? ( wifi )
|| ( nss gnutls )
- ?? ( consolekit elogind systemd )
+ ?? ( elogind systemd )
"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
# gobject-introspection-0.10.3 is needed due to gnome bug 642300
# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
@@ -45,7 +45,6 @@ COMMON_DEPEND="
connection-sharing? (
net-dns/dnsmasq[dbus,dhcp]
net-firewall/iptables )
- consolekit? ( >=sys-auth/consolekit-1.0.0 )
dhclient? ( >=net-misc/dhcp-4[client] )
dhcpcd? ( net-misc/dhcpcd )
elogind? ( >=sys-auth/elogind-219 )
@@ -187,9 +186,11 @@ 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)
- --with-session-tracking=$(multilib_native_usex systemd systemd
$(multilib_native_usex elogind elogind $(multilib_native_usex consolekit
consolekit no)))
- # ConsoleKit has no build-time dependency, so use it as the
default case.
- # There is no off switch, and we do not support upower.
+ # 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)
