commit: 1ac4db79a15f5dbf186cac519da403ee14445ea6 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Fri Apr 24 18:49:30 2020 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> 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 <floppym <AT> 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
