Version bump, use keyfile plugin instead of ifnet for systemd to prevent collisions and problems like bug #485658

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 40 insertions, 257 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index 16b7aaf3ab91..4495334c96fc 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/networkmanager
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.181 2013/10/01 22:19:42 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.182 2013/10/05 13:39:26 pacho Exp $
+
+*networkmanager-0.9.8.6 (05 Oct 2013)
+
+  05 Oct 2013; Pacho Ramos <pacho@gentoo.org> +networkmanager-0.9.8.6.ebuild,
+  -networkmanager-0.9.6.4-r1.ebuild, -networkmanager-0.9.8.2-r3.ebuild:
+  Version bump, use keyfile plugin instead of ifnet for systemd to prevent
+  collisions and problems like bug #485658
 
   01 Oct 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
   networkmanager-0.9.6.4.ebuild, networkmanager-0.9.6.4-r1.ebuild,
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 583d56d029e6..63dc3607363a 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -24,22 +24,17 @@ AUX networkmanager-0.9.8.2-allow-new-dhcpcd.patch 917 SHA256 b3a69fd9850634edc19
 AUX networkmanager-0.9.8.4-pre-sleep.patch 4606 SHA256 ea70654524d5b414fcef10164b8dfb5e84bdf2444341f62fc7617952e2e721de SHA512 0781743f1e1afce3e51df6958996ea96885f56be96bd377dfbf115efaaa935396d468c701dd8a8c97e3a1623743476880e5936f4c0db4d560188e1f4c3b9b814 WHIRLPOOL 76dc1381cf0d7aa4d2d1530c077379929b40fcd54f66426ff46cca28d128fb40c88fd15bb6cb6139bec8c6bc338dbc8d266512056d27f307fa4e830cf28deb12
 AUX nm-system-settings.conf-ifnet 70 SHA256 34f53d9ac1ad65eda6942dc3059117f60f6321059ca23f4fbfcc2f2edcae151f SHA512 74304a367c0675cfc88a6ae17b291a9bc20f24a9dab72e9a4578e697870c4d96245aa45ce62ec86f1e5e7e3069ab8fccec33936e479ca630a836805addb5574d WHIRLPOOL 24e140440014c07c355cecab0564d6a57fc2e37e3ded242f3b9dd3e6ddd05dd924a7497400d2984eed407e99ba9661028a159dd4e393917cee7665b0ff4737eb
 DIST NetworkManager-0.9.6.4.tar.xz 1968564 SHA256 511b411e055d187bc8f26c519fdb3e55e07fc40d4adecbbec623c0249380a7eb SHA512 900eb30f7fed35d43f2c1003fcf7fc0b6ab9c5a9f0a14777d4636372376af8477e63fc7fc9b05d2f281d48de658d96d9b30f44851af8ae2b4271bb2b5c2cb669 WHIRLPOOL b87903e4cbb3efcec17b25e74dd67dc6a81a6d553df57e9c699bb1f0d40fe6d611953f6baaeca48ef4387316980d775ec2b07a9df06ecb5f03c10dffc2b60584
-DIST NetworkManager-0.9.8.2.tar.xz 1967452 SHA256 5c0b2f71b2f61e0dfbe95cebad83001758db252d5cdf5b6f7ceebac9c6bd7ead SHA512 a731b85d267bcbd837960b0b1bec2c8ec0458180a751bce353e763e9fca033dfc8101a1267101dadcc8984138a4b693a198a09c15acd7faab3930f98c8246775 WHIRLPOOL 788c3f07f66aca9099349a1a8325cf4ba5c23665d019c508baf4bf037f77316379a1c47c1eb67d4ab6ef845ff6a783e2453d6ff50cde6b830d36f2d5cd648e3c
 DIST NetworkManager-0.9.8.4.tar.xz 2007408 SHA256 4c9ff0aaf52bee8df9a73290ec2b3f4441ff504420d0b0dfd729b00a92d80d99 SHA512 2e70ab144a07d5d452efbd445ab0fc28a0a64934661cc77456ec0c4f8ba4015e8943759954b0c6d6bb0994237e97a53ff16929a4ac7a620cfc5fde095f02c327 WHIRLPOOL 900d2ff6adbfd71f5d26734a3c9791d46be8e3a76775e2878767573004ef78047338e188e9200b64955504c547467c2e07909ba6bcc5db98bd6d1aa85940040d
