punt old wrt #340329

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64

30 files changed, 0 insertions, 1866 deletions

diff --git a/net-misc/networkmanager-openvpn/Manifest b/net-misc/networkmanager-openvpn/Manifest
index a2faf51683a9..41287b3b43b0 100644
--- a/net-misc/networkmanager-openvpn/Manifest
+++ b/net-misc/networkmanager-openvpn/Manifest
@@ -1,14 +1,6 @@
-AUX networkmanager-openvpn-0.3.2_p20070621-service-name.patch 612 RMD160 43736ae448fceebf03511b5c9c94c7ea898d8538 SHA1 b91e195d70383036fb79c59ff99f4fe7fbd2861a SHA256 dd615118e9a2fea251a759a6e49cbaf8da611598e18fd9ab3144f374474252b3
-AUX networkmanager-openvpn-0.7.1-glibc2.10.fix.patch 3585 RMD160 510a11d6642f95c2aae2f96deaea60a0325863ad SHA1 3a35211f309c8ece2565dc106d73041e47e98395 SHA256 5bee6702d64b4d881b2eac720a82bde799b41d2e034840fa5d77943df5b57e4a
-DIST NetworkManager-openvpn-0.3.2_p20070621.tar.gz 467416 RMD160 8077b3b629e1c003d5ea78ad7c3aa17d4d6a1f15 SHA1 0c9d1ee1db9608ff2fcfc3ae2e1ce3847deb7789 SHA256 e6552cd2180698e304f4a3e0f5db0d945f896931433febac3d88e6e8be2dd22c
-DIST NetworkManager-openvpn-0.7.1.tar.bz2 381840 RMD160 fc0e8d82d9cc20b4c326685f3b1c817c814b99a4 SHA1 73c4e37b0d130b6c08ff814bde2fa63f7cc63c0a SHA256 7c6a7b9b8c6ccf3e2fbf2431b9fb2035f99e1d78065f3344f667e2f108f38d5b
-DIST NetworkManager-openvpn-0.7.2.tar.bz2 398612 RMD160 3aaca391876860c09dee5c0c23d15f025a980502 SHA1 95fd8e3625bbd69293db721539a66c10140cecdb SHA256 cce2deb114f55559f6c2f2fd5ddb3b12a4812549a5354ea92c65c42d8e67a47f
 DIST NetworkManager-openvpn-0.8.1.tar.bz2 406698 RMD160 f2ef27fd724d039ca0ee6db69aa41c08192da59f SHA1 5369a5d2c5effd29991aab182ea1c792e4623cdc SHA256 7deac7c07da82292722f74135462e36a964ace7faf43e9a6d367dcefea721ecc
 DIST NetworkManager-openvpn-0.8.2.tar.bz2 404472 RMD160 da62be9dbbe5781920d2e0a2e990e783d6ea45e5 SHA1 3618555e141b9b770f8e7eeda7d6ef8315244645 SHA256 21d540b7e7cd88cff3173bb3574a88d4dd76da564fccc58dc436a68476d6d6fe
 DIST NetworkManager-openvpn-0.8.tar.bz2 400780 RMD160 801e63f12d2128438313c8b2f945eeae571b247e SHA1 f7bab5b53e332186b3e898200c07a8107381f982 SHA256 8fd6f25093ade66a98ce1327f24ef953351aabf02870c5dcf12500a6b7f08d43
-EBUILD networkmanager-openvpn-0.3.2_p20070621.ebuild 1643 RMD160 9e052e7242b196ef1ca59d53ce6d0e94926b07cd SHA1 d2fb7746f4dde6c38430256ca5e600141ce6ab5a SHA256 7007c4c8186937fabd850ffc98f2c28b102aaa9bdcaa4fa0cb46f6712f057240
-EBUILD networkmanager-openvpn-0.7.1-r1.ebuild 1312 RMD160 ddce877c25b652819327405ec930fbf31ff9bfd3 SHA1 73eaa7f827ba89be16f0f5116a8729591b1daca7 SHA256 f108f887c2b2a75b67e80a65897306a3eaeb5157303242a25f05b8e000d7b1fd
-EBUILD networkmanager-openvpn-0.7.2.ebuild 1221 RMD160 6a897482da104f5b3d730fe7673ffd20b204357d SHA1 800587321a30174af39bf95fc1e7685bf0737985 SHA256 470a48bd7f00d08090b88fb29f5455d43a5dbe3939bd637d1b5d820653d0c8f9
 EBUILD networkmanager-openvpn-0.8.1.ebuild 1226 RMD160 20d245d9a2096497c800fad17bf39037941c30e6 SHA1 9c621f91ae1e4709cc9cf1f3ebf402a0f3d60d7a SHA256 0e92657db50c287b0bfe7690e49df0916712e26bbd79575c01c7b2f6747b6cf8
 EBUILD networkmanager-openvpn-0.8.2.ebuild 1226 RMD160 c9c739eea7ffee38e506fa70127497d97dfffc56 SHA1 0b040d1e0135df29520c5092d5868a343ca5e6be SHA256 561dbde869cedb283b97364f17ffe4c255651a3bfab8d9463869d61ef7937087
 EBUILD networkmanager-openvpn-0.8.ebuild 1224 RMD160 d3c1b204820efdbd21d8c3e46e301113d82fee0c SHA1 f2ea4236f2b8c05cbd8e96ffc6cc0b074c19e139 SHA256 bbea92555a3b4c298dc3219182d8ea664eabf8decc59cf57eedeae31eb2f3f68
