add networkmanager 0.8.4 and 9.0_rc2

4 files changed, 55 insertions, 50 deletions

diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index c2acb8d..6e4572e 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -1,8 +1,8 @@
 AUX nm-system-settings.conf 70 RMD160 c0d2be147383999b62cead86ab4333169e4ef277 SHA1 679ec8052b610969c148a2d34cd4da7a41484a76 SHA256 34f53d9ac1ad65eda6942dc3059117f60f6321059ca23f4fbfcc2f2edcae151f
-DIST NetworkManager-0.8.997.tar.bz2 2048464 RMD160 6c8b685065540500b5fc4510f7b99338b6364be1 SHA1 385b094f2806703edac2d9a5dfb38f1ad8bfbd8e SHA256 332cdd94f480099d23f39d56b3aee9925e435ffe91d088a9476d9b8b3586887a
-DIST NetworkManager-0.8.998.tar.bz2 2055112 RMD160 d95ecc2f5ea86e45bb7a9fd8600c83dd9c65cf0c SHA1 56f874463d24e90b7e6a077469f644401cccb280 SHA256 239271e7cd93272776bb9297bfc5214ab910d3d9a7c1862b2625b90719014a82
+DIST NetworkManager-0.8.4.0.tar.bz2 1672926 RMD160 d2f20c4130b1a0015973358920802ad6796e7400 SHA1 85a75f7ed80cbdd4b35797ae5698cafad10084c8 SHA256 e71f2ed5b28b9d46566fbf573e43ee8553e60aa3f557dc61e07b9e198c657588
+DIST NetworkManager-0.8.999.tar.bz2 2084950 RMD160 9fb22a6e53814d3d89cc3bb9862d7090adaae0bc SHA1 517647c1916dbdb0f0258c5f3ecdfd010a373d2e SHA256 fc2430e4babe1f53ac071746cd3f662f064a7d338f0e324f42f82fe9512968cd
 DIST ifnet-0.9.tar.bz2 5351 RMD160 a936dcd50fca5d8b89cd119223f4c4c9c6a8fc68 SHA1 f2fe16ee3b36698977ac48bbd17d60373336214d SHA256 e23addc579ec2f40ad8babb5073f15abc5f2368c6313e4a983999c54ef9479ed
-EBUILD networkmanager-0.9_beta3.ebuild 4010 RMD160 480e33a182241ea665706b0894db8b928954d410 SHA1 278cce3b003ec642874053ac76d18a63a929fca1 SHA256 595636c765c65110efdf31385bce56697d4a1353950874fc97832c2810c57a9e
-EBUILD networkmanager-0.9_rc1.ebuild 4008 RMD160 3eb89863d22f9093afc5cd5221683476d9842f0d SHA1 e1bd42a1c4898f093a7b1b0fe859134c78f4bcff SHA256 08913c6f71a1392ca21cbc5040213d23c126ceb5849427b47ff40b663d90ede8
+EBUILD networkmanager-0.8.4.0.ebuild 3932 RMD160 3119c1e39039d2a62b109c89a337d9b2589f586c SHA1 c4a5dc0c65e80011d294d4c4182543fbe989267e SHA256 352c9e4cecb0e7fd1c8c96c54e2fad5d3d7e069a8fbfe36fa25c1ab3b61f0076
+EBUILD networkmanager-0.9_rc2.ebuild 3996 RMD160 45633b277c53852a36fcabaef8746b9cb182c6a4 SHA1 b62b6d75266684bd9e4e88b9c1abbab84a468a1d SHA256 a1151089d5c9591e3b88815eb5f59527cde64eb293011894045f0407ece588e1
 MISC ChangeLog 13714 RMD160 d527dda4eafb8aef2547bd0ee54514588eb5d47a SHA1 8ce7174a11ed35dc522ea7a0bb4318fd1ffcd913 SHA256 fb4a4a61edf20acfefbef3598d134f225edb8d215e7c2544939af59a7fb7ad52
