| 1 |
commit: 84d7291509d0a6fbbbfb355af2b87a8e66aad048 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Mar 29 02:10:17 2020 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Mar 29 02:11:26 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84d72915 |
| 7 |
|
| 8 |
media-fonts/unifont: bump to 13.0.01 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.92_p3, Repoman-2.3.20_p118 |
| 11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 12 |
|
| 13 |
media-fonts/unifont/Manifest | 2 +- |
| 14 |
...ifont-11.0.02.ebuild => unifont-13.0.01.ebuild} | 39 ++++++++++------------ |
| 15 |
2 files changed, 18 insertions(+), 23 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-fonts/unifont/Manifest b/media-fonts/unifont/Manifest |
| 18 |
index a418d652f56..d587e3534eb 100644 |
| 19 |
--- a/media-fonts/unifont/Manifest |
| 20 |
+++ b/media-fonts/unifont/Manifest |
| 21 |
@@ -1,2 +1,2 @@ |
| 22 |
DIST unifont-10.0.06.tar.gz 15651257 BLAKE2B e146ffe9ab591e5d90d399d37e068f0c3002a67699698b3f6b22a14ca91fe0415a507d855b56caae4e50183d97978667edca2fa2095209abbc7d02a4f17c20b8 SHA512 36f1eed24b37aad2f2ef100c8d2be01363a5438e76771e9ae82fa61ce58a4dd51566063b8e7b1265696cfe2335f1017842fecac2a5a801913f82ac9bf24caa54 |
| 23 |
-DIST unifont-11.0.02.tar.gz 15874967 BLAKE2B ee3c887ae441e70a95aad9a8f11d955ef848a5d4921d9c4c340d2f91a4c795503f2ef514bae93899591978afb797bee9d03bc222801f7d2daed199fb6045769b SHA512 d0dc8ce079feb282f53c444df5819751a7c97788feed480dc5c5b8a239c8cc13ef258876ffe2830994e404c0a6f524481a405b273c7341703ceef5854c12a68d |
| 24 |
+DIST unifont-13.0.01.tar.gz 21053298 BLAKE2B 981d3d79015df9fa401823034de532840652127bc881d13244243dc0fbaabc14212b006f1e72ff65233793c7064576b51855d6a8ab1f7d889e7837c9c22d4f5d SHA512 2987aa097f89b1287d126e44297b19e405e198bb8ede2e321e6452c60678ebf4cf0be5f059b9565f4584bad09801effabe64d01ab90f132f27b206174827b14b |
| 25 |
|
| 26 |
diff --git a/media-fonts/unifont/unifont-11.0.02.ebuild b/media-fonts/unifont/unifont-13.0.01.ebuild |
| 27 |
similarity index 60% |
| 28 |
rename from media-fonts/unifont/unifont-11.0.02.ebuild |
| 29 |
rename to media-fonts/unifont/unifont-13.0.01.ebuild |
| 30 |
index 11e1e3db69d..ff270fcb7c1 100644 |
| 31 |
--- a/media-fonts/unifont/unifont-11.0.02.ebuild |
| 32 |
+++ b/media-fonts/unifont/unifont-13.0.01.ebuild |
| 33 |
@@ -1,9 +1,9 @@ |
| 34 |
# Copyright 1999-2020 Gentoo Authors |
| 35 |
# Distributed under the terms of the GNU General Public License v2 |
| 36 |
|
| 37 |
-EAPI=6 |
| 38 |
+EAPI=7 |
| 39 |
|
| 40 |
-inherit font toolchain-funcs xdg-utils |
| 41 |
+inherit font toolchain-funcs |
| 42 |
|
| 43 |
DESCRIPTION="GNU Unifont - a Pan-Unicode X11 bitmap iso10646 font" |
| 44 |
HOMEPAGE="http://unifoundry.com/" |
| 45 |
@@ -14,7 +14,7 @@ SLOT="0" |
| 46 |
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" |
| 47 |
IUSE="fontforge utils" |
| 48 |
|
| 49 |
-DEPEND=" |
| 50 |
+BDEPEND=" |
| 51 |
fontforge? ( |
| 52 |
app-text/bdf2psf |
| 53 |
dev-lang/perl |
| 54 |
@@ -34,32 +34,27 @@ PATCHES=( |
| 55 |
"${FILESDIR}"/11.0.02-make.patch |
| 56 |
) |
| 57 |
|
| 58 |
-src_prepare() { |
| 59 |
- sed -i -e 's/install -s/install/' src/Makefile || die |
| 60 |
- default |
| 61 |
-} |
| 62 |
- |
| 63 |
src_compile() { |
| 64 |
+ buildargs=( |
| 65 |
+ BUILDFONT=$(usex fontforge 1 '') |
| 66 |
+ CC="$(tc-getCC)" |
| 67 |
+ CFLAGS="${CFLAGS}" |
| 68 |
+ INSTALL="${INSTALL-install}" |
| 69 |
+ ) |
| 70 |
if use fontforge || use utils; then |
| 71 |
- tc-export CC |
| 72 |
- xdg_environment_reset |
| 73 |
- makeargs=( |
| 74 |
- CFLAGS="${CFLAGS}" |
| 75 |
- BUILDFONT=$(usex fontforge 1 '') |
| 76 |
- ) |
| 77 |
- emake "${makeargs[@]}" |
| 78 |
+ emake "${buildargs[@]}" |
| 79 |
fi |
| 80 |
} |
| 81 |
|
| 82 |
src_install() { |
| 83 |
- makeargs+=( |
| 84 |
- DESTDIR="${ED%/}" |
| 85 |
- PCFDEST="${ED%/}${FONTDIR}" |
| 86 |
- TTFDEST="${ED%/}${FONTDIR}" |
| 87 |
- USRDIR=usr |
| 88 |
+ local installargs=( |
| 89 |
+ COMPRESS=0 |
| 90 |
+ DESTDIR="${ED}" |
| 91 |
+ PCFDEST="${ED}${FONTDIR}" |
| 92 |
+ TTFDEST="${ED}${FONTDIR}" |
| 93 |
) |
| 94 |
- use utils || makeargs+=( -C font ) |
| 95 |
- emake "${makeargs[@]}" COMPRESS=0 install |
| 96 |
+ use utils || installargs+=( -C font ) |
| 97 |
+ emake "${buildargs[@]}" "${installargs[@]}" install |
| 98 |
font_xfont_config |
| 99 |
font_fontconfig |
| 100 |
} |
Archives