kde-misc/plasma-nm -> kde-plasma/plasma-nm

5 files changed, 2 insertions, 80 deletions

diff --git a/kde-misc/networkmanagement/networkmanagement-0.9.0.12.ebuild b/kde-misc/networkmanagement/networkmanagement-0.9.0.12.ebuild
index a2174028dcf8..8acef267324c 100644
--- a/kde-misc/networkmanagement/networkmanagement-0.9.0.12.ebuild
+++ b/kde-misc/networkmanagement/networkmanagement-0.9.0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -30,7 +30,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	!kde-base/solid
-	!kde-misc/plasma-nm
+	!kde-plasma/plasma-nm:4
 "
 
 src_configure() {
diff --git a/kde-misc/plasma-nm/Manifest b/kde-misc/plasma-nm/Manifest
deleted file mode 100644
index 3e1a6bb7f5c6..000000000000
--- a/kde-misc/plasma-nm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST plasma-nm-0.9.3.6.tar.xz 551320 SHA256 56b5c8221761fac30808117c7f8fa11a9e3cdb4b2d16a733d33996bc7136b64b SHA512 50f3e5020f4437d710709a301b981f888898c293a71dff3aee809255207a0f97caf5d3811b453da2338df93238ef33a79e85cb3598ee38d8a41255d8a572e256 WHIRLPOOL 2486304f8c5c169105e2ea0527e7fb291cc9c9f9fee36a2cdc9d5aff7f5a72cb8bdda692ac54f621c63a84b2e48ba2c429e20a4bbe7efa91ecb48a393286dc7c
diff --git a/kde-misc/plasma-nm/files/plasma-nm-0.9.3.6-networkmanager-1.0.6.patch b/kde-misc/plasma-nm/files/plasma-nm-0.9.3.6-networkmanager-1.0.6.patch
deleted file mode 100644
index 1151763886c3..000000000000
--- a/kde-misc/plasma-nm/files/plasma-nm-0.9.3.6-networkmanager-1.0.6.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fixes build with networkmanager-1.0.6.
-
-Triggered by http://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?h=nm-1-0&id=6f616d4c4b04d5478f60d0311317bc84c5459ea4.
-
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -49,6 +49,7 @@
-                     ${CMAKE_CURRENT_SOURCE_DIR}/libs
-                     ${CMAKE_CURRENT_SOURCE_DIR}/libs/editor/
-                     ${NETWORKMANAGER_INCLUDE_DIRS}
-+                    ${NM-UTIL_INCLUDE_DIRS}
-                     ${NETWORKMANAGERQT_INCLUDE_DIRS}
-                     ${KDE4_INCLUDES})
- 
diff --git a/kde-misc/plasma-nm/metadata.xml b/kde-misc/plasma-nm/metadata.xml
deleted file mode 100644
index b346d4af9201..000000000000
--- a/kde-misc/plasma-nm/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="modemmanager">Enable support for mobile broadband devices</flag>
-		<flag name="openconnect">Build support for the OpenConnect VPN client</flag>
-	</use>
-</pkgmetadata>
diff --git a/kde-misc/plasma-nm/plasma-nm-0.9.3.6.ebuild b/kde-misc/plasma-nm/plasma-nm-0.9.3.6.ebuild
deleted file mode 100644
index 6bdcc223fa08..000000000000
--- a/kde-misc/plasma-nm/plasma-nm-0.9.3.6.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="ar bg bs ca ca@valencia cs da de el en_GB eo es et fa fi fr ga gl
-hr hu is it ja km ko lt lv mai mr ms nb nds nl nn pa pl pt pt_BR ro ru sk
-sl sr sr@ijekavian sr@ijekavianlatin sr@latin sv th tr ug uk zh_CN zh_TW"
-DECLARATIVE_REQUIRED="always"
-inherit kde4-base
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	KEYWORDS="amd64 x86"
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-else
-	KEYWORDS=""
-fi
-
-DESCRIPTION="KDE Plasma applet for NetworkManager"
-HOMEPAGE="https://projects.kde.org/projects/playground/network/plasma-nm"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="4"
-IUSE="debug modemmanager openconnect"
-
-RDEPEND="
-	>=net-libs/libnm-qt-0.9.8.2[modemmanager?]
-	net-misc/mobile-broadband-provider-info
-	>=net-misc/networkmanager-0.9.8.0
-	modemmanager? ( >=net-libs/libmm-qt-1.0.0 )
-	openconnect? (
-		net-misc/networkmanager-openconnect
-		net-misc/openconnect:=
-	)
-	!kde-misc/networkmanagement
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-PATCHES=( "${FILESDIR}/${P}-networkmanager-1.0.6.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use !modemmanager DISABLE_MODEMMANAGER_SUPPORT)
-		$(cmake-utils_use_find_package openconnect OpenConnect)
-	)
-
-	kde4-base_src_configure
-}