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

[Andreas Sturmlechner]

commit:     701b635f727ba383eaf73dd8149412dffbbb164a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 22 22:36:50 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 22 22:36:50 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=701b635f

kde-apps/kubrick: Frameworks merged to master

Thanks-to: Andrius Štikonas <andrius <AT> stikonas.eu>

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 kde-apps/kubrick/kubrick-5.9999.ebuild | 32 --------------------------------
 kde-apps/kubrick/kubrick-9999.ebuild   | 23 +++++++++++++++++------
 2 files changed, 17 insertions(+), 38 deletions(-)

diff --git a/kde-apps/kubrick/kubrick-5.9999.ebuild b/kde-apps/kubrick/kubrick-5.9999.ebuild
deleted file mode 100644
index eae8cb4425..0000000000
--- a/kde-apps/kubrick/kubrick-5.9999.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK=true
-EGIT_BRANCH="frameworks"
-inherit kde5
-
-DESCRIPTION="Game based on the \"Rubik's Cube\" puzzle by KDE"
-HOMEPAGE="https://www.kde.org/applications/games/kubrick/"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtopengl)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	virtual/glu
-"
-DEPEND="${RDEPEND}
-	virtual/opengl
-"

diff --git a/kde-apps/kubrick/kubrick-9999.ebuild b/kde-apps/kubrick/kubrick-9999.ebuild
index b75c156b0a..a16a2cedb4 100644
--- a/kde-apps/kubrick/kubrick-9999.ebuild
+++ b/kde-apps/kubrick/kubrick-9999.ebuild
@@ -3,16 +3,27 @@
 
 EAPI=6
 
-KDE_HANDBOOK="optional"
-OPENGL_REQUIRED="always"
-inherit kde4-base
+KDE_HANDBOOK="true"
+inherit kde5
 
-DESCRIPTION="A game based on the \"Rubik's Cube\" puzzle"
+DESCRIPTION="Game based on the \"Rubik's Cube\" puzzle by KDE"
 HOMEPAGE="https://www.kde.org/applications/games/kubrick/"
 KEYWORDS=""
-IUSE="debug"
+IUSE=""
 
-RDEPEND="$(add_kdeapps_dep libkdegames)
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtopengl)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
 	virtual/glu
 "
 DEPEND="${RDEPEND}