Fix build failure with libnl-3.2.20 (bug #453736, thanks to Harris Landgarten, Ben Kohler et al.); drop old.

(Portage version: 2.2.0_alpha159/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

8 files changed, 42 insertions, 762 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index 6d77d852f1e3..f520ecc2bf1f 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,16 @@
 # 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.157 2013/01/06 10:03:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.158 2013/01/24 04:38:08 tetromino Exp $
+
+  24 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -networkmanager-0.9.4.0-r5.ebuild, -networkmanager-0.9.4.0-r7.ebuild,
+  -networkmanager-0.9.6.0.ebuild,
+  -files/networkmanager-0.9.6.0-cached-ipv6-routes-1.patch,
+  -files/networkmanager-0.9.6.0-cached-ipv6-routes-2.patch,
+  networkmanager-0.9.6.4.ebuild,
+  +files/networkmanager-0.9.6.4-object-api.h.patch:
+  Fix build failure with libnl-3.2.20 (bug #453736, thanks to Harris
+  Landgarten, Ben Kohler et al.); drop old.
 
   06 Jan 2013; Agostino Sarubbo <ago@gentoo.org> networkmanager-0.9.6.4.ebuild:
   Add ~sparc, wrt bug #449220
diff --git a/net-misc/networkmanager/files/networkmanager-0.9.6.0-cached-ipv6-routes-1.patch b/net-misc/networkmanager/files/networkmanager-0.9.6.0-cached-ipv6-routes-1.patch
deleted file mode 100644
index 386f19b9a066..000000000000
--- a/net-misc/networkmanager/files/networkmanager-0.9.6.0-cached-ipv6-routes-1.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 3ca3120e4a01ea4a86fd052311c977e7ec136365 Mon Sep 17 00:00:00 2001
-From: Ben Jencks <ben@bjencks.net>
-Date: Thu, 30 Aug 2012 13:55:36 -0500
-Subject: [PATCH] ip6: ignore cached/cloned route notifications from the
- kernel (lp:1038541) (bgo #671767)
-
-The kernel periodically adds routes for specific operations, including
-when pinging any host.  These are temporary routes and aren't part of
-the interface's permanent routing configuration, so we should ignore
-them.
----
- src/ip6-manager/nm-ip6-manager.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/ip6-manager/nm-ip6-manager.c b/src/ip6-manager/nm-ip6-manager.c
-index e452c18..3dc8616 100644
---- a/src/ip6-manager/nm-ip6-manager.c
-+++ b/src/ip6-manager/nm-ip6-manager.c
-@@ -921,6 +921,14 @@ process_route_change (NMIP6Manager *manager, struct nl_msg *msg)
- 		return NULL;
- 	}
- 
-+	/* Cached/cloned routes are created by the kernel for specific operations
-+	 * and aren't part of the interface's permanent routing configuration.
-+	 */
-+	if (rtnl_route_get_flags (rtnlroute) & RTM_F_CLONED) {
-+		rtnl_route_put (rtnlroute);
-+		return NULL;
-+	}
-+
- 	device = nm_ip6_manager_get_device (manager, rtnl_route_get_oif (rtnlroute));
- 
- 	old_size = nl_cache_nitems (priv->route_cache);
--- 
-1.7.12
-
diff --git a/net-misc/networkmanager/files/networkmanager-0.9.6.0-cached-ipv6-routes-2.patch b/net-misc/networkmanager/files/networkmanager-0.9.6.0-cached-ipv6-routes-2.patch
deleted file mode 100644
index 3c23c2d45c0e..000000000000
--- a/net-misc/networkmanager/files/networkmanager-0.9.6.0-cached-ipv6-routes-2.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 46e0af2942e23fb3cf1c313e58e4081877d4f289 Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Thu, 30 Aug 2012 13:57:06 -0500
-Subject: [PATCH] ip6: ignore cached/cloned routes when retrieving IPv6 config
- (lp:1038541) (bgo #671767)
-
-Should also ignore them when building up the initial IPv6 config.
----
- src/ip6-manager/nm-ip6-manager.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/ip6-manager/nm-ip6-manager.c b/src/ip6-manager/nm-ip6-manager.c
-index 3dc8616..4432aa5 100644
---- a/src/ip6-manager/nm-ip6-manager.c
-+++ b/src/ip6-manager/nm-ip6-manager.c
-@@ -1531,6 +1531,12 @@ nm_ip6_manager_get_ip6_config (NMIP6Manager *manager, int ifindex)
- 		if (rtnl_route_get_family (rtnlroute) != AF_INET6)
- 			continue;
- 
-+		/* And ignore cache/cloned routes as they aren't part of the interface's
-+		 * permanent routing configuration.
-+		 */
-+		if (rtnl_route_get_flags (rtnlroute) & RTM_F_CLONED)
-+			continue;
-+
- 		nldest = rtnl_route_get_dst (rtnlroute);
- 		if (!nldest || nl_addr_get_family (nldest) != AF_INET6)
- 			continue;
--- 
-1.7.12
-
diff --git a/net-misc/networkmanager/files/networkmanager-0.9.6.4-object-api.h.patch b/net-misc/networkmanager/files/networkmanager-0.9.6.4-object-api.h.patch
new file mode 100644
index 000000000000..cca6edfa9403
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-0.9.6.4-object-api.h.patch
@@ -0,0 +1,28 @@
+From 527f55420fb16c5525e12178ddd8b7568dceb0e2 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 23 Jan 2013 23:00:37 -0500
+Subject: [PATCH] netlink: do not include object-api.h
+
+It's no longer installed by libnl-3.0 >= 3.2.20
+
+https://bugzilla.gnome.org/show_bug.cgi?id=692423
+---
+ src/nm-netlink-monitor.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/nm-netlink-monitor.c b/src/nm-netlink-monitor.c
+index 29a21e3..84f9386 100644
+--- a/src/nm-netlink-monitor.c
++++ b/src/nm-netlink-monitor.c
+@@ -38,7 +38,7 @@
+ #include <linux/if.h>
+ #include <linux/unistd.h>
+ #include <unistd.h>
+-#include <netlink/object-api.h>
++#include <netlink/object.h>
+ #include <netlink/route/addr.h>
+ #include <netlink/route/rtnl.h>
+ 
+-- 
+1.8.1.1
+
diff --git a/net-misc/networkmanager/networkmanager-0.9.4.0-r5.ebuild b/net-misc/networkmanager/networkmanager-0.9.4.0-r5.ebuild
deleted file mode 100644
index 3c1c0f23da3f..000000000000
--- a/net-misc/networkmanager/networkmanager-0.9.4.0-r5.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.4.0-r5.ebuild,v 1.5 2012/12/02 22:31:17 ssuominen Exp $
-
-EAPI="4"
-GNOME_ORG_MODULE="NetworkManager"
-
-inherit autotools eutils gnome.org linux-info systemd user
-
-DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="avahi bluetooth connection-sharing dhclient +dhcpcd doc gnutls +introspection kernel_linux +nss modemmanager +ppp resolvconf systemd +wext wimax"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~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
-# 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.75
-	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 )
-	resolvconf? ( net-dns/openresolv )
-	connection-sharing? (
-		net-dns/dnsmasq
-		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 )
-	systemd? ( >=sys-apps/systemd-31 )
-	!systemd? ( sys-auth/consolekit )"
-
-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 )"
-
-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"
-	# Fix quote handling for global data (Bug #410821)
-	epatch "${FILESDIR}/${PN}-0.9.4.0-fix-quote-handling.patch"
-	# Fix uninitialized variables in libnm-glib
-	epatch "${FILESDIR}/${P}-libnm-glib-ensure_inited.patch"
-	epatch "${FILESDIR}/${P}-libnm-glib-init-gerror.patch"
-	# Fix building against linux-headers-3.4, #417055
-	epatch "${FILESDIR}/${P}-ip_ppp.h.patch"
-	# Fix ipv6 default route bug, #417529
-	epatch "${FILESDIR}/${P}-ipv6-route.patch"
-	# Bug #335147, https://bugzilla.gnome.org/show_bug.cgi?id=679428
-	epatch "${FILESDIR}/${P}-dhclient-ipv6.patch"
-	# Bug #426844, wext vs. nl80211 API issues
-	epatch "${FILESDIR}/${P}-nl80211-encryption-caps.patch"
-	epatch "${FILESDIR}/${P}-wifi-kernel-api.patch"
-
-	epatch_user
-
-	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=/lib/udev
-		--with-iptables=/sbin/iptables
-		--enable-concheck
-		$(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_with wext)
-		$(use_with wimax libnl-1)
-		$(systemd_with_unitdir)"
-
-		if use nss ; then
-			ECONF="${ECONF} $(use_with nss crypto=nss)"
-		else
-			ECONF="${ECONF} $(use_with gnutls crypto=gnutls)"
-		fi
-
-		if use systemd; then
-			ECONF="${ECONF} --with-session-tracking=systemd"
-		else
-			ECONF="${ECONF} --with-session-tracking=ck"
-		fi
-
-	econf ${ECONF}
-}
-
-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
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r2" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	# 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
-
-	# Default conf.d file
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# Remove useless .la files
-	find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
-}
-
-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.4.0-r7.ebuild b/net-misc/networkmanager/networkmanager-0.9.4.0-r7.ebuild
deleted file mode 100644
index abf7126f77e7..000000000000
--- a/net-misc/networkmanager/networkmanager-0.9.4.0-r7.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.4.0-r7.ebuild,v 1.5 2012/12/02 22:31:17 ssuominen Exp $
-
-EAPI="4"
-GNOME_ORG_MODULE="NetworkManager"
-
-inherit autotools eutils gnome.org linux-info systemd user toolchain-funcs udev
-
-DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="avahi bluetooth connection-sharing dhclient +dhcpcd doc gnutls +introspection kernel_linux +nss modemmanager +ppp resolvconf systemd +wext wimax"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~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
-# 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.75
-	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 )
-	resolvconf? ( net-dns/openresolv )
-	connection-sharing? (
-		net-dns/dnsmasq
-		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 )
-	systemd? ( >=sys-apps/systemd-31 )
-	!systemd? ( sys-auth/consolekit )"
-
-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 )"
-
-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"
-	# Fix quote handling for global data (Bug #410821)
-	epatch "${FILESDIR}/${PN}-0.9.4.0-fix-quote-handling.patch"
-	# Fix uninitialized variables in libnm-glib
-	epatch "${FILESDIR}/${P}-libnm-glib-ensure_inited.patch"
-	epatch "${FILESDIR}/${P}-libnm-glib-init-gerror.patch"
-	# Fix building against linux-headers-3.4, #417055
-	epatch "${FILESDIR}/${P}-ip_ppp.h.patch"
-	# Fix ipv6 default route bug, #417529
-	epatch "${FILESDIR}/${P}-ipv6-route.patch"
-	# Bug #335147, https://bugzilla.gnome.org/show_bug.cgi?id=679428
-	epatch "${FILESDIR}/${P}-dhclient-ipv6.patch"
-	# Bug #426844, wext vs. nl80211 API issues
-	epatch "${FILESDIR}/${P}-nl80211-encryption-caps.patch"
-	epatch "${FILESDIR}/${P}-wifi-kernel-api.patch"
-
-	epatch_user
-
-	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
-		$(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_with wext)
-		$(use_with wimax libnl-1)
-		$(systemd_with_unitdir)"
-
-		if use nss ; then
-			ECONF="${ECONF} $(use_with nss crypto=nss)"
-		else
-			ECONF="${ECONF} $(use_with gnutls crypto=gnutls)"
-		fi
-
-		if use systemd; then
-			ECONF="${ECONF} --with-session-tracking=systemd"
-		else
-			ECONF="${ECONF} --with-session-tracking=ck"
-		fi
-
-	econf ${ECONF}
-}
-
-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
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r2" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	# 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
-
-	# Default conf.d file
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# Remove useless .la files
-	find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
-}
-
-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.6.0.ebuild b/net-misc/networkmanager/networkmanager-0.9.6.0.ebuild
deleted file mode 100644
index 8b3bc35d452c..000000000000
--- a/net-misc/networkmanager/networkmanager-0.9.6.0.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2012 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.0.ebuild,v 1.7 2012/12/02 22:31:17 ssuominen Exp $
-
-EAPI="4"
-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
-
-DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="avahi bluetooth connection-sharing dhclient +dhcpcd doc gnutls +introspection kernel_linux +nss modemmanager +ppp resolvconf systemd vala +wext wimax"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~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
-# 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
-		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 )
-	systemd? ( >=sys-apps/systemd-31 )
-	!systemd? ( sys-auth/consolekit )"
-
-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) )"
-
-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"
-	# Bug #428274, don't save temporary ipv6 routes
-	epatch "${FILESDIR}/${P}-cached-ipv6-routes-"{1,2}.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
-		$(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)"
-
-		if use nss ; then
-			ECONF="${ECONF} $(use_with nss crypto=nss)"
-		else
-			ECONF="${ECONF} $(use_with gnutls crypto=gnutls)"
-		fi
-
-		if use systemd; then
-			ECONF="${ECONF} --with-session-tracking=systemd"
-		else
-			ECONF="${ECONF} --with-session-tracking=ck"
-		fi
-
-	econf ${ECONF}
-}
-
-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-r2" 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
-	find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
-}
-
-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.6.4.ebuild b/net-misc/networkmanager/networkmanager-0.9.6.4.ebuild
index b75d7869df64..97c71a4a012e 100644
--- a/net-misc/networkmanager/networkmanager-0.9.6.4.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.9.6.4.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.8 2013/01/06 10:03:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.6.4.ebuild,v 1.9 2013/01/24 04:38:08 tetromino Exp $
 
 EAPI="4"
 GNOME_ORG_MODULE="NetworkManager"
@@ -107,6 +107,8 @@ src_prepare() {
 	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"
+	# https://bugzilla.gnome.org/show_bug.cgi?id=692423, bug #453736
+	epatch "${FILESDIR}/${PN}-0.9.6.4-object-api.h.patch"
 
 	epatch_user