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

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

commit:     0779f8b9e5d2601127b5021972135ffd6b11500a
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 23 19:48:17 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Feb 23 19:48:17 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0779f8b9

[kde-apps/filelight] Frameworks merged to master

Package-Manager: portage-2.2.17

---
 kde-apps/filelight/filelight-5.9999.ebuild | 31 ------------------------------
 kde-apps/filelight/filelight-9999.ebuild   | 23 +++++++++++++++++++---
 2 files changed, 20 insertions(+), 34 deletions(-)

diff --git a/kde-apps/filelight/filelight-5.9999.ebuild b/kde-apps/filelight/filelight-5.9999.ebuild
deleted file mode 100644
index 2d9f4e4..0000000
--- a/kde-apps/filelight/filelight-5.9999.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-EGIT_BRANCH="frameworks"
-inherit kde5
-
-DESCRIPTION="Visualise disk usage with interactive map of concentric, segmented rings"
-HOMEPAGE="http://utils.kde.org/projects/filelight"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}
-	!kde-base/filelight:4
-"

diff --git a/kde-apps/filelight/filelight-9999.ebuild b/kde-apps/filelight/filelight-9999.ebuild
index 2cee901..5f492d4 100644
--- a/kde-apps/filelight/filelight-9999.ebuild
+++ b/kde-apps/filelight/filelight-9999.ebuild
@@ -4,10 +4,27 @@
 
 EAPI=5
 
-KDE_HANDBOOK="optional"
-inherit kde4-base
+KDE_HANDBOOK=true
+inherit kde5
 
 DESCRIPTION="Visualise disk usage with interactive map of concentric, segmented rings"
 HOMEPAGE="http://utils.kde.org/projects/filelight"
 KEYWORDS=""
-IUSE="debug"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}"