[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-nm/

["Manuel Rüger" <mrueg@gentoo.org>]

commit:     39a79135fa721a143eaf3bce11a2262b3827b81e
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  9 17:04:33 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Fri Jan  9 17:04:33 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=39a79135

[kde-plasma/plasma-nm] Update dependencies on kde-frameworks/networkmanager-qt. Remove old.

---
 kde-plasma/plasma-nm/plasma-nm-5.1.2.1.ebuild  |  2 +-
 kde-plasma/plasma-nm/plasma-nm-5.1.2.ebuild    | 65 --------------------------
 kde-plasma/plasma-nm/plasma-nm-5.1.9999.ebuild |  2 +-
 3 files changed, 2 insertions(+), 67 deletions(-)

diff --git a/kde-plasma/plasma-nm/plasma-nm-5.1.2.1.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.1.2.1.ebuild
index 366e49d..c2fc120 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.1.2.1.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.1.2.1.ebuild
@@ -12,7 +12,7 @@ KEYWORDS=" ~amd64"
 IUSE="modemmanager openconnect teamd"
 
 DEPEND="
-	$(add_frameworks_dep networkmanager-qt 'teamd=' '5.6.0')
+	$(add_frameworks_dep networkmanager-qt 'teamd=')
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)

diff --git a/kde-plasma/plasma-nm/plasma-nm-5.1.2.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.1.2.ebuild
deleted file mode 100644
index 5caf09c..0000000
--- a/kde-plasma/plasma-nm/plasma-nm-5.1.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="KDE Plasma applet for NetworkManager"
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS=" ~amd64"
-IUSE="modemmanager openconnect teamd"
-
-DEPEND="
-	$(add_kdeplasma_dep libnm-qt 'teamd=')
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	net-misc/mobile-broadband-provider-info
-	>=net-misc/networkmanager-0.9.10.0[teamd=]
-	modemmanager? (
-		$(add_kdeplasma_dep libmm-qt)
-		dev-qt/qtxml:5
-	)
-	openconnect? (
-		dev-qt/qtxml:5
-		net-misc/networkmanager-openconnect
-		net-misc/openconnect
-	)
-"
-RDEPEND="${DEPEND}
-	!kde-misc/networkmanagement
-	!kde-misc/plasma-nm:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package modemmanager ModemManager)
-		$(cmake-utils_use_find_package modemmanager KF5ModemManagerQt)
-		$(cmake-utils_use_find_package openconnect OpenConnect)
-	)
-
-	kde5_src_configure
-}

diff --git a/kde-plasma/plasma-nm/plasma-nm-5.1.9999.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.1.9999.ebuild
index d36b44f..594e563 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.1.9999.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.1.9999.ebuild
@@ -12,7 +12,7 @@ KEYWORDS=""
 IUSE="modemmanager openconnect teamd"
 
 DEPEND="
-	$(add_kdeplasma_dep libnm-qt 'teamd=')
+	$(add_frameworks_dep networkmanager-qt 'teamd=')
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)