[gentoo-commits] proj/kde:master commit in: sets/, kde-apps/kmines/

[Johannes Huber]

commit:     a694c69c3a801d1650e74d12205186d7b4ad6b9b
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Jan 31 19:22:34 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Feb  1 00:10:54 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=a694c69c

[kde-apps/kmines] Frameworks merged to master

Package-Manager: portage-2.2.15

---
 kde-apps/kmines/kmines-5.9999.ebuild | 54 ------------------------------------
 kde-apps/kmines/kmines-9999.ebuild   | 43 ++++++++++++++++++++++++----
 sets/kdegames-live                   |  1 +
 3 files changed, 39 insertions(+), 59 deletions(-)

diff --git a/kde-apps/kmines/kmines-5.9999.ebuild b/kde-apps/kmines/kmines-5.9999.ebuild
deleted file mode 100644
index f143512..0000000
--- a/kde-apps/kmines/kmines-5.9999.ebuild
+++ /dev/null
@@ -1,54 +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"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="KMines is a classic mine sweeper game"
-HOMEPAGE="
-	http://www.kde.org/applications/games/kmines/
-	http://games.kde.org/game.php?game=kmines
-"
-KEYWORDS=""
-IUSE="phonon"
-
-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 knotifyconfig)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	dev-qt/qtdeclarative:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	phonon? ( media-libs/phonon[qt5] )
-"
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# fix copy-paste (?) error, there are no tests
-	sed -i "/find_package(Qt5/ s/ Test//" CMakeLists.txt || die
-
-	kde5_src_prepare
-}
-
-src_configure(){
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package phonon Phonon4Qt5)
-	)
-
-	kde5_src_configure
-}

diff --git a/kde-apps/kmines/kmines-9999.ebuild b/kde-apps/kmines/kmines-9999.ebuild
index 3efd530..6cbdc9f 100644
--- a/kde-apps/kmines/kmines-9999.ebuild
+++ b/kde-apps/kmines/kmines-9999.ebuild
@@ -4,17 +4,50 @@
 
 EAPI=5
 
-KDE_HANDBOOK="optional"
+KDE_HANDBOOK="true"
 KDE_SELINUX_MODULE="games"
-inherit kde4-base
+inherit kde5
 
-DESCRIPTION="KMines is a classic mine sweeper game"
+DESCRIPTION="Classic mine sweeper game"
 HOMEPAGE="
 	http://www.kde.org/applications/games/kmines/
 	http://games.kde.org/game.php?game=kmines
 "
 KEYWORDS=""
-IUSE="debug"
+IUSE="phonon"
+
+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 knotifyconfig)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	dev-qt/qtdeclarative:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	phonon? ( media-libs/phonon[qt5] )
+"
 
-DEPEND="$(add_kdeapps_dep libkdegames)"
 RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# fix copy-paste (?) error, there are no tests
+	sed -i "/find_package(Qt5/ s/ Test//" CMakeLists.txt || die
+
+	kde5_src_prepare
+}
+
+src_configure(){
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package phonon Phonon4Qt5)
+	)
+
+	kde5_src_configure
+}

diff --git a/sets/kdegames-live b/sets/kdegames-live
index dfa920e..f1c1711 100644
--- a/sets/kdegames-live
+++ b/sets/kdegames-live
@@ -1,4 +1,5 @@
 ~kde-apps/bomber-9999
 ~kde-apps/bovo-9999
+~kde-apps/kmines-9999
 ~kde-apps/libkdegames-9999
 ~kde-apps/libkmahjongg-9999