Fix font setup (#53753). Previously we trashed fonts.scale for all scalable fonts, even though we only regenerated it for TrueType fonts. ttmkfdir can't regenerate fonts.scale for Type1 or OpenType fonts, so we start using mkfontscale for that. We trashed any other fonts.scale files that happened to be around, such as Speedo/CID. We stop doing that. Also fixed the regexps in the ebuild and the xfs init script to use ttmkfdir for TrueType only and mkfontscale for Type1 and OpenType. Change INFODIR to INFOPATH also (#54275).

6 files changed, 90 insertions, 25 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 0ba43c57332c..aa7d34e59724 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-base/xfree
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.355 2004/08/02 01:27:20 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.356 2004/08/02 08:57:41 spyderous Exp $
+
+  02 Aug 2004; Donnie Berkholz <spyderous@gentoo.org>; files/4.3.0/10xfree,
+  files/4.3.0/xfs.start, xfree-4.3.0-r5.ebuild, xfree-4.3.0-r6.ebuild:
+  Fix font setup (#53753). Previously we trashed fonts.scale for all scalable
+  fonts, even though we only regenerated it for TrueType fonts. ttmkfdir can't
+  regenerate fonts.scale for Type1 or OpenType fonts, so we start using
+  mkfontscale for that. We trashed any other fonts.scale files that happened to
+  be around, such as Speedo/CID. We stop doing that. Also fixed the regexps in
+  the ebuild and the xfs init script to use ttmkfdir for TrueType only and
+  mkfontscale for Type1 and OpenType. Change INFODIR to INFOPATH also (#54275).
 
   01 Aug 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r5.ebuild,
   xfree-4.3.0-r6.ebuild:
diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest
index ffa3ca4ab916..f1e78e51f9bc 100644
--- a/x11-base/xfree/Manifest
+++ b/x11-base/xfree/Manifest
@@ -1,13 +1,13 @@
 MD5 e6ee387a2de6b2fea8e5a3573c48b667 metadata.xml 228
-MD5 79d4f8c17aac7b9a58d047ea8a864f87 ChangeLog 77162
-MD5 1af2989f104eae1b39709af8ad47c2cb xfree-4.3.0-r6.ebuild 35509
+MD5 81368f2cff4387691edcc06fd7b2c712 ChangeLog 77853
+MD5 1ca13817ed16899591f5f36bc211ee10 xfree-4.3.0-r6.ebuild 36174
 MD5 013b6e5a650c7043deb989ad55478bf1 xfree-4.3.0-r7.ebuild 39913
-MD5 68cbb27f9792d2610c5edbe3ceb913fb xfree-4.3.0-r5.ebuild 35414
+MD5 8594b553407607e3e0f11ab54b1b0e6a xfree-4.3.0-r5.ebuild 36071
 MD5 252c61d8b687ce1467ff95552c156c48 files/digest-xfree-4.3.0-r7 1528
 MD5 51e5068e138c7820ebdab5441f6482a2 files/digest-xfree-4.3.0-r6 2002
 MD5 7fd6e890f5d2a756eb18123975ad7f49 files/digest-xfree-4.3.0-r5 2002
 MD5 2d22ba49943c630e4299f439d3a0d4cc files/4.3.0/XftConfig 7750
-MD5 c343ee3f0cbca24c7210773d483cfa15 files/4.3.0/10xfree 182
+MD5 3949f8dacfbee7b89290bfbaf5c1446c files/4.3.0/10xfree 183
 MD5 c6dd3e9a9e557b9cba51ff77cb6108a4 files/4.3.0/Xsession 1521
 MD5 0e84cb8a3f7b821072b2a75482b83f97 files/4.3.0/Xsetup_0 880
 MD5 b2e6c7bec437a8c250fedccf9189f23b files/4.3.0/chooser.sh 1566
@@ -17,7 +17,7 @@ MD5 d0cb338160e3be8790524af8071cc4df files/4.3.0/xdm.pamd 380
 MD5 e84c45b905dcd89a9f1462a88d15aa12 files/4.3.0/xdm.start 2827
 MD5 1622d5777f1c7f058bd1f1b753636a18 files/4.3.0/xfs.conf.d 781
 MD5 55ed160cbb7076b1292ea8e3772a2761 files/4.3.0/xfs.config 1331
-MD5 ed0e218d82dbbb67fa4025e7b83974f1 files/4.3.0/xfs.start 6643
+MD5 02f77d9f6ed85a86f2bed64bd8d9eec4 files/4.3.0/xfs.start 7331
 MD5 4485c7fa46907db803d219218f62a5df files/4.3.0/xinitrc 918
 MD5 9cb44182ea92068b22973bcb0afda322 files/4.3.0/xserver.pamd 284
 MD5 a0ce0f1c8a5771a1194f5895211a3f66 files/4.3.0/Sessions/Xsession 2187
diff --git a/x11-base/xfree/files/4.3.0/10xfree b/x11-base/xfree/files/4.3.0/10xfree
index 4dba95e6bd68..b47eda85e4f6 100644
--- a/x11-base/xfree/files/4.3.0/10xfree
+++ b/x11-base/xfree/files/4.3.0/10xfree
@@ -2,6 +2,6 @@ PATH=/usr/X11R6/bin
 ROOTPATH=/usr/X11R6/bin
 LDPATH=/usr/X11R6/lib
 MANPATH=/usr/X11R6/man
-INFODIR=/usr/X11R6/info
+INFOPATH=/usr/X11R6/info
 XINITRC=/etc/X11/xinit/xinitrc
 CONFIG_PROTECT=/usr/X11R6/lib/X11/xkb
diff --git a/x11-base/xfree/files/4.3.0/xfs.start b/x11-base/xfree/files/4.3.0/xfs.start
index 8b20359b84c2..5ed1dd4d1336 100644
--- a/x11-base/xfree/files/4.3.0/xfs.start
+++ b/x11-base/xfree/files/4.3.0/xfs.start
@@ -1,11 +1,12 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.3.0/xfs.start,v 1.4 2004/07/15 01:03:31 agriffis Exp $
 # Author:  Martin Schlemmer <azarah@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.3.0/xfs.start,v 1.5 2004/08/02 08:57:41 spyderous Exp $
 
 #NB: Config is in /etc/conf.d/xfs
 
+
 opts="${opts} mkfontdirs"
 
 depend() {
@@ -124,6 +125,9 @@ get_fontdir_list() {
 					# Ok, we got our que, so start
 					if (DO_WRITE) {
 
+						# Strip and suffixes from the directory lists
+						sub(/\:[[:alnum:]]*/, "", xfsconf_data)
+
 						# Strip any leading spaces and tabs
 						sub(/^[[:space:]]*/, "", xfsconf_data)
 						# Strip the 'catalogue=' part
@@ -179,11 +183,18 @@ setup_font_dirs() {
 
 	umask 022
 
-	if [ ! -x /usr/X11R6/bin/mkfontdir -o ! -x /usr/X11R6/bin/ttmkfdir ]
-	then
-		ewarn "Could not find the mkfontdir or ttmkfdir binaries!"
-		return 0
-	fi
+	local NEEDED_BIN
+	local NEEDED_BINS="/usr/X11R6/bin/mkfontdir
+		/usr/X11R6/bin/mkfontscale
+		/usr/X11R6/bin/ttmkfdir"
+	for NEEDED_BIN in ${NEEDED_BINS}
+	do
+		if [ ! -x ${NEEDED_BIN} ]
+		then
+			ewarn "Could not find the `basename ${NEEDED_BIN}` binary!"
+			return 0
+		fi
+	done
 
 	if [ ! -d /usr/X11R6/lib/X11/fonts/encodings ]
 	then
@@ -220,13 +231,27 @@ setup_font_dirs() {
 		do
 			ebegin "  ${x}"
 
-			# Only generate .scale files if there are truetype fonts present ...
+			# 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
+			# <spyderous@gentoo.org> 2 August 2004
 			if [ "${x/encodings}" = "${x}" -a \
-			     -n "$(find ${x} -iname '*.[otps][pft][cfad]' -print)" ]
+			     -n "$(find ${x} -iname '*.tt[cf]' -print)" ]
 			then
 				/usr/X11R6/bin/ttmkfdir -x 2 \
 					-e /usr/X11R6/lib/X11/fonts/encodings/encodings.dir \
 					-o ${x}/fonts.scale -d ${x} > /dev/null
+
+			# Next type1 and opentype (pfa,pfb,otf,otc)
+			elif [ "${x/encodings}" = "${x}" -a \
+				-n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]
+			then
+				/usr/X11R6/bin/mkfontscale \
+					-a /usr/X11R6/lib/X11/fonts/encodings/encodings.dir \
+					-- ${x}
 			fi
           
 		  	# Now generate fonts.dir files ...
diff --git a/x11-base/xfree/xfree-4.3.0-r5.ebuild b/x11-base/xfree/xfree-4.3.0-r5.ebuild
index 6f93d1fb3fb6..1080e9e4c299 100644
--- a/x11-base/xfree/xfree-4.3.0-r5.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r5.ebuild
@@ -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/x11-base/xfree/xfree-4.3.0-r5.ebuild,v 1.20 2004/08/02 01:27:20 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r5.ebuild,v 1.21 2004/08/02 08:57:41 spyderous Exp $
 
 inherit eutils flag-o-matic gcc xfree
 
@@ -993,7 +993,8 @@ pkg_preinst() {
 	# clean out old fonts.* and encodings.dir files, as we
 	# will regenerate them
 	local G_FONTDIR
-	local G_FONTDIRS="100dpi 75dpi Speedo TTF Type1 encodings local misc util"
+	# Not Speedo or CID, as their fonts.scale files are "real"
+	local G_FONTDIRS="100dpi 75dpi TTF Type1 encodings local misc util"
 	for G_FONTDIR in ${G_FONTDIRS}
 	do
 		find ${ROOT}/usr/X11R6/lib/X11/fonts/${G_FONTDIR} -type f -name 'fonts.*' \
@@ -1084,14 +1085,28 @@ pkg_postinst() {
 				[ -z "$(ls ${x}/)" ] && continue
 				[ "$(ls ${x}/)" = "fonts.cache-1" ] && continue
 
-				# Only generate .scale files if there are truetype
-				# fonts present ...
+				# 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
+				# <spyderous@gentoo.org> 2 August 2004
 				if [ "${x/encodings}" = "${x}" -a \
-				     -n "$(find ${x} -iname '*.[otps][pft][cfad]' -print)" ]
+				     -n "$(find ${x} -iname '*.tt[cf]' -print)" ]
 				then
+					LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/lib" \
 					${ROOT}/usr/X11R6/bin/ttmkfdir -x 2 \
 						-e ${ROOT}/usr/X11R6/lib/X11/fonts/encodings/encodings.dir \
 						-o ${x}/fonts.scale -d ${x}
+				# Next type1 and opentype (pfa,pfb,otf,otc)
+				elif [ "${x/encodings}" = "${x}" -a \
+					-n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]
+				then
+					LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/lib" \
+					${ROOT}/usr/X11R6/bin/mkfontscale \
+						-a ${ROOT}/usr/share/fonts/encodings/encodings.dir \
+						-- ${x}
 				fi
 			done
 			eend 0
diff --git a/x11-base/xfree/xfree-4.3.0-r6.ebuild b/x11-base/xfree/xfree-4.3.0-r6.ebuild
index 73996c0cabbe..060c8b2ad3fa 100644
--- a/x11-base/xfree/xfree-4.3.0-r6.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r6.ebuild
@@ -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/x11-base/xfree/xfree-4.3.0-r6.ebuild,v 1.51 2004/08/02 01:27:20 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r6.ebuild,v 1.52 2004/08/02 08:57:41 spyderous Exp $
 
 inherit eutils flag-o-matic gcc xfree
 
@@ -996,7 +996,8 @@ pkg_preinst() {
 	# clean out old fonts.* and encodings.dir files, as we
 	# will regenerate them
 	local G_FONTDIR
-	local G_FONTDIRS="100dpi 75dpi Speedo TTF Type1 encodings local misc util"
+	# Not Speedo or CID, as their fonts.scale files are "real"
+	local G_FONTDIRS="100dpi 75dpi TTF Type1 encodings local misc util"
 	for G_FONTDIR in ${G_FONTDIRS}
 	do
 		find ${ROOT}/usr/X11R6/lib/X11/fonts/${G_FONTDIR} -type f -name 'fonts.*' \
@@ -1087,14 +1088,28 @@ pkg_postinst() {
 				[ -z "$(ls ${x}/)" ] && continue
 				[ "$(ls ${x}/)" = "fonts.cache-1" ] && continue
 
-				# Only generate .scale files if there are truetype
-				# fonts present ...
+				# 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
+				# <spyderous@gentoo.org> 2 August 2004
 				if [ "${x/encodings}" = "${x}" -a \
-				     -n "$(find ${x} -iname '*.[otps][pft][cfad]' -print)" ]
+				     -n "$(find ${x} -iname '*.tt[cf]' -print)" ]
 				then
+					LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/lib" \
 					${ROOT}/usr/X11R6/bin/ttmkfdir -x 2 \
 						-e ${ROOT}/usr/X11R6/lib/X11/fonts/encodings/encodings.dir \
 						-o ${x}/fonts.scale -d ${x}
+				# Next type1 and opentype (pfa,pfb,otf,otc)
+				elif [ "${x/encodings}" = "${x}" -a \
+					-n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]
+				then
+					LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/lib" \
+					${ROOT}/usr/X11R6/bin/mkfontscale \
+						-a ${ROOT}/usr/X11R6/lib/X11/fonts/encodings/encodings.dir \
+						-- ${x}
 				fi
 			done
 			eend 0