[gentoo-commits] proj/kde:master commit in: kde-apps/kcachegrind/

["Johannes Huber" <johu@gentoo.org>]

commit:     897bb14944915bb0060095397ba50bd2b1e780ee
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 17 20:55:38 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Nov 17 20:55:38 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=897bb149

kde-apps/kcachegrind: Frameworks merged to master

Package-Manager: portage-2.3.2

 kde-apps/kcachegrind/kcachegrind-5.9999.ebuild | 30 --------------------------
 kde-apps/kcachegrind/kcachegrind-9999.ebuild   | 21 +++++++++++++-----
 2 files changed, 16 insertions(+), 35 deletions(-)

diff --git a/kde-apps/kcachegrind/kcachegrind-5.9999.ebuild b/kde-apps/kcachegrind/kcachegrind-5.9999.ebuild
deleted file mode 100644
index dcd7399..0000000
--- a/kde-apps/kcachegrind/kcachegrind-5.9999.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-EGIT_BRANCH="frameworks"
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="KDE Frontend for Cachegrind"
-HOMEPAGE="https://www.kde.org/applications/development/kcachegrind
-http://kcachegrind.sourceforge.net"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	media-gfx/graphviz
-"

diff --git a/kde-apps/kcachegrind/kcachegrind-9999.ebuild b/kde-apps/kcachegrind/kcachegrind-9999.ebuild
index 9f2f5c8..faffa4d 100644
--- a/kde-apps/kcachegrind/kcachegrind-9999.ebuild
+++ b/kde-apps/kcachegrind/kcachegrind-9999.ebuild
@@ -4,15 +4,26 @@
 
 EAPI=6
 
-KDE_HANDBOOK="optional"
-inherit kde4-base
+KDE_HANDBOOK="forceoptional"
+inherit kde5
 
-DESCRIPTION="KDE Frontend for Cachegrind"
+DESCRIPTION="Frontend for Cachegrind by KDE"
 HOMEPAGE="https://www.kde.org/applications/development/kcachegrind
 http://kcachegrind.sourceforge.net"
 KEYWORDS=""
-IUSE="debug"
+IUSE=""
 
-RDEPEND="
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
 	media-gfx/graphviz
 "