Fix dhcpcd detection (#549970 by Joakim Tjernlund)

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

4 files changed, 343 insertions, 7 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index 65f05b3b1c06..8040f2bb8964 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/networkmanager
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.238 2015/05/31 13:21:09 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.239 2015/06/04 09:33:20 pacho Exp $
+
+*networkmanager-1.0.2-r1 (04 Jun 2015)
+
+  04 Jun 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/networkmanager-1.0.2-configure-dhcpcd.patch,
+  +networkmanager-1.0.2-r1.ebuild:
+  Fix dhcpcd detection (#549970 by Joakim Tjernlund)
 
   31 May 2015; Mikle Kolyada <zlogene@gentoo.org> networkmanager-1.0.2.ebuild:
   arm stable wrt bug #545980
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 9d0f1f0d42d3..64ca49ba632a 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -11,6 +11,7 @@ AUX networkmanager-0.9.8.9-fix-crash-on-wifi-rescan.patch 2015 SHA256 b883506591
 AUX networkmanager-1.0.0-find-helpers.patch 666 SHA256 46013a02f3608b4bf48975b1be16e71d489c8947c4faf4b3944b29b4f5f1c6c3 SHA512 8754eef0efbe387d14f8e3f167ab726d9cb5da726dd4ee110e6601642cd11cb1238ce8b2168ad4a165ca749094093c523e14dc9405d5e68813c991df2ac473b2 WHIRLPOOL 133e7c01238e788378e97ec73d366b0c707c72213a642370af5256b0a8cdfd5774204fd6b1c501d52b12a5c21900baf90454a2912015c2cc8d9a5b390e9252f4
 AUX networkmanager-1.0.0-lto-switch.patch 1162 SHA256 c76a4e16828f967cfed35fa6a49bb3522a03b25b1ab13e8a2182a8f6c1678a36 SHA512 9e5c39ceb7f1e56bb5559ad92e6ad2385408f5aa59f24256ae5723a0cc47d47df5fd56ba412b790f86f603611114fb954f6d41974fa454380a6789795b222282 WHIRLPOOL 5f1eb3d8f3b7cd97a49ae6f80753de24fb00b357a829801394776651fb8602a50daac18eee524dc4d362c42f55601cabe6a04ca322a17dcad842c16d9476491f
 AUX networkmanager-1.0.0-remove-bashisms.patch 1758 SHA256 2d9870eae54b8032153cd7ea9c75a3134426d32ed4e5dcba7f0ae3776a4d7e1b SHA512 6b42fc0d4ccb6c15844e0395d57131c9dad3a137129bd55eceddb5484e3ca7ec2e68fbddf76627737a8b1630bd7c701b559db148834c857644f37b2e9ffb5369 WHIRLPOOL 9e87e387ce85e2301716baf307376ba3f878081b0c56d781f2a8dc8ffa54b813c941c72aa8df5b303d21ca57f4dda47601e926c27e2f6f99d6c49a90174d2dc6
+AUX networkmanager-1.0.2-configure-dhcpcd.patch 1235 SHA256 54b7e6573dcdefdadfa2a0301eb22cd8135584d87c792295fe2fd3251075572e SHA512 2194e31198c7a5be9cde7a3f0fd3102bf1c60b21d9420f26652927975d57825a9770d736413b578db148688a3fabcc555c00609e62aaf062dc6b28deae1be5ee WHIRLPOOL 75479f012a8a53e033003f22f3d239c57f408c56630897372f3295547ef68d22c48fcf75c91f85a2b0ffa2e4ab47b09a6397a01845e4d44a89513a21465a8433
 AUX nm-system-settings.conf-ifnet 70 SHA256 34f53d9ac1ad65eda6942dc3059117f60f6321059ca23f4fbfcc2f2edcae151f SHA512 74304a367c0675cfc88a6ae17b291a9bc20f24a9dab72e9a4578e697870c4d96245aa45ce62ec86f1e5e7e3069ab8fccec33936e479ca630a836805addb5574d WHIRLPOOL 24e140440014c07c355cecab0564d6a57fc2e37e3ded242f3b9dd3e6ddd05dd924a7497400d2984eed407e99ba9661028a159dd4e393917cee7665b0ff4737eb
 DIST NetworkManager-0.9.10.1_pre20141101.tar.xz 2507248 SHA256 5f2e61c74713ce9ebb755c23c9aca279f321eb924247c282bdd50c2c8337fe40 SHA512 0cc4ec34e5933229a9b25e25b26d7619ac1a61275cd4c33a658c98578e6a27d4d2b1337c1e839467c625739a6ae2175ab6d883c4bfbe35642dbbafb7b11a421d WHIRLPOOL 1d0fb976ffc26aba74fc8b8bee081efc236ea647da0970a5564730522f2f837bfa5cd0853268d5098126810a4429b2ff7840f9cf66e6faa3bd5829b175679681
 DIST NetworkManager-0.9.8.10.tar.xz 2015492 SHA256 064d27223d3824859df12e1fb25b787fec1c68bbc864dc52a0289b9211c4c972 SHA512 8688b8dceadf87d26b76bdda76ecb0b383ecaa7991487e6f6ddc150cf311f2f0cb3487afd91f19ecde2925585e8d53c8761fd45743f25c488eff6a7811ca4200 WHIRLPOOL 29c4f2189eb812c23e8c1cfbce728c525282ad3f04d3c9c25b3a80a043c95f2a9419fa71ac6f8a59d7abde8a30275e68e3ef615b74f78c07846757d92f114e1c
@@ -19,15 +20,14 @@ DIST NetworkManager-1.0.2.tar.xz 3210588 SHA256 359385707494bedbb48cfe0992ccfbcc
 EBUILD networkmanager-0.9.10.1_pre20141101.ebuild 10721 SHA256 bfa817deca02bd20d221c8d1ee92deaf9700698e5f1e1e0f3a656c075d9e3c75 SHA512 3703bd068744d31245e67f97ee70c0e6d23398496f254c9a4b155695c8474998596544183b6586d8002391152f3d574cb0dc9c72a6da164b819688aa64b58898 WHIRLPOOL ff82f9886d7227a7d8ec467034a559c54ba0dcb336564dab0a858ede084ceb2a0b567cf5bbd112cb84d8ac2af60ca5f27b8f00051ab464331f1d474b65f411e2
 EBUILD networkmanager-0.9.8.10-r1.ebuild 8440 SHA256 580948a52d8f47ab225af2e221b04d25ac1a4cc14f9c352dad3ef066e996635c SHA512 182fa0697cbfd27b4d502e318b77b2271c9e746e13bd6ad6c88f83ecba2ccc7cd9b1b182e14eb7974460e61ee82b1280a00aba70b7e9baf36f27e515b4a70ee7 WHIRLPOOL a9bdeae4e4eb7fc08ac26f6e6318e79921f18f5679b75d5670aca3085b9aaa46363c49e06df0e319d129ae58cc9990b903603ee64ef05c34a7e9f4fb9bc0ee5a
 EBUILD networkmanager-1.0.0.ebuild 10740 SHA256 6ed3ac5cfac555c1897ae9ea87205cf7749ad7376cc2392385827cda75915204 SHA512 7b9f1963df0b21f5234494b396a9158bdaff4d2a7080d8c8463b7de1b198f678e4a5c76a3104f818c3a65ddc651cf6d2eafaf7faffb1c710568ce2b0c7ee15ed WHIRLPOOL 1ed47bbcf3cc13cd4826d5741dd240dc59d82d5782bc293780d63389dfe8cca1e59df4d4e8115c1496f5247bb719b71344071d8fa568b623d918be330d651d44
+EBUILD networkmanager-1.0.2-r1.ebuild 10467 SHA256 2a057dacd8f3ade69f81946e2bed25dba3bca14524af5457c14cab0c283c395a SHA512 3d9e9fc79c2f549c86b664ba5eba73e560a74a980c49c1b210437bba741b165842ba460ed3407346d1b6796a95fd1f08405bdafa565724553d912d43544e43e6 WHIRLPOOL 4e217e625868e16f0250de85f0954e2e847843cb096794560cb1389afd46ebaebb45cdcfb79caae783a6a4f2d0f6c2d5932ae975d48779b74a487a8b74fed4ba
 EBUILD networkmanager-1.0.2.ebuild 10310 SHA256 6bff4981f2c136822aaac061c6620940bdea1daf330202f74938b413e5f471f2 SHA512 7886545a93750818f0d1bc57cbefaaf87368cfe39437e3580514bc67f9e58da4fb79e5d7cd3a48ec6c717c594d0a1ebc17aeaf6e998c857087b744dceffd9695 WHIRLPOOL 7ab70d573ed6365cb71c41a984b505380e6699fa7c732a1ccdaf1bd4e4670ad39c3e4cd09b33b0dbed4c8cf16437743f7e61ae74c5b02b3a065ff6b65e8b4c08
-MISC ChangeLog 55784 SHA256 6546bbc44589b6d36488a629302d5d438974247d67a34210f8fb92e2f755d911 SHA512 29b15638fe68b32ee0c2943bb8da67a6f16b5ccce0c7de2ae5b8fc1de30662d58235e29a879dc5220e45b45b54237b93cefd8f637fddb4a46c0dd5c8f2948332 WHIRLPOOL 1e25f38e48575c01571a4429c443efd8c232f0def2f987f9ca891648a86080bda29880e43d3922c29c4db20a6bdcbce891cb5a07415cf04327e676f0873552bb
+MISC ChangeLog 56011 SHA256 68567edf72f27f0e54d16dd9ba438a8791a3fe31f16d79fe96b949da375274b1 SHA512 ede8ab5c18e1180d4c5b2c2959e85c8a2d9e1db0340d568a5c02bed4629994cdf7b7a3731f1edc095336f74ab0ebb30eb2eed97d861736b843c47dec49dd1dad WHIRLPOOL e88a01b994ec992fda5568e7e7f614cf742e506a3d8c56c0aace47b60021a5a2c63ea1f67a026edaf8b6a4eaf74608c7ea159a78b15dfa1e056e815c93af3672
 MISC metadata.xml 1313 SHA256 7b9488247558149363d2a36cf46f8f007482796cc400c481fb7f73ac70968274 SHA512 e824980bcdf6a80ec84fae9fbe2ebe76ce4f0512171908726e753c67dd59553d7f62285a3b937fc0f42219a1195b95ece7a03a616290d486684cff8a1e362121 WHIRLPOOL fddc2cc08d2a64525abe59133b02e7bf690793a5c04e219260238ae0cea244cefbd7ee1ae5f668227e1629f6e393ce38f3f94417fe56c0e6a3b0e115b40e0666
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlVrCkYACgkQG9wOWsQutdZNfgP+KaNScxDiK45CF6BX7V1an19o
-XNy7vJGm0BfqG2+WraQswW0vD5y8jlpZ+w9AzRJaH84u2POJ+05Fk9dfPohEEFrz
-oeOHmmHT6Gmrl9xpeljSDP0pdOInsjEuBX8pj7QICPodqTxEoHNwdykK+9fmZtOS
-2FUtJx/Km1D3TAKaKtA=
-=/a2y
+iEYEAREIAAYFAlVwG2EACgkQCaWpQKGI+9Q2RACdFon4eIqxODNicYsa+IJ8Y6Dc
+T4oAnA8rjQ8evjEyjmbRn/88MyX8Ut+B
+=SYi7
 -----END PGP SIGNATURE-----
diff --git a/net-misc/networkmanager/files/networkmanager-1.0.2-configure-dhcpcd.patch b/net-misc/networkmanager/files/networkmanager-1.0.2-configure-dhcpcd.patch
new file mode 100644
index 000000000000..52325810f0b2
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-1.0.2-configure-dhcpcd.patch
@@ -0,0 +1,31 @@
+From 6baca260d11b4c2f92e8765ff0f66786e507022a Mon Sep 17 00:00:00 2001
+From: Dan Williams <dcbw@redhat.com>
+Date: Tue, 26 May 2015 18:21:31 -0500
+Subject: Partially revert "dhcp: gracefully recover from failed DHCP BOUND
+ state transitions (bgo #743700)"
+
+This reverts commit 7daf63461de4195b1626ca15f835fc7cbc56e847.
+
+Turns out the removal of the second set of [] in configure.ac causes the command
+to be wrong in 'configure' and the test to be incorrect.
+
+diff --git a/configure.ac b/configure.ac
+index ba22057..d9a90c1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -668,10 +668,10 @@ fi
+ if test "$with_dhcpcd" = "yes"; then
+ 	AC_PATH_PROGS(with_dhcpcd, dhcpcd, no, /sbin:/usr/sbin:/usr/local/sbin)
+ 	if test "$with_dhcpcd" != "no"; then
+-		if ! $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [456789]\."; then
++		if ! $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [[456789]]\."; then
+ 			AC_MSG_WARN([Cannot use dhcpcd, version 4.x or higher is required])
+ 			with_dhcpcd=no
+-		elif $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [6789]\."; then
++		elif $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [[6789]]\."; then
+ 			AC_DEFINE(DHCPCD_SUPPORTS_IPV6, 1, [Define if dhcpcd supports IPv6 (6.x+)])
+ 		fi
+ 	fi
+-- 
+cgit v0.10.2
+
diff --git a/net-misc/networkmanager/networkmanager-1.0.2-r1.ebuild b/net-misc/networkmanager/networkmanager-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..8eecbde5260e
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.0.2-r1.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-1.0.2-r1.ebuild,v 1.1 2015/06/04 09:33:20 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME_ORG_MODULE="NetworkManager"
+GNOME2_LA_PUNT="yes"
+VALA_MIN_API_VERSION="0.18"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit autotools bash-completion-r1 eutils gnome2 linux-info multilib python-any-r1 systemd \
+	user readme.gentoo toolchain-funcs vala versionator virtualx udev
+
+DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
+
+IUSE="bluetooth connection-sharing consolekit +dhclient dhcpcd gnutls +introspection \
+kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test \
+vala +wext +wifi zeroconf" # wimax
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+REQUIRED_USE="
+	modemmanager? ( ppp )
+	^^ ( nss gnutls )
+	^^ ( dhclient dhcpcd )
+"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+# TODO: Qt support?
+COMMON_DEPEND="
+	>=sys-apps/dbus-1.2
+	>=dev-libs/dbus-glib-0.100
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/libnl-3.2.8:3=
+	>=sys-auth/polkit-0.106
+	net-libs/libndp
+	>=net-libs/libsoup-2.26:2.4=
+	net-misc/iputils
+	sys-libs/readline
+	>=virtual/libgudev-165:=
+	bluetooth? ( >=net-wireless/bluez-5 )
+	connection-sharing? (
+		net-dns/dnsmasq[dhcp]
+		net-firewall/iptables )
+	gnutls? (
+		dev-libs/libgcrypt:0=
+		net-libs/gnutls:= )
+	modemmanager? ( >=net-misc/modemmanager-0.7.991 )
+	ncurses? ( >=dev-libs/newt-0.52.15 )
+	nss? ( >=dev-libs/nss-3.11:= )
+	dhclient? ( >=net-misc/dhcp-4[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] net-dialup/rp-pppoe )
+	resolvconf? ( net-dns/openresolv )
+	systemd? ( >=sys-apps/systemd-209:0= )
+	!systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )
+	teamd? ( >=net-misc/libteam-1.9 )
+	zeroconf? ( net-dns/avahi:=[autoipd] )
+"
+RDEPEND="${COMMON_DEPEND}
+	consolekit? ( sys-auth/consolekit )
+	wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gdbus-codegen
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	>=sys-kernel/linux-headers-2.6.29
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:2[${PYTHON_USEDEP}]')
+	)
+"
+
+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() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	# Force use of /run, avoid eautoreconf, upstream bug #737139
+	sed -e 's:$localstatedir/run/:/run/:' -i configure || die
+
+	# Partially revert commit that breaks dhcpcd detection, bug #549970
+	epatch "${FILESDIR}"/${PN}-1.0.2-configure-dhcpcd.patch
+
+	use vala && vala_src_prepare
+
+	epatch_user # don't remove, users often want custom patches for NM
+
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		myconf="${myconf} --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER}"
+	fi
+
+	# unit files directory needs to be passed only when systemd is enabled,
+	# otherwise systemd support is not disabled completely, bug #524534
+	use systemd && myconf="${myconf} "$(systemd_with_unitdir)""
+
+	# TODO: enable wimax when we have a libnl:3 compatible revision of it
+	# wimax will be removed, bug #522822
+	# ifnet plugin always disabled until someone volunteers to actively
+	# maintain and fix it
+	gnome2_src_configure \
+		--disable-more-warnings \
+		--disable-static \
+		--localstatedir=/var \
+		--disable-lto \
+		--disable-config-plugin-ibft \
+		--disable-ifnet \
+		--without-netconfig \
+		--with-dbus-sys-dir=/etc/dbus-1/system.d \
+		--with-udev-dir="$(get_udevdir)" \
+		--with-config-plugins-default=keyfile \
+		--with-iptables=/sbin/iptables \
+		--with-libsoup=yes \
+		--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) \
+		$(use_enable bluetooth bluez5-dun) \
+		$(use_enable introspection) \
+		$(use_enable ppp) \
+		--disable-wimax \
+		$(use_with dhclient) \
+		$(use_with dhcpcd) \
+		$(use_with modemmanager modem-manager-1) \
+		$(use_with ncurses nmtui) \
+		$(use_with resolvconf) \
+		$(use_with selinux) \
+		$(use_enable teamd teamdctl) \
+		$(use_enable test tests) \
+		$(use_enable vala) \
+		--without-valgrind \
+		$(use_with wext) \
+		${myconf}
+}
+
+src_test() {
+	python_setup
+	Xemake check
+}
+
+src_install() {
+	# Install completions at proper place, bug #465100
+	gnome2_src_install completiondir="$(get_bashcompdir)"
+
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# /var/run/NetworkManager is used by some distros, but not by Gentoo
+	rmdir -v "${ED}/var/run/NetworkManager" || die "rmdir failed"
+	rmdir -v "${ED}/var/run" || die "rmdir failed"
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765
+
+	# 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"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	! use systemd && readme.gentoo_print_elog
+
+	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
+
+	# ifnet plugin was disabled for systemd users with 0.9.8.6 version
+	# and for all people with 0.9.10.0-r1 (see ChangeLog for full explanations)
+	if use systemd; then
+		if ! version_is_at_least 0.9.8.6 ${REPLACING_VERSIONS}; 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 reconfigure some of"
+			ewarn "your networks. To do this you can rely on Gnome control center,"
+			ewarn "nm-connection-editor or nmtui tools for example once updated"
+			ewarn "NetworkManager version is installed."
+		fi
+	else
+		if ! version_is_at_least 0.9.10.0-r1 ${REPLACING_VERSIONS}; then
+			ewarn "Ifnet plugin is now disabled because of it being unattended"
+			ewarn "and unmaintained for a long time, leading to some unfixed bugs"
+			ewarn "and new problems appearing. We will now use upstream 'keyfile'"
+			ewarn "plugin."
+			ewarn "Because of this, you will likely need to reconfigure some of"
+			ewarn "your networks. To do this you can rely on Gnome control center,"
+			ewarn "nm-connection-editor or nmtui tools for example once updated"
+			ewarn "NetworkManager version is installed."
+		fi
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+}