Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/klickety/
Date: Thu, 05 Nov 2015 13:27:44
Message-Id: 1446729795.e6d9e19017b3a85821a238e5f274db3e23815155.kensington@gentoo
1 commit: e6d9e19017b3a85821a238e5f274db3e23815155
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Thu Nov 5 13:21:28 2015 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 5 13:23:15 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e6d9e190
7
8 kde-apps/klickety: frameworks merged to master
9
10 Package-Manager: portage-2.2.20.1
11
12 kde-apps/klickety/klickety-5.9999.ebuild | 32 --------------------------------
13 kde-apps/klickety/klickety-9999.ebuild | 25 ++++++++++++++++++++-----
14 2 files changed, 20 insertions(+), 37 deletions(-)
15
16 diff --git a/kde-apps/klickety/klickety-5.9999.ebuild b/kde-apps/klickety/klickety-5.9999.ebuild
17 deleted file mode 100644
18 index 0755da4..0000000
19 --- a/kde-apps/klickety/klickety-5.9999.ebuild
20 +++ /dev/null
21 @@ -1,32 +0,0 @@
22 -# Copyright 1999-2015 Gentoo Foundation
23 -# Distributed under the terms of the GNU General Public License v2
24 -# $Id$
25 -
26 -EAPI=5
27 -
28 -KDE_HANDBOOK="true"
29 -KDE_PUNT_BOGUS_DEPS="true"
30 -KDE_SELINUX_MODULE="games"
31 -EGIT_BRANCH="frameworks"
32 -inherit kde5
33 -
34 -DESCRIPTION="A game almost the same as ksame, but a bit different by KDE"
35 -KEYWORDS=""
36 -IUSE=""
37 -
38 -DEPEND="
39 - $(add_frameworks_dep kconfig)
40 - $(add_frameworks_dep kconfigwidgets)
41 - $(add_frameworks_dep kcoreaddons)
42 - $(add_frameworks_dep ki18n)
43 - $(add_frameworks_dep kio)
44 - $(add_frameworks_dep knotifications)
45 - $(add_frameworks_dep knotifyconfig)
46 - $(add_frameworks_dep kwidgetsaddons)
47 - $(add_frameworks_dep kxmlgui)
48 - $(add_kdeapps_dep libkdegames)
49 - dev-qt/qtgui:5
50 - dev-qt/qtwidgets:5
51 -"
52 -
53 -RDEPEND="${DEPEND}"
54
55 diff --git a/kde-apps/klickety/klickety-9999.ebuild b/kde-apps/klickety/klickety-9999.ebuild
56 index 5b3288e..3756452 100644
57 --- a/kde-apps/klickety/klickety-9999.ebuild
58 +++ b/kde-apps/klickety/klickety-9999.ebuild
59 @@ -4,13 +4,28 @@
60
61 EAPI=5
62
63 -KDE_HANDBOOK="optional"
64 +KDE_HANDBOOK="true"
65 +KDE_PUNT_BOGUS_DEPS="true"
66 KDE_SELINUX_MODULE="games"
67 -inherit kde4-base
68 +inherit kde5
69
70 -DESCRIPTION="A KDE game almost the same as ksame, but a bit different"
71 +DESCRIPTION="A game almost the same as ksame, but a bit different by KDE"
72 KEYWORDS=""
73 -IUSE="debug"
74 +IUSE=""
75 +
76 +DEPEND="
77 + $(add_frameworks_dep kconfig)
78 + $(add_frameworks_dep kconfigwidgets)
79 + $(add_frameworks_dep kcoreaddons)
80 + $(add_frameworks_dep ki18n)
81 + $(add_frameworks_dep kio)
82 + $(add_frameworks_dep knotifications)
83 + $(add_frameworks_dep knotifyconfig)
84 + $(add_frameworks_dep kwidgetsaddons)
85 + $(add_frameworks_dep kxmlgui)
86 + $(add_kdeapps_dep libkdegames)
87 + dev-qt/qtgui:5
88 + dev-qt/qtwidgets:5
89 +"
90
91 -DEPEND="$(add_kdeapps_dep libkdegames)"
92 RDEPEND="${DEPEND}"