Bump, drop old. First stable release in the 0.9.2 series.

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

6 files changed, 19 insertions, 299 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index 21593fff3c60..21e4e3ff4609 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/networkmanager
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.119 2011/11/07 18:27:29 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.120 2011/11/13 23:19:00 tetromino Exp $
+
+*networkmanager-0.9.2.0 (13 Nov 2011)
+
+  13 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -networkmanager-0.9.1.90-r3.ebuild,
+  -files/networkmanager-0.9.1.90-force-libnl1.1.patch,
+  -files/networkmanager-0.9.1.90-if.h.patch,
+  -files/networkmanager-0.9.1.90-rfkill.patch, +networkmanager-0.9.2.0.ebuild:
+  Bump, drop old. First stable release in the 0.9.2 series.
 
 *networkmanager-0.9.1.95 (07 Nov 2011)
 
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index d3255b7d6f7d..ceb4252ab4c2 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -9,9 +9,6 @@ AUX networkmanager-0.8-read-hostname.patch 2380 RMD160 8b4349293235d2b63546b4e65
 AUX networkmanager-0.8.4.0-fix-tests.patch 2079 RMD160 8e867d51abbd0418e4eeb92d5e9d8315cafe78fe SHA1 31f9ab7e9f35798590e5c35965f9b96874055550 SHA256 33ca19856777794b558b88972a5ba15a13c53d77834eaf2339a64c6b072c31a7
 AUX networkmanager-0.8.4.0-ifnet-smarter-write.patch 5969 RMD160 d401c8eae69ea70f5bf08f2950a6e476a03f460b SHA1 9a1fde1c789b42ce6e3b0766125862bde962b4c8 SHA256 b4fbc482cbc22edfff0f89624d857cd35b6cb3d7fe85604c5453e7685eb4e12a
 AUX networkmanager-0.8.4.0-shared-connection.patch 15067 RMD160 3e878a999e92fdb6baffba6f2a12caa25a2ba2c6 SHA1 e9664c505bc19964082aa319c4d524e6cf6651e2 SHA256 57f56fb45e48f80636a17d64f080aae594d6f19e51ff5467cc27a739b4b380e6
-AUX networkmanager-0.9.1.90-force-libnl1.1.patch 1107 RMD160 16fa945b15f7efb6a4e3d3d48fec8a59d1af2b95 SHA1 11fad910de906806eda886aee72ba220934fd19a SHA256 b74af98b60bfe5ecdb54804f0c9cd7e8110790bd974f5bcea21aaa6d2c669e38
-AUX networkmanager-0.9.1.90-if.h.patch 3188 RMD160 e7491815436511b45464371dbe909b8ac051bdf6 SHA1 af7af4ade7dcdb5853cd05f9a4c0ebd15b89eac5 SHA256 b4ae29559a45fcb3a09518d3306c951a641ad3b807033e623dba96eabcd3f37c
-AUX networkmanager-0.9.1.90-rfkill.patch 5016 RMD160 47cd9a355b030f6ad8732b61784a171e085a4c96 SHA1 9567dc8d96d50710b1992c5b428bce6308e9a7dd SHA256 8ca3d9d01612bf9a0a4eeae56bc3d5e6e7f50e4a07be4f238c3c693501a9c67d
 AUX networkmanager-0.9.1.95-dns-routing-unmanaged-devices.patch 2740 RMD160 014d4d3d887995861cb9c5f930c37e4aabfc519a SHA1 d6a05686ec9c18da9df4606561a08f248961c7b7 SHA256 f5f37f6addba0cd0326cb08d7d1949cc2f074c38967bcaddd805a67f944a3f23
 AUX networkmanager-0.9.1.95-force-libnl1.1.patch 1883 RMD160 fc6760cdcba81710c7232c536ee31276fe676062 SHA1 9bb1257b55f7a15d61f6c30d27ec7ded7c49da7a SHA256 1fb9d5bbda83e056c7ea53bcb5463f2f1b1c09d91b05a0df5fcfd948fb4c0007
 AUX networkmanager-0.9.1.95-glib-2.31.patch 4932 RMD160 6d20b856a4c3ce86cc15f10439ac437c1f70e0aa SHA1 2c773a16109e57eddb7bf8a1932c05eb3c5442a1 SHA256 b5a70e9a29d11a0455493d895abeb673042c7bcbc149c16a12b6f70ca8ab4912
