diff options
author | Ryan Hill <rhill@gentoo.org> | 2009-08-22 20:12:42 +0000 |
---|---|---|
committer | Ryan Hill <rhill@gentoo.org> | 2009-08-22 20:12:42 +0000 |
commit | e44a48e67aa3034ef550552817dc1040f470fdb4 (patch) | |
tree | b4e1ebbbbaa1ff1c0960764259ecfa1b12e9f408 /eclass/x-modular.eclass | |
parent | updated rdepends for bug 231870. (diff) | |
download | historical-e44a48e67aa3034ef550552817dc1040f470fdb4.tar.gz historical-e44a48e67aa3034ef550552817dc1040f470fdb4.tar.bz2 historical-e44a48e67aa3034ef550552817dc1040f470fdb4.zip |
Allow fonts to override --with-fontdir, for fonts installing more than one typeface. Drop fix_font_permissions as it doesn't do anything and is handled by font.eclass already.
Diffstat (limited to 'eclass/x-modular.eclass')
-rw-r--r-- | eclass/x-modular.eclass | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/eclass/x-modular.eclass b/eclass/x-modular.eclass index 12b832c3ad21..d8f4302bcbb8 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.110 2009/07/24 13:32:44 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.111 2009/08/22 20:12:42 dirtyepic Exp $ # # @ECLASS: x-modular.eclass # @MAINTAINER: @@ -147,8 +147,10 @@ if [[ -n "${FONT}" ]]; then FONT_DIR=${FONT_DIR/type1/Type1} FONT_DIR=${FONT_DIR/speedo/Speedo} - # Set up configure option - FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\"" + # Set up configure options, wrapped so ebuilds can override if need be + if [[ -z ${FONT_OPTIONS} ]]; then + FONT_OPTIONS="--with-fontdir=\"/usr/share/fonts/${FONT_DIR}\"" + fi if [[ -n "${FONT}" ]]; then if [[ ${PN##*-} = misc ]] || [[ ${PN##*-} = 75dpi ]] || [[ ${PN##*-} = 100dpi ]] || [[ ${PN##*-} = cyrillic ]]; then @@ -561,7 +563,6 @@ setup_fonts() { create_fonts_scale create_fonts_dir - fix_font_permissions create_font_cache } @@ -654,19 +655,6 @@ create_fonts_dir() { eend 0 } -# @FUNCTION: fix_font_permissions -# @USAGE: -# @DESCRIPTION: -# Font files should have 644 permissions. Ensure this is the case. -fix_font_permissions() { - ebegin "Fixing permissions" - for DIR in ${FONT_DIR}; do - find "${ROOT}"/usr/share/fonts/${DIR} -type f -name 'font.*' \ - -exec chmod 0644 {} \; - done - eend 0 -} - # @FUNCTION: create_font_cache # @USAGE: # @DESCRIPTION: |