From c311c51c1242f6e7ef6b0032af906cb0b5389f67 Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 15 Mar 2021 14:25:12 -0400 Subject: [PATCH] media-fonts/dejavu: EAPI 7 Closes: https://bugs.gentoo.org/776415 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: David Michael --- media-fonts/dejavu/dejavu-2.37.ebuild | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/media-fonts/dejavu/dejavu-2.37.ebuild b/media-fonts/dejavu/dejavu-2.37.ebuild index 0b1bf5416c9..204523db4a6 100644 --- a/media-fonts/dejavu/dejavu-2.37.ebuild +++ b/media-fonts/dejavu/dejavu-2.37.ebuild @@ -1,16 +1,16 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit font versionator xdg-utils +EAPI=7 +inherit font xdg-utils DESCRIPTION="DejaVu fonts, bitstream vera with ISO-8859-2 characters" HOMEPAGE="https://dejavu-fonts.github.io/" # If you want to test snapshot from dejavu.sf.net/snapshots/ # just rename ebuild to dejavu-2.22.20071220.2156.ebuild -MY_PV=$(get_version_component_range 1-2) -snapv=$(get_version_component_range 3-4) +MY_PV=$(ver_cut 1-2) +snapv=$(ver_cut 3-4) snapv=${snapv/./-} MY_BP=${PN}-fonts-ttf-${MY_PV} MY_SP=${PN}-fonts-${MY_PV} @@ -28,12 +28,14 @@ SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="fontforge" -DEPEND="fontforge? ( - >=x11-apps/mkfontscale-1.2.0 - >=media-gfx/fontforge-20080429 - dev-perl/Font-TTF +BDEPEND=" + fontforge? ( app-i18n/unicode-data - >media-libs/fontconfig-2.6.0:1.0 ) + dev-perl/Font-TTF + >=media-gfx/fontforge-20080429 + >media-libs/fontconfig-2.6.0:1.0 + >=x11-apps/mkfontscale-1.2.0 + ) " FONT_CONF=( @@ -47,7 +49,7 @@ FONT_CONF=( FONT_S="ttf" FONT_SUFFIX="ttf" -DOCS="AUTHORS NEWS README.md status.txt langcover.txt unicover.txt" +DOCS=( AUTHORS NEWS README.md status.txt langcover.txt unicover.txt ) src_unpack() { default @@ -75,8 +77,6 @@ src_compile() { } src_install() { + use fontforge && DOCS+=( ttf/*.txt ) font_src_install - if use fontforge; then - dodoc ttf/*.txt - fi } -- 2.26.2