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

[Manuel Rüger]

commit:     981a5ddac3144851c49e49f1212ff1e85ba08e88
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Jul 31 17:50:18 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Fri Jul 31 18:43:04 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=981a5dda

Frameworks merged to master

Package-Manager: portage-2.2.20

Signed-off-by: Manuel Rüger <mrueg <AT> gentoo.org>

 kde-apps/ktuberling/ktuberling-5.9999.ebuild | 39 ----------------------------
 kde-apps/ktuberling/ktuberling-9999.ebuild   | 28 ++++++++++++++++----
 2 files changed, 23 insertions(+), 44 deletions(-)

diff --git a/kde-apps/ktuberling/ktuberling-5.9999.ebuild b/kde-apps/ktuberling/ktuberling-5.9999.ebuild
deleted file mode 100644
index e98adfa..0000000
--- a/kde-apps/ktuberling/ktuberling-5.9999.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KDE_HANDBOOK=true
-KDE_SELINUX_MODULE="games"
-EGIT_BRANCH="frameworks"
-inherit kde5
-
-DESCRIPTION="Potato game for kids by KDE"
-HOMEPAGE="
-	http://www.kde.org/applications/games/ktuberling/
-	http://games.kde.org/game.php?game=ktuberling
-"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/phonon[qt5]
-"
-
-RDEPEND="${DEPEND}"

diff --git a/kde-apps/ktuberling/ktuberling-9999.ebuild b/kde-apps/ktuberling/ktuberling-9999.ebuild
index 91a3675..0314771 100644
--- a/kde-apps/ktuberling/ktuberling-9999.ebuild
+++ b/kde-apps/ktuberling/ktuberling-9999.ebuild
@@ -4,17 +4,35 @@
 
 EAPI=5
 
-KDE_HANDBOOK="optional"
+KDE_HANDBOOK=true
 KDE_SELINUX_MODULE="games"
-inherit kde4-base
+inherit kde5
 
-DESCRIPTION="KDE: potato game for kids"
+DESCRIPTION="Potato game for kids by KDE"
 HOMEPAGE="
 	http://www.kde.org/applications/games/ktuberling/
 	http://games.kde.org/game.php?game=ktuberling
 "
 KEYWORDS=""
-IUSE="debug"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/phonon[qt5]
+"
 
-DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"