Version bump

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

5 files changed, 375 insertions, 5 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index 8a0d9e14dbf3..58b81d193587 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.221 2015/01/08 10:05:07 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.222 2015/01/10 14:51:52 pacho Exp $
+
+*networkmanager-1.0.0 (10 Jan 2015)
+
+  10 Jan 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/networkmanager-1.0.0-find-helpers.patch,
+  +files/networkmanager-1.0.0-lto-switch.patch, +networkmanager-1.0.0.ebuild:
+  Version bump
 
   08 Jan 2015; Pacho Ramos <pacho@gentoo.org>
   networkmanager-0.9.10.1_pre20141101.ebuild:
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index e2ea74fc15b6..bdba833ea35f 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -8,17 +8,21 @@ AUX init.d.NetworkManager 1895 SHA256 5f368362ef5c6deed538f20dc582d6da3c86871bd4
 AUX networkmanager-0.9.10.0-arpingpath.patch 859 SHA256 ea8c0e293e3af198412e2ea95757330d7c978d89809b39b4a6caddc0fc1cafa6 SHA512 9d7c2512e4d124c14de3cd7e49694ad79c1cb2774d89466960f6debcf117f1409b1bf43ee2d2ee09a3be2be1dd96054073fe4e1342d02749c966d36ac5d06b62 WHIRLPOOL c27921ff23df7c1d55d7b673a48c46efe7784c651a2f74f2b157ad53622ab354ac3f7beac480207ad0ebf4c276f75abf84a511328f298b6dbc4c3ee17477f618
 AUX networkmanager-0.9.8.4-pre-sleep.patch 4606 SHA256 ea70654524d5b414fcef10164b8dfb5e84bdf2444341f62fc7617952e2e721de SHA512 0781743f1e1afce3e51df6958996ea96885f56be96bd377dfbf115efaaa935396d468c701dd8a8c97e3a1623743476880e5936f4c0db4d560188e1f4c3b9b814 WHIRLPOOL 76dc1381cf0d7aa4d2d1530c077379929b40fcd54f66426ff46cca28d128fb40c88fd15bb6cb6139bec8c6bc338dbc8d266512056d27f307fa4e830cf28deb12
 AUX networkmanager-0.9.8.9-fix-crash-on-wifi-rescan.patch 2015 SHA256 b883506591031ebda11beed149975137950449c0c17a4c3f06745c89d782256c SHA512 3435d9ab85df69e6cd8284a34bf689331d338d13a5d64d52abc36f4ffb5c3ba31aa4336560a7e0e082c58dd916ba4364dfb75246f1bd8c22c81aa195f4ff18a7 WHIRLPOOL eb9fbd2ff5471539dcfbb0cee8213ae479c191695f798a7475484c7061d636f5cb6e6be3eebbb74e0781481477002846d37957768e5b089c2b0bbc143f9d4991
+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 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
+DIST NetworkManager-1.0.0.tar.xz 3210884 SHA256 3a66afec670c975edd9832e620b725a5f16ed267a1b9e1b2d51ef27250d85947 SHA512 7089496ce31bfdffe99c0f031b6326734d2e36b3bb9a2ed0ecbe3dad64bff0dc993b2e6bcac770b31bcfe634833bd8dbabc23d128356dbba8243a6d8fc489a5e WHIRLPOOL df928cb0a9be0782b1f853d808273f798ca62be5f0fd650caf033fb16b98ef696c7f90eaed90488ef7f6a9e607cf74cd865848523fbbf08cd26487e98b4a455a
 EBUILD networkmanager-0.9.10.1_pre20141101.ebuild 10706 SHA256 a3d0c1f069b710d5ae40d9c0d8376b19e1a5f52f5e3bd50644fd5b26a0f67ca0 SHA512 06c378ab4ef3b65e2b9b2ace581b644d8af79dc9154fa014f66619e1d47ae17281fb759d2e45b0e762ad544827f61f9b634c1f93e54f510395529f16897dbca9 WHIRLPOOL 17953ca142fe8a4e6753ed13a7ae64070abf39b59e9bb798376e0e47e82ada4666d0075d043888e98c65327340e0e73edc37752b381ec7f3ea4e79c060ae2638
 EBUILD networkmanager-0.9.8.10-r1.ebuild 8440 SHA256 580948a52d8f47ab225af2e221b04d25ac1a4cc14f9c352dad3ef066e996635c SHA512 182fa0697cbfd27b4d502e318b77b2271c9e746e13bd6ad6c88f83ecba2ccc7cd9b1b182e14eb7974460e61ee82b1280a00aba70b7e9baf36f27e515b4a70ee7 WHIRLPOOL a9bdeae4e4eb7fc08ac26f6e6318e79921f18f5679b75d5670aca3085b9aaa46363c49e06df0e319d129ae58cc9990b903603ee64ef05c34a7e9f4fb9bc0ee5a