@@ -22,19 +19,19 @@ AUX nm-system-settings.conf-ifnet 70 RMD160 c0d2be147383999b62cead86ab4333169e4e
 DIST NetworkManager-0.8.4.0.tar.bz2 1672926 RMD160 d2f20c4130b1a0015973358920802ad6796e7400 SHA1 85a75f7ed80cbdd4b35797ae5698cafad10084c8 SHA256 e71f2ed5b28b9d46566fbf573e43ee8553e60aa3f557dc61e07b9e198c657588
 DIST NetworkManager-0.8.tar.bz2 1376044 RMD160 40074f52a79965510de816c0e94d1b9ac582c522 SHA1 fd290057a9246055fa59507b6a3d6b99ceb4c3dc SHA256 4ac38f5c6ddbbcc67601ba898dd475457e2d259b77f9680eee51cb07f19c1b05
 DIST NetworkManager-0.9.0.tar.xz 1740644 RMD160 340fa7db13ba9163e3092acfdd23b4e9d946a664 SHA1 635cc2b32fd820b3c2c14d27ced208d3adc6a708 SHA256 166db385e5a349dd320f061554a54a9d599eb5bfc8fcbcc836cf5046904c5149
-DIST NetworkManager-0.9.1.90.tar.xz 1749596 RMD160 7665b4d55974085de31fd81d1150c3afc17d6703 SHA1 3a5f384d7db3dc76d02b2cb8156adfc3078c96b8 SHA256 de7e5d6de80bf14ada468d01f15dd4b118a6bef5d06cadf04954fd7de7ce5910
 DIST NetworkManager-0.9.1.95.tar.xz 1761076 RMD160 3882ee276737cbe18c209420b4e75dea924b37d5 SHA1 337b2e2d9bcce32f7adbbb145f04de3ce26d9771 SHA256 4702c25324fc6c0e860a9be9860b898ce444333d084b0d5b86b069bbd5fee468
+DIST NetworkManager-0.9.2.0.tar.xz 1764032 RMD160 f9104c2d2af3df9879551d090944f6df0ef8e172 SHA1 9e174ded9cdd27b4424b5c35cd985e23dd7f8924 SHA256 437af9132a6fe1ff603cd981c0cfaa4557592b34782f9705e708d61365226ddf
 EBUILD networkmanager-0.8-r1.ebuild 3718 RMD160 abf962bc9f2368b13d28432994383e37d82aa76c SHA1 1ff8a79f45d9daab366466d0a9858e4fcfabad83 SHA256 ffd2d70ed1172833aa994d6e62ef5a00503119e5dd1c2c9090ceac348ab78414
 EBUILD networkmanager-0.8.4.0-r2.ebuild 4336 RMD160 a6b9df362d700edc3ae404c186e82783590e1d44 SHA1 c7da5c3d80168ceb8ed6c16d540ba42422fe3a0d SHA256 256c6c1bda7b1d45835a0236bd59ee8a4b99f1cc888d63ca54679ea3d6959e9f
 EBUILD networkmanager-0.9.0.ebuild 3945 RMD160 cd897dc8dc3fa92d4f4694a5acd703be6f9b5be1 SHA1 ef7eaa7e68bf01c2f4ea280742f30f856ef76ef6 SHA256 ab67f7f112c3b415c70f08b1ea9d6c029b7733203bafb512250e483b91c61bc8
-EBUILD networkmanager-0.9.1.90-r3.ebuild 4795 RMD160 73126e96c46ca1476d289b1101f8d830c703ca63 SHA1 93727fb458cb41c0af7744eccceb84819c7746f9 SHA256 fac43deca77c72b040e7b6af205bb2acc7ee26636a2d70cea4389e45f4d8fb92
 EBUILD networkmanager-0.9.1.95.ebuild 4926 RMD160 2a93cf7a8e56c5a5717dfbe44eb782c6a71efa94 SHA1 47cb6a9354dcc37eba1b56b286cbbd6d56fb1e7e SHA256 2beb60a101e6a8ee920b20f7ffa711f4250073cb10369d829e1c3f17b40fa8f1
