--- networkmanager-0.9.8.10-r1.ebuild	2014-07-22 19:33:57.000000000 +0300
+++ networkmanager-0.9.8.10-r1.ebuild	2014-07-23 20:37:17.060464000 +0300
@@ -14,7 +14,7 @@ 
 
 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 +modemmanager policykit +ppp resolvconf systemd suspend test vala +wext +wifi" # wimax
 
 KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
@@ -32,7 +32,7 @@ 
 	>=dev-libs/dbus-glib-0.94
 	>=dev-libs/glib-2.30
 	>=dev-libs/libnl-3.2.7:3=
-	>=sys-auth/polkit-0.106
+	policykit? ( >=sys-auth/polkit-0.106 )
 	>=net-libs/libsoup-2.26:2.4=
 	>=virtual/udev-165[gudev]
 	bluetooth? ( >=net-wireless/bluez-4.82 )
@@ -51,7 +51,7 @@ 
 	ppp? ( >=net-dialup/ppp-2.4.5[ipv6] )
 	resolvconf? ( net-dns/openresolv )
 	systemd? ( >=sys-apps/systemd-183:0= )
-	|| ( sys-power/upower sys-power/upower-pm-utils >=sys-apps/systemd-183 )
+	suspend? ( || ( sys-power/upower sys-power/upower-pm-utils >=sys-apps/systemd-183 ) )
 "
 RDEPEND="${COMMON_DEPEND}
 	consolekit? ( sys-auth/consolekit )
@@ -142,13 +142,14 @@ 
 		--enable-concheck \
 		--with-crypto=$(usex nss nss gnutls) \
 		--with-session-tracking=$(usex systemd systemd $(usex consolekit consolekit no)) \
-		--with-suspend-resume=$(usex systemd systemd upower) \
+		$(usex suspend $(usex--with-suspend-resume=$(usex systemd systemd upower))) \
 		$(use_enable introspection) \
 		$(use_enable ppp) \
 		--disable-wimax \
 		$(use_with dhclient) \
 		$(use_with dhcpcd) \
 		$(use_with modemmanager modem-manager-1) \
+		$(use_with policykit polkit) \
 		$(use_with resolvconf) \
 		$(use_enable test tests) \
 		$(use_enable vala) \
@@ -195,8 +196,10 @@ 
 	fi
 
 	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+	if use policykit; then
+		insinto /usr/share/polkit-1/rules.d/
+		doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+	fi
 
 	prune_libtool_files --modules
 }
@@ -214,7 +217,7 @@ 
 
 	# The polkit rules file moved to /usr/share
 	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-	if [[ -f "${old_rules}" ]]; then
+	if use policykit && [[ -f "${old_rules}" ]]; then
 		case "$(md5sum ${old_rules})" in
 		  574d0cfa7e911b1f7792077003060240* )
 			# Automatically delete the old rules.d file if the user did not change it