-MISC ChangeLog 53620 SHA256 a3624474a77e8248ef087aed20dba9071c660aaad292a2ca090c22dd32c15ef0 SHA512 4b6d634346810d4dc1e8610807e3411fa6a808d4f68561620fca45ef979f9179be3296800de8cf39209e3be3ac4bb96237438695fbac498fed2564590913d4d8 WHIRLPOOL 08b77916722873f962f378e5577c62cdcf313a31d9667e35ebb65aca0d971044ddea6af5f307b425f646972f326338b82efc65f940273d4b3aa7d535a844c42c
+EBUILD networkmanager-1.0.0.ebuild 10523 SHA256 1d65a82ea656bc5c7776d4f8dc144d392b9f2f0433a2095d35c0dc87c3ddbd74 SHA512 5c01ec337b29469eff9c51c1d0ec8d8f2592bf57bc33d8408909b5c9a6d1761df4034884d275a4e86773256fd17f8b987117bebe08e49c11405e8f47175d816d WHIRLPOOL bb808382c66f93dad1c33a061fbd103f9d3221539a8ab0238500f4ec78ff52f3684f92579c8be5f628cb4b6fcf4b3714b2662ecea08ba1336d876a43430b3935
+MISC ChangeLog 53847 SHA256 56fb5e7b5b3e67b78e1ffd8a2ba4dbf6830319f07cd0b2f400395982310d674a SHA512 c4a1ef88c1840ea4f0e2fa6206f977bd7226b8b0bcf31506e12343e96f68d154614a6960ad565fe0236d2c451f2a5f2785893b4536edb1aafe3d2e58003416d3 WHIRLPOOL c5f02f3946adaf77aea97f4aea498e20fb04aa65dffd3f024c5dc8f2e52a53dc438a26500b4515c1269338de1663c61e18588469f067d457087132ddf0f9143f
 MISC metadata.xml 1385 SHA256 d04ab1cb16ef0a6a26f7c33bd86d675d523a66a5b0bca93d8400e6856ca34f41 SHA512 2c7f04f034612dee8b6b52c9048bc5344d733f4666889472af5efaaf603127b570d564936b8c5c95bb54ba868d594fc5eb0a11b8b223cac47dc64c1ffd999a0c WHIRLPOOL 3713878a1db910af3904203485c31b5364d1ff4c9c67ab38a0b246c378811a2e33112215134731e760f3fc8155c692a25f5277239f6d2ea6d8f4aa32c4f9a61a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSuVlQACgkQCaWpQKGI+9Q81QCcDQ/m5kuEG9bRcYErq530MQ8I
-YHwAnRFNsHFRGfkAjGvQQH8D/ulvXI0f
-=Ixgk
+iEYEAREIAAYFAlSxPIkACgkQCaWpQKGI+9TmKQCdGKFSfS1QdgB6zlnd8L9XYzIU
+rZoAniRwUXRpxpeAwUqs3bz7z9lHekuQ
+=247D
 -----END PGP SIGNATURE-----
