[gentoo-commits] proj/gnome:master commit in: gnome-base/gsettings-desktop-schemas/, ...

[Alexandre Restovtsev]

commit:     4cfb1f149d2496792a3b0320ac7f8c35725bdafd
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 19:57:25 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sat Oct 29 19:59:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4cfb1f14

networkmanager, nm-applet, gsettings-destkop-schemas, gnome-control-center: moved to gx86

---
 .../gnome-control-center-3.2.1.ebuild              |  116 ---------------
 ...tings-desktop-schemas-3.2.0-unix-software.patch |   26 ----
 .../gsettings-desktop-schemas-3.2.0-r1.ebuild      |   37 -----
 .../gsettings-desktop-schemas-9999.ebuild          |    2 +-
 gnome-extra/nm-applet/nm-applet-0.9.1.90.ebuild    |   47 ------
 ...ktop.NetworkManager.settings.modify.system.pkla |    6 -
 .../networkmanager-0.9.1.90-force-libnl1.1.patch   |   33 ----
 .../files/networkmanager-0.9.1.90-if.h.patch       |  117 ---------------
 .../files/networkmanager-0.9.1.90-rfkill.patch     |  133 -----------------
 .../files/networkmanager-0.9_rc3-fix-tests.patch   |   18 ---
 .../files/nm-system-settings.conf-ifnet            |    6 -
 .../networkmanager-0.9.1.90-r3.ebuild              |  157 --------------------
 12 files changed, 1 insertions(+), 697 deletions(-)

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.2.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.2.1.ebuild
deleted file mode 100644
index a094f13..0000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.2.1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-2.32.1.ebuild,v 1.1 2010/12/04 00:46:57 pacho Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-
-inherit autotools gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="GNOME Desktop Configuration Tool"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-IUSE="+cheese +colord +cups +networkmanager +socialweb"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-fi
-
-# XXX: gnome-desktop-2.91.5 is needed for upstream commit c67f7efb
-# XXX: NetworkManager-0.9 support is automagic, make hard-dep once it's released
-#
-# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
-# Latest gsettings-desktop-schemas is neededfor commit 73f9bffb
-# gnome-settings-daemon-3.1.4 is needed for power panel (commit 4f08a325)
-COMMON_DEPEND="
-	>=dev-libs/glib-2.29.14:2
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.1.19:3
-	>=gnome-base/gsettings-desktop-schemas-3.0.2
-	>=gnome-base/gconf-2.0:2
-	>=dev-libs/dbus-glib-0.73
-	>=gnome-base/gnome-desktop-3.1.0:3
-	>=gnome-base/gnome-settings-daemon-3.1.4[colord(+)?]
-	>=gnome-base/libgnomekbd-2.91.91
-
-	app-text/iso-codes
-	dev-libs/libxml2:2
-	gnome-base/gnome-menus:3
-	gnome-base/libgtop:2
-	media-libs/fontconfig
-	net-libs/gnome-online-accounts
-
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=media-sound/pulseaudio-0.9.16[glib]
-	>=sys-auth/polkit-0.97
-	>=sys-power/upower-0.9.1
-	>=x11-libs/libnotify-0.7.3
-
-	x11-apps/xmodmap
-	x11-libs/libX11
-	x11-libs/libXxf86misc
-	>=x11-libs/libxklavier-5.1
-	>=x11-libs/libXi-1.2
-
-	cheese? (
-		media-libs/gstreamer:0.10
-		>=media-video/cheese-2.91.91.1 )
-	colord? ( >=x11-misc/colord-0.1.8 )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	networkmanager? (
-		>=gnome-extra/nm-applet-0.9.1.90
-		>=net-misc/networkmanager-0.8.997 )
-	socialweb? ( net-libs/libsocialweb )"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-RDEPEND="${COMMON_DEPEND}
-	app-admin/apg
-	sys-apps/accountsservice
-	cups? ( net-print/cups-pk-helper )
-
-	!<gnome-extra/gnome-color-manager-3.1.2
-	!gnome-extra/gnome-media[pulseaudio]
-	!<gnome-extra/gnome-media-2.32.0-r300
-	!<gnome-base/gdm-2.91.94"
-# PDEPEND to avoid circular dependency
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
-DEPEND="${COMMON_DEPEND}
-	x11-proto/xproto
-	x11-proto/xf86miscproto
-	x11-proto/kbproto
-
-	>=sys-devel/gettext-0.17
-	>=dev-util/intltool-0.40.1
-	>=dev-util/pkgconfig-0.19
-
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.10.1
-
-	cups? ( sys-apps/sed )"
-# Needed for autoreconf
-#	gnome-base/gnome-common
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-update-mimedb
-		--disable-static
-		$(use_with cheese)
-		$(use_enable colord color)
-		$(use_enable cups)
-		$(use_with socialweb libsocialweb)"
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-}
-
-src_prepare() {
-	# Make colord plugin optional; requires eautoreconf
-	epatch "${FILESDIR}/${PN}-3.2.1-optional-colord.patch"
-	eautoreconf
-
-	gnome2_src_prepare
-}

