10 files changed, 9 insertions, 48 deletions
diff --git a/Documentation/package.keywords/kde-extras-live.keywords b/Documentation/package.keywords/kde-extras-live.keywords
index 14c0cc77e07..75926b892de 100644
--- a/Documentation/package.keywords/kde-extras-live.keywords
+++ b/Documentation/package.keywords/kde-extras-live.keywords
@@ -18,11 +18,11 @@
 ~kde-misc/kdiff3-9999 **
 ~kde-misc/kepas-9999 **
 ~kde-misc/kgrubeditor-9999 **
+~kde-misc/knetworkmanager-9999 **
 ~kde-misc/kobby-9999 **
 ~kde-misc/konq-plugins-9999 **
 ~kde-misc/krusader-9999 **
 ~kde-misc/menubar-9999 **
-~kde-misc/networkmanager-applet-9999 **
 ~kde-misc/plasma-emergelog-9999 **
 ~kde-misc/raptormenu-9999 **
 ~kde-misc/translatoid-9999 **
diff --git a/Documentation/package.unmask/kde-live b/Documentation/package.unmask/kde-live
index 9dfc95709c0..0f3b7b5b45e 100644
--- a/Documentation/package.unmask/kde-live
+++ b/Documentation/package.unmask/kde-live
@@ -22,11 +22,11 @@ kde-base/kde-l10n:live
 ~kde-misc/kdiff3-9999
 ~kde-misc/kepas-9999
 ~kde-misc/kgrubeditor-9999
+~kde-misc/knetworkmanager-9999
 ~kde-misc/kobby-9999
 ~kde-misc/konq-plugins-9999
 ~kde-misc/krusader-9999
 ~kde-misc/menubar-9999
-~kde-misc/networkmanager-applet-9999
 ~kde-misc/plasma-emergelog-9999
 ~kde-misc/raptormenu-9999
 ~kde-misc/translatoid-9999
@@ -366,5 +366,4 @@ kde-base/kdeutils-meta:live
 kde-base/kdewebdev-meta:live
 ~kde-misc/kepas-9999
 ~kde-misc/menubar-9999
-~kde-misc/networkmanager-applet-9999
 ~kde-misc/plasma-emergelog-9999
diff --git a/kde-misc/knetworkmanager/Manifest b/kde-misc/knetworkmanager/Manifest
new file mode 100644
index 00000000000..ce65005695b
--- /dev/null
+++ b/kde-misc/knetworkmanager/Manifest
@@ -0,0 +1,2 @@
+EBUILD knetworkmanager-9999.ebuild 761 RMD160 a067c7209b987a74bca1df0e37ae36e7a0a19e6a SHA1 bf72b2df117b1d5342c80391a47bf6b573127ba6 SHA256 afdc15cc4e653eaa176d46c9a5c5a07663520bd6f75a1b2d0d633f546abaffd5
+MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-misc/networkmanager-applet/networkmanager-applet-9999.ebuild b/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
index 2d75eaf0446..7afc743f2dd 100644
--- a/kde-misc/networkmanager-applet/networkmanager-applet-9999.ebuild
+++ b/kde-misc/knetworkmanager/knetworkmanager-9999.ebuild
@@ -8,15 +8,16 @@ KMNAME="playground/base/plasma/applets"
 KMMODULE="networkmanager"
 inherit kde4-base
 
-DESCRIPTION="A NetworkManager applet for kde"
+DESCRIPTION="KDE frontend for NetworkManager"
 HOMEPAGE="http://kde.org/"
 
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS=""
-SLOT="0"
+SLOT="4"
 IUSE="debug"
 
 DEPEND="
+	!kde-misc/networkmanager-applet
 	>=kde-base/solid-${KDE_MINIMAL}[networkmanager]
 	>=net-misc/networkmanager-0.7
 "
