diff options
| author |   Donnie Berkholz <dberkholz@gentoo.org> | 2006-10-30 06:13:48 +0000 |
|---|---|---|
| committer | Donnie Berkholz <dberkholz@gentoo.org> | 2006-10-30 06:13:48 +0000 |
| commit | 27f31fcb217d45dd179367f4034f2bf152eb3e0a (patch) | |
| tree | f36ee14ba3f15a2a8e69b9b90d5bfae944df6456 /eclass | |
| parent | Start using font.eclass: Replace create_font_cache() code with a call to font... (diff) | |
| download | gentoo-2-27f31fcb217d45dd179367f4034f2bf152eb3e0a.tar.gz gentoo-2-27f31fcb217d45dd179367f4034f2bf152eb3e0a.tar.bz2 gentoo-2-27f31fcb217d45dd179367f4034f2bf152eb3e0a.zip | |
Simplify fonts.scale and fonts.dir generation a bit -- stop using ttmkfdir, always use mkfontscale. Also, run from the build system since they are in DEPEND and not RDEPEND.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/font.eclass | 2 | ||||
| -rw-r--r-- | eclass/x-modular.eclass | 34 |
2 files changed, 6 insertions, 30 deletions
diff --git a/eclass/font.eclass b/eclass/font.eclass index 2570d0a49431..00d82ec940a2 100644 --- a/eclass/font.eclass +++ b/eclass/font.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/font.eclass,v 1.20 2006/10/30 05:56:11 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/font.eclass,v 1.21 2006/10/30 06:13:48 dberkholz Exp $ # Author: foser <foser@gentoo.org> diff --git a/eclass/x-modular.eclass b/eclass/x-modular.eclass index 1cc3575ba26e..b5de1f2682e7 100644 --- a/eclass/x-modular.eclass +++ b/eclass/x-modular.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.78 2006/10/30 05:57:41 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.79 2006/10/30 06:13:48 dberkholz Exp $ # # Author: Donnie Berkholz <spyderous@gentoo.org> # @@ -469,34 +469,11 @@ create_fonts_scale() { # Only generate .scale files if truetype, opentype or type1 # fonts are present ... - # First truetype (ttf,ttc) - # NOTE: ttmkfdir does NOT work on type1 fonts (#53753) - # Also, there is no way to regenerate Speedo/CID fonts.scale + # NOTE: There is no way to regenerate Speedo/CID fonts.scale # <spyderous@gentoo.org> 2 August 2004 if [[ "${x/encodings}" = "${x}" ]] \ - && [[ -n "$(find ${x} -iname '*.tt[cf]' -print)" ]]; then - if [[ -x ${ROOT}/usr/bin/ttmkfdir ]]; then - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ - ${ROOT}/usr/bin/ttmkfdir -x 2 \ - -e ${ROOT}/usr/share/fonts/encodings/encodings.dir \ - -o ${x}/fonts.scale -d ${x} - # ttmkfdir fails on some stuff, so try mkfontscale if it does - local ttmkfdir_return=$? - else - # We didn't use ttmkfdir at all - local ttmkfdir_return=2 - fi - if [[ ${ttmkfdir_return} -ne 0 ]]; then - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ - ${ROOT}/usr/bin/mkfontscale \ - -a /usr/share/fonts/encodings/encodings.dir \ - -- ${x} - fi - # Next type1 and opentype (pfa,pfb,otf,otc) - elif [[ "${x/encodings}" = "${x}" ]] \ - && [[ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]]; then - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ - ${ROOT}/usr/bin/mkfontscale \ + && [[ -n "$(find ${x} -iname '*.[pot][ft][abcf]' -print)" ]]; then + mkfontscale \ -a ${ROOT}/usr/share/fonts/encodings/encodings.dir \ -- ${x} fi @@ -512,8 +489,7 @@ create_fonts_dir() { [[ "$(ls ${x}/)" = "fonts.cache-1" ]] && continue if [[ "${x/encodings}" = "${x}" ]]; then - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ - ${ROOT}/usr/bin/mkfontdir \ + mkfontdir \ -e ${ROOT}/usr/share/fonts/encodings \ -e ${ROOT}/usr/share/fonts/encodings/large \ -- ${x} |