diff --git a/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-0.3.2_p20070621-service-name.patch b/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-0.3.2_p20070621-service-name.patch
deleted file mode 100644
index 1c127ed70ed0..000000000000
--- a/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-0.3.2_p20070621-service-name.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fixes bug http://bugzilla.gnome.org/show_bug.cgi?id=447577
-
-Index: openvpn/nm-openvpn-service.name.in
-===================================================================
---- openvpn/nm-openvpn-service.name.in  (revision 2653)
-+++ openvpn/nm-openvpn-service.name.in  (working copy)
-@@ -1,8 +1,8 @@
- [VPN Connection]
- name=openvpn
- service=org.freedesktop.NetworkManager.openvpn
--program=@bindir@/nm-openvpn-service
-+program=@BINDIR@/nm-openvpn-service
-
- [GNOME]
--auth-dialog=@libexecdir@/nm-openvpn-auth-dialog
-+auth-dialog=@LIBEXECDIR@/nm-openvpn-auth-dialog
- properties=@prefix@/${LIB}/libnm-openvpn-properties
diff --git a/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-0.7.1-glibc2.10.fix.patch b/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-0.7.1-glibc2.10.fix.patch
deleted file mode 100644
index f630476a1648..000000000000
--- a/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-0.7.1-glibc2.10.fix.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From 27192957d887915a23f186a34c3bb85af3faba3a Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Tue, 14 Jul 2009 10:51:33 +0000
-Subject: don't use sscanf
-
-besides the fact that for some reason sscanf wasn't working, it's evil
-and confusing, and we don't even need to use it.  Also add the ability
-to set OPENVPN_DEBUG to get more info out of openvpn.
----
-diff --git a/src/nm-openvpn-service.c b/src/nm-openvpn-service.c
-index 346df20..6cde642 100644
---- a/src/nm-openvpn-service.c
-+++ b/src/nm-openvpn-service.c
-@@ -287,6 +287,35 @@ ovpn_quote_string (const char *unquoted)
- 	return quoted;
- }
- 
-+/* sscanf is evil, and since we can't use glib regexp stuff since it's still
-+ * too new for some distros, do a simple match here.
-+ */
-+static char *
-+get_detail (const char *input, const char *prefix)
-+{
-+	char *ret = NULL;
-+	guint32 i = 0;
-+	const char *p, *start;
-+
-+	g_return_val_if_fail (prefix != NULL, NULL);
-+
-+	if (!g_str_has_prefix (input, prefix))
-+		return NULL;
-+
-+	/* Grab characters until the next ' */
-+	p = start = input + strlen (prefix);
-+	while (*p) {
-+		if (*p == '\'') {
-+			ret = g_malloc0 (i + 1);
-+			strncpy (ret, start, i);
-+			break;
-+		}
-+		p++, i++;
-+	}
-+
-+	return ret;
-+}
-+
- static gboolean
- handle_management_socket (NMVPNPlugin *plugin,
-                           GIOChannel *source,
-@@ -295,7 +324,7 @@ handle_management_socket (NMVPNPlugin *plugin,
- {
- 	NMOpenvpnPluginIOData *io_data = NM_OPENVPN_PLUGIN_GET_PRIVATE (plugin)->io_data;
- 	gboolean again = TRUE;
--	char *str = NULL, *auth, *buf;
-+	char *str = NULL, *auth = NULL, *buf;
- 	gsize written;
- 
- 	if (!(condition & G_IO_IN))
-@@ -307,7 +336,8 @@ handle_management_socket (NMVPNPlugin *plugin,
- 	if (strlen (str) < 1)
- 		goto out;
- 
--	if (sscanf (str, ">PASSWORD:Need '%a[^']'", &auth) > 0) {
-+	auth = get_detail (str, ">PASSWORD:Need '");
-+	if (auth) {
- 		if (strcmp (auth, "Auth") == 0) {
- 			if (io_data->username != NULL && io_data->password != NULL) {
- 				char *quser, *qpass;
-@@ -351,8 +381,11 @@ handle_management_socket (NMVPNPlugin *plugin,
- 				*out_failure = NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED;
- 			again = FALSE;
- 		}
--		free (auth);
--	} else if (sscanf (str, ">PASSWORD:Verification Failed: '%a[^']'", &auth) > 0) {
-+		g_free (auth);
-+	}
-+
-+	auth = get_detail (str, ">PASSWORD:Verification Failed: '");
-+	if (auth) {
- 		if (!strcmp (auth, "Auth"))
- 			nm_warning ("Password verification failed");
- 		else if (!strcmp (auth, "Private Key"))
-@@ -360,7 +393,7 @@ handle_management_socket (NMVPNPlugin *plugin,
- 		else
- 			nm_warning ("Unknown verification failed: %s", auth);
- 
--		free (auth);
-+		g_free (auth);
- 
- 		if (out_failure)
- 			*out_failure = NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED;
-@@ -688,6 +721,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin,
- 		add_openvpn_arg (args, "--auth");
- 		add_openvpn_arg (args, auth);
- 	}
-+	add_openvpn_arg (args, "--auth-nocache");
- 
- 	/* TA */
- 	tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_TA);
-@@ -700,9 +734,14 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin,
- 			add_openvpn_arg (args, tmp);
- 	}
- 
--	/* Syslog */
--	add_openvpn_arg (args, "--syslog");
--	add_openvpn_arg (args, "nm-openvpn");
-+	if (getenv ("OPENVPN_DEBUG")) {
-+		add_openvpn_arg (args, "--verb");
-+		add_openvpn_arg (args, "10");
-+	} else {
-+		/* Syslog */
-+		add_openvpn_arg (args, "--syslog");
-+		add_openvpn_arg (args, "nm-openvpn");
-+	}
- 
- 	/* Punch script security in the face; this option was added to OpenVPN 2.1-rc9
- 	 * and defaults to disallowing any scripts, a behavior change from previous
---
-cgit v0.8.2
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.3.2_p20070621.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.3.2_p20070621.ebuild
deleted file mode 100644
index 6867a705c8a2..000000000000
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.3.2_p20070621.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.3.2_p20070621.ebuild,v 1.4 2009/04/22 14:22:08 rbu Exp $
-
-inherit gnome2 eutils autotools
-
-# NetworkManager likes itself with capital letters
-MY_P=${P/networkmanager/NetworkManager}
-
-DESCRIPTION="NetworkManager OpenVPN plugin."
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-#SRC_URI="http://dev.gentoo.org/~rbu/distfiles/${MY_P}.tar.gz"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="crypt doc gnome"
-
-RDEPEND=">=sys-apps/dbus-0.35.2
-	>=sys-apps/hal-0.5
-	sys-apps/iproute2
-	>=net-misc/dhcdbd-1.4
-	>=net-wireless/wireless-tools-28_pre9
-	>=dev-libs/glib-2.8
-	=net-misc/networkmanager-0.6*
-	gnome? ( >=x11-libs/gtk+-2.8
-		>=gnome-base/libglade-2
-		>=gnome-base/gnome-keyring-0.4
-		>=gnome-base/gnome-panel-2
-		>=gnome-base/gconf-2
-		>=gnome-base/libgnomeui-2 )
-	!gnome? ( >=gnome-base/libglade-2
-		>=gnome-base/gnome-keyring-0.4
-		>=gnome-base/gconf-2 )
-	>=net-misc/openvpn-2.0.5
-	crypt? ( dev-libs/libgcrypt )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS ChangeLog NEWS README"
-USE_DESTDIR="1"
-
-G2CONF="${G2CONF} \
-	`use_with crypt gcrypt` \
-	`use_with gnome` \
-	--disable-more-warnings \
-	--with-dbus-sys=/etc/dbus-1/system.d \
-	--enable-notification-icon"
-
-src_unpack () {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-service-name.patch"
-	intltoolize --copy --automake --force || die "intltoolize failed"
-	eautoreconf
-}
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.7.1-r1.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.7.1-r1.ebuild
deleted file mode 100644
index 309acbead37b..000000000000
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.7.1-r1.ebuild,v 1.1 2009/08/24 14:11:40 dagger Exp $
-
-EAPI=2
-inherit eutils versionator
-
-# NetworkManager likes itself with capital letters
-MY_P=${P/networkmanager/NetworkManager}
-MYPV_MINOR=$(get_version_component_range 1-2)
-
-DESCRIPTION="NetworkManager OpenVPN plugin."
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-SRC_URI="mirror://gnome/sources/NetworkManager-openvpn/0.7/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-IUSE="gnome"
-
-RDEPEND="
-	=net-misc/networkmanager-${MYPV_MINOR}*
-	>=net-misc/openvpn-2.1_rc9
-	gnome? (
-		>=gnome-base/gconf-2.20
-		>=gnome-base/gnome-keyring-2.20
-		>=gnome-base/libglade-2
-		>=gnome-base/libgnomeui-2.20
-		>=x11-libs/gtk+-2.10
-	)"
-
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-
-	# fixes bug #282428
-	epatch "${FILESDIR}"/${P}-glibc2.10.fix.patch
-}
-
-src_configure() {
-	ECONF="--disable-more-warnings \
-		$(use_with gnome)"
-
-	econf ${ECONF}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-}
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.7.2.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.7.2.ebuild
deleted file mode 100644
index dc2e9b8e6136..000000000000
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.7.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.7.2.ebuild,v 1.1 2009/12/02 11:46:15 dagger Exp $
-
-EAPI=2
-inherit eutils versionator
-
-# NetworkManager likes itself with capital letters
-MY_P=${P/networkmanager/NetworkManager}
-MYPV_MINOR=$(get_version_component_range 1-2)
-
-DESCRIPTION="NetworkManager OpenVPN plugin."
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-SRC_URI="mirror://gnome/sources/NetworkManager-openvpn/0.7/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-IUSE="gnome"
-
-RDEPEND="
-	=net-misc/networkmanager-${MYPV_MINOR}*
-	>=net-misc/openvpn-2.1_rc9
-	gnome? (
-		>=gnome-base/gconf-2.20
-		>=gnome-base/gnome-keyring-2.20
-		>=gnome-base/libglade-2
-		>=gnome-base/libgnomeui-2.20
-		>=x11-libs/gtk+-2.10
-	)"
-
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	ECONF="--disable-more-warnings \
-		$(use_with gnome)"
-
-	econf ${ECONF}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-}
diff --git a/net-misc/networkmanager-pptp/Manifest b/net-misc/networkmanager-pptp/Manifest
index d2fad522c254..69c16599440b 100644
--- a/net-misc/networkmanager-pptp/Manifest
+++ b/net-misc/networkmanager-pptp/Manifest
@@ -1,14 +1,6 @@
-AUX networkmanager-pptp-0.1.0_p20070726-service-name.patch 626 RMD160 bca8b62ab1c157af0cd6bf0af77e4b1e71f9d613 SHA1 fcefd2e4b2f8f7f57e62cfa8396c6c3bbc7536a1 SHA256 865ba9173bc1bc3ad9c77b0c82915343fae99e05d74e533d53cfcf09ef78e102
-DIST NetworkManager-pptp-0.1.0_p20070726.tar.gz 444015 RMD160 bbc67e8461e0df687f43f2aee851429ce206e0dd SHA1 be7d88e126e281fa3119f69854b0534e88deab5c SHA256 b90990ee1c17089341b9e4078ee0ed0f4af3b972a26a6639239588ef07335cc6
-DIST NetworkManager-pptp-0.7.1.tar.bz2 385225 RMD160 f35bc1cab07ad51ca68e3a4442d32409f2053b9e SHA1 bb31526c8c2b1ae3b779298e757ca6a22c1bd555 SHA256 be285f1ab638cda5a65ff97137f561af49bebbada4f947c4bba71f4b69ca77d0
-DIST NetworkManager-pptp-0.7.2.tar.bz2 387097 RMD160 4f7c08455fa3e6dcd0801d2f2420e74af2c9651e SHA1 3b153ae7f7e0fac05e54ade79e1e5445595db473 SHA256 de68d4524e3896393405fe954d4b69e0ea546da90410e8c74c95113ac7c4ba2a
 DIST NetworkManager-pptp-0.8.1.tar.bz2 384104 RMD160 77b241da0454c4b282c87010923ad4193ce45922 SHA1 21347010af0a1b9328652fcc0ed68e276361fba4 SHA256 02039e0c6a88c58e32b7cc0f4d9037e077f9a9263d99f26894f7c19fa7453576
 DIST NetworkManager-pptp-0.8.2.tar.bz2 384259 RMD160 c71ac14b92cb27d95bdf21c559b05cd05c23f264 SHA1 72b8701d0e217a1d5944199f58ef52ffa982d342 SHA256 c90172273d6b29a5f3fec138cc474d6a7003edf35918602f3b7283ddd05d87e6
 DIST NetworkManager-pptp-0.8.tar.bz2 392545 RMD160 463049fb0e108131e5f5cf8547b9a06230b6fdb2 SHA1 ba592f9a1c6d6e86b6b847ed4e13fd114d596b05 SHA256 d099a9a7c324f842f28be0f6f3cf4c9b4c8d653d060c9d277cc9332fb9326ab4
-DIST networkmanager-pptp-0.1.0_p20070726-pppd-plugindir.patch.bz2 19322 RMD160 320ed8b119c89fd6ab0068814fd6c377f3997842 SHA1 16080ec4c6f16c1598f642c38dc2d41b00ca50b7 SHA256 670f3c635091cabd46ae0b605a570a834b07eb0a929d08f5c7c230f2415e2b86
-EBUILD networkmanager-pptp-0.1.0_p20070726.ebuild 1687 RMD160 64ae459b2621302376fb15c32461e38d840bf67d SHA1 07fe318d311479fcbbeb6a99a88a6e7c358b6482 SHA256 7e12e7a565b1c45bb62dfc211228e9615d025f483067f86f14b8d95c79d7aec4
-EBUILD networkmanager-pptp-0.7.1.ebuild 1177 RMD160 891b9cbf7e728ff4ad6e977adfe81a8834c4141c SHA1 8782bf7601b301e4c35f2ebe99bf87f548405696 SHA256 9a1ba2058ae99673ee695e011cef9297520a0d7b5a752b69dce58857f9a8045c
-EBUILD networkmanager-pptp-0.7.2.ebuild 1177 RMD160 0eb18e9d3bc76b56cecbabc01d37807d0e0710e8 SHA1 44a88725d1ec0a5aa8e616ca0697d5d41484c289 SHA256 49310f115cd07a85d45cc8b33882dcff286373719ee7dab07234ec5c9f5186c6
 EBUILD networkmanager-pptp-0.8.1.ebuild 1163 RMD160 3a35600b6ae263bce4f5163879ff4254809b8f86 SHA1 9394cd5968a043b1a0ee35553922b2c52337f250 SHA256 6985fd0a5def20b8ea0e0ea307f8c6bbd7d05af294061a1a93e226e3ec543f98
 EBUILD networkmanager-pptp-0.8.2.ebuild 1163 RMD160 d5c34ae4f60ba89066f90b2c029340ce544f128e SHA1 5123a9872fe316fd3663a542e533a3bd2ba4a01e SHA256 5695e5e8b27f33824de912ad3ab9cbf21c304a646ed40b6549261ddbce19123e
 EBUILD networkmanager-pptp-0.8.ebuild 1161 RMD160 2d083cde2b4036fd0812589b0af8d0143f419715 SHA1 dfba1f25b270fadfab8b3e7a0149f4034284182d SHA256 b9a24a48de38b4f22fac0e1f4733f25fb8c809f9668032486991dff2ff5b1872
diff --git a/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.1.0_p20070726-service-name.patch b/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.1.0_p20070726-service-name.patch
deleted file mode 100644
index 098135624f1d..000000000000
--- a/net-misc/networkmanager-pptp/files/networkmanager-pptp-0.1.0_p20070726-service-name.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fixes bug http://bugzilla.gnome.org/show_bug.cgi?id=447577
-
-Index: pptp/nm-pptp-service.name.in
-===================================================================
---- pptp/nm-pptp-service.name.in        (revision 2653)
-+++ pptp/nm-pptp-service.name.in        (working copy)
-@@ -1,8 +1,8 @@
- [VPN Connection]
- name=pptp
- service=org.freedesktop.NetworkManager.pptp
--program=@bindir@/nm-pptp-service
-+program=@BINDIR@/nm-pptp-service
-
- [GNOME]
--auth-dialog=@libexecdir@/nm-pptp-auth-dialog
-+auth-dialog=@LIBEXECDIR@/nm-pptp-auth-dialog
- properties=@prefix@/${LIB}/libnm-pptp-properties
-Index: openvpn/nm-openvpn-service.name.in
\ No newline at end of file
diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-0.1.0_p20070726.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-0.1.0_p20070726.ebuild
deleted file mode 100644
index f5dc4b54455e..000000000000
--- a/net-misc/networkmanager-pptp/networkmanager-pptp-0.1.0_p20070726.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-pptp/networkmanager-pptp-0.1.0_p20070726.ebuild,v 1.5 2009/04/22 14:22:09 rbu Exp $
-
-inherit gnome2 eutils autotools
-
-# NetworkManager likes itself with capital letters
-MY_P=${P/networkmanager/NetworkManager}
-
-DESCRIPTION="NetworkManager PPTP plugin."
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-#SRC_URI="http://dev.gentoo.org/~rbu/distfiles/${MY_P}.tar.gz"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz
-	mirror://gentoo/${P}-pppd-plugindir.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="crypt debug doc gnome"
-
-RDEPEND=">=sys-apps/dbus-0.35.2
-	>=dev-libs/glib-2.8
-	=net-misc/networkmanager-0.6*
-	net-dialup/ppp
-	gnome? ( >=x11-libs/gtk+-2.8
-		>=gnome-base/libglade-2
-		>=gnome-base/gnome-keyring-0.4
-		>=gnome-base/gnome-panel-2
-		>=gnome-base/gconf-2
-		>=gnome-base/libgnomeui-2 )
-	!gnome? ( >=gnome-base/libglade-2
-		>=gnome-base/gnome-keyring-0.4
-		>=gnome-base/gconf-2 )
-	>=net-misc/openvpn-2.0.5
-	crypt? ( dev-libs/libgcrypt )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool"
-RDEPEND="net-dialup/pptpclient"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS ChangeLog NEWS README"
-USE_DESTDIR="1"
-
-G2CONF="${G2CONF} \
-	`use_with crypt gcrypt` \
-	`use_with gnome` \
-	--disable-more-warnings \
-	--with-dbus-sys=/etc/dbus-1/system.d \
-	--enable-notification-icon"
-
-src_unpack () {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-service-name.patch"
-	epatch "${WORKDIR}/${P}-pppd-plugindir.patch"
-	rm -rf "${S}/src/pppd"
-	eautoreconf
-	intltoolize --force || die "intltoolize failed"
-}
diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-0.7.1.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-0.7.1.ebuild
deleted file mode 100644
index d0d833e6e92a..000000000000
--- a/net-misc/networkmanager-pptp/networkmanager-pptp-0.7.1.ebuild
+++ /dev/null
@@ -1,48 +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-pptp/networkmanager-pptp-0.7.1.ebuild,v 1.4 2010/01/20 17:56:17 armin76 Exp $
-
-EAPI=2
-inherit eutils versionator
-
-# NetworkManager likes itself with capital letters
-MY_P=${P/networkmanager/NetworkManager}
-MYPV_MINOR=$(get_version_component_range 1-2)
-
-DESCRIPTION="NetworkManager PPTP plugin."
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-SRC_URI="mirror://gnome/sources/NetworkManager-pptp/0.7/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gnome"
-
-RDEPEND="
-	=net-misc/networkmanager-${MYPV_MINOR}*
-	gnome? (
-		>=gnome-base/gconf-2.20
-		>=gnome-base/gnome-keyring-2.20
-		>=gnome-base/libglade-2
-		>=gnome-base/libgnomeui-2.20
-		>=x11-libs/gtk+-2.10
-	)"
-
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	ECONF="--disable-more-warnings \
-		$(use_with gnome)"
-
-	econf ${ECONF}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-}
diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-0.7.2.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-0.7.2.ebuild
deleted file mode 100644
index f62c763a5150..000000000000
--- a/net-misc/networkmanager-pptp/networkmanager-pptp-0.7.2.ebuild
+++ /dev/null
@@ -1,48 +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-pptp/networkmanager-pptp-0.7.2.ebuild,v 1.3 2010/01/20 17:56:17 armin76 Exp $
-
-EAPI=2
-inherit eutils versionator
-
-# NetworkManager likes itself with capital letters
-MY_P=${P/networkmanager/NetworkManager}
-MYPV_MINOR=$(get_version_component_range 1-2)
-
-DESCRIPTION="NetworkManager PPTP plugin."
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-SRC_URI="mirror://gnome/sources/NetworkManager-pptp/0.7/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gnome"
-
-RDEPEND="
-	=net-misc/networkmanager-${MYPV_MINOR}*
-	gnome? (
-		>=gnome-base/gconf-2.20
-		>=gnome-base/gnome-keyring-2.20
-		>=gnome-base/libglade-2
-		>=gnome-base/libgnomeui-2.20
-		>=x11-libs/gtk+-2.10
-	)"
-
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	ECONF="--disable-more-warnings \
-		$(use_with gnome)"
-
-	econf ${ECONF}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-}
diff --git a/net-misc/networkmanager-vpnc/Manifest b/net-misc/networkmanager-vpnc/Manifest
index abccb71b4117..af9fb3464d33 100644
--- a/net-misc/networkmanager-vpnc/Manifest
+++ b/net-misc/networkmanager-vpnc/Manifest
@@ -1,15 +1,6 @@
-AUX networkmanager-vpnc-0.6.4_p20070621-service-name.patch 585 RMD160 75379b2000169189f1a8e179d041e71d39151326 SHA1 3a228568089d9906f707f95c47aaf7a8cda2146a SHA256 d440538dbbaa226ceebff4661b508c03ed812f30d4efe72dedc54c6576c23963
-AUX nm-vpnc-dbus_conf.patch 715 RMD160 ba8ee121d330cd704272a9f220b1f2c3983b329c SHA1 0e2799e9f9a8d56ee882af8afc6afe0d3e5a12e1 SHA256 1d4f08479ef0bf5f222f18717f5d3ed7329fb2f09f1118c95a576c995bfee02d
-AUX nm-vpnc-path.patch 418 RMD160 cf6138d9847db1310e095e559822f13956a9fc6b SHA1 d9d659deac1ea9981bf53d0671acde9a5eaabc1f SHA256 5557a9956d3dd9921b2722045d5dbb675f8e17dca1de8603cf6adb7fc3fa3672
-DIST NetworkManager-vpnc-0.6.4_p20070621.tar.gz 435524 RMD160 0849848fe6311eb1ec0b18d64607fe5388370fb6 SHA1 16c7697598ef76a3b338bbb75693d800b96862a0 SHA256 bff3d3ef3f9140095554b0aa57db7f6fe12176675f5016f51e247a9c4990f979
-DIST NetworkManager-vpnc-0.7.1.tar.bz2 380708 RMD160 4c0bd5ee3129ebb629cb01e3497f88fa2fae0dc9 SHA1 1c91c30f6cf2ba2eb651709dd7b5a648a17dbb1c SHA256 edbd51b07b4617af7f15317646feee29259949e661b1df9605f57931d5bb57b6
-DIST NetworkManager-vpnc-0.7.2.tar.bz2 361377 RMD160 923fbaa50669f0a854dbf5a7fb459fa3ed8bf041 SHA1 7e6ad00d7dae3abc47a163d268c6ab60f986340a SHA256 7c6a1f8cbb9364ced8172bcbc6b006ff00f677fbcab857cc70c9a53764a21487
 DIST NetworkManager-vpnc-0.8.1.tar.bz2 360081 RMD160 74b417f3d97816f807f0f99dedd969884a1cce02 SHA1 d84da0151368d06eead4aeac39bb6ffa1f1bbfd5 SHA256 061cdcbac4f8fafe7307cf7c6b3e6b56b8bc58d7e80260e2dd16fda30e38f032
 DIST NetworkManager-vpnc-0.8.2.tar.bz2 376519 RMD160 43b236624a0813203368f507b46cbb92295154a0 SHA1 dd291b8797eafbaecdb4c71dd78c9b916b102575 SHA256 c37cf921c223f226d16e659321bb372e33278bf642362b7a92cb665d27950011
 DIST NetworkManager-vpnc-0.8.tar.bz2 366967 RMD160 19e1c1dc078a020277baf68640dc9f58c8914d0c SHA1 9495c34381b5dca0fbdeebbb67e3bf6ed163e85f SHA256 f914fbef082511929cffec512a012f92ef57ebc751019a644797208f42d82117
-EBUILD networkmanager-vpnc-0.6.4_p20070621.ebuild 1916 RMD160 991615971faa9bbb491ff64d6496827f9d45ce3f SHA1 06156d62a610d8b1d846bbd247b5caf2be49af18 SHA256 951e9ab47a0d234cb02f604eb3bec7a0bcc1f98f5ae205be9f62f8575396a527
-EBUILD networkmanager-vpnc-0.7.1.ebuild 1219 RMD160 f4cbbb159240a049babd4dcc02d3fa5cd645691e SHA1 ee0af7c15a07af3b2088d4db953142fec27bd27a SHA256 6198d821b677c4c278afc5beccc0f65224a082da1266835fdbca71edfa2256b0
-EBUILD networkmanager-vpnc-0.7.2.ebuild 1222 RMD160 c5c6640b04405c138ffaf75354fd7199c1b24ef2 SHA1 b09e971575f3c2471faf5d427df84ad954a7db9d SHA256 9f76eae91338de3a51421a38c69df487a40950505fc791c8b74432f6bebd1691
 EBUILD networkmanager-vpnc-0.8.1.ebuild 1189 RMD160 a161bab91183e592867f1ee9da0a3c44386261cd SHA1 d253dea3bb096d6dd523a77172b32448f4a78e2a SHA256 40f6c82cff45dd1c5b165c321f3c4b42c1c86f69381fabf125d28f7ac7f6a5b6
 EBUILD networkmanager-vpnc-0.8.2.ebuild 1189 RMD160 943851afabece0bcfa7802210125d9f3fb54ad1b SHA1 e0c1157390649149cf5cda7d40172a599d369bef SHA256 95e45275031a236dd79fc299399511777b19102d98de313a26ea39f14f6aab01
 EBUILD networkmanager-vpnc-0.8.ebuild 1187 RMD160 116c8ecff598ca40b6d34e8f64012b2e000c945e SHA1 c61cb125ca4c0907023191c50055e9ac882943f3 SHA256 eb74603f2fa7a91ee440722f472126e4352a622b858039c51d3e6afe62b35790
diff --git a/net-misc/networkmanager-vpnc/files/networkmanager-vpnc-0.6.4_p20070621-service-name.patch b/net-misc/networkmanager-vpnc/files/networkmanager-vpnc-0.6.4_p20070621-service-name.patch
deleted file mode 100644
index 83b2a7b80898..000000000000
--- a/net-misc/networkmanager-vpnc/files/networkmanager-vpnc-0.6.4_p20070621-service-name.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fixes bug http://bugzilla.gnome.org/show_bug.cgi?id=447577
-
-Index: vpnc/nm-vpnc-service.name.in
-===================================================================
---- vpnc/nm-vpnc-service.name.in        (revision 2653)
-+++ vpnc/nm-vpnc-service.name.in        (working copy)
-@@ -1,8 +1,8 @@
- [VPN Connection]
- name=vpnc
- service=org.freedesktop.NetworkManager.vpnc
--program=@bindir@/nm-vpnc-service
-+program=@BINDIR@/nm-vpnc-service
-
- [GNOME]
--auth-dialog=@libexecdir@/nm-vpnc-auth-dialog
-+auth-dialog=@LIBEXECDIR@/nm-vpnc-auth-dialog
- properties=@prefix@/${LIB}/libnm-vpnc-properties
diff --git a/net-misc/networkmanager-vpnc/files/nm-vpnc-dbus_conf.patch b/net-misc/networkmanager-vpnc/files/nm-vpnc-dbus_conf.patch
deleted file mode 100644
index ce3d5c37ace7..000000000000
--- a/net-misc/networkmanager-vpnc/files/nm-vpnc-dbus_conf.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- NetworkManager-vpnc-0.5.0.orig/nm-vpnc-service.conf	2005-11-13 01:22:50.000000000 -0500
-+++ NetworkManager-vpnc-0.5.0/nm-vpnc-service.conf	2005-11-13 14:35:12.000000000 -0500
-@@ -7,6 +7,11 @@
- 		<allow send_destination="org.freedesktop.NetworkManager.vpnc"/>
- 		<allow send_interface="org.freedesktop.NetworkManager.vpnc"/>
- 	</policy>
-+	<policy at_console="true">
-+		<allow own="org.freedesktop.NetworkManager.vpnc"/>
-+		<allow send_destination="org.freedesktop.NetworkManager.vpnc"/>
-+		<allow send_interface="org.freedesktop.NetworkManager.vpnc"/>
-+	</policy>
- 	<policy context="default">
- 		<deny own="org.freedesktop.NetworkManager.vpnc"/>
- 		<deny send_destination="org.freedesktop.NetworkManager.vpnc"/>
diff --git a/net-misc/networkmanager-vpnc/files/nm-vpnc-path.patch b/net-misc/networkmanager-vpnc/files/nm-vpnc-path.patch
deleted file mode 100644
index 8595c6bf391a..000000000000
--- a/net-misc/networkmanager-vpnc/files/nm-vpnc-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN NetworkManager-vpnc-0.5.0.orig/src/nm-vpnc-service.c NetworkManager-vpnc-0.5.0/src/nm-vpnc-service.c
---- NetworkManager-vpnc-0.5.0.orig/src/nm-vpnc-service.c	2005-11-15 14:28:05.000000000 -0600
-+++ NetworkManager-vpnc-0.5.0/src/nm-vpnc-service.c	2005-11-15 14:29:06.000000000 -0600
-@@ -51,6 +51,8 @@
- 	"/usr/sbin/vpnc",
- 	"/sbin/vpnc",
-	"/usr/local/sbin/vpnc",
-+	"/usr/bin/vpnc",
-+	"/bin/vpnc",
- 	NULL
- };
- 
diff --git a/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.6.4_p20070621.ebuild b/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.6.4_p20070621.ebuild
deleted file mode 100644
index eae73a90cf02..000000000000
--- a/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.6.4_p20070621.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.6.4_p20070621.ebuild,v 1.5 2009/04/22 14:22:10 rbu Exp $
-
-inherit gnome2 eutils autotools versionator
-
-# NetworkManager likes itself with capital letters
-MY_P=${P/networkmanager/NetworkManager}
-MYPV_MINOR=$(get_version_component_range 1-2)
-
-DESCRIPTION="NetworkManager vpnc plugin for daemon and client configuration."
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-#SRC_URI="http://dev.gentoo.org/~rbu/distfiles/${MY_P}.tar.gz"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="crypt doc gnome"
-
-RDEPEND=">=sys-apps/dbus-0.60
-	>=sys-apps/hal-0.5
-	sys-apps/iproute2
-	>=dev-libs/libnl-1.0_pre6
-	>=net-misc/dhcdbd-1.4
-	>=net-wireless/wireless-tools-28_pre9
-	>=net-wireless/wpa_supplicant-0.4.8
-	=net-misc/networkmanager-${MYPV_MINOR}*
-	>=net-misc/vpnc-0.3.3
-	>=dev-libs/glib-2.8
-	>=x11-libs/libnotify-0.3.2
-	gnome? ( >=x11-libs/gtk+-2.8
-		>=gnome-base/libglade-2
-		>=gnome-base/gnome-keyring-0.4
-		>=gnome-base/gnome-panel-2
-		>=gnome-base/gconf-2
-		>=gnome-base/libgnomeui-2 )
-	crypt? ( dev-libs/libgcrypt )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS ChangeLog NEWS README"
-USE_DESTDIR="1"
-
-G2CONF="${G2CONF} \
-	`use_with crypt gcrypt` \
-	`use_with gnome` \
-	--disable-more-warnings \
-	--with-dbus-sys=/etc/dbus-1/system.d \
-	--enable-notification-icon"
-
-src_unpack () {
-	unpack ${A}
-	cd "${S}"
-	# Gentoo puts vpnc somewhere that the source doesn't expect.
-	epatch "${FILESDIR}"/nm-vpnc-path.patch
-	# Match the same dbus permissions as NetworkManager
-	epatch "${FILESDIR}"/nm-vpnc-dbus_conf.patch
-
-	epatch "${FILESDIR}"/${P}-service-name.patch
-	eautoreconf
-	intltoolize --force || die "intltoolize failed"
-}
diff --git a/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.7.1.ebuild b/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.7.1.ebuild
deleted file mode 100644
index efcaeb759144..000000000000
--- a/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.7.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.7.1.ebuild,v 1.1 2009/04/22 14:22:10 rbu Exp $
-
-inherit eutils versionator
-
-# NetworkManager likes itself with capital letters
-MY_P=${P/networkmanager/NetworkManager}
-MYPV_MINOR=$(get_version_component_range 1-2)
-
-DESCRIPTION="NetworkManager VPNC plugin."
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-SRC_URI="mirror://gnome/sources/NetworkManager-vpnc/0.7/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-IUSE="gnome"
-
-RDEPEND="
-	=net-misc/networkmanager-${MYPV_MINOR}*
-	>=net-misc/vpnc-0.5
-	gnome? (
-		>=gnome-base/gconf-2.20
-		>=gnome-base/gnome-keyring-2.20
-		>=gnome-base/libglade-2
-		>=gnome-base/libgnomeui-2.20
-		>=x11-libs/gtk+-2.10
-	)"
-
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	ECONF="--disable-more-warnings \
-		$(use_with gnome)"
-
-	econf ${ECONF}
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-}
diff --git a/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.7.2.ebuild b/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.7.2.ebuild
deleted file mode 100644
index fcf47566d276..000000000000
--- a/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.7.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.7.2.ebuild,v 1.1 2009/12/02 11:49:37 dagger Exp $
-
-inherit eutils versionator
-
-# NetworkManager likes itself with capital letters
-MY_P=${P/networkmanager/NetworkManager}
-MYPV_MINOR=$(get_version_component_range 1-2)
-
-DESCRIPTION="NetworkManager VPNC plugin."
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-SRC_URI="mirror://gnome/sources/NetworkManager-vpnc/0.7/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-IUSE="gnome"
-
-RDEPEND="
-	=net-misc/networkmanager-${MYPV_MINOR}*
-	>=net-misc/vpnc-0.5
-	gnome? (
-		>=gnome-base/gconf-2.20
-		>=gnome-base/gnome-keyring-2.20
-		>=gnome-base/libglade-2
-		>=gnome-base/libgnomeui-2.20
-		>=x11-libs/gtk+-2.10
-	)"
-
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	ECONF="--disable-more-warnings \
-		$(use_with gnome)"
-
-	econf ${ECONF}
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 7d1a02e73495..e6604f9279b2 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -1,9 +1,4 @@
 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-0.8-confchanges.patch 1063 RMD160 25a0d45410fa5590098386556e9947dd15507eda SHA1 ba6eaa63188f97f93bbbb327676d8104bbf7e8c8 SHA256 9fcbe0b9ab4cc38c9057a0dde2f5153efc12515ed4d28920a455dad7fc2b1e09
 AUX networkmanager-0.8-nscd-clear-cache.patch 1214 RMD160 2381f455593202a740e634601c0ba8245ecb8fac SHA1 b4a0cec446b6f8fa81c06d5992db61b296f17057 SHA256 2d981bafa96607acb06740d78b8e33afdc675c52b0cf3ce5b098c67566362c99
 AUX networkmanager-0.8-read-hostname.patch 2380 RMD160 8b4349293235d2b63546b4e65d30a94d91ab9a04 SHA1 f7d57c686e9bd1f1ac58e67efcd8255c0fc9a5c5 SHA256 5ee07a0fb949c7ce299f0d2459c4f9840ace765308cd1a208d89eecec51a63fe
@@ -13,22 +8,12 @@ AUX networkmanager-0.8.1-dhclient3-fix.patch 295 RMD160 986359b62d5cb7d4ca34b015
 AUX networkmanager-0.8.1-dhclient3.patch 4658 RMD160 d229c87a41f882a6162520ee3f2afdc5650c283a SHA1 06ca671ba76cd1591556cdcc96a88060ca89e727 SHA256 45b1c302cea8605cc489a77250404e4457d0747ca3cab9ed993eb51551da3290
 AUX networkmanager-0.8.1-dhcp-configure.patch 2447 RMD160 1c222ce867a7f92167b2ffcbc401f8ea83b24193 SHA1 f17b676ad65788b5b665c16b29d01a88e3cdd041 SHA256 7bda5db2d937b2562c98435620774bba487bf8b53da5c035422b2bc2ed21a400
 AUX networkmanager-0.8.1-glib-2.25.12-workaround.patch 663 RMD160 b4397b17a6148244dedd341b35185c07ca267f06 SHA1 926acbd76076750ab4ec48ac34fe73679693a4ca SHA256 a00523ad7d6bdced76be82b980788af4c313fc59aff8b9d258343e17ad6bf969
-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
 AUX nm-system-settings.conf-ifnet 70 RMD160 c0d2be147383999b62cead86ab4333169e4ef277 SHA1 679ec8052b610969c148a2d34cd4da7a41484a76 SHA256 34f53d9ac1ad65eda6942dc3059117f60f6321059ca23f4fbfcc2f2edcae151f
-DIST NetworkManager-0.6.6.tar.gz 984114 RMD160 f0672ee31001f83b06f6b93c30a01f37ee12ed6e SHA1 c5d0bcf7d262e1b600df6dad9f6f4baada293634 SHA256 36d48a11957e1c4f53a685b0fcc7d060e8972b435501c92b10737bb844dd95e2
-DIST NetworkManager-0.7.1-gentoo-patches-1b.tar.bz2 36726 RMD160 201e68e6760d6154744e0570e63fc4c7b62bdfb7 SHA1 c2df56df89f652a84287951dcb5c89497fc62b46 SHA256 e4684f0c49c3f1c55f8028a1a2fbe18d726a9aa1592f25e1bd61b9443bfe3060
-DIST NetworkManager-0.7.1.tar.bz2 1226975 RMD160 117677b5da4e66df0287e5a974c80709e988dcb3 SHA1 3f734b8c606bcc71a43c63ba3993524d8db807ca SHA256 7526a31de615a662cb09e915f26e5b151eda364240d983df6232aac8b9333f3a
-DIST NetworkManager-0.7.2.tar.bz2 1315036 RMD160 b4cfe2cdb8df5a7ae7f6e7d580337e9cc9094e2b SHA1 0de68cb77698b4788f415b0361b48258f4734119 SHA256 8d6f47432ae372aaffdc78f056cec9e9fc6bb1547a454e0c1ad7d130a9198470
 DIST NetworkManager-0.8.1.tar.bz2 1505134 RMD160 82f5ad1a641fa49acf34604f89154c865f3d5fbc SHA1 778989ed73cfd7ec05714f77121fa8bfc1bf0981 SHA256 dc126fbe3199d47899c4781e4fff32cee404dc7c728c6ade9eaa899bd80f19fa
 DIST NetworkManager-0.8.2.tar.bz2 1629296 RMD160 d5ef4adfc74db4a77fadcbeb545175b2f49dfd9c SHA1 2c9a9f0317d2ad4fd8a05631211cfd6040070f8e SHA256 58e49dcd83cb641a9dcaad4fd566a08196c862479ad3086c00f28f03768eb4f1
 DIST NetworkManager-0.8.tar.bz2 1376044 RMD160 40074f52a79965510de816c0e94d1b9ac582c522 SHA1 fd290057a9246055fa59507b6a3d6b99ceb4c3dc SHA256 4ac38f5c6ddbbcc67601ba898dd475457e2d259b77f9680eee51cb07f19c1b05
 DIST networkmanager-ifnet-540e40f.patch 268068 RMD160 954ffb9915fdd8ae650963b66aba7e185ddfe0c6 SHA1 0bd0cfcb02a0511d17179d2994e40a663b49dd6f SHA256 8a870fb5ed708eea5523b954e23be05471c5b6783cd2d0a19071a1d253fcab51
-EBUILD networkmanager-0.6.6.ebuild 2621 RMD160 7516ea6287cfe7c9b98e4f8e5203bf4b1642c8e6 SHA1 6dfc5a1e518e5b4b335a28ceeb248f8e1c639175 SHA256 8dce1c81ef039889d0bdd0ec9c18a3f3da14b42f20ba6ced5639808d6708bbe5
-EBUILD networkmanager-0.7.1-r6.ebuild 4033 RMD160 a0629b415c2cbcc2de8569dac2c67552a61d03d4 SHA1 5f1c4fa2d71818685a7dc0c1fdc3bfdab392df8d SHA256 7602f8b235552c2be536cb41bc60a3095cc86fe4754dd0ac141f294770607f98
-EBUILD networkmanager-0.7.2.ebuild 3707 RMD160 18fe37ad670fe2a39422502963ec2cf0c710b73d SHA1 68701111f54980fb1a66596b35700e9b73060391 SHA256 fcc749b95097b7e69ff913c4db82378f367097912c90bf5e4ba75774d82ed5ab
 EBUILD networkmanager-0.8-r1.ebuild 3516 RMD160 8722fcf8330e8f11a1e3dd83f2e2b53c8f34be5b SHA1 ebb761da259e1e76abe6645f35ff654fc5385984 SHA256 6142178a7ee9177a978c451eb9e02ccdf11de09b2f5b13ca0be79382d07883aa
 EBUILD networkmanager-0.8.1-r6.ebuild 4632 RMD160 15481e54c0f3e9502c8357fd6a6b772a53c7ceab SHA1 b656512bcd456c4b621cff0876e846954a6545df SHA256 ec4be6303fd338df4efc0e4c51bce67985b295a14a9b6eea0e0a46460fffe557
 EBUILD networkmanager-0.8.2.ebuild 4018 RMD160 78d0726dafa4d3e768f17ad1938909bf0e76aa1f SHA1 d2bffb3bfbae6bcf07a04a54157c68463f7c84fc SHA256 47bef482328648fbd39d933b9e5aa4f277a3bcd0c1b7f7594fe61f77ced0ac4d
diff --git a/net-misc/networkmanager/files/networkmanager-0.6.5-confchanges.patch b/net-misc/networkmanager/files/networkmanager-0.6.5-confchanges.patch
deleted file mode 100644
index 8969cdae18cb..000000000000
--- a/net-misc/networkmanager/files/networkmanager-0.6.5-confchanges.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/NetworkManager.conf.orig	2006-10-28 04:43:50.426682976 +0100
-+++ src/NetworkManager.conf	2006-10-28 04:44:36.883620448 +0100
-@@ -8,14 +8,14 @@
-                 <allow send_destination="org.freedesktop.NetworkManager"/>
-                 <allow send_interface="org.freedesktop.NetworkManager"/>
-         </policy>
--        <policy at_console="true">
-+        <policy group="plugdev">
-                 <allow send_destination="org.freedesktop.NetworkManager"/>
-                 <allow send_interface="org.freedesktop.NetworkManager"/>
-         </policy>
-         <policy context="default">
--                <deny own="org.freedesktop.NetworkManager"/>
--                <deny send_destination="org.freedesktop.NetworkManager"/>
--                <deny send_interface="org.freedesktop.NetworkManager"/>
-+                <allow own="org.freedesktop.NetworkManager"/>
-+                <allow send_destination="org.freedesktop.NetworkManager"/>
-+                <allow send_interface="org.freedesktop.NetworkManager"/>
-         </policy>
- </busconfig>
- 
diff --git a/net-misc/networkmanager/files/networkmanager-0.7.0-confchanges.patch b/net-misc/networkmanager/files/networkmanager-0.7.0-confchanges.patch
deleted file mode 100644
index 1372c1203ed7..000000000000
--- a/net-misc/networkmanager/files/networkmanager-0.7.0-confchanges.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/NetworkManager.conf
-===================================================================
---- src/NetworkManager.conf.orig
-+++ src/NetworkManager.conf
-@@ -11,7 +11,7 @@
-                 <allow send_destination="org.freedesktop.NetworkManager.PPP"/>
-                 <allow send_interface="org.freedesktop.NetworkManager.PPP"/>
-         </policy>
--        <policy at_console="true">
-+        <policy group="plugdev">
-                 <allow send_destination="org.freedesktop.NetworkManager"/>
-                 <allow send_interface="org.freedesktop.NetworkManager"/>
-         </policy>
diff --git a/net-misc/networkmanager/files/networkmanager-0.7.0-gentoo-dhclient.patch b/net-misc/networkmanager/files/networkmanager-0.7.0-gentoo-dhclient.patch
deleted file mode 100644
index fa21c7680817..000000000000
--- a/net-misc/networkmanager/files/networkmanager-0.7.0-gentoo-dhclient.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 33547b8d8b64a10187b9c452eef7325d909889a1 Mon Sep 17 00:00:00 2001
-From: Daniel Gryniewicz <dang@gentoo.org>
-Date: Thu, 23 Apr 2009 10:42:43 -0400
-Subject: [PATCH] dhcp: use correct dhclient config file location for Gentoo (bgo #579737)
-
----
- src/dhcp-manager/nm-dhcp-dhclient.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c
-index 946be0c..34b36f1 100644
---- a/src/dhcp-manager/nm-dhcp-dhclient.c
-+++ b/src/dhcp-manager/nm-dhcp-dhclient.c
-@@ -167,6 +167,8 @@ create_dhclient_config (NMDHCPDevice *device, NMSettingIP4Config *s_ip4)
- 	orig = g_strdup (SYSCONFDIR "/dhclient.conf");
- #elif defined(TARGET_DEBIAN)
- 	orig = g_strdup (SYSCONFDIR "/dhcp3/dhclient.conf");
-+#elif defined(TARGET_GENTOO)
-+	orig = g_strdup (SYSCONFDIR "/dhcp/dhclient.conf");
- #else
- 	orig = g_strdup_printf (SYSCONFDIR "/dhclient-%s.conf", device->iface);
- #endif
--- 
-1.6.2
-
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
deleted file mode 100644
index ea074bae821a..000000000000
--- a/net-misc/networkmanager/files/networkmanager-0.7.1-bad-link.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index ca5332815e1c..000000000000
--- a/net-misc/networkmanager/files/networkmanager-0.7.1-confchanges.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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/networkmanager-resolvconf-perms.patch b/net-misc/networkmanager/files/networkmanager-resolvconf-perms.patch
deleted file mode 100644
index a76c419807cc..000000000000
--- a/net-misc/networkmanager/files/networkmanager-resolvconf-perms.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/named-manager/nm-named-manager.c.orig	2006-03-25 00:38:24.000000000 -0500
-+++ src/named-manager/nm-named-manager.c	2006-03-25 00:44:15.000000000 -0500
-@@ -31,6 +31,7 @@
- #include <resolv.h>
- #include <sys/socket.h>
- #include <sys/types.h>
-+#include <sys/stat.h>
- #include <arpa/inet.h>
- #include <syslog.h>
- #include <glib.h>
-@@ -396,6 +397,8 @@
- 	if (rename (tmp_resolv_conf, RESOLV_CONF) < 0)
- 		goto lose;
- 	nm_system_update_dns ();
-+
-+	chmod(RESOLV_CONF, S_IREAD | S_IWRITE | S_IRGRP | S_IROTH);
- 	return TRUE;
- 
- lose:
diff --git a/net-misc/networkmanager/files/networkmanager-updatedbackend.patch b/net-misc/networkmanager/files/networkmanager-updatedbackend.patch
deleted file mode 100644
index 767284a28233..000000000000
--- a/net-misc/networkmanager/files/networkmanager-updatedbackend.patch
+++ /dev/null
@@ -1,657 +0,0 @@
-Index: NetworkManager/trunk/src/backends/NetworkManagerGentoo.c
-===================================================================
---- NetworkManagerGentoo.c (revision 15)
-+++ NetworkManagerGentoo.c (revision 38)
-@@ -1,2 +1,3 @@
-+
- /* NetworkManager -- Network link manager
-  *
-@@ -250,8 +251,20 @@
-  */
- void nm_system_restart_mdns_responder (void)
--{
--	nm_spawn_process("/etc/init.d/mDNSResponder stop");
--	nm_spawn_process("/etc/init.d/mDNSResponder zap");
--	nm_spawn_process("/etc/init.d/mDNSResponder start");
-+{	
-+	/* Check if the daemon was already running - do not start a new instance */
-+	/* Howl */
-+	if (g_file_test("/var/run/mDNSResponder.pid", G_FILE_TEST_EXISTS))
-+	{
-+		nm_info("Restarting mDNSResponder");
-+		nm_spawn_process("/etc/init.d/mDNSResponder stop");
-+		nm_spawn_process("/etc/init.d/mDNSResponder zap");
-+		nm_spawn_process("/etc/init.d/mDNSResponder start");
-+	}
-+	/* Apple's mDNSResponder */
-+	if (g_file_test("/var/run/mDNSResponderPosix.pid", G_FILE_TEST_EXISTS))
-+	{
-+		nm_info("Restarting mDNSResponderPosix");
-+		nm_spawn_process("/etc/init.d/mDNSResponderPosix restart");
-+	}
- }
- 
-@@ -266,5 +279,4 @@
- {
- 	char *buf;
--	char *addr;
- 	struct ether_addr hw_addr;
- 	unsigned char eui[8];
-@@ -288,4 +300,258 @@
- 	g_free(buf);
- }
-+/* Get the array associated with the key, and leave the current pointer
-+ * pointing at the line containing the key.  The char** returned MUST
-+ * be freed by the caller.
-+ */
-+gchar **
-+svGetArray(shvarFile *s, const char *key)
-+{
-+	gchar **values = NULL, **lines, *line, *value;
-+	GList *restore;
-+	int len, strvlen, i, j;
-+
-+	g_assert(s);
-+	g_assert(key);
-+
-+	/* Attempt to do things the easy way first */
-+	line = svGetValue(s, key);
-+	if (!line)
-+		return NULL;
-+	
-+	restore = s->current;
-+	
-+	g_strstrip(strtok(line, "#"));	/* Remove comments and whitespace */
-+	
-+	if (line[0] != '(')
-+	{
-+		/* This isn't an array, so pretend it's a one item array. */
-+		values = g_renew(char*, values, 2);
-+		values[0] = line;
-+		values[1] = NULL;
-+		return values;
-+	}
-+	
-+	while(!strrchr(line, ')'))
-+	{
-+		s->current = s->current->next;
-+		value = g_strjoin(" ", line, g_strstrip(strtok(s->current->data, "#")), NULL);
-+		g_free(line);
-+		line = value;
-+		value = NULL;
-+	}
-+	
-+	lines = g_strsplit(line, "\"", 0);
-+	
-+	strvlen = g_strv_length(lines);
-+	if (strvlen == 0)
-+	{
-+		/* didn't split, something's wrong */
-+		g_free(line);
-+		return NULL;
-+	}
-+	
-+	j = 0;
-+	for (i = 0; i <= strvlen - 1; i++)
-+	{
-+		value = lines[i];
-+		len = strlen(g_strstrip(value));
-+		if ((value[0] == '(') || (value[0] == ')') || (len == 0))
-+			continue;
-+		
-+		values = g_renew(char*, values, j + 2);
-+		values[j+1] = NULL;
-+		values[j++] = g_strdup(value);
-+	}
-+	
-+	g_free(line);
-+	g_strfreev(lines);
-+	s->current = restore;
-+	
-+	return values;
-+}
-+
-+/*
-+*   GentooReadConfig
-+*   
-+*   Most of this comes from the arch backend, no need to re-invent.
-+*   Read platform dependant config file and fill hash with relevant info
-+*/
-+static GHashTable * GentooReadConfig(const char* dev)
-+{
-+	GHashTable *ifs;
-+	shvarFile	*file;
-+	int len, hits, i = 0;
-+	guint32 maskval;
-+	gchar buf[16], *value, *cidrprefix, *gateway;
-+	gchar *config_str, *iface_str, *route_str, *mtu_str, *dnsserver_str, *dnssearch_str;	/* Lookup keys */
-+	gchar **conf, **config = NULL, **routes = NULL;
-+	struct in_addr mask;
-+	
-+	file = svNewFile(SYSCONFDIR"/conf.d/net");
-+	if (!file)
-+		return NULL;
-+	
-+	ifs = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
-+	if (ifs == NULL)
-+	{
-+		nm_debug("Unable to create g_hash_table.");
-+		svCloseFile(file);
-+		return NULL;
-+	}
-+	
-+	/* Keys we will use for lookups later */
-+	config_str = g_strdup_printf("config_%s", dev);
-+	iface_str = g_strdup_printf("iface_%s", dev);
-+	route_str = g_strdup_printf("routes_%s", dev);
-+	mtu_str = g_strdup_printf("mtu_%s", dev);
-+	dnsserver_str = g_strdup_printf("dns_servers_%s", dev);
-+	dnssearch_str = g_strdup_printf("dns_search_%s", dev);
-+	
-+	
-+	if ((config = svGetArray(file, iface_str)))
-+	{
-+		/* This isn't tested, (or supported, really) so hopefully it works */
-+		nm_info("You are using a deprecated configuration syntax for %s.", dev);
-+		nm_info("You are advised to read /etc/conf.d/net.example and upgrade it accordingly.");
-+		value = svGetValue(file, "gateway");
-+		if ((value) && (gateway = strstr(value, dev)) && strtok(gateway, "/"))
-+		{
-+			/* Is it possible to specify multiple gateways using this variable? */
-+			gateway = strtok(NULL, "/");
-+			routes = g_renew(char*, routes, 2);
-+			routes[0] = g_strdup_printf("default via %s", gateway);
-+			routes[1] = NULL;
-+			g_free(value);
-+		}
-+	}
-+	else
-+	{
-+		config = svGetArray(file, config_str);
-+		routes = svGetArray(file, route_str);
-+	}
-+	
-+	
-+	if ((config) && g_ascii_strcasecmp(config[0], "dhcp"))
-+	{
-+		nm_debug("Found %s in %s.", config_str, SYSCONFDIR"/conf.d/net");
-+	
-+		if (!g_ascii_strcasecmp(config[0], "null"))
-+		{
-+			nm_debug("Config disables device %s.", dev);
-+			g_hash_table_insert(ifs, g_strdup("disabled"), g_strdup("true"));
-+		}
-+		else
-+		{
-+			/* TODO: Handle "noop". */
-+			conf = g_strsplit(config[0], " ", 0);
-+			hits = g_strv_length(conf);
-+			
-+			strtok(conf[0], "/");
-+			if ((cidrprefix = strtok(NULL, "/")))
-+			{
-+				maskval = 0xffffffff;
-+				maskval <<= (32 - atoi(cidrprefix));
-+				mask.s_addr = htonl(maskval);
-+				g_hash_table_insert(ifs, g_strdup("netmask"), g_strdup(inet_ntoa(mask)));
-+			}
-+			
-+			
-+			if ((hits > 0) && inet_aton(conf[0], &mask))
-+			{
-+				g_hash_table_insert(ifs, g_strdup(dev), g_strdup(conf[i++]));
-+				while ((hits -= 2) > 0)
-+				{
-+					g_hash_table_insert(ifs, g_strdup(conf[i]), g_strdup(conf[i+1]));
-+					i += 2;
-+				}
-+			}
-+			else
-+			{
-+				nm_debug("Unhandled configuration. Switching to DHCP.");
-+				nm_debug("\t%s = %s", config_str, config[0]);
-+				g_hash_table_insert(ifs, g_strdup("dhcp"), g_strdup("true"));
-+			}
-+			g_strfreev(conf);
-+		}
-+	}
-+	else
-+	{
-+		nm_debug("Enabling DHCP for device %s.", dev);
-+		g_hash_table_insert(ifs, g_strdup("dhcp"), g_strdup("true"));
-+	}
-+	
-+	g_strfreev(config);
-+	
-+	if (routes)
-+	{
-+		nm_debug("Found %s in config.", route_str);
-+		
-+		len = g_strv_length(routes);
-+		for (i = 0; i < len; i++)
-+		{
-+			if (!sscanf(routes[i], "default via %[0-9.:]", buf))
-+				continue;
-+
-+			g_hash_table_insert(ifs,g_strdup("gateway"),g_strdup( (char*) buf));
-+		}
-+	}
-+	
-+	g_strfreev(routes);
-+	
-+	if ((value = svGetValue(file, mtu_str)))
-+	{
-+		nm_debug("Found %s in config.", mtu_str);
-+		g_hash_table_insert(ifs, g_strdup("mtu"), g_strdup(value));
-+	}
-+	
-+	g_free(value);
-+	
-+	if (!(value = svGetValue(file, dnsserver_str)))
-+	{
-+		value = svGetValue(file, "dns_servers");
-+	}
-+	if (value)
-+	{
-+		nm_debug("Found DNS nameservers in config.");
-+		g_hash_table_insert(ifs, g_strdup("nameservers"), g_strdup(value));
-+	}
-+	
-+	g_free(value);
-+	
-+	if (!(value = svGetValue(file, dnssearch_str)))
-+	{
-+		value = svGetValue(file, "dns_search");
-+	}
-+	if (value)
-+	{
-+		nm_debug("Found DNS search in config.");
-+		g_hash_table_insert(ifs, g_strdup("dnssearch"), g_strdup(value));
-+	}
-+
-+	g_free(value);
-+	svCloseFile(file);
-+	
-+	if ((file = svNewFile(SYSCONFDIR"/conf.d/hostname")))
-+	{	
-+		if ((value = svGetValue(file, "HOSTNAME")) && (strlen(value) > 0))
-+		{
-+			nm_debug("Found hostname.");
-+			g_hash_table_insert(ifs, g_strdup("hostname"), g_strdup(value));
-+		}
-+		
-+		g_free(value);
-+		svCloseFile(file);
-+	}
-+
-+		
-+	g_free(config_str);
-+	g_free(iface_str);
-+	g_free(route_str);
-+	g_free(mtu_str);
-+	g_free(dnsserver_str);
-+	g_free(dnssearch_str);
-+	
-+	return ifs;
-+}
- 
- typedef struct GentooSystemConfigData
-@@ -293,6 +559,7 @@
- 	NMIP4Config *	config;
- 	gboolean		use_dhcp;
-+	gboolean		system_disabled;
-+	guint32		mtu;
- } GentooSystemConfigData;
--
- 
- /*
-@@ -304,133 +571,172 @@
-  *
-  */
--void *nm_system_device_get_system_config (NMDevice *dev, NMData *app_data)
--{
--	char		*cfg_file_path = NULL;
--	FILE		*file = NULL;
--	char		 buffer[100];
--	char		 confline[100], dhcpline[100], ipline[100];
--	int		 ipa, ipb, ipc, ipd;
-- 	int		 nNext =  0, bNext = 0, count = 0;
--	char		*confToken;
--	gboolean	 data_good = FALSE;
--	gboolean	 use_dhcp = TRUE;
--	GentooSystemConfigData *sys_data = NULL;
--	guint32	 ip4_address = 0;
--	guint32	 ip4_netmask = 0;
--	guint32	 ip4_gateway = 0;
--	guint32	 ip4_broadcast = 0;
--
--	g_return_val_if_fail (dev != NULL, NULL);
--
--	sys_data = g_malloc0 (sizeof (GentooSystemConfigData));
--    sys_data->config = nm_device_get_ip4_config(dev);
--	/* We use DHCP on an interface unless told not to */
-+void* nm_system_device_get_system_config (NMDevice * dev, NMData *app_data)
-+{
-+	GHashTable* ifh;
-+	gpointer val;
-+	gchar **strarr;
-+	GentooSystemConfigData*   sys_data = NULL;
-+	int len, i;
-+
-+	g_return_val_if_fail(dev != NULL, NULL);
-+	
-+	sys_data = g_malloc0(sizeof (GentooSystemConfigData));
- 	sys_data->use_dhcp = TRUE;
--	nm_device_set_use_dhcp (dev, TRUE);
--//	nm_ip4_config_set_address (sys_data->config, 0);
--//	nm_ip4_config_set_gateway (sys_data->config, 0);
--//	nm_ip4_config_set_netmask (sys_data->config, 0);
--
--	/* Gentoo systems store this information in
--	 * /etc/conf.d/net, this is for all interfaces.
--	 */
--
--	cfg_file_path = g_strdup_printf ("/etc/conf.d/net");
--	if (!cfg_file_path)
-+	sys_data->system_disabled = FALSE;
-+	sys_data->mtu = 0;
-+	sys_data->config=NULL;
-+
-+	ifh = GentooReadConfig(nm_device_get_iface(dev));
-+	if (ifh == NULL)
-+	{
-+		g_free(sys_data);
- 		return NULL;
--
--	if (!(file = fopen (cfg_file_path, "r")))
--	{
--		g_free (cfg_file_path);
--		return NULL;
--	}
-- 	sprintf(confline, "iface_%s", nm_device_get_iface (dev));
-- 	sprintf(dhcpline, "iface_%s=\"dhcp\"", nm_device_get_iface (dev));
--	while (fgets (buffer, 499, file) && !feof (file))
--	{
--		/* Kock off newline if any */
--		g_strstrip (buffer);
--
--		if (strncmp (buffer, confline, strlen(confline)) == 0)
-+	}
-+	
-+	val = g_hash_table_lookup(ifh, "disabled");
-+	if (val)
-+	{
-+		if (!strcasecmp (val, "true"))
-+		{
-+			nm_info ("System configuration disables device %s", nm_device_get_iface (dev));
-+			sys_data->system_disabled = TRUE;
-+		}
-+	}
-+	
-+	val = g_hash_table_lookup(ifh, "mtu");
-+	if (val)
-+	{
-+		guint32 mtu;
-+		
-+		mtu = strtoul(val, NULL, 10);
-+		if (mtu > 500 && mtu < INT_MAX)
-+		{
-+			nm_debug("System configuration specifies a MTU of %i for device %s", mtu, nm_device_get_iface(dev));
-+			sys_data->mtu = mtu;
-+		}
-+	}
-+	val = g_hash_table_lookup(ifh, "hostname");
-+	if (val)
-+	{
-+		nm_ip4_config_set_hostname(sys_data->config, val);
-+	}
-+	
-+	val = g_hash_table_lookup(ifh, nm_device_get_iface(dev));
-+	if (val && !g_hash_table_lookup(ifh, "dhcp"))
-+	{
-+		/* This device does not use DHCP */
-+
-+		sys_data->use_dhcp=FALSE;
-+		sys_data->config = nm_ip4_config_new();
-+
-+		nm_ip4_config_set_address (sys_data->config, inet_addr (val));
-+
-+		val = g_hash_table_lookup(ifh, "gateway");
-+		if (val)
-+			nm_ip4_config_set_gateway (sys_data->config, inet_addr (val));
-+		else
-+		{
-+			nm_info ("Network configuration for device '%s' does not specify a gateway but is "
-+				 "statically configured (non-DHCP).", nm_device_get_iface (dev));
-+		}
-+
-+		val = g_hash_table_lookup(ifh, "netmask");
-+		if (val)
-+			nm_ip4_config_set_netmask (sys_data->config, inet_addr (val));
-+		else
-+		{
-+			guint32 addr = nm_ip4_config_get_address (sys_data->config);
-+
-+			/* Make a default netmask if we have an IP address */
-+			if (((ntohl (addr) & 0xFF000000) >> 24) <= 127)
-+				nm_ip4_config_set_netmask (sys_data->config, htonl (0xFF000000));
-+			else if (((ntohl (addr) & 0xFF000000) >> 24) <= 191)
-+				nm_ip4_config_set_netmask (sys_data->config, htonl (0xFFFF0000));
-+			else
-+				nm_ip4_config_set_netmask (sys_data->config, htonl (0xFFFFFF00));
-+		}
-+
-+		val = g_hash_table_lookup(ifh, "broadcast");
-+		if (val)
-+			nm_ip4_config_set_broadcast (sys_data->config, inet_addr (val));
-+		else if ((val = g_hash_table_lookup(ifh, "brd")))
-+			nm_ip4_config_set_broadcast (sys_data->config, inet_addr (val));
-+		else
-+		{
-+			guint32 broadcast = ((nm_ip4_config_get_address (sys_data->config) & nm_ip4_config_get_netmask (sys_data->config))
-+							 | ~nm_ip4_config_get_netmask (sys_data->config));
-+			nm_ip4_config_set_broadcast (sys_data->config, broadcast);
-+		}
-+		
-+		val = g_hash_table_lookup(ifh, "nameservers");
-+		if (val)
-+		{
-+			nm_debug("Using DNS nameservers \"%s\" from config for device %s.", val, nm_device_get_iface(dev));
-+			if ((strarr = g_strsplit(val, " ", 0)))
- 			{
--			/* Make sure this config file is for this device */
--			if (strncmp (&buffer[strlen(confline) - strlen(nm_device_get_iface (dev))], 
--				nm_device_get_iface (dev), strlen(nm_device_get_iface (dev))) != 0)
-+				len = g_strv_length(strarr);
-+				for(i = 0; i < len; i++)
- 				{
--				nm_warning ("System config file '%s' does not define device '%s'\n",
--                                             cfg_file_path, nm_device_get_iface (dev));
--				break;
--			}
--			else
--				data_good = TRUE;
--
--			if (strncmp (buffer, dhcpline, strlen(dhcpline)) == 0)
--			{
--				use_dhcp = TRUE;
-+					guint32 addr = (guint32) (inet_addr (strarr[i]));
-+
-+					if (addr != (guint32) -1)
-+						nm_ip4_config_add_nameserver(sys_data->config, addr);
-+				}
-+				
-+				g_strfreev(strarr);
- 			}
- 			else
- 			{
--				use_dhcp = FALSE;
--				confToken = strtok(&buffer[strlen(confline) + 2], " ");
--				while (count < 3)
--					{
--					if (nNext == 1 && bNext == 1)
--					{
--						ip4_address = inet_addr (confToken);
--						count++;
--						continue;
--					}
--					if (strcmp(confToken, "netmask") == 0)
--					{
--						confToken = strtok(NULL, " ");
--						ip4_netmask = inet_addr (confToken);
--						count++;
--						nNext = 1;
--					}
--					else if (strcmp(confToken, "broadcast") == 0)
--					{
--						confToken = strtok(NULL, " ");
--						count++;
--						bNext = 1;
--					}
--					else
--					{
--						ip4_address = inet_addr (confToken);
--						count++;
--					}
--						confToken = strtok(NULL, " ");
--					}
-+				guint32 addr = (guint32) (inet_addr (val));
-+
-+				if (addr != (guint32) -1)
-+					nm_ip4_config_add_nameserver(sys_data->config, addr);
-+			}
-+		}
-+
-+		val = g_hash_table_lookup(ifh, "dnssearch");
-+		if (val)
-+		{
-+			nm_debug("Using DNS search \"%s\" from config for device %s.", val, nm_device_get_iface(dev));
-+			if ((strarr = g_strsplit(val, " ", 0)))
-+			{
-+				len = g_strv_length(strarr);
-+				for(i = 0; i < len; i++)
-+				{
-+					if (strarr[i])
-+						nm_ip4_config_add_domain(sys_data->config, strarr[i]);
- 				}
-+				
-+				g_strfreev(strarr);
- 			}
--		/* If we aren't using dhcp, then try to get the gateway */
--		if (!use_dhcp)
-+			else
- 			{
--			sprintf(ipline, "gateway=\"%s/", nm_device_get_iface (dev));
--			if (strncmp(buffer, ipline, strlen(ipline) - 1) == 0)
-+				nm_ip4_config_add_domain(sys_data->config, val);
-+			}
-+		}
-+		
-+		nm_ip4_config_set_mtu (sys_data->config, sys_data->mtu);
-+
-+#if 0
-+		{
-+			int j;
-+			nm_debug ("------ Config (%s)", nm_device_get_iface (dev));
-+			nm_debug ("    ADDR=%d", nm_ip4_config_get_address (sys_data->config));
-+			nm_debug ("    GW  =%d", nm_ip4_config_get_gateway (sys_data->config));
-+			nm_debug ("    NM  =%d", nm_ip4_config_get_netmask (sys_data->config));
-+			nm_debug ("    NSs =%d",nm_ip4_config_get_num_nameservers(sys_data->config));
-+			for (j=0;j<nm_ip4_config_get_num_nameservers(sys_data->config);j++)
- 			{
--				sprintf(ipline, "gateway=\"%s/%%d.%%d.%%d.%%d\"", nm_device_get_iface (dev) );
--				sscanf(buffer, ipline, &ipa, &ipb, &ipc, &ipd);
--				sprintf(ipline, "%d.%d.%d.%d", ipa, ipb, ipc, ipd);
--				ip4_gateway = inet_addr (ipline);
-+				nm_debug ("    NS =%d",nm_ip4_config_get_nameserver(sys_data->config,j));
- 			}
--		}		
--	}
--	fclose (file);
--	g_free (cfg_file_path);
-- 
--	/* If successful, set values on the device */
--	if (data_good)
--	{
--        nm_warning("data good :-)");
--		nm_device_set_use_dhcp (dev, use_dhcp);
--		if (ip4_address)
--            nm_ip4_config_set_address (sys_data->config, ip4_address);
--		if (ip4_gateway)
--            nm_ip4_config_set_gateway (sys_data->config, ip4_gateway);
--		if (ip4_netmask)
--			nm_ip4_config_set_netmask (sys_data->config, ip4_netmask);
--		if (ip4_broadcast)
--			nm_ip4_config_set_broadcast (sys_data->config, ip4_broadcast);
--	}
-+			nm_debug ("---------------------\n");
-+		}
-+#endif
-+
-+	}
-+	
-+	g_hash_table_destroy(ifh);
-+
-+
- 	return (void *)sys_data;
- }
-@@ -519,4 +825,11 @@
- gboolean nm_system_device_get_disabled (NMDevice *dev)
- {
-+	GentooSystemConfigData *sys_data;
-+
-+	g_return_val_if_fail (dev != NULL, FALSE);
-+
-+	if ((sys_data = nm_device_get_system_config_data (dev)))
-+		return sys_data->system_disabled;
-+
- 	return FALSE;
- }
-@@ -576,4 +889,35 @@
- void nm_system_set_hostname (NMIP4Config *config)
- {
-+	char *h_name = NULL;
-+	const char *hostname;
-+
-+	g_return_if_fail (config != NULL);
-+
-+	hostname = nm_ip4_config_get_hostname (config);
-+	if (!hostname)
-+	{
-+		struct in_addr temp_addr;
-+		struct hostent *host;
-+
-+		/* try to get hostname via dns */
-+		temp_addr.s_addr = nm_ip4_config_get_address (config);
-+		host = gethostbyaddr ((char *) &temp_addr, sizeof (temp_addr), AF_INET);
-+		if (host)
-+		{
-+			h_name = g_strdup (host->h_name);
-+			hostname = strtok (h_name, ".");
-+		}
-+		else
-+			nm_warning ("nm_system_set_hostname(): gethostbyaddr failed, h_errno = %d", h_errno);
-+	}
-+
-+	if (hostname)
-+	{
-+		nm_info ("Setting hostname to '%s'", hostname);
-+		if (sethostname (hostname, strlen (hostname)) < 0)
-+			nm_warning ("Could not set hostname.");
-+	}
-+
-+	g_free (h_name);
- }
- 
-@@ -596,4 +940,11 @@
- guint32 nm_system_get_mtu (NMDevice *dev)
- {
-+	GentooSystemConfigData *sys_data;
-+
-+	g_return_val_if_fail (dev != NULL, 0);
-+
-+	if ((sys_data = nm_device_get_system_config_data (dev)))
-+		return sys_data->mtu;
-+
- 	return 0;
- }
diff --git a/net-misc/networkmanager/files/networkmanager-use-kernel-headers.patch b/net-misc/networkmanager/files/networkmanager-use-kernel-headers.patch
deleted file mode 100644
index e74c3c54834a..000000000000
--- a/net-misc/networkmanager/files/networkmanager-use-kernel-headers.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN NetworkManager-0.5.2.orig/src/nm-device-802-3-ethernet.c NetworkManager-0.5.2/src/nm-device-802-3-ethernet.c
---- NetworkManager-0.5.2.orig/src/nm-device-802-3-ethernet.c	2006-02-04 05:20:00.000000000 -0600
-+++ NetworkManager-0.5.2/src/nm-device-802-3-ethernet.c	2006-02-04 05:20:26.000000000 -0600
-@@ -18,7 +18,7 @@
-  *
-  * (C) Copyright 2005 Red Hat, Inc.
-  */
--
-+#define HEADERS_KERNEL
- #include <glib.h>
- #include <glib/gi18n.h>
- #include <dbus/dbus.h>
diff --git a/net-misc/networkmanager/networkmanager-0.6.6.ebuild b/net-misc/networkmanager/networkmanager-0.6.6.ebuild
deleted file mode 100644
index 4b76fece7216..000000000000
--- a/net-misc/networkmanager/networkmanager-0.6.6.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# 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.6.6.ebuild,v 1.6 2009/04/22 13:30:43 rbu Exp $
-
-inherit gnome2 eutils
-
-# NetworkManager likes itself with capital letters
-MY_P=${P/networkmanager/NetworkManager}
-
-DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-# Release candidate for 0.6.6, Hosted in dcbw's redhat space.
-SRC_URI="http://people.redhat.com/dcbw/NetworkManager/0.6.6/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="crypt doc gnome"
-
-# Yes, I know that configure will accept libnl 1.0-pre8, however we only have
-# 1.1 in the tree, therefore dep on it.
-RDEPEND=">=sys-apps/dbus-0.60
-	>=sys-apps/hal-0.5.10
-	sys-apps/iproute2
-	>=dev-libs/libnl-1.1
-	>=net-misc/dhcdbd-1.4
-	>=net-wireless/wireless-tools-28_pre9
-	>=net-wireless/wpa_supplicant-0.4.8
-	>=dev-libs/glib-2.8
-	gnome? ( >=x11-libs/gtk+-2.8
-		>=gnome-base/libglade-2
-		>=gnome-base/gnome-keyring-0.4
-		>=gnome-base/gconf-2
-		>=gnome-base/libgnomeui-2 )
-	crypt? ( dev-libs/libgcrypt )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool"
-PDEPEND="gnome? ( >gnome-extra/nm-applet-0.6.5 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-USE_DESTDIR="1"
-
-G2CONF="${G2CONF} \
-	`use_with crypt gcrypt` \
-	`use_with gnome` \
-	--disable-more-warnings \
-	--localstatedir=/var \
-	--with-distro=gentoo \
-	--with-dbus-sys=/etc/dbus-1/system.d"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if built_with_use sys-apps/iproute2 minimal ; then
-		eerror "Please rebuild sys-apps/iproute2 without the minimal useflag."
-		die "Fix iproute2 first."
-	fi
-}
-
-src_unpack () {
-	unpack ${A}
-	cd "${S}"
-
-	# Use the kernel headers
-	epatch "${FILESDIR}/${PN}-use-kernel-headers.patch"
-	# Fix the resolv.conf permissions
-	epatch "${FILESDIR}/${PN}-resolvconf-perms.patch"
-	# Fix up the dbus conf file to use plugdev group
-	epatch "${FILESDIR}/${PN}-0.6.5-confchanges.patch"
-}
-
-src_install() {
-	gnome2_src_install
-	# Need to keep the /var/run/NetworkManager directory
-	keepdir /var/run/NetworkManager
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	elog "You need to be in the plugdev group in order to use NetworkManager"
-	elog "Problems with your hostname getting changed?"
-	elog ""
-	elog "Add the following to /etc/dhcp/dhclient.conf"
-	elog 'send host-name "YOURHOSTNAME";'
-	elog 'supersede host-name "YOURHOSTNAME";'
-
-	elog "You will need to restart DBUS if this is your first time"
-	elog "installing NetworkManager."
-}
diff --git a/net-misc/networkmanager/networkmanager-0.7.1-r6.ebuild b/net-misc/networkmanager/networkmanager-0.7.1-r6.ebuild
deleted file mode 100644
index e0ac0e4eb748..000000000000
--- a/net-misc/networkmanager/networkmanager-0.7.1-r6.ebuild
+++ /dev/null
@@ -1,141 +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.7.1-r6.ebuild,v 1.7 2010/01/06 21:44:06 ranger Exp $
-
-EAPI="2"
-inherit eutils autotools
-
-PATCH_VERSION="1b"
-
-# 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="amd64 ~arm ppc ~ppc64 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.92
-	>=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
-	dev-util/gtk-doc-am
-	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"'
-}
diff --git a/net-misc/networkmanager/networkmanager-0.7.2.ebuild b/net-misc/networkmanager/networkmanager-0.7.2.ebuild
deleted file mode 100644
index 9365be0a0c99..000000000000
--- a/net-misc/networkmanager/networkmanager-0.7.2.ebuild
+++ /dev/null
@@ -1,130 +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.7.2.ebuild,v 1.5 2010/01/22 19:19:21 ranger Exp $
-
-EAPI="2"
-inherit eutils
-# autotools
-
-#PATCH_VERSION="1b"
-
-# 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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 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
-	>=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
-	dev-util/gtk-doc-am
-	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"
-
-}
-
-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"'
-}