commit:     fd2bde8374433d558dcc36a788ac765e74a508b3
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Jan  4 23:31:28 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Jan  5 00:56:49 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fd2bde83

kde-apps/kmahjongg: Frameworks merged to master

Package-Manager: portage-2.2.26

 kde-apps/kmahjongg/kmahjongg-5.9999.ebuild | 36 ------------------------------
 kde-apps/kmahjongg/kmahjongg-9999.ebuild   | 22 ++++++++++++++----
 2 files changed, 18 insertions(+), 40 deletions(-)

diff --git a/kde-apps/kmahjongg/kmahjongg-5.9999.ebuild 
b/kde-apps/kmahjongg/kmahjongg-5.9999.ebuild
deleted file mode 100644
index c5cd522..0000000
--- a/kde-apps/kmahjongg/kmahjongg-5.9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK=true
-KDE_SELINUX_MODULE="games"
-EGIT_BRANCH="frameworks"
-inherit kde5
-
-DESCRIPTION="Mahjongg game by KDE"
-HOMEPAGE="
-       https://www.kde.org/applications/games/kmahjongg/
-       https://games.kde.org/game.php?game=kmahjongg
-"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
-       $(add_frameworks_dep kcompletion)
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kconfigwidgets)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kdbusaddons)
-       $(add_frameworks_dep kdelibs4support)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_frameworks_dep kxmlgui)
-       $(add_kdeapps_dep libkdegames)
-       $(add_kdeapps_dep libkmahjongg)
-       dev-qt/qtgui:5
-       dev-qt/qtwidgets:5
-"
-
-RDEPEND="${DEPEND}"

diff --git a/kde-apps/kmahjongg/kmahjongg-9999.ebuild 
b/kde-apps/kmahjongg/kmahjongg-9999.ebuild
index 28930a4..3db3a88 100644
--- a/kde-apps/kmahjongg/kmahjongg-9999.ebuild
+++ b/kde-apps/kmahjongg/kmahjongg-9999.ebuild
@@ -4,20 +4,34 @@
 
 EAPI=5
 
-KDE_HANDBOOK="optional"
+KDE_HANDBOOK="forceoptional"
 KDE_SELINUX_MODULE="games"
-inherit kde4-base
+inherit kde5
 
-DESCRIPTION="Mahjongg for KDE"
+DESCRIPTION="A tile matching game for one or two players"
 HOMEPAGE="
        https://www.kde.org/applications/games/kmahjongg/
        https://games.kde.org/game.php?game=kmahjongg
 "
 KEYWORDS=""
-IUSE="debug"
+IUSE=""
 
 DEPEND="
+       $(add_frameworks_dep kcompletion)
+       $(add_frameworks_dep kconfig)
+       $(add_frameworks_dep kconfigwidgets)
+       $(add_frameworks_dep kcoreaddons)
+       $(add_frameworks_dep kdbusaddons)
+       $(add_frameworks_dep kdeclarative)
+       $(add_frameworks_dep ki18n)
+       $(add_frameworks_dep knewstuff)
+       $(add_frameworks_dep kwidgetsaddons)
+       $(add_frameworks_dep kxmlgui)
        $(add_kdeapps_dep libkdegames)
        $(add_kdeapps_dep libkmahjongg)
+       dev-qt/qtgui:5
+       dev-qt/qtsvg:5
+       dev-qt/qtwidgets:5
 "
+
 RDEPEND="${DEPEND}"

Reply via email to