Drop 4.2. It's two years old.

3 files changed, 4 insertions, 861 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index c3246378af17..8adcc047a35f 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-base/xfree
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.309 2004/03/29 08:08:33 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.310 2004/03/31 06:36:56 spyderous Exp $
+
+  31 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.2.1-r4.ebuild:
+  Drop 4.2. It's two years old.
 
   29 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild:
   Adding blocker on virtual/x11. Only one should be installed at a time.
diff --git a/x11-base/xfree/files/digest-xfree-4.2.1-r4 b/x11-base/xfree/files/digest-xfree-4.2.1-r4
deleted file mode 100644
index 4712904eb090..000000000000
--- a/x11-base/xfree/files/digest-xfree-4.2.1-r4
+++ /dev/null
@@ -1,22 +0,0 @@
-MD5 ad43a8e9e39703322005cd6f7145b77f X420src-1.tgz 25961532
-MD5 dae33268a9f2735b9678a81fb23e8d3e X420src-2.tgz 23227328
-MD5 560899e175a02ab592185b69756f539e X420src-3.tgz 9306679
-MD5 2f2852c80924a9b5356c3037a471c1a1 fcpackage.2_1.tar.gz 544661
-MD5 38adc94a4953a6b29e8619c25dda4887 4.2.0-4.2.1.diff.gz 54763
-MD5 69f91895792744c394c3ad62fd49bff8 XFree86-4.2.1-patches-1.6.tar.bz2 407061
-MD5 12179b90b41b35f9f03f93968613cb05 XFree86-4.2.1-files-0.1.tar.bz2 34199
-MD5 222bffcae6c2be37ec5cd993037f4f45 xf86Wacom.c.gz 26156
-MD5 537bb3e2da7642bd979ebc1cafa8dce7 savage-1.1.27t.zip 76974
-MD5 4550c4f28637be556e2000676072de32 sis_drv_src_311003-1.tar.gz 419840
-MD5 aaeb8f8b276a6849f7a570097d69788e glide3-headers.tar.bz2 14564
-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
diff --git a/x11-base/xfree/xfree-4.2.1-r4.ebuild b/x11-base/xfree/xfree-4.2.1-r4.ebuild
deleted file mode 100644
index 4e77bff671a4..000000000000
--- a/x11-base/xfree/xfree-4.2.1-r4.ebuild
+++ /dev/null
@@ -1,838 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1-r4.ebuild,v 1.4 2004/03/27 21:23:15 spyderous 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 ...
-RESTRICT="nostrip"
-
-IUSE="sse nls mmx truetype 3dnow 3dfx"
-
-inherit eutils flag-o-matic gcc
-
-filter-flags "-funroll-loops"
-
-# Sparc support
-replace-flags "-mcpu=ultrasparc" "-mcpu=v8 -mtune=ultrasparc"
-replace-flags "-mcpu=v9" "-mcpu=v8 -mtune=v9"
-
-# 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 himeself) 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
-
-PATCH_VER="1.6"
-FILES_VER="0.1"
-FT2_VER="2.1.2"
-FC2_VER="2.1"
-SISDRV_VER="311003-1"
-SAVDRV_VER="1.1.27t"
-
-PATCH_DIR="${WORKDIR}/patch"
-FILES_DIR="${WORKDIR}/files"
-
-BASE_PV="4.2.0"
-MY_SV="${BASE_PV//\.}"
-S="${WORKDIR}/xc"
-S_XFT2="${WORKDIR}/fcpackage.${FC2_VER/\./_}/Xft"
-DESCRIPTION="XFree86: 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-${PATCH_VER}.tar.bz2
-	http://dev.gentoo,org/~seemant/extras/XFree86-${PV}-patches-${PATCH_VER}.tar.bz2"
-
-X_FILES="mirror://gentoo/XFree86-${PV}-files-${FILES_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
-	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.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 Tahoma font
-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
-	http://fontconfig.org/release/fcpackage.${FC2_VER/\./_}.tar.gz
-	${X_PATCHES}
-	${X_FILES}
-	${X_DRIVERS}
-	truetype? ( ${MS_FONT_URLS} )"
-
-# http://www.xfree86.org/4.3.0/LICENSE.html
-LICENSE="Adobe-X CID DEC DEC-2 IBM-X NVIDIA-X NetBSD SGI UCB-LBL XC-2
-	bigelow-holmes-urw-gmbh-luxi christopher-g-demetriou national-semiconductor
-	nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0
-	MIT SGI-B BSD FTL | GPL-2 MSttfEULA"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha"
-
-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-2.5.4a-r5
-	dev-lang/perl
-	>=media-libs/freetype-${FT2_VER}-r2
-	>=x11-base/opengl-update-1.4
-	>=x11-misc/ttmkfdir-2.0
-	truetype? ( app-arch/cabextract )
-	app-arch/unzip" # needed for savage driver (version 1.1.27t)
-
-RDEPEND=">=sys-apps/baselayout-1.8.3
-	>=sys-libs/ncurses-5.1
-	>=sys-libs/pam-0.75
-	>=sys-libs/zlib-1.1.3-r2
-	>=media-libs/freetype-${FT2_VER}-r2
-	>=media-libs/fontconfig-2.1
-	>=x11-base/opengl-update-1.4"
-# Above fontconfig is just to make sure user have a fixed version installed.
-
-PDEPEND="3dfx? ( >=media-libs/glide-v3-3.10 )"
-
-PROVIDE="virtual/x11
-	virtual/opengl
-	virtual/glu"
-
-src_unpack() {
-
-	unpack X${MY_SV}src-{1,2,3}.tgz \
-		fcpackage.${FC2_VER/\./_}.tar.gz \
-		XFree86-${PV}-patches-${PATCH_VER}.tar.bz2 \
-		XFree86-${PV}-files-${FILES_VER}.tar.bz2
-
-	# Fix permissions
-	chmod -R 0755 ${WORKDIR}/fcpackage.${FC2_VER/\./_}/
-
-	# Install the glide3 headers for compiling the tdfx driver
-	if [ -n "`use 3dfx`" ]
-	then
-		ebegin "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
-		eend 0
-	fi
-
-	# Update to XFree86-4.2.1 tree
-	cd ${S};
-	EPATCH_SINGLE_MSG="Updating ${BASE_PV} sources to ${PV}..." \
-	epatch ${DISTDIR}/${BASE_PV}-${PV}.diff.gz
-	eend 0
-
-	ebegin "Updating Xrender"
-	cd ${S}; rm -rf ${S}/lib/Xrender
-	mv ${WORKDIR}/fcpackage.${FC2_VER/\./_}/Xrender ${S}/lib/Xrender || die
-	# Get Xrender to also install its extension headers, as they need to
-	# be updated.
-	cp ${S}/lib/Xrender/Imakefile ${S}/lib/Xrender/Imakefile.orig
-	sed -e '2i NONSTANDARD_HEADERS = extutil.h region.h render.h renderproto.h' \
-		${S}/lib/Xrender/Imakefile.orig > ${S}/lib/Xrender/Imakefile
-	eend 0
-
-	if [ "`gcc-version`" = "2.95" ]
-	then
-		# Do not apply this patch for gcc-2.95.3, as it cause compile to fail,
-		# closing bug #10146.
-		EPATCH_EXCLUDE="107_all_4.2.1-gcc32-internal-compiler-error.patch.bz2"
-	fi
-
-	# Remove 082 patch which b0rks keycodes,
-	# see bug #13073
-	rm -f ${PATCH_DIR}/082*
-
-	# Do not disable DRI for 3dfx cards if resolution higher than 1024x768,
-	# bug #15001.
-	rm -f ${PATCH_DIR}/035*
-
-	rm -f ${PATCH_DIR}/920*
-
-	# Various Patches from all over
-	epatch ${PATCH_DIR}
-	unset EPATCH_EXCLUDE
-
-	# Update the Savage Driver
-	ebegin "Updating Savage driver"
-	cd ${S}/programs/Xserver/hw/xfree86/drivers
-	unzip -qo ${DISTDIR}/savage-${SAVDRV_VER}.zip || die
-	eend 0
-
-	# Update the SIS Driver
-	ebegin "Updating SiS driver"
-	cd ${S}/programs/Xserver/hw/xfree86/drivers/sis
-	tar -zxf ${DISTDIR}/sis_drv_src_${SISDRV_VER}.tar.gz || die
-	eend 0
-
-	# 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 [ -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 ${FILES_DIR}/site.def config/cf/host.def || die
-	echo "#define XVendorString \"Gentoo Linux (XFree86 ${PV}, revision ${PR})\"" \
-		>> 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
-		replace-flags "-march=pentium4" "-march=pentium3"
-		replace-flags "-march=athlon-tbird" "-march=athlon"
-
-		# Without this, modules breaks with gcc3
-		if [ "`gcc-version`" = "3.1" ]
-		then
-			export CFLAGS="${CFLAGS} -fno-merge-constants"
-			export CXXFLAGS="${CXXFLAGS} -fno-merge-constants"
-		fi
-	fi
-	echo "#define OptimizedCDebugFlags ${CFLAGS}" >> config/cf/host.def
-	echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS}" >> config/cf/host.def
-	if [ "${DEBUGBUILD}" != "yes" ]
-	then
-		# use less ram .. got this from Spider's makeedit.eclass :)
-		echo "#define GccWarningOptions -Wno-return-type -w" >> config/cf/host.def
-	fi
-
-	if [ -n "`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 [ "${ARCH}" = "x86" ]
-	then
-		# optimize Mesa for architecture
-		if [ -n "`use mmx`" ]
-		then
-			echo "#define HasMMXSupport	YES" >> config/cf/host.def
-			echo "#define MesaUseMMX YES" >> config/cf/host.def
-		fi
-		if [ -n "`use 3dnow`" ]
-		then
-			echo "#define Has3DNowSupport YES" >> config/cf/host.def
-			echo "#define MesaUse3DNow YES" >> config/cf/host.def
-		fi
-		if [ -n "`use sse`" ]
-		then
-			echo "#define HasKatmaiSupport YES" >> config/cf/host.def
-			echo "#define MesaUseKatmai YES" >> config/cf/host.def
-		fi
-	fi
-
-	if [ "`uname -r | cut -d. -f1,2`" != "2.2" ]
-	then
-		echo "#define HasLinuxInput YES" >> config/cf/host.def
-	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
-
-	if [ -n "`use nls`" ]
-	then
-		echo "#define XtermWithI18N YES" >> config/cf/host.def
-	fi
-	eend 0
-
-	# 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
-}
-
-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..."
-	emake World || die
-
-	if [ -n "`use nls`" ]
-	then
-		cd ${S}/nls
-		make || die
-	fi
-}
-
-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
-
-	einfo "Installing man pages..."
-	make install.man DESTDIR=${D} || die
-	einfo "Compressing man pages..."
-	prepman /usr/X11R6
-
-	if [ -n "`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/common/*.so*
-	do
-		if [ -f ${x} ]
-		then
-			fperms 0755 `echo ${x} | sed -e "s|${D}||"`
-		fi
-	done
-
-	# we zap the 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 [ -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
-
-	# 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
-
-	# Some Xft2.0 checks to ease things a bit
-	if [ -L ${ROOT}/usr/X11R6/lib/libXft.so ]
-	then
-		local libxft_link="`readlink ${ROOT}/usr/X11R6/lib/libXft.so`"
-
-		if [ "${libxft_link##*/}" = "libXft.so.2.0" ] && \
-		   [ -f ${ROOT}/usr/lib/libXft.so.2.0 ]
-		then
-			# Do not overwrite /usr/X11R6/lib/libXft.so if we have
-			# Xft2.0 installed ...
-			rm -f ${D}/usr/X11R6/lib/libXft.so
-
-			# Move Xft1.1 headers to not overwrite Xft2.0 headers ...
-			mv -f ${D}/usr/X11R6/include/X11/Xft ${D}/usr/X11R6/include/X11/Xft1
-		fi
-	fi
-
-	# 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}
-
-	# 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
-
-	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 [ -n "`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
-
-	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
-}
-
-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
-
-		if [ -x ${ROOT}/usr/bin/fc-cache ]
-		then
-			ebegin "Creating FC font cache..."
-			HOME="/root" ${ROOT}/usr/bin/fc-cache -f
-			eend 0
-		fi
-
-		# 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
-
-		# 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 ....
-	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
-}
-
-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
-}
-