new version ... be afraid

32 files changed, 1463 insertions, 1 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index ab16f55851f0..29b3a8ae1ed2 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for x11-base/xfree
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.39 2002/08/25 14:38:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.40 2002/09/08 20:02:04 azarah Exp $
+
+*xfree-4.2.1 (8 Sep 2002):
+
+  8 Sep 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1.ebuild :
+
+  New version.  Lots of cleanups.  Freetype-2.1.2 added.
+  
+  Fix security issue with xterms; bug #2618 and #7630.
+
+  Fix compile issues for the tdfx driver.  This should fix bug #3735, thanks
+  to ideas from Ron Simpkin <ron@doobedoobedo.f2s.com>
+
+  Use buildin zlib to fix segfaults, thanks to Brad Laue <brad@brad-x.com>.
+  This closes bug #4777.
+
+  Integrate MS corefonts the right way (tm), thanks to great work from
+  Santiago Tabares <santi___@softhome.net>.  This should close bug #6980,
+  and maybe also bug #6968 and #5722.
+
+  Do not update the Wacom driver if kernel version 2.2 is in use.  This
+  should fix bug #4152.
+
+  Update the Savaga driver to try and fix bug #3531.
 
   25 Aug 2002; Dan Armak <danarmak@gentoo.org> files/4.2.0-r12/Xsetup_0  :
 
diff --git a/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-G450.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-G450.patch.bz2
new file mode 100644
index 000000000000..f5467c95bd0e
--- /dev/null
+++ b/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-G450.patch.bz2
diff --git a/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-ati-r128-vtswitch-fix-busmaster-enable.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-ati-r128-vtswitch-fix-busmaster-enable.patch.bz2
new file mode 100644
index 000000000000..28b2cf5fd040
--- /dev/null
+++ b/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-ati-r128-vtswitch-fix-busmaster-enable.patch.bz2
diff --git a/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-ati-radeon-mobility-FireGL-7800.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-ati-radeon-mobility-FireGL-7800.patch.bz2
new file mode 100644
index 000000000000..390bad769d6e
--- /dev/null
+++ b/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-ati-radeon-mobility-FireGL-7800.patch.bz2
diff --git a/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-ati-radeon-vtswitch-fix-busmaster-enable.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-ati-radeon-vtswitch-fix-busmaster-enable.patch.bz2
new file mode 100644
index 000000000000..68839e5af1f8
--- /dev/null
+++ b/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-ati-radeon-vtswitch-fix-busmaster-enable.patch.bz2
diff --git a/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-elf-loader-empty-symbol-table.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-elf-loader-empty-symbol-table.patch.bz2
new file mode 100644
index 000000000000..b984e316846f
--- /dev/null
+++ b/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-elf-loader-empty-symbol-table.patch.bz2
diff --git a/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-i810-vtswitch-sync-fix.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-i810-vtswitch-sync-fix.patch.bz2
new file mode 100644
index 000000000000..40c9cd81f5ab
--- /dev/null
+++ b/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-i810-vtswitch-sync-fix.patch.bz2
diff --git a/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-tdfx-fix-vtswitch-font-corruption.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-tdfx-fix-vtswitch-font-corruption.patch.bz2
new file mode 100644
index 000000000000..8a13446f22e7
--- /dev/null
+++ b/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-tdfx-fix-vtswitch-font-corruption.patch.bz2
diff --git a/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-xkb-fix-deadkey-quotedbl-us_intl.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-xkb-fix-deadkey-quotedbl-us_intl.patch.bz2
new file mode 100644
index 000000000000..bebf7b32ce37
--- /dev/null
+++ b/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.0-xkb-fix-deadkey-quotedbl-us_intl.patch.bz2
diff --git a/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.1-fix-shared-libXau-link.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.1-fix-shared-libXau-link.patch.bz2
new file mode 100644
index 000000000000..f41e83a12f22
--- /dev/null
+++ b/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.1-fix-shared-libXau-link.patch.bz2
diff --git a/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.1-freetype212.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.1-freetype212.patch.bz2
new file mode 100644
index 000000000000..8a9eb5726127
--- /dev/null
+++ b/x11-base/xfree/files/4.2.1-patches/XFree86-4.2.1-freetype212.patch.bz2
diff --git a/x11-base/xfree/files/4.2.1-patches/freetype2-enable-bytecode-interpreter.patch.bz2 b/x11-base/xfree/files/4.2.1-patches/freetype2-enable-bytecode-interpreter.patch.bz2
new file mode 100644
index 000000000000..e9932cec390b
--- /dev/null
+++ b/x11-base/xfree/files/4.2.1-patches/freetype2-enable-bytecode-interpreter.patch.bz2
diff --git a/x11-base/xfree/files/4.2.1/10xfree b/x11-base/xfree/files/4.2.1/10xfree
new file mode 100644
index 000000000000..a302f743012c
--- /dev/null
+++ b/x11-base/xfree/files/4.2.1/10xfree
@@ -0,0 +1,6 @@
+PATH=/usr/X11R6/bin
+ROOTPATH=/usr/X11R6/bin
+LDPATH=/usr/X11R6/lib
+MANPATH=/usr/X11R6/man
+INFODIR=/usr/X11R6/info
+XINITRC=/etc/X11/xinit/xinitrc
diff --git a/x11-base/xfree/files/4.2.1/Sessions/Xsession b/x11-base/xfree/files/4.2.1/Sessions/Xsession
new file mode 100644
index 000000000000..c86ccee19ff3
--- /dev/null
+++ b/x11-base/xfree/files/4.2.1/Sessions/Xsession
@@ -0,0 +1,107 @@
+#!/bin/sh
+# $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $
+
+case $# in
+1)
+	case $1 in
+	failsafe)
+		exec xterm -geometry 80x24-0-0
+		;;
+	esac
+esac
+
+# redirect errors to a file in user's home directory if we can
+for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
+do
+	if ( cp /dev/null "$errfile" 2> /dev/null )
+	then
+		chmod 600 "$errfile"
+		exec > "$errfile" 2>&1
+		break
+	fi
+done
+
+# clean up after xbanner
+if which freetemp 2> /dev/null ; then
+	freetemp
+fi
+
+startup=$HOME/.xsession
+
+userresources=$HOME/.Xresources 
+usermodmap=$HOME/.Xmodmap 
+userxkbmap=$HOME/.Xkbmap
+
+sysresources=/etc/X11/Xresources 
+sysmodmap=/etc/X11/Xmodmap 
+sysxkbmap=/etc/X11/Xkbmap
+
+rh6sysresources=/etc/X11/xinit/Xresources 
+rh6sysmodmap=/etc/X11/xinit/Xmodmap 
+
+
+# merge in defaults
+if [ -f "$rh6sysresources" ]; then
+    xrdb -merge "$rh6sysresources"
+fi
+
+if [ -f "$sysresources" ]; then
+    xrdb -merge "$sysresources"
+fi
+
+if [ -f "$userresources" ]; then
+    xrdb -merge "$userresources"
+fi
+
+# merge in keymaps
+if [ -f "$sysxkbmap" ]; then
+    setxkbmap `cat "$sysxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+if [ -f "$userxkbmap" ]; then
+    setxkbmap `cat "$userxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+#
+# Eeek, this seems like too much magic here
+#
+if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
+    if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
+       xkbsymbols=`sed -n -e 's/^[     ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config`
+       if [ -n "$xkbsymbols" ]; then
+           setxkbmap -symbols "$xkbsymbols"
+           XKB_IN_USE=yes
+       fi
+    fi
+fi
+
+# xkb and xmodmap don't play nice together
+if [ -z "$XKB_IN_USE" ]; then
+    if [ -f "$rh6sysmodmap" ]; then
+       xmodmap "$rh6sysmodmap"
+    fi
+
+    if [ -f "$sysmodmap" ]; then
+       xmodmap "$sysmodmap"
+    fi
+
+    if [ -f "$usermodmap" ]; then
+       xmodmap "$usermodmap"
+    fi
+fi
+
+unset XKB_IN_USE
+
+if [ -x "$startup" ]; then
+	exec "$startup"
+elif [ -x "$HOME/.Xclients" ]; then
+	exec "$HOME/.Xclients"
+elif [ -x /etc/X11/xinit/Xclients ]; then
+	exec /etc/X11/xinit/Xclients
+elif [ -x /etc/X11/Xclients ]; then
+	exec /etc/X11/Xclients
+else
+	exec xsm
+fi
diff --git a/x11-base/xfree/files/4.2.1/XftConfig b/x11-base/xfree/files/4.2.1/XftConfig
new file mode 100644
index 000000000000..352757a1ce64
--- /dev/null
+++ b/x11-base/xfree/files/4.2.1/XftConfig
@@ -0,0 +1,239 @@
+#
+# XftConfig
+#
+# Use with Type1 and TrueType fonts
+# 
+
+# Note that each application scans all these directories
+# during startup, so you may want to disable some to
+# get better speed.
+
+# Standard XFree86 Type 1 fonts
+dir "/usr/X11R6/lib/X11/fonts/Type1"
+# TTF fonts
+dir "/usr/X11R6/lib/X11/fonts/truetype"
+dir "/usr/X11R6/lib/X11/fonts/TrueType"
+dir "/usr/X11R6/lib/X11/fonts/TTF"
+# User installed fonts
+dir "/opt/ttfonts"
+# URW fonts
+dir "/usr/share/fonts/default/Type1"
+# Localized Truetype fonts
+dir "/usr/share/fonts/truetype"
+dir "/usr/share/fonts/ttf/western"
+dir "/usr/share/fonts/ttf/big5"
+dir "/usr/share/fonts/ttf/gb2312"
+dir "/usr/share/fonts/ttf/japanese"
+dir "/usr/share/fonts/ttf/korean"
+dir "/usr/share/fonts/ttf/armenian"
+dir "/usr/share/fonts/ttf/decoratives"
+dir "/usr/share/fonts/ttf/thai"
+# don't yet exist, but i hope to include some day a package for them (Pablo)
+dir "/usr/share/fonts/ttf/cyrillic"
+dir "/usr/share/fonts/ttf/viet"
+dir "/usr/share/fonts/ttf/ethiopic"
+dir "/usr/share/fonts/ttf/georgian"
+dir "/usr/share/fonts/ttf/arabic"
+dir "/usr/share/fonts/ttf/hebrew"
+dir "/usr/share/fonts/ttf/unicode"
+# AbiSuite comes with URW fonts as well
+dir "/usr/share/AbiSuite/fonts"
+
+#
+# alias 'fixed' for 'mono'
+#
+match any family == "fixed"		edit family =+ "mono";
+
+#
+# Check users config file
+#
+includeif	"~/.xftconfig"
+
+#
+# Substitute TrueType fonts for Type1 versions
+#
+match any family == "Times"		edit family =+ "Times New Roman";
+match any family == "Helvetica"		edit family =+ "Verdana";
+match any family == "Courier"		edit family =+ "Courier New";
+
+#
+# Use TrueType fonts for defaults
+#
+match any family == "serif" 		edit family += "Times New Roman";
+match any family == "sans" 		edit family += "Arial";
+match any family == "sans" 		edit family += "Verdana";
+
+#
+# Use monotype.com (andale) face where possible
+#
+match 
+	any family == "mono" 
+	all slant == roman 
+	all weight < bold
+edit
+	family += "monotype.com";
+#
+# otherwise, use courier
+#
+match any family == "mono"		edit family += "Courier New";
+match any family == "mono"		edit family += "Courier";
+
+#
+# Alias between XLFD families and font file family name, prefer local fonts
+#
+match any family == "Charter"		edit family += "Bitstream Charter";
+match any family == "Bitstream Charter" edit family =+ "Charter";
+
+match any family == "Lucidux Serif"	edit family += "LuciduxSerif";
+match any family == "LuciduxSerif"	edit family =+ "Lucidux Serif";
+
+match any family == "Lucidux Sans"	edit family += "LuciduxSans";
+match any family == "LuciduxSans"	edit family =+ "Lucidux Sans";
+
+match any family == "Lucidux Mono"	edit family += "LuciduxMono";
+match any family == "LuciduxMono"	edit family =+ "Lucidux Mono";
+    
+#
+# TrueType font aliases
+#
+match any family == "Comic Sans"	edit family += "Comic Sans MS";
+match any family == "Comic Sans MS"	edit family =+ "Comic Sans";
+match any family == "Trebuchet" 	edit family += "Trebuchet MS";
+match any family == "Trebuchet MS" 	edit family =+ "Trebuchet";
+match any family == "Monotype" 		edit family =+ "Monotype.com";
+match any family == "Andale Mono"	edit family += "Monotype.com";
+match any family == "Monotype.com"	edit family =+ "Andale Mono";
+
+# modifications from Laurent Culioli
+match
+        any family == "webdings"
+        edit antialias = false;
+        encoding += "glyphs-fontspecific";
+match
+        any family == "wingdings"
+        edit antialias = false;
+        encoding += "glyphs-fontspecific";
+
+# extra aliases -- pablo
+
+# a nice default for sans serif (same as used in yudit)
+match any family == "sans"  	edit family =+ "Arial";
+match any family == "sans"  	edit family =+ "MS Gothic";
+match any family == "sans"  	edit family =+ "Gulim";
+match any family == "sans"  	edit family =+ "Baekmuk unigulir";
+match any family == "sans"  	edit family =+ "Lucida Sans Unicode";
+match any family == "sans"  	edit family =+ "Tahoma";
+match any family == "sans"  	edit family =+ "BPG UTF8 M";
+match any family == "sans"  	edit family =+ "GF Zemen Unicode";
+match any family == "sans"  	edit family =+ "MS Mincho";
+match any family == "sans"  	edit family =+ "Pigiarniq";
+match any family == "sans"  	edit family =+ "Urdu Naqsh Nastalique";
+match any family == "sans"  	edit family =+ "Ballymun RO";
+# a nice monospaced one
+match any family == "mono"		edit family =+ "Lucida Console";
+# korean
+match any family == "Gulim"  	edit family =+ "Baekmuk unigulir";
+match any family == "Batang"  	edit family =+ "Ubatang";
+match any family == "sans"  	edit family =+ "Gulim";
+match any family == "serif"  	edit family =+ "Batang";
+match any family == "mono"  	edit family =+ "Gulim";
+# chinese gb2312
+match any family == "Kaiti"  	edit family =+ "AR PL KaitiM GB";
+match any family == "Sungti"  	edit family =+ "AR PL SungtiL GB";
+match any family == "sans"  	edit family =+ "Sungti";
+match any family == "serif"  	edit family =+ "Sungti";
+# chinese big5
+match any family == "Kaiti"  	edit family =+ "AR PL KaitiM Big5";
+match any family == "Mingti"  	edit family =+ "AR PL Mingti2L Big5";
+match any family == "sans"  	edit family =+ "Mingti";
+match any family == "serif"  	edit family =+ "Mingti";
+# thai
+match any family == "sans"  	edit family =+ "Norasi";
+match any family == "serif"  	edit family =+ "Norasi";
+# armenian
+match any family == "Helvetica" edit family =+ "ArmNet Helvetica";
+match any family == "sans"  	edit family =+ "ArmNet Helvetica";
+match any family == "serif"  	edit family =+ "ArmNet Helvetica";
+# indic
+match any family == "Raghindi" 	edit family =+ "Raghu";
+match any family == "sans"  	edit family =+ "Raghindi";
+match any family == "serif"  	edit family =+ "Raghindi";
+
+#
+# If the Microsoft Web Fonts are not installed, we have to find a 
+# replacement
+#
+
+# these come with Sun JDK 1.3
+match any family == "Verdana"		edit family =+ "Lucida Sans";
+match any family == "Times New Roman"	edit family =+ "Lucida Bright";
+match any family == "Courier New"	edit family =+ "Lucida Sans Typewriter";
+
+# OpenOffice 6
+match any family == "Verdana"		edit family =+ "Lucida Sans Tur";
+match any family == "Times New Roman"	edit family =+ "Lucida Bright Tur";
+match any family == "Courier New"	edit family =+ "Lucida Sans Typewriter Tur";
+
+# ttfonts from RH7
+match any family == "Verdana"		edit family =+ "Helmet";
+
+# URW fonts 
+match any family == "Verdana"		edit family =+ "Nimbus Sans L";
+match any family == "Times New Roman"	edit family =+ "Nimbus Roman No9 L";
+match any family == "Courier New"	edit family =+ "Nimbus Mono L";
+
+# western fonts
+match any family == "Verdana"		edit family =+ "Blue Highway";
+
+# XFree86 default fonts
+match any family == "Verdana"   	edit family =+ "LuciduxSans";
+match any family == "Times New Roman"  	edit family =+ "LuciduxSerif";
+
+
+# last ressort defaults
+match any family == "Courier"		edit family =+ "mono";
+
+match any family == "Helvetica"  	edit family =+ "sans";
+match any family == "Arial"  	edit family =+ "sans";
+
+match any family == "serif"  	edit family =+ "sans";
+match any family == "Times"  	edit family =+ "serif";
+
+# Aditions from Danny Tholen
+
+match
+        any family == "symbol"
+edit
+        antialias = false;
+        encoding += "glyphs-fontspecific";
+
+match
+        any family == "Standard Symbols L"
+edit
+        antialias = false;
+        encoding += "glyphs-fontspecific";
+
+match
+        any family == "dingbats"
+edit
+        antialias = false;
+        encoding += "glyphs-fontspecific";
+
+
+match
+        any family == "Cursor"
+edit
+        antialias = false;
+        encoding += "glyphs-fontspecific";
+
+match
+        any family == "StarBats"
+edit
+        antialias = false;
+        encoding += "glyphs-fontspecific";
+
+match
+        any family == "StarMath"
+edit
+        antialias = false;
+        encoding += "glyphs-fontspecific";
diff --git a/x11-base/xfree/files/4.2.1/Xsession b/x11-base/xfree/files/4.2.1/Xsession
new file mode 100644
index 000000000000..d38b573bdbe4
--- /dev/null
+++ b/x11-base/xfree/files/4.2.1/Xsession
@@ -0,0 +1,66 @@
+#!/bin/sh --login
+#
+# $Xorg: Xsession,v 1.4 2000/08/17 19:54:17 cpqbld Exp $
+#
+#
+#
+#
+# $XFree86: xc/programs/xdm/config/Xsession,v 1.3 2001/01/17 23:45:24 dawes Exp $
+
+# redirect errors to a file in user's home directory if we can
+for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
+do
+	if ( cp /dev/null "$errfile" 2> /dev/null )
+	then
+		chmod 600 "$errfile"
+		exec > "$errfile" 2>&1
+		break
+	fi
+done
+
+# handle KDM
+if [ -n "$1" ]; then
+	export XSESSION="$1"
+fi
+
+# This next bit should be in the users ~/.xsession,
+# but we have it here as reference
+#
+#userdefaults=$HOME/.Xdefaults  
+#userresources=$HOME/.Xresources   
+#usermodmap=$HOME/.Xmodmap   
+#  
+##Xdefaults  
+#if [ -f "$userdefaults" ]; then  
+#	xrdb -merge "$userdefaults"  
+#fi  
+#Xresorces  
+#if [ -f "$userresources" ]; then  
+#	xrdb -merge "$userresources"  
+#fi  
+##Xmodmap  
+#if [ -f "$usermodmap" ]; then  
+#	xmodmap "$usermodmap"  
+#fi  
+
+startup=$HOME/.xsession
+resources=$HOME/.Xresources
+
+# First run the system default
+if [ -n "`/etc/X11/chooser.sh`" ]; then
+	exec "`/etc/X11/chooser.sh`"
+# If not defined, try the user's ~/.xsession
+elif [ -s "$startup" ]; then
+	if [ -x "$startup" ]; then
+		exec "$startup"
+	else
+		exec /bin/sh "$startup"
+	fi
+# Lastly, xsm as failsafe
+else
+	if [ -r "$resources" ]; then
+		xrdb -load "$resources"
+	fi
+	exec xsm
+fi
+
diff --git a/x11-base/xfree/files/4.2.1/Xsetup_0 b/x11-base/xfree/files/4.2.1/Xsetup_0
new file mode 100644
index 000000000000..2022592bb146
--- /dev/null
+++ b/x11-base/xfree/files/4.2.1/Xsetup_0
@@ -0,0 +1,32 @@
+#!/bin/sh
+# $Xorg: Xsetup_0,v 1.3 2000/08/17 19:54:17 cpqbld Exp $
+#xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail
+
+# get KDEDIR value (only) and run kdmdesktop from there
+eval "`grep KDEDIR /etc/profile.env`"
+[ -n "$KDEDIR" ]  && ${KDEDIR}/bin/kdmdesktop
+
+# --- Gentoo ---
+# create list of sessions for kdm
+sessions="SessionTypes="
+for x in `ls /etc/X11/Sessions`
+do
+    sessions="${sessions}${x},"
+done
+echo sessions: $sessions
+
+# update all kdmrcs located; tries some pretty much impossible locations
+# to make sure we get 'em all
+source /etc/make.conf
+for dir in /usr/kde/* /usr $KDEDIR $KDE2DIR $KDE3DIR $KDE2LIBSDIR $KDE3LIBSDIR
+do
+
+    echo "Changing kdmrc in $dir"
+    cd ${dir}/share/config/kdm || continue
+    
+    cp kdmrc kdmrc.orig
+    sed -e "/SessionTypes=/c\
+${sessions}" kdmrc.orig > kdmrc
+    rm kdmrc.orig
+    
+done
diff --git a/x11-base/xfree/files/4.2.1/chooser.sh b/x11-base/xfree/files/4.2.1/chooser.sh
new file mode 100644
index 000000000000..969b81cb2d7f
--- /dev/null
+++ b/x11-base/xfree/files/4.2.1/chooser.sh
@@ -0,0 +1,67 @@
+#!/bin/sh
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author:  Martin Schlemmer <azarah@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.1/chooser.sh,v 1.1 2002/09/08 20:02:04 azarah Exp $
+
+#if $XSESSION is "", source first /etc/conf.d/basic, and then /etc/rc.conf
+if [ -z "${XSESSION}" ]
+then
+	[ -f /etc/conf.d/basic ] && source /etc/conf.d/basic
+	[ -f /etc/rc.conf ] && source /etc/rc.conf
+fi
+
+#find a match for $XSESSION in /etc/X11/Sessions
+GENTOO_SESSION=""
+for x in /etc/X11/Sessions/*
+do
+	if [ "`echo ${x##*/} | awk '{ print toupper($1) }'`" \
+		= "`echo ${XSESSION} | awk '{ print toupper($1) }'`" ]
+	then
+		GENTOO_SESSION=${x}
+		break
+	fi
+done
+
+GENTOO_EXEC=""
+
+if [ -n "${XSESSION}" ]; then
+	if [ -f /etc/X11/Sessions/${XSESSION} ]; then
+		if [ -x /etc/X11/Sessions/${XSESSION} ]; then
+			GENTOO_EXEC="/etc/X11/Sessions/${XSESSION}"
+		else
+			GENTOO_EXEC="/bin/sh /etc/X11/Sessions/${XSESSION}"
+		fi
+	elif [ -n "${GENTOO_SESSION}" ]; then
+		if [ -x "${GENTOO_SESSION}" ]; then
+			GENTOO_EXEC="${GENTOO_SESSION}"
+		else
+			GENTOO_EXEC="/bin/sh ${GENTOO_SESSION}"
+		fi
+	else
+		for x in "${XSESSION}" \
+			"`echo ${XSESSION} | awk '{ print toupper($1) }'`" \
+			"`echo ${XSESSION} | awk '{ print tolower($1) }'`"
+		do
+			#fall through ...
+			if [ -x /bin/${x} ]; then
+				GENTOO_EXEC="/bin/${x}"
+				break
+			elif [ -x /usr/bin/${x} ]; then
+				GENTOO_EXEC="/usr/bin/${x}"
+				break
+			elif [ -x /usr/X11R6/bin/${x} ]; then
+				GENTOO_EXEC="/usr/X11R6/bin/${x}"
+				break
+			elif [ -x /usr/local/bin/${x} ]; then
+				GENTOO_EXEC="/usr/local/bin/${x}"
+				break
+			fi
+		done
+	fi
+fi
+
+echo "${GENTOO_EXEC}"
+
+
+# vim:ts=4
diff --git a/x11-base/xfree/files/4.2.1/lib/libGL.la b/x11-base/xfree/files/4.2.1/lib/libGL.la
new file mode 100644
index 000000000000..8566b67d4c3d
--- /dev/null
+++ b/x11-base/xfree/files/4.2.1/lib/libGL.la
@@ -0,0 +1,32 @@
+# libGL.la - a libtool library file
+# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18)
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='libGL.so.1'
+
+# Names of this library.
+library_names='libGL.so.1.2 libGL.so.1 libGL.so'
+
+# The name of the static archive.
+old_library=''
+
+# Libraries that this one depends upon.
+dependency_libs=' -L/usr/lib -L/usr/X11R6/lib -lSM -lICE -lXmu -lXt -lXext -lXi -lX11 -ldl -lpthread        '
+
+# Version information for libGL.
+current=3
+age=2
+revision=0
+
+# Is this an already installed library?
+installed=yes
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='/usr/lib/opengl/xfree/lib'
diff --git a/x11-base/xfree/files/4.2.1/lib/libGLU.la b/x11-base/xfree/files/4.2.1/lib/libGLU.la
new file mode 100644
index 000000000000..86b6432cf5db
--- /dev/null
+++ b/x11-base/xfree/files/4.2.1/lib/libGLU.la
@@ -0,0 +1,32 @@
+# libGLU.la - a libtool library file
+# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18)
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='libGLU.so.1'
+
+# Names of this library.
+library_names='libGLU.so.1.3 libGLU.so.1 libGLU.so'
+
+# The name of the static archive.
+old_library=''
+
+# Libraries that this one depends upon.
+dependency_libs=' -L/usr/lib -L/usr/X11R6/lib -lGL -lSM -lICE -lXmu -lXt -lXext -lXi -lX11 -ldl -lpthread      '
+
+# Version information for libGLU.
+current=4
+age=3
+revision=0
+
+# Is this an already installed library?
+installed=yes
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='/usr/lib'
diff --git a/x11-base/xfree/files/4.2.1/lib/libOSMesa.la b/x11-base/xfree/files/4.2.1/lib/libOSMesa.la
new file mode 100644
index 000000000000..56a72ed91f02
--- /dev/null
+++ b/x11-base/xfree/files/4.2.1/lib/libOSMesa.la
@@ -0,0 +1,32 @@
+# libOSMesa.la - a libtool library file
+# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18)
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='libOSMesa.so.3'
+
+# Names of this library.
+library_names='libOSMesa.so.3.3 libOSMesa.so.3 libOSMesa.so'
+
+# The name of the static archive.
+old_library=''
+
+# Libraries that this one depends upon.
+dependency_libs=' -L/usr/lib -L/usr/X11R6/lib -lGL -lSM -lICE -lXmu -lXt -lXext -lXi -lX11 -ldl -lpthread '
+
+# Version information for libOSMesa.
+current=4
+age=3
+revision=0
+
+# Is this an already installed library?
+installed=yes
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='/usr/X11R6/lib'
diff --git a/x11-base/xfree/files/4.2.1/site.def b/x11-base/xfree/files/4.2.1/site.def
new file mode 100644
index 000000000000..dcf5581e87ee
--- /dev/null
+++ b/x11-base/xfree/files/4.2.1/site.def
@@ -0,0 +1,62 @@
+/* Use buildin zlib to try and fix segfaults. Bug #4777 */
+#define HasZlib NO
+#define HasPam YES
+#define HasNCurses YES
+#define HasLibCrypt YES
+#define HasGcc2ForCplusplus YES
+#define LocalThreads YES
+#define ThreadedX YES
+#define HasPosixThreads YES
+#define HasThreadSafeAPI YES
+#define ForceNormalLib YES
+#define BuildXinerama YES
+#define XprtServer YES
+/* #define XnestServer YES */
+/* Do not change, as it can break things like gdm */
+#define SharedLibXau YES
+#define UseFreetype2 YES
+#define BuildFreetype2Library YES
+#define Freetype2Version 2.1.2
+#define BuildFonts YES
+/* #define BuildCyrillicFonts YES */
+#define BuildXF86MiscExt YES
+#define BuildXInputExt YES
+#define BuildXKB YES
+#define BuildDBE YES
+#define BuildScreenSaverExt YES
+#define BuildRman YES
+#define BuildHtmlManPages NO
+#define BuildAllSpecsDocs NO
+#define BuildSpecsDocs NO
+#define BuildXF86DRI YES
+#define HasAgpGart YES
+#define BuildGLXLibrary YES
+#define BuildGlxExt YES
+#define BuildGLULibrary YES
+#define SharedLibGLU YES
+#define NormalLibGLU YES
+#define DoLoadableServer YES
+#define BuildXvExt YES
+#define BuildXF86DGA YES
+#define BuildRender YES
+#define BuildRECORD YES
+#define BuildPexExt YES
+#define BuildXIE YES
+
+/* required for Lokis Erics Ultimate Solitaire */
+#define UseInternalMalloc NO
+#define ForceNormalLib YES
+#define SharedLibXxf86vm YES
+#define SharedLibXxf86dga YES
+#define SharedLibXxf86misc YES
+#define SharedLibXv YES
+
+/* binutils-2.9 */
+#define LinuxBinUtilsMajorVersion 29
+/* glibc-2.2 (6.2 because glibc is considered libc-6) */
+#define LinuxCLibMajorVersion 6
+#define LinuxClibMinorVersion 2
+#define HasTk NO
+#define HasTcl NO
+#define FSUseSyslog YES
+
diff --git a/x11-base/xfree/files/4.2.1/startDM.sh b/x11-base/xfree/files/4.2.1/startDM.sh
new file mode 100644
index 000000000000..49bbd8cf5f20
--- /dev/null
+++ b/x11-base/xfree/files/4.2.1/startDM.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author: Martin Schlemmer <azarah@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.1/startDM.sh,v 1.1 2002/09/08 20:02:04 azarah Exp $
+
+source /etc/init.d/functions.sh
+
+
+if [ -e ${svcdir}/options/xdm/service ]
+then
+	retval=0
+	EXE="`cat ${svcdir}/options/xdm/service`"
+
+	/sbin/start-stop-daemon --start --quiet --exec ${EXE}
+	retval=$?
+	sleep 5
+	
+	if [ "${retval}" -ne 0 ]
+	then
+		# there was a error running the DM
+		einfo "ERROR: could not start the Display Manager..."
+		# make sure we do not have a misbehaving DM
+		killall -9 ${EXE##*/}
+	fi
+fi
+
+
+# vim:ts=4
diff --git a/x11-base/xfree/files/4.2.1/xdm b/x11-base/xfree/files/4.2.1/xdm
new file mode 100644
index 000000000000..1d2e081625f1
--- /dev/null
+++ b/x11-base/xfree/files/4.2.1/xdm
@@ -0,0 +1,7 @@
+#%PAM-1.0
+auth       required	/lib/security/pam_stack.so service=system-auth
+auth       required	/lib/security/pam_nologin.so
+account    required	/lib/security/pam_stack.so service=system-auth
+password   required	/lib/security/pam_stack.so service=system-auth
+session    required	/lib/security/pam_stack.so service=system-auth
+session    optional     /lib/security/pam_console.so
diff --git a/x11-base/xfree/files/4.2.1/xdm.start b/x11-base/xfree/files/4.2.1/xdm.start
new file mode 100644
index 000000000000..9d36e9bfdafa
--- /dev/null
+++ b/x11-base/xfree/files/4.2.1/xdm.start
@@ -0,0 +1,100 @@
+#!/sbin/runscript
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.1/xdm.start,v 1.1 2002/09/08 20:02:04 azarah Exp $
+
+# This is here to serve as a note to myself, and future developers.
+#
+# Any Display manager (gdm,kdm,xdm) have the following problem:  if
+# it is started before any getty, and no vt is specified, it will
+# usually run on vt2.  When the getty on vt2 then starts, and the
+# DM is already started, the getty will take control of the keyboard,
+# leaving us with a "dead" keyboard.
+#
+# Resolution: add the following line to /etc/inittab
+#
+#  x:a:once:/etc/X11/startDM.sh
+#
+# and have /etc/X11/startDM.sh start the DM in daemon mode if
+# a lock is present (with the info of what DM should be started),
+# else just fall through.
+#
+# How this basically works, is the "a" runlevel is a additional
+# runlevel that you can use to fork processes with init, but the
+# runlevel never gets changed to this runlevel.  Along with the "a"
+# runlevel, the "once" key word means that startDM.sh will only be
+# run when we specify it to run, thus eliminating respawning
+# startDM.sh when "xdm" is not added to the default runleve, as was
+# done previously.
+#
+# This script then just calls "tellinit a", and init will run
+# /etc/X11/startDM.sh after the current runlevel completes (this
+# script should only be added to the actual runlevel the user is
+# using).
+#
+# Martin Schlemmer
+# aka Azarah
+# 04 March 2002
+
+
+# Start X Font Server before X
+depend() {
+	use xfs hotplug
+}
+
+setup_dm() {
+	source /etc/profile.env
+	export PATH="/bin:/sbin:/usr/bin:/usr/sbin:${ROOTPATH}"
+
+	case "$(echo ${DISPLAYMANAGER} | awk '{ print toupper($1) }')" in
+		KDM|KDE|KDE2|KDE3)	 
+			EXE="$(which kdm)"
+			;;
+		GDM|GNOME) 
+			EXE=/usr/bin/gdm
+			;;
+		*)	
+			EXE=/usr/X11R6/bin/xdm
+			;;
+	esac
+
+	test ! -x "${EXE}" && EXE=/usr/X11R6/bin/xdm
+
+	SERVICE="${EXE##*/}"
+}
+
+start() {
+	setup_dm
+	ebegin "Setting up ${SERVICE}"
+	#save the prefered DM
+	save_options "service" "${EXE}"
+	#tell init to run /etc/X11/startDM.sh after current
+	#runlevel is finished (should *not* be in the "boot"
+	#                      runlevel).
+	/sbin/telinit a &>/dev/null
+	eend 0
+}
+
+stop() {
+	local retval=0
+	local curvt="$(fgconsole)"
+	local myexe="$(get_options "service")"
+	local myservice="${myexe##*/}"
+	ebegin "Stopping ${myservice}"
+	rm -f ${svcdir}/options/xdm/service
+	if [ "$(ps -A | grep -e "${myservice}")" ]
+	then
+		start-stop-daemon --stop --quiet \
+			--exe ${myexe} &>/dev/null
+		retval=$?
+	else
+		retval=1
+	fi
+	#switch back to original vt
+	chvt "${curvt}" &>/dev/null
+	eend ${retval} "Error stopping ${myservice}."
+	return ${retval}
+}
+
+
+# vim:ts=4
diff --git a/x11-base/xfree/files/4.2.1/xfs.conf.d b/x11-base/xfree/files/4.2.1/xfs.conf.d
new file mode 100644
index 000000000000..d5f0362ee61b
--- /dev/null
+++ b/x11-base/xfree/files/4.2.1/xfs.conf.d
@@ -0,0 +1,14 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.1/xfs.conf.d,v 1.1 2002/09/08 20:02:04 azarah Exp $
+
+# Config file for /etc/init.d/xfs
+
+
+# Port for xfs to listen on.  Default is set to "-1", meaning
+# it will only listen on unix sockets, and not tcp ports.  If
+# you however want it to listen on tcp, remember to comment
+# "nolisten = tcp" in /etc/X11/fs/config.
+
+XFS_PORT="-1"
+
diff --git a/x11-base/xfree/files/4.2.1/xfs.config b/x11-base/xfree/files/4.2.1/xfs.config
new file mode 100644
index 000000000000..d8bc52b30d68
--- /dev/null
+++ b/x11-base/xfree/files/4.2.1/xfs.config
@@ -0,0 +1,56 @@
+#
+# X Font Server configuration file
+#
+
+# allow a max of 4 clients to connect to this font server
+#client-limit = 4
+
+# no tcp, use sockets!
+no-listen  =  tcp
+
+# when a font server reaches its limit, start up a new one
+clone-self = on
+
+# alternate font servers for clients to use
+#alternate-servers = foo:7101,bar:7102
+
+# where to look for fonts
+# Some of these are commented out, i.e. the TrueType and Type1
+# directories in /usr/share, because they aren't forced to be
+# installed alongside X.
+#
+catalogue = /usr/X11R6/lib/X11/fonts/75dpi,
+	/usr/X11R6/lib/X11/fonts/100dpi,
+	/usr/X11R6/lib/X11/fonts/misc,
+	/usr/X11R6/lib/X11/fonts/Type1,
+	/usr/X11R6/lib/X11/fonts/Speedo,
+	/usr/X11R6/lib/X11/fonts/CID,
+	/usr/X11R6/lib/X11/fonts/PEX,
+	/usr/X11R6/lib/X11/fonts/util,
+	/usr/X11R6/lib/X11/fonts/Type1,
+	/usr/X11R6/lib/X11/fonts/local,
+	/usr/X11R6/lib/X11/fonts/Speedo,
+	/usr/X11R6/lib/X11/fonts/truetype,
+	/usr/X11R6/lib/X11/fonts/TTF,
+	/usr/X11R6/lib/X11/fonts/encodings,
+	/usr/X11R6/lib/X11/fonts/cyrillic,
+	/usr/X11R6/lib/X11/fonts/freefont,
+	/usr/X11R6/lib/X11/fonts/sharefont,
+	/usr/share/fonts/default/Type1,
+	/usr/share/fonts/ttf/decoratives,
+	/usr/share/fonts/ttf/western
+
+# in 12 points, decipoints
+default-point-size = 120
+
+# 100 x 100 and 75 x 75
+default-resolutions = 75,75,100,100
+
+# how to log errors
+use-syslog = on
+
+# font cache control, specified in KB
+cache-hi-mark = 2048
+cache-low-mark = 1433
+cache-balance = 70
+
diff --git a/x11-base/xfree/files/4.2.1/xfs.start b/x11-base/xfree/files/4.2.1/xfs.start
new file mode 100644
index 000000000000..eb5bbdaf2858
--- /dev/null
+++ b/x11-base/xfree/files/4.2.1/xfs.start
@@ -0,0 +1,42 @@
+#!/sbin/runscript
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.1/xfs.start,v 1.1 2002/09/08 20:02:04 azarah Exp $
+
+#NB: Config is in /etc/conf.d/xfs
+
+
+depend() {
+	use logger
+}
+
+check_config() {
+	if [ -z "${XFS_PORT}" ]
+	then
+		eerror "Please set \$XFS_PORT in /etc/conf.d/xfs!"
+		return 1
+	fi
+	return 0
+}
+
+start() {
+	check_config || return 1
+	ebegin "Starting X Font Server"
+	if [ "`grep -e "^xfs:" /etc/passwd`" ] ; then
+		start-stop-daemon --start --quiet --exec /usr/X11R6/bin/xfs \
+			-- -daemon -config /etc/X11/fs/config \
+				-droppriv -user xfs -port ${XFS_PORT} 1>&2
+	else
+		start-stop-daemon --start --quiet --exec /usr/X11R6/bin/xfs \
+			-- -daemon -config /etc/X11/fs/config \
+				-port ${XFS_PORT} 1>&2
+	fi
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping X Font Server"
+	start-stop-daemon --stop --quiet --exec /usr/X11R6/bin/xfs 1>&2
+	rm -rf /tmp/.font-unix
+	eend $?
+}
diff --git a/x11-base/xfree/files/4.2.1/xft-quality.diff b/x11-base/xfree/files/4.2.1/xft-quality.diff
new file mode 100644
index 000000000000..a9ed1fe5fdb5
--- /dev/null
+++ b/x11-base/xfree/files/4.2.1/xft-quality.diff
@@ -0,0 +1,38 @@
+diff -urN Xft.orig/xftfreetype.c Xft/xftfreetype.c
+--- Xft.orig/xftfreetype.c	Thu Dec 13 10:26:00 2001
++++ Xft/xftfreetype.c	Wed Mar  6 00:23:19 2002
+@@ -1,5 +1,5 @@
+ /*
+- * $XFree86: xc/lib/Xft/xftfreetype.c,v 1.16 2001/12/13 17:26:00 keithp Exp $
++ * $XFree86: xc/lib/Xft1/xftfreetype.c,v 1.1.1.1 2002/02/15 01:26:16 keithp Exp $
+  *
+  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
+  *
+@@ -236,7 +236,7 @@
+ 		if (_XftFontDebug() & XFT_DBG_GLYPH)
+ 		    printf ("Set face size to %d (%d)\n", 
+ 			    (int) (size >> 6), (int) size);
+-		if (FT_Set_Char_Size (face, size, size, 0, 0))
++		if (FT_Set_Char_Size (face, size, size, 69, 72))
+ 		    return False;
+ 		f->size = size;
+ 	    }
+diff -urN Xft.orig/xftglyphs.c Xft/xftglyphs.c
+--- Xft.orig/xftglyphs.c	Sat Nov 17 01:22:45 2001
++++ Xft/xftglyphs.c	Wed Mar  6 00:23:19 2002
+@@ -1,5 +1,5 @@
+ /*
+- * $XFree86: xc/lib/Xft/xftglyphs.c,v 1.14 2001/11/17 08:22:45 keithp Exp $
++ * $XFree86: xc/lib/Xft1/xftglyphs.c,v 1.1.1.1 2002/02/15 01:26:16 keithp Exp $
+  *
+  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
+  *
+@@ -124,7 +124,7 @@
+ 	}
+ 	else
+ 	    glyphindex = (FT_UInt) charcode;
+-	error = FT_Load_Glyph (font->face, glyphindex, FT_LOAD_NO_BITMAP);
++	error = FT_Load_Glyph (font->face, glyphindex, FT_LOAD_NO_BITMAP | FT_LOAD_NO_HINTING);
+ 	if (error)
+ 	    continue;
+ 
diff --git a/x11-base/xfree/files/4.2.1/xinitrc b/x11-base/xfree/files/4.2.1/xinitrc
new file mode 100644
index 000000000000..f81157d11fd1
--- /dev/null
+++ b/x11-base/xfree/files/4.2.1/xinitrc
@@ -0,0 +1,43 @@
+#!/bin/sh
+# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+XINITDIR=/usr/X11R6/lib/X11/xinit
+sysresources=$XINITDIR/.Xresources
+sysmodmap=$XINITDIR/.Xmodmap
+
+# merge in defaults and keymaps
+
+if [ -f $sysresources ]; then
+    xrdb -merge $sysresources
+fi
+
+if [ -f $sysmodmap ]; then
+    xmodmap $sysmodmap
+fi
+
+if [ -f $userresources ]; then
+    xrdb -merge $userresources
+fi
+
+if [ -f $usermodmap ]; then
+    xmodmap $usermodmap
+fi
+
+# First try ~/.xinitrc
+if [ -f "$HOME/.xinitrc" ]; then
+	XINITRC="$HOME/.xinitrc"
+	exec /bin/sh "$HOME/.xinitrc"
+# If not present, try the system default
+elif [ -n "`/etc/X11/chooser.sh`" ]; then
+	exec "`/etc/X11/chooser.sh`"
+# Failsafe
+else
+	# start some nice programs
+	twm &
+	xclock -geometry 50x50-1+1 &
+	xterm -geometry 80x50+494+51 &
+	xterm -geometry 80x20+494-0 &
+	exec xterm -geometry 80x66+0+0 -name login
+fi
diff --git a/x11-base/xfree/files/digest-xfree-4.2.1 b/x11-base/xfree/files/digest-xfree-4.2.1
new file mode 100644
index 000000000000..eca25c77ea45
--- /dev/null
+++ b/x11-base/xfree/files/digest-xfree-4.2.1
@@ -0,0 +1,22 @@
+MD5 ad43a8e9e39703322005cd6f7145b77f X420src-1.tgz 25961532
+MD5 dae33268a9f2735b9678a81fb23e8d3e X420src-2.tgz 23227328
+MD5 560899e175a02ab592185b69756f539e X420src-3.tgz 9306679
+MD5 23d04bf0cfc48772b8d698c95eec37bd freetype-2.1.2.tar.bz2 742830
+MD5 38adc94a4953a6b29e8619c25dda4887 4.2.0-4.2.1.diff.gz 54763
+MD5 a3156de293556d1c7ac1efed67558091 XFree86-4.2.1-patches.tar.bz2 124888
+MD5 222bffcae6c2be37ec5cd993037f4f45 xf86Wacom.c.gz 26156
+MD5 edd1643429f2ffcfde3ccecdf2f76c94 xf41sav.tgz 33105
+MD5 1877066730c28394e9048583390dc0d3 sis_drv_src_050902-2.tar.gz 286720
+MD5 aaeb8f8b276a6849f7a570097d69788e glide3-headers.tar.bz2 14564
+MD5 cbdc2fdd7d2ed0832795e86a8b9ee19a andale32.exe 198384
+MD5 230a1d13a365b22815f502eb24d9149b webdin32.exe 185072
+MD5 0d7ea16cac6261f8513a061fbfcdb2b5 trebuc32.exe 357200
+MD5 4d90016026e2da447593b41a8d8fa8bd georgi32.exe 392440
+MD5 12d2a75f8156e10607be1eaa8e8ef120 verdan32.exe 351992
+MD5 2b30de40bb5e803a0452c7715fc835d1 comic32.exe 246008
+MD5 c9089ae0c3b3d0d8c4b0a95979bb9ff0 arialb32.exe 168176
+MD5 7907c7dd6684e9bade91cff82683d9d7 impact32.exe 173288
+MD5 9637df0e91703179f0723ec095a36cb5 arial32.exe 554208
+MD5 ed39c8ef91b9fb80f76f702568291bd5 times32.exe 661728
+MD5 4e412c772294403ab62fb2d247d85c60 courie32.exe 646368
+MD5 358584cddb75ac90472c25f01b308ebe IELPKTH.CAB 411248
diff --git a/x11-base/xfree/xfree-4.2.1.ebuild b/x11-base/xfree/xfree-4.2.1.ebuild
new file mode 100644
index 000000000000..5f39dbed9c8a
--- /dev/null
+++ b/x11-base/xfree/xfree-4.2.1.ebuild
@@ -0,0 +1,413 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1.ebuild,v 1.1 2002/09/08 20:02:04 azarah Exp $
+
+inherit flag-o-matic
+# Compile problems with these ...
+filter-flags "-funroll-loops"
+
+FT2_VER="2.1.2"
+SISDRV_VER="050902-2"
+
+BASE_PV="4.2.0"
+MY_SV="${BASE_PV//\.}"
+S="${WORKDIR}/xc"
+DESCRIPTION="Xfree86: famous and free X server"
+SRC_PATH0="ftp://ftp.xfree.org/pub/XFree86/${BASE_PV}/source"
+SRC_PATH1="ftp://ftp1.sourceforge.net/pub/mirrors/XFree86/${BASE_PV}/source"
+HOMEPAGE="http://www.xfree.org"
+
+X_PATCHES="http://ftp.xfree86.org/pub/XFree86/${PV}/patches/${BASE_PV}-${PV}.diff.gz
+	mirror://gentoo/XFree86-${PV}-patches.tar.bz2"
+
+X_DRIVERS="http://people.mandrakesoft.com/~flepied/projects/wacom/xf86Wacom.c.gz
+	http://www.probo.com/timr/xf41sav.tgz
+	http://www.webit.at/~twinny/sis/sis_drv_src_${SISDRV_VER}.tar.gz
+	3dfx? ( mirror://gentoo/glide3-headers.tar.bz2 )"
+# Updated Wacom driver at http://people.mandrakesoft.com/~flepied/projects/wacom/
+# Latest Savaga drivers at http://www.probo.com/timr/savage40.html
+# Latest SIS drivers at http://www.webit.at/~twinny/linuxsis630.shtml
+# 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"
+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_PATH1}/X${MY_SV}src-1.tgz
+	 ${SRC_PATH1}/X${MY_SV}src-2.tgz
+	 ${SRC_PATH1}/X${MY_SV}src-3.tgz
+	 mirror://sourceforge/freetype/freetype-${FT2_VER}.tar.bz2
+	 ${X_PATCHES}
+	 ${X_DRIVERS}
+	 truetype? ( ${MS_FONT_URLS} )"
+
+LICENSE="X11 MSttfEULA"
+SLOT="0"
+KEYWORDS="x86 ppc sparc sparc64"
+
+DEPEND=">=sys-apps/baselayout-1.8.3
+	>=sys-libs/ncurses-5.1
+	>=sys-libs/pam-0.75
+	>=sys-libs/zlib-1.1.3-r2
+	sys-devel/flex
+	sys-devel/perl
+	truetype? ( app-arch/cabextract )"
+#	3dfx? ( >=media-libs/glide-v3-3.10 )"
+	
+RDEPEND=">=sys-apps/baselayout-1.8.3
+	>=sys-libs/ncurses-5.1
+	>=x11-base/opengl-update-1.4"
+
+PROVIDE="virtual/x11
+	virtual/opengl
+	virtual/glu"	
+
+src_unpack() {
+
+	unpack X${MY_SV}src-{1,2,3}.tgz \
+		freetype-${FT2_VER}.tar.bz2 \
+		XFree86-${PV}-patches.tar.bz2
+
+	# Deploy our custom freetype2.  We want it static for stability,
+	# and because some things in Gentoo depends the freetype2 that
+	# is distributed with XFree86.
+	rm -rf ${S}/extras/freetype2
+	mv ${WORKDIR}/freetype-${FT2_VER} ${S}/extras/freetype2
+
+	# Install the glide3 headers for compiling the tdfx driver
+	if [ -n "`use 3dfx`" ]
+	then
+		einfo "Installing tempory glide3 headers..."
+		cd ${WORKDIR}; unpack glide3-headers.tar.bz2
+		cp -f ${S}/lib/GL/mesa/src/drv/tdfx/Imakefile ${T}
+		sed -e 's:$(GLIDE3INCDIR):$(WORKDIR)/glide3:g' \
+			${T}/Imakefile > ${S}/lib/GL/mesa/src/drv/tdfx/Imakefile
+	fi
+
+	# Update to XFree86-4.2.1 tree
+	einfo "Updating ${BASE_PV} sources to ${PV}..."
+	cd ${S};
+	gzip -dc ${DISTDIR}/${BASE_PV}-${PV}.diff.gz | patch -p1 > /dev/null || die
+
+	# 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
+	fi
+	
+	# Update the Savage Driver
+	einfo "Updating Savage driver..."
+	cd ${S}/programs/Xserver/hw/xfree86/drivers/savage
+	tar -zxf ${DISTDIR}/xf41sav.tgz || die
+
+	# Update the SIS Driver
+	einfo "Updating SiS driver..."
+	cd ${S}/programs/Xserver/hw/xfree86/drivers/sis
+	tar -zxf ${DISTDIR}/sis_drv_src_${SISDRV_VER}.tar.gz || die
+
+	# 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
+		einfo "Updating Wacom USB Driver..."
+		gzip -dc ${DISTDIR}/xf86Wacom.c.gz > \
+			${S}/programs/Xserver/hw/xfree86/input/wacom/xf86Wacom.c || die
+	fi
+
+	cd ${S}
+
+	# Various patches from all over
+	einfo "Applying various patches (bugfixes/updates)..."
+	for x in ${WORKDIR}/*.patch.bz2 ${FILESDIR}/${PV}-patches/*.patch.bz2
+	do
+		if [ -f ${x} ]
+		then
+			einfo "  ${x##*/}..."
+			bzip2 -dc ${x} | patch -p2 > /dev/null || die
+		fi
+	done
+
+	einfo "Setting up config/cf/host.def..."
+	cp ${FILESDIR}/${PVR}/site.def config/cf/host.def
+	echo "#define XVendorString \"Gentoo Linux (XFree86 ${PV}, revision ${PR})\"" \
+		>> config/cf/host.def
+
+	if [ "`gcc -dumpversion`" != "2.95.3" ]
+	then
+		# should fix bug #4189.  gcc-3.x have problems with -march=pentium4
+		# and -march=athlon-tbird
+		export CFLAGS="${CFLAGS/pentium4/pentium3}"
+		export CXXFLAGS="${CXXFLAGS/pentium4/pentium3}"
+		export CFLAGS="${CFLAGS/athlon-tbird/athlon}"
+		export CXXFLAGS="${CXXFLAGS/athlon-tbird/athlon}"
+		# Without this, modules breaks with gcc3
+		export CFLAGS="${CFLAGS} -fno-merge-constants"
+		export CXXFLAGS="${CXXFLAGS} -fno-merge-constants"
+	fi
+	echo "#define OptimizedCDebugFlags ${CFLAGS}" >> config/cf/host.def
+	echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS}" >> config/cf/host.def
+	if [ "${DEBUGBUILD}" != "true" ]
+	then
+		# use less ram .. got this from Spider's makeedit.eclass :)
+		echo "#define GccWarningOptions -Wno-return-type -w" >> config/cf/host.def
+	fi
+
+	if [ "${ARCH}" = "x86" ]
+	then
+		# optimize Mesa for architecture
+		if [ -n "`use mmx`" ]
+		then
+			echo "#define HasMMXSupport	YES" >> config/cf/host.def
+		fi
+		if [ -n "`use 3dnow`" ]
+		then
+			echo "#define MesaUse3DNow YES" >> config/cf/host.def
+			echo "#define MesaUseKatmai NO" >> config/cf/host.def
+		elif [ -n "`use sse`" ]
+		then
+			echo "#define MesaUseKatmai YES" >> config/cf/host.def
+			echo "#define MesaUse3DNow NO" >> config/cf/host.def
+		fi
+	fi
+
+	# build with glide3 support? (build the tdfx_dri.o module)
+	if [ -n "`use 3dfx`" ]
+	then
+		echo "#define HasGlide3 YES" >> config/cf/host.def
+	fi
+
+	# Apply Xft quality patch from http://www.cs.mcgill.ca/~dchest/xfthack/
+#	cd ${S}/lib/Xft
+#	cat ${FILESDIR}/${PVR}/xft-quality.diff | patch -p1 || die
+}
+
+src_compile() {
+
+	emake World || die
+
+	if [ -n "`use nls`" ]
+	then
+		cd ${S}/nls
+		make || die
+		cd ${S}
+	fi
+}
+
+src_install() {
+
+	make install DESTDIR=${D} || die
+	
+	make install.man DESTDIR=${D} || die
+
+	if [ -n "`use nls`" ]
+	then
+		cd ${S}/nls
+		make DESTDIR=${D} install || die
+		cd ${S}
+	fi
+
+	# Make sure user running xterm can only write to utmp.
+	chown root.utmp ${D}/usr/X11R6/bin/xterm
+	chmod 2755 ${D}/usr/X11R6/bin/xterm
+
+	# we zap the our CFLAGS in the host.def file, as hardcoded CFLAGS can
+	# mess up other things that use xmkmf
+	cp ${D}/usr/X11R6/lib/X11/config/host.def ${T}
+	awk '!/OptimizedCDebugFlags|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.
+
+	insinto /etc/X11
+	doins ${FILESDIR}/${PVR}/XftConfig
+	dosym ../../../../etc/X11/XftConfig /usr/X11R6/lib/X11/XftConfig
+	
+	# Install MS fonts.
+	if [ -n "`use truetype`" ]
+	then
+		einfo "Installing MS Core Fonts..."
+		mkdir -p ${D}/usr/X11R6/lib/X11/fonts/truetype
+		mv -f ${WORKDIR}/truetype/*.ttf ${D}/usr/X11R6/lib/X11/fonts/truetype
+	fi
+
+	# Standard symlinks
+	dodir /usr/{bin,include,lib}
+	dosym ../X11R6/bin /usr/bin/X11
+	dosym ../X11R6/include/X11 /usr/include/X11
+	dosym ../X11R6/include/GL /usr/include/GL
+	dosym ../X11R6/lib/X11 /usr/lib/X11
+
+	# 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 ${FILESDIR}/${PVR}/lib/*.la
+
+	exeinto /etc/X11
+	# new session management script
+	doexe ${FILESDIR}/${PVR}/chooser.sh
+	# new display manager script
+	doexe ${FILESDIR}/${PVR}/startDM.sh
+	exeinto /etc/X11/Sessions
+	doexe ${FILESDIR}/${PVR}/Sessions/*
+	insinto /etc/env.d
+	doins ${FILESDIR}/${PVR}/10xfree
+	insinto /etc/X11/xinit
+	doins ${FILESDIR}/${PVR}/xinitrc
+	exeinto /etc/X11/xdm
+	doexe ${FILESDIR}/${PVR}/Xsession ${FILESDIR}/${PVR}/Xsetup_0
+	insinto /etc/X11/fs
+	newins ${FILESDIR}/${PVR}/xfs.config config
+	insinto /etc/pam.d
+	doins ${FILESDIR}/${PVR}/xdm
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/${PVR}/xdm.start xdm
+	newexe ${FILESDIR}/${PVR}/xfs.start xfs
+	insinto /etc/conf.d
+	newins ${FILESDIR}/${PVR}/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
+	einfo "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
+}
+
+pkg_preinst() {
+
+	# this changed from a directory/file to a symlink
+	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}/usr/X11R6/lib/X11/app-defaults ] && \
+	   [ -d ${ROOT}/usr/X11R6/lib/X11/app-defaults ]
+	then
+		mv f ${ROOT}/usr/X11R6/lib/X11/app-defaults ${ROOT}/etc/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
+
+	# make sure we do not have any stale files lying round
+	# that could break things.
+	rm -f ${ROOT}/usr/X11R6/lib/libGL.*
+}
+
+pkg_postinst() {
+
+	env-update
+	einfo "Making font dirs..."
+	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/lib" \
+	find ${ROOT}/usr/X11R6/lib/X11/fonts/* -type d -maxdepth 1 \
+		-exec ${ROOT}/usr/X11R6/bin/mkfontdir {} \;
+
+	# make sure all the Compose files are present
+	for x in $(find ${ROOT}/usr/X11R6/lib/X11/locale/ -mindepth 1 -type d)
+	do
+		if [ ! -f ${x}/Compose ]
+		then
+			touch ${x}/Compose
+		fi
+	done
+
+	# switch to the xfree implementation
+	if [ "${ROOT}" = "/" ]
+	then
+		# use new opengl-update that will not reset user selected
+		# OpenGL interface ...
+		/usr/sbin/opengl-update --use-old xfree
+	fi
+
+	# add back directories that portage nukes on unmerge
+	if [ ! -d ${ROOT}/var/lib/xdm ]
+	then
+		mkdir -p ${ROOT}/var/lib/xdm
+	fi
+	touch ${ROOT}/var/lib/xdm/.keep
+
+	if [ "`use 3dfx`" ]
+	then
+		einfo
+		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"
+		einfo
+	fi
+}
+
+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/GL ${ROOT}/usr/include/GL
+		ln -snf ../X11R6/lib/X11 ${ROOT}/usr/lib/X11
+	fi
+}
+