commit: e6d9e19017b3a85821a238e5f274db3e23815155
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 5 13:21:28 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Nov 5 13:23:15 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e6d9e190
kde-apps/klickety: frameworks merged to master
Package-Manager: portage-2.2.20.1
kde-apps/klickety/klickety-5.9999.ebuild | 32 --------------------------------
kde-apps/klickety/klickety-9999.ebuild | 25 ++++++++++++++++++++-----
2 files changed, 20 insertions(+), 37 deletions(-)
diff --git a/kde-apps/klickety/klickety-5.9999.ebuild
b/kde-apps/klickety/klickety-5.9999.ebuild
deleted file mode 100644
index 0755da4..0000000
--- a/kde-apps/klickety/klickety-5.9999.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="true"
-KDE_PUNT_BOGUS_DEPS="true"
-KDE_SELINUX_MODULE="games"
-EGIT_BRANCH="frameworks"
-inherit kde5
-
-DESCRIPTION="A game almost the same as ksame, but a bit different by KDE"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep knotifyconfig)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_kdeapps_dep libkdegames)
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
-"
-
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/klickety/klickety-9999.ebuild
b/kde-apps/klickety/klickety-9999.ebuild
index 5b3288e..3756452 100644
--- a/kde-apps/klickety/klickety-9999.ebuild
+++ b/kde-apps/klickety/klickety-9999.ebuild
@@ -4,13 +4,28 @@
EAPI=5
-KDE_HANDBOOK="optional"
+KDE_HANDBOOK="true"
+KDE_PUNT_BOGUS_DEPS="true"
KDE_SELINUX_MODULE="games"
-inherit kde4-base
+inherit kde5
-DESCRIPTION="A KDE game almost the same as ksame, but a bit different"
+DESCRIPTION="A game almost the same as ksame, but a bit different by KDE"
KEYWORDS=""
-IUSE="debug"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_kdeapps_dep libkdegames)
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
-DEPEND="$(add_kdeapps_dep libkdegames)"
RDEPEND="${DEPEND}"