diff --git a/kde-misc/networkmanager-applet/metadata.xml b/kde-misc/knetworkmanager/metadata.xml
index 8d1e86a9cef..8d1e86a9cef 100644
--- a/kde-misc/networkmanager-applet/metadata.xml
+++ b/kde-misc/knetworkmanager/metadata.xml
diff --git a/kde-misc/networkmanager-applet/Manifest b/kde-misc/networkmanager-applet/Manifest
deleted file mode 100644
index 5b6101a4a28..00000000000
--- a/kde-misc/networkmanager-applet/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-EBUILD networkmanager-applet-0.1_pre20091013.ebuild 781 RMD160 0aaaeee5dcbe4b2b45064bdfb27e61c26374276c SHA1 f7bc390ef3d1503f7798d7ab99f438be2533b8f6 SHA256 47af4ecfbfe79a0d20581ff505ddb617c3757c4b9c742bdb00946123b63ff803
-EBUILD networkmanager-applet-9999.ebuild 728 RMD160 adcecabf8a713ddbfd96e41b93da14d8a4df9fc0 SHA1 2f085cd57f471b06488f393f5056bc700ecfb300 SHA256 d85873b7f864a20a27b7843ef1aacbe8eb2c7630a6f4e1a4a42852147207b047
-MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-misc/networkmanager-applet/networkmanager-applet-0.1_pre20091013.ebuild b/kde-misc/networkmanager-applet/networkmanager-applet-0.1_pre20091013.ebuild
deleted file mode 100644
index d0822be5a66..00000000000
--- a/kde-misc/networkmanager-applet/networkmanager-applet-0.1_pre20091013.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit kde4-base subversion
-
-ESVN_REPO_URI="svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager@1034271"
-
-DESCRIPTION="A NetworkManager applet for kde"
-HOMEPAGE="http://kde.org/"
-
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS=""
-SLOT="0"
-IUSE="debug"
-
-DEPEND="
-	>=kde-base/solid-${KDE_MINIMAL}[networkmanager]
-	>=net-misc/networkmanager-0.7
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-
-	# Fix dbus policy
-	sed -i 's/at_console=".*"/group="plugdev"/' \
-			"${S}/NetworkManager-kde4.conf" \
-				|| die "Fixing dbus policy failed"
-
-	mycmakeargs="${mycmakeargs}
-		-DDBUS_SYSTEM_POLICY_DIR=/etc/dbus-1/system.d"
-
-	kde4-base_src_configure
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index b8571b34baf..03a526e11d0 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -321,11 +321,11 @@ kde-base/kde-l10n:live
 ~kde-misc/kdiff3-9999
 ~kde-misc/kepas-9999
 ~kde-misc/kgrubeditor-9999
+~kde-misc/knetworkmanager-9999
 ~kde-misc/kobby-9999
 ~kde-misc/konq-plugins-9999
 ~kde-misc/krusader-9999
 ~kde-misc/menubar-9999
-~kde-misc/networkmanager-applet-9999
 ~kde-misc/plasma-emergelog-9999
 ~kde-misc/raptormenu-9999
 ~kde-misc/translatoid-9999
@@ -665,7 +665,6 @@ kde-base/kdeutils-meta:live
 kde-base/kdewebdev-meta:live
 ~kde-misc/kepas-9999
 ~kde-misc/menubar-9999
-~kde-misc/networkmanager-applet-9999
 ~kde-misc/plasma-emergelog-9999
 
 media-libs/opengtl
diff --git a/sets/kde-extras-live b/sets/kde-extras-live
index f3fbb31752b..06c45f5dbd8 100644
--- a/sets/kde-extras-live
+++ b/sets/kde-extras-live
@@ -17,11 +17,11 @@
 ~kde-misc/kdiff3-9999
 ~kde-misc/kepas-9999
 ~kde-misc/kgrubeditor-9999
+~kde-misc/knetworkmanager-9999
 ~kde-misc/kobby-9999
 ~kde-misc/konq-plugins-9999
 ~kde-misc/krusader-9999
 ~kde-misc/menubar-9999
-~kde-misc/networkmanager-applet-9999
 ~kde-misc/plasma-emergelog-9999
 ~kde-misc/raptormenu-9999
 ~kde-misc/translatoid-9999
diff --git a/sets/plasmoids-live b/sets/plasmoids-live
index 3c833a87f07..3c8332987ea 100644
--- a/sets/plasmoids-live
+++ b/sets/plasmoids-live
@@ -1,4 +1,3 @@
 ~kde-misc/kepas-9999
 ~kde-misc/menubar-9999
-~kde-misc/networkmanager-applet-9999
 ~kde-misc/plasma-emergelog-9999