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 B8CB7138350 for ; Fri, 24 Apr 2020 19:12:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E2DE5E08D6; Fri, 24 Apr 2020 19:12:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 B3159E08D6 for ; Fri, 24 Apr 2020 19:12:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 D787934F19C for ; Fri, 24 Apr 2020 19:12:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7C4191EE for ; Fri, 24 Apr 2020 19:12:29 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1587755543.1ac4db79a15f5dbf186cac519da403ee14445ea6.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-fonts/noto-emoji/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-fonts/noto-emoji/noto-emoji-20200311.ebuild media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild media-fonts/noto-emoji/noto-emoji-20200317.ebuild X-VCS-Directories: media-fonts/noto-emoji/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 1ac4db79a15f5dbf186cac519da403ee14445ea6 X-VCS-Branch: master Date: Fri, 24 Apr 2020 19:12:29 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f845f6e0-d5e4-46e8-a544-f7501f59280d X-Archives-Hash: bf0c81c52ac00f585d60cf7bb95e5e03 commit: 1ac4db79a15f5dbf186cac519da403ee14445ea6 Author: Mike Gilbert gentoo org> AuthorDate: Fri Apr 24 18:49:30 2020 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Fri Apr 24 19:12:23 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ac4db79 media-fonts/noto-emoji: fix python support Closes: https://bugs.gentoo.org/719264 Signed-off-by: Mike Gilbert gentoo.org> media-fonts/noto-emoji/noto-emoji-20200311.ebuild | 16 ++++++++++++---- media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild | 15 ++++++++++----- media-fonts/noto-emoji/noto-emoji-20200317.ebuild | 16 ++++++++++++---- 3 files changed, 34 insertions(+), 13 deletions(-) diff --git a/media-fonts/noto-emoji/noto-emoji-20200311.ebuild b/media-fonts/noto-emoji/noto-emoji-20200311.ebuild index 8c9d46ac17e..96e7679fa64 100644 --- a/media-fonts/noto-emoji/noto-emoji-20200311.ebuild +++ b/media-fonts/noto-emoji/noto-emoji-20200311.ebuild @@ -17,7 +17,7 @@ SLOT="0" KEYWORDS="amd64" IUSE="" -DEPEND="${PYTHON_DEPS} +BDEPEND="${PYTHON_DEPS} app-arch/zopfli $(python_gen_any_dep ' dev-python/fonttools[${PYTHON_USEDEP}] @@ -27,7 +27,6 @@ DEPEND="${PYTHON_DEPS} x11-libs/cairo || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) " -RDEPEND="" RESTRICT="binchecks strip" @@ -37,8 +36,12 @@ FONT_S="${S}" FONT_SUFFIX="ttf" python_check_deps() { - has_version "dev-python/fonttools[${PYTHON_USEDEP}]" && \ - has_version "dev-python/nototools[${PYTHON_USEDEP}]" + has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]" && + has_version -b "dev-python/nototools[${PYTHON_USEDEP}]" +} + +pkg_setup() { + font_pkg_setup } PATCHES=( @@ -58,6 +61,11 @@ src_prepare() { fi } +src_compile() { + python_setup + default +} + src_install() { font_src_install diff --git a/media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild b/media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild index e34508200bf..c676a419e55 100644 --- a/media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild +++ b/media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild @@ -17,7 +17,8 @@ SLOT="0" KEYWORDS="~amd64" IUSE="buildfont" -DEPEND="buildfont? ( +BDEPEND=" + buildfont? ( ${PYTHON_DEPS} app-arch/zopfli $(python_gen_any_dep ' @@ -29,15 +30,18 @@ DEPEND="buildfont? ( || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) ) " -RDEPEND="" RESTRICT="binchecks strip" S="${WORKDIR}/${PN}-${COMMIT}" python_check_deps() { - has_version "dev-python/fonttools[${PYTHON_USEDEP}]" && \ - has_version "dev-python/nototools[${PYTHON_USEDEP}]" + has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]" && + has_version -b "dev-python/nototools[${PYTHON_USEDEP}]" +} + +pkg_setup() { + font_pkg_setup } src_prepare() { @@ -55,7 +59,7 @@ src_prepare() { eapply "${FILESDIR}"/${PN}-zopflipng-verbose.patch # Based on Fedora patch to allow graphicsmagick usage - if has_version media-gfx/graphicsmagick; then + if has_version -b media-gfx/graphicsmagick; then eapply "${FILESDIR}/${PN}-20190328-use-gm.patch" fi fi @@ -68,6 +72,7 @@ src_compile() { einfo "To build fonts based on latest images enable 'buildfont'" einfo "USE (that will require more time and resources too)." else + python_setup einfo "Building fonts..." default fi diff --git a/media-fonts/noto-emoji/noto-emoji-20200317.ebuild b/media-fonts/noto-emoji/noto-emoji-20200317.ebuild index 73217e5becc..b4230796aef 100644 --- a/media-fonts/noto-emoji/noto-emoji-20200317.ebuild +++ b/media-fonts/noto-emoji/noto-emoji-20200317.ebuild @@ -17,7 +17,7 @@ SLOT="0" KEYWORDS="~amd64" IUSE="" -DEPEND="${PYTHON_DEPS} +BDEPEND="${PYTHON_DEPS} app-arch/zopfli $(python_gen_any_dep ' dev-python/fonttools[${PYTHON_USEDEP}] @@ -27,7 +27,6 @@ DEPEND="${PYTHON_DEPS} x11-libs/cairo || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) " -RDEPEND="" RESTRICT="binchecks strip" @@ -37,8 +36,12 @@ FONT_S="${S}" FONT_SUFFIX="ttf" python_check_deps() { - has_version "dev-python/fonttools[${PYTHON_USEDEP}]" && \ - has_version "dev-python/nototools[${PYTHON_USEDEP}]" + has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]" && + has_version -b "dev-python/nototools[${PYTHON_USEDEP}]" +} + +pkg_setup() { + font_pkg_setup } PATCHES=( @@ -58,6 +61,11 @@ src_prepare() { fi } +src_compile() { + python_setup + default +} + src_install() { font_src_install