[gentoo-commits] gentoo-x86 commit in eclass: x-modular.eclass

[Ryan Hill (dirtyepic)]

dirtyepic    09/08/22 20:12:43

  Modified:             x-modular.eclass
  Log:
  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.

Revision  Changes    Path
1.111                eclass/x-modular.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.111&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.111&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.110&r2=1.111

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- x-modular.eclass	24 Jul 2009 13:32:44 -0000	1.110
+++ x-modular.eclass	22 Aug 2009 20:12:42 -0000	1.111
@@ -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 @@
 	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 @@
 
 	create_fonts_scale
 	create_fonts_dir
-	fix_font_permissions
 	create_font_cache
 }
 
@@ -654,19 +655,6 @@
 	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: