From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DD1FB138334 for ; Thu, 18 Oct 2018 21:00:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 179ACE0A8F; Thu, 18 Oct 2018 21:00:49 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E0732E0A8F for ; Thu, 18 Oct 2018 21:00:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8D34C335CF4 for ; Thu, 18 Oct 2018 21:00:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8ED61444 for ; Thu, 18 Oct 2018 21:00:38 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1539894773.aa66e2a5a700c9a14e0057d1baec01a7583cb911.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kiten/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/kiten/kiten-18.08.49.9999.ebuild kde-apps/kiten/kiten-9999.ebuild X-VCS-Directories: kde-apps/kiten/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: aa66e2a5a700c9a14e0057d1baec01a7583cb911 X-VCS-Branch: master Date: Thu, 18 Oct 2018 21:00:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 12c0879b-0a55-4229-94ae-bfc9be605154 X-Archives-Hash: 1e16c18fde79dac936f1b972c08d09dc commit: aa66e2a5a700c9a14e0057d1baec01a7583cb911 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Oct 18 20:22:14 2018 +0000 Commit: Andreas Sturmlechner gentoo 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 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 }