-MISC metadata.xml 1190 RMD160 50f2c2962026f1e2c6b7d199fbe336f0a5e4979f SHA1 2e43144f0318d30c62221875c4e6682bde9cb78f SHA256 2407742dbcfe0171431274ac31b198b185a2f642965c09ab922e9fb93ad12836
+MISC metadata.xml 1290 RMD160 1285a26b775a35451982a7c19e16dfd7b2d59554 SHA1 c530542e8a292173ca722cb6d96ced7ceb55dabf SHA256 924b5245838d35e16b8b99ba6585c434fd6938c6f99b4abec0d8ea8d0fad17ce
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml
index c1409e5..7d8b3b4 100644
--- a/net-misc/networkmanager/metadata.xml
+++ b/net-misc/networkmanager/metadata.xml
@@ -18,6 +18,7 @@
 		<flag name="connection-sharing">Use <pkg>net-dns/dnsmasq</pkg> and <pkg>net-firewall/iptables</pkg> for connection sharing </flag>
                 <flag name="dhclient">Use dhclient from <pkg>net-misc/dhcp</pkg> for getting ip.</flag>
 		<flag name="dhcpcd">Use <pkg>net-misc/dhcpcd</pkg> for getting ip.</flag>
+		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
 		<flag name="nss">Use <pkg>dev-libs/nss</pkg> for cryptography.</flag>
 		<flag name="ppp">Enable support for mobile broadband and PPPoE connections using <pkg>net-dialup/ppp</pkg>.</flag>
 		<flag name="resolvconf">Use <pkg>net-dns/openresolv</pkg> for managing DNS information</flag>
diff --git a/net-misc/networkmanager/networkmanager-0.9_beta3.ebuild b/net-misc/networkmanager/networkmanager-0.8.4.0.ebuild
index d0ec03b..f7bcb78 100644
--- a/net-misc/networkmanager/networkmanager-0.9_beta3.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.8.4.0.ebuild
@@ -1,65 +1,54 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.995.ebuild,v 1.1 2011/03/09 07:56:21 qiaomuf Exp $
+# $Header: $
 
-EAPI="4"
+EAPI="2"
 
-inherit eutils linux-info
-# gnome.org
-# once 0.9 is released add gnome.org eclass back
+inherit eutils gnome.org linux-info
 
 # NetworkManager likes itself with capital letters
 MY_PN=${PN/networkmanager/NetworkManager}
-# Use 0.9 beta/rc rather then 0.8.9xx
-MY_PV=${PV/0.9_beta3/0.8.997}
-MY_P=${MY_PN}-${MY_PV}
+MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
 HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-
-SRC_URI="mirror://gnome/sources/${MY_PN}/0.8/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~dagger/files/ifnet-0.9.tar.bz2"
-
-# Change once 0.9 is released
-#SRC_URI="${SRC_URI//${PN}/${MY_PN}}
+SRC_URI="${SRC_URI//${PN}/${MY_PN}}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="avahi bluetooth doc +nss gnutls dhclient +dhcpcd +introspection kernel_linux +ppp resolvconf connection-sharing wimax"
-
-REQUIRED_USE="
-	nss? ( !gnutls ) !nss? ( gnutls )
-	dhcpcd? ( !dhclient ) !dhcpcd? ( dhclient )"
+IUSE="avahi bluetooth doc nss gnutls dhclient dhcpcd kernel_linux resolvconf connection-sharing"
 
 RDEPEND=">=sys-apps/dbus-1.2
 	>=dev-libs/dbus-glib-0.75
 	>=net-wireless/wireless-tools-28_pre9
-	>=sys-fs/udev-147[extras]
-	>=dev-libs/glib-2.26
-	>=sys-auth/polkit-0.96
+	>=sys-fs/udev-145[extras]
+	>=dev-libs/glib-2.18
+	>=sys-auth/polkit-0.92
 	>=dev-libs/libnl-1.1
 	>=net-misc/modemmanager-0.4
