public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/dagger:master commit in: net-misc/networkmanager/
@ 2011-03-10 16:17 Robert Piasek
  0 siblings, 0 replies; 7+ messages in thread
From: Robert Piasek @ 2011-03-10 16:17 UTC (permalink / raw
  To: gentoo-commits

commit:     6ad2c4aab187de775fc466655b2ae0775875add2
Author:     Robert Piasek <dagger <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 10 16:16:33 2011 +0000
Commit:     Robert Piasek <dagger <AT> gentoo <DOT> org>
CommitDate: Thu Mar 10 16:16:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dagger.git;a=commit;h=6ad2c4aa

Update NM version to 0.9 beta2. Clean up some dependencies

---
 net-misc/networkmanager/ChangeLog                  |    9 +++++-
 net-misc/networkmanager/Manifest                   |    8 +++---
 net-misc/networkmanager/metadata.xml               |    4 +-
 ...eta1.ebuild => networkmanager-0.9_beta2.ebuild} |   28 +++++++++----------
 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
similarity index 87%
rename from net-misc/networkmanager/networkmanager-0.9_beta1.ebuild
rename to 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
 



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] dev/dagger:master commit in: net-misc/networkmanager/
@ 2011-03-10 16:20 Robert Piasek
  0 siblings, 0 replies; 7+ messages in thread
