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

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

commit:     5b56f6b541b251564fc543add82c5ceae00026b1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 25 20:57:43 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 20:57:43 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5b56f6b5

kde-apps/kspaceduel: Frameworks merged to master

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-apps/kspaceduel/kspaceduel-5.9999.ebuild | 33 ----------------------------
 kde-apps/kspaceduel/kspaceduel-9999.ebuild   | 21 ++++++++++++++----
 2 files changed, 17 insertions(+), 37 deletions(-)

diff --git a/kde-apps/kspaceduel/kspaceduel-5.9999.ebuild b/kde-apps/kspaceduel/kspaceduel-5.9999.ebuild
deleted file mode 100644
index 2fb9e1729c..0000000000
--- a/kde-apps/kspaceduel/kspaceduel-5.9999.ebuild
+++ /dev/null
@@ -1,33 +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"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Space Game by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/games/kspaceduel/
-	https://games.kde.org/game.php?game=kspaceduel
-"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"

diff --git a/kde-apps/kspaceduel/kspaceduel-9999.ebuild b/kde-apps/kspaceduel/kspaceduel-9999.ebuild
index ffcfa4b61f..ffbd97341f 100644
--- a/kde-apps/kspaceduel/kspaceduel-9999.ebuild
+++ b/kde-apps/kspaceduel/kspaceduel-9999.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=6
 
-KDE_HANDBOOK="optional"
+KDE_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
-inherit kde4-base
+inherit kde5
 
 DESCRIPTION="Space Game by KDE"
 HOMEPAGE="
@@ -13,7 +13,20 @@ HOMEPAGE="
 	https://games.kde.org/game.php?game=kspaceduel
 "
 KEYWORDS=""
-IUSE="debug"
+IUSE=""
 
-DEPEND="$(add_kdeapps_dep libkdegames)"
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
 RDEPEND="${DEPEND}"