Version bump

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

3 files changed, 308 insertions, 15 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index 89d274d8753c..bfdbd4d33436 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,11 @@
 # 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.241 2015/06/24 09:00:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.242 2015/07/19 09:19:12 pacho Exp $
+
+*networkmanager-1.0.4 (19 Jul 2015)
+
+  19 Jul 2015; Pacho Ramos <pacho@gentoo.org> +networkmanager-1.0.4.ebuild:
+  Version bump
 
   24 Jun 2015; Agostino Sarubbo <ago@gentoo.org> networkmanager-1.0.2.ebuild:
   Stable for ppc, wrt bug #545980
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index fbda85d3531c..afa845141546 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -17,27 +17,19 @@ DIST NetworkManager-0.9.10.1_pre20141101.tar.xz 2507248 SHA256 5f2e61c74713ce9eb
 DIST NetworkManager-0.9.8.10.tar.xz 2015492 SHA256 064d27223d3824859df12e1fb25b787fec1c68bbc864dc52a0289b9211c4c972 SHA512 8688b8dceadf87d26b76bdda76ecb0b383ecaa7991487e6f6ddc150cf311f2f0cb3487afd91f19ecde2925585e8d53c8761fd45743f25c488eff6a7811ca4200 WHIRLPOOL 29c4f2189eb812c23e8c1cfbce728c525282ad3f04d3c9c25b3a80a043c95f2a9419fa71ac6f8a59d7abde8a30275e68e3ef615b74f78c07846757d92f114e1c
 DIST NetworkManager-1.0.0.tar.xz 3210884 SHA256 3a66afec670c975edd9832e620b725a5f16ed267a1b9e1b2d51ef27250d85947 SHA512 7089496ce31bfdffe99c0f031b6326734d2e36b3bb9a2ed0ecbe3dad64bff0dc993b2e6bcac770b31bcfe634833bd8dbabc23d128356dbba8243a6d8fc489a5e WHIRLPOOL df928cb0a9be0782b1f853d808273f798ca62be5f0fd650caf033fb16b98ef696c7f90eaed90488ef7f6a9e607cf74cd865848523fbbf08cd26487e98b4a455a
 DIST NetworkManager-1.0.2.tar.xz 3210588 SHA256 359385707494bedbb48cfe0992ccfbcc4ac147dae1f7a47055c71e96439508ff SHA512 9c5884c75c2a2aae478d99bde4ecbb0dc4293b3f50dcf78a1579aa13e09ab95b01981a366f1dc58cd5d02fe77dc90fc0941f00142cd5ef1cea14c3b9d89f5c36 WHIRLPOOL 0a9f4bc6cc0f176bfc1c82294b45392c86b6d6a65cefe38fc80fce8f09584f275a23163d1909dfde9427405fe7b4086b8e2bc4995eded4cf441b8024fa00657d
+DIST NetworkManager-1.0.4.tar.xz 3364168 SHA256 e4099fa2f4f4b8d95d0ad9fdd03ec20960845085fa500bf79aecbf54cee018c9 SHA512 b07583ca654a95dc018a712626ba0065c2ff5d9904b326891be684b32526f360f287b46cbd11026277a385558c1b55e38a086ae2b0aab059b63a4f3e11566cb1 WHIRLPOOL d6a612a855e216b7b46c620a85ceb3b3893029cf83bb9699ed0ba1c2d349abdeb4ee8921155216fb8285ac369cea64704836984e86bbf3813d8287b4803fc49a
 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 10463 SHA256 e81a5c2bfa38db3e94c3de82b5a4f7521931bf534979145bebecc61076e71d02 SHA512 6f9b3f71ec973de7cfbe5c961714a4e4544f03d5ee7395ccc8a98f0516e349ca8a4ab3a29e674ca9f94d588e47ba0bf971cb4e9c6de62d2903ec5c7280979263 WHIRLPOOL ae2665358dbf717f392a35dc70a616053569e16e609139f6cffab1276e506dd5009e76dfe6b339bbee8495fe5446ab2ff4ac56aff05d2354ff59dc78a418d0ff
 EBUILD networkmanager-1.0.2.ebuild 10305 SHA256 da32ac0b3ae4403ea6fd76415064b10acbf8f54a9c6d0d2ff77588653fc5c6ae SHA512 aae6a3ad4a21a4711b4ff2e69588dece7a0f0fee8e25b8db7a7c2f2b8f17b928a94c59890d53c5859165cdf4a8fe2e014eaa662eba59e708838c7ae8f1931989 WHIRLPOOL d4946abb21f48cdcfee9197a87321c234d52504a6be6e04b9b686260cab51c39bf0e1e460d5be1012379df0ed89b0c945487ddc873644d31f08de1bf391af0ec
