Update NM version to 0.9 beta2. Clean up some dependencies

4 files changed, 27 insertions, 22 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index d10318c..7955ed7 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for net-misc/networkmanager
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.47 2009/06/10 22:03:19 dagger Exp $
 
+*networkmanager-0.9_beta2 (10 Mar 2011)
+
+  10 Mar 2011; Robert Piasek <dagger@gentoo.org>
+  -networkmanager-0.9_beta1.ebuild, +networkmanager-0.9_beta2.ebuild,
+  metadata.xml:
+  Update NM version to 0.9 beta2. Clean up some dependencies
+
 *networkmanager-0.8.1-r6 (18 Aug 2010)
 
   18 Aug 2010; Robert Piasek <dagger@gentoo.org>
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index cff00ab..610ce4b 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -1,7 +1,7 @@
 AUX networkmanager-0.9_beta1-fix-tests.patch 1166 RMD160 34f50bc37043a4beba0e30015e73841bb265aeef SHA1 28592f3c7fdebc7838a476b0436bb58e4e561b0a SHA256 a16a3ad7eb1a1a8a3562fbc15b200cfd22fc9444e410ba94399dcff5627f9357
 AUX nm-system-settings.conf 70 RMD160 c0d2be147383999b62cead86ab4333169e4ef277 SHA1 679ec8052b610969c148a2d34cd4da7a41484a76 SHA256 34f53d9ac1ad65eda6942dc3059117f60f6321059ca23f4fbfcc2f2edcae151f
-DIST NetworkManager-0.8.995.tar.bz2 1793297 RMD160 47c51a3180d5c26c2fbfca183d1d70a0cedaab21 SHA1 b6f1dd23e8976f7f2c68b303081bee0ad8991d58 SHA256 821d37ac75c5327c432a855e26687065459f2b42139f82feebfa6696750ad88a
+DIST NetworkManager-0.8.996.tar.bz2 1798026 RMD160 988f0013c7a60ce6389a41fa7679a702b3473a20 SHA1 5bb96ae204c4037baa3432798e0922beebc3e7ec SHA256 3ccca66610a4896c5bc17e653dcde70320ed7c8278aa4419507e7221131d8550
 DIST ifnet-0.9.tar.bz2 5351 RMD160 a936dcd50fca5d8b89cd119223f4c4c9c6a8fc68 SHA1 f2fe16ee3b36698977ac48bbd17d60373336214d SHA256 e23addc579ec2f40ad8babb5073f15abc5f2368c6313e4a983999c54ef9479ed
-EBUILD networkmanager-0.9_beta1.ebuild 4188 RMD160 35d941347ea7e707b04d34768e1efd13e401c60f SHA1 438383c061609c272b8b490ce46d1f34dba765b9 SHA256 4bc258d55c9d5560c981d18e3e3bf6a1c0a8a4ef8c52ad184688f47db65e0f20
-MISC ChangeLog 13476 RMD160 256bda1edb3eee9931ba76cc17965441895ad031 SHA1 2437530f031257e8d6692f8a6e1ea256159bcdca SHA256 a74203459cecbbb1f6ebd9a3e3158783b5fed1c0eee70053569849472aa5224f
-MISC metadata.xml 1170 RMD160 287261f1bec5dcf47ceaa9ef0a03e34237c21aec SHA1 9eca24bdf6065a9e2da43a0a41bde0f80b8e0fbe SHA256 c4092b4609340b5e90074fd7574f702c2a035d61c488d477db4c2d024ce5c1b3
+EBUILD networkmanager-0.9_beta2.ebuild 4155 RMD160 c8d8afc3fec9df3c8368340e36da829810022c2d SHA1 efcef155bb6eefda9d68e51856f52a491152c18e SHA256 07d8a423017b528fb25b02cb99f888fc904e02ce0ed44187aeb15654405f8682
+MISC ChangeLog 13714 RMD160 d527dda4eafb8aef2547bd0ee54514588eb5d47a SHA1 8ce7174a11ed35dc522ea7a0bb4318fd1ffcd913 SHA256 fb4a4a61edf20acfefbef3598d134f225edb8d215e7c2544939af59a7fb7ad52
+MISC metadata.xml 1190 RMD160 50f2c2962026f1e2c6b7d199fbe336f0a5e4979f SHA1 2e43144f0318d30c62221875c4e6682bde9cb78f SHA256 2407742dbcfe0171431274ac31b198b185a2f642965c09ab922e9fb93ad12836
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml
index a79cba9..c1409e5 100644
--- a/net-misc/networkmanager/metadata.xml
+++ b/net-misc/networkmanager/metadata.xml
@@ -15,12 +15,12 @@
                 <name>Robert Piasek</name>
         </maintainer>
 	<use>
-		<flag name="3G">Enable mobile broadband connection. Requires <pkg>net-dialup/ppp</pkg>.</flag>
+		<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="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>
-		<flag name="connection-sharing">Use <pkg>net-dns/dnsmasq</pkg> and <pkg>net-firewall/iptables</pkg> for connection sharing </flag>
 		<flag name="wimax">Enable WiMAX support. Requires <pkg>net-wireless/wimax</pkg>.</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/networkmanager/networkmanager-0.9_beta1.ebuild b/net-misc/networkmanager/networkmanager-0.9_beta2.ebuild
index 1c276ff..68d1fd7 100644
--- a/net-misc/networkmanager/networkmanager-0.9_beta1.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.9_beta2.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_beta1/0.8.995}
+MY_PV=${PV/0.9_beta2/0.8.996}
 MY_P=${MY_PN}-${MY_PV}
 
 DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
@@ -26,7 +26,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"
-IUSE="3G avahi bluetooth doc nss gnutls dhclient dhcpcd kernel_linux resolvconf connection-sharing wimax"
+IUSE="avahi bluetooth doc +nss gnutls dhclient +dhcpcd +introspection kernel_linux +ppp resolvconf connection-sharing wimax"
 
 REQUIRED_USE="
 	nss? ( !gnutls ) !nss? ( gnutls )
@@ -42,17 +42,15 @@ RDEPEND=">=sys-apps/dbus-1.2
 	>=net-misc/modemmanager-0.4
 	>=net-wireless/wpa_supplicant-0.7.2[dbus]
 	bluetooth? ( >=net-wireless/bluez-4.82 )
-	3G? ( >=net-dialup/ppp-2.4.5 )
 	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 ) )
-	!dhclient? ( >=net-misc/dhcpcd-5.2 )
+		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 )
 	resolvconf? ( net-dns/openresolv )
 	connection-sharing? (
 		net-dns/dnsmasq
@@ -94,7 +92,7 @@ pkg_setup() {
 
 src_prepare() {
 	# fix tests
-	epatch "${FILESDIR}/${P}-fix-tests.patch"
+	epatch "${FILESDIR}/${P/beta2/beta1}-fix-tests.patch"
 
 	EPATCH_SOURCE="${WORKDIR}/ifnet-0.9" EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch
 }
@@ -106,8 +104,9 @@ src_configure() {
 		--with-dbus-sys-dir=/etc/dbus-1/system.d
 		--with-udev-dir=/etc/udev
 		--with-iptables=/sbin/iptables
-		$(use_enable 3G ppp)
 		$(use_enable doc gtk-doc)
+		$(use_enable introspection)
+		$(use_enable ppp)
 		$(use_enable wimax)
 		$(use_with dhclient)
 		$(use_with dhcpcd)
@@ -124,8 +123,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
+	default
 	# Need to keep the /var/run/NetworkManager directory
 	keepdir /var/run/NetworkManager