commit:     56868357f7a56123da4a5b059885609e254e360a
Author:     Andrius Štikonas <andrius <AT> stikonas <DOT> eu>
AuthorDate: Fri Apr 21 16:37:49 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 21 17:15:06 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=56868357

kde-apps/konquest: frameworks merged to master.

Closes: https://github.com/gentoo/kde/pull/856

 kde-apps/konquest/konquest-5.9999.ebuild | 35 --------------------------------
 kde-apps/konquest/konquest-9999.ebuild   | 17 +++++++++++++---
 2 files changed, 14 insertions(+), 38 deletions(-)

diff --git a/kde-apps/konquest/konquest-5.9999.ebuild 
b/kde-apps/konquest/konquest-5.9999.ebuild
deleted file mode 100644
index 2668265674..0000000000
--- a/kde-apps/konquest/konquest-5.9999.ebuild
+++ /dev/null
@@ -1,35 +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" # not optional until kdelibs4support is gone
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Galactic Strategy KDE Game"
-HOMEPAGE="
-       https://www.kde.org/applications/games/konquest/
-       https://games.kde.org/game.php?game=konquest
-"
-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 kdelibs4support)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(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/konquest/konquest-9999.ebuild 
b/kde-apps/konquest/konquest-9999.ebuild
index ae70f95210..e7f5bd22e6 100644
--- a/kde-apps/konquest/konquest-9999.ebuild
+++ b/kde-apps/konquest/konquest-9999.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=6
 
-KDE_HANDBOOK="optional"
+KDE_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
-inherit kde4-base
+inherit kde5
 
 DESCRIPTION="Galactic Strategy KDE Game"
 HOMEPAGE="
@@ -13,9 +13,20 @@ HOMEPAGE="
        https://games.kde.org/game.php?game=konquest
 "
 KEYWORDS=""
-IUSE="debug"
+IUSE=""
 
 DEPEND="
+       $(add_frameworks_dep kconfig)
+       $(add_frameworks_dep kcoreaddons)
+       $(add_frameworks_dep kcrash)
+       $(add_frameworks_dep kdbusaddons)
+       $(add_frameworks_dep kguiaddons)
+       $(add_frameworks_dep ki18n)
+       $(add_frameworks_dep kxmlgui)
+       $(add_frameworks_dep kwidgetsaddons)
        $(add_kdeapps_dep libkdegames)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtsvg)
+       $(add_qt_dep qtwidgets)
 "
 RDEPEND="${DEPEND}"

Reply via email to