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). Also update Gentoo copyright and licensing info in files tarball to be consistent with everything else.

5 files changed, 81 insertions, 23 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 935b7d521fa5..b3fc26acee72 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.84 2004/07/28 08:50:48 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.85 2004/08/02 09:02:52 spyderous Exp $
+
+  02 Aug 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r1.ebuild, xorg-x11-6.7.0-r2.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).
+  Also update Gentoo copyright and licensing info in files tarball to be
+  consistent with everything else.
 
   28 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-x11-6.7.0-r1.ebuild, xorg-x11-6.7.0-r2.ebuild:
diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-6.7.0-r1 b/x11-base/xorg-x11/files/digest-xorg-x11-6.7.0-r1
index 59427b95da6e..768310a36ade 100644
--- a/x11-base/xorg-x11/files/digest-xorg-x11-6.7.0-r1
+++ b/x11-base/xorg-x11/files/digest-xorg-x11-6.7.0-r1
@@ -2,7 +2,7 @@ MD5 4d7d5fdc4ed56c144ef998302581478c eurofonts-X11.tar.bz2 8811
 MD5 01a21c248e5ac4ba02cbbea994fc774a xfsft-encodings-0.1.tar.bz2 11892
 MD5 d0fab996daf97adf095e2dad0bd9012e gentoo-cursors-tad-0.3.1.tar.bz2 1196991
 MD5 3d4ee581df78c9dacc6e97aa07a1af72 gemini-koi8-u.tar.bz2 439173
-MD5 2d091e7ca01bddd12a99f4d37b3b0234 xorg-x11-6.7.0-files-0.2.tar.bz2 9169
+MD5 02aadc16fe9ce67246dc5819e340ce9d xorg-x11-6.7.0-files-0.3.tar.bz2 9383
 MD5 19f3cea9c811b89d9e33da0c3e7fe3fc xorg-x11-6.7.0-patches-1.1.1.tar.bz2 68883
 MD5 22465263bae7a2e9f5ad77e172cf1ab5 X11R6.7.0-src1.tar.gz 30039655
 MD5 6ef4e8f7647a28f080c10ea1bcf01f79 X11R6.7.0-src2.tar.gz 5739983
diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-6.7.0-r2 b/x11-base/xorg-x11/files/digest-xorg-x11-6.7.0-r2
index ced18771536a..bf39b6adbf7a 100644
--- a/x11-base/xorg-x11/files/digest-xorg-x11-6.7.0-r2
+++ b/x11-base/xorg-x11/files/digest-xorg-x11-6.7.0-r2
@@ -2,7 +2,7 @@ MD5 4d7d5fdc4ed56c144ef998302581478c eurofonts-X11.tar.bz2 8811
 MD5 01a21c248e5ac4ba02cbbea994fc774a xfsft-encodings-0.1.tar.bz2 11892
 MD5 d0fab996daf97adf095e2dad0bd9012e gentoo-cursors-tad-0.3.1.tar.bz2 1196991
 MD5 3d4ee581df78c9dacc6e97aa07a1af72 gemini-koi8-u.tar.bz2 439173
-MD5 2d091e7ca01bddd12a99f4d37b3b0234 xorg-x11-6.7.0-files-0.2.tar.bz2 9169
+MD5 02aadc16fe9ce67246dc5819e340ce9d xorg-x11-6.7.0-files-0.3.tar.bz2 9383
 MD5 ef9d87f9804a05f3926aa2eadd6c9ce8 xorg-x11-6.7.0-patches-1.2.tar.bz2 85060
 MD5 22465263bae7a2e9f5ad77e172cf1ab5 X11R6.7.0-src1.tar.gz 30039655
 MD5 6ef4e8f7647a28f080c10ea1bcf01f79 X11R6.7.0-src2.tar.gz 5739983
diff --git a/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild
index a778cf4ac507..07f735795d7a 100644
--- a/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.7.0-r1.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/xorg-x11/xorg-x11-6.7.0-r1.ebuild,v 1.30 2004/07/28 08:50:48 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild,v 1.31 2004/08/02 09:02:52 spyderous Exp $
 
 # Libraries which are now supplied in shared form that were not in the past
 # include:  libFS.so, libGLw.so, libI810XvMC.so, libXRes.so, libXfontcache.so,
@@ -22,7 +22,7 @@ RESTRICT="nostrip"
 IUSE="3dfx 3dnow cjk debug dlloader doc ipv6 mmx nls pam sdk sse static"
 # IUSE_INPUT_DEVICES="synaptics wacom"
 
-FILES_VER="0.2"
+FILES_VER="0.3"
 PATCH_VER="1.1.1"
 #RENDER_VER="0.8"
 # Needed for xrender.pc in addition to external libs
