[gentoo-commits] repo/gentoo:master commit in: media-fonts/unifont/

["Mike Gilbert" <floppym@gentoo.org>]

commit:     84d7291509d0a6fbbbfb355af2b87a8e66aad048
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 29 02:10:17 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Mar 29 02:11:26 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84d72915

media-fonts/unifont: bump to 13.0.01

Package-Manager: Portage-2.3.92_p3, Repoman-2.3.20_p118
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 media-fonts/unifont/Manifest                       |  2 +-
 ...ifont-11.0.02.ebuild => unifont-13.0.01.ebuild} | 39 ++++++++++------------
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/media-fonts/unifont/Manifest b/media-fonts/unifont/Manifest
index a418d652f56..d587e3534eb 100644
--- a/media-fonts/unifont/Manifest
+++ b/media-fonts/unifont/Manifest
@@ -1,2 +1,2 @@
 DIST unifont-10.0.06.tar.gz 15651257 BLAKE2B e146ffe9ab591e5d90d399d37e068f0c3002a67699698b3f6b22a14ca91fe0415a507d855b56caae4e50183d97978667edca2fa2095209abbc7d02a4f17c20b8 SHA512 36f1eed24b37aad2f2ef100c8d2be01363a5438e76771e9ae82fa61ce58a4dd51566063b8e7b1265696cfe2335f1017842fecac2a5a801913f82ac9bf24caa54
-DIST unifont-11.0.02.tar.gz 15874967 BLAKE2B ee3c887ae441e70a95aad9a8f11d955ef848a5d4921d9c4c340d2f91a4c795503f2ef514bae93899591978afb797bee9d03bc222801f7d2daed199fb6045769b SHA512 d0dc8ce079feb282f53c444df5819751a7c97788feed480dc5c5b8a239c8cc13ef258876ffe2830994e404c0a6f524481a405b273c7341703ceef5854c12a68d
+DIST unifont-13.0.01.tar.gz 21053298 BLAKE2B 981d3d79015df9fa401823034de532840652127bc881d13244243dc0fbaabc14212b006f1e72ff65233793c7064576b51855d6a8ab1f7d889e7837c9c22d4f5d SHA512 2987aa097f89b1287d126e44297b19e405e198bb8ede2e321e6452c60678ebf4cf0be5f059b9565f4584bad09801effabe64d01ab90f132f27b206174827b14b

diff --git a/media-fonts/unifont/unifont-11.0.02.ebuild b/media-fonts/unifont/unifont-13.0.01.ebuild
similarity index 60%
rename from media-fonts/unifont/unifont-11.0.02.ebuild
rename to media-fonts/unifont/unifont-13.0.01.ebuild
index 11e1e3db69d..ff270fcb7c1 100644
--- a/media-fonts/unifont/unifont-11.0.02.ebuild
+++ b/media-fonts/unifont/unifont-13.0.01.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit font toolchain-funcs xdg-utils
+inherit font toolchain-funcs
 
 DESCRIPTION="GNU Unifont - a Pan-Unicode X11 bitmap iso10646 font"
 HOMEPAGE="http://unifoundry.com/"
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="fontforge utils"
 
-DEPEND="
+BDEPEND="
 	fontforge? (
 		app-text/bdf2psf
 		dev-lang/perl
@@ -34,32 +34,27 @@ PATCHES=(
 	"${FILESDIR}"/11.0.02-make.patch
 )
 
-src_prepare() {
-	sed -i -e 's/install -s/install/' src/Makefile || die
-	default
-}
-
 src_compile() {
+	buildargs=(
+		BUILDFONT=$(usex fontforge 1 '')
+		CC="$(tc-getCC)"
+		CFLAGS="${CFLAGS}"
+		INSTALL="${INSTALL-install}"
+	)
 	if use fontforge || use utils; then
-		tc-export CC
-		xdg_environment_reset
-		makeargs=(
-			CFLAGS="${CFLAGS}"
-			BUILDFONT=$(usex fontforge 1 '')
-		)
-		emake  "${makeargs[@]}"
+		emake "${buildargs[@]}"
 	fi
 }
 
 src_install() {
-	makeargs+=(
-		DESTDIR="${ED%/}"
-		PCFDEST="${ED%/}${FONTDIR}"
-		TTFDEST="${ED%/}${FONTDIR}"
-		USRDIR=usr
+	local installargs=(
+		COMPRESS=0
+		DESTDIR="${ED}"
+		PCFDEST="${ED}${FONTDIR}"
+		TTFDEST="${ED}${FONTDIR}"
 	)
-	use utils || makeargs+=( -C font )
-	emake "${makeargs[@]}" COMPRESS=0 install
+	use utils || installargs+=( -C font )
+	emake "${buildargs[@]}" "${installargs[@]}" install
 	font_xfont_config
 	font_fontconfig
 }