-EBUILD networkmanager-0.9.6.4-r1.ebuild 7552 SHA256 976e9705902e4df03308af4e9f95ef0ebff424a1ce4bf029ec05dfc12e15e20b SHA512 7fd0fd1ca35da0fa12cf96d999230df45664da266a8c34ef9eb072521c3140840b055e78169454db54c64812780854bed9abfbb971707adc39791375ce3f1a70 WHIRLPOOL bdb946b9a10edbf04b124d483fb945c4c3ab9fc8471fe9b24564031495801565f13b92c81098aeb26bb6c37315f286be461ec30198b906906d23a5607e782600
+DIST NetworkManager-0.9.8.6.tar.xz 2026452 SHA256 2289800de66fd7f8c141e029923beb39f43952e442b3cb864e3bf73b26c0c369 SHA512 a7c56763422ca71be70aec5507e39158ac6062a247df4aec1b78fdaf21f1369ffd9728234ed8ea2c40e1e8a18bbca23e71e4a088e05c5c482b859fd98ed544ce WHIRLPOOL bb4f93bbb811d7b34ea57e5b68bad1fd6fa74e87fedd5c93c0c9258325e9d953b797712fbd59094678f58a4b3c6c289c14ea159b01fbdfe56c8c2b831dad3ee7
 EBUILD networkmanager-0.9.6.4.ebuild 7530 SHA256 119f07d23fff9969a85438ea092242c761393b32e95ffcb292eeb94770fbaac9 SHA512 f8dea7d426b67d215f3f3d8c40e25a2d14da2d7dff3bd80aeb24e4a8d2d6da5e46b22692d75a2c266a85617ede1b24b5c0a08b5d41ad25ff0767e09318117a6c WHIRLPOOL e9c4ba5236727574e0bf79cde0935ec62d52cab63b18af824a3a463daf4fedaf6b2fc29fd7a8658177bd1367ab14ea21c4a16eea08d4a484c162db0b82916b24
-EBUILD networkmanager-0.9.8.2-r3.ebuild 7612 SHA256 82b9ed9cab18506012be1bc147a9f89b57e67e34f0cad8c510223d0645181b5c SHA512 d32b13a0dce475de8bda2f3159ef682ee49ec1f687d21e835228bc881b5de09d6fc9823564d0f3ff78bd1d16fd6db708a4512d549e56f706d2cfb387db09db59 WHIRLPOOL 79b51395d583779e2e99113af448a0b2c2b0b2afc897955505b0a8af8e978453bb54ebb2b0a4d42fd77a136b9ce80addbdb8ac879ecb889df5fd0b15bf29e55e
 EBUILD networkmanager-0.9.8.4.ebuild 7704 SHA256 cb97a4bdd449275c6a87863b49ef58cbbee0c3e1e7210fb7eacec024029ee284 SHA512 6e33017fc519fb57d756bf2b8a4addda207300a3ecc21d87e0ae19890a932195760c3e42726ef0d4c8eeca9b0bd967a7537412d6191bdc2f3d5c36c4e16ba120 WHIRLPOOL 8cab1cb320b2a981380cbe6c98d14787d0a6aabe806bd6dfbfc96736ee06997e390dbe5236a6d7fa986cb9cfe3f7264b532741247a6715665a8ba1e8340f49ad