-	>=net-wireless/wpa_supplicant-0.7.2[dbus]
-	bluetooth? ( >=net-wireless/bluez-4.82 )
+	>=net-wireless/wpa_supplicant-0.5.10[dbus]
+	bluetooth? ( net-wireless/bluez )
+	|| ( sys-libs/e2fsprogs-libs <sys-fs/e2fsprogs-1.41.0 )
 	avahi? ( net-dns/avahi[autoipd] )
 	gnutls? (
-		dev-libs/libgcrypt
-		net-libs/gnutls )
-	nss? ( >=dev-libs/nss-3.11 )
-	dhclient? ( net-misc/dhcp )
-	dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3 )
-	ppp? ( >=net-dialup/ppp-2.4.5 )
+		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 ) )
+	!dhclient? ( >=net-misc/dhcpcd-4.0.0_rc3 )
 	resolvconf? ( net-dns/openresolv )
 	connection-sharing? (
 		net-dns/dnsmasq
-		net-firewall/iptables )
-	wimax? ( >=net-wireless/wimax-1.5.1 )"
+		net-firewall/iptables )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-util/intltool
+	>=net-dialup/ppp-2.4.5
 	doc? ( >=dev-util/gtk-doc-1.8 )"
 
 S=${WORKDIR}/${MY_P}
@@ -90,33 +79,48 @@ pkg_setup() {
 	fi
 }
 
+#src_prepare() {
+#}
+
 src_configure() {
 	ECONF="--disable-more-warnings
 		--localstatedir=/var
 		--with-distro=gentoo
 		--with-dbus-sys-dir=/etc/dbus-1/system.d
-		--with-udev-dir=/etc/udev
+		--with-udev-dir=/lib/udev
 		--with-iptables=/sbin/iptables
 		$(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)"
 
+	# default is dhcpcd (if none or both are specified), ISC dchclient otherwise
+	if use dhclient ; then
+		if use dhcpcd ; then
+			ECONF="${ECONF} --with-dhcpcd --without-dhclient"
+		else
+			ECONF="${ECONF} --with-dhclient --without-dhcpcd"
+		fi
+	else
+		ECONF="${ECONF} --with-dhcpcd --without-dhclient"
+	fi
+
+	# default is NSS (if none or both are specified), GnuTLS otherwise
+	if use gnutls ; then
 		if use nss ; then
-			ECONF="${ECONF} $(use_with nss crypto=nss)"
+			ECONF="${ECONF} --with-crypto=nss"
 		else
-			ECONF="${ECONF} $(use_with gnutls crypto=gnutls)"
+			ECONF="${ECONF} --with-crypto=gnutls"
 		fi
+	else
+		ECONF="${ECONF} --with-crypto=nss"
+	fi
 
 	econf ${ECONF}
 }
 
 src_install() {
-	default
+	emake DESTDIR="${D}" install || die "emake install failed"
+
 	# Need to keep the /var/run/NetworkManager directory
 	keepdir /var/run/NetworkManager
 
@@ -128,7 +132,7 @@ src_install() {
 	# Add keyfile plugin support
 	keepdir /etc/NetworkManager/system-connections
 	insinto /etc/NetworkManager
-	newins "${FILESDIR}/nm-system-settings.conf" nm-system-settings.conf \
+	newins "${FILESDIR}/nm-system-settings.conf-ifnet" nm-system-settings.conf \
 		|| die "newins failed"
 }
 
diff --git a/net-misc/networkmanager/networkmanager-0.9_rc1.ebuild b/net-misc/networkmanager/networkmanager-0.9_rc2.ebuild
index 623f2a9..c0f6c9f 100644
--- a/net-misc/networkmanager/networkmanager-0.9_rc1.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.9_rc2.ebuild
@@ -11,7 +11,7 @@ inherit eutils linux-info
 # NetworkManager likes itself with capital letters
 MY_PN=${PN/networkmanager/NetworkManager}
 # Use 0.9 beta/rc rather then 0.8.9xx
-MY_PV=${PV/0.9_rc1/0.8.998}
+MY_PV=${PV/0.9_rc2/0.8.999}
 MY_P=${MY_PN}-${MY_PV}
 
 DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
@@ -25,7 +25,7 @@ SRC_URI="mirror://gnome/sources/${MY_PN}/0.8/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="avahi bluetooth doc +nss gnutls dhclient +dhcpcd +introspection kernel_linux +ppp resolvconf connection-sharing wimax"
 
 REQUIRED_USE="