From: Robert Piasek @ 2011-03-10 16:20 UTC (permalink / raw
  To: gentoo-commits

commit:     2db6f4f67614f6f7e1ae58d14111b3f6afec32be
Author:     Robert Piasek <dagger <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 10 16:19:38 2011 +0000
Commit:     Robert Piasek <dagger <AT> gentoo <DOT> org>
CommitDate: Thu Mar 10 16:19:38 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dagger.git;a=commit;h=2db6f4f6

Update ECONF

---
 net-misc/networkmanager/Manifest                   |    2 +-
 .../networkmanager/networkmanager-0.9_beta2.ebuild |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 610ce4b..241d47b 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -2,6 +2,6 @@ AUX networkmanager-0.9_beta1-fix-tests.patch 1166 RMD160 34f50bc37043a4beba0e300
 AUX nm-system-settings.conf 70 RMD160 c0d2be147383999b62cead86ab4333169e4ef277 SHA1 679ec8052b610969c148a2d34cd4da7a41484a76 SHA256 34f53d9ac1ad65eda6942dc3059117f60f6321059ca23f4fbfcc2f2edcae151f
 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_beta2.ebuild 4155 RMD160 c8d8afc3fec9df3c8368340e36da829810022c2d SHA1 efcef155bb6eefda9d68e51856f52a491152c18e SHA256 07d8a423017b528fb25b02cb99f888fc904e02ce0ed44187aeb15654405f8682
+EBUILD networkmanager-0.9_beta2.ebuild 4189 RMD160 0b210b41d60a8c94c2ede155b7c28e682d572a33 SHA1 6161a5b3d27e229cad82fc86dcaa575699031370 SHA256 33fbca23fdc7749104bd062977a2e9a530ef7245c2a9352ebb533d3350b6070c
 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/networkmanager-0.9_beta2.ebuild b/net-misc/networkmanager/networkmanager-0.9_beta2.ebuild
index 68d1fd7..4d776a4 100644
--- a/net-misc/networkmanager/networkmanager-0.9_beta2.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.9_beta2.ebuild
@@ -114,9 +114,9 @@ src_configure() {
 		$(use_with resolvconf)"
 
 		if use nss ; then
-			$(use_with nss crypto=nss)
+			ECONF="${ECONF} $(use_with nss crypto=nss)"
 		else
-			$(use_with gnutls crypto=gnutls)
+			ECONF="${ECONF} $(use_with gnutls crypto=gnutls)"
 		fi
 
 	econf ${ECONF}



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] dev/dagger:master commit in: net-misc/networkmanager/
@ 2011-03-10 16:25 Robert Piasek
  0 siblings, 0 replies; 7+ messages in thread
From: Robert Piasek @ 2011-03-10 16:25 UTC (permalink / raw
  To: gentoo-commits

commit:     211e934808b57610755ec1087d7373acccc6e65a
Author:     Robert Piasek <dagger <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 10 16:24:47 2011 +0000
Commit:     Robert Piasek <dagger <AT> gentoo <DOT> org>
CommitDate: Thu Mar 10 16:24:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dagger.git;a=commit;h=211e9348

Update udev dependency. New NM will require udev 147 or later

---
 net-misc/networkmanager/Manifest                   |    2 +-
 .../networkmanager/networkmanager-0.9_beta2.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 241d47b..6da4b9a 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -2,6 +2,6 @@ AUX networkmanager-0.9_beta1-fix-tests.patch 1166 RMD160 34f50bc37043a4beba0e300
 AUX nm-system-settings.conf 70 RMD160 c0d2be147383999b62cead86ab4333169e4ef277 SHA1 679ec8052b610969c148a2d34cd4da7a41484a76 SHA256 34f53d9ac1ad65eda6942dc3059117f60f6321059ca23f4fbfcc2f2edcae151f
 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_beta2.ebuild 4189 RMD160 0b210b41d60a8c94c2ede155b7c28e682d572a33 SHA1 6161a5b3d27e229cad82fc86dcaa575699031370 SHA256 33fbca23fdc7749104bd062977a2e9a530ef7245c2a9352ebb533d3350b6070c
+EBUILD networkmanager-0.9_beta2.ebuild 4189 RMD160 aebcccb688fabb51b0b72f540d092a5f41a16728 SHA1 082858228b4fb124a9992125c76c9958556b7a0a SHA256 95c68c78508c3f48c7d3bee2fa6e5d0f8c658517bf75905535f605e5393b8041
 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/networkmanager-0.9_beta2.ebuild b/net-misc/networkmanager/networkmanager-0.9_beta2.ebuild
index 4d776a4..31ba4bb 100644
--- a/net-misc/networkmanager/networkmanager-0.9_beta2.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.9_beta2.ebuild
@@ -35,7 +35,7 @@ REQUIRED_USE="
 RDEPEND=">=sys-apps/dbus-1.2
 	>=dev-libs/dbus-glib-0.75
 	>=net-wireless/wireless-tools-28_pre9
-	>=sys-fs/udev-145[extras]
+	>=sys-fs/udev-147[extras]
 	>=dev-libs/glib-2.26
 	>=sys-auth/polkit-0.96
 	>=dev-libs/libnl-1.1



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] dev/dagger:master commit in: net-misc/networkmanager/
@ 2011-03-12 12:06 Robert Piasek
  0 siblings, 0 replies; 7+ messages in thread
From: Robert Piasek @ 2011-03-12 12:06 UTC (permalink / raw
  To: gentoo-commits

commit:     ec6ca0fd1235f78b44501fbc7860adf48e4c1db3
Author:     Robert Piasek <dagger <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 12 12:06:12 2011 +0000
Commit:     Robert Piasek <dagger <AT> gentoo <DOT> org>
CommitDate: Sat Mar 12 12:06:12 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dagger.git;a=commit;h=ec6ca0fd

Fix installation

---
 net-misc/networkmanager/Manifest                   |    2 +-
 .../networkmanager/networkmanager-0.9_beta2.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 6da4b9a..75c6193 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -2,6 +2,6 @@ AUX networkmanager-0.9_beta1-fix-tests.patch 1166 RMD160 34f50bc37043a4beba0e300
 AUX nm-system-settings.conf 70 RMD160 c0d2be147383999b62cead86ab4333169e4ef277 SHA1 679ec8052b610969c148a2d34cd4da7a41484a76 SHA256 34f53d9ac1ad65eda6942dc3059117f60f6321059ca23f4fbfcc2f2edcae151f
 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_beta2.ebuild 4189 RMD160 aebcccb688fabb51b0b72f540d092a5f41a16728 SHA1 082858228b4fb124a9992125c76c9958556b7a0a SHA256 95c68c78508c3f48c7d3bee2fa6e5d0f8c658517bf75905535f605e5393b8041
+EBUILD networkmanager-0.9_beta2.ebuild 4183 RMD160 2e704ea4717d42d584466888827ba8f54a4452ee SHA1 4dca3eae25aeb2a0321bfcfff81d82436758d7b9 SHA256 137c1bb5b52a20871aceb53b8afb75a306725ab40ac3c64c32ce10bf8c81c219
 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/networkmanager-0.9_beta2.ebuild b/net-misc/networkmanager/networkmanager-0.9_beta2.ebuild
index 31ba4bb..a7f63f7 100644
--- a/net-misc/networkmanager/networkmanager-0.9_beta2.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.9_beta2.ebuild
@@ -135,7 +135,7 @@ src_install() {
 	# Add keyfile plugin support
 	keepdir /etc/NetworkManager/system-connections
 	insinto /etc/NetworkManager
-	newins "${FILESDIR}/nm-system-settings.conf-ifnet" nm-system-settings.conf \
+	newins "${FILESDIR}/nm-system-settings.conf" nm-system-settings.conf \
 		|| die "newins failed"
 }
 



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] dev/dagger:master commit in: net-misc/networkmanager/
@ 2011-04-20 15:14 Robert Piasek
  0 siblings, 0 replies; 7+ messages in thread
From: Robert Piasek @ 2011-04-20 15:14 UTC (permalink / raw
  To: gentoo-commits

commit:     cf696fd202bed15d4603592fed8b9bd69a6f1d48
Author:     Robert Piasek <dagger <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 20 15:14:09 2011 +0000
Commit:     Robert Piasek <dagger <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 15:14:09 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dagger.git;a=commit;h=cf696fd2

Add version 0.9_rc1

---
 net-misc/networkmanager/Manifest                   |    2 +
 .../networkmanager/networkmanager-0.9_rc1.ebuild   |  139 ++++++++++++++++++++
 2 files changed, 141 insertions(+), 0 deletions(-)

diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 968367d..c2acb8d 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -1,6 +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 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
 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/networkmanager-0.9_rc1.ebuild b/net-misc/networkmanager/networkmanager-0.9_rc1.ebuild
new file mode 100644
index 0000000..623f2a9
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-0.9_rc1.ebuild
@@ -0,0 +1,139 @@
+# 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 $
+
+EAPI="4"
+
+inherit eutils linux-info
+# gnome.org
+# once 0.9 is released add gnome.org eclass back
+
+# 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_P=${MY_PN}-${MY_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}}
+
+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 )"
+
+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
+	>=dev-libs/libnl-1.1
+	>=net-misc/modemmanager-0.4
+	>=net-wireless/wpa_supplicant-0.7.2[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 )
+	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? ( >=net-wireless/wimax-1.5.1 )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool
+	doc? ( >=dev-util/gtk-doc-1.8 )"
+
+S=${WORKDIR}/${MY_P}
+
+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_setup() {
+	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
+}
+
+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-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)"
+
+		if use nss ; then
+			ECONF="${ECONF} $(use_with nss crypto=nss)"
+		else
+			ECONF="${ECONF} $(use_with gnutls crypto=gnutls)"
+		fi
+
+	econf ${ECONF}
+}
+
+src_install() {
+	default
+	# 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 will need to reload DBus if this is your first time installing"
+	elog "NetworkManager, or if you're upgrading from 0.7 or older."
+	elog ""
+}



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] dev/dagger:master commit in: net-misc/networkmanager/
@ 2011-05-04 20:12 Robert Piasek
  0 siblings, 0 replies; 7+ messages in thread
