diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2006-03-21 00:31:11 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2006-03-21 00:31:11 +0000 |
| commit | 066c7f37b2934ccdc15999db6480381e31dfdfed (patch) | |
| tree | 3839737fd7d1fe76c4838f3cee6c7306d8fa983d /eclass/x-modular.eclass | |
| parent | Removed gssapi support since it's broken. Replaced xml2 useflag with xml usef... (diff) | |
| download | gentoo-2-066c7f37b2934ccdc15999db6480381e31dfdfed.tar.gz gentoo-2-066c7f37b2934ccdc15999db6480381e31dfdfed.tar.bz2 gentoo-2-066c7f37b2934ccdc15999db6480381e31dfdfed.zip | |
(#103174) Don't install fonts.* files when they're autogenerated, to avoid errors with FEATURES=collision-protect.
Diffstat (limited to 'eclass/x-modular.eclass')
| -rw-r--r-- | eclass/x-modular.eclass | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/eclass/x-modular.eclass b/eclass/x-modular.eclass index 7319ef7ce21c..fa3495f96cc7 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.47 2006/03/09 20:39:30 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.48 2006/03/21 00:31:11 spyderous Exp $ # # Author: Donnie Berkholz <spyderous@gentoo.org> # @@ -319,6 +319,12 @@ x-modular_src_install() { find ${D}/usr/lib/xorg/modules -name '*.la' \ | xargs rm -f fi + + # Don't install overlapping fonts.* files + # Generate them instead when possible + if [[ -n "${FONT}" ]]; then + remove_font_metadata + fi } x-modular_pkg_preinst() { @@ -387,6 +393,18 @@ setup_fonts() { create_font_cache } +remove_font_metadata() { + local DIR + for DIR in ${FONT_DIR}; do + if [[ "${DIR}" != "Speedo" ]] && \ + [[ "${DIR}" != "CID" ]] ; then + # Delete font metadata files + # fonts.scale, fonts.dir, fonts.cache-1 + rm -f ${D}/usr/share/fonts/${DIR}/fonts.{scale,dir,cache-1} + fi + done +} + discover_font_dirs() { pushd ${IMAGE}/usr/share/fonts FONT_DIRS="$(find . -maxdepth 1 -mindepth 1 -type d)" |