--- a/net-misc/networkmanager/networkmanager-1.4.4-r1.ebuild	2017-02-13 09:56:57.000000000 +0100
+++ a/net-misc/networkmanager/networkmanager-1.4.4-r1.ebuild	2017-02-21 13:25:15.864426221 +0100
@@ -8,6 +8,10 @@ 
 VALA_USE_DEPEND="vapigen"
 PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
+# Patch in elogind support
+# Bug #607352
+GNOME2_EAUTORECONF="yes"
+
 inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
 	user readme.gentoo-r1 toolchain-funcs vala versionator virtualx udev multilib-minimal
 
@@ -17,15 +21,17 @@ 
 LICENSE="GPL-2+"
 SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
 
-IUSE="audit bluetooth connection-sharing consolekit +dhclient gnutls +introspection \
-json kernel_linux +nss +modemmanager ncurses ofono +ppp resolvconf selinux \
-systemd teamd test vala +wext +wifi"
+IUSE="audit bluetooth connection-sharing consolekit +dhclient elogind gnutls \
++introspection json kernel_linux +nss +modemmanager ncurses ofono +ppp \
+resolvconf selinux systemd teamd test vala +wext +wifi"
 
 REQUIRED_USE="
+
 	modemmanager? ( ppp )
 	vala? ( introspection )
 	wext? ( wifi )
 	^^ ( nss gnutls )
+	?? ( consolekit elogind systemd )
 "
 
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
@@ -52,6 +58,8 @@ 
 		net-firewall/iptables )
 	consolekit? ( >=sys-auth/consolekit-1.0.0 )
 	dhclient? ( >=net-misc/dhcp-4[client] )
+	!dhclient? ( >=net-misc/dhcpcd-6.11.3 )
+	elogind? ( sys-auth/elogind )
 	gnutls? (
 		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
 		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] )
@@ -85,6 +93,12 @@ 
 	)
 "
 
+PATCHES=(
+        # Patch in elogind support
+        # Bug #607352
+        "${FILESDIR}"/${P}-enable-elogind.patch
+)
+
 python_check_deps() {
 	if use test; then
 		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
@@ -165,6 +179,7 @@ 
 	# maintain and fix it
 	# Also disable dhcpcd support as it's also completely unmaintained
 	# and facing bugs like #563938 and many others
+	# Update: Said bug says, that it *should* work now, so re-enable dhcpcd.
 	#
 	# We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
 	# still not ready for removing that lib
@@ -188,15 +203,15 @@ 
 			$(multilib_native_with libsoup) \
 			$(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 consolekit) \
+			--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no))) \
+			--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) \
 			$(multilib_native_use_enable introspection) \
 			$(multilib_native_use_enable json json-validation) \
 			$(multilib_native_use_enable ppp) \
 			$(use_with dhclient) \
-			--without-dhcpcd \
+			$(use_with !dhclient dhcpcd) \
 			$(multilib_native_use_with modemmanager modem-manager-1) \
 			$(multilib_native_use_with ncurses nmtui) \
 			$(multilib_native_use_with ofono) \