From: Robert Piasek @ 2011-05-04 20:12 UTC (permalink / raw
  To: gentoo-commits

commit:     a6daa6bd7eb5cc16cf39209a00602cb6cd2607cf
Author:     Robert Piasek <dagger <AT> gentoo <DOT> org>
AuthorDate: Wed May  4 20:11:56 2011 +0000
Commit:     Robert Piasek <dagger <AT> gentoo <DOT> org>
CommitDate: Wed May  4 20:11:56 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dagger.git;a=commit;h=a6daa6bd

add networkmanager 0.8.4 and 9.0_rc2

---
 net-misc/networkmanager/Manifest                   |   10 +-
 net-misc/networkmanager/metadata.xml               |    1 +
 ..._beta3.ebuild => networkmanager-0.8.4.0.ebuild} |   90 ++++++++++---------
 ....9_rc1.ebuild => networkmanager-0.9_rc2.ebuild} |    4 +-
 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
similarity index 62%
rename from net-misc/networkmanager/networkmanager-0.9_beta3.ebuild
rename to 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
similarity index 98%
rename from net-misc/networkmanager/networkmanager-0.9_rc1.ebuild
rename to 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="



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] dev/dagger:master commit in: net-misc/networkmanager/
@ 2011-06-22  7:39 Robert Piasek
  0 siblings, 0 replies; 7+ messages in thread
