net-misc/networkmanager: Pull in current portage versions, we only had a

live ebuild.

11 files changed, 388 insertions, 0 deletions

diff --git a/metadata/cache/net-misc/networkmanager-0.6.5_p20070823 b/metadata/cache/net-misc/networkmanager-0.6.5_p20070823
new file mode 100644
index 000000000..0cc3feae0
--- /dev/null
+++ b/metadata/cache/net-misc/networkmanager-0.6.5_p20070823
@@ -0,0 +1,22 @@
+>=sys-apps/dbus-0.60 >=sys-apps/hal-0.5 sys-apps/iproute2 =dev-libs/libnl-1.0_pre6* !>=dev-libs/libnl-1.1 >=net-misc/dhcdbd-1.4 >=net-wireless/wireless-tools-28_pre9 >=net-wireless/wpa_supplicant-0.4.8 >=dev-libs/glib-2.8 gnome? ( >=x11-libs/gtk+-2.8 >=gnome-base/libglade-2 >=gnome-base/gnome-keyring-0.4 || ( >=gnome-base/gnome-panel-2 xfce-base/xfce4-panel ) >=gnome-base/gconf-2 >=gnome-base/libgnomeui-2 ) crypt? ( dev-libs/libgcrypt ) dev-util/pkgconfig dev-util/intltool >=sys-apps/sed-4 sys-apps/abi-wrapper
+>=sys-apps/dbus-0.60 >=sys-apps/hal-0.5 sys-apps/iproute2 =dev-libs/libnl-1.0_pre6* !>=dev-libs/libnl-1.1 >=net-misc/dhcdbd-1.4 >=net-wireless/wireless-tools-28_pre9 >=net-wireless/wpa_supplicant-0.4.8 >=dev-libs/glib-2.8 gnome? ( >=x11-libs/gtk+-2.8 >=gnome-base/libglade-2 >=gnome-base/gnome-keyring-0.4 || ( >=gnome-base/gnome-panel-2 xfce-base/xfce4-panel ) >=gnome-base/gconf-2 >=gnome-base/libgnomeui-2 ) crypt? ( dev-libs/libgcrypt ) sys-apps/abi-wrapper
+0
+mirror://gentoo/NetworkManager-0.6.5_p20070823.tar.gz mirror://gentoo/networkmanager-0.6.5_p20070823-updatedbackend.patch.bz2
+
+http://www.gnome.org/projects/NetworkManager/
+GPL-2
+Network configuration and management in an easy way. Desktop environment independent.
+ppc
+base eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib multilib-native portability toolchain-funcs
+crypt doc gnome debug lib32
+
+gnome? ( >=gnome-extra/nm-applet-0.6.5 )
+
+
+
+compile install postinst postrm preinst setup unpack
+
+
+
+
+
diff --git a/metadata/cache/net-misc/networkmanager-0.6.6 b/metadata/cache/net-misc/networkmanager-0.6.6
new file mode 100644
index 000000000..f8a4b9b92
--- /dev/null
+++ b/metadata/cache/net-misc/networkmanager-0.6.6
@@ -0,0 +1,22 @@
+>=sys-apps/dbus-0.60 >=sys-apps/hal-0.5.10 sys-apps/iproute2 >=dev-libs/libnl-1.1 >=net-misc/dhcdbd-1.4 >=net-wireless/wireless-tools-28_pre9 >=net-wireless/wpa_supplicant-0.4.8 >=dev-libs/glib-2.8 gnome? ( >=x11-libs/gtk+-2.8 >=gnome-base/libglade-2 >=gnome-base/gnome-keyring-0.4 >=gnome-base/gconf-2 >=gnome-base/libgnomeui-2 ) crypt? ( dev-libs/libgcrypt ) dev-util/pkgconfig dev-util/intltool >=sys-apps/sed-4 sys-apps/abi-wrapper
+>=sys-apps/dbus-0.60 >=sys-apps/hal-0.5.10 sys-apps/iproute2 >=dev-libs/libnl-1.1 >=net-misc/dhcdbd-1.4 >=net-wireless/wireless-tools-28_pre9 >=net-wireless/wpa_supplicant-0.4.8 >=dev-libs/glib-2.8 gnome? ( >=x11-libs/gtk+-2.8 >=gnome-base/libglade-2 >=gnome-base/gnome-keyring-0.4 >=gnome-base/gconf-2 >=gnome-base/libgnomeui-2 ) crypt? ( dev-libs/libgcrypt ) sys-apps/abi-wrapper
+0
+http://people.redhat.com/dcbw/NetworkManager/0.6.6/NetworkManager-0.6.6.tar.gz
+
+http://www.gnome.org/projects/NetworkManager/
+GPL-2
+Network configuration and management in an easy way. Desktop environment independent.
+amd64 ~ppc x86
+base eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib multilib-native portability toolchain-funcs
+crypt doc gnome debug lib32
+
+gnome? ( >gnome-extra/nm-applet-0.6.5 )
+
+
+
+compile install postinst postrm preinst setup unpack
+
+
+
+
+
diff --git a/metadata/cache/net-misc/networkmanager-0.7.1-r3 b/metadata/cache/net-misc/networkmanager-0.7.1-r3
new file mode 100644
index 000000000..1f96a1785
--- /dev/null
+++ b/metadata/cache/net-misc/networkmanager-0.7.1-r3
@@ -0,0 +1,22 @@
+>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 >=sys-apps/hal-0.5.10 >=net-wireless/wireless-tools-28_pre9 >=dev-libs/glib-2.16 >=sys-auth/policykit-0.8 >=dev-libs/libnl-1.1 >=net-wireless/wpa_supplicant-0.5.10[dbus] || ( sys-libs/e2fsprogs-libs <sys-fs/e2fsprogs-1.41.0 ) avahi? ( net-dns/avahi[autoipd] ) gnutls? ( nss? ( >=dev-libs/nss-3.11 ) !nss? ( dev-libs/libgcrypt net-libs/gnutls ) ) !gnutls? ( >=dev-libs/nss-3.11 ) dhclient? ( dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) !dhcpcd? ( >=net-misc/dhcp-3.0.0 ) ) !dhclient? ( >=net-misc/dhcpcd-4.0.0_rc3 ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) dev-util/pkgconfig dev-util/intltool net-dialup/ppp doc? ( >=dev-util/gtk-doc-1.8 ) sys-apps/abi-wrapper
+>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 >=sys-apps/hal-0.5.10 >=net-wireless/wireless-tools-28_pre9 >=dev-libs/glib-2.16 >=sys-auth/policykit-0.8 >=dev-libs/libnl-1.1 >=net-wireless/wpa_supplicant-0.5.10[dbus] || ( sys-libs/e2fsprogs-libs <sys-fs/e2fsprogs-1.41.0 ) avahi? ( net-dns/avahi[autoipd] ) gnutls? ( nss? ( >=dev-libs/nss-3.11 ) !nss? ( dev-libs/libgcrypt net-libs/gnutls ) ) !gnutls? ( >=dev-libs/nss-3.11 ) dhclient? ( dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) !dhcpcd? ( >=net-misc/dhcp-3.0.0 ) ) !dhclient? ( >=net-misc/dhcpcd-4.0.0_rc3 ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) sys-apps/abi-wrapper
+0
+mirror://gnome/sources/NetworkManager/0.7/NetworkManager-0.7.1.tar.bz2
+
+http://www.gnome.org/projects/NetworkManager/
+GPL-2
+Network configuration and management in an easy way. Desktop environment independent.
+~arm ~amd64 ~ppc ~x86
+base eutils multilib multilib-native portability toolchain-funcs
+avahi doc nss gnutls dhclient dhcpcd resolvconf connection-sharing lib32
+
+
+
+2
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/net-misc/networkmanager-0.7.1-r6 b/metadata/cache/net-misc/networkmanager-0.7.1-r6
new file mode 100644
index 000000000..7beb05ab2
--- /dev/null
+++ b/metadata/cache/net-misc/networkmanager-0.7.1-r6
@@ -0,0 +1,22 @@
+>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 >=sys-apps/hal-0.5.10 >=net-wireless/wireless-tools-28_pre9 >=dev-libs/glib-2.16 >=sys-auth/policykit-0.8 >=dev-libs/libnl-1.1 >=net-wireless/wpa_supplicant-0.5.10[dbus] || ( sys-libs/e2fsprogs-libs <sys-fs/e2fsprogs-1.41.0 ) avahi? ( net-dns/avahi[autoipd] ) gnutls? ( nss? ( >=dev-libs/nss-3.11 ) !nss? ( dev-libs/libgcrypt net-libs/gnutls ) ) !gnutls? ( >=dev-libs/nss-3.11 ) dhclient? ( dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) !dhcpcd? ( >=net-misc/dhcp-3.0.0 ) ) !dhclient? ( >=net-misc/dhcpcd-4.0.0_rc3 ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) dev-util/pkgconfig dev-util/intltool net-dialup/ppp doc? ( >=dev-util/gtk-doc-1.8 ) =sys-devel/automake-1.10* >=sys-devel/autoconf-2.61 sys-devel/libtool sys-apps/abi-wrapper
+>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 >=sys-apps/hal-0.5.10 >=net-wireless/wireless-tools-28_pre9 >=dev-libs/glib-2.16 >=sys-auth/policykit-0.8 >=dev-libs/libnl-1.1 >=net-wireless/wpa_supplicant-0.5.10[dbus] || ( sys-libs/e2fsprogs-libs <sys-fs/e2fsprogs-1.41.0 ) avahi? ( net-dns/avahi[autoipd] ) gnutls? ( nss? ( >=dev-libs/nss-3.11 ) !nss? ( dev-libs/libgcrypt net-libs/gnutls ) ) !gnutls? ( >=dev-libs/nss-3.11 ) dhclient? ( dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) !dhcpcd? ( >=net-misc/dhcp-3.0.0 ) ) !dhclient? ( >=net-misc/dhcpcd-4.0.0_rc3 ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) sys-apps/abi-wrapper
+0
+mirror://gnome/sources/NetworkManager/0.7/NetworkManager-0.7.1.tar.bz2 http://dev.gentoo.org/~dagger/files/NetworkManager-0.7.1-gentoo-patches-1b.tar.bz2
+
+http://www.gnome.org/projects/NetworkManager/
+GPL-2
+Network configuration and management in an easy way. Desktop environment independent.
+~arm ~amd64 ~ppc ~x86
+autotools base eutils libtool multilib multilib-native portability toolchain-funcs
+avahi doc nss gnutls dhclient dhcpcd resolvconf connection-sharing lib32
+
+
+
+2
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/net-misc/networkmanager/files/networkmanager-0.7.0-confchanges.patch b/net-misc/networkmanager/files/networkmanager-0.7.0-confchanges.patch
new file mode 100644
index 000000000..1372c1203
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-0.7.0-confchanges.patch
@@ -0,0 +1,13 @@
+Index: src/NetworkManager.conf
+===================================================================
+--- src/NetworkManager.conf.orig
++++ src/NetworkManager.conf
+@@ -11,7 +11,7 @@
+                 <allow send_destination="org.freedesktop.NetworkManager.PPP"/>
+                 <allow send_interface="org.freedesktop.NetworkManager.PPP"/>
+         </policy>
+-        <policy at_console="true">
++        <policy group="plugdev">
+                 <allow send_destination="org.freedesktop.NetworkManager"/>
+                 <allow send_interface="org.freedesktop.NetworkManager"/>
+         </policy>
diff --git a/net-misc/networkmanager/files/networkmanager-0.7.0-gentoo-dhclient.patch b/net-misc/networkmanager/files/networkmanager-0.7.0-gentoo-dhclient.patch
new file mode 100644
index 000000000..fa21c7680
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-0.7.0-gentoo-dhclient.patch
@@ -0,0 +1,25 @@
+From 33547b8d8b64a10187b9c452eef7325d909889a1 Mon Sep 17 00:00:00 2001
+From: Daniel Gryniewicz <dang@gentoo.org>
+Date: Thu, 23 Apr 2009 10:42:43 -0400
+Subject: [PATCH] dhcp: use correct dhclient config file location for Gentoo (bgo #579737)
+
+---
+ src/dhcp-manager/nm-dhcp-dhclient.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c
+index 946be0c..34b36f1 100644
+--- a/src/dhcp-manager/nm-dhcp-dhclient.c
++++ b/src/dhcp-manager/nm-dhcp-dhclient.c
+@@ -167,6 +167,8 @@ create_dhclient_config (NMDHCPDevice *device, NMSettingIP4Config *s_ip4)
+ 	orig = g_strdup (SYSCONFDIR "/dhclient.conf");
+ #elif defined(TARGET_DEBIAN)
+ 	orig = g_strdup (SYSCONFDIR "/dhcp3/dhclient.conf");
++#elif defined(TARGET_GENTOO)
++	orig = g_strdup (SYSCONFDIR "/dhcp/dhclient.conf");
+ #else
+ 	orig = g_strdup_printf (SYSCONFDIR "/dhclient-%s.conf", device->iface);
+ #endif
+-- 
+1.6.2
+
diff --git a/net-misc/networkmanager/files/networkmanager-0.7.1-bad-link.patch b/net-misc/networkmanager/files/networkmanager-0.7.1-bad-link.patch
new file mode 100644
index 000000000..ea074bae8
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-0.7.1-bad-link.patch
@@ -0,0 +1,15 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN NetworkManager-0.7.1.orig/src/ppp-manager/Makefile.am NetworkManager-0.7.1/src/ppp-manager/Makefile.am
+--- NetworkManager-0.7.1.orig/src/ppp-manager/Makefile.am	2009-03-03 11:55:47.000000000 -0500
++++ NetworkManager-0.7.1/src/ppp-manager/Makefile.am	2009-04-24 11:32:58.000000000 -0400
+@@ -47,9 +47,9 @@ nm_pppd_plugin_la_CPPFLAGS = \
+ nm_pppd_plugin_la_LDFLAGS = -module -avoid-version
+ 
+ nm_pppd_plugin_la_LIBADD = \
++	$(top_builddir)/libnm-util/libnm-util.la \
+ 	$(DBUS_LIBS) \
+-	$(GLIB_LIBS) \
+-	$(top_builddir)/libnm-util/libnm-util.la
++	$(GLIB_LIBS)
+ 
+ BUILT_SOURCES = nm-ppp-manager-glue.h
+ 
diff --git a/net-misc/networkmanager/files/networkmanager-0.7.1-confchanges.patch b/net-misc/networkmanager/files/networkmanager-0.7.1-confchanges.patch
new file mode 100644
index 000000000..ca5332815
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-0.7.1-confchanges.patch
@@ -0,0 +1,16 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN NetworkManager-0.7.1.orig/src/NetworkManager.conf NetworkManager-0.7.1/src/NetworkManager.conf
+--- NetworkManager-0.7.1.orig/src/NetworkManager.conf	2009-03-03 11:55:47.000000000 -0500
++++ NetworkManager-0.7.1/src/NetworkManager.conf	2009-05-01 20:04:33.000000000 -0400
+@@ -15,6 +15,12 @@
+                 <deny send_destination="org.freedesktop.NetworkManager"
+                       send_interface="org.freedesktop.NetworkManager.PPP"/>
+         </policy>
++        <policy group="plugdev">
++                <allow send_destination="org.freedesktop.NetworkManager"/>
++
++                <deny send_destination="org.freedesktop.NetworkManager"
++                      send_interface="org.freedesktop.NetworkManager.PPP"/>
++        </policy>
+         <policy context="default">
+                 <deny own="org.freedesktop.NetworkManager"/>
+                 <deny send_destination="org.freedesktop.NetworkManager"/>
diff --git a/net-misc/networkmanager/files/nm-system-settings.conf b/net-misc/networkmanager/files/nm-system-settings.conf
new file mode 100644
index 000000000..c37b59680
--- /dev/null
+++ b/net-misc/networkmanager/files/nm-system-settings.conf
@@ -0,0 +1,2 @@
+[main]
+plugins=keyfile
diff --git a/net-misc/networkmanager/networkmanager-0.6.6.ebuild b/net-misc/networkmanager/networkmanager-0.6.6.ebuild
new file mode 100644
index 000000000..21e2c2b79
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-0.6.6.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.6.6.ebuild,v 1.6 2009/04/22 13:30:43 rbu Exp $
+
+EAPI=2
+
+inherit gnome2 eutils multilib-native
+
+# NetworkManager likes itself with capital letters
+MY_P=${P/networkmanager/NetworkManager}
+
+DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
+HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
+# Release candidate for 0.6.6, Hosted in dcbw's redhat space.
+SRC_URI="http://people.redhat.com/dcbw/NetworkManager/0.6.6/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="crypt doc gnome"
+
+# Yes, I know that configure will accept libnl 1.0-pre8, however we only have
+# 1.1 in the tree, therefore dep on it.
+RDEPEND=">=sys-apps/dbus-0.60[lib32?]
+	>=sys-apps/hal-0.5.10[lib32?]
+	sys-apps/iproute2
+	>=dev-libs/libnl-1.1[lib32?]
+	>=net-misc/dhcdbd-1.4
+	>=net-wireless/wireless-tools-28_pre9
+	>=net-wireless/wpa_supplicant-0.4.8
+	>=dev-libs/glib-2.8[lib32?]
+	gnome? ( >=x11-libs/gtk+-2.8[lib32?]
+		>=gnome-base/libglade-2[lib32?]
+		>=gnome-base/gnome-keyring-0.4[lib32?]
+		>=gnome-base/gconf-2[lib32?]
+		>=gnome-base/libgnomeui-2[lib32?] )
+	crypt? ( dev-libs/libgcrypt[lib32?] )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool"
+PDEPEND="gnome? ( >gnome-extra/nm-applet-0.6.5 )"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+USE_DESTDIR="1"
+
+G2CONF="${G2CONF} \
+	`use_with crypt gcrypt` \
+	`use_with gnome` \
+	--disable-more-warnings \
+	--localstatedir=/var \
+	--with-distro=gentoo \
+	--with-dbus-sys=/etc/dbus-1/system.d"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if built_with_use sys-apps/iproute2 minimal ; then
+		eerror "Please rebuild sys-apps/iproute2 without the minimal useflag."
+		die "Fix iproute2 first."
+	fi
+}
+
+src_prepare () {
+	# Use the kernel headers
+	epatch "${FILESDIR}/${PN}-use-kernel-headers.patch"
+	# Fix the resolv.conf permissions
+	epatch "${FILESDIR}/${PN}-resolvconf-perms.patch"
+	# Fix up the dbus conf file to use plugdev group
+	epatch "${FILESDIR}/${PN}-0.6.5-confchanges.patch"
+}
+
+multilib-native_src_install_internal() {
+	gnome2_src_install
+	# Need to keep the /var/run/NetworkManager directory
+	keepdir /var/run/NetworkManager
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	elog "You need to be in the plugdev group in order to use NetworkManager"
+	elog "Problems with your hostname getting changed?"
+	elog ""
+	elog "Add the following to /etc/dhcp/dhclient.conf"
+	elog 'send host-name "YOURHOSTNAME";'
+	elog 'supersede host-name "YOURHOSTNAME";'
+
+	elog "You will need to restart DBUS if this is your first time"
+	elog "installing NetworkManager."
+}
diff --git a/net-misc/networkmanager/networkmanager-0.7.1-r6.ebuild b/net-misc/networkmanager/networkmanager-0.7.1-r6.ebuild
new file mode 100644
index 000000000..8517bf754
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-0.7.1-r6.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.7.1-r6.ebuild,v 1.1 2009/06/19 08:58:11 dagger Exp $
+
+EAPI="2"
+inherit eutils autotools multilib-native
+
+PATCH_VERSION="1b"
+
+# NetworkManager likes itself with capital letters
+MY_PN=${PN/networkmanager/NetworkManager}
+MY_P=${MY_PN}-${PV}
+PATCHNAME="${MY_P}-gentoo-patches-${PATCH_VERSION}"
+
+DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
+HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
+SRC_URI="mirror://gnome/sources/NetworkManager/0.7/${MY_P}.tar.bz2
+	http://dev.gentoo.org/~dagger/files/${PATCHNAME}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~arm ~amd64 ~ppc ~x86"
+IUSE="avahi doc nss gnutls dhclient dhcpcd resolvconf connection-sharing"
+# modemmanager"
+
+RDEPEND=">=sys-apps/dbus-1.2[lib32?]
+	>=dev-libs/dbus-glib-0.75[lib32?]
+	>=sys-apps/hal-0.5.10[lib32?]
+	>=net-wireless/wireless-tools-28_pre9
+	>=dev-libs/glib-2.16[lib32?]
+	>=sys-auth/policykit-0.8[lib32?]
+	>=dev-libs/libnl-1.1[lib32?]
+	>=net-wireless/wpa_supplicant-0.5.10[dbus]
+	|| ( sys-libs/e2fsprogs-libs[lib32?] <sys-fs/e2fsprogs-1.41.0[lib32?] )
+	avahi? ( net-dns/avahi[autoipd,lib32?] )
+	gnutls? (
+		nss? ( >=dev-libs/nss-3.11[lib32?] )
+		!nss? ( dev-libs/libgcrypt[lib32?]
+			net-libs/gnutls[lib32?] ) )
+	!gnutls? ( >=dev-libs/nss-3.11[lib32?] )
+	dhclient? (
+		dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
+		!dhcpcd? ( >=net-misc/dhcp-3.0.0 ) )
+	!dhclient? ( >=net-misc/dhcpcd-4.0.0_rc3 )
+	resolvconf? ( net-dns/openresolv )
+	connection-sharing? (
+		net-dns/dnsmasq
+		net-firewall/iptables )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool
+	net-dialup/ppp
+	doc? ( >=dev-util/gtk-doc-1.8 )"
+
+#PDEPEND="modemmanager? ( >=net-misc/modemmanager-0.2 )"
+
+S=${WORKDIR}/${MY_P}
+
+multilib-native_src_prepare_internal() {
+
+	# Fix up the dbus conf file to use plugdev group
+	epatch "${FILESDIR}/${PN}-0.7.1-confchanges.patch"
+
+	# bug #266982
+	epatch "${FILESDIR}/${PN}-0.7.0-gentoo-dhclient.patch"
+
+	# bug #267349
+	epatch "${FILESDIR}/${PN}-0.7.1-bad-link.patch"
+
+	# bug #262112
+	EPATCH_SOURCE="${WORKDIR}/nm_0.7.1_patchset_${PATCH_VERSION}"
+	EPATCH_SUFFIX="patch"
+	epatch && eautoreconf
+
+}
+
+multilib-native_src_configure_internal() {
+	ECONF="--disable-more-warnings
+		--localstatedir=/var
+		--with-distro=gentoo
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		$(use_enable doc gtk-doc)
+		$(use_with doc docs)
+		$(use_with resolvconf)"
+
+	# default is dhcpcd (if none or both are specified), ISC dchclient otherwise
+	if use dhclient ; then
+		if use dhcpcd ; then
+			ECONF="${ECONF} --with-dhcp-client=dhcpcd"
+		else
+			ECONF="${ECONF} --with-dhcp-client=dhclient"
+		fi
+	else
+		ECONF="${ECONF} --with-dhcp-client=dhcpcd"
+	fi
+
+	# default is NSS (if none or both are specified), GnuTLS otherwise
+	if use gnutls ; then
+		if use nss ; then
+			ECONF="${ECONF} --with-crypto=nss"
+		else
+			ECONF="${ECONF} --with-crypto=gnutls"
+		fi
+	else
+		ECONF="${ECONF} --with-crypto=nss"
+	fi
+
+	econf ${ECONF}
+}
+
+multilib-native_src_install_internal() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# Need to keep the /var/run/NetworkManager directory
+	keepdir /var/run/NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
+
+	# Add keyfile plugin support
+	keepdir /etc/NetworkManager/system-connections
+	insinto /etc/NetworkManager
+	newins "${FILESDIR}/nm-system-settings.conf" nm-system-settings.conf \
+		|| die "newins failed"
+	insinto /etc/udev/rules.d
+	newins callouts/77-nm-probe-modem-capabilities.rules 77-nm-probe-modem-capabilities.rules
+	rm -rf "${D}"/lib/udev/rules.d
+}
+
+pkg_postinst() {
+	elog "You will need to restart DBUS if this is your first time"
+	elog "installing NetworkManager."
+	elog ""
+	elog "To save system-wide settings as a user, that user needs to have the"
+	elog "right policykit privileges. You can add them by running:"
+	elog 'polkit-auth --grant org.freedesktop.network-manager-settings.system.modify --user "USERNAME"'
+}