-MISC ChangeLog 26481 RMD160 1a987079db1f4c0ba2ffaa6f9db7b45fe2f95738 SHA1 f94a2f76581c0916f2498dd826d25ca31ade1e36 SHA256 f95115afa97f6ad2593a910ff07c143a50a30bc7316eaf44a989a8df2aa656f3
+EBUILD networkmanager-0.9.2.0.ebuild 4603 RMD160 3debbefb4e568c8f9a88afbe99c9b396c23e2c8a SHA1 ac79b40c257c8f35785de76abd642dc57d3a2a42 SHA256 dc3ed6e10b182eaf4630e819a413c07a2193da9d2d575a4dac8ab2a443ead44e
+MISC ChangeLog 26857 RMD160 70bdecbf9b31facc6d71a97415333432b0b7dc23 SHA1 8e5ff6bfc81a33aabeba95ea64774a177bc62e51 SHA256 d9cedc4601e834a280b14488320f99614a7e3462bb2ca5f40d6b37951c880299
 MISC metadata.xml 1330 RMD160 e4f803e3c28dc220a820f908667df763a4320097 SHA1 541270c3f3c902f9378451bd47d00379c725af6b SHA256 d7e9e19f1ebd28e9058f8ef868bc6298b77c45461bfbc93c155a5aa9166c65c4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk64IxcACgkQdjK8w9WeBnCHSgD+Mp/L87sZDld2SwC2sslslxa5
-8a6edaCgEuMk+ZjDYe0A/3Xsn6wdLRiICYS9ut21dH8/gaK/LLQbOFlqEX9/hSCJ
-=R23q
+iF4EAREIAAYFAk7AUGoACgkQdjK8w9WeBnDuhQEAuNz9M3LBzHPpaFC1qaON/gFR
+hB8stkLDEc/Wb6uGzOkA/0orX1q8HC92izRqEhBfNhZ8EtRSgpMpBRqCoWC4cgrY
+=Dq/9
 -----END PGP SIGNATURE-----
