From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 55EEE138A1A for ; Fri, 9 Jan 2015 17:46:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 10071E084E; Fri, 9 Jan 2015 17:46:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 44245E084E for ; Fri, 9 Jan 2015 17:46:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 30E1F34070A for ; Fri, 9 Jan 2015 17:46:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CD1C0F37F for ; Fri, 9 Jan 2015 17:46:52 +0000 (UTC) From: "Manuel Rüger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Manuel Rüger" Message-ID: <1420823073.39a79135fa721a143eaf3bce11a2262b3827b81e.mrueg@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-nm/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/plasma-nm/plasma-nm-5.1.2.1.ebuild kde-plasma/plasma-nm/plasma-nm-5.1.2.ebuild kde-plasma/plasma-nm/plasma-nm-5.1.9999.ebuild X-VCS-Directories: kde-plasma/plasma-nm/ X-VCS-Committer: mrueg X-VCS-Committer-Name: Manuel Rüger X-VCS-Revision: 39a79135fa721a143eaf3bce11a2262b3827b81e X-VCS-Branch: master Date: Fri, 9 Jan 2015 17:46:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 60e8cc4d-a0a4-4832-9c8f-eb9a251e5bc9 X-Archives-Hash: ff9bbd3375187619c513a1f0aa23e255 commit: 39a79135fa721a143eaf3bce11a2262b3827b81e Author: Manuel Rüger gentoo org> AuthorDate: Fri Jan 9 17:04:33 2015 +0000 Commit: Manuel Rüger gentoo 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)