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

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

commit:     97af02a85aef1d6865ad66e9deabdf4c5f71128a
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Jan 28 21:23:57 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jan 28 21:23:57 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=97af02a8

[kde-apps/bomber] Frameworks merged to master

---
 kde-apps/bomber/bomber-5.9999.ebuild | 31 -------------------------------
 kde-apps/bomber/bomber-9999.ebuild   | 22 ++++++++++++++++++----
 2 files changed, 18 insertions(+), 35 deletions(-)

diff --git a/kde-apps/bomber/bomber-5.9999.ebuild b/kde-apps/bomber/bomber-5.9999.ebuild
deleted file mode 100644
index 2271280..0000000
--- a/kde-apps/bomber/bomber-5.9999.ebuild
+++ /dev/null
@@ -1,31 +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 arcade bombing game"
-HOMEPAGE="http://www.kde.org/applications/games/bomber/"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	media-libs/phonon[qt5]
-"
-
-RDEPEND="${DEPEND}"

diff --git a/kde-apps/bomber/bomber-9999.ebuild b/kde-apps/bomber/bomber-9999.ebuild
index 69ff6a8..897763d 100644
--- a/kde-apps/bomber/bomber-9999.ebuild
+++ b/kde-apps/bomber/bomber-9999.ebuild
@@ -4,13 +4,27 @@
 
 EAPI=5
 
-KDE_HANDBOOK="optional"
-inherit kde4-base
+KDE_HANDBOOK="true"
+inherit kde5
 
 DESCRIPTION="KDE arcade bombing game"
 HOMEPAGE="http://www.kde.org/applications/games/bomber/"
 KEYWORDS=""
-IUSE="debug"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	media-libs/phonon[qt5]
+"
 
-DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"