-MISC ChangeLog 45495 SHA256 ba4ffb38f37adae55131e455cec1cd57d43d57b7226bd50cdfb3a36157eea5ef SHA512 e443db7034093b6633cf8e4ebc04f6b4ed77e139a2e54b890b6b2da86b47dcd6831fdc7007d07258d06e4bebc69945c5e541cefd2344061634b64f785e2a5f9f WHIRLPOOL 293a652943ef7953d0616a66e9c61e0a52738d1ad26d4819b5db16e4ea70d37ab6664f73d5e82edf6ca285fd476c6bdaa4c886591e169bee9b317704f6dc7352
+EBUILD networkmanager-0.9.8.6.ebuild 7833 SHA256 aa4012697e3d682ce7777603d3ebb42c921c698b0c4e8633642d044ec599bbcd SHA512 63e2e0646ffa08fc9b0bcd650792a87e3797c677e557d3d165f1f43921de5fcd532a716dda62b30f2d30a729543a0be1e3d59b277de4769c78368d102b844a27 WHIRLPOOL 8e1c28d2d1ec94e1349cdaecc0edcc452ccb2a5a0d3af5855e327cb05419104b8a2a958f1dfb66732b9582265b8902073f3ec8e726830ea969680a25afdb22f6
+MISC ChangeLog 45799 SHA256 80c78154d6de2d456d456a1aa6029170d2da5ade60126e54badeae810c3fbebe SHA512 93cdbf7945ad5bd894de101e108a4b57f826bb3a0954762bfc537fbbd21f6a4436d9cbb19dc958809bddc1d623e96d3a4431daa412a6a8e8ad55e1021adb5414 WHIRLPOOL 7443067d0c79d9ab986751ed47042222783f8b31bbfad8261e07b0f607d62933f70078191b18cf022a9a3d88f27c05bdaa0725fd6e8c4253e10655b3f4fe36e4
 MISC metadata.xml 1310 SHA256 7bc71d09fd619c5f65f1e9b5618d49f9f8ee38fe5b437cab2a3a870b8272fdbd SHA512 5637c1aed72ac8bcecd6fa806f4f8c35aa8ed353b5a4ae649cc415a1bad31b62ed657ed0a8c43cfdcbeebdac827ede6fa86c88a7ed49fa38464f00bcb4e72574 WHIRLPOOL 13bc9e31905900f2c23399268e5f670b6b75cf21ad6c1a7ccde29668fc441362f9b8b03ff2eba2de320c395f79dbd5dffa03d0ebcf62bf95a4f1a525c446dc42
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSS0qYAAoJEJ0WA1zPCt1hzXcH/3gPfzNVEB/1IQBneDngzynW
-0UhojRMkvTjZtF1EFxJraA59/EhUvp8DpQgLbTWZ+GTAn3XlRzd/ujKVO4D/VUYb
-go8J8bvfm76uL59PN2LoWW6WDe60+8brK8HACnz3VQ2ezlNNykshqZ3hmEoPBzDP
-so3Uxsq8vgit/W31D9HnjR9pPsD94NjS5uMQjfy099illvyPX+5QgGybCzBMbAzg
-9vx16tP6ZrjPlU0bOojqSgnDd0GG9EmIoq/z8PVShJfgYKf4kz8pgxuEYs9QVL3b
-A91QiAP0//ucczI3YgmdZ39Qcmv/3ZWnScYB4gGS6Uh2MQ+ALK11HAtnWhwkMZQ=
-=3ghn
+iEYEAREIAAYFAlJQFo8ACgkQCaWpQKGI+9SHXQCeKv5UApcg82hU93KTxSoAVcpe
+jpYAmwccdJrA7PSdfH9X8Auj/rHYCc5G
+=5NZF
 -----END PGP SIGNATURE-----
