Remove networkmanager

(Portage version: 2.1.9.25/git/Linux x86_64, unsigned Manifest commit)

14 files changed, 2 insertions, 1698 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
deleted file mode 100644
index 65e8415..0000000
--- a/net-misc/networkmanager/ChangeLog
+++ /dev/null
@@ -1,500 +0,0 @@
-# ChangeLog for net-misc/networkmanager
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.88 2010/11/10 12:57:16 dagger Exp $
-
-  30 Nov 2010; <gentoo@gentoo.org> -networkmanager-0.8.2-r1.ebuild:
-  Remove nm-0.8.2-r1 since it's been added to portage tree
-
-*networkmanager-0.8.2-r1 (24 Nov 2010)
-
-  24 Nov 2010; <gentoo@gentoo.org> +networkmanager-0.8.2-r1.ebuild,
-  +files/networkmanager-0.8.2-accept-gw.patch,
-  +files/NetworkManagerDispatcher, +files/nm-system-settings.conf,
-  +files/nm-system-settings.conf-ifnet, +metadata.xml:
-  Accept "gw" by the plugin. That should fix bug #339215
-
-  28 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
-  networkmanager-0.8-r1.ebuild:
-  ppc64 stable wrt #321593
-
-  19 Oct 2010; Brent Baude <ranger@gentoo.org> networkmanager-0.8-r1.ebuild:
-  Marking networkmanager-0.8-r1 ppc for bug 321593
-
-*networkmanager-0.8.2 (10 Nov 2010)
-
-  10 Nov 2010; Robert Piasek <dagger@gentoo.org>
-  +networkmanager-0.8.2.ebuild:
-  Added version 0.8.2
-
-  23 Aug 2010; Robert Piasek <dagger@gentoo.org>
-  networkmanager-0.8.1-r6.ebuild:
-  removed hard dependency on dhcp4. Now dhcp3 can be used as well
-
-*networkmanager-0.8.1-r6 (23 Aug 2010)
-
-  23 Aug 2010; Robert Piasek <dagger@gentoo.org>
-  -networkmanager-0.8.1-r5.ebuild, +networkmanager-0.8.1-r6.ebuild,
-  +files/networkmanager-0.8.1-dhclient3-fix.patch:
-  Fix dhclient-3 backport. That should fix bug #332157 and bug #331547 for
-  good.
-
-*networkmanager-0.8.1-r5 (23 Aug 2010)
-
-  23 Aug 2010; Robert Piasek <dagger@gentoo.org>
-  -networkmanager-0.8.1-r4.ebuild, +networkmanager-0.8.1-r5.ebuild:
-  explicitly disable dhclient if dhcpcd is enabled. That should finally fix
-  bug #331547
-
-*networkmanager-0.8.1-r4 (23 Aug 2010)
-
-  23 Aug 2010; Robert Piasek <dagger@gentoo.org>
-  -networkmanager-0.8.1-r3.ebuild, +networkmanager-0.8.1-r4.ebuild:
-  Updated ifnet plugin. Added extra kernel checks.
-  Fixes bugs: #333257, #333639, #333785
-
-  23 Aug 2010; Robert Piasek <dagger@gentoo.org>
-  networkmanager-0.8-r1.ebuild, files/nm-system-settings.conf,
-  +files/nm-system-settings.conf-ifnet:
-  Added separate file for system-settings with Gentoo plugin.
-
-  20 Aug 2010; Markos Chandras <hwoarang@gentoo.org>
-  networkmanager-0.8-r1.ebuild:
-  Stable on amd64 wrt bug #321593
-
-*networkmanager-0.8.1-r3 (17 Aug 2010)
-
-  17 Aug 2010; Robert Piasek <dagger@gentoo.org>
-  -networkmanager-0.8.1-r2.ebuild, +networkmanager-0.8.1-r3.ebuild:
-  NM now depends on ppp-2.4.5. Fixed bug #330665
-
-*networkmanager-0.8.1-r2 (17 Aug 2010)
-
-  17 Aug 2010; Robert Piasek <dagger@gentoo.org>
-  -networkmanager-0.8.1-r1.ebuild, +networkmanager-0.8.1-r2.ebuild,
-  +files/networkmanager-0.8.1-CVE-2010-1172.patch,
-  +files/networkmanager-0.8.1-dhclient3.patch,
-  files/networkmanager-0.8.1-dhcp-configure.patch,
-  +files/networkmanager-0.8.1-glib-2.25.12-workaround.patch,
-  files/nm-system-settings.conf:
-  Gentoo specyfic plugin is now enabled by default!
-  Backported some patches. This should fix bugs #331509, #331547, #332157
-
-  13 Aug 2010; Christian Faulhammer <fauli@gentoo.org>
-  networkmanager-0.8-r1.ebuild:
-  stable x86, bug 321593
-
-*networkmanager-0.8.1-r1 (04 Aug 2010)
-
-  04 Aug 2010; Robert Piasek <dagger@gentoo.org>
-  -networkmanager-0.8.1.ebuild, +networkmanager-0.8.1-r1.ebuild,
-  +files/networkmanager-0.8.1-dhcp-configure.patch:
-  Updated dhcp client configure option (bug #330659) - thanks Marco Paolone
-  Updated ISC dhcp client requirement to version 4.0 (bug #330319) - thanks
-  to Mike Auty  for providing patch
-
-*networkmanager-0.8.1 (28 Jul 2010)
-
-  28 Jul 2010; Robert Piasek <dagger@gentoo.org>
-  -networkmanager-0.7.1-r3.ebuild, -networkmanager-0.7.1_p20090824.ebuild,
-  -networkmanager-0.8.ebuild, +networkmanager-0.8.1.ebuild,
-  +files/networkmanager-0.8.1-confchanges.patch:
-  Bump version to 0.8.1. Added Gentoo specyfic plugin - ifnet plugin by Qiao
-  Mu
-
-  07 Jul 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
-  networkmanager-0.8.ebuild, networkmanager-0.8-r1.ebuild:
-  Fix postinst message about reloading dbus as per bug 322805
-
-  04 Jun 2010; Robert Piasek <dagger@gentoo.org> networkmanager-0.8.ebuild,
-  networkmanager-0.8-r1.ebuild:
-  Removed incorrect postinfo message which is no longer valid for 0.8
-
-  13 Apr 2010; Raúl Porcel <armin76@gentoo.org> networkmanager-0.8.ebuild,
-  networkmanager-0.8-r1.ebuild:
-  Add ~arm
-
-*networkmanager-0.8-r1 (30 Mar 2010)
-
-  30 Mar 2010; Daniel Gryniewicz <dang@gentoo.org>
-  +networkmanager-0.8-r1.ebuild,
-  +files/networkmanager-0.8-confchanges.patch:
-  Add VPN.Plugin to at_console; bug #294992
-
-  10 Mar 2010; Joseph Jezak <josejx@gentoo.org> networkmanager-0.8.ebuild:
-  Marked ~ppc/~ppc64 for bug #296548.
-
-*networkmanager-0.8 (26 Feb 2010)
-
-  26 Feb 2010; Robert Piasek <dagger@gentoo.org>
-  -networkmanager-0.6.5_p20070823.ebuild, -networkmanager-0.7.999.ebuild,
-  +networkmanager-0.8.ebuild,
-  +files/networkmanager-0.8-nscd-clear-cache.patch:
-  New version of Networkmanager (0.8) is now out. Removed anvient and RC
-  versions.
-
-  25 Jan 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
-  networkmanager-0.7.999.ebuild:
-  Don't hard-depend on gtk-doc, fixes bug 302150
-
-  25 Jan 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
-  -networkmanager-0.8.0_pre20090824.ebuild,
-  -networkmanager-0.8.0_pre20091105.ebuild:
-  Remove old snapshots of networkmanager; buggy, and conflict with
-  versioning scheme of 0.8-rc3 (0.7.999)
-
-  25 Jan 2010; Nirbheek Chauhan <nirbheek@gentoo.org> metadata.xml:
-  metadata.xml: add myself, fix indentation
-
-*networkmanager-0.7.999 (25 Jan 2010)
-
-  25 Jan 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
-  +networkmanager-0.7.999.ebuild,
-  +files/networkmanager-0.8-read-hostname.patch:
-  Bump to 0.7.999 -- final RC of networkmanager-0.8; add fix for bug 176873
-
-  22 Jan 2010; Brent Baude <ranger@gentoo.org> networkmanager-0.7.2.ebuild:
-  Marking networkmanager-0.7.2 ppc64 for bug 274688
-
-  18 Jan 2010; Robert Buchholz <rbu@gentoo.org> metadata.xml:
-  Dropping maintenance
-
-  14 Jan 2010; Markus Meier <maekke@gentoo.org> networkmanager-0.7.2.ebuild:
-  x86 stable, bug #299319
-
-  12 Jan 2010; nixnut <nixnut@gentoo.org> networkmanager-0.7.2.ebuild:
-  ppc stable #299319
-
-  06 Jan 2010; Brent Baude <ranger@gentoo.org>
-  networkmanager-0.7.1-r6.ebuild:
-  Marking networkmanager-0.7.1-r6 ~ppc64 for bug 274688
-
-  02 Jan 2010; Pacho Ramos <pacho@gentoo.org> networkmanager-0.7.2.ebuild:
-  amd64 stable, bug 299319
-
-*networkmanager-0.7.2 (24 Nov 2009)
-
-  24 Nov 2009; Robert Piasek <dagger@gentoo.org>
-  +networkmanager-0.7.2.ebuild:
-  New bugfix release for NetworkManager 0.7 series
-
-  05 Nov 2009; Robert Piasek <dagger@gentoo.org>
-  networkmanager-0.8.0_pre20091105.ebuild:
-  Added configure option for iptables support
-
-*networkmanager-0.8.0_pre20091105 (05 Nov 2009)
-
-  05 Nov 2009; Robert Piasek <dagger@gentoo.org>
-  +networkmanager-0.8.0_pre20091105.ebuild:
-  new snapshot of development version of NetworkManager
-
-  24 Oct 2009; nixnut <nixnut@gentoo.org> networkmanager-0.7.1-r6.ebuild:
-  ppc stable #288416
-
-  17 Oct 2009; Markus Meier <maekke@gentoo.org>
-  networkmanager-0.7.1-r6.ebuild:
-  x86 stable, bug #288416
-
-  10 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
-  networkmanager-0.7.1-r6.ebuild:
-  amd64 stable wrt #288416
-
-  17 Sep 2009; Robert Piasek <dagger@gentoo.org>
-  networkmanager-0.7.1-r6.ebuild:
-  Added dev-util/gtk-doc-am as dep, as autoreconf needs it.
-
-*networkmanager-0.8.0_pre20090824 (24 Aug 2009)
-*networkmanager-0.7.1_p20090824 (24 Aug 2009)
-
-  24 Aug 2009; Robert Piasek <dagger@gentoo.org>
-  +networkmanager-0.7.1_p20090824.ebuild,
-  +networkmanager-0.8.0_pre20090824.ebuild:
-  New stable snapshot of NetworkManager (0.7.1)
-  New dev snapshot of NetworkManager (0.8)
-
-  12 Jul 2009; Robert Buchholz <rbu@gentoo.org>
-  networkmanager-0.7.1-r3.ebuild, networkmanager-0.7.1-r6.ebuild:
-  Adapt DEPEND to reflect that policykit 0.92 does not work for us, bug 274906.
-
-*networkmanager-0.7.1-r6 (19 Jun 2009)
-
-  19 Jun 2009; Robert Piasek <dagger@gentoo.org>
-  -networkmanager-0.7.1-r4.ebuild, +networkmanager-0.7.1-r6.ebuild:
-  Fixed some regression bugs caused by backport patches (bug #273741 and
-  #274636)
-
-  14 Jun 2009; Robert Piasek <dagger@gentoo.org>
-  +networkmanager-0.7.1-r3.ebuild:
-  Restored networkmanager-0.7.1-r3 version due to potential regression
-  problems as per bug (#273741).
-
-*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
deleted file mode 100644
index 1956fa5..0000000
--- a/net-misc/networkmanager/Manifest
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX NetworkManagerDispatcher 1198 RMD160 4345870ab40607b9aed80c8da383b604f032b98e SHA1 1dd2250c746b25566fceaab551f4ef8335fe4f55 SHA256 f8cb5d0470619cf1f0812fffcf1bf2091e3c44a757899c07164f80ddd6a2641e
-AUX networkmanager-0.8.2-1.patch 6642 RMD160 466f7c2bd34043d13d1b265f4a52b172c594430e SHA1 7af80cb4ea3cf1d60566c8dacd3eadc3ef4cc186 SHA256 f29cfa186c9b77452266e9c303711c2368986fb7e5455e388a5dfe064e80b3e3
-AUX networkmanager-0.8.2-accept-gw.patch 3679 RMD160 b163afa5215f0eb52ba2562d22c65ec5e0bd3380 SHA1 a71f25413abf0c359439add74a73545790604ac9 SHA256 631ccad5bc4c2d880b5235bc8e6ace494467bad1734023ded9d8bcd52b9177af
-AUX networkmanager-0.8.2-confchanges.patch 1279 RMD160 1ff5b6d663aa4417beaf9c7630d710a17a1812b5 SHA1 634ad19b189509e75362e5cd7f069ca795b4aeba SHA256 7c9ed8dc35b5b6d0414f96902fbe8117408ad556af655c0afc593ec5a1beac28
-AUX networkmanager-0.8.2-shared-connection.patch 14961 RMD160 4c37ccb1e63c12dac0b60aabf2d107d51f1f2ac9 SHA1 709f4d9104d2423699d934ad9eca5e8cc3233395 SHA256 93ae68009518c4bdf809a43eb84c063042cf5d2bf099da8aeb8f52c97be42b9b
-AUX nm-system-settings.conf 23 RMD160 6d66c702b345bde668a420a15716feea6005fbd1 SHA1 49ba558d20f5ca5a201e027e13b878dd5ac3569c SHA256 44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21
-AUX nm-system-settings.conf-ifnet 70 RMD160 c0d2be147383999b62cead86ab4333169e4ef277 SHA1 679ec8052b610969c148a2d34cd4da7a41484a76 SHA256 34f53d9ac1ad65eda6942dc3059117f60f6321059ca23f4fbfcc2f2edcae151f
-DIST NetworkManager-0.8.2.tar.bz2 1629296 RMD160 d5ef4adfc74db4a77fadcbeb545175b2f49dfd9c SHA1 2c9a9f0317d2ad4fd8a05631211cfd6040070f8e SHA256 58e49dcd83cb641a9dcaad4fd566a08196c862479ad3086c00f28f03768eb4f1
-EBUILD networkmanager-0.8.2-r104.ebuild 4202 RMD160 16fddd8bd4a77905a47850fecb12dd4a2d266931 SHA1 00daba60673f8886fa23efef7ad95193a8a5423d SHA256 78c93c5de6c2b1c1d46b1113f52c87df334a440e34d494d1af9efa6ab96764e2
-EBUILD networkmanager-9999.ebuild 4197 RMD160 4a64e0b4141d174eda2716f2a08f6ce5f0a52ed8 SHA1 fd2a1e026e7625312431048ccca94216c3936b76 SHA256 006eea72c4dfc9e605d353c47ad85b8a6a70cbd0eb784aa363b49397b53e393a
-MISC ChangeLog 18915 RMD160 6b010bfb98563502a1503c06f962ab2c030043f3 SHA1 88a338f79f4c7980b0322642aa055bb2ffb2adb9 SHA256 c4f984efef8828c8d04cc34ec4b42b187f012515bcb4675ae10fa1005f97f00d
-MISC metadata.xml 975 RMD160 7f7f8f54c53fe2098dae8ed0a4cd177900289d3f SHA1 11de32f78915bbc01c6b0665b45233d004d75c25 SHA256 e0ce95394f82f5631ecec62c6595dc4dad9afc52cf5e1bb0f30618edfb79becc
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQEcBAEBAgAGBQJNMpDEAAoJEDCzDeQXsVfp19wH/RCAWWeVpo+wfMK4ypd2Z4wO
-GCH0NmpghXuX9IaFaVxgbWImuTajqoPf0pkAbCuPHfa9OuTE96WR4bypdTvH4n/X
-7IWgn4PXR7Spi3A7I9qn87npkyykCYwtfaaBszvEoCpEnkZLQlC8rmfBmtBrQ73f
-5rdJ+I4TVIx3L3M1Bgd84ODVa5FLnIkgttG80maGZSnCohSyIPJ3dEDSmigqu3hs
-Mspwqy1QW3mLDKPAEZAbTUAQ5sud4W4by+mMA7fgPvcqay780rpYqVB/BUOW+1PN
-kf9MVp41F32iPR3Xml5E3Q2AhCKmOeM8OEcg+010cAlVRd1WzmRMNdXU6IIspUk=
-=7RBR
------END PGP SIGNATURE-----
diff --git a/net-misc/networkmanager/files/NetworkManagerDispatcher b/net-misc/networkmanager/files/NetworkManagerDispatcher
deleted file mode 100644
index 24aa37b..0000000
--- a/net-misc/networkmanager/files/NetworkManagerDispatcher
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/sbin/runscript
-#
-# NetworkManagerDispatcher:   NetworkManagerDispatcher daemon
-#
-# chkconfig: 345 98 02
-# description:  This is a daemon for automatically executing certain
-#               actions, when switching networks
-#
-# processname: NetworkManagerDispatcher
-# pidfile: /var/run/NetworkManagerDispatcher.pid
-
-prefix=/usr
-exec_prefix=/usr
-sbindir=${exec_prefix}/sbin
-
-NETWORKMANAGERDISPATCHER_BIN=${sbindir}/NetworkManagerDispatcher
-
-# Sanity checks.
-[ -x $NETWORKMANAGERDISPATCHER_BIN ] || exit 0
-
-# so we can rearrange this easily
-processname=$NETWORKMANAGERDISPATCHER_BIN
-pidfile=/var/run/NetworkManagerDispatcher.pid
-
-depend() {
-        need NetworkManager
-}
-
-start()
-{
-        if [ -e ${pidfile} ]; then
-                rm -f ${pidfile}
-        fi
-        ebegin "Starting NetworkManagerDispatcher"
-        start-stop-daemon --start --quiet --exec ${processname}
-        eend $?
-        echo $(/bin/pidof NetworkManagerDispatcher) > ${pidfile}
-}
-
-stop()
-{
-        ebegin "Stopping NetworkManagerDispatcher"
-        start-stop-daemon --stop --quiet --exec ${processname} --pidfile ${pidfile}
-        eend $?
-        if [ -e ${pidfile} ]; then
-                rm -f $pidfile
-        fi
-}
diff --git a/net-misc/networkmanager/files/networkmanager-0.8.2-1.patch b/net-misc/networkmanager/files/networkmanager-0.8.2-1.patch
deleted file mode 100644
index 1df4019..0000000
--- a/net-misc/networkmanager/files/networkmanager-0.8.2-1.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From d60a988518cb0851488bc21732271a971877cdcd Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Thu, 18 Nov 2010 22:30:00 +0000
-Subject: dhcpcd: prevent dhcpcd from messing with routing (bgo #634983)
-
-Since NM is already handling that.
----
-diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c
-index 378a97b..4fb703c 100644
---- a/src/dhcp-manager/nm-dhcp-dhcpcd.c
-+++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c
-@@ -128,6 +128,8 @@ real_ip4_start (NMDHCPClient *client,
- 
- 	g_ptr_array_add (argv, (gpointer) "-L");	/* Disable built-in IPv4LL since we use avahi-autoipd */
- 
-+	g_ptr_array_add (argv, (gpointer) "-G");	/* Let NM handle routing */
-+
- 	g_ptr_array_add (argv, (gpointer) "-c");	/* Set script file */
- 	g_ptr_array_add (argv, (gpointer) ACTION_SCRIPT_PATH );
- 
---
-cgit v0.8.3-6-g21f6
-From 83e02840b5ce1cf8c122cc70918ddd57396c91db Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Wed, 24 Nov 2010 04:17:21 +0000
-Subject: core: suppress error message when user settings service is not active
-
-Don't bother trying to initialize the user settings proxy when it
-isn't even active.  Would trigger a warning to syslog if PolicyKit
-permissions changed via changes to /usr/share/polkit-1/actions/.
----
-diff --git a/src/nm-manager.c b/src/nm-manager.c
-index 48f2173..afcc6ad 100644
---- a/src/nm-manager.c
-+++ b/src/nm-manager.c
-@@ -1356,6 +1356,12 @@ user_proxy_init (NMManager *self)
- 	g_return_if_fail (self != NULL);
- 	g_return_if_fail (priv->user_proxy == NULL);
- 
-+	/* Don't try to initialize the user settings proxy if the user
-+	 * settings service doesn't actually exist.
-+	 */
-+	if (!nm_dbus_manager_name_has_owner (priv->dbus_mgr, NM_DBUS_SERVICE_USER_SETTINGS))
-+		return;
-+
- 	bus = nm_dbus_manager_get_connection (priv->dbus_mgr);
- 	priv->user_proxy = dbus_g_proxy_new_for_name_owner (bus,
- 	                                                    NM_DBUS_SERVICE_USER_SETTINGS,
-@@ -3975,8 +3981,7 @@ nm_manager_start (NMManager *self)
- 	 * they will be queried when the user settings service shows up on the
- 	 * bus in nm_manager_name_owner_changed().
- 	 */
--	if (nm_dbus_manager_name_has_owner (priv->dbus_mgr, NM_DBUS_SERVICE_USER_SETTINGS))
--		user_proxy_init (self);
-+	user_proxy_init (self);
- 
- 	nm_udev_manager_query_devices (priv->udev_mgr);
- 	bluez_manager_resync_devices (self);
---
-cgit v0.8.3-6-g21f6
-From 45ae52523158f4e7c0cc3fb5af56859c41512f66 Mon Sep 17 00:00:00 2001
-From: Jiří Klimeš <jklimes@redhat.com>
-Date: Wed, 24 Nov 2010 11:51:08 +0000
-Subject: dns: fix a crash due to uninitialized nis_domain (novell #655685)
-
-Reported and tested by Raymond Wooninck. Thanks!
----
-diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c
-index 7a6fbbc..b0cdcc2 100644
---- a/src/dns-manager/nm-dns-manager.c
-+++ b/src/dns-manager/nm-dns-manager.c
-@@ -583,6 +583,7 @@ update_dns (NMDnsManager *self,
- 	rc.nameservers = g_ptr_array_new ();
- 	rc.domain = NULL;
- 	rc.searches = g_ptr_array_new ();
-+	rc.nis_domain = NULL;
- 	rc.nis_servers = g_ptr_array_new ();
- 
- 	if (priv->ip4_vpn_config)
---
-cgit v0.8.3-6-g21f6
-From 71fcccbacd51e939f168d44301393301e9dcb5fe Mon Sep 17 00:00:00 2001
-From: Jiří Klimeš <jklimes@redhat.com>
-Date: Mon, 13 Dec 2010 19:55:02 +0000
-Subject: libnm-util: fix a memory leaks in nm_setting_to_string()
-
----
-diff --git a/libnm-util/nm-setting.c b/libnm-util/nm-setting.c
-index 06994c7..190199c 100644
---- a/libnm-util/nm-setting.c
-+++ b/libnm-util/nm-setting.c
-@@ -620,6 +620,8 @@ nm_setting_to_string (NMSetting *setting)
- 		is_serializable = prop_spec->flags & NM_SETTING_PARAM_SERIALIZE;
- 		is_default = g_param_value_defaults (prop_spec, &value);
- 
-+		g_value_unset (&value);
-+
- 		if (is_serializable || is_default) {
- 			g_string_append (string, " (");
- 
---
-cgit v0.8.3-6-g21f6
-From 7c2ba8a4a55899e4f4bd5bd243e10ce8a0c0f13a Mon Sep 17 00:00:00 2001
-From: Jiří Klimeš <jklimes@redhat.com>
-Date: Thu, 16 Dec 2010 12:49:28 +0000
-Subject: libnm-util: fix nm_utils_security_valid() checks for Ad-Hoc APs (rh #632123)
-
-Without the fix fake Ad-Hoc APs created by nm-applet's "Create New Wireless
-Network..." don't pass the check and nm-applet can crash.
----
-diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c
-index ce13da3..9c3662f 100644
---- a/libnm-util/nm-utils.c
-+++ b/libnm-util/nm-utils.c
-@@ -1269,14 +1269,24 @@ nm_utils_security_valid (NMUtilsSecurityType type,
- 		if (!(wifi_caps & NM_WIFI_DEVICE_CAP_WPA))
- 			return FALSE;
- 		if (have_ap) {
--			/* Ad-Hoc WPA APs won't necessarily have the PSK flag set */
--			if ((ap_wpa & NM_802_11_AP_SEC_KEY_MGMT_PSK) || adhoc) {
--				if (   (ap_wpa & NM_802_11_AP_SEC_PAIR_TKIP)
-+			/* Ad-Hoc WPA APs won't necessarily have the PSK flag set, and
-+			 * they don't have any pairwise ciphers. */
-+			if (adhoc) {
-+				if (   (ap_wpa & NM_802_11_AP_SEC_GROUP_TKIP)
- 				    && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_TKIP))
- 					return TRUE;
--				if (   (ap_wpa & NM_802_11_AP_SEC_PAIR_CCMP)
-+				if (   (ap_wpa & NM_802_11_AP_SEC_GROUP_CCMP)
- 				    && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_CCMP))
- 					return TRUE;
-+			} else {
-+				if (ap_wpa & NM_802_11_AP_SEC_KEY_MGMT_PSK) {
-+					if (   (ap_wpa & NM_802_11_AP_SEC_PAIR_TKIP)
-+					    && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_TKIP))
-+						return TRUE;
-+					if (   (ap_wpa & NM_802_11_AP_SEC_PAIR_CCMP)
-+					    && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_CCMP))
-+						return TRUE;
-+				}
- 			}
- 			return FALSE;
- 		}
-@@ -1285,14 +1295,22 @@ nm_utils_security_valid (NMUtilsSecurityType type,
- 		if (!(wifi_caps & NM_WIFI_DEVICE_CAP_RSN))
- 			return FALSE;
- 		if (have_ap) {
--			/* Ad-Hoc WPA APs won't necessarily have the PSK flag set */
--			if ((ap_rsn & NM_802_11_AP_SEC_KEY_MGMT_PSK) || adhoc) {
--				if (   (ap_rsn & NM_802_11_AP_SEC_PAIR_TKIP)
--				    && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_TKIP))
-+			/* Ad-Hoc WPA APs won't necessarily have the PSK flag set, and
-+			 * they don't have any pairwise ciphers, nor any RSA flags yet. */
-+			if (adhoc) {
-+				if (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_TKIP)
- 					return TRUE;
--				if (   (ap_rsn & NM_802_11_AP_SEC_PAIR_CCMP)
--				    && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_CCMP))
-+				if (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_CCMP)
- 					return TRUE;
-+			} else {
-+				if (ap_rsn & NM_802_11_AP_SEC_KEY_MGMT_PSK) {
-+					if (   (ap_rsn & NM_802_11_AP_SEC_PAIR_TKIP)
-+					    && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_TKIP))
-+						return TRUE;
-+					if (   (ap_rsn & NM_802_11_AP_SEC_PAIR_CCMP)
-+					    && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_CCMP))
-+						return TRUE;
-+				}
- 			}
- 			return FALSE;
- 		}
---
-cgit v0.8.3-6-g21f6
diff --git a/net-misc/networkmanager/files/networkmanager-0.8.2-accept-gw.patch b/net-misc/networkmanager/files/networkmanager-0.8.2-accept-gw.patch
deleted file mode 100644
index b2911db..0000000
--- a/net-misc/networkmanager/files/networkmanager-0.8.2-accept-gw.patch
+++ /dev/null
@@ -1,135 +0,0 @@
---- NetworkManager_Patched/system-settings/plugins/ifnet/net_utils.c	2010-11-04 04:10:52.000000000 +0800
-+++ NetworkManager-0.8.2/system-settings/plugins/ifnet/net_utils.c	2010-11-23 15:11:08.024000011 +0800
-@@ -19,7 +19,6 @@
-  * Copyright (C) 1999-2010 Gentoo Foundation, Inc.
-  */
- 
--#include <config.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-@@ -194,6 +193,32 @@
- 	return error_quark;
- }
- 
-+static char *
-+find_default_gateway_str (char *str)
-+{
-+	char *tmp;
-+
-+	if ((tmp = strstr (str, "default via ")) != NULL) {
-+		return tmp + strlen ("default via ");
-+	} else if ((tmp = strstr (str, "default gw ")) != NULL) {
-+		return tmp + strlen ("default gw ");
-+	}
-+	return NULL;
-+}
-+
-+static char *
-+find_gateway_str (char *str)
-+{
-+	char *tmp;
-+
-+	if ((tmp = strstr (str, "via ")) != NULL) {
-+		return tmp + strlen ("via ");
-+	} else if ((tmp = strstr (str, "gw ")) != NULL) {
-+		return tmp + strlen ("gw ");
-+	}
-+	return NULL;
-+}
-+
- gboolean
- reload_parsers ()
- {
-@@ -362,11 +387,10 @@
- 	if (!tmp)
- 		return FALSE;
- 	routes = g_strdup (tmp);
--	tmp = strstr (routes, "default via ");
-+	tmp = find_default_gateway_str (routes);
- 	if (!tmp) {
- 		goto error;
- 	}
--	tmp += strlen ("default via ");
- 	g_strstrip (tmp);
- 	if ((end = strstr (tmp, "\"")) != NULL)
- 		*end = '\0';
-@@ -483,8 +507,13 @@
- 
- 	if (!gateway)
- 		return 0;
--	tmp = strstr (gateway, "via ");
--	tmp = g_strdup (tmp + strlen ("via "));
-+	tmp = find_gateway_str(gateway);
-+	if (!tmp) {
-+		PLUGIN_WARN (IFNET_PLUGIN_NAME,
-+			     "Couldn't obtain gateway in \"%s\"", gateway);
-+		return 0;
-+	}
-+	tmp = g_strdup (tmp);
- 	strip_string (tmp, ' ');
- 	strip_string (tmp, '"');
- 	if ((split = strstr (tmp, "\"")) != NULL)
-@@ -509,8 +538,13 @@
- 
- 	if (!next_hop)
- 		return 0;
--	tmp = strstr (next_hop, "via ");
--	tmp = g_strdup (tmp + strlen ("via "));
-+	tmp = find_gateway_str(next_hop);
-+	if (!tmp) {
-+		PLUGIN_WARN (IFNET_PLUGIN_NAME,
-+			     "Couldn't obtain next_hop in \"%s\"", next_hop);
-+		return 0;
-+	}
-+	tmp = g_strdup (tmp);
- 	strip_string (tmp, ' ');
- 	strip_string (tmp, '"');
- 	g_strstrip (tmp);
-@@ -671,8 +705,8 @@
- 	length = g_strv_length (ipset);
- 	for (i = 0; i < length; i++) {
- 		ip = ipset[i];
--		if (strstr (ip, "default via ") || strstr (ip, "::")
--		    || !strstr (ip, "via"))
-+		if (find_default_gateway_str (ip) || strstr (ip, "::")
-+		    || !find_gateway_str (ip))
- 			continue;
- 		ip = strip_string (ip, '"');
- 		iblock = create_ip4_block (ip);
-@@ -712,9 +746,7 @@
- 		ip = strip_string (ip, '"');
- 		if (ip[0] == '\0')
- 			continue;
--		printf ("ip:%s\n", ip);
--		if ((tmp_addr = strstr (ip, "default via ")) != NULL) {
--			tmp_addr += strlen ("default via ");
-+		if ((tmp_addr = find_default_gateway_str (ip)) != NULL) {
- 			if (!is_ip6_address (tmp_addr))
- 				continue;
- 			else {
-@@ -855,7 +887,7 @@
- void
- get_dhcp_hostname_and_client_id (char **hostname, char **client_id)
- {
--	gchar *dhcp_client = ifnet_get_global_setting ("main", "dhcp");
-+	gchar *dhcp_client = NULL;
- 	const gchar *dhcpcd_conf = "/etc/dhcpcd.conf";
- 	const gchar *dhclient_conf = "/etc/dhcp/dhclient.conf";
- 	gchar *line = NULL, *tmp = NULL, *contents = NULL;
-@@ -864,6 +896,7 @@
- 
- 	*hostname = NULL;
- 	*client_id = NULL;
-+	dhcp_client = ifnet_get_global_setting ("main", "dhcp");
- 	if (dhcp_client) {
- 		if (!strcmp (dhcp_client, "dhclient"))
- 			g_file_get_contents (dhclient_conf, &contents, NULL,
-@@ -871,6 +904,7 @@
- 		else if (!strcmp (dhcp_client, "dhcpcd"))
- 			g_file_get_contents (dhcpcd_conf, &contents, NULL,
- 					     NULL);
-+		g_free (dhcp_client);
- 	} else {
- 		if (g_file_test (dhclient_conf, G_FILE_TEST_IS_REGULAR))
- 			g_file_get_contents (dhclient_conf, &contents, NULL,
diff --git a/net-misc/networkmanager/files/networkmanager-0.8.2-confchanges.patch b/net-misc/networkmanager/files/networkmanager-0.8.2-confchanges.patch
deleted file mode 100644
index a5acc38..0000000
--- a/net-misc/networkmanager/files/networkmanager-0.8.2-confchanges.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/NetworkManager.conf~	2010-11-03 13:04:05.000000000 +0000
-+++ src/NetworkManager.conf	2010-12-17 12:12:48.391177001 +0000
-@@ -57,6 +57,9 @@
-                 <allow send_destination="org.freedesktop.NetworkManager"
-                        send_interface="org.freedesktop.NetworkManager.VPN.Connection"/>
- 
-+                <allow send_destination="org.freedesktop.NetworkManager"
-+                       send_interface="org.freedesktop.NetworkManager.VPN.Plugin"/>
-+
-                 <deny send_destination="org.freedesktop.NetworkManager"
-                        send_interface="org.freedesktop.NetworkManager"
-                        send_member="SetLogging"/>
-@@ -73,6 +76,12 @@
-                        send_interface="org.freedesktop.NetworkManager"
-                        send_member="wake"/>
-         </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 own="org.freedesktop.NetworkManagerSystemSettings"/>
diff --git a/net-misc/networkmanager/files/networkmanager-0.8.2-shared-connection.patch b/net-misc/networkmanager/files/networkmanager-0.8.2-shared-connection.patch
deleted file mode 100644
index 8ffdf17..0000000
--- a/net-misc/networkmanager/files/networkmanager-0.8.2-shared-connection.patch
+++ /dev/null
@@ -1,454 +0,0 @@
-From 5a67c7a5ad341fa84091287eb6452458c7ee24b0 Mon Sep 17 00:00:00 2001
-From: Mu Qiao <qiaomuf@gentoo.org>
-Date: Wed, 5 Jan 2011 13:30:08 +0800
-Subject: [PATCH] Support shared and link-local method for ipv4
- Signed-off-by: Mu Qiao <qiaomuf@gentoo.org>
- fix flush_to_file, return TRUE when nothing changed
- ssid do not lose quotes anymore
- do not delete old connection when ssid is not changed
-
-Signed-off-by: Mu Qiao <qiaomuf@gentoo.org>
----
- system-settings/plugins/ifnet/connection_parser.c  |   92 ++++++++++++++------
- system-settings/plugins/ifnet/net_parser.c         |   55 +++++++-----
- system-settings/plugins/ifnet/net_parser.h         |    4 +-
- system-settings/plugins/ifnet/net_utils.c          |    4 +
- .../plugins/ifnet/nm-ifnet-connection.c            |    8 +-
- system-settings/plugins/ifnet/wpa_parser.c         |   21 +++--
- 6 files changed, 123 insertions(+), 61 deletions(-)
-
-diff --git a/system-settings/plugins/ifnet/connection_parser.c b/system-settings/plugins/ifnet/connection_parser.c
-index f9fae51..539f33c 100644
---- a/system-settings/plugins/ifnet/connection_parser.c
-+++ b/system-settings/plugins/ifnet/connection_parser.c
-@@ -557,7 +557,7 @@ make_ip4_setting (NMConnection * connection, gchar * conn_name, GError ** error)
- 
- 	NMSettingIP4Config *ip4_setting =
- 	    NM_SETTING_IP4_CONFIG (nm_setting_ip4_config_new ());
--	gchar *value;
-+	gchar *value, *method = NULL;
- 	gboolean is_static_block = is_static_ip4 (conn_name);
- 	ip_block *iblock = NULL;
- 
-@@ -569,12 +569,42 @@ make_ip4_setting (NMConnection * connection, gchar * conn_name, GError ** error)
- 		      && strstr (value, "nogateway") ? TRUE : FALSE, NULL);
- 
- 	if (!is_static_block) {
--		g_object_set (ip4_setting,
--			      NM_SETTING_IP4_CONFIG_METHOD,
--			      NM_SETTING_IP4_CONFIG_METHOD_AUTO,
--			      NM_SETTING_IP4_CONFIG_NEVER_DEFAULT, FALSE, NULL);
--		PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Using DHCP for %s",
--			      conn_name);
-+		method = ifnet_get_data (conn_name, "config");
-+		if (!method){
-+			g_set_error (error, ifnet_plugin_error_quark (), 0,
-+						 "Unknown config for %s", conn_name);
-+			g_object_unref (ip4_setting);
-+			return;
-+		}
-+		if (!strcmp (method, "dhcp"))
-+			g_object_set (ip4_setting,
-+						  NM_SETTING_IP4_CONFIG_METHOD,
-+						  NM_SETTING_IP4_CONFIG_METHOD_AUTO,
-+						  NM_SETTING_IP4_CONFIG_NEVER_DEFAULT, FALSE, NULL);
-+		else if (!strcmp (method, "autoip")){
-+			g_object_set (ip4_setting,
-+						  NM_SETTING_IP4_CONFIG_METHOD,
-+						  NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL,
-+						  NM_SETTING_IP4_CONFIG_NEVER_DEFAULT, FALSE, NULL);
-+			nm_connection_add_setting (connection, NM_SETTING (ip4_setting));
-+			return;
-+		}
-+		else if (!strcmp (method, "shared")){
-+			g_object_set (ip4_setting,
-+						  NM_SETTING_IP4_CONFIG_METHOD,
-+						  NM_SETTING_IP4_CONFIG_METHOD_SHARED,
-+						  NM_SETTING_IP4_CONFIG_NEVER_DEFAULT, FALSE, NULL);
-+			nm_connection_add_setting (connection, NM_SETTING (ip4_setting));
-+			return;
-+		}
-+		else {
-+			g_set_error (error, ifnet_plugin_error_quark (), 0,
-+						 "Unknown config for %s", conn_name);
-+			g_object_unref (ip4_setting);
-+			return;
-+		}
-+		PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Using %s method for %s",
-+					  method, conn_name);
- 	} else {
- 		iblock = convert_ip4_config_block (conn_name);
- 		if (!iblock) {
-@@ -625,7 +655,7 @@ make_ip4_setting (NMConnection * connection, gchar * conn_name, GError ** error)
- 	}
- 
- 	/* add dhcp hostname and client id */
--	if (!is_static_block) {
-+	if (method && !strcmp (method, "dhcp")) {
- 		gchar *dhcp_hostname, *client_id;
- 
- 		get_dhcp_hostname_and_client_id (&dhcp_hostname, &client_id);
-@@ -712,7 +742,6 @@ make_ip4_setting (NMConnection * connection, gchar * conn_name, GError ** error)
- 		iblock = iblock->next;
- 		destroy_ip_block (current_iblock);
- 	}
--
- 	/* Finally add setting to connection */
- 	nm_connection_add_setting (connection, NM_SETTING (ip4_setting));
- }
-@@ -1243,10 +1272,10 @@ parse_wpa_psk (gchar * psk, GError ** error)
- 	 * the passphrase contains spaces.
- 	 */
- 
--	p = psk;
--	if (p[0] == '"' && psk[strlen (psk) - 1] == '"')
-+	p = g_strdup (psk);
-+	if (p[0] == '"' && p[strlen (p) - 1] == '"')
- 		quoted = TRUE;
--	if (!quoted && (strlen (psk) == 64)) {
-+	if (!quoted && (strlen (p) == 64)) {
- 		/* Verify the hex PSK; 64 digits */
- 		if (!is_hex (p)) {
- 			g_set_error (error, ifnet_plugin_error_quark (),
-@@ -1254,7 +1283,7 @@ parse_wpa_psk (gchar * psk, GError ** error)
- 				     "Invalid WPA_PSK (contains non-hexadecimal characters)");
- 			goto out;
- 		}
--		hashed = g_strdup (psk);
-+		hashed = g_strdup (p);
- 	} else {
- 		strip_string (p, '"');
- 
-@@ -1276,6 +1305,7 @@ parse_wpa_psk (gchar * psk, GError ** error)
- 	}
- 
-       out:
-+	g_free (p);
- 	return hashed;
- }
- 
-@@ -2085,7 +2115,8 @@ write_wireless_security_setting (NMConnection * connection,
- 	} else if (!strcmp (key_mgmt, "wpa-eap")) {
- 		wpa_set_data (conn_name, "key_mgmt", "WPA-EAP");
- 		wpa = TRUE;
--	}
-+	} else
-+		PLUGIN_WARN (IFNET_PLUGIN_NAME, "Unknown key_mgmt: %s", key_mgmt);
- 
- 	if (auth_alg) {
- 		if (!strcmp (auth_alg, "shared"))
-@@ -2180,8 +2211,11 @@ write_wireless_security_setting (NMConnection * connection,
- 			g_string_append (quoted, psk);
- 			g_string_append_c (quoted, '"');
- 		}
--		wpa_set_data (conn_name, "psk",
--			      quoted ? quoted->str : (gchar *) psk);
-+		if (psk)
-+			wpa_set_data (conn_name, "psk",
-+					  quoted ? quoted->str : (gchar *) psk);
-+		else
-+			PLUGIN_WARN (IFNET_PLUGIN_NAME, "Use WPA, but no psk received from NM");
- 		if (quoted)
- 			g_string_free (quoted, TRUE);
- 	} else
-@@ -2190,15 +2224,19 @@ write_wireless_security_setting (NMConnection * connection,
- 	return TRUE;
- }
- 
--/* remove old ssid and add new one*/
-+/* Only remove old config when ssid is changed. 
-+ * See bug #350476.
-+ * */
- static void
- update_wireless_ssid (NMConnection * connection, gchar * conn_name,
- 		      gchar * ssid, gboolean hex)
- {
--	ifnet_delete_network (conn_name);
--	ifnet_add_connection (ssid, "wireless");
-+	if (strcmp (conn_name, ssid)){
-+		ifnet_delete_network (conn_name);
-+		wpa_delete_security (conn_name);
-+	}
- 
--	wpa_delete_security (conn_name);
-+	ifnet_add_network (ssid, "wireless");
- 	wpa_add_security (ssid);
- }
- 
-@@ -2443,8 +2481,12 @@ write_ip4_setting (NMConnection * connection, gchar * conn_name,
- 		}
- 		ifnet_set_data (conn_name, "config", ips->str);
- 		g_string_free (ips, TRUE);
--	} else
--		ifnet_set_data (conn_name, "config", "dhcp");
-+	} else if (!strcmp (value, NM_SETTING_IP4_CONFIG_METHOD_SHARED))
-+		ifnet_set_data (conn_name, "config", "shared");
-+	else if (!strcmp (value, NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL))
-+		ifnet_set_data (conn_name, "config", "autoip");
-+	else
-+        ifnet_set_data (conn_name, "config", "dhcp");
- 
- 	/* DNS Servers */
- 	ifnet_set_data (conn_name, "dns_servers", NULL);
-@@ -2858,7 +2900,7 @@ get_wired_name ()
- 	for (; i < 256; i++) {
- 		gchar *conn_name = g_strdup_printf ("eth%d", i);
- 
--		if (!ifnet_has_connection (conn_name)) {
-+		if (!ifnet_has_network (conn_name)) {
- 			return conn_name;
- 		} else
- 			g_free (conn_name);
-@@ -2875,7 +2917,7 @@ get_ppp_name ()
- 	for (; i < 256; i++) {
- 		gchar *conn_name = g_strdup_printf ("ppp%d", i);
- 
--		if (!ifnet_has_connection (conn_name)) {
-+		if (!ifnet_has_network (conn_name)) {
- 			return conn_name;
- 		} else
- 			g_free (conn_name);
-@@ -2982,7 +3024,7 @@ ifnet_add_new_connection (NMConnection * connection,
- 		goto out;
- 	}
- 
--	if (ifnet_add_connection (new_name, new_type))
-+	if (ifnet_add_network (new_name, new_type))
- 		success =
- 		    ifnet_update_parsers_by_connection (connection, new_name,
- 							NULL, config_file,
-diff --git a/system-settings/plugins/ifnet/net_parser.c b/system-settings/plugins/ifnet/net_parser.c
-index b4a381d..de2db8a 100644
---- a/system-settings/plugins/ifnet/net_parser.c
-+++ b/system-settings/plugins/ifnet/net_parser.c
-@@ -37,6 +37,9 @@ static GList *functions_list;
- /* Used to decide whether to write changes to file*/
- static gboolean net_parser_data_changed = FALSE;
- 
-+static void
-+destroy_connection_config (GHashTable * conn);
-+
- static GHashTable *
- add_new_connection_config (const gchar * type, const gchar * name)
- {
-@@ -58,8 +61,10 @@ add_new_connection_config (const gchar * type, const gchar * name)
- }
- 
- gboolean
--ifnet_add_connection (gchar * name, gchar * type)
-+ifnet_add_network (gchar * name, gchar * type)
- {
-+	if (ifnet_has_network (name))
-+		return TRUE;
- 	if (add_new_connection_config (type, name)) {
- 		PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Adding network for %s", name);
- 		net_parser_data_changed = TRUE;
-@@ -69,11 +74,27 @@ ifnet_add_connection (gchar * name, gchar * type)
- }
- 
- gboolean
--ifnet_has_connection (gchar * conn_name)
-+ifnet_has_network (gchar * conn_name)
- {
- 	return g_hash_table_lookup (conn_table, conn_name) != NULL;
- }
- 
-+gboolean
-+ifnet_delete_network (gchar * conn_name)
-+{
-+	GHashTable *network = NULL;
-+
-+	g_return_val_if_fail (conn_table != NULL && conn_name != NULL, FALSE);
-+	PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Deleting network for %s", conn_name);
-+	network = g_hash_table_lookup (conn_table, conn_name);
-+	if (!network)
-+		return FALSE;
-+	g_hash_table_remove (conn_table, conn_name);
-+	destroy_connection_config (network);
-+	net_parser_data_changed = TRUE;
-+	return TRUE;
-+}
-+
- static GHashTable *
- get_connection_config (gchar * name)
- {
-@@ -377,21 +398,27 @@ ifnet_set_data (gchar * conn_name, gchar * key, gchar * value)
- {
- 	gpointer orin_key = NULL, orin_value = NULL;
- 	GHashTable *conn = g_hash_table_lookup (conn_table, conn_name);
-+	gchar *new_value = NULL;
- 
- 	if (!conn) {
- 		PLUGIN_WARN (IFNET_PLUGIN_NAME,
- 			     "%s does not exsit!", conn_name);
- 		return;
- 	}
-+	if (value){
-+		new_value = g_strdup (value);
-+		strip_string (new_value, '"');
-+	}
- 	/* Remove existing key value pair */
- 	if (g_hash_table_lookup_extended (conn, key, &orin_key, &orin_value)) {
-+		if (new_value && !strcmp (orin_value, new_value))
-+			return;
- 		g_hash_table_remove (conn, orin_key);
- 		g_free (orin_key);
- 		g_free (orin_value);
- 	}
--	if (value)
--		g_hash_table_insert (conn, g_strdup (key),
--				     strip_string (g_strdup (value), '"'));
-+	if (new_value)
-+		g_hash_table_insert (conn, g_strdup (key), new_value);
- 	net_parser_data_changed = TRUE;
- }
- 
-@@ -467,7 +494,7 @@ ifnet_flush_to_file (gchar * config_file)
- 	gboolean result = FALSE;
- 
- 	if (!net_parser_data_changed)
--		return FALSE;
-+		return TRUE;
- 	if (!conn_table || !global_settings_table)
- 		return FALSE;
- 
-@@ -583,22 +610,6 @@ ifnet_flush_to_file (gchar * config_file)
- 	return result;
- }
- 
--gboolean
--ifnet_delete_network (gchar * conn_name)
--{
--	GHashTable *network = NULL;
--
--	g_return_val_if_fail (conn_table != NULL && conn_name != NULL, FALSE);
--	PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Deleting network for %s", conn_name);
--	network = g_hash_table_lookup (conn_table, conn_name);
--	if (!network)
--		return FALSE;
--	g_hash_table_remove (conn_table, conn_name);
--	destroy_connection_config (network);
--	net_parser_data_changed = TRUE;
--	return TRUE;
--}
--
- void
- ifnet_destroy (void)
- {
-diff --git a/system-settings/plugins/ifnet/net_parser.h b/system-settings/plugins/ifnet/net_parser.h
-index 73a44c8..b71a01f 100644
---- a/system-settings/plugins/ifnet/net_parser.h
-+++ b/system-settings/plugins/ifnet/net_parser.h
-@@ -36,11 +36,11 @@ GList *ifnet_get_connection_names (void);
- gchar *ifnet_get_data (gchar * conn_name, const gchar * key);
- gchar *ifnet_get_global_data (const gchar * key);
- gchar *ifnet_get_global_setting (gchar * group, gchar * key);
--gboolean ifnet_has_connection (gchar * conn_name);
-+gboolean ifnet_has_network (gchar * conn_name);
- 
- /* Writer functions */
- gboolean ifnet_flush_to_file (gchar * config_file);
- void ifnet_set_data (gchar * conn_name, gchar * key, gchar * value);
--gboolean ifnet_add_connection (gchar * name, gchar * type);
-+gboolean ifnet_add_network (gchar * name, gchar * type);
- gboolean ifnet_delete_network (gchar * conn_name);
- #endif
-diff --git a/system-settings/plugins/ifnet/net_utils.c b/system-settings/plugins/ifnet/net_utils.c
-index 2dc253c..7e52f10 100644
---- a/system-settings/plugins/ifnet/net_utils.c
-+++ b/system-settings/plugins/ifnet/net_utils.c
-@@ -278,6 +278,10 @@ is_static_ip4 (gchar * conn_name)
- 
- 	if (!data)
- 		return FALSE;
-+	if (!strcmp (data, "shared"))
-+		return FALSE;
-+	if (!strcmp (data, "autoip"))
-+		return FALSE;
- 	dhcp6 = strstr (data, "dhcp6");
- 	if (dhcp6) {
- 		gchar *dhcp4;
-diff --git a/system-settings/plugins/ifnet/nm-ifnet-connection.c b/system-settings/plugins/ifnet/nm-ifnet-connection.c
-index e47495c..ebe2581 100644
---- a/system-settings/plugins/ifnet/nm-ifnet-connection.c
-+++ b/system-settings/plugins/ifnet/nm-ifnet-connection.c
-@@ -71,12 +71,14 @@ nm_ifnet_connection_new (gchar * conn_name)
- {
- 	NMConnection *tmp;
- 	GObject *object;
--	GError **error = NULL;
-+	GError *error = NULL;
- 
- 	g_return_val_if_fail (conn_name != NULL, NULL);
--	tmp = ifnet_update_connection_from_config_block (conn_name, error);
--	if (!tmp)
-+	tmp = ifnet_update_connection_from_config_block (conn_name, &error);
-+	if (!tmp){
-+		g_error_free (error);
- 		return NULL;
-+	}
- 	object = (GObject *) g_object_new (NM_TYPE_IFNET_CONNECTION,
- 					   NM_IFNET_CONNECTION_CONN_NAME,
- 					   conn_name, NULL);
-diff --git a/system-settings/plugins/ifnet/wpa_parser.c b/system-settings/plugins/ifnet/wpa_parser.c
-index 5e94108..42c52c3 100644
---- a/system-settings/plugins/ifnet/wpa_parser.c
-+++ b/system-settings/plugins/ifnet/wpa_parser.c
-@@ -366,7 +366,7 @@ wpa_flush_to_file (gchar * config_file)
- 	gboolean result = FALSE;
- 
- 	if (!wpa_parser_data_changed)
--		return FALSE;
-+		return TRUE;
- 	if (!wsec_table || !wsec_global_table)
- 		return FALSE;
- 
-@@ -450,26 +450,29 @@ wpa_set_data (gchar * ssid, gchar * key, gchar * value)
- {
- 	gpointer orig_key = NULL, orig_value = NULL;
- 	GHashTable *security = g_hash_table_lookup (wsec_table, ssid);
-+	gchar *new_value = NULL;
- 
- 	g_return_if_fail (security != NULL);
- 
-+	if (value){
-+		new_value = g_strdup(value);
-+		if (strcmp (key, "ssid") != 0 && strcmp (key, "psk") != 0
-+			&& !g_str_has_prefix (key, "wep_key"))
-+			strip_string (new_value, '"');
-+	}
- 	/* Remove old key value pairs */
- 	if (g_hash_table_lookup_extended
- 	    (security, key, &orig_key, &orig_value)) {
-+		if (new_value && !strcmp(orig_value, new_value))
-+			return;
- 		g_hash_table_remove (security, orig_key);
- 		g_free (orig_key);
- 		g_free (orig_value);
- 	}
- 
- 	/* Add new key value */
--	if (value) {
--		gchar *new_value = g_strdup (value);
--
--		if (strcmp (key, "ssid") != 0 && strcmp (key, "psk") != 0
--		    && !g_str_has_prefix (key, "wep_key"))
--			strip_string (new_value, '"');
-+	if (new_value)
- 		g_hash_table_insert (security, g_strdup (key), new_value);
--	}
- 	wpa_parser_data_changed = TRUE;
- }
- 
-@@ -483,7 +486,7 @@ gboolean
- wpa_add_security (gchar * ssid)
- {
- 	if (wpa_has_security (ssid))
--		return FALSE;
-+		return TRUE;
- 	else {
- 		GHashTable *security =
- 		    g_hash_table_new (g_str_hash, g_str_equal);
--- 
-1.7.3.4
-
diff --git a/net-misc/networkmanager/files/nm-system-settings.conf b/net-misc/networkmanager/files/nm-system-settings.conf
deleted file mode 100644
index c37b596..0000000
--- a/net-misc/networkmanager/files/nm-system-settings.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[main]
-plugins=keyfile
diff --git a/net-misc/networkmanager/files/nm-system-settings.conf-ifnet b/net-misc/networkmanager/files/nm-system-settings.conf-ifnet
deleted file mode 100644
index 4d14ee7..0000000
--- a/net-misc/networkmanager/files/nm-system-settings.conf-ifnet
+++ /dev/null
@@ -1,6 +0,0 @@
-[main]
-plugins=ifnet,keyfile
-
-[ifnet]
-managed=true
-auto_refresh=false
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml
deleted file mode 100644
index 1e6b51f..0000000
--- a/net-misc/networkmanager/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>no-herd</herd>
-	<maintainer>
-		<email>dagger@gentoo.org</email>
-		<name>Robert Piasek</name>
-	</maintainer>
-	<maintainer>
-		<email>nirbheek@gentoo.org</email>
-		<name>Nirbheek Chauhan</name>
-	</maintainer>
-        <maintainer>
-                <email>steev@gentoo.org</email>
-                <name>Stephen Klimaszewski</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.8.2-r104.ebuild b/net-misc/networkmanager/networkmanager-0.8.2-r104.ebuild
deleted file mode 100644
index 8094376..0000000
--- a/net-misc/networkmanager/networkmanager-0.8.2-r104.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit gnome.org linux-info
-
-# NetworkManager likes itself with capital letters
-MY_PN=${PN/networkmanager/NetworkManager}
-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="${SRC_URI//${PN}/${MY_PN}}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-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-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.5.10[dbus]
-	bluetooth? ( net-wireless/bluez )
-	|| ( 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 ) )
-	!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-2.4.5
-	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_prepare() {
-	# dbus policy patch
-	epatch "${FILESDIR}/${P}-confchanges.patch"
-	# accept "gw" in /etc/conf.d/net (bug #339215)
-	epatch "${FILESDIR}/${P}-accept-gw.patch"
-	# wrt bug #350476
-	epatch "${FILESDIR}/${P}-shared-connection.patch"
-	# Backports #1
-	epatch "${FILESDIR}/${P}-1.patch"
-}
-
-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_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} --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-ifnet" 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 ""
-}
diff --git a/net-misc/networkmanager/networkmanager-9999.ebuild b/net-misc/networkmanager/networkmanager-9999.ebuild
deleted file mode 100644
index 1ae9bb7..0000000
--- a/net-misc/networkmanager/networkmanager-9999.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.2.ebuild,v 1.1 2010/11/10 12:57:16 dagger Exp $
-
-EAPI="2"
-
-inherit git linux-info
-
-# NetworkManager likes itself with capital letters
-MY_PN=${PN/networkmanager/NetworkManager}
-MY_P=${MY_PN}-${PV}
-EGIT_REPO_URI="git://anongit.freedesktop.org/${MY_PN}/${MY_PN}.git"
-EGIT_PROJECT="${MY_PN}"
-EGIT_BOOTSTRAP="autogen.sh"
-
-DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-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-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.5.10[dbus]
-	bluetooth? ( net-wireless/bluez )
-	|| ( 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 ) )
-	!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-2.4.5
-	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_prepare() {
-	git_src_prepare
-	# patch latest ifnet
-	cp -r "/home/gentoo/repository/NetworkManager/system-settings/" "${S}"
-}
-
-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_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} --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-ifnet" 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 ""
-}
diff --git a/www-plugins/aliedit/Manifest b/www-plugins/aliedit/Manifest
index 673952b..ba72e4f 100644
--- a/www-plugins/aliedit/Manifest
+++ b/www-plugins/aliedit/Manifest
@@ -1,4 +1,4 @@
 DIST aliedit.tar.gz 219668 RMD160 67b87b84215b4804d620154f402a5c78061af1cc SHA1 39dad4f741151c8dbb79219f7871ce0b8ba72b7d SHA256 1151399faffe97e676ea9a922199902e287f2feaf4142e158cff0ba874410b78
-EBUILD aliedit-1.0.3.20.ebuild 969 RMD160 6508abd34d5e446482d0d49323054387943e46de SHA1 7b6a86d0d06c5130ca02f64813cac1461a3b9e26 SHA256 6a405df2a15e9bb439f7c32d87beb5aeea8794284df41e694dbf79f3b4a08e0f
+EBUILD aliedit-1.0.3.20.ebuild 933 RMD160 a8b9cba36bb1e97c0bf4f5f3b95f34c17f7f334a SHA1 fffbd08d8ff40caae349c50396c5bf8305d41e32 SHA256 fa567334ef7a445206985700fb430b4953f900bec1af43f0b4b06b5f6ec27788
 MISC ChangeLog 289 RMD160 68e67fd7084585fdea1871c5aad07665427f39ff SHA1 c60984991abbc28715b5ded25688900ecaf8126e SHA256 203a821365f243480da5acf07c454bed10dc4d401c8fe33e9e7cdb64f6c8fae0
 MISC metadata.xml 216 RMD160 e99c47ba555ab9c5840db973af6b2bdd21127091 SHA1 ea3e97b8a730687767cf13495aeaa94ac17352c1 SHA256 778c8364ef437a2407d3bcda74a4d84b1a29902ac8ef3dd9de78405d7f54f5fb
diff --git a/www-plugins/aliedit/aliedit-1.0.3.20.ebuild b/www-plugins/aliedit/aliedit-1.0.3.20.ebuild
index 3012155..6ec616b 100644
--- a/www-plugins/aliedit/aliedit-1.0.3.20.ebuild
+++ b/www-plugins/aliedit/aliedit-1.0.3.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 EAPI=2
@@ -20,7 +20,6 @@ RDEPEND="amd64? ( media-libs/libpng:1.2 )
 
 src_compile() {
 	ARCHIVE=`awk '/^__ARCHIVE_BELOW__/ {print NR + 1; exit 0; }' ./aliedit.sh`
-	$? || die "Can't get archive file"
 	tail -n+$ARCHIVE aliedit.sh | tar xzm -C ./
 	assert
 }