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

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

commit:     fe2aa8f0b7dc45c1c688d1e8aab4dfc12cf5f6c7
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 23 20:23:25 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Feb 23 20:23:25 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=fe2aa8f0

[kde-apps/kcharselect] Frameworks merged to master

Package-Manager: portage-2.2.17

---
 kde-apps/kcharselect/kcharselect-5.9999.ebuild | 29 --------------------------
 kde-apps/kcharselect/kcharselect-9999.ebuild   | 18 +++++++++++++---
 2 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/kde-apps/kcharselect/kcharselect-5.9999.ebuild b/kde-apps/kcharselect/kcharselect-5.9999.ebuild
deleted file mode 100644
index 0f77bf7..0000000
--- a/kde-apps/kcharselect/kcharselect-5.9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KDE_HANDBOOK="true"
-EGIT_BRANCH="frameworks"
-inherit kde5
-
-DESCRIPTION="KDE character selection utility"
-HOMEPAGE="http://www.kde.org/applications/utilities/kcharselect
-http://utils.kde.org/projects/kcharselect"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}
-	!kde-base/kcharselect:4
-"

diff --git a/kde-apps/kcharselect/kcharselect-9999.ebuild b/kde-apps/kcharselect/kcharselect-9999.ebuild
index 3d9e14e..2ee611a 100644
--- a/kde-apps/kcharselect/kcharselect-9999.ebuild
+++ b/kde-apps/kcharselect/kcharselect-9999.ebuild
@@ -4,11 +4,23 @@
 
 EAPI=5
 
-KDE_HANDBOOK="optional"
-inherit kde4-base
+KDE_HANDBOOK="true"
+inherit kde5
 
 DESCRIPTION="KDE character selection utility"
 HOMEPAGE="http://www.kde.org/applications/utilities/kcharselect
 http://utils.kde.org/projects/kcharselect"
 KEYWORDS=""
-IUSE="debug"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}"