fonts are no longer part of the compile

3 files changed, 114 insertions, 126 deletions

diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest
index bb49bd41daa4..fa971c3c6d8f 100644
--- a/x11-base/xfree/Manifest
+++ b/x11-base/xfree/Manifest
@@ -1,14 +1,14 @@
 MD5 f11ed1feb06c079f6d570a0ca23d647c xfree-4.1.0-r6.ebuild 2963
 MD5 b9f3b9360be464ae961a20335800828c xfree-4.3.0-r2.ebuild 30491
 MD5 bd9ddb285a3d2f153656f2639025a9e0 xfree-4.2.1-r2.ebuild 24195
-MD5 5c0741bac4327609b1f5bfeb1fee89d5 xfree-4.3.0-r3.ebuild 30489
+MD5 76c8bd69f110ab46a8efcc39eeec8733 xfree-4.3.0-r3.ebuild 30341
 MD5 bb0c74eff729638ea6f682023cdfbe9e ChangeLog 29102
 MD5 c702fab31b9adac56477a9a5c16911c4 xfree-4.2.0-r12.ebuild 10302
 MD5 ab68703ef80727e333fd52ed5806df2d files/digest-xfree-4.1.0-r6 240
 MD5 10e681917f61e8ed068030a373694906 files/xfree-4.2.x-home_end-keys.patch 666
 MD5 e7a9b48bfe345c76aa9a5bf5b3149ea4 files/digest-xfree-4.2.1-r2 10826
 MD5 dc40fb2bff2045ab21d28c0c675debe8 files/digest-xfree-4.3.0-r2 1924
-MD5 9a3f00171022215da8534b9b79b9e88b files/digest-xfree-4.3.0-r3 1047
+MD5 62db163135bd8bd4bcaed7b8b88ce11b files/digest-xfree-4.3.0-r3 716
 MD5 21d5f7a63f9dbf1948cc7df8b2bf67fc files/digest-xfree-4.2.0-r12 576
 MD5 6c0fe2e04a359ddc367dbd0dd00c61a1 files/xfree-4.2.x.-bison.fixes.patch 2854
 MD5 a9371704cf72bcb8d1aa713ca4b27546 files/XFree86-4.2.1-Xft11-Imakefile.patch 341
diff --git a/x11-base/xfree/files/digest-xfree-4.3.0-r3 b/x11-base/xfree/files/digest-xfree-4.3.0-r3
index 5fe6d607e24c..74fc6ecd6f74 100644
--- a/x11-base/xfree/files/digest-xfree-4.3.0-r3
+++ b/x11-base/xfree/files/digest-xfree-4.3.0-r3
@@ -1,16 +1,11 @@
 MD5 4f241a4f867363f40efa2b00dca292af X430src-1.tgz 10993622
 MD5 844c2ee908d21dbf8911fd13115bf8b4 X430src-2.tgz 7962239
 MD5 b82a0443e1b7bf860e4343e6b6766cb6 X430src-3.tgz 12366363
-MD5 567903747018f2534965ab6cb3976b38 X430src-4.tgz 12906091
-MD5 8e8280ab7f65b6ac133c4e27082a8268 XFree86-4.3.0-patches-2.0.0.tar.bz2 420389
+MD5 163d9864e1353a4a9f992cb3843c240f X430src-6.tgz 8074919
+MD5 e002e70f24098ca4f62fabd1c2809ed1 X430src-7.tgz 9317241
+MD5 422d25619affcdfb29e817805c46bca4 XFree86-4.3.0-patches-1.1.3.tar.bz2 428355
 MD5 e0c52f0e726e20db445e9708665a26d4 xfree86-dri-resume-v8.patch 15333
 MD5 222bffcae6c2be37ec5cd993037f4f45 xf86Wacom.c.gz 26156
 MD5 537bb3e2da7642bd979ebc1cafa8dce7 savage-1.1.27t.zip 76974
