Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/ksudoku/
Date: Mon, 01 May 2017 18:44:02
Message-Id: 1493663477.46f6441e19ea6f3c5797c755a42cc0c54b80b7ae.asturm@gentoo
1 commit: 46f6441e19ea6f3c5797c755a42cc0c54b80b7ae
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 1 18:31:17 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon May 1 18:31:17 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=46f6441e
7
8 kde-apps/ksudoku: Frameworks merged to master
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 kde-apps/ksudoku/ksudoku-5.9999.ebuild | 50 ----------------------------------
13 kde-apps/ksudoku/ksudoku-9999.ebuild | 36 ++++++++++++++++++------
14 2 files changed, 28 insertions(+), 58 deletions(-)
15
16 diff --git a/kde-apps/ksudoku/ksudoku-5.9999.ebuild b/kde-apps/ksudoku/ksudoku-5.9999.ebuild
17 deleted file mode 100644
18 index 9ead4a2f6e..0000000000
19 --- a/kde-apps/ksudoku/ksudoku-5.9999.ebuild
20 +++ /dev/null
21 @@ -1,50 +0,0 @@
22 -# Copyright 1999-2017 Gentoo Foundation
23 -# Distributed under the terms of the GNU General Public License v2
24 -
25 -EAPI=6
26 -
27 -KDE_HANDBOOK=true
28 -EGIT_BRANCH="frameworks"
29 -inherit kde5
30 -
31 -DESCRIPTION="Sudoku by KDE"
32 -HOMEPAGE="
33 - https://www.kde.org/applications/games/ksudoku/
34 - https://games.kde.org/game.php?game=ksudoku
35 -"
36 -KEYWORDS=""
37 -IUSE="opengl"
38 -
39 -DEPEND="
40 - $(add_frameworks_dep karchive)
41 - $(add_frameworks_dep kconfig)
42 - $(add_frameworks_dep kconfigwidgets)
43 - $(add_frameworks_dep kcoreaddons)
44 - $(add_frameworks_dep kcrash)
45 - $(add_frameworks_dep kguiaddons)
46 - $(add_frameworks_dep ki18n)
47 - $(add_frameworks_dep kiconthemes)
48 - $(add_frameworks_dep kio)
49 - $(add_frameworks_dep kjobwidgets)
50 - $(add_frameworks_dep kwidgetsaddons)
51 - $(add_frameworks_dep kxmlgui)
52 - $(add_kdeapps_dep libkdegames)
53 - $(add_qt_dep qtgui)
54 - $(add_qt_dep qtprintsupport)
55 - $(add_qt_dep qtsvg)
56 - $(add_qt_dep qtwidgets)
57 - $(add_qt_dep qtxml)
58 - opengl? (
59 - $(add_qt_dep qtopengl)
60 - virtual/glu
61 - )
62 -"
63 -RDEPEND="${DEPEND}"
64 -
65 -src_configure() {
66 - local mycmakeargs=(
67 - $(cmake-utils_use_find_package opengl OpenGL)
68 - )
69 -
70 - kde5_src_configure
71 -}
72
73 diff --git a/kde-apps/ksudoku/ksudoku-9999.ebuild b/kde-apps/ksudoku/ksudoku-9999.ebuild
74 index 0d827e6c92..d95161ea52 100644
75 --- a/kde-apps/ksudoku/ksudoku-9999.ebuild
76 +++ b/kde-apps/ksudoku/ksudoku-9999.ebuild
77 @@ -3,27 +3,47 @@
78
79 EAPI=6
80
81 -KDE_HANDBOOK="optional"
82 -OPENGL_REQUIRED="optional"
83 -inherit kde4-base
84 +KDE_HANDBOOK="true"
85 +inherit kde5
86
87 -DESCRIPTION="Sudoku by KDE"
88 +DESCRIPTION="Logic-based symbol placement puzzle by KDE"
89 HOMEPAGE="
90 https://www.kde.org/applications/games/ksudoku/
91 https://games.kde.org/game.php?game=ksudoku
92 "
93 KEYWORDS=""
94 -IUSE="debug"
95 +IUSE="opengl"
96
97 DEPEND="
98 + $(add_frameworks_dep karchive)
99 + $(add_frameworks_dep kconfig)
100 + $(add_frameworks_dep kconfigwidgets)
101 + $(add_frameworks_dep kcoreaddons)
102 + $(add_frameworks_dep kcrash)
103 + $(add_frameworks_dep kguiaddons)
104 + $(add_frameworks_dep ki18n)
105 + $(add_frameworks_dep kiconthemes)
106 + $(add_frameworks_dep kio)
107 + $(add_frameworks_dep kjobwidgets)
108 + $(add_frameworks_dep kwidgetsaddons)
109 + $(add_frameworks_dep kxmlgui)
110 $(add_kdeapps_dep libkdegames)
111 - opengl? ( virtual/glu )
112 + $(add_qt_dep qtgui)
113 + $(add_qt_dep qtprintsupport)
114 + $(add_qt_dep qtsvg)
115 + $(add_qt_dep qtwidgets)
116 + $(add_qt_dep qtxml)
117 + opengl? (
118 + $(add_qt_dep qtopengl)
119 + virtual/glu
120 + )
121 "
122 RDEPEND="${DEPEND}"
123
124 src_configure() {
125 local mycmakeargs=(
126 - -DWITH_OpenGL=$(usex opengl)
127 + $(cmake-utils_use_find_package opengl OpenGL)
128 )
129 - kde4-base_src_configure
130 +
131 + kde5_src_configure
132 }