From a79db02fc8cd32562817094c665000ea3bfec550 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Sun, 15 Jan 2017 21:39:03 -0500 Subject: [PATCH] net-misc/networkmanager: stop passing --with-suspend-resume=no This causes configure to fail when USE=systemd for non-native abis. --with-suspend-resume must be either systemd, upower, or consolekit. Additionally, configure checks for libsystemd using pkg-config if we pass --with-suspend-resume=systemd. There's no real need for this since the daemon communicates with systemd using dbus. The pkg-config check is only there to look for a new-enough version of systemd. Passing --with-suspend-resume=consolekit does not perform any pkg-config check. Therefore, let's use consolekit as the fallback value for the systemd non-native abi case. Bug: https://bugs.gentoo.org/605814 Package-Manager: Portage-2.3.3_p32, Repoman-2.3.1_p25 --- net-misc/networkmanager/networkmanager-1.4.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/networkmanager/networkmanager-1.4.4.ebuild b/net-misc/networkmanager/networkmanager-1.4.4.ebuild index 8e90b83ec634..2d1b16aba117 100644 --- a/net-misc/networkmanager/networkmanager-1.4.4.ebuild +++ b/net-misc/networkmanager/networkmanager-1.4.4.ebuild @@ -189,7 +189,7 @@ multilib_src_configure() { $(multilib_native_enable concheck) \ --with-crypto=$(usex nss nss gnutls) \ --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex consolekit consolekit no)) \ - --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex consolekit consolekit no)) \ + --with-suspend-resume=$(multilib_native_usex systemd systemd consolekit) \ $(multilib_native_use_with audit libaudit) \ $(multilib_native_use_enable bluetooth bluez5-dun) \ $(multilib_native_use_enable introspection) \ -- 2.26.2