-MD5 3001d660c8d43a6da0c53737d969424d sis_drv_src_060403-1.tar.gz 378880
-MD5 3d4ee581df78c9dacc6e97aa07a1af72 gemini-koi8-u.tar.bz2 439173
-MD5 4d7d5fdc4ed56c144ef998302581478c eurofonts-X11.tar.bz2 8811
-MD5 cfdef5d00cd4a7937ff4bc136dab1932 xfsft-encodings.tar.bz2 11811
-MD5 794107aa54dda238ab1ab4776b36274d XFree86-compose.dir.bz2 1883
-MD5 aafd74e26c541382bb382ff338f81f87 XFree86-en_US.UTF-8.old.bz2 7068
-MD5 2e2263bb4adaee6f959fbb6c8df5336a XFree86-locale.alias.bz2 3592
-MD5 d4402be729da91e849aa5b9f506bda06 XFree86-locale.dir.bz2 2094
+MD5 e3848a87ea835bd80ed91f674e24fb02 sis_drv_src_180403-1.tar.gz 378880
+MD5 3585b8924a92d3dab36db8912d2a0581 gentoo-cursors-tad-0.2.tar.bz2 1203605
diff --git a/x11-base/xfree/xfree-4.3.0-r3.ebuild b/x11-base/xfree/xfree-4.3.0-r3.ebuild
index b6c437391941..a7596082ccb2 100644
--- a/x11-base/xfree/xfree-4.3.0-r3.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r3.ebuild,v 1.2 2003/05/24 04:58:53 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r3.ebuild,v 1.3 2003/05/28 10:18:17 seemant Exp $
 
 # Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
 # that only we only strip stuff that are safe to strip ...
@@ -68,27 +68,12 @@ X_DRIVERS="http://people.mandrakesoft.com/~flepied/projects/wacom/xf86Wacom.c.gz
 # Latest SIS drivers:  http://www.winischhofer.net/
 # Glide headers for compiling the tdfx modules
 
-# For the MS Core fonts ..
-MS_COREFONTS="./andale32.exe ./arial32.exe
-	./arialb32.exe ./comic32.exe
-	./courie32.exe ./georgi32.exe
-	./impact32.exe ./times32.exe
-	./trebuc32.exe ./verdan32.exe
-	./webdin32.exe"
-#	./IELPKTH.CAB"
-# Need windows license to use this one
-MS_FONT_URLS="${MS_COREFONTS//\.\//mirror://sourceforge/corefonts/}"
-
 SRC_URI="${SRC_PATH0}/X${MY_SV}src-1.tgz
 	${SRC_PATH0}/X${MY_SV}src-2.tgz
 	${SRC_PATH0}/X${MY_SV}src-3.tgz
-	${SRC_PATH0}/X${MY_SV}src-4.tgz
-	${SRC_PATH0}/X${MY_SV}src-5.tgz
 	${SRC_PATH1}/X${MY_SV}src-1.tgz
 	${SRC_PATH1}/X${MY_SV}src-2.tgz
 	${SRC_PATH1}/X${MY_SV}src-3.tgz
