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

[Andreas Sturmlechner]

commit:     924c3ff306c7df492c3a4c27391ceaca8f2007fe
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May  1 22:37:06 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May  1 22:37:06 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=924c3ff3

kde-apps/kmag: Frameworks merged to master

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-apps/kmag/kmag-5.9999.ebuild | 36 ------------------------------------
 kde-apps/kmag/kmag-9999.ebuild   | 29 ++++++++++++++++++++++++-----
 2 files changed, 24 insertions(+), 41 deletions(-)

diff --git a/kde-apps/kmag/kmag-5.9999.ebuild b/kde-apps/kmag/kmag-5.9999.ebuild
deleted file mode 100644
index 09b4455a03..0000000000
--- a/kde-apps/kmag/kmag-5.9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_BRANCH="frameworks"
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE screen magnifier"
-HOMEPAGE="https://www.kde.org/applications/utilities/kmag/"
-KEYWORDS=""
-IUSE="keyboardfocus"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	keyboardfocus? ( media-libs/libkdeaccessibilityclient:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package keyboardfocus QAccessibilityClient)
-	)
-
-	kde5_src_configure
-}

diff --git a/kde-apps/kmag/kmag-9999.ebuild b/kde-apps/kmag/kmag-9999.ebuild
index af79e37352..e0ba7f6f5a 100644
--- a/kde-apps/kmag/kmag-9999.ebuild
+++ b/kde-apps/kmag/kmag-9999.ebuild
@@ -3,14 +3,33 @@
 
 EAPI=6
 
-KDE_HANDBOOK="optional"
-inherit kde4-base
+KDE_HANDBOOK="forceoptional"
+inherit kde5
 
 DESCRIPTION="KDE screen magnifier"
 HOMEPAGE="https://www.kde.org/applications/utilities/kmag/"
 KEYWORDS=""
-IUSE="debug"
+IUSE="keyboardfocus"
 
-RDEPEND="
-	$(add_kdeapps_dep kaccessible)
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	keyboardfocus? ( media-libs/libkdeaccessibilityclient:5 )
 "
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package keyboardfocus QAccessibilityClient)
+	)
+
+	kde5_src_configure
+}