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

["Johannes Huber" <johu@gentoo.org>]

commit:     579895a5c45e52df96449dae9c82c1dbf14da2fe
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 24 23:30:11 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Feb 24 23:30:11 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=579895a5

[kde-apps/granatier] Frameworks merged to master

Package-Manager: portage-2.2.17

---
 kde-apps/granatier/granatier-5.9999.ebuild | 37 ------------------------------
 kde-apps/granatier/granatier-9999.ebuild   | 24 ++++++++++++++++---
 2 files changed, 21 insertions(+), 40 deletions(-)

diff --git a/kde-apps/granatier/granatier-5.9999.ebuild b/kde-apps/granatier/granatier-5.9999.ebuild
deleted file mode 100644
index 3896846..0000000
--- a/kde-apps/granatier/granatier-5.9999.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-EGIT_BRANCH="frameworks"
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="KDE Bomberman game"
-HOMEPAGE="http://www.kde.org/applications/games/granatier/"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-"
-
-RDEPEND="${DEPEND}"

diff --git a/kde-apps/granatier/granatier-9999.ebuild b/kde-apps/granatier/granatier-9999.ebuild
index d11020e..1e2c667 100644
--- a/kde-apps/granatier/granatier-9999.ebuild
+++ b/kde-apps/granatier/granatier-9999.ebuild
@@ -4,15 +4,33 @@
 
 EAPI=5
 
-KDE_HANDBOOK="optional"
-inherit kde4-base
+KDE_HANDBOOK="true"
+inherit kde5
 
 DESCRIPTION="KDE Bomberman game"
 HOMEPAGE="http://www.kde.org/applications/games/granatier/"
 KEYWORDS=""
-IUSE="debug"
+IUSE=""
 
 DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
 	$(add_kdeapps_dep libkdegames)
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
 "
+
 RDEPEND="${DEPEND}"