Backported following patches from NM trunk:

01 - 6bfade3227752f6565a3812238dee415b077b967
02 - 8a2393ade219b57790eb9facf0f0058956c6173f
03 - 4ca66db72127829747eeee5e9497326e2efd5fee
04 - 6bd0fce1c99267da03bcaff48b99be599667c4e4
05 - 345fd870fa8bc1c0ecd5698e57ed74888a3f2a20
06 - 5405a26b407126eae31c0f21569ea35e44346741
07 - 5f7cbe5ee9444734ac4267787571472ace994904
08 - bac45aa0d57064a9b05a898ad6a4938e6af40d38
09 - a020ed21da6721e896c7eb4b84fc805e127031eb
10 - f2e8870338fbe7056bf511e8d2cd895b0e9335a8 


svn path=/overlay/; revision=77

2 files changed, 139 insertions, 0 deletions

diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 11cecf5..c289ef7 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -1,4 +1,7 @@
 AUX networkmanager-0.7.0-confchanges.patch 594 RMD160 c70c7d32722aa8f1ebf62b0382fad56c7d8e21d4 SHA1 35706e9807e923732e3ac1db9c1e7d7a9f0bcc8f SHA256 ffd4fdf452a5791d938406d33b432aff591ab7e475583a66343a5c98ee6091af
 AUX nm-system-settings.conf 23 RMD160 6d66c702b345bde668a420a15716feea6005fbd1 SHA1 49ba558d20f5ca5a201e027e13b878dd5ac3569c SHA256 44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21
+DIST NetworkManager-0.7.0.tar.bz2 1139665 RMD160 d727cf71fec20797fce7d75e75f9fbc7292e990e SHA1 c661e95867c0cb231d3ef3e911b285ebb1e02310 SHA256 281234116b99b4c4b45fde038a435a0d26b7ee55beac0c351186b3f12c301659
+DIST networkmanager-patches1.tar.bz2 22756 RMD160 419b330ba9011040254043bb4f66a6b67823ab58 SHA1 168d62bfc0d59f54fae102f71f3bf48f49724ea3 SHA256 598fdf48716f147669f2ff7e30e8a9d8b382abaa0cefc006f0c9d83074ed9f01
+EBUILD networkmanager-0.7.0-r1.ebuild 3765 RMD160 a5eea691c19a986d6882349e80c2cf2beebfb2ec SHA1 c9b0a266c9197f22e2e2d5fba0e6ac006400af43 SHA256 5c1f51cf5a70fb4e770f0658edc36aa54acc11648a2886be6c4321117f8e521a
 EBUILD networkmanager-9999.ebuild 3738 RMD160 e572302105ee0468a58a6ebefe7f66a857f583e2 SHA1 d0865a15b6acdafef63852a722fc774b57b08c50 SHA256 8cdc1bbd524e6f0f493d2d0698fee1928ab50536742ba83407cd78ddede61c53
 MISC metadata.xml 848 RMD160 170f8df1ab065ba2bb99fc25285542a6c01b2ab6 SHA1 8b3ebfdaa0864e3b3317e83aea048c0c1f8621bc SHA256 4f9d94121cd05463d66cd25c00026cd9de74f914b04ba293998bb2eba3a12cbd
diff --git a/net-misc/networkmanager/networkmanager-0.7.0-r1.ebuild b/net-misc/networkmanager/networkmanager-0.7.0-r1.ebuild
new file mode 100644
index 0000000..71dfba0
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-0.7.0-r1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+
+# 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/"
+SRC_URI="mirror://gnome/sources/NetworkManager/0.7/${MY_P}.tar.bz2
+	http://patches.piasek.co.uk/networkmanager-patches1.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~arm ~amd64 ~ppc ~x86"
+IUSE="doc nss gnutls dhclient dhcpcd resolvconf"
+
+RDEPEND=">=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
+	|| ( sys-libs/e2fsprogs-libs <sys-fs/e2fsprogs-1.41.0 )
+
+	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 )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool
+	net-dialup/ppp
+	doc? ( >=dev-util/gtk-doc-1.8 )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if ! built_with_use net-wireless/wpa_supplicant dbus ; then
+		eerror "Please rebuild net-wireless/wpa_supplicant with the dbus useflag."
+		die "Fix wpa_supplicant first."
+	fi
+}
+
+src_unpack () {
+	unpack ${A}
+	cd "${S}"
+
+	# Fix up the dbus conf file to use plugdev group
+	epatch "${FILESDIR}/${P}-confchanges.patch"
+
+	EPATCH_SOURCE="${WORKDIR}"/backports-pachset1/
+	EPATCH_SUFFIX="patch"
+	epatch
+}
+
+src_compile() {
+	ECONF="--disable-more-warnings \
+		--localstatedir=/var \
+		--with-distro=gentoo \
+		--with-dbus-sys=/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}
+	emake || die "emake failed"
+}
+
+src_install() {
+	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"
+}
+
+pkg_postinst() {
+	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 ""
+	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"'
+}