TEST version of networkmanager patche 1a

7 files changed, 492 insertions, 0 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
new file mode 100644
index 0000000..d8b4cde
--- /dev/null
+++ b/net-misc/networkmanager/ChangeLog
@@ -0,0 +1,275 @@
+# ChangeLog for net-misc/networkmanager
+# Copyright 1999-2009 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.7.1-r4 (10 Jun 2009)
+
+  10 Jun 2009; Robert Piasek <dagger@gentoo.org>
+  -networkmanager-0.7.1-r3.ebuild, +networkmanager-0.7.1-r4.ebuild:
+  Backported some importent patches from NM trunk. Fixes gentoo bug #262112
+  gnome bug #513820, rh bug #441070 among the others. Thanks to Pacho Ramos
+  for investigating the problem (bug #262112).
+
+  31 May 2009; Mike Auty <ikelos@gentoo.org> metadata.xml:
+  Fixing typo in local USE flag description (see bug 271604).
+
+  26 May 2009; Robert Piasek <dagger@gentoo.org> metadata.xml:
+  Updated dagger's email address in metadata
+
+*networkmanager-0.7.1-r3 (12 May 2009)
+
+  12 May 2009; Robert Buchholz <rbu@gentoo.org>
+  -networkmanager-0.7.0.ebuild, -networkmanager-0.7.1-r1.ebuild,
+  -networkmanager-0.7.1-r2.ebuild, +networkmanager-0.7.1-r3.ebuild:
+  fix udev rules path properly now, bug #253788
+
+*networkmanager-0.7.1-r2 (02 May 2009)
+
+  02 May 2009; Daniel Gryniewicz <dang@gentoo.org>
+  +networkmanager-0.7.1-r2.ebuild,
+  +files/networkmanager-0.7.1-confchanges.patch:
+  Enable ck-based policy; bug #268223
+
+*networkmanager-0.7.1-r1 (25 Apr 2009)
+
+  25 Apr 2009; Robert Buchholz <rbu@gentoo.org>
+  files/networkmanager-0.7.0-gentoo-dhclient.patch,
+  +files/networkmanager-0.7.1-bad-link.patch, -networkmanager-0.7.1.ebuild,
+  +networkmanager-0.7.1-r1.ebuild:
+  Fix bug #267349 by Daniel Gryniewicz, NetworkManager-0.7 links against
+  installed version of nm-util, specify udev directory for bug #267168.
+
+  24 Apr 2009; Robert Buchholz <rbu@gentoo.org>
+  +networkmanager-0.6.5_p20070823.ebuild:
+  Readd NM 0.6.5 for ppc.
+
+  22 Apr 2009; Robert Buchholz <rbu@gentoo.org> metadata.xml,
+  networkmanager-0.7.1.ebuild:
+  Add use flags for RFC 3927 link-local addresses via avahi and connection
+  sharing (bug #258842), by Robert Piasek.
+
+*networkmanager-0.7.1 (22 Apr 2009)
+
+  22 Apr 2009; Robert Buchholz <rbu@gentoo.org>
+  -networkmanager-0.6.5_p20070823.ebuild, networkmanager-0.6.6.ebuild,
+  +networkmanager-0.7.1.ebuild:
+  Version bump by Robert Piasek. Fixes bug 266184.
+  Remove 0.6.5 version, remove dependency on gnome/xfce panels as they
+  are pulled in via nm-applet anyway (bug 246023).
+
+  21 Apr 2009; Daniel Gryniewicz <dang@gentoo.org>
+  +files/networkmanager-0.7.0-gentoo-dhclient.patch, networkmanager-0.7.0:
+  fix nm 0.7 to look for dhclient.conf in the correct place on gentoo
+
+  22 Jan 2009; Peter Volkov <pva@gentoo.org>
+  networkmanager-0.6.5_p20070823.ebuild, networkmanager-0.6.6.ebuild:
+  Added xfce-base/xfce4-panel as alternative for gnome-panel, but I really
+  vote to remove this dep, see bug #246023.
+
+  18 Dec 2008; Robert Buchholz <rbu@gentoo.org> networkmanager-0.7.0.ebuild:
+  Correct postinst output, bug #250858.
+
+  05 Dec 2008; Robert Buchholz <rbu@gentoo.org> metadata.xml:
+  Add Robert Piasek to metadata
+
+*networkmanager-0.7.0 (04 Dec 2008)
+
+  04 Dec 2008; Tomas Chvatal <scarabeus@gentoo.org>
+  +files/networkmanager-0.7.0-confchanges.patch,
+  +files/nm-system-settings.conf, metadata.xml,
+  +networkmanager-0.7.0.ebuild:
+  New version. Thanks to robert.piasek@member.fsf.org for ebuild.
+
+  17 Aug 2008; Markus Meier <maekke@gentoo.org> networkmanager-0.6.6.ebuild:
+  x86 stable, bug #228837
+
+  28 Jul 2008; Kenneth Prugh <ken69267@gentoo.org>
+  networkmanager-0.6.6.ebuild:
+  amd64 stable, bug #228837. Removed unused autotools inherit.
+
+  26 Jun 2008; Robert Buchholz <rbu@gentoo.org>
+  networkmanager-0.6.5_p20070823.ebuild,
+  -networkmanager-0.6.5_p20080205.ebuild, networkmanager-0.6.6.ebuild:
+  Readd ~ppc which was dropped due to >=hal-0.5.10 dependency, and remove old
+  version. Block latest version of libnl (bug #223381).
+
+  07 Mar 2008; Steev Klimaszewski <steev@gentoo.org>
+  -files/NM-po-linguas.patch, -networkmanager-0.6.5.98.ebuild,
+  +networkmanager-0.6.6.ebuild:
+  Remove the patches that 0.6.5.98 were using
+
+*networkmanager-0.6.6 (07 Mar 2008)
+
+  07 Mar 2008; Steev Klimaszewski <steev@gentoo.org>
+  -networkmanager-0.6.5.98.ebuild, +networkmanager-0.6.6.ebuild:
+  New upstream release. Unmentioned changes in the release notes include the
+  updated backend being committed for Gentoo, as well as new init scripts from
+  compnerd.
+
+*networkmanager-0.6.5.98 (14 Feb 2008)
+
+  14 Feb 2008; Steev Klimaszewski <steev@gentoo.org>
+  +files/NM-po-linguas.patch, +networkmanager-0.6.5.98.ebuild:
+  Add 0.6.5.98 (aka 0.6.6rc1) to the tree, include patch from Debian to use
+  po/LINGUAS.
+
+  14 Feb 2008; Steev Klimaszewski <steev@gentoo.org>
+  networkmanager-0.6.5_p20070823.ebuild,
+  networkmanager-0.6.5_p20080205.ebuild:
+  Fix the libnotify dependency, this is unneeded in NetworkManager as the
+  graphical bits have been split out.
+
+*networkmanager-0.6.5_p20080205 (10 Feb 2008)
+
+  10 Feb 2008; Steev Klimaszewski <steev@gentoo.org>
+  -networkmanager-0.6.5_p20080130.ebuild,
+  +networkmanager-0.6.5_p20080205.ebuild:
+  Bump NetworkManager snapshot
+
+  04 Feb 2008; Steev Klimaszewski <steev@gentoo.org>
+  networkmanager-0.6.5_p20070823.ebuild:
+  Update the dependency to be 1.0_pre6* not just 1.0_pre6.
+
+  02 Feb 2008; Steev Klimaszewski <steev@gentoo.org>
+  +files/NetworkManagerDispatcher, networkmanager-0.6.5_p20080130.ebuild:
+  Add NetworkManagerDispatcher init script for the latest snapshot
+
+*networkmanager-0.6.5_p20080130 (02 Feb 2008)
+
+  02 Feb 2008; Steev Klimaszewski <steev@gentoo.org>
+  -files/networkmanager-0.6.4-Gentoo-checklo.patch,
+  -files/networkmanager-0.6.4-confchanges.patch,
+  -files/networkmanager-0.6.4-dbus-1.patch,
+  -files/networkmanager-0.6.4-gentooinitscript.patch,
+  -networkmanager-0.6.4_pre20061028.ebuild,
+  -networkmanager-0.6.4_pre20061028-r1.ebuild, -networkmanager-0.6.5.ebuild,
+  networkmanager-0.6.5_p20070823.ebuild,
+  +networkmanager-0.6.5_p20080130.ebuild:
+  Remove old versions of NetworkManager and add a bump that works with libnl 1.1
+
+  25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
+  Removing metalgod from metadata.xml as per #99350.
+
+  16 Sep 2007; Markus Meier <maekke@gentoo.org>
+  networkmanager-0.6.5_p20070823.ebuild:
+  x86 stable, bug #191302
+
+  08 Sep 2007; Joseph Jezak <josejx@gentoo.org>
+  networkmanager-0.6.5_p20070823.ebuild:
+  Marked ppc stable for bug #191302.
+
+  05 Sep 2007; Robert Buchholz <rbu@gentoo.org>
+  networkmanager-0.6.5_p20070823.ebuild:
+  Add die with iproute minimal build (bug #190046)
+
+  05 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  networkmanager-0.6.5_p20070823.ebuild:
+  Marked stable on amd64 as per bug 191302 to make sure stable systems
+  actually work.
+
+  28 Aug 2007; nixnut <nixnut@gentoo.org> networkmanager-0.6.5.ebuild:
+  Stable on ppc wrt bug 189781
+
+  26 Aug 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  networkmanager-0.6.5.ebuild:
+  Marked stable on amd64 as per bug 189781.
+
+  24 Aug 2007; Christian Faulhammer <opfer@gentoo.org>
+  networkmanager-0.6.5.ebuild:
+  stable x86, bug 189781
+
+*networkmanager-0.6.5_p20070823 (23 Aug 2007)
+
+  23 Aug 2007; Robert Buchholz <rbu@gentoo.org> metadata.xml,
+  +networkmanager-0.6.5_p20070823.ebuild:
+  Version bump to a current 0.6 branch state, adding myself to metadata
+
+  15 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml:
+  add <herd>no-herd</herd>
+
+  14 May 2007; Steev Klimaszewski <steev@gentoo.org>
+  networkmanager-0.6.5.ebuild:
+  Fix homepage url, fixes bug #178101.  Thanks to Pacho Ramos for reporting
+
+  11 May 2007; Gustavo Zacarias <gustavoz@gentoo.org>
+  networkmanager-0.6.5.ebuild:
+  Keyworded ~ppc
+
+  03 May 2007; Steev Klimaszewski <steev@gentoo.org>
+  networkmanager-0.6.5.ebuild:
+  Add use_with gnome to G2CONF. Fixes bug #176867, thanks to Ingmar Vanhassel
+  <ingmar.vanhassel@gmail.com> for reporting
+
+*networkmanager-0.6.5 (02 May 2007)
+
+  02 May 2007; Steev Klimaszewski <steev@gentoo.org>
+  +files/networkmanager-0.6.5-confchanges.patch,
+  +networkmanager-0.6.5.ebuild:
+  New upstream release of NetworkManager.
+
+  26 Jan 2007; Mart Raudsepp <leio@gentoo.org>
+  networkmanager-0.6.4_pre20061028.ebuild,
+  networkmanager-0.6.4_pre20061028-r1.ebuild:
+  Really fix gnome and gcrypt use on configure
+
+  14 Jan 2007; Markus Rothe <corsair@gentoo.org>
+  networkmanager-0.6.4_pre20061028-r1.ebuild:
+  Added ~ppc and ~ppc64
+
+  05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  networkmanager-0.6.4_pre20061028.ebuild,
+  networkmanager-0.6.4_pre20061028-r1.ebuild:
+  Remove debug.eclass usage.
+
+  06 Dec 2006; Steev Klimaszewski <steev@gentoo.org>
+  +files/networkmanager-0.6.4-dbus-1.patch,
+  networkmanager-0.6.4_pre20061028-r1.ebuild:
+  Add patch from the NetworkManager mailing list to fix compilation against
+  D-Bus 1.x.  Fixes bug #155279.  Thanks to Priit Laes for reporting.
+
+  04 Dec 2006; Luis Medinas <metalgod@gentoo.org>
+  networkmanager-0.6.4_pre20061028.ebuild,
+  networkmanager-0.6.4_pre20061028-r1.ebuild:
+  Fix gnome use on configure. Closes bug #155192.
+
+*networkmanager-0.6.4_pre20061028-r1 (26 Nov 2006)
+
+  26 Nov 2006; Luis Medinas <metalgod@gentoo.org>
+  +files/networkmanager-updatedbackend.patch,
+  +networkmanager-0.6.4_pre20061028-r1.ebuild:
+  Added a patch with Gentoo backend updated done by Nathan Caldwell
+  <saintdev@gmail.com>. Please test the backend and report any bug.
+
+  05 Nov 2006; Steev Klimaszewski <steev@gentoo.org>
+  networkmanager-0.6.4_pre20061028.ebuild:
+  Fix the names of patches since epkgmove apparently renamed the patches as
+  well.
+
+*networkmanager-0.6.4_pre20061028 (05 Nov 2006)
+
+  05 Nov 2006; Steev Klimaszewski <steev@gentoo.org>
+  +files/networkmanager-0.6.4-Gentoo-checklo.patch,
+  +files/networkmanager-0.6.4-confchanges.patch,
+  +files/networkmanager-0.6.4-gentooinitscript.patch,
+  +files/networkmanager-resolvconf-perms.patch,
+  +files/networkmanager-use-kernel-headers.patch, +metadata.xml,
+  +networkmanager-0.6.4_pre20061028.ebuild:
+  Moved from net-misc/NetworkManager to net-misc/networkmanager.
+
+  04 Nov 2006; Luis Medinas <metalgod@gentoo.org>
+  NetworkManager-0.6.4_pre20061028.ebuild:
+  Remove pam_console from dependencies since our patch makes it work with
+  hal/dbus instead of pam_console.
+
+*NetworkManager-0.6.4_pre20061028 (31 Oct 2006)
+
+  31 Oct 2006; Luis Medinas <metalgod@gentoo.org>
+  +files/NetworkManager-0.6.4-Gentoo-checklo.patch,
+  +files/NetworkManager-0.6.4-confchanges.patch,
+  +files/NetworkManager-0.6.4-gentooinitscript.patch,
+  +files/NetworkManager-resolvconf-perms.patch,
+  +files/NetworkManager-use-kernel-headers.patch, +metadata.xml,
+  +NetworkManager-0.6.4_pre20061028.ebuild:
+  Initial import. This ebuild was made by Luis Medinas <metalgod@gentoo.org>
+  and Stephen Klimaszewski <steev@gentoo.org>.
+
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
new file mode 100644
index 0000000..dea8611
--- /dev/null
+++ b/net-misc/networkmanager/Manifest
@@ -0,0 +1,20 @@
+AUX NetworkManagerDispatcher 1198 RMD160 4345870ab40607b9aed80c8da383b604f032b98e SHA1 1dd2250c746b25566fceaab551f4ef8335fe4f55 SHA256 f8cb5d0470619cf1f0812fffcf1bf2091e3c44a757899c07164f80ddd6a2641e
+AUX networkmanager-0.6.5-confchanges.patch 1053 RMD160 ae76d5c029090848a9264e7559aaab90e7f3c084 SHA1 4847532aa15316a1a45e8667cd7947b514a1833f SHA256 bf3418ccbf8643d14b0413cf7a9d25290003d4443a7a051bb54f953aebede84f
+AUX networkmanager-0.7.0-confchanges.patch 594 RMD160 c70c7d32722aa8f1ebf62b0382fad56c7d8e21d4 SHA1 35706e9807e923732e3ac1db9c1e7d7a9f0bcc8f SHA256 ffd4fdf452a5791d938406d33b432aff591ab7e475583a66343a5c98ee6091af
+AUX networkmanager-0.7.0-gentoo-dhclient.patch 956 RMD160 7d7cb94256350c92e95d9adcf57cc891a84cc086 SHA1 95663877b428803bdbb540cda6effe5a29dda9c5 SHA256 da9c943969ad22a9ad465efc914644c7a6c600c0c88b8b2a8b8807ff05e5f7ae
+AUX networkmanager-0.7.1-bad-link.patch 655 RMD160 24a431665b604d111a9b10efa33ff066a4363aad SHA1 9de1073f681623cb156444fed53c19d03e06076d SHA256 92bf60b9a10d804d0c295e73f8525bce67e9d6e36dc7ccf5468243c21183c113
+AUX networkmanager-0.7.1-confchanges.patch 968 RMD160 7216f028613a29cf619029db3178cb0510aa3c1b SHA1 d818ddeb553862e18f0f796dcf30e53e25af0bd4 SHA256 5032ffd7fddbd9f67ef05ee0159f77e67b8c08b1aac9ef5209363fb02297d437
+AUX networkmanager-resolvconf-perms.patch 532 RMD160 453ce19560e1872d1da1fa48e0c9a365025e6b1b SHA1 a81be4e9c9bac854e092b82529c4ae2c12cdf91c SHA256 e1786f34a75d2e0a27ceccb960cf975176260886f70cc3e9b172180f8a1d2e6e
+AUX networkmanager-updatedbackend.patch 17700 RMD160 685132b4a98843416264f06c480ff205fa87f789 SHA1 a83d2b0ea7e4a563af3d14567ba1da3605fbf654 SHA256 ee4a1583db867fd6a1851a9dd243401166f29ee9d00ad6e03e5b677915e5bf43
+AUX networkmanager-use-kernel-headers.patch 466 RMD160 cd16279966d4e3594a20aa0b89d08f3baa3c2e58 SHA1 a9e269c9021888ca058b9fb72f9a71dc25a7488b SHA256 952948f41676fafcf76210cbef46728cbb219d6c851d5417d892b984fd725402
+AUX nm-system-settings.conf 23 RMD160 6d66c702b345bde668a420a15716feea6005fbd1 SHA1 49ba558d20f5ca5a201e027e13b878dd5ac3569c SHA256 44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21
+DIST NetworkManager-0.6.5_p20070823.tar.gz 956975 RMD160 9d8556e3b5fc3155632bafdb726a5861412ae94b SHA1 c1d795cf114d2f5951a746eb4aa770e54eece9b6 SHA256 e6181ac9aadf1c36a20b979d313cfd0ae947bcf93f61c1c028cc1642c216454c
+DIST NetworkManager-0.6.6.tar.gz 984114 RMD160 f0672ee31001f83b06f6b93c30a01f37ee12ed6e SHA1 c5d0bcf7d262e1b600df6dad9f6f4baada293634 SHA256 36d48a11957e1c4f53a685b0fcc7d060e8972b435501c92b10737bb844dd95e2
+DIST NetworkManager-0.7.1-gentoo-patches-1.tar.bz2 36726 RMD160 1fe335f595a110ce9e96c5fb44ace62285eca4fb SHA1 edbb4d7fb81b4d64cefbf659f21a2fe100709bca SHA256 1a83a59a594b034a7bac53bddc5f1bb8921bfe019d5cce35a20111c5abc7cb44
+DIST NetworkManager-0.7.1.tar.bz2 1226975 RMD160 117677b5da4e66df0287e5a974c80709e988dcb3 SHA1 3f734b8c606bcc71a43c63ba3993524d8db807ca SHA256 7526a31de615a662cb09e915f26e5b151eda364240d983df6232aac8b9333f3a
+DIST networkmanager-0.6.5_p20070823-updatedbackend.patch.bz2 5006 RMD160 f35c35a3db8dbd3178c8325a4eb8a641653a85f0 SHA1 5f9a3b1d85e4a08fa242ab1ff73c6d08ec2791d8 SHA256 0ee0ee38a3e5ac1f501d83dd424dd95e69871dd9e7d67cf2e09e9a378ae10fa8
+EBUILD networkmanager-0.6.5_p20070823.ebuild 2703 RMD160 f26ac7b1b243c9be2e087042984453230d1b65f4 SHA1 d8d21f867a132d1368429b5f57d93be594a8a919 SHA256 bf05ebe5e345e0016b0391708813f1ae78ea10446dbbfd8c2f9d82a456b158e9
+EBUILD networkmanager-0.6.6.ebuild 2621 RMD160 7516ea6287cfe7c9b98e4f8e5203bf4b1642c8e6 SHA1 6dfc5a1e518e5b4b335a28ceeb248f8e1c639175 SHA256 8dce1c81ef039889d0bdd0ec9c18a3f3da14b42f20ba6ced5639808d6708bbe5
+EBUILD networkmanager-0.7.1-r4.ebuild 4007 RMD160 b0e735e86eab124b33d82b5c31fdd4c522cca51a SHA1 bad299581356ba1514b02910a33eefd43eae5e8d SHA256 482b5214b071afbbaf8872a18796adb3952a55e79cbeefd8473b6729184bc17c
+MISC ChangeLog 10742 RMD160 2a332f637075f0ebb1fdc9c3bfab87e342e1740a SHA1 a502bed9d7d1c9ef846aa3af003793cd1d6f4d90 SHA256 004d92e7ec1087f3057138694c44395e5e0a37e59292985caa7309410c9b5c90
+MISC metadata.xml 969 RMD160 c16683ef7fed4b5603029ae39f5872032ec37554 SHA1 813e0b48a78ce50d5257030507d22fd0e9452161 SHA256 e4375eae4ff0d47386780e4d29575e6581f7c9b89168372bb1bb7713a452c02f
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 0000000..ea074ba
--- /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 0000000..ca53328
--- /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 0000000..c37b596
--- /dev/null
+++ b/net-misc/networkmanager/files/nm-system-settings.conf
@@ -0,0 +1,2 @@
+[main]
+plugins=keyfile
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml
new file mode 100644
index 0000000..acb36b2
--- /dev/null
+++ b/net-misc/networkmanager/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>steev@gentoo.org</email>
+		<name>Stephen Klimaszewski</name>
+	</maintainer>
+	<maintainer>
+		<email>rbu@gentoo.org</email>
+		<name>Robert Buchholz</name>
+	</maintainer>
+        <maintainer>
+                <email>dagger@gentoo.org</email>
+                <name>Robert Piasek</name>
+        </maintainer>
+	<use>
+		<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="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>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/networkmanager/networkmanager-0.7.1-r4.ebuild b/net-misc/networkmanager/networkmanager-0.7.1-r4.ebuild
new file mode 100644
index 0000000..1973d47
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-0.7.1-r4.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-r4.ebuild,v 1.1 2009/06/10 22:03:19 dagger Exp $
+
+EAPI="2"
+inherit eutils autotools
+
+PATCH_VERSION="1a"
+
+# 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
+	>=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 )"
+
+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}
+
+src_prepare() {
+
+	# 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
+
+}
+
+src_configure() {
+	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}
+}
+
+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"
+	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"'
+}