-	${SRC_PATH1}/X${MY_SV}src-4.tgz
-	${SRC_PATH1}/X${MY_SV}src-5.tgz
 	doc? ( ${SRC_PATH0}/X${MY_SV}src-6.tgz
 		${SRC_PATH0}/X${MY_SV}src-7.tgz
 		${SRC_PATH1}/X${MY_SV}src-6.tgz
@@ -97,18 +82,17 @@ SRC_URI="${SRC_PATH0}/X${MY_SV}src-1.tgz
 SRC_URI="${SRC_URI}
 	${X_PATCHES}
 	${X_DRIVERS}
-	nls? ( mirror://gentoo/gemini-koi8-u.tar.bz2 )
-	mirror://gentoo/eurofonts-X11.tar.bz2
-	mirror://gentoo/xfsft-encodings.tar.bz2
-	mirror://gentoo/XFree86-compose.dir.bz2
-	mirror://gentoo/XFree86-en_US.UTF-8.old.bz2
-	mirror://gentoo/XFree86-locale.alias.bz2
-	mirror://gentoo/XFree86-locale.dir.bz2
-	mirror://gentoo/gentoo-cursors-tad-${XCUR_VER}.tar.bz2
-	truetype? ( ${MS_FONT_URLS} )"
-
-LICENSE="X11 MSttfEULA"
+	mirror://gentoo/gentoo-cursors-tad-${XCUR_VER}.tar.bz2"
+#	nls? ( mirror://gentoo/gemini-koi8-u.tar.bz2 )
+#	mirror://gentoo/eurofonts-X11.tar.bz2
+#	mirror://gentoo/xfsft-encodings.tar.bz2
+#	mirror://gentoo/XFree86-compose.dir.bz2
+#	mirror://gentoo/XFree86-en_US.UTF-8.old.bz2
+#	mirror://gentoo/XFree86-locale.alias.bz2
+#	mirror://gentoo/XFree86-locale.dir.bz2"
+
 SLOT="0"
+LICENSE="X11"
 KEYWORDS="x86 ppc sparc ~alpha ~mips ~hppa arm"
 
 DEPEND=">=sys-apps/baselayout-1.8.3
@@ -142,28 +126,25 @@ PROVIDE="virtual/x11
 inherit eutils flag-o-matic gcc
 
 src_unpack() {
-
+	ebegin "unpacking shit"
 	# Unpack source and patches
-	unpack X${MY_SV}src-{1,2,3,4,5}.tgz
-	if [ -n "`use doc`" ]
-	then
-		unpack X${MY_SV}src-{6,7}.tgz
-	fi
+	unpack X${MY_SV}src-{1,2,3}.tgz
 	unpack XFree86-${PV}-patches-${PATCH_VER}.tar.bz2
 
 	# Unpack TaD's gentoo cursors
 	unpack gentoo-cursors-tad-${XCUR_VER}.tar.bz2
+	eend 0
 
 	# Unpack extra fonts stuff from Mandrake
-	if [ -n "`use nls`" ]
-	then
-		unpack gemini-koi8-u.tar.bz2
-	fi
-	unpack eurofonts-X11.tar.bz2
-	unpack xfsft-encodings.tar.bz2
+#	if [ -n "`use nls`" ]
+#	then
+#		unpack gemini-koi8-u.tar.bz2
+#	fi
+#	unpack eurofonts-X11.tar.bz2
+#	unpack xfsft-encodings.tar.bz2
 	
 	# Remove bum encoding
-	rm -f ${WORKDIR}/usr/X11R6/lib/X11/fonts/encodings/urdunaqsh-0.enc
+#	rm -f ${WORKDIR}/usr/X11R6/lib/X11/fonts/encodings/urdunaqsh-0.enc
 	
 	# Update the Savage Driver
 	# savage driver 1.1.27t is a .zip and contains a savage directory
@@ -212,7 +193,9 @@ src_unpack() {
 	else
 		rm -f ${WORKDIR}/patch/076*
 	fi
-
+	
+	rm ${WORKDIR}/patch/063*
+	rm ${WORKDIR}/patch/107*
 	# Various Patches from all over
 	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/patch/
 	
@@ -236,21 +219,27 @@ src_unpack() {
 		eend 0
 	fi
 	
+	# Customise font directory to /usr/share/fonts
+	ebegin "Changing Font directory to /usr/share/fonts"
+	sed -i "s:#define FontDir.*:#define FontDir /usr/share/fonts:" \
+		${S}/config/cf/X11.tmpl
+	eend 0
+
 	# Unpack the MS fonts
-	if [ -n "`use truetype`" ]
-	then
-		einfo "Unpacking MS Core Fonts..."
-		mkdir -p ${WORKDIR}/truetype; cd ${WORKDIR}/truetype
-		for x in ${MS_COREFONTS}
-		do
-			if [ -f ${DISTDIR}/${x} ]
-			then
-				einfo "  ${x/\.\/}..."
-				cabextract --lowercase ${DISTDIR}/${x} > /dev/null || die
-			fi
-		done
-		ebegin "Done unpacking Core Fonts"; eend 0
-	fi
+#	if [ -n "`use truetype`" ]
+#	then
+#		einfo "Unpacking MS Core Fonts..."
+#		mkdir -p ${WORKDIR}/truetype; cd ${WORKDIR}/truetype
+#		for x in ${MS_COREFONTS}
+#		do
+#			if [ -f ${DISTDIR}/${x} ]
+#			then
+#				einfo "  ${x/\.\/}..."
+#				cabextract --lowercase ${DISTDIR}/${x} > /dev/null || die
+#			fi
+#		done
+#		ebegin "Done unpacking Core Fonts"; eend 0
+#	fi
 	
 	ebegin "Setting up config/cf/host.def"
 	cd ${S}; cp ${FILESDIR}/${PV}/site.def config/cf/host.def || die
@@ -292,7 +281,7 @@ src_unpack() {
 		echo "#define XFree86Devel	YES" >> config/cf/host.def
 		echo "#define DoLoadableServer	NO" >>config/cf/host.def
 	else
-		echo "#define ExtraXInputDrivers acecad" >> config/cf/host.def
+	#	echo "#define ExtraXInputDrivers acecad" >> config/cf/host.def
 		# use less ram .. got this from Spider's makeedit.eclass :)
 		echo "#define GccWarningOptions -Wno-return-type -w" \
 			>> config/cf/host.def
@@ -386,22 +375,26 @@ src_unpack() {
 	fi
 
 	# Native Language Support Fonts
-	if [ -z "`use nls`" ]
-	then
-		echo "#define BuildCyrillicFonts NO" >> config/cf/host.def
-		echo "#define BuildArabicFonts NO" >> config/cf/host.def
-		echo "#define BuildGreekFonts NO" >> config/cf/host.def
-		echo "#define BuildHebrewFonts NO" >> config/cf/host.def
-		echo "#define BuildThaiFonts NO" >> config/cf/host.def
+#	if [ -z "`use nls`" ]
+#	then
+#		echo "#define BuildCyrillicFonts NO" >> config/cf/host.def
+#		echo "#define BuildArabicFonts NO" >> config/cf/host.def
+#		echo "#define BuildGreekFonts NO" >> config/cf/host.def
+#		echo "#define BuildHebrewFonts NO" >> config/cf/host.def
+#		echo "#define BuildThaiFonts NO" >> config/cf/host.def
+#
+#		if [ -z "`use cjk`" ]
+#		then
+#			echo "#define BuildCIDFonts NO" >> config/cf/host.def
+#			echo "#define BuildJapaneseFonts NO" >> config/cf/host.def
+#			echo "#define BuildKoreanFonts NO" >> config/cf/host.def
+#			echo "#define BuildChineseFonts NO" >> config/cf/host.def
+#		fi
+#	fi
 
-		if [ -z "`use cjk`" ]
-		then
-			echo "#define BuildCIDFonts NO" >> config/cf/host.def
-			echo "#define BuildJapaneseFonts NO" >> config/cf/host.def
-			echo "#define BuildKoreanFonts NO" >> config/cf/host.def
-			echo "#define BuildChineseFonts NO" >> config/cf/host.def
-		fi
-	fi
+	echo "#define BuildFonts NO" >> config/cf/host.def
+	echo "#define DefaultFontPath /usr/share/fonts" >> config/cf/host.def
+	echo "#define FontDir /usr/share/fonts" >> config/cf/host.def
 
 #	# Build with the binary MatroxHAL driver
 #	echo "#define HaveMatroxHal YES" >> config/cf/host.def
@@ -418,11 +411,11 @@ src_unpack() {
 	# End the host.def definitions here
 	eend 0
 
-	cd ${S}
-	bzcat ${DISTDIR}/XFree86-compose.dir.bz2 > nls/compose.dir
-	bzcat ${DISTDIR}/XFree86-locale.alias.bz2 > nls/locale.alias
-	bzcat ${DISTDIR}/XFree86-locale.dir.bz2 > nls/locale.dir
-	bzcat ${DISTDIR}/XFree86-en_US.UTF-8.old.bz2 > nls/Compose/en_US.UTF-8
+#	cd ${S}
+#	bzcat ${DISTDIR}/XFree86-compose.dir.bz2 > nls/compose.dir
+#	bzcat ${DISTDIR}/XFree86-locale.alias.bz2 > nls/locale.alias
+#	bzcat ${DISTDIR}/XFree86-locale.dir.bz2 > nls/locale.dir
+#	bzcat ${DISTDIR}/XFree86-en_US.UTF-8.old.bz2 > nls/Compose/en_US.UTF-8
 	
 	if use doc
 	then
@@ -550,21 +543,21 @@ src_install() {
 	newins ${S}/programs/Xserver/hw/xfree86/XF86Config XF86Config.example
 	
 	# Install MS fonts.
-	if [ -n "`use truetype`" ]
-	then
-		ebegin "Installing MS Core Fonts"
-		dodir /usr/X11R6/lib/X11/fonts/truetype
-		cp -af ${WORKDIR}/truetype/*.ttf ${D}/usr/X11R6/lib/X11/fonts/truetype
-		eend 0
-	fi
+#	if [ -n "`use truetype`" ]
+#	then
+#		ebegin "Installing MS Core Fonts"
+#		dodir /usr/X11R6/lib/X11/fonts/truetype
+#		cp -af ${WORKDIR}/truetype/*.ttf ${D}/usr/X11R6/lib/X11/fonts/truetype
+#		eend 0
+#	fi
 
 	# EURO support
-	ebegin "Euro Support..."
-	${D}/usr/X11R6/bin/bdftopcf -t ${WORKDIR}/Xlat9-8x14.bdf | \
-		gzip -9 > ${D}/usr/X11R6/lib/X11/fonts/misc/Xlat9-8x14-lat9.pcf.gz
-	${D}/usr/X11R6/bin/bdftopcf -t ${WORKDIR}/Xlat9-9x16.bdf | \
-		gzip -9 > ${D}/usr/X11R6/lib/X11/fonts/misc/Xlat9-9x16-lat9.pcf.gz
-	eend 0
+#	ebegin "Euro Support..."
+#	${D}/usr/X11R6/bin/bdftopcf -t ${WORKDIR}/Xlat9-8x14.bdf | \
+#		gzip -9 > ${D}/usr/X11R6/lib/X11/fonts/misc/Xlat9-8x14-lat9.pcf.gz
+#	${D}/usr/X11R6/bin/bdftopcf -t ${WORKDIR}/Xlat9-9x16.bdf | \
+#		gzip -9 > ${D}/usr/X11R6/lib/X11/fonts/misc/Xlat9-9x16-lat9.pcf.gz
+#	eend 0
 
 	# Standard symlinks
 	dodir /usr/{bin,include,lib}
@@ -640,26 +633,26 @@ src_install() {
 
 	# Yet more Mandrake
 	ebegin "Encoding files for xfsft font server..."
-	dodir /usr/X11R6/lib/X11/fonts/encodings
-	cp -a ${WORKDIR}/usr/X11R6/lib/X11/fonts/encodings/* \
-		${D}/usr/X11R6/lib/X11/fonts/encodings
+	dodir /usr/share/fonts/encodings
+	cp -a ${WORKDIR}/usr/share/fonts/encodings/* \
+		${D}/usr/share/fonts/encodings
 	
-	for x in ${D}/usr/X11R6/lib/X11/fonts/encodings/{.,large}/*.enc
+	for x in ${D}/usr/share/fonts/encodings/{.,large}/*.enc
 	do
 		[ -f "${x}" ] && gzip -9 -f ${x}
 	done
 	eend 0
 
-	if [ -n "`use nls`" ]
-	then
-		ebegin "gemini-koi8 fonts..."
-		cd ${WORKDIR}/ukr
-		gunzip *.Z
-		gzip -9 *.pcf
-		cd ${S}
-		cp -a ${WORKDIR}/ukr ${D}/usr/X11R6/lib/X11/fonts
-		eend 0
-	fi
+#	if [ -n "`use nls`" ]
+#	then
+#		ebegin "gemini-koi8 fonts..."
+#		cd ${WORKDIR}/ukr
+#		gunzip *.Z
+#		gzip -9 *.pcf
+#		cd ${S}
+#		cp -a ${WORKDIR}/ukr ${D}/usr/X11R6/lib/X11/fonts
+#		eend 0
+#	fi
 	
 	exeinto /etc/X11
 	# new session management script
@@ -817,9 +810,9 @@ pkg_preinst() {
 
 	# clean out old fonts.* and encodings.dir files, as we
 	# will regenerate them
-	find ${ROOT}/usr/X11R6/lib/X11/fonts/ -type f -name 'fonts.*' \
+	find ${ROOT}/usr/share/fonts/ -type f -name 'fonts.*' \
 		-exec rm -f {} \;
-	find ${ROOT}/usr/X11R6/lib/X11/fonts/ -type f -name 'encodings.dir' \
+	find ${ROOT}/usr/share/fonts/ -type f -name 'encodings.dir' \
 		-exec rm -f {} \;
 
 	# make sure we do not have any stale files lying round
@@ -891,15 +884,15 @@ pkg_postinst() {
 		# Create the encodings.dir in /usr/X11R6/lib/X11/fonts/encodings
 		LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/lib" \
 		${ROOT}/usr/X11R6/bin/mkfontdir -n \
-			-e ${ROOT}/usr/X11R6/lib/X11/fonts/encodings \
-			-e ${ROOT}/usr/X11R6/lib/X11/fonts/encodings/large \
-			-- ${ROOT}/usr/X11R6/lib/X11/fonts/encodings
+			-e ${ROOT}/usr/share/fonts/encodings \
+			-e ${ROOT}/usr/share/fonts/encodings/large \
+			-- ${ROOT}/usr/share/fonts/encodings
 		eend 0
 
 		if [ -x ${ROOT}/usr/X11R6/bin/ttmkfdir ]
 		then
 			ebegin "Creating fonts.scale files..."
-			for x in $(find ${ROOT}/usr/X11R6/lib/X11/fonts/* -type d -maxdepth 1)
+			for x in $(find ${ROOT}/usr/share/fonts/* -type d -maxdepth 1)
 			do
 				[ -z "$(ls ${x}/)" ] && continue
 				[ "$(ls ${x}/)" = "fonts.cache-1" ] && continue
@@ -918,7 +911,7 @@ pkg_postinst() {
 		fi
 			
 		ebegin "Generating fonts.dir files..."
-		for x in $(find ${ROOT}/usr/X11R6/lib/X11/fonts/* -type d -maxdepth 1)
+		for x in $(find ${ROOT}/usr/share/fonts/* -type d -maxdepth 1)
 		do
 			[ -z "$(ls ${x}/)" ] && continue
 			[ "$(ls ${x}/)" = "fonts.cache-1" ] && continue
@@ -927,15 +920,15 @@ pkg_postinst() {
 			then
 				LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/lib" \
 				${ROOT}/usr/X11R6/bin/mkfontdir \
-					-e ${ROOT}/usr/X11R6/lib/X11/fonts/encodings \
-					-e ${ROOT}/usr/X11R6/lib/X11/fonts/encodings/large \
+					-e ${ROOT}/usr/share/fonts/encodings \
+					-e ${ROOT}/usr/share/fonts/encodings/large \
 					-- ${x}
 			fi
 		done
 		eend 0
 
 		ebegin "Generating Xft Cache..."
-		for x in $(find ${ROOT}/usr/X11R6/lib/X11/fonts/* -type d -maxdepth 1)
+		for x in $(find ${ROOT}/usr/share/fonts/* -type d -maxdepth 1)
 		do
 			[ -z "$(ls ${x}/)" ] && continue
 			[ "$(ls ${x}/)" = "fonts.cache-1" ] && continue
@@ -952,7 +945,7 @@ pkg_postinst() {
 		eend 0
 		
 		ebegin "Fixing permissions..."
-		find ${ROOT}/usr/X11R6/lib/X11/fonts/ -type f -name 'font.*' \
+		find ${ROOT}/usr/share/fonts/ -type f -name 'font.*' \
 			-exec chmod 0644 {} \;
 		eend 0