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

[Michael Palimaka]

commit:     3d4588ac45afb30fca792f20f495bfae70db6274
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  5 16:53:24 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Nov  5 16:53:24 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3d4588ac

kde-apps/knavalbattle: frameworks merged to master

Package-Manager: portage-2.2.20.1

 kde-apps/knavalbattle/knavalbattle-5.9999.ebuild | 38 ------------------------
 kde-apps/knavalbattle/knavalbattle-9999.ebuild   | 27 +++++++++++++----
 2 files changed, 22 insertions(+), 43 deletions(-)

diff --git a/kde-apps/knavalbattle/knavalbattle-5.9999.ebuild b/kde-apps/knavalbattle/knavalbattle-5.9999.ebuild
deleted file mode 100644
index 4de9234..0000000
--- a/kde-apps/knavalbattle/knavalbattle-5.9999.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK=true
-KDE_SELINUX_MODULE="games"
-EGIT_BRANCH="frameworks"
-inherit kde5
-
-DESCRIPTION="Battleship clone by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/games/navalbattle/
-	https://games.kde.org/game.php?game=kbattleship
-"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/phonon[qt5]
-"
-
-RDEPEND="${DEPEND}"

diff --git a/kde-apps/knavalbattle/knavalbattle-9999.ebuild b/kde-apps/knavalbattle/knavalbattle-9999.ebuild
index 426c4c3..1ac25a6 100644
--- a/kde-apps/knavalbattle/knavalbattle-9999.ebuild
+++ b/kde-apps/knavalbattle/knavalbattle-9999.ebuild
@@ -4,17 +4,34 @@
 
 EAPI=5
 
-KDE_HANDBOOK="optional"
+KDE_HANDBOOK=true
 KDE_SELINUX_MODULE="games"
-inherit kde4-base
+inherit kde5
 
-DESCRIPTION="The KDE Battleship clone"
+DESCRIPTION="Battleship clone by KDE"
 HOMEPAGE="
 	https://www.kde.org/applications/games/navalbattle/
 	https://games.kde.org/game.php?game=kbattleship
 "
 KEYWORDS=""
-IUSE="debug"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/phonon[qt5]
+"
 
-DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"