diff --git a/net-misc/networkmanager/networkmanager-0.9.6.4-r1.ebuild b/net-misc/networkmanager/networkmanager-0.9.6.4-r1.ebuild
deleted file mode 100644
index e2597cdea653..000000000000
--- a/net-misc/networkmanager/networkmanager-0.9.6.4-r1.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.6.4-r1.ebuild,v 1.3 2013/10/01 22:19:42 tetromino Exp $
-
-EAPI="5"
-GNOME_ORG_MODULE="NetworkManager"
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools eutils gnome.org linux-info systemd user toolchain-funcs vala udev
-
-DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts"
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-
-LICENSE="GPL-2+"
-SLOT="0" # TODO: add subslot on 0.9.8 bump
-IUSE="avahi bluetooth connection-sharing +consolekit dhclient +dhcpcd doc gnutls +introspection kernel_linux +nss modemmanager +ppp resolvconf systemd vala +wext wimax"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-REQUIRED_USE="
-	modemmanager? ( ppp )
-	^^ ( nss gnutls )
-	^^ ( dhclient dhcpcd )
-	?? ( consolekit systemd )
-"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-# libnl:1.1 is needed for linking to net-wireless/wimax libraries
-# XXX: on bump, check that net-wireless/wimax is still using libnl:1.1 !
-# TODO: Qt support?
-COMMON_DEPEND=">=sys-apps/dbus-1.2
-	>=dev-libs/dbus-glib-0.94
-	virtual/udev[gudev]
-	>=dev-libs/glib-2.26
-	>=sys-auth/polkit-0.97
-	>=net-libs/libsoup-2.26:2.4=
-	>=net-wireless/wpa_supplicant-0.7.3-r3[dbus]
-	bluetooth? ( >=net-wireless/bluez-4.82 )
-	avahi? ( net-dns/avahi:=[autoipd] )
-	gnutls? (
-		dev-libs/libgcrypt:=
-		net-libs/gnutls:= )
-	nss? ( >=dev-libs/nss-3.11:= )
-	dhclient? ( net-misc/dhcp[client] )
-	dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3 )
-	ppp? ( >=net-dialup/ppp-2.4.5[ipv6] )
-	resolvconf? ( net-dns/openresolv )
-	connection-sharing? (
-		net-dns/dnsmasq[dhcp]
-		net-firewall/iptables )
-	wimax? (
-		dev-libs/libnl:1.1=
-		>=net-wireless/wimax-1.5.1 )
-	!wimax? ( dev-libs/libnl:3= )
-"
-RDEPEND="${COMMON_DEPEND}
-	modemmanager? ( >=net-misc/modemmanager-0.4 )
-	consolekit? ( sys-auth/consolekit )
-	systemd? ( >=sys-apps/systemd-31 )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	>=sys-kernel/linux-headers-2.6.29
-	doc? ( >=dev-util/gtk-doc-1.8 )
-	vala? ( $(vala_depend) )
-	!wimax? ( !=dev-libs/libnl-3.2.20 )
-"
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See http://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See http://bugs.gentoo.org/333639 for more info."
-		fi
-
-	fi
-}
-
-pkg_setup() {
-	enewgroup plugdev
-}
-
-src_prepare() {
-	# Build against libnl:1.1 for net-wireless/wimax-1.5.2 compatibility
-	epatch "${FILESDIR}/${PN}-0.9.4.0-force-libnl1.1-r1.patch"
-	# Update init.d script to provide net and use inactive status if not connected
-	epatch "${FILESDIR}/${PN}-0.9.2.0-init-provide-net-r1.patch"
-	# Bug #402085, https://bugzilla.gnome.org/show_bug.cgi?id=387832
-	epatch "${FILESDIR}/${PN}-0.9.2.0-pre-sleep.patch"
-	# Bug #335147, https://bugzilla.gnome.org/show_bug.cgi?id=679428
-	epatch "${FILESDIR}/${PN}-0.9.4.0-dhclient-ipv6.patch"
-	# https://bugzilla.gnome.org/show_bug.cgi?id=683932
-	epatch "${FILESDIR}/${PN}-0.9.6.0-daemon-signals.patch"
-
-	epatch_user
-
-	use vala && vala_src_prepare
-	eautoreconf
-	default
-}
-
-src_configure() {
-	econf \
-		--disable-more-warnings \
-		--disable-static \
-		--localstatedir=/var \
-		--with-distro=gentoo \
-		--with-dbus-sys-dir=/etc/dbus-1/system.d \
-		--with-udev-dir="$(udev_get_udevdir)" \
-		--with-iptables=/sbin/iptables \
-		--enable-concheck \
-		--with-crypto=$(usex nss nss gnutls) \
-		--with-session-tracking=$(usex consolekit ck $(usex systemd systemd none)) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable introspection) \
-		$(use_enable ppp) \
-		$(use_enable wimax) \
-		$(use_with dhclient) \
-		$(use_with dhcpcd) \
-		$(use_with doc docs) \
-		$(use_with resolvconf) \
-		$(use_enable vala) \
-		$(use_with wext) \
-		$(use_with wimax libnl-1) \
-		"$(systemd_with_unitdir)"
-}
-
-src_test() {
-	cp libnm-util/tests/certs/test_ca_cert.pem src/settings/plugins/ifnet/tests/ || die
-	default
-}
-
-src_install() {
-	default
-	# /var/run/NetworkManager is used by some distros, but not by Gentoo
-	rmdir -v "${ED}/var/run/NetworkManager" || die "rmdir failed"
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	if use systemd; then
-		# Our init.d script requires running a dispatcher script that annoys
-		# systemd users; bug #434692
-		rm -rv "${ED}/etc/init.d" || die "rm failed"
-	else
-		# Provide openrc net dependency only when nm is connected
-		exeinto /etc/NetworkManager/dispatcher.d
-		newexe "${FILESDIR}/10-openrc-status-r3" 10-openrc-status
-		sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-			-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-		# Default conf.d file
-		newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-	fi
-
-	# Add keyfile plugin support
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765
-	insinto /etc/NetworkManager
-	newins "${FILESDIR}/nm-system-settings.conf-ifnet" NetworkManager.conf
-
-	# 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 has_version '<sys-auth/polkit-0.106'; then
-		insinto /etc/polkit-1/localauthority/10-vendor.d
-		doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.pkla"
-	fi
-
-	# Remove useless .la files
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	elog "To modify system network connections without needing to enter the"
-	elog "root password, add your user account to the 'plugdev' group."
-
-	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# 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
-		case "$(md5sum ${old_rules})" in
-		  574d0cfa7e911b1f7792077003060240* )
-			# Automatically delete the old rules.d file if the user did not change it
-			elog
-			elog "Removing old ${old_rules} ..."
-			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
-			;;
-		  * )
-			elog "The ${old_rules}"
-			elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4"
-			elog "If you edited ${old_rules}"
-			elog "without changing its behavior, you may want to remove it."
-			;;
-		esac
-	fi
-}
diff --git a/net-misc/networkmanager/networkmanager-0.9.8.2-r3.ebuild b/net-misc/networkmanager/networkmanager-0.9.8.6.ebuild
index a86041d8dd3b..aebe757b7679 100644
--- a/net-misc/networkmanager/networkmanager-0.9.8.2-r3.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.9.8.6.ebuild
@@ -1,22 +1,20 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.8.2-r3.ebuild,v 1.4 2013/10/01 22:19:42 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.8.6.ebuild,v 1.1 2013/10/05 13:39:26 pacho Exp $
 
 EAPI="5"
 GNOME_ORG_MODULE="NetworkManager"
 VALA_MIN_API_VERSION="0.18"
 VALA_USE_DEPEND="vapigen"
 