From: Robert Piasek @ 2011-06-22  7:39 UTC (permalink / raw
  To: gentoo-commits

commit:     40f1177569bb2fcf5fdff0d9159677a47d375227
Author:     Robert Piasek <dagger <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 22 07:38:43 2011 +0000
Commit:     Robert Piasek <dagger <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 07:38:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dagger.git;a=commit;h=40f11775

Add version 0.9_rc3

---
 net-misc/networkmanager/ChangeLog                  |    7 +++++++
 net-misc/networkmanager/Manifest                   |    7 +++----
 ....9_rc2.ebuild => networkmanager-0.9_rc3.ebuild} |    6 +++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index 7955ed7..d38c3d1 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -2,6 +2,13 @@
 # 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_rc3 (22 Jun 2011)
+
+  22 Jun 2011; Robert Piasek <dagger@gentoo.org>
+  -networkmanager-0.9_rc2.ebuild, +networkmanager-0.9_rc3.ebuild,
+  files/nm-system-settings.conf, metadata.xml:
+  Update version to 0.9_rc3
+
 *networkmanager-0.9_beta2 (10 Mar 2011)
 
   10 Mar 2011; Robert Piasek <dagger@gentoo.org>

diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 6e4572e..6bb2df0 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -1,8 +1,7 @@
 AUX nm-system-settings.conf 70 RMD160 c0d2be147383999b62cead86ab4333169e4ef277 SHA1 679ec8052b610969c148a2d34cd4da7a41484a76 SHA256 34f53d9ac1ad65eda6942dc3059117f60f6321059ca23f4fbfcc2f2edcae151f
 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
+DIST NetworkManager-0.8.9997.tar.bz2 2113404 RMD160 5b97cd4d603ca047bd83ef9cf22a72223f0d4f87 SHA1 f14c8c46523792eecacdd91ce09f13b0678d1b0c SHA256 af2e08546cfcd51731be8f4d944b77876ba2eca93cf4f15509caf5572cac6596
 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
+EBUILD networkmanager-0.9_rc3.ebuild 3999 RMD160 25d8e451ba481a19960b21f3ba13bcf736d76327 SHA1 5e29d0ede9eaa71861fb91776034dd54534b24cc SHA256 5fe803c6e74b8b103539a95c225b7baa1285194bd05515fafd8a694abf129a43
+MISC ChangeLog 13944 RMD160 b52a0a99530bebc7ba4fc0e7c89d8d4bb1f1c244 SHA1 3d6fb2afc241f149c84cc737f32219afd14030b0 SHA256 7945b78e0acec23b5591919c7f5c9c7a1a26ebfee9abdbccfd9f003a3b825689
 MISC metadata.xml 1290 RMD160 1285a26b775a35451982a7c19e16dfd7b2d59554 SHA1 c530542e8a292173ca722cb6d96ced7ceb55dabf SHA256 924b5245838d35e16b8b99ba6585c434fd6938c6f99b4abec0d8ea8d0fad17ce

diff --git a/net-misc/networkmanager/networkmanager-0.9_rc2.ebuild b/net-misc/networkmanager/networkmanager-0.9_rc3.ebuild
similarity index 96%
rename from net-misc/networkmanager/networkmanager-0.9_rc2.ebuild
rename to net-misc/networkmanager/networkmanager-0.9_rc3.ebuild
index c0f6c9f..bcf79aa 100644
--- a/net-misc/networkmanager/networkmanager-0.9_rc2.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.9_rc3.ebuild
@@ -11,14 +11,14 @@ 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_rc2/0.8.999}
+MY_PV=${PV/0.9_rc3/0.8.9997}
 MY_P=${MY_PN}-${MY_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"
+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}}



^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2011-06-22  7:39 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-10 16:25 [gentoo-commits] dev/dagger:master commit in: net-misc/networkmanager/ Robert Piasek
  -- strict thread matches above, loose matches on Subject: below --
2011-06-22  7:39 Robert Piasek
2011-05-04 20:12 Robert Piasek
2011-04-20 15:14 Robert Piasek
2011-03-12 12:06 Robert Piasek
2011-03-10 16:20 Robert Piasek
2011-03-10 16:17 Robert Piasek

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox