--- networkmanager-0.9.8.10-r1.ebuild.orig	2014-08-15 18:34:51.000000000 +0400
+++ networkmanager-0.9.8.10-r1.ebuild	2014-08-15 18:34:49.000000000 +0400
@@ -14,12 +14,13 @@
 
 LICENSE="GPL-2+"
 SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
-IUSE="avahi bluetooth connection-sharing consolekit dhclient +dhcpcd gnutls +introspection kernel_linux +nss +modemmanager +ppp resolvconf systemd test vala +wext +wifi" # wimax
+IUSE="avahi bluetooth connection-sharing consolekit dhclient +dhcpcd gnutls +introspection kernel_linux +nss netifrc +modemmanager +ppp resolvconf systemd test vala +wext +wifi" # wimax
 
 KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86"
 
 REQUIRED_USE="
 	modemmanager? ( ppp )
+	systemd? ( !netifrc )
 	^^ ( nss gnutls )
 	^^ ( dhclient dhcpcd )
 "
@@ -135,7 +136,7 @@
 		--disable-more-warnings \
 		--disable-static \
 		--localstatedir=/var \
-		$(usex systemd '--disable-ifnet' '--enable-ifnet') \
+		$(use_enable netifrc ifnet) \
 		--without-netconfig \
 		--with-dbus-sys-dir=/etc/dbus-1/system.d \
 		--with-udev-dir="$(get_udevdir)" \
@@ -190,7 +191,7 @@
 	keepdir /etc/NetworkManager/system-connections
 	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765
 
-	if ! use systemd; then
+	if use netifrc; then
 		insinto /etc/NetworkManager
 		newins "${FILESDIR}/nm-system-settings.conf-ifnet" NetworkManager.conf
 	fi
@@ -232,10 +233,10 @@
 		esac
 	fi
 
-	if use systemd; then
+	if ! use netifrc; then
 		if [[ ${REPLACING_VERSIONS} < 0.9.8.6 ]]; then
-			ewarn "Ifnet plugin won't be used with systemd support enabled"
-			ewarn "as it is meant to be used with openRC and can cause collisions"
+			ewarn "Ifnet plugin won't be used because USE netifrc is disabled"
+			ewarn "as it is meant to be used with net-misc/netifrc and can cause collisions"
 			ewarn "(like bug #485658)."
 			ewarn "Because of this, you will likely need to reconfigure some of"
 			ewarn "your networks."
@@ -244,7 +245,7 @@
 		if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
 			if grep -q plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
 				ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
-				ewarn "Since it won't be used when running under Systemd, you will need to stop setting"
+				ewarn "Since it won't be used when building with USE netifrc disabled, you will need to stop setting"
 				ewarn "ifnet plugin there to allow NetworkManager to work."
 			fi
 		fi