@@ -711,7 +711,7 @@ pkgconfig_install() {
 
 backward_compat_setup() {
 	# Backwards compatibility for /usr/share move
-	G_FONTDIRS="100dpi 75dpi Speedo TTF Type1 encodings local misc util"
+	G_FONTDIRS="100dpi 75dpi CID Speedo TTF Type1 encodings local misc util"
 
 	dodir /usr/X11R6/lib/X11/fonts/
 	for G_FONTDIR in ${G_FONTDIRS}
@@ -1095,12 +1095,22 @@ pkg_preinst() {
 
 		# clean out old fonts.* and encodings.dir files, as we
 		# will regenerate them
-		find ${ROOT}/usr/share/fonts/${G_FONTDIR} -type f -name 'fonts.*' \
-			-exec rm -f {} \;
-		find ${ROOT}/usr/share/fonts/${G_FONTDIR} -type f -name 'encodings.dir' \
-			-exec rm -f {} \;
+		# Not Speedo or CID, as their fonts.scale files are "real"
+		if [ "${G_FONTDIR}" != "CID" -a "${G_FONTDIR}" != "Speedo" ]
+		then
+			find ${ROOT}/usr/share/fonts/${G_FONTDIR} -type f -name 'fonts.*' \
+				-exec rm -f {} \;
+			find ${ROOT}/usr/share/fonts/${G_FONTDIR} -type f -name 'encodings.dir' \
+				-exec rm -f {} \;
+		fi
 	done
 
+	# No longer used by xorg-x11
+	if [ -d ${ROOT}/usr/X11R6/lib/X11/fonts/truetype ]
+	then
+		rm -rf ${ROOT}/usr/X11R6/lib/X11/fonts/truetype
+	fi
+
 	if [ -L ${ROOT}/etc/X11/app-defaults ]
 	then
 		rm -f ${ROOT}/etc/X11/app-defaults
@@ -1186,15 +1196,28 @@ font_setup() {
 				[ -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/share/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/xorg-x11/xorg-x11-6.7.0-r2.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild
index 4ba0bf0e6cc8..51fce2112f25 100644
--- a/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.7.0-r2.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/xorg-x11/xorg-x11-6.7.0-r2.ebuild,v 1.10 2004/07/28 08:50:48 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild,v 1.11 2004/08/02 09:02:52 spyderous Exp $
 
 # Libraries which are now supplied in shared form that were not in the past
 # include:  libFS.so, libGLw.so, libI810XvMC.so, libXRes.so, libXfontcache.so,
@@ -22,7 +22,7 @@ RESTRICT="nostrip"
 IUSE="3dfx 3dnow cjk debug dlloader doc ipv6 mmx nls pam sdk sse static"
 # IUSE_INPUT_DEVICES="synaptics wacom"
 
-FILES_VER="0.2"
+FILES_VER="0.3"
 PATCH_VER="1.2"
 XCUR_VER="0.3.1"
 #MGADRV_VER="1_3_0beta"
@@ -599,7 +599,7 @@ pkgconfig_install() {
 
 backward_compat_setup() {
 	# Backwards compatibility for /usr/share move
-	G_FONTDIRS="100dpi 75dpi Speedo TTF Type1 encodings local misc util"
+	G_FONTDIRS="100dpi 75dpi CID Speedo TTF Type1 encodings local misc util"
 
 	dodir /usr/X11R6/lib/X11/fonts/
 	for G_FONTDIR in ${G_FONTDIRS}
@@ -974,12 +974,22 @@ pkg_preinst() {
 
 		# clean out old fonts.* and encodings.dir files, as we
 		# will regenerate them
-		find ${ROOT}/usr/share/fonts/${G_FONTDIR} -type f -name 'fonts.*' \
-			-exec rm -f {} \;
-		find ${ROOT}/usr/share/fonts/${G_FONTDIR} -type f -name 'encodings.dir' \
-			-exec rm -f {} \;
+		# Not Speedo or CID, as their fonts.scale files are "real"
+		if [ "${G_FONTDIR}" != "CID" -a "${G_FONTDIR}" != "Speedo" ]
+		then
+			find ${ROOT}/usr/share/fonts/${G_FONTDIR} -type f -name 'fonts.*' \
+				-exec rm -f {} \;
+			find ${ROOT}/usr/share/fonts/${G_FONTDIR} -type f -name 'encodings.dir' \
+				-exec rm -f {} \;
+		fi
 	done
 
+	# No longer used by xorg-x11
+	if [ -d ${ROOT}/usr/X11R6/lib/X11/fonts/truetype ]
+	then
+		rm -rf ${ROOT}/usr/X11R6/lib/X11/fonts/truetype
+	fi
+
 	if [ -L ${ROOT}/etc/X11/app-defaults ]
 	then
 		rm -f ${ROOT}/etc/X11/app-defaults
@@ -1065,15 +1075,28 @@ font_setup() {
 				[ -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/share/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