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/kiten/
Date: Thu, 18 Oct 2018 21:00:49
Message-Id: 1539894773.aa66e2a5a700c9a14e0057d1baec01a7583cb911.asturm@gentoo
1 commit: aa66e2a5a700c9a14e0057d1baec01a7583cb911
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 18 20:22:14 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 18 20:32:53 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=aa66e2a5
7
8 kde-apps/kiten: RDEPEND on media-fonts/kanjistrokeorders
9
10 Bug: https://bugs.gentoo.org/668672
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12 Package-Manager: Portage-2.3.51, Repoman-2.3.11
13
14 kde-apps/kiten/kiten-18.08.49.9999.ebuild | 15 ++++++++-------
15 kde-apps/kiten/kiten-9999.ebuild | 13 +++++++------
16 2 files changed, 15 insertions(+), 13 deletions(-)
17
18 diff --git a/kde-apps/kiten/kiten-18.08.49.9999.ebuild b/kde-apps/kiten/kiten-18.08.49.9999.ebuild
19 index 55f9010343..69a18a5805 100644
20 --- a/kde-apps/kiten/kiten-18.08.49.9999.ebuild
21 +++ b/kde-apps/kiten/kiten-18.08.49.9999.ebuild
22 @@ -1,11 +1,10 @@
23 -# Copyright 1999-2018 Gentoo Foundation
24 +# Copyright 1999-2018 Gentoo Authors
25 # Distributed under the terms of the GNU General Public License v2
26
27 EAPI=6
28
29 KDE_HANDBOOK="forceoptional"
30 -FONT_PN="kanjistrokeorders"
31 -inherit font kde5
32 +inherit kde5
33
34 DESCRIPTION="KDE Japanese dictionary and reference"
35 HOMEPAGE="https://www.kde.org/applications/education/kiten https://edu.kde.org/kiten/"
36 @@ -29,9 +28,11 @@ DEPEND="
37 $(add_qt_dep qtgui)
38 $(add_qt_dep qtwidgets)
39 "
40 -RDEPEND="${DEPEND}"
41 +RDEPEND="${DEPEND}
42 + media-fonts/kanjistrokeorders
43 +"
44
45 -src_install() {
46 - kde5_src_install
47 - font_src_install
48 +src_prepare() {
49 + kde5_src_prepare
50 + cmake_comment_add_subdirectory data/font
51 }
52
53 diff --git a/kde-apps/kiten/kiten-9999.ebuild b/kde-apps/kiten/kiten-9999.ebuild
54 index e6d1012b0a..b7ee8fcf5a 100644
55 --- a/kde-apps/kiten/kiten-9999.ebuild
56 +++ b/kde-apps/kiten/kiten-9999.ebuild
57 @@ -4,8 +4,7 @@
58 EAPI=6
59
60 KDE_HANDBOOK="forceoptional"
61 -FONT_PN="kanjistrokeorders"
62 -inherit font kde5
63 +inherit kde5
64
65 DESCRIPTION="KDE Japanese dictionary and reference"
66 HOMEPAGE="https://www.kde.org/applications/education/kiten https://edu.kde.org/kiten/"
67 @@ -30,9 +29,11 @@ DEPEND="
68 $(add_qt_dep qtgui)
69 $(add_qt_dep qtwidgets)
70 "
71 -RDEPEND="${DEPEND}"
72 +RDEPEND="${DEPEND}
73 + media-fonts/kanjistrokeorders
74 +"
75
76 -src_install() {
77 - kde5_src_install
78 - font_src_install
79 +src_prepare() {
80 + kde5_src_prepare
81 + cmake_comment_add_subdirectory data/font
82 }