[patch] x-modular.eclass.diff

x-modular.eclass.diff (text/plain), 1.34 KB, created by Ryan Hill (RETIRED) on 2009-08-18 06:28:17 UTC

Index: x-modular.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v
retrieving revision 1.110
diff -u -r1.110 x-modular.eclass
--- x-modular.eclass	24 Jul 2009 13:32:44 -0000	1.110
+++ x-modular.eclass	18 Aug 2009 06:27:01 -0000
@@ -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: