Initial commit.

4 files changed, 1125 insertions, 2 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 2f8e73c30e11..4dd61a3074e9 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xfree
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.168 2003/08/11 21:53:41 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.169 2003/08/13 20:09:50 spyderous Exp $
+
+*xfree-4.3.99.10 (13 Aug 2003)
+
+  13 Aug 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.99.10.ebuild:
+  Initial commit.
 
   11 Aug 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild:
   Updated synaptics and sis drivers, made patch 0251 also apply to hppa as patch
diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest
index 27de8ecc3009..2786d53df2e0 100644
--- a/x11-base/xfree/Manifest
+++ b/x11-base/xfree/Manifest
@@ -1,4 +1,4 @@
-MD5 fb98d614a0ab7ce70fa2deeeb90ab21c ChangeLog 38327
+MD5 915e39522bfb97cb550f340b33e510a9 ChangeLog 38457
 MD5 e6ee387a2de6b2fea8e5a3573c48b667 metadata.xml 228
 MD5 f11ed1feb06c079f6d570a0ca23d647c xfree-4.1.0-r6.ebuild 2963
 MD5 c702fab31b9adac56477a9a5c16911c4 xfree-4.2.0-r12.ebuild 10302
@@ -8,6 +8,7 @@ MD5 66296954503547211cc3f26f2ececf5f xfree-4.3.0-r2.ebuild 31357
 MD5 11b69d45016ec00af571b7ca63b1e42f xfree-4.3.0-r3.ebuild 33634
 MD5 def56c51cb1af0c18123da88760adfe2 xfree-4.3.99.8.ebuild 31875
 MD5 30ab90872cc1960dcb87dfe3a37bb704 xfree-4.3.99.9.ebuild 31586
+MD5 24cdcd01eb1136c73d605f2353336983 xfree-4.3.99.10.ebuild 31058
 MD5 a9371704cf72bcb8d1aa713ca4b27546 files/XFree86-4.2.1-Xft11-Imakefile.patch 341
 MD5 bc3aad4b056a41f47d427c036edcef9f files/XFree86-4.2.1-Xft11-hack.patch 1163
 MD5 ab68703ef80727e333fd52ed5806df2d files/digest-xfree-4.1.0-r6 240
@@ -20,6 +21,7 @@ MD5 1c7cafb1b2985413aefab2e4104ef564 files/digest-xfree-4.3.99.8 475
 MD5 10e681917f61e8ed068030a373694906 files/xfree-4.2.x-home_end-keys.patch 666
 MD5 6c0fe2e04a359ddc367dbd0dd00c61a1 files/xfree-4.2.x.-bison.fixes.patch 2854
 MD5 9f7043b0fff9699184d56a3bb32cf18b files/digest-xfree-4.3.99.9 558
+MD5 b54e3468ffe57d029e79273008937c0e files/digest-xfree-4.3.99.10 1630
 MD5 027d2f93b478a1c419b8aee64ab2914b files/4.1.0-r6/XftConfig 2002
 MD5 0e3eb0ef30faacadc0372721d57c51f3 files/4.1.0-r6/10xfree 113
 MD5 e110b49a8eef223cbdb65b1ff0ac27c8 files/4.1.0-r6/Xsession 986
diff --git a/x11-base/xfree/files/digest-xfree-4.3.99.10 b/x11-base/xfree/files/digest-xfree-4.3.99.10
new file mode 100644
index 000000000000..a2400d77e7a8
--- /dev/null
+++ b/x11-base/xfree/files/digest-xfree-4.3.99.10
@@ -0,0 +1,25 @@
+MD5 d840a796e38d9a5fd30bdcd9a4c1383d XFree86-4.3.99.10.tar.bz2 41919780
+MD5 4d7d5fdc4ed56c144ef998302581478c eurofonts-X11.tar.bz2 8811
+MD5 cfdef5d00cd4a7937ff4bc136dab1932 xfsft-encodings.tar.bz2 11811
+MD5 d0fab996daf97adf095e2dad0bd9012e gentoo-cursors-tad-0.3.1.tar.bz2 1196991
+MD5 977f998187b7c0f3cb10192085f4ea76 XFree86-synaptics-fixup-0.11.3.diff 263
+MD5 7ce1e73495a9b4414a9771274138704e XFree86-synaptics-update-0.11.3p11.diff 97485
+MD5 cbdc2fdd7d2ed0832795e86a8b9ee19a andale32.exe 198384
+MD5 9637df0e91703179f0723ec095a36cb5 arial32.exe 554208
+MD5 c9089ae0c3b3d0d8c4b0a95979bb9ff0 arialb32.exe 168176
+MD5 2b30de40bb5e803a0452c7715fc835d1 comic32.exe 246008
+MD5 4e412c772294403ab62fb2d247d85c60 courie32.exe 646368
+MD5 4d90016026e2da447593b41a8d8fa8bd georgi32.exe 392440
+MD5 7907c7dd6684e9bade91cff82683d9d7 impact32.exe 173288
+MD5 ed39c8ef91b9fb80f76f702568291bd5 times32.exe 661728
+MD5 0d7ea16cac6261f8513a061fbfcdb2b5 trebuc32.exe 357200
+MD5 12d2a75f8156e10607be1eaa8e8ef120 verdan32.exe 351992
+MD5 230a1d13a365b22815f502eb24d9149b webdin32.exe 185072
+MD5 3d4ee581df78c9dacc6e97aa07a1af72 gemini-koi8-u.tar.bz2 439173
+MD5 a3d78acc5b0762a7853e3be51250f2bb XFree86-4.3.99.10-files-0.3.tar.bz2 10777
+MD5 222bffcae6c2be37ec5cd993037f4f45 xf86Wacom.c.gz 26156
+MD5 537bb3e2da7642bd979ebc1cafa8dce7 savage-1.1.27t.zip 76974
+MD5 f196aaf1542000e2d7caac5d03b88661 sis_drv_src_100803-1.tar.gz 419840
+MD5 a5a77a87fac3a7e02270a9514207bb5d XFree86-4.3.0-drivers-via-0.1.tar.bz2 79965
+MD5 e170657ec4c11fe5be21f3668c236aec synaptics-0.11.3.tar.gz 41989
+MD5 ce53c0a9e0b20803b9728e2b662165a8 XFree86-4.3.99.10-patches-0.5.tar.bz2 1415
diff --git a/x11-base/xfree/xfree-4.3.99.10.ebuild b/x11-base/xfree/xfree-4.3.99.10.ebuild
new file mode 100644
index 000000000000..81e4b22e99bb
--- /dev/null
+++ b/x11-base/xfree/xfree-4.3.99.10.ebuild
@@ -0,0 +1,1091 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+# 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 ...
+RESTRICT="nostrip"
+
+IUSE="3dfx sse mmx 3dnow xml2 truetype nls cjk doc ipv6 debug static"
+
+filter-flags "-funroll-loops"
+
+ALLOWED_FLAGS="-fstack-protector -march -mcpu -O -O2 -O3 -pipe"
+
+# Recently there has been a lot of stability problem in Gentoo-land.  Many
+# things can be the cause to this, but I believe that it is due to gcc3
+# still having issues with optimizations, or with it not filtering bad
+# combinations (protecting the user maybe from themselves) yet.
+#
+# This can clearly be seen in large builds like glibc, where too aggressive
+# CFLAGS cause the tests to fail miserbly.
+#
+# Quote from Nick Jones <carpaski@gentoo.org>, who in my opinion
+# knows what he is talking about:
+#
+#   People really shouldn't force code-specific options on... It's a
+#   bad idea. The -march options aren't just to look pretty. They enable
+#   options that are sensible (and include sse,mmx,3dnow when apropriate).
+#
+# The next command strips CFLAGS and CXXFLAGS from nearly all flags.  If
+# you do not like it, comment it, but do not bugreport if you run into
+# problems.
+#
+# <azarah@gentoo.org> (13 Oct 2002)
+strip-flags
+
+# Needed by kdebase on hppa
+[ "${ARCH}" = "hppa" ] && append-flags -fPI
+
+# Are we using a snapshot ?
+USE_SNAPSHOT="no"
+
+FILES_VER="0.3"
+PATCH_VER="0.5"
+FT2_VER="2.1.4"
+XCUR_VER="0.3.1"
+SISDRV_VER="100803-1"
+SAVDRV_VER="1.1.27t"
+MGADRV_VER="1_3_0beta"
+SYNDRV_VER="0.11.3"
+SYNUPDATE_VER="p11"
+VIADRV_VER="0.1"
+
+BASE_PV="${PV}"
+MY_SV="XFree86-${BASE_PV}"
+
+S="${WORKDIR}/xc"
+FILES_DIR="${WORKDIR}/files"
+PATCH_DIR="${WORKDIR}/patch"
+SYNDIR="${WORKDIR}/synaptics"
+
+SRC_PATH0="ftp://ftp.xfree86.org/pub/XFree86/develsnaps"
+
+HOMEPAGE="http://www.xfree.org"
+
+# Misc patches we may need to fetch ..
+X_PATCHES="mirror://gentoo/XFree86-${PV}-patches-${PATCH_VER}.tar.bz2"
+
+X_DRIVERS="http://people.mandrakesoft.com/~flepied/projects/wacom/xf86Wacom.c.gz
+	http://www.probo.com/timr/savage-${SAVDRV_VER}.zip
+	http://www.winischhofer.net/sis/sis_drv_src_${SISDRV_VER}.tar.gz
+	mirror://gentoo/XFree86-4.3.0-drivers-via-${VIADRV_VER}.tar.bz2
+	http://tuxmobil.org/software/synaptics/synaptics-${SYNDRV_VER}.tar.gz"
+# Updated Wacom driver:  http://people.mandrakesoft.com/~flepied/projects/wacom/
+# Latest Savaga drivers:  http://www.probo.com/timr/savage40.html
+# Latest SIS drivers:  http://www.winischhofer.net/
+
+# 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/}"
+
+GENTOO_FILES="mirror://gentoo/XFree86-${PV}-files-${FILES_VER}.tar.bz2"
+
+SRC_URI="${SRC_PATH0}/${MY_SV}.tar.bz2
+	mirror://gentoo/eurofonts-X11.tar.bz2
+	mirror://gentoo/xfsft-encodings.tar.bz2
+	mirror://gentoo/gentoo-cursors-tad-${XCUR_VER}.tar.bz2
+	mirror://gentoo/XFree86-synaptics-fixup-${SYNDRV_VER}.diff
+	mirror://gentoo/XFree86-synaptics-update-${SYNDRV_VER}${SYNUPDATE_VER}.diff
+	truetype? ( ${MS_FONT_URLS} )
+	nls? ( mirror://gentoo/gemini-koi8-u.tar.bz2 )
+	${GENTOO_FILES}
+	${X_DRIVERS}
+	${X_PATCHES}"
+
+LICENSE="X11 MSttfEULA"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
+
+DEPEND=">=sys-apps/baselayout-1.8.3
+	>=sys-libs/ncurses-5.1
+	>=sys-libs/zlib-1.1.3-r2
+	>=sys-devel/flex-2.5.4a-r5
+	>=dev-libs/expat-1.95.3
+	>=media-libs/freetype-${FT2_VER}
+	>=media-libs/fontconfig-2.1-r1
+	>=x11-base/opengl-update-1.4
+	>=x11-misc/ttmkfdir-3.0.4
+	>=sys-apps/sed-4
+	dev-lang/perl
+	media-libs/libpng
+	app-arch/unzip
+	pam? ( >=sys-libs/pam-0.75 )
+	truetype? ( app-arch/cabextract )
+	!x11-libs/xft"
+#RDEPEND="$DEPEND"
+# unzip - needed for savage driver (version 1.1.27t)
+# x11-libs/xft -- blocked because of interference with xfree's
+
+PDEPEND="3dfx? ( >=media-libs/glide-v3-3.10 )"
+
+PROVIDE="virtual/x11
+	virtual/opengl
+	virtual/glu
+	virtual/xft"
+
+#inherit needs to happen *after* DEPEND has been defined to have "newdepend"
+#do the right thing. Otherwise RDEPEND doesn't get set properly.
+inherit eutils flag-o-matic gcc
+
+
+
+DESCRIPTION="Xfree86: famous and free X server"
+
+src_unpack() {
+
+	# Unpack source and patches
+	unpack ${MY_SV}.tar.bz2
+	unpack XFree86-${PV}-files-${FILES_VER}.tar.bz2
+	unpack XFree86-${PV}-patches-${PATCH_VER}.tar.bz2
+
+	# Unpack TaD's gentoo cursors
+	unpack gentoo-cursors-tad-${XCUR_VER}.tar.bz2
+
+	# Unpack extra fonts stuff from Mandrake
+	if 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
+
+	# Update the Savage Driver
+	# savage driver 1.1.27t is a .zip and contains a savage directory
+	# (that's why we have to be in drivers, not in savage subdir).
+	# Could be USE flag based
+
+	ebegin "Updating Savage driver"
+	cd ${S}/programs/Xserver/hw/xfree86/drivers
+	unpack savage-${SAVDRV_VER}.zip
+	ln -s ${S}/programs/Xserver/hw/xfree86/vbe/vbe.h \
+		${S}/programs/Xserver/hw/xfree86/drivers/savage
+	cd ${S}
+	eend 0
+
+	ebegin "Updating SiS driver"
+	cd ${S}/programs/Xserver/hw/xfree86/drivers/sis
+	unpack sis_drv_src_${SISDRV_VER}.tar.gz
+	ln -s ${S}/programs/Xserver/hw/xfree86/vbe/vbe.h \
+		${S}/programs/Xserver/hw/xfree86/drivers/sis
+	cd ${S}
+	eend 0
+
+	ebegin "Adding VIA driver"
+	cd ${WORKDIR}
+	unpack XFree86-4.3.0-drivers-via-${VIADRV_VER}.tar.bz2
+	cd ${S}
+	eend 0
+
+	ebegin "Adding Synaptics touchpad driver"
+	cd ${WORKDIR}
+	unpack synaptics-${SYNDRV_VER}.tar.gz
+	cd ${S}
+	eend 0
+
+	if use debug
+	then
+		mv -f ${PATCH_DIR}/5901* ${PATCH_DIR}/excluded
+	fi
+
+        # Bulk patching - based on patch name
+        # Will create excluded stuff once it's needed
+        EPATCH_SUFFIX="patch" epatch ${PATCH_DIR}
+
+        unset EPATCH_EXCLUDE
+
+	# Set up Synaptics Makefile
+	cd ${WORKDIR}
+	epatch ${DISTDIR}/XFree86-synaptics-update-${SYNDRV_VER}${SYNUPDATE_VER}.diff
+	cd ${SYNDIR}
+	epatch ${DISTDIR}/XFree86-synaptics-fixup-${SYNDRV_VER}.diff
+
+	# Update Wacom Driver, hopefully resolving bug #1632
+	# The kernel driver should prob also be updated, this can be
+	# found at:
+	#
+	#  http://people.mandrakesoft.com/~flepied/projects/wacom/
+	#
+	if [ "`uname -r | cut -d. -f1,2`" != "2.2" ]
+	then
+		ebegin "Updating Wacom USB Driver"
+		gzip -dc ${DISTDIR}/xf86Wacom.c.gz > \
+			${S}/programs/Xserver/hw/xfree86/input/wacom/xf86Wacom.c || die
+		eend 0
+	fi
+
+	# Unpack the MS fonts
+	if 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 ${FILES_DIR}/site.def config/cf/host.def || die
+	echo "#define XVendorString \"Gentoo Linux (XFree86 ${PV}, revision ${PR})\"" \
+		>> config/cf/host.def
+
+	# Xwrapper has been removed so we now need to use the set uid server
+	# again, this mustve happened somewhere after 4.3.0 in the development.
+	echo "#define InstallXserverSetUID YES" >> config/cf/host.def
+	echo "#define BuildServersOnly NO" >> config/cf/host.def
+
+	# Bug #12775 .. fails with -Os.
+	replace-flags "-Os" "-O2"
+
+	if [ "`gcc-version`" != "2.95" ]
+	then
+		# Should fix bug #4189.  gcc 3.x have problems with -march=pentium4
+		# and -march=athlon-tbird
+
+		if [ "`gcc-version`" != "3.3" ]
+		then
+			replace-flags "-march=pentium4" "-march=pentium3"
+			replace-flags "-march=athlon-tbird" "-march=athlon"
+		fi
+
+		# Without this, modules breaks with gcc3
+		if [ "`gcc-version`" = "3.1" ]
+		then
+			append-flags "-fno-merge-constants"
+			append-flags "-fno-merge-constants"
+		fi
+	fi
+
+	if [ "`uname -r | cut -d. -f1,2`" != "2.2" ]
+	then
+		echo "#define HasLinuxInput YES" >> config/cf/host.def
+	fi
+
+	echo "#define CcCmd ${CC}" >> config/cf/host.def
+	echo "#define OptimizedCDebugFlags ${CFLAGS}" >> config/cf/host.def
+	echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS}" >> config/cf/host.def
+
+	if [ -n "`use debug`" -o -n "`use static`" ]
+	then
+		echo "#define DoLoadableServer	NO" >>config/cf/host.def
+	fi
+
+	if has_version ">=sys-devel/hardened-gcc-1.2"; then
+		einfo "setting DoLoadableServer to NO for PaX"
+		sleep 10s
+		echo "#define DoLoadableServer  NO" >>config/cf/host.def
+	fi
+
+	if use debug
+	then
+		echo "#define XFree86Devel	YES" >> config/cf/host.def
+	else
+		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
+	fi
+
+	if use pam
+	then
+		# If you want to have optional pam support, do it properly ...
+		echo "#define HasPam YES" >> config/cf/host.def
+		echo "#define HasPamMisc YES" >> config/cf/host.def
+	else
+		echo "#define HasPam NO" >> config/cf/host.def
+		echo "#define HasPamMisc NO" >> config/cf/host.def
+	fi
+
+	if use nls
+	then
+		echo "#define XtermWithI18N YES" >> config/cf/host.def
+	fi
+
+	if [ "${ARCH}" = "x86" ]
+	then
+		# optimize Mesa for architecture
+		if use mmx
+		then
+			echo "#define HasMMXSupport	YES" >> config/cf/host.def
+			echo "#define MesaUseMMX YES" >> config/cf/host.def
+		else
+			echo "#define HasMMXSupport	NO" >> config/cf/host.def
+			echo "#define MesaUseMMX NO" >> config/cf/host.def
+		fi
+		if use 3dnow
+		then
+			echo "#define Has3DNowSupport YES" >> config/cf/host.def
+			echo "#define MesaUse3DNow YES" >> config/cf/host.def
+		else
+			echo "#define Has3DNowSupport NO" >> config/cf/host.def
+			echo "#define MesaUse3DNow NO" >> config/cf/host.def
+		fi
+		if use sse
+		then
+			echo "#define HasKatmaiSupport YES" >> config/cf/host.def
+			echo "#define MesaUseKatmai YES" >> config/cf/host.def
+		else
+			echo "#define HasKatmaiSupport NO" >> config/cf/host.def
+			echo "#define MesaUseKatmai NO" >> config/cf/host.def
+		fi
+
+		# build with glide3 support? (build the tdfx_dri.o module)
+		if use 3dfx
+		then
+			echo "#define HasGlide3 YES" >> config/cf/host.def
+		fi
+
+		# Compile the VIA driver
+		echo "#define XF86ExtraCardDrivers via" >> config/cf/host.def
+	fi
+
+	if [ "${ARCH}" = "hppa" ]
+	then
+		echo "#define DoLoadableServer NO" >> config/cf/host.def
+	fi
+
+	if [ "${ARCH}" = "alpha" ]
+	then
+		echo "#define XF86CardDrivers mga nv tga s3virge sis rendition \
+			i740 tdfx cirrus tseng fbdev \
+			ati vga v4l glint" >> config/cf/host.def
+	fi
+
+	if [ "${ARCH}" = "ppc" ]
+	then
+		echo "#define XF86CardDrivers mga glint s3virge sis savage trident \
+			chips tdfx fbdev ati DevelDrivers vga nv imstt \
+			XF86OSCardDrivers XF86ExtraCardDrivers" >> config/cf/host.def
+	fi
+
+	if [ "${ARCH}" = "sparc" ]
+	then
+		echo "#define XF86CardDrivers sunffb sunleo suncg6 suncg3 suncg14 \
+		suntcx sunbw2 glint mga tdfx ati savage vesa vga fbdev \
+		XF86OSCardDrivers XF86ExtraCardDrivers \
+		DevelDrivers" >> config/cf/host.def
+	fi
+
+	if use xml2
+	then
+		echo "#define HasLibxml2 YES" >> config/cf/host.def
+	fi
+
+	# The definitions for fontconfig
+	echo "#define UseFontconfig YES" >> config/cf/host.def
+	echo "#define HasFontconfig YES" >> config/cf/host.def
+
+	# Use the xfree Xft2 lib
+	echo "#define SharedLibXft YES" >> config/cf/host.def
+	
+	# disable docs if doc not in USE
+	if [ -z "`use doc`" ]
+	then
+		echo "#define BuildLinuxDocText NO" >> config/cf/host.def
+		echo "#define BuildLinuxDocHtml NO" >> config/cf/host.def
+		echo "#define BuildLinuxDocPS NO" >> config/cf/host.def
+		echo "#define BuildSpecsDocs NO" >> config/cf/host.def
+	fi
+
+	# enable Japanese docs, optionally
+	if use cjk && use doc
+	then
+		echo "#define InstallJapaneseDocs YES" >> config/cf/host.def
+	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 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 use ipv6
+	then
+		echo "#define HasIPv6 YES" >> config/cf/host.def
+	fi
+
+# Will uncomment this after kde, qt, and *box ebuilds are alterered to use
+# it
+#	if use xinerama
+#	then
+#		echo "#define BuildXinerama YES" >> config/cf/host.def
+#		echo "#define BuildXineramaLibrary YES" >> config/cf/host.def
+#	fi
+
+	# End the host.def definitions here
+	eend 0
+
+	cd ${S}
+	if use doc
+	then
+		# These are not included anymore as they are obsolete
+		rm -rf ${S}/doc/hardcopy/{XIE,PEX5}
+		for x in ${S}/programs/Xserver/hw/xfree86/{XF98Conf.cpp,XF98Config}
+		do
+			if [ -f ${x} ]
+			then
+				cp ${x} ${x}.orig
+				grep -iv 'Load[[:space:]]*"\(pex5\|xie\)"' ${x}.orig > ${x}
+				rm -f ${x}.orig
+			fi
+		done
+	fi
+
+}
+
+src_compile() {
+
+	# Set MAKEOPTS to have proper -j? option ..
+	get_number_of_jobs
+
+	# If a user defines the MAKE_OPTS variable in /etc/make.conf instead of
+	# MAKEOPTS, they'll redefine an internal XFree86 Makefile variable and the
+	# xfree build will silently die. This is tricky to track down, so I'm
+	# adding a preemptive fix for this issue by making sure that MAKE_OPTS is
+	# unset. (drobbins, 08 Mar 2003)
+	unset MAKE_OPTS
+
+	einfo "Building XFree86..."
+	FAST=1 emake World || die
+
+	if use nls
+	then
+		cd ${S}/nls
+		make || die
+		cd ${S}
+	fi
+
+	ebegin "Building Synaptics driver..."
+	cd ${SYNDIR}
+	make
+	eend 0
+
+}
+
+src_install() {
+
+	unset MAKE_OPTS
+
+	einfo "Installing XFree86..."
+	# gcc3 related fix.  Do this during install, so that our
+	# whole build will not be compiled without mmx instructions.
+	if [ "`gcc-version`" != "2.95" ] && [ "${ARCH}" = "x86" ]
+	then
+		make install DESTDIR=${D} || \
+		make CDEBUGFLAGS="${CDEBUGFLAGS} -mno-mmx" \
+			CXXDEBUGFLAGS="${CXXDEBUGFLAGS} -mno-mmx" \
+			install DESTDIR=${D} || die
+	else
+		make install DESTDIR=${D} || die
+	fi
+
+	# We do not want these, so remove them ...
+	rm -rf ${D}/usr/X11R6/include/fontconfig
+	rm -f ${D}/usr/X11R6/lib/libfontconfig.*
+	rm -f ${D}/usr/X11R6/bin/{fontconfig-config,fc-cache,fc-list}
+	rm -f ${D}/usr/X11R6/man/man3/fontconfig.3x*
+	rm -rf ${D}/etc/fonts/
+
+	# This one needs to be in /usr/lib
+	insinto /usr/lib/pkgconfig
+	doins ${D}/usr/X11R6/lib/pkgconfig/{xcursor,xft}.pc
+	# Now remove the invalid xft.pc, and co ...
+	rm -rf ${D}/usr/X11R6/lib/pkgconfig
+
+	einfo "Installing man pages..."
+	make install.man DESTDIR=${D} || die
+	einfo "Compressing man pages..."
+	prepman /usr/X11R6
+
+	if use nls
+	then
+		cd ${S}/nls
+		make DESTDIR=${D} install || die
+	fi
+
+	# Make sure the user running xterm can only write to utmp.
+	fowners root.utmp /usr/X11R6/bin/xterm
+	fperms 2755 /usr/X11R6/bin/xterm
+
+	# Fix permissions on locale/common/*.so
+	for x in ${D}/usr/X11R6/lib/X11/locale/lib/common/*.so*
+	do
+		if [ -f ${x} ]
+		then
+			fperms 0755 `echo ${x} | sed -e "s|${D}||"`
+		fi
+	done
+
+	# Fix permissions on modules ...
+	for x in $(find ${D}/usr/X11R6/lib/modules -name '*.o') \
+	         $(find ${D}/usr/X11R6/lib/modules -name '*.so')
+	do
+		if [ -f ${x} ]
+		then
+			fperms 0755 `echo ${x} | sed -e "s|${D}||"`
+		fi
+	done
+
+	# We zap our CFLAGS in the host.def file, as hardcoded CFLAGS can
+	# mess up other things that use xmkmf
+	ebegin "Fixing lib/X11/config/host.def"
+	cp ${D}/usr/X11R6/lib/X11/config/host.def ${T}
+	awk '!/OptimizedCDebugFlags|OptimizedCplusplusDebugFlags|GccWarningOptions/ {print $0}' \
+		${T}/host.def > ${D}/usr/X11R6/lib/X11/config/host.def
+	# theoretically, /usr/X11R6/lib/X11/config is a possible candidate for
+	# config file management. If we find that people really worry about imake
+	# stuff, we may add it.  But for now, we leave the dir unprotected.
+	eend 0
+
+	insinto /etc/X11
+	# We still use freetype for now ...
+	doins ${FILES_DIR}/XftConfig
+	newins ${FILES_DIR}/XftConfig XftConfig.new
+	# This is if we are using Fontconfig only ...
+	#newins ${S}/lib/Xft1/XftConfig-OBSOLETE XftConfig
+	dosym ../../../../etc/X11/XftConfig /usr/X11R6/lib/X11/XftConfig
+
+	# Install example config file
+	newins ${S}/programs/Xserver/hw/xfree86/XF86Config XF86Config.example
+
+	# Install MS fonts.
+	if 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
+	${D}/usr/X11R6/bin/bdftopcf -t ${WORKDIR}/Xlat9-10x20.bdf | \
+		gzip -9 > ${D}/usr/X11R6/lib/X11/fonts/misc/Xlat9-10x20-lat9.pcf.gz
+	eend 0
+
+	# Standard symlinks
+	dodir /usr/{bin,include,lib}
+	dosym ../X11R6/bin /usr/bin/X11
+	dosym ../X11R6/include/X11 /usr/include/X11
+	dosym ../X11R6/include/DPS /usr/include/DPS
+	dosym ../X11R6/include/GL /usr/include/GL
+	dosym ../X11R6/lib/X11 /usr/lib/X11
+	dosym ../../usr/X11R6/lib/X11/xkb /etc/X11/xkb
+
+	# Some critical directories
+	keepdir /var/lib/xdm
+	dosym ../../../var/lib/xdm /etc/X11/xdm/authdir
+
+	# Remove invalid symlinks
+	rm -f ${D}/usr/lib/libGL.*
+	# Create required symlinks
+	dosym libGL.so.1.2 /usr/X11R6/lib/libGL.so
+	dosym libGL.so.1.2 /usr/X11R6/lib/libGL.so.1
+	dosym libGL.so.1.2 /usr/X11R6/lib/libMesaGL.so
+	# We move libGLU to /usr/lib now
+	dosym libGLU.so.1.3 /usr/lib/libMesaGLU.so
+
+	# .la files for libtool support
+	insinto /usr/X11R6/lib
+	doins ${FILES_DIR}/lib/*.la
+
+	# Remove libz.a, as it causes problems (bug #4777)
+	rm -f ${D}/usr/X11R6/lib/libz.a
+	# And do not forget the includes (bug #9470)
+	rm -f ${D}/usr/X11R6/include/{zconf.h,zlib.h}
+
+	# Use the server as the X binary now as the wrapper is gone.
+	dosym ../../usr/X11R6/bin/XFree86 /etc/X11/X
+
+	# Fix perms
+	fperms 755 /usr/X11R6/lib/X11/xkb/geometry/sgi
+	fperms 755 /usr/X11R6/bin/dga
+
+	# Hack from Mandrake (update ours that just created Compose files for
+	# all locales)
+	for x in $(find ${D}/usr/X11R6/lib/X11/locale/ -mindepth 1 -type d)
+	do
+		# make empty Compose files for some locales
+		# CJK must not have that file (otherwise XIM don't works some times)
+		case `basename ${x}` in
+			C|microsoft-*|iso8859-*|koi8-*)
+				if [ ! -f ${x}/Compose ]
+				then
+					touch ${x}/Compose
+				fi
+				;;
+			ja*|ko*|zh*)
+				if [ -r ${x}/Compose ]
+				then
+					rm -f ${x}/Compose
+				fi
+				;;
+		esac
+	done
+
+	# Another hack from Mandrake -- to fix dead + space for the us
+	# international keyboard
+	for i in ${D}/usr/X11R6/lib/X11/locale/*/Compose
+	do
+		sed -i \
+			-e 's/\(<dead_diaeresis> <space>\).*$/\1 : "\\"" quotedbl/' \
+			-e "s/\(<dead_acute> <space>\).*$/\1 : \"'\" apostrophe/" \
+			${i}
+	done
+
+	# 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
+
+	for x in ${D}/usr/X11R6/lib/X11/fonts/encodings/{.,large}/*.enc
+	do
+		[ -f "${x}" ] && gzip -9 -f ${x}
+	done
+	eend 0
+
+	if 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
+	doexe ${FILES_DIR}/chooser.sh
+	# new display manager script
+	doexe ${FILES_DIR}/startDM.sh
+	exeinto /etc/X11/Sessions
+	for x in ${FILES_DIR}/Sessions/*
+	do
+		[ -f ${x} ] && doexe ${x}
+	done
+	insinto /etc/env.d
+	doins ${FILES_DIR}/10xfree
+	insinto /etc/X11/xinit
+	doins ${FILES_DIR}/xinitrc
+	exeinto /etc/X11/xdm
+	doexe ${FILES_DIR}/Xsession ${FILES_DIR}/Xsetup_0
+	insinto /etc/X11/fs
+	newins ${FILES_DIR}/xfs.config config
+	if use pam
+	then
+		insinto /etc/pam.d
+		newins ${FILES_DIR}/xdm.pamd xdm
+		# Need to fix console permissions first
+		newins ${FILES_DIR}/xserver.pamd xserver
+	fi
+	exeinto /etc/init.d
+	newexe ${FILES_DIR}/xdm.start xdm
+	newexe ${FILES_DIR}/xfs.start xfs
+	insinto /etc/conf.d
+	newins ${FILES_DIR}/xfs.conf.d xfs
+
+	# we want libGLU.so* in /usr/lib
+	mv ${D}/usr/X11R6/lib/libGLU.* ${D}/usr/lib
+
+	# next section is to setup the dynamic libGL stuff
+	ebegin "Moving libGL and friends for dynamic switching"
+	dodir /usr/lib/opengl/xfree/{lib,extensions,include}
+	local x=""
+	for x in ${D}/usr/X11R6/lib/libGL.so* \
+		${D}/usr/X11R6/lib/libGL.la \
+		${D}/usr/X11R6/lib/libGL.a \
+		${D}/usr/X11R6/lib/libMesaGL.so
+	do
+		if [ -f ${x} -o -L ${x} ]
+		then
+			# libGL.a cause problems with tuxracer, etc
+			mv -f ${x} ${D}/usr/lib/opengl/xfree/lib
+		fi
+	done
+	for x in ${D}/usr/X11R6/lib/modules/extensions/libglx*
+	do
+		if [ -f ${x} -o -L ${x} ]
+		then
+			mv -f ${x} ${D}/usr/lib/opengl/xfree/extensions
+		fi
+	done
+	for x in ${D}/usr/X11R6/include/GL/{gl.h,glx.h,glxtokens.h}
+	do
+		if [ -f ${x} -o -L ${x} ]
+		then
+			mv -f ${x} ${D}/usr/lib/opengl/xfree/include
+		fi
+	done
+	eend 0
+
+	# Make the core cursor the default.  People seem not to like whiteglass
+	# for some reason.
+	dosed 's:whiteglass:core:' /usr/share/cursors/xfree/default/index.theme
+
+	einfo "Striping binaries and libraries..."
+	# This bit I got from Redhat ... strip binaries and drivers ..
+	# NOTE:  We do NOT want to strip the drivers, modules or DRI modules!
+	for x in $(find ${D}/ -type f -perm +0111 -exec file {} \; | \
+	           grep -v ' shared object,' | \
+	           sed -n -e 's/^\(.*\):[  ]*ELF.*, not stripped/\1/p')
+	do
+	if [ -f ${x} ]
+		then
+			# Dont do the modules ...
+			if [ "${x/\/usr\/X11R6\/lib\/modules}" = "${x}" ]
+			then
+				echo "`echo ${x} | sed -e "s|${D}||"`"
+				strip ${x} || :
+			fi
+		fi
+	done
+	# Now do the libraries ...
+	for x in ${D}/usr/{lib,lib/opengl/xfree/lib}/*.so.* \
+		${D}/usr/X11R6/{lib,lib/X11/locale/lib/common}/*.so.*
+	do
+		if [ -f ${x} ]
+		then
+			echo "`echo ${x} | sed -e "s|${D}||"`"
+			strip --strip-debug ${x} || :
+		fi
+	done
+
+	# Install TaD's gentoo cursors
+	insinto /usr/share/cursors/xfree/gentoo/cursors
+	doins ${WORKDIR}/cursors/gentoo/cursors/*
+	insinto /usr/share/cursors/xfree/gentoo-blue/cursors
+	doins ${WORKDIR}/cursors/gentoo-blue/cursors/*
+	insinto /usr/share/cursors/xfree/gentoo-silver/cursors
+	doins ${WORKDIR}/cursors/gentoo-silver/cursors/*
+
+	# Install Synaptics touchpad driver and docs
+	insinto /usr/X11R6/lib/modules/input
+	doins ${SYNDIR}/synaptics_drv.o
+	insinto /usr/X11R6/bin
+	doins ${SYNDIR}/synclient
+	docinto synaptics
+	dodoc ${SYNDIR}/{COMPATIBILITY,FEATURES,FILES,INSTALL,INSTALL.DE,LICENSE,NEWS,PARAMETER,TODO,VERSION}
+}
+
+pkg_preinst() {
+
+	# These changed from a directory/file to a symlink and reverse
+	if [ ! -L ${ROOT}/usr/X11R6/lib/X11/XftConfig ] && \
+	   [ -f ${ROOT}/usr/X11R6/lib/X11/XftConfig ]
+	then
+		rm -rf ${ROOT}/usr/X11R6/lib/X11/XftConfig
+	fi
+	
+	if [ -L ${ROOT}/etc/X11/app-defaults ]
+	then
+		rm -f ${ROOT}/etc/X11/app-defaults
+	fi
+	
+	if [ ! -L ${ROOT}/usr/X11R6/lib/X11/app-defaults ] && \
+	   [ -d ${ROOT}/usr/X11R6/lib/X11/app-defaults ]
+	then
+		if [ ! -d ${ROOT}/etc/X11/app-defaults ]
+		then
+			mkdir -p ${ROOT}/etc/X11/app-defaults
+		fi
+		
+		mv -f ${ROOT}/usr/X11R6/lib/X11/app-defaults ${ROOT}/etc/X11
+	fi
+	
+	if [ -L ${ROOT}/usr/X11R6/lib/X11/xkb ]
+	then
+		rm -f ${ROOT}/usr/X11R6/lib/X11/xkb
+	fi
+	
+	if [ ! -L ${ROOT}/etc/X11/xkb ] && \
+	   [ -d ${ROOT}/etc/X11/xkb ]
+	then
+		if [ ! -d ${ROOT}/usr/X11R6/lib/X11/xkb ]
+		then
+			mkdir -p ${ROOT}/usr/X11R6/lib/X11
+		fi
+		
+	    mv -f ${ROOT}/etc/X11/xkb ${ROOT}/usr/X11R6/lib/X11
+	fi
+
+	# clean the dinamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [ -d ${ROOT}/usr/lib/opengl/xfree ]
+	then
+		rm -rf ${ROOT}/usr/lib/opengl/xfree/*
+	fi
+
+	# clean out old fonts.* and encodings.dir files, as we
+	# will regenerate them
+	find ${ROOT}/usr/X11R6/lib/X11/fonts/ -type f -name 'fonts.*' \
+		-exec rm -f {} \;
+	find ${ROOT}/usr/X11R6/lib/X11/fonts/ -type f -name 'encodings.dir' \
+		-exec rm -f {} \;
+
+	# make sure we do not have any stale files lying round
+	# that could break things.
+	rm -f ${ROOT}/usr/X11R6/lib/libGL*
+}
+
+update_XftConfig() {
+
+	if [ "${ROOT}" = "/" ]
+	then
+		local CHECK1="f901d29ec6e3cbb0a5b0fd5cbdd9ff33"
+		local CHECK2="$(md5sum ${ROOT}/etc/X11/XftConfig | cut -d ' ' -f1)"
+
+		if [ "${CHECK1}" = "${CHECK2}" ]
+		then
+			echo
+			ewarn "Due to an invalid /etc/X11/XftConfig from x11-base/xfree-4.2.1,"
+			ewarn "/etc/X11/XftConfig is being updated automatically.  Your old"
+			ewarn "version of /etc/X11/XftConfig will be backed up as:"
+			ewarn
+			ewarn "  ${ROOT}etc/X11/XftConfig.bak"
+			echo
+			
+			cp -a ${ROOT}/etc/X11/XftConfig \
+				${ROOT}/etc/X11/XftConfig.bak
+			mv -f ${ROOT}/etc/X11/XftConfig.new \
+				${ROOT}/etc/X11/XftConfig
+			rm -f ${ROOT}/etc/X11/._cfg????_XftConfig
+		else
+			rm -f ${ROOT}/etc/X11/XftConfig.new
+		fi
+	fi
+}
+
+
+pkg_postinst() {
+
+	env-update
+
+	if [ "${ROOT}" = "/" ]
+	then
+		local x=""
+		
+		umask 022
+	
+		# This one cause ttmkfdir to segfault :/
+		#rm -f ${ROOT}/usr/X11R6/lib/X11/fonts/encodings/large/gbk-0.enc.gz
+
+		# ********************************************************************
+		#  A note about fonts and needed files:
+		#  
+		#  1)  Create /usr/X11R6/lib/X11/fonts/encodings/encodings.dir
+		#
+		#  2)  Create font.scale for TrueType fonts (need to do this before
+		#      we create fonts.dir files, else fonts.dir files will be
+		#      invalid for TrueType fonts...)
+		#
+		#  3)  Now Generate fonts.dir files.
+		#
+		#  CID fonts is a bit more involved, but as we do not install any,
+		#  thus I am not going to bother.
+		#
+		#  <azarah@gentoo.org> (20 Oct 2002)
+		#
+		# ********************************************************************
+
+		ebegin "Generating encodings.dir..."
+		# 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
+		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)
+			do
+				[ -z "$(ls ${x}/)" ] && continue
+				[ "$(ls ${x}/)" = "fonts.cache-1" ] && continue
+		
+				# Only generate .scale files if there are truetype
+				# fonts present ...
+				if [ "${x/encodings}" = "${x}" -a \
+				     -n "$(find ${x} -iname '*.[otps][pft][cfad]' -print)" ]
+				then
+					${ROOT}/usr/X11R6/bin/ttmkfdir -x 2 \
+						-e ${ROOT}/usr/X11R6/lib/X11/fonts/encodings/encodings.dir \
+						-o ${x}/fonts.scale -d ${x}
+				fi
+			done
+			eend 0
+		fi
+			
+		ebegin "Generating fonts.dir files..."
+		for x in $(find ${ROOT}/usr/X11R6/lib/X11/fonts/* -type d -maxdepth 1)
+		do
+			[ -z "$(ls ${x}/)" ] && continue
+			[ "$(ls ${x}/)" = "fonts.cache-1" ] && continue
+		
+			if [ "${x/encodings}" = "${x}" ]
+			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 \
+					-- ${x}
+			fi
+		done
+		eend 0
+
+		ebegin "Generating Xft Cache..."
+		for x in $(find ${ROOT}/usr/X11R6/lib/X11/fonts/* -type d -maxdepth 1)
+		do
+			[ -z "$(ls ${x}/)" ] && continue
+			[ "$(ls ${x}/)" = "fonts.cache-1" ] && continue
+
+			# Only generate XftCache files if there are truetype
+			# fonts present ...
+			if [ "${x/encodings}" = "${x}" -a \
+			     -n "$(find ${x} -iname '*.[otps][pft][cfad]' -print)" ]
+			then
+				LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/lib" \
+				${ROOT}/usr/X11R6/bin/xftcache ${x} &> /dev/null
+			fi
+		done
+		eend 0
+		
+		ebegin "Fixing permissions..."
+		find ${ROOT}/usr/X11R6/lib/X11/fonts/ -type f -name 'font.*' \
+			-exec chmod 0644 {} \;
+		eend 0
+
+		# danarmak found out that fc-cache should be run AFTER all the above
+		# stuff, as otherwise the cache is invalid, and has to be run again
+		# as root anyway
+		if [ -x ${ROOT}/usr/bin/fc-cache ]
+		then
+			ebegin "Creating FC font cache..."
+			HOME="/root" ${ROOT}/usr/bin/fc-cache -f
+			eend 0
+		fi
+
+		# Switch to the xfree implementation.
+		# Use new opengl-update that will not reset user selected
+		# OpenGL interface ...
+		echo; ${ROOT}/usr/sbin/opengl-update --use-old xfree
+	fi
+
+	for x in $(find ${ROOT}/usr/X11R6/lib/X11/locale/ -mindepth 1 -type d)
+	do
+		# Remove old compose files we might have created incorrectly
+		# CJK must not have that file (otherwise XIM don't works some times)
+		case `basename ${x}` in
+			ja*|ko*|zh*)
+				if [ -r "${x}/Compose" ]
+				then
+					rm -f ${x}/Compose
+				fi
+				;;
+		esac
+	done
+
+	# Update /etc/X11/XftConfig if its the one from Xft1.2, as its
+	# invalid for Xft1.1 ....
+	# NOTE:  This should not be needed for xfree-4.2.99 or later,
+	#        but lets not take chances with people that may downgrade
+	#        at a later stage ....
+	update_XftConfig
+
+	# These need to be owned by root and the correct permissions
+	# (bug #8281)
+	for x in ${ROOT}/tmp/.{ICE,X11}-unix
+	do
+		if [ ! -d ${x} ]
+		then
+			mkdir -p ${x}
+		fi
+		
+		chown root:root ${x}
+		chmod 1777 ${x}
+	done
+
+	if use 3dfx
+	then
+		echo
+		einfo "If using a 3DFX card, and you had \"3dfx\" in your USE flags,"
+		einfo "please merge media-libs/glide-v3 if you have not done so yet"
+		einfo "by doing:"
+		einfo
+		einfo "  # emerge media-libs/glide-v3"
+		echo
+	fi
+	echo
+	ewarn "BEWARE 1:"
+	ewarn "This version of XFree won't work with ati-drivers-2.5.1-r1"
+	ewarn "if you are using them please unmerge ati-drivers"
+	ewarn " and emerge xfree-drm"
+	echo
+	ewarn "BEWARE 2:"
+	ewarn "If you experience font corruption on OpenOffice.org or similar"
+	ewarn "glitches please remake your XF86Config"
+	echo
+
+	einfo "Please note that the xcursors are in /usr/share/cursors/xfree"
+	einfo "Any custom cursor sets should be placed in that directory"
+	einfo "This is different from the previous versions of 4.3 and"
+	einfo "the 4.2.99 series."
+	einfo
+	ewarn "New in this release: if you wish to set system-wide default"
+	ewarn "cursors, please set them in /usr/local/share/cursors/xfree"
+	ewarn "so that future emerges will not overwrite those settings"
+	echo
+	einfo "To use the Synaptics touchpad driver, check the installed"
+	einfo "documentation in /usr/share/doc/xfree, as well as"
+	einfo "http://tuxmobil.org/touchpad_driver.html and"
+	einfo "http://w1.894.telia.com/~u89404340/touchpad/."
+}
+
+pkg_postrm() {
+
+	# Fix problematic links
+	if [ -x ${ROOT}/usr/X11R6/bin/XFree86 ]
+	then
+		ln -snf ../X11R6/bin ${ROOT}/usr/bin/X11
+		ln -snf ../X11R6/include/X11 ${ROOT}/usr/include/X11
+		ln -snf ../X11R6/include/DPS ${ROOT}/usr/include/DPS
+		ln -snf ../X11R6/include/GL ${ROOT}/usr/include/GL
+		ln -snf ../X11R6/lib/X11 ${ROOT}/usr/lib/X11
+	fi
+}