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

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     46f6441e19ea6f3c5797c755a42cc0c54b80b7ae
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May  1 18:31:17 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May  1 18:31:17 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=46f6441e

kde-apps/ksudoku: Frameworks merged to master

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-apps/ksudoku/ksudoku-5.9999.ebuild | 50 ----------------------------------
 kde-apps/ksudoku/ksudoku-9999.ebuild   | 36 ++++++++++++++++++------
 2 files changed, 28 insertions(+), 58 deletions(-)

diff --git a/kde-apps/ksudoku/ksudoku-5.9999.ebuild b/kde-apps/ksudoku/ksudoku-5.9999.ebuild
deleted file mode 100644
index 9ead4a2f6e..0000000000
--- a/kde-apps/ksudoku/ksudoku-5.9999.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK=true
-EGIT_BRANCH="frameworks"
-inherit kde5
-
-DESCRIPTION="Sudoku by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/games/ksudoku/
-	https://games.kde.org/game.php?game=ksudoku
-"
-KEYWORDS=""
-IUSE="opengl"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	opengl? (
-		$(add_qt_dep qtopengl)
-		virtual/glu
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package opengl OpenGL)
-	)
-
-	kde5_src_configure
-}

diff --git a/kde-apps/ksudoku/ksudoku-9999.ebuild b/kde-apps/ksudoku/ksudoku-9999.ebuild
index 0d827e6c92..d95161ea52 100644
--- a/kde-apps/ksudoku/ksudoku-9999.ebuild
+++ b/kde-apps/ksudoku/ksudoku-9999.ebuild
@@ -3,27 +3,47 @@
 
 EAPI=6
 
-KDE_HANDBOOK="optional"
-OPENGL_REQUIRED="optional"
-inherit kde4-base
+KDE_HANDBOOK="true"
+inherit kde5
 
-DESCRIPTION="Sudoku by KDE"
+DESCRIPTION="Logic-based symbol placement puzzle by KDE"
 HOMEPAGE="
 	https://www.kde.org/applications/games/ksudoku/
 	https://games.kde.org/game.php?game=ksudoku
 "
 KEYWORDS=""
-IUSE="debug"
+IUSE="opengl"
 
 DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep libkdegames)
-	opengl? ( virtual/glu )
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	opengl? (
+		$(add_qt_dep qtopengl)
+		virtual/glu
+	)
 "
 RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		-DWITH_OpenGL=$(usex opengl)
+		$(cmake-utils_use_find_package opengl OpenGL)
 	)
-	kde4-base_src_configure
+
+	kde5_src_configure
 }