[gentoo-commits] proj/kde:master commit in: kde-apps/kiten/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     aa66e2a5a700c9a14e0057d1baec01a7583cb911
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 18 20:22:14 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 18 20:32:53 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=aa66e2a5

kde-apps/kiten: RDEPEND on media-fonts/kanjistrokeorders

Bug: https://bugs.gentoo.org/668672
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 kde-apps/kiten/kiten-18.08.49.9999.ebuild | 15 ++++++++-------
 kde-apps/kiten/kiten-9999.ebuild          | 13 +++++++------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/kde-apps/kiten/kiten-18.08.49.9999.ebuild b/kde-apps/kiten/kiten-18.08.49.9999.ebuild
index 55f9010343..69a18a5805 100644
--- a/kde-apps/kiten/kiten-18.08.49.9999.ebuild
+++ b/kde-apps/kiten/kiten-18.08.49.9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 KDE_HANDBOOK="forceoptional"
-FONT_PN="kanjistrokeorders"
-inherit font kde5
+inherit kde5
 
 DESCRIPTION="KDE Japanese dictionary and reference"
 HOMEPAGE="https://www.kde.org/applications/education/kiten https://edu.kde.org/kiten/"
@@ -29,9 +28,11 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	media-fonts/kanjistrokeorders
+"
 
-src_install() {
-	kde5_src_install
-	font_src_install
+src_prepare() {
+	kde5_src_prepare
+	cmake_comment_add_subdirectory data/font
 }

diff --git a/kde-apps/kiten/kiten-9999.ebuild b/kde-apps/kiten/kiten-9999.ebuild
index e6d1012b0a..b7ee8fcf5a 100644
--- a/kde-apps/kiten/kiten-9999.ebuild
+++ b/kde-apps/kiten/kiten-9999.ebuild
@@ -4,8 +4,7 @@
 EAPI=6
 
 KDE_HANDBOOK="forceoptional"
-FONT_PN="kanjistrokeorders"
-inherit font kde5
+inherit kde5
 
 DESCRIPTION="KDE Japanese dictionary and reference"
 HOMEPAGE="https://www.kde.org/applications/education/kiten https://edu.kde.org/kiten/"
@@ -30,9 +29,11 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	media-fonts/kanjistrokeorders
+"
 
-src_install() {
-	kde5_src_install
-	font_src_install
+src_prepare() {
+	kde5_src_prepare
+	cmake_comment_add_subdirectory data/font
 }