summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2017-01-15 21:39:03 -0500
committerMike Gilbert <floppym@gentoo.org>2017-01-15 21:39:30 -0500
commita79db02fc8cd32562817094c665000ea3bfec550 (patch)
tree61d108fa2b885b20e13063a97649e262b60d5235 /net-misc/networkmanager
parentsys-fs/xfsprogs: Fixed compilation on 32bit systems (bug #605406). (diff)
downloadgentoo-a79db02fc8cd32562817094c665000ea3bfec550.tar.gz
gentoo-a79db02fc8cd32562817094c665000ea3bfec550.tar.bz2
gentoo-a79db02fc8cd32562817094c665000ea3bfec550.zip
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
Diffstat (limited to 'net-misc/networkmanager')
-rw-r--r--net-misc/networkmanager/networkmanager-1.4.4.ebuild2
1 files changed, 1 insertions, 1 deletions
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) \