diff --git a/net-misc/networkmanager/files/networkmanager-1.0.0-find-helpers.patch b/net-misc/networkmanager/files/networkmanager-1.0.0-find-helpers.patch
new file mode 100644
index 000000000000..a84909c8253e
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-1.0.0-find-helpers.patch
@@ -0,0 +1,23 @@
+From 6f643d2761650e53fd3b647526110a8473138b5d Mon Sep 17 00:00:00 2001
+From: Thomas Haller <thaller@redhat.com>
+Date: Thu, 8 Jan 2015 11:55:50 +0100
+Subject: core: add /bin to the default search path
+
+https://bugzilla.gnome.org/show_bug.cgi?id=742576
+(cherry picked from commit abbca50ca9d552a28eca792f12ec618df6128fff)
+
+diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c
+index 2c291cd..6747b65 100644
+--- a/src/NetworkManagerUtils.c
++++ b/src/NetworkManagerUtils.c
+@@ -814,6 +814,7 @@ const char *const NM_PATHS_DEFAULT[] = {
+ 	"/sbin/",
+ 	"/usr/sbin/",
+ 	"/usr/local/sbin/",
++	"/bin/",
+ 	"/usr/bin/",
+ 	"/usr/local/bin/",
+ 	NULL,
+-- 
+cgit v0.10.2
+
diff --git a/net-misc/networkmanager/files/networkmanager-1.0.0-lto-switch.patch b/net-misc/networkmanager/files/networkmanager-1.0.0-lto-switch.patch
new file mode 100644
index 000000000000..5d66c3393c71
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-1.0.0-lto-switch.patch
@@ -0,0 +1,36 @@
+From cda2802fe960737abb4623166ca4f75a63b5fe5a Mon Sep 17 00:00:00 2001
+From: Thomas Haller <thaller@redhat.com>
+Date: Thu, 8 Jan 2015 12:01:32 +0100
+Subject: build: fix --enable-lto configure option to allow disabling option
+ explicitly
+
+When specifying '--enable-lto=anything' or '--disable-lto',
+the configure script would always set enable_lto=yes.
+
+The only way to disable lto, was *not* specifying the
+configure option.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=742575
+(cherry picked from commit 6eccfda0face594f86dea495d2ed2546b0d37e77)
+
+diff --git a/configure.ac b/configure.ac
+index b6bf38e..b407686 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -821,10 +821,11 @@ AM_CONDITIONAL(BUILD_NMTUI, test "$build_nmtui" = yes)
+ 
+ NM_COMPILER_WARNINGS
+ 
+-AC_ARG_ENABLE(lto, AS_HELP_STRING([--enable-lto], [Enable Link Time Optimization for smaller size (default: no)]),
+-              [enable_lto=yes], [enable_lto=no])
++AC_ARG_ENABLE(lto, AS_HELP_STRING([--enable-lto], [Enable Link Time Optimization for smaller size (default: no)]))
+ if (test "${enable_lto}" = "yes"); then
+     CFLAGS="-flto $CFLAGS"
++else
++    enable_lto='no'
+ fi
+ 
+ 
+-- 
+cgit v0.10.2
+
diff --git a/net-misc/networkmanager/networkmanager-1.0.0.ebuild b/net-misc/networkmanager/networkmanager-1.0.0.ebuild
new file mode 100644
index 000000000000..6a8ad98be94b
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.0.0.ebuild
@@ -0,0 +1,300 @@
+# 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.0.ebuild,v 1.1 2015/01/10 14:51:52 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"
+
+# Tests need python2, https://bugzilla.gnome.org/show_bug.cgi?id=739448
+PYTHON_COMPAT=( python2_7 )
+
+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 ~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= )
+	teamd? ( >=net-misc/libteam-1.9 )
+	zeroconf? ( net-dns/avahi:=[autoipd] )
+	|| ( sys-power/upower sys-power/upower-pm-utils >=sys-apps/systemd-209 )
+"
+RDEPEND="${COMMON_DEPEND}
+	consolekit? ( sys-auth/consolekit )
+	wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	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."
+
+	# Find arping in our paths, upstream bug #742576 (from 1.0 branch)
+	epatch "${FILESDIR}"/${PN}-1.0.0-find-helpers.patch
+
+	# Fix lto configure switch, upstream bug #742575 (from 1.0 branch)
+	epatch "${FILESDIR}"/${PN}-1.0.0-lto-switch.patch
+
+	# Force use of /run, avoid eautoreconf, upstream bug #737139
+	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) \
+		${myconf}
+}
+
+src_test() {
+	python_setup
+	Xemake check
+}
+
+src_install() {
+	# Install completions at proper place, bug #465100
+	gnome2_src_install completiondir="$(get_bashcompdir)"
+
+	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"
+
+	# 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
+	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
+}