diff --git a/gnome-base/gsettings-desktop-schemas/files/gsettings-desktop-schemas-3.2.0-unix-software.patch b/gnome-base/gsettings-desktop-schemas/files/gsettings-desktop-schemas-3.2.0-unix-software.patch
deleted file mode 100644
index 428f5ac..0000000
--- a/gnome-base/gsettings-desktop-schemas/files/gsettings-desktop-schemas-3.2.0-unix-software.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 96bf58048800f1336aa8424c475f951702ce4858 Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi <cosimoc@×××××.org>
-Date: Mon, 03 Oct 2011 19:56:46 +0000
-Subject: media: change x-content/software to x-content/unix-software
-
-The Nautilus handler doesn't claim x-content/software at all now, and
-we're really interested in autorunning UNIX software rather than Win32
-one anyway.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=660803
----
-diff --git a/schemas/org.gnome.desktop.media-handling.gschema.xml.in.in b/schemas/org.gnome.desktop.media-handling.gschema.xml.in.in
-index a1bd398..1df7aea 100644
---- a/schemas/org.gnome.desktop.media-handling.gschema.xml.in.in
-+++ b/schemas/org.gnome.desktop.media-handling.gschema.xml.in.in
-@@ -16,7 +16,7 @@
-       <_description>If set to true, then Nautilus will never prompt nor autorun/autostart programs when a medium is inserted.</_description>
-     </key>
-     <key name="autorun-x-content-start-app" type="as">
--      <default>[ 'x-content/software' ]</default>
-+      <default>[ 'x-content/unix-software' ]</default>
-       <_summary>List of x-content/* types where the preferred application will be launched</_summary>
-       <_description>List of x-content/* types for which the user have chosen to start an application in the preference capplet. The preferred application for the given type will be started on insertion on media matching these types.</_description>
-     </key>
---
-cgit v0.9.0.2

diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.2.0-r1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.2.0-r1.ebuild
deleted file mode 100644
index 590c405..0000000
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.2.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-0.1.5.ebuild,v 1.1 2011/02/02 05:53:24 nirbheek Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-fi
-
-RDEPEND=">=dev-libs/glib-2.21:2"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.40"
-
-DOCS="AUTHORS HACKING NEWS README"
-
-src_prepare() {
-	# Upstream patch to use x-content/unix-software like all of gnome-3.2.1,
-	# will be in next release
-	epatch "${FILESDIR}/${P}-unix-software.patch"
-	gnome2_src_prepare
-}

diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-9999.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-9999.ebuild
index 19a7e3a..820f2fa 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-9999.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-9999.ebuild
@@ -19,7 +19,7 @@ IUSE=""
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 fi
 
 RDEPEND=">=dev-libs/glib-2.21:2"

diff --git a/gnome-extra/nm-applet/nm-applet-0.9.1.90.ebuild b/gnome-extra/nm-applet/nm-applet-0.9.1.90.ebuild
deleted file mode 100644
index a54f0b7..0000000
--- a/gnome-extra/nm-applet/nm-applet-0.9.1.90.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.9.0.ebuild,v 1.1 2011/08/23 23:18:30 nirbheek Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_ORG_MODULE="network-manager-applet"
-
-inherit gnome2
-
-DESCRIPTION="GNOME applet for NetworkManager"
-HOMEPAGE="http://projects.gnome.org/NetworkManager/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="bluetooth"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND=">=dev-libs/glib-2.16:2
-	>=dev-libs/dbus-glib-0.88
-	>=gnome-base/gconf-2.20:2
-	>=gnome-base/gnome-keyring-2.20
-	>=sys-apps/dbus-1.4.1
-	>=sys-auth/polkit-0.96-r1
-	>=x11-libs/gtk+-2.91.4:3
-	>=x11-libs/libnotify-0.7.0
-
-	app-text/iso-codes
-	>=net-misc/networkmanager-${PV}
-	net-misc/mobile-broadband-provider-info
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-2.27.6 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.40"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF}
-		--with-gtkver=3
-		--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		$(use_with bluetooth)"
-}

diff --git a/net-misc/networkmanager/files/01-org.freedesktop.NetworkManager.settings.modify.system.pkla b/net-misc/networkmanager/files/01-org.freedesktop.NetworkManager.settings.modify.system.pkla
deleted file mode 100644
index d443327..0000000
--- a/net-misc/networkmanager/files/01-org.freedesktop.NetworkManager.settings.modify.system.pkla
+++ /dev/null
@@ -1,6 +0,0 @@
-[Let users in plugdev group modify NetworkManager]
-Identity=unix-group:plugdev
-Action=org.freedesktop.NetworkManager.settings.modify.system
-ResultAny=no
-ResultInactive=no
-ResultActive=yes
\ No newline at end of file

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 e4da7b3..0000000
--- 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 2078569..0000000
--- 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@××××××.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@××××××.com>
-    
-    [ Alexandre Rostovtsev <tetromino@g.o>: 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 0ddf3ad..0000000
--- 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@×××××.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/files/networkmanager-0.9_rc3-fix-tests.patch b/net-misc/networkmanager/files/networkmanager-0.9_rc3-fix-tests.patch
deleted file mode 100644
index 7bd8a2b..0000000
--- a/net-misc/networkmanager/files/networkmanager-0.9_rc3-fix-tests.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -577,7 +577,6 @@
- src/settings/plugins/ifupdown/Makefile
- src/settings/plugins/ifupdown/tests/Makefile
- src/settings/plugins/ifnet/Makefile
--src/settings/plugins/ifnet/tests/Makefile
- src/settings/plugins/ifcfg-rh/Makefile
- src/settings/plugins/ifcfg-rh/tests/Makefile
- src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile
---- src/settings/plugins/ifnet/Makefile.am
-+++ src/settings/plugins/ifnet/Makefile.am
-@@ -1,4 +1,4 @@
--SUBDIRS = . tests
-+SUBDIRS = .
- INCLUDES = \
-        -I$(top_srcdir)/src/settings \
-        -I$(top_srcdir)/include \

diff --git a/net-misc/networkmanager/files/nm-system-settings.conf-ifnet b/net-misc/networkmanager/files/nm-system-settings.conf-ifnet
deleted file mode 100644
index 4d14ee7..0000000
--- a/net-misc/networkmanager/files/nm-system-settings.conf-ifnet
+++ /dev/null
@@ -1,6 +0,0 @@
-[main]
-plugins=ifnet,keyfile
-
-[ifnet]
-managed=true
-auto_refresh=false

diff --git a/net-misc/networkmanager/networkmanager-0.9.1.90-r3.ebuild b/net-misc/networkmanager/networkmanager-0.9.1.90-r3.ebuild
deleted file mode 100644
index 496b53b..0000000
--- a/net-misc/networkmanager/networkmanager-0.9.1.90-r3.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# 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.0.ebuild,v 1.1 2011/08/23 23:17:09 nirbheek Exp $
-
-EAPI="4"
-GNOME_ORG_MODULE="NetworkManager"
-
-inherit autotools eutils gnome.org linux-info systemd
-
-DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="avahi bluetooth doc +nss gnutls dhclient +dhcpcd +introspection
-	kernel_linux +ppp resolvconf connection-sharing wimax"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-REQUIRED_USE="
-	^^ ( nss gnutls )
-	^^ ( dhclient dhcpcd )"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-# libnl:1.1 is needed for linking to net-wireless/wimax libraries
-# XXX: on bump, check that net-wireless/wimax is still using libnl:1.1 !
-# TODO: Qt support?
-COMMON_DEPEND=">=sys-apps/dbus-1.2
-	>=dev-libs/dbus-glib-0.75
-	>=net-wireless/wireless-tools-28_pre9
-	|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-147[extras] )
-	>=dev-libs/glib-2.26
-	>=sys-auth/polkit-0.97
-	dev-libs/libnl:1.1
-	>=net-wireless/wpa_supplicant-0.7.3-r3[dbus]
-	bluetooth? ( >=net-wireless/bluez-4.82 )
-	avahi? ( net-dns/avahi[autoipd] )
-	gnutls? (
-		dev-libs/libgcrypt
-		net-libs/gnutls )
-	nss? ( >=dev-libs/nss-3.11 )
-	dhclient? ( net-misc/dhcp )
-	dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3 )
-	ppp? (
-		>=net-misc/modemmanager-0.4
-		>=net-dialup/ppp-2.4.5 )
-	resolvconf? ( net-dns/openresolv )
-	connection-sharing? (
-		net-dns/dnsmasq
-		net-firewall/iptables )
-	wimax? ( >=net-wireless/wimax-1.5.1 )"
-
-RDEPEND="${COMMON_DEPEND}
-	sys-auth/consolekit"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	doc? ( >=dev-util/gtk-doc-1.8 )"
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See http://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See http://bugs.gentoo.org/333639 for more info."
-		fi
-
-	fi
-}
-
-pkg_setup() {
-	enewgroup plugdev
-}
-
-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"
-	eautoreconf
-	default
-}
-
-src_configure() {
-	ECONF="--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		--with-distro=gentoo
-		--with-dbus-sys-dir=/etc/dbus-1/system.d
-		--with-udev-dir=/lib/udev
-		--with-iptables=/sbin/iptables
-		$(use_enable doc gtk-doc)
-		$(use_enable introspection)
-		$(use_enable ppp)
-		$(use_enable wimax)
-		$(use_with dhclient)
-		$(use_with dhcpcd)
-		$(use_with doc docs)
-		$(use_with resolvconf)
-		$(systemd_with_unitdir)"
-
-		if use nss ; then
-			ECONF="${ECONF} $(use_with nss crypto=nss)"
-		else
-			ECONF="${ECONF} $(use_with gnutls crypto=gnutls)"
-		fi
-
-	econf ${ECONF}
-}
-
-src_install() {
-	default
-	# Need to keep the /var/run/NetworkManager directory
-	keepdir /var/run/NetworkManager
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Add keyfile plugin support
-	keepdir /etc/NetworkManager/system-connections
-	insinto /etc/NetworkManager
-	newins "${FILESDIR}/nm-system-settings.conf-ifnet" nm-system-settings.conf
-
-	# Allow users in plugdev group to modify system connections
-	insinto /etc/polkit-1/localauthority/10-vendor.d
-	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.pkla"
-
-	# Remove useless .la files
-	find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
-}
-
-pkg_postinst() {
-	elog "To modify system network connections without needing to enter the"
-	elog "root password, add your user account to the 'plugdev' group."
-}