diff --git a/net-misc/networkmanager/files/networkmanager-0.9.1.90-force-libnl1.1.patch b/net-misc/networkmanager/files/networkmanager-0.9.1.90-force-libnl1.1.patch
deleted file mode 100644
index e4da7b3990bc..000000000000
--- a/net-misc/networkmanager/files/networkmanager-0.9.1.90-force-libnl1.1.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Build against libnl:1.1 only. Otherwise, networkmanager will link to
-libnl-3.so and to libiWmxSdk (from wimax-1.5.2) which links to libnl.so,
-and then explode spectacularly at runtime due to symbol collisions.
-
-diff --git a/configure.ac b/configure.ac
-index 117dd91..b8b11de 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -323,24 +323,6 @@ if (test "${have_libnl1}" = "yes"); then
- 	have_libnl="yes"
- fi
- 
--PKG_CHECK_MODULES(LIBNL2, libnl-2.0, [have_libnl2=yes], [have_libnl2=no])
--if (test "${have_libnl2}" = "yes"); then
--	AC_DEFINE(HAVE_LIBNL2, 1, [Define if you require specific libnl-2 support])
--	LIBNL_CFLAGS="$LIBNL2_CFLAGS"
--	LIBNL_LIBS="$LIBNL2_LIBS"
--	libnl_version="2"
--	have_libnl="yes"
--fi
--
--PKG_CHECK_MODULES(LIBNL3, libnl-3.0, [have_libnl2=yes], [have_libnl2=no])
--if (test "${have_libnl2}" = "yes"); then
--	AC_DEFINE(HAVE_LIBNL3, 1, [Define if you require specific libnl-3 support])
--	LIBNL_CFLAGS="$LIBNL3_CFLAGS"
--	LIBNL_LIBS="$LIBNL3_LIBS"
--	libnl_version="3"
--	have_libnl="yes"
--fi
--
- if (test "${have_libnl}" = "no"); then
- 	AC_MSG_ERROR([libnl development header are required])
- fi
diff --git a/net-misc/networkmanager/files/networkmanager-0.9.1.90-if.h.patch b/net-misc/networkmanager/files/networkmanager-0.9.1.90-if.h.patch
deleted file mode 100644
index 20785693cc05..000000000000
--- a/net-misc/networkmanager/files/networkmanager-0.9.1.90-if.h.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-commit 00f2b0a9bb806be64c5868af44f43dbe55bdd75b
-Author: Thomas Graf <tgraf@redhat.com>
-Date:   Fri Sep 23 13:46:41 2011 +0200
-
-    core: Include <linux/if.h> instead of <net/if.h>
-    
-    NM already includes <linux/if.h> in some places, f.e. nm-netlink-monitor and
-    we can't mix usage of the two. Stick to using <linux/if.h> as it provides
-    additional flag definitions such as operational link state and link mode.
-    
-    Signed-off-by: Thomas Graf <tgraf@redhat.com>
-    
-    [ Alexandre Rostovtsev <tetromino@gentoo.org>: remove parts of commit
-    unrelated to if.h changes. ]
-
-diff --git a/include/wireless-helper.h b/include/wireless-helper.h
-index d150ef7..2e4509a 100644
---- a/include/wireless-helper.h
-+++ b/include/wireless-helper.h
-@@ -27,6 +27,6 @@
- #include <sys/types.h>
- #include <linux/types.h>
- #include <sys/socket.h>
--#include <net/if.h>
-+#include <linux/if.h>
- #include <wireless.h>
- 
-diff --git a/src/nm-device.c b/src/nm-device.c
-index c0b1b87..559606c 100644
---- a/src/nm-device.c
-+++ b/src/nm-device.c
-@@ -25,7 +25,6 @@
- #include <dbus/dbus.h>
- #include <netinet/in.h>
- #include <string.h>
--#include <net/if.h>
- #include <unistd.h>
- #include <errno.h>
- #include <sys/ioctl.h>
-@@ -34,6 +33,7 @@
- #include <sys/wait.h>
- #include <arpa/inet.h>
- #include <fcntl.h>
-+#include <linux/if.h>
- 
- #include "nm-glib-compat.h"
- #include "nm-device-interface.h"
-diff --git a/src/nm-system.c b/src/nm-system.c
-index 0b29468..473fcec 100644
---- a/src/nm-system.c
-+++ b/src/nm-system.c
-@@ -40,7 +40,7 @@
- #include <netdb.h>
- #include <glib.h>
- #include <ctype.h>
--#include <net/if.h>
-+#include <linux/if.h>
- 
- #include "nm-system.h"
- #include "nm-device.h"
-diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c
-index 522c075..3546f8d 100644
---- a/src/ppp-manager/nm-ppp-manager.c
-+++ b/src/ppp-manager/nm-ppp-manager.c
-@@ -32,7 +32,7 @@
- #include <sys/socket.h>
- #include <sys/ioctl.h>
- #include <asm/types.h>
--#include <net/if.h>
-+#include <linux/if.h>
- #include <sys/stat.h>
- 
- #include <linux/ppp_defs.h>
-diff --git a/src/settings/plugins/ifcfg-rh/reader.c b/src/settings/plugins/ifcfg-rh/reader.c
-index 691a176..910cca3 100644
---- a/src/settings/plugins/ifcfg-rh/reader.c
-+++ b/src/settings/plugins/ifcfg-rh/reader.c
-@@ -28,10 +28,10 @@
- #include <ctype.h>
- #include <sys/inotify.h>
- #include <errno.h>
--#include <net/if.h>
- #include <sys/ioctl.h>
- #include <unistd.h>
- #include <netinet/ether.h>
-+#include <linux/if.h>
- 
- #ifndef __user
- #define __user
-diff --git a/src/wimax/iwmxsdk.c b/src/wimax/iwmxsdk.c
-index ff6b553..9c3a78b 100644
---- a/src/wimax/iwmxsdk.c
-+++ b/src/wimax/iwmxsdk.c
-@@ -27,7 +27,8 @@
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
--#include <net/if.h>
-+#include <sys/socket.h>
-+#include <linux/if.h>
- 
- #include <glib.h>
- 
-diff --git a/src/wimax/nm-device-wimax.c b/src/wimax/nm-device-wimax.c
-index b6afc27..6654140 100644
---- a/src/wimax/nm-device-wimax.c
-+++ b/src/wimax/nm-device-wimax.c
-@@ -23,7 +23,8 @@
- #include <unistd.h>
- #include <sys/ioctl.h>
- #include <net/ethernet.h>
--#include <net/if.h>
-+#include <sys/socket.h>
-+#include <linux/if.h>
- 
- #include <WiMaxAPI.h>
- #include <WiMaxAPIEx.h>
diff --git a/net-misc/networkmanager/files/networkmanager-0.9.1.90-rfkill.patch b/net-misc/networkmanager/files/networkmanager-0.9.1.90-rfkill.patch
deleted file mode 100644
index 0ddf3ad7c6c6..000000000000
--- a/net-misc/networkmanager/files/networkmanager-0.9.1.90-rfkill.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From 339229e4c698c61e20a28bfc33d8501490891427 Mon Sep 17 00:00:00 2001
-From: Gary Ching-Pang Lin <chingpang@gmail.com>
-Date: Tue, 20 Sep 2011 08:36:35 +0000
-Subject: core: improving handling of rfkill (bgo #655773)
-
-This commit improves the handling of rfkill.
-
-- The original two passes check gathers the states of platform
-  and non-platform switches in two separate loops. Now we gather
-  the both states in one loop and determine the final states later.
-
-- A new rule is used to determine the states of switches.
-
-  if (platform_state == UNBLOCKED)
-          choose non_platform_state;
-  else
-          choose platform_state;
-
-  The state is UNBLOCKED if and only if both the platform and
-  non-platform switches are unblocked, so the ambiguous state in
-  bgo#655773 will not happen.
-
-  Original code always preferred the platform switch state over
-  the device switch state, so if the platform switch was UNBLOCKED
-  but the device was BLOCKED, NM would treat the device as
-  UNBLOCKED and try to activate it, and obviously fail.
----
-diff --git a/src/nm-udev-manager.c b/src/nm-udev-manager.c
-index 72501c2..3e855b7 100644
---- a/src/nm-udev-manager.c
-+++ b/src/nm-udev-manager.c
-@@ -195,78 +195,50 @@ recheck_killswitches (NMUdevManager *self)
- 	NMUdevManagerPrivate *priv = NM_UDEV_MANAGER_GET_PRIVATE (self);
- 	GSList *iter;
- 	RfKillState poll_states[RFKILL_TYPE_MAX];
-+	RfKillState platform_states[RFKILL_TYPE_MAX];
- 	gboolean platform_checked[RFKILL_TYPE_MAX];
- 	int i;
- 
- 	/* Default state is unblocked */
- 	for (i = 0; i < RFKILL_TYPE_MAX; i++) {
- 		poll_states[i] = RFKILL_UNBLOCKED;
-+		platform_states[i] = RFKILL_UNBLOCKED;
- 		platform_checked[i] = FALSE;
- 	}
- 
--	/* Perform two passes here; the first pass is for non-platform switches,
--	 * which typically if hardkilled cannot be changed except by a physical
--	 * hardware switch.  The second pass checks platform killswitches, which
--	 * take precedence over device killswitches, because typically platform
--	 * killswitches control device killswitches.  That is, a hardblocked device
--	 * switch can often be unblocked by a platform switch.  Thus if we have
--	 * a hardblocked device switch and a softblocked platform switch, the
--	 * combined state should be softblocked since the platform switch can be
--	 * unblocked to change the device switch.
--	 */
--
--	/* Device switches first */
-+	/* Poll the states of all killswitches */
- 	for (iter = priv->killswitches; iter; iter = g_slist_next (iter)) {
- 		Killswitch *ks = iter->data;
- 		GUdevDevice *device;
- 		RfKillState dev_state;
- 		int sysfs_state;
- 
--		if (ks->platform == FALSE) {
--			device = g_udev_client_query_by_subsystem_and_name (priv->client, "rfkill", ks->name);
--			if (device) {
--				sysfs_state = g_udev_device_get_property_as_int (device, "RFKILL_STATE");
--				dev_state = sysfs_state_to_nm_state (sysfs_state);
-+		device = g_udev_client_query_by_subsystem_and_name (priv->client, "rfkill", ks->name);
-+		if (device) {
-+			sysfs_state = g_udev_device_get_property_as_int (device, "RFKILL_STATE");
-+			dev_state = sysfs_state_to_nm_state (sysfs_state);
-+			if (ks->platform == FALSE) {
- 				if (dev_state > poll_states[ks->rtype])
- 					poll_states[ks->rtype] = dev_state;
--				g_object_unref (device);
--			}
--		}
--	}
--
--	/* Platform switches next; their state overwrites device state */
--	for (iter = priv->killswitches; iter; iter = g_slist_next (iter)) {
--		Killswitch *ks = iter->data;
--		GUdevDevice *device;
--		RfKillState dev_state;
--		int sysfs_state;
--
--		if (ks->platform == TRUE) {
--			device = g_udev_client_query_by_subsystem_and_name (priv->client, "rfkill", ks->name);
--			if (device) {
--				sysfs_state = g_udev_device_get_property_as_int (device, "RFKILL_STATE");
--				dev_state = sysfs_state_to_nm_state (sysfs_state);
--
--				if (platform_checked[ks->rtype] == FALSE) {
--					/* Overwrite device state with platform state for first
--					 * platform switch found.
--					 */
--					poll_states[ks->rtype] = dev_state;
--					platform_checked[ks->rtype] = TRUE;
--				} else {
--					/* If there are multiple platform switches of the same type,
--					 * take the "worst" state for all of that type.
--					 */
--					if (dev_state > poll_states[ks->rtype])
--						poll_states[ks->rtype] = dev_state;
--				}
--				g_object_unref (device);
-+			} else {
-+				platform_checked[ks->rtype] = TRUE;
-+				if (dev_state > platform_states[ks->rtype])
-+					platform_states[ks->rtype] = dev_state;
- 			}
-+			g_object_unref (device);
- 		}
- 	}
- 
- 	/* Log and emit change signal for final rfkill states */
- 	for (i = 0; i < RFKILL_TYPE_MAX; i++) {
-+		if (platform_checked[i] == TRUE) {
-+			/* blocked platform switch state overrides device state, otherwise
-+			 * let the device state stand. (bgo #655773)
-+			 */
-+			if (platform_states[i] != RFKILL_UNBLOCKED)
-+				poll_states[i] = platform_states[i];
-+		}
-+
- 		if (poll_states[i] != priv->rfkill_states[i]) {
- 			nm_log_dbg (LOGD_RFKILL, "%s rfkill state now '%s'",
- 			            rfkill_type_to_desc (i),
---
-cgit v0.9.0.2-2-gbebe
diff --git a/net-misc/networkmanager/networkmanager-0.9.1.90-r3.ebuild b/net-misc/networkmanager/networkmanager-0.9.2.0.ebuild
index acefeaebcd80..cd8a51c91a4c 100644
--- a/net-misc/networkmanager/networkmanager-0.9.1.90-r3.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.9.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.1.90-r3.ebuild,v 1.3 2011/11/07 18:27:29 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.2.0.ebuild,v 1.1 2011/11/13 23:19:00 tetromino Exp $
 
 EAPI="4"
 GNOME_ORG_MODULE="NetworkManager"
@@ -94,11 +94,8 @@ src_prepare() {
 	# Don't build tests
 	epatch "${FILESDIR}/${PN}-0.9_rc3-fix-tests.patch"
 	# Build against libnl:1.1 for net-wireless/wimax-1.5.2 compatibility
-	epatch "${FILESDIR}/${P}-force-libnl1.1.patch"
-	# Fix <linux/if.h> & <net/if.h> conflict, in next release (bug #388609)
-	epatch "${FILESDIR}/${P}-if.h.patch"
-	# Fix rfkill handling, will be in next release
-	epatch "${FILESDIR}/${P}-rfkill.patch"
+	epatch "${FILESDIR}/${PN}-0.9.1.95-force-libnl1.1.patch"
+
 	eautoreconf
 	default
 }