-inherit bash-completion-r1 gnome.org linux-info systemd user readme.gentoo toolchain-funcs vala virtualx udev eutils autotools
+inherit bash-completion-r1 gnome.org linux-info systemd user readme.gentoo toolchain-funcs vala virtualx udev eutils
 
 DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts"
 HOMEPAGE="http://projects.gnome.org/NetworkManager/"
 
 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" # wimax
+IUSE="avahi bluetooth connection-sharing consolekit dhclient +dhcpcd gnutls +introspection kernel_linux +nss modemmanager +ppp resolvconf systemd test vala +wext" # wimax
 
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
@@ -107,11 +105,7 @@ src_prepare() {
 		root password, add your user account to the 'plugdev' group."
 
 	# Bug #402085, https://bugzilla.gnome.org/show_bug.cgi?id=387832
-	epatch "${FILESDIR}/${PN}-0.9.7.995-pre-sleep.patch"
-
-	# Allow dhcpcd newer than 5.x to be used, patch from upstream (will be
-	# included in next version)
-	epatch "${FILESDIR}/${P}-allow-new-dhcpcd.patch"
+	epatch "${FILESDIR}/${PN}-0.9.8.4-pre-sleep.patch"
 
 	# Use python2.7 shebangs for test scripts
 	sed -e 's@\(^#!.*python\)@\12.7@' \
@@ -119,26 +113,25 @@ src_prepare() {
 
 	# Fix completiondir, avoid eautoreconf, bug #465100
 	sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
-		cli/completion/Makefile.am || die "sed completiondir failed"
+		cli/completion/Makefile.in || die "sed completiondir failed"
 
 	## Force use of /run, avoid eautoreconf
-	#sed -e 's:$localstatedir/run/:/run/:' -i configure || die
-
-	# We have to eautoreconf anyway for the dhcpcd patch
-	sed -e 's:$localstatedir/run/:/run/:' -i configure.ac || die
+	sed -e 's:$localstatedir/run/:/run/:' -i configure || die
 
 	use vala && vala_src_prepare
 
-	eautoreconf
+	epatch_user # don't remove, users often want custom patches for NM
 }
 
 src_configure() {
 	# TODO: enable wimax when we have a libnl:3 compatible revision of it
+	# We are not ready for bluez5 yet
 	econf \
+		--enable-bluez4 \
 		--disable-more-warnings \
 		--disable-static \
 		--localstatedir=/var \
-		--enable-ifnet \
+		$(usex systemd '--disable-ifnet' '--enable-ifnet') \
 		--without-netconfig \
 		--with-dbus-sys-dir=/etc/dbus-1/system.d \
 		--with-udev-dir="$(udev_get_udevdir)" \
@@ -192,14 +185,16 @@ src_install() {
 	# Add keyfile plugin support
 	keepdir /etc/NetworkManager/system-connections
 	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765
-	insinto /etc/NetworkManager
-	newins "${FILESDIR}/nm-system-settings.conf-ifnet" NetworkManager.conf
+
+	if ! use systemd; then
+		insinto /etc/NetworkManager
+		newins "${FILESDIR}/nm-system-settings.conf-ifnet" NetworkManager.conf
+	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"
 
-	# Remove useless .la files
 	prune_libtool_files --modules
 }
 
@@ -232,4 +227,14 @@ pkg_postinst() {
 			;;
 		esac
 	fi
+
+	if use systemd; 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 "(like bug #485658)."
+			ewarn "Because of this, you will likely need to reintroduce passwords"
+			ewarn "for your used routers."
+		fi
+	fi
 }