-MISC ChangeLog 56261 SHA256 e3938edbafe7e395a064ba7d26408f66f83f56d2a0c17be37f98407a695a3dff SHA512 b73fb4a6f33730b7f5ee3cc945fa06ec2280a61a8c15a3823bc944b8486f036f230787a30776f93547c924e71e5b1a42fe8acf3f99609e9030a054468867b1a4 WHIRLPOOL 4858670c851dc6d3f7101f8cf78013c0bb453506b77baebea3fe6713cffcaf03c12537ae41617eba125ac56a4308055bb65c90e556290e58b4c19854bdf9d4d0
+EBUILD networkmanager-1.0.4.ebuild 10369 SHA256 16c3085c7b3a8acacf5a421f17fea48e6d29dba0bcaf0d01627a49fb0ce636ca SHA512 50ff3d04509c893dc9b7da95236671222f2a4c627618d54c2f91b944f0e25c8ad383e03531ec482a4db002d044521ae3dc99dcd114dc8cb5b84f6ef97345876a WHIRLPOOL 0589a53f4e7e74ed081348514744d137070bacee6205ce2383f89814a04155b968a691ebfac23aa92e707c5850304dd343968a22426f7ae1ce6660a2eb7493c3
+MISC ChangeLog 56392 SHA256 515224a1e8bece0dd83a77279f79a320fed283d3b110fa05c9d1dcaa41947b2f SHA512 62797f6f203f19217edbae57d58175bb0ae665eaadd23aa188e9680f024063526df9605e65ef9d2a4d8bd3cbe3884bae09449e572838bc52eceb2e615b572eea WHIRLPOOL 9db4afd3d38e476f03f6d69a5c337f143d1f690c73efee63c96832ca9a4cf7b5819617f0f8cc79b1923d6ec991ec3742153e6faac5de9c31ad4554733b013c86
 MISC metadata.xml 1313 SHA256 7b9488247558149363d2a36cf46f8f007482796cc400c481fb7f73ac70968274 SHA512 e824980bcdf6a80ec84fae9fbe2ebe76ce4f0512171908726e753c67dd59553d7f62285a3b937fc0f42219a1195b95ece7a03a616290d486684cff8a1e362121 WHIRLPOOL fddc2cc08d2a64525abe59133b02e7bf690793a5c04e219260238ae0cea244cefbd7ee1ae5f668227e1629f6e393ce38f3f94417fe56c0e6a3b0e115b40e0666
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVinHDAAoJELp701BxlEWf0ksP/1b6DMrKX884tZpgEFbK2dwW
-vb6ISk7Glrk7wLnr2x1pCaYshSScYKAzKRppeuFJTPiU1I02ei0czoSQurzE7RZW
-jMdzL4CgdYFsV5y7lkJl4QUb6bL2zW8sNvNQdWBeW61eDYE7f5KDLC5WHzgJcmHp
-Y+PS0pBmALwa+calZ5bXzhgcFRo7guAjWAMDA1zF0WczzFUcwgw9OBwGa2S1DQIk
-b2SiIfylu+CKsJGGaC6asXfng88AqtI1wdSQUBof+wH4eOnEJlMpxH7+EusbLGC0
-UlcLnTMESoygu2IZ83gxKuldogQowga8MeBsGJv2g2RJ0GeUhpeQkKYC88/hFBw3
-pWP4R+4MCYbSRQCEgNfPvof8D7YMIeFVujarLpLKfNCzsIYKq2nbtCFinFoXHvsF
-pYJU5Ub3dfMfFbYsKk2QvUVti7fIec3ScWHrvedvAQylS1Nqad67iXo91xsLWCRv
-RG/NyVcaMe2LmzGthm3mI26T4ELsyxjHmmfNbTb3C4PJOCUDG4K7S/c4vsF+wcxM
-1oPViaYz6eYoHWDKebx+XxqE8X2O52QNZKCCsUoSjahgInHDHLJ99akZABNoV0d6
-ay56F0Vr2IDwUEa3eS7JrRS1FMIQaGrFi0s0LkdgdOhTkjMqtKqF9Wvjp3prXJdC
-sgGKUnVt/ZDjLyg+MqxI
-=bRXq
+iEYEAREIAAYFAlWra5IACgkQCaWpQKGI+9SyZwCcD3HAk+W2YUPyoZncblz3HxFb
+HvUAnimoXKJw02GTdgvQWnzfGlMVra1x
+=FBbI
 -----END PGP SIGNATURE-----
diff --git a/net-misc/networkmanager/networkmanager-1.0.4.ebuild b/net-misc/networkmanager/networkmanager-1.0.4.ebuild
new file mode 100644
index 000000000000..e2191313c6fc
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.0.4.ebuild
@@ -0,0 +1,296 @@
+# 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.4.ebuild,v 1.1 2015/07/19 09:19:12 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME_ORG_MODULE="NetworkManager"
+GNOME2_LA_PUNT="yes"
+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 )
+	wext? ( wifi )
+	^^ ( 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.37.6: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, fixed in 'master'
+	sed -e 's:$localstatedir/run/:/run/:' -i configure || die
+
+	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) \
+		$(use_enable wifi) \
+		${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
+}