repoman: trim trailing whitespace

10 files changed, 208 insertions, 208 deletions

diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest
index 0bc8b27b44c2..1b26e31d078b 100644
--- a/x11-base/xfree/Manifest
+++ b/x11-base/xfree/Manifest
@@ -1,14 +1,14 @@
-MD5 e6ee387a2de6b2fea8e5a3573c48b667 metadata.xml 228
-MD5 f11ed1feb06c079f6d570a0ca23d647c xfree-4.1.0-r6.ebuild 2963
-MD5 c702fab31b9adac56477a9a5c16911c4 xfree-4.2.0-r12.ebuild 10302
-MD5 3afe69de4b96b8fb40a395eac73d0880 xfree-4.2.1-r2.ebuild 24186
-MD5 b35f68907eb1c04375a133178e01d2a6 xfree-4.3.0-r1.ebuild 25121
-MD5 cc8893cec16b0a68f380bee66fa307b1 xfree-4.3.0-r2.ebuild 31410
-MD5 f43f9f652052e4f8bf896a85717d7d33 xfree-4.3.0-r3.ebuild 33940
-MD5 24cdcd01eb1136c73d605f2353336983 xfree-4.3.99.10.ebuild 31058
-MD5 6cded196432edca8ee88917f6fa2c402 xfree-4.3.99.11.ebuild 31786
-MD5 30ab90872cc1960dcb87dfe3a37bb704 xfree-4.3.99.9.ebuild 31586
 MD5 5427f4fd8ed8ee02aba8c8310c446985 ChangeLog 40693
+MD5 e6ee387a2de6b2fea8e5a3573c48b667 metadata.xml 228
+MD5 420adec0e5a7edc8175b2a4032b172cc xfree-4.1.0-r6.ebuild 2954
+MD5 2e730b1127a59eabfc864b23049418d6 xfree-4.2.0-r12.ebuild 10299
+MD5 e01435598f0611dafe440192d953b222 xfree-4.2.1-r2.ebuild 24143
+MD5 9afeabe9fa568c38b51e96a261c66078 xfree-4.3.0-r1.ebuild 25074
+MD5 889d158389bdd3e447f0043ff34df007 xfree-4.3.0-r2.ebuild 31362
+MD5 e500ee020c88a5745c5256c1db604ea7 xfree-4.3.0-r3.ebuild 33889
+MD5 8ab091b71132001ea98d23f34ab845f9 xfree-4.3.99.10.ebuild 31029
+MD5 380a5e1de1c141c780aaa043f9dce631 xfree-4.3.99.11.ebuild 31758
+MD5 01dd43144b5b004d3021a23a9e882740 xfree-4.3.99.9.ebuild 31546
 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
diff --git a/x11-base/xfree/xfree-4.1.0-r6.ebuild b/x11-base/xfree/xfree-4.1.0-r6.ebuild
index fd7f1df5a941..77728e63e6bc 100644
--- a/x11-base/xfree/xfree-4.1.0-r6.ebuild
+++ b/x11-base/xfree/xfree-4.1.0-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.1.0-r6.ebuild,v 1.12 2003/03/11 21:11:49 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.1.0-r6.ebuild,v 1.13 2003/09/07 07:27:40 msterret Exp $
 
 MY_V="`echo ${PV} |sed -e 's:\.::g'`"
 S=${WORKDIR}/xc
@@ -25,18 +25,18 @@ DEPEND=">=sys-libs/ncurses-5.1
         >=sys-libs/zlib-1.1.3-r2
 	sys-devel/flex
 	dev-lang/perl"
-	
+
 RDEPEND=">=sys-libs/ncurses-5.1"
 
 PROVIDE="virtual/x11 virtual/opengl"
 # virtual/glu"
 # This has been removed.  Anyone know why exactly ??
-	
+
 
 src_unpack () {
 
 	unpack X${MY_V}src-{1,2,3}.tgz
-	
+
 	cd ${S}
 	cp ${FILESDIR}/${PVR}/site.def config/cf/host.def
 	echo "#define DefaultGcc2i386Opt ${CFLAGS}" >>  config/cf/host.def
@@ -66,16 +66,16 @@ src_install() {
 	tar -xz --no-same-owner -f ${DISTDIR}/truetype.tar.gz
 	dosym /usr/X11R6/lib/libGL.so.1.2 /usr/X11R6/lib/libMesaGL.so
 	dosym /usr/X11R6/bin /usr/bin/X11
-	
+
 	#X installs some /usr/lib/libGL symlinks, pointing to the libGL's in /usr/X11R6/lib.
 	#I don't see the point in this.  Yes, according to LSB, the correct location for libGL is
 	#in /usr/lib, but this is so closely integrated with X itself that /usr/X11R6/lib seems
 	#like the right place.
-	rm -rf ${D}/usr/lib    
-	
+	rm -rf ${D}/usr/lib
+
 	#dosym /usr/X11R6/lib/libGLU.so.1.3 /usr/lib/libMesaGLU.so
 	#We're no longer including libGLU from here.  Packaged separately, from separate sources.
-	
+
 	insinto /etc/env.d
 	doins ${FILESDIR}/${PVR}/10xfree
 	insinto /etc/X11/xinit
diff --git a/x11-base/xfree/xfree-4.2.0-r12.ebuild b/x11-base/xfree/xfree-4.2.0-r12.ebuild
index 0934d2f6d46c..6161bf14e1cb 100644
--- a/x11-base/xfree/xfree-4.2.0-r12.ebuild
+++ b/x11-base/xfree/xfree-4.2.0-r12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.0-r12.ebuild,v 1.21 2003/03/20 15:25:06 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.0-r12.ebuild,v 1.22 2003/09/07 07:27:40 msterret Exp $
 
 IUSE="sse nls mmx 3dnow 3dfx"
 
@@ -52,13 +52,13 @@ DEPEND=">=sys-libs/ncurses-5.1
 	sys-devel/flex
 	dev-lang/perl
 	3dfx? ( >=media-libs/glide-v3-3.10 )"
-	
+
 RDEPEND=">=sys-libs/ncurses-5.1
 	>=x11-base/opengl-update-1.3"
 
 PROVIDE="virtual/x11
 	virtual/opengl
-	virtual/glu"	
+	virtual/glu"
 
 src_unpack () {
 
@@ -165,14 +165,14 @@ src_compile() {
 		ln -s /usr/include/glide3/g3ext.h g3ext.h
 		cd ${S}
 	fi
-	
+
 	# 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
-	
+
 	emake World || die
 
 	if [ "`use nls`" ]
@@ -196,7 +196,7 @@ src_install() {
 	else
 		make install DESTDIR=${D} || die
 	fi
-	
+
 	make install.man DESTDIR=${D} || die
 
 	if [ "`use nls`" ]
diff --git a/x11-base/xfree/xfree-4.2.1-r2.ebuild b/x11-base/xfree/xfree-4.2.1-r2.ebuild
index ef9268f7c381..4f5809381aa9 100644
--- a/x11-base/xfree/xfree-4.2.1-r2.ebuild
+++ b/x11-base/xfree/xfree-4.2.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1-r2.ebuild,v 1.31 2003/09/07 02:25:28 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1-r2.ebuild,v 1.32 2003/09/07 07:27:40 msterret 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 ...
@@ -105,7 +105,7 @@ DEPEND=">=sys-apps/baselayout-1.8.3
 	>=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
@@ -119,7 +119,7 @@ PDEPEND="3dfx? ( >=media-libs/glide-v3-3.10 )"
 
 PROVIDE="virtual/x11
 	virtual/opengl
-	virtual/glu"	
+	virtual/glu"
 
 src_unpack() {
 
@@ -193,13 +193,13 @@ src_unpack() {
 	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:
@@ -213,7 +213,7 @@ src_unpack() {
 			${S}/programs/Xserver/hw/xfree86/input/wacom/xf86Wacom.c || die
 		eend 0
 	fi
-	
+
 	# Unpack the MS fonts
 	if [ -n "`use truetype`" ]
 	then
@@ -404,7 +404,7 @@ src_install() {
 
 	# Install example config file
 	newins ${S}/programs/Xserver/hw/xfree86/XF86Config XF86Config.example
-	
+
 	# Install MS fonts.
 	if [ -n "`use truetype`" ]
 	then
@@ -444,7 +444,7 @@ src_install() {
 	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
@@ -483,7 +483,7 @@ src_install() {
 				;;
 		esac
 	done
-	
+
 	exeinto /etc/X11
 	# new session management script
 	doexe ${FILESDIR}/${PVR}/chooser.sh
@@ -586,12 +586,12 @@ pkg_preinst() {
 	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
@@ -599,15 +599,15 @@ pkg_preinst() {
 		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
@@ -615,7 +615,7 @@ pkg_preinst() {
 		then
 			mkdir -p ${ROOT}/usr/X11R6/lib/X11
 		fi
-		
+
 	    mv -f ${ROOT}/etc/X11/xkb ${ROOT}/usr/X11R6/lib/X11
 	fi
 
@@ -654,7 +654,7 @@ update_XftConfig() {
 			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 \
@@ -674,9 +674,9 @@ pkg_postinst() {
 	if [ "${ROOT}" = "/" ]
 	then
 		local x=""
-		
+
 		umask 022
-	
+
 		if [ -x ${ROOT}/usr/bin/fc-cache ]
 		then
 			ebegin "Creating FC font cache..."
@@ -689,7 +689,7 @@ pkg_postinst() {
 
 		# ********************************************************************
 		#  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
@@ -721,7 +721,7 @@ pkg_postinst() {
 			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 \
@@ -734,13 +734,13 @@ pkg_postinst() {
 			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" \
@@ -768,7 +768,7 @@ pkg_postinst() {
 			fi
 		done
 		eend 0
-		
+
 		ebegin "Fixing permissions..."
 		find ${ROOT}/usr/X11R6/lib/X11/fonts/ -type f -name 'font.*' \
 			-exec chmod 0644 {} \;
@@ -806,7 +806,7 @@ pkg_postinst() {
 		then
 			mkdir -p ${x}
 		fi
-		
+
 		chown root:root ${x}
 		chmod 1777 ${x}
 	done
diff --git a/x11-base/xfree/xfree-4.3.0-r1.ebuild b/x11-base/xfree/xfree-4.3.0-r1.ebuild
index fb420bdfcaac..2987663c4075 100644
--- a/x11-base/xfree/xfree-4.3.0-r1.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r1.ebuild,v 1.19 2003/08/03 04:44:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r1.ebuild,v 1.20 2003/09/07 07:27:40 msterret 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 ...
@@ -119,7 +119,7 @@ DEPEND=">=sys-apps/baselayout-1.8.3
 	pam? ( >=sys-libs/pam-0.75 )
 	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/zlib-1.1.3-r2
@@ -136,7 +136,7 @@ PDEPEND=">=x11-libs/xft-2.0.1-r1
 
 PROVIDE="virtual/x11
 	virtual/opengl
-	virtual/glu"	
+	virtual/glu"
 
 #inherit needs to happen *after* DEPEND has been defined to have "newdepend"
 #do the right thing. Otherwise RDEPEND doesn't get set properly.
@@ -153,7 +153,7 @@ src_unpack() {
 	else
 		unpack X${MY_SV}src-{1,2,3,4,5,6,7}.tgz
 	fi
-	
+
 	unpack XFree86-4.2.99.4-patches-${PATCH_VER}.tar.bz2
 
 	if [ "`gcc-version`" = "2.95" ]
@@ -164,13 +164,13 @@ src_unpack() {
 	fi
 	# Various Patches from all over
 	epatch ${WORKDIR}/patch/
-	
+
 	unset EPATCH_EXCLUDE
-	
+
 	# enable the nv driver on ppc
 	if use ppc &> /dev/null
 	then
-		epatch ${FILESDIR}/${PV}-patches/XFree86-${PV}-enable-nv-on-ppc.patch 
+		epatch ${FILESDIR}/${PV}-patches/XFree86-${PV}-enable-nv-on-ppc.patch
 	fi
 
 	# Fix HOME and END keys to work in xterm, bug #15254
@@ -179,14 +179,14 @@ src_unpack() {
 	# Fix DRI related problems
 	cd ${S}/programs/Xserver/hw/xfree86/
 	epatch ${DISTDIR}/xfree86-dri-resume-v8.patch
-	
+
 	# Fix keyboard issue on sparc
 	if use sparc &> /dev/null
 	then
 		cd ${S}
 		epatch ${FILESDIR}/${PV}-patches/XFree86-${PV}-sparc-kb.patch
 	fi
-	
+
 	# 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).
@@ -196,7 +196,7 @@ src_unpack() {
 	ln -s ${S}/programs/Xserver/hw/xfree86/vbe/vbe.h \
 		${S}/programs/Xserver/hw/xfree86/drivers/savage
 	eend 0
-    
+
 	# Update the SIS Driver
 	ebegin "Updating SiS driver"
 	cd ${S}/programs/Xserver/hw/xfree86/drivers/sis
@@ -204,7 +204,7 @@ src_unpack() {
 	ln -s ${S}/programs/Xserver/hw/xfree86/vbe/vbe.h \
 		${S}/programs/Xserver/hw/xfree86/drivers/sis
 	eend 0
-    
+
 	# Update Wacom Driver, hopefully resolving bug #1632
 	# The kernel driver should prob also be updated, this can be
 	# found at:
@@ -218,7 +218,7 @@ src_unpack() {
 			${S}/programs/Xserver/hw/xfree86/input/wacom/xf86Wacom.c || die
 		eend 0
 	fi
-	
+
 	# Unpack the MS fonts
 	if [ -n "`use truetype`" ]
 	then
@@ -234,7 +234,7 @@ src_unpack() {
 		done
 		ebegin "Done unpacking Core Fonts"; eend 0
 	fi
-	
+
 	ebegin "Setting up config/cf/host.def"
 	cd ${S}; cp ${FILESDIR}/${PV}/site.def config/cf/host.def || die
 	echo "#define XVendorString \"Gentoo Linux (XFree86 ${PV}, revision ${PR})\"" \
@@ -312,9 +312,9 @@ src_unpack() {
 	fi
 
 	[ "${ARCH}" = "hppa" ] && echo "#define DoLoadableServer NO" >> config/cf/host.def
-	
+
 	echo "#define SharedLibXft NO" >> config/cf/host.def
-	
+
 	eend 0
 
 	# These are not included anymore as they are obsolete
@@ -441,7 +441,7 @@ src_install() {
 
 	# Install example config file
 	newins ${S}/programs/Xserver/hw/xfree86/XF86Config XF86Config.example
-	
+
 	# Install MS fonts.
 	if [ -n "`use truetype`" ]
 	then
@@ -506,7 +506,7 @@ src_install() {
 				;;
 		esac
 	done
-	
+
 	exeinto /etc/X11
 	# new session management script
 	doexe ${FILESDIR}/${PV}/chooser.sh
@@ -609,12 +609,12 @@ pkg_preinst() {
 	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
@@ -622,15 +622,15 @@ pkg_preinst() {
 		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
@@ -638,7 +638,7 @@ pkg_preinst() {
 		then
 			mkdir -p ${ROOT}/usr/X11R6/lib/X11
 		fi
-		
+
 	    mv -f ${ROOT}/etc/X11/xkb ${ROOT}/usr/X11R6/lib/X11
 	fi
 
@@ -677,7 +677,7 @@ update_XftConfig() {
 			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 \
@@ -697,15 +697,15 @@ pkg_postinst() {
 	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
@@ -737,7 +737,7 @@ pkg_postinst() {
 			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 \
@@ -750,13 +750,13 @@ pkg_postinst() {
 			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" \
@@ -784,7 +784,7 @@ pkg_postinst() {
 			fi
 		done
 		eend 0
-		
+
 		ebegin "Fixing permissions..."
 		find ${ROOT}/usr/X11R6/lib/X11/fonts/ -type f -name 'font.*' \
 			-exec chmod 0644 {} \;
@@ -832,7 +832,7 @@ pkg_postinst() {
 		then
 			mkdir -p ${x}
 		fi
-		
+
 		chown root:root ${x}
 		chmod 1777 ${x}
 	done
diff --git a/x11-base/xfree/xfree-4.3.0-r2.ebuild b/x11-base/xfree/xfree-4.3.0-r2.ebuild
index e7a50d6245fc..cfc90702ca5b 100644
--- a/x11-base/xfree/xfree-4.3.0-r2.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r2.ebuild,v 1.39 2003/09/07 00:51:49 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r2.ebuild,v 1.40 2003/09/07 07:27:40 msterret 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 ...
@@ -127,11 +127,11 @@ DEPEND=">=sys-apps/baselayout-1.8.3
 	app-arch/unzip
 	pam? ( >=sys-libs/pam-0.75 )
 	truetype? ( !bindist? ( app-arch/cabextract ) )
-	!x11-libs/xft" 
+	!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
@@ -165,10 +165,10 @@ src_unpack() {
 	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).
@@ -189,7 +189,7 @@ src_unpack() {
 		${S}/programs/Xserver/hw/xfree86/drivers/sis
 	cd ${S}
 	eend 0
-    
+
 #	ebegin "Updating Matrox HAL driver"
 #	unpack mga-${MGADRV_VER}.tgz
 #	touch ${WORKDIR}/mga/HALlib/mgaHALlib.a
@@ -221,13 +221,13 @@ src_unpack() {
 
 	# Various Patches from all over
 	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/patch/
-	
+
 	unset EPATCH_EXCLUDE
-	
+
 	# Fix DRI related problems
 	cd ${S}/programs/Xserver/hw/xfree86/
 	epatch ${DISTDIR}/xfree86-dri-resume-v8.patch
-	
+
 	# Update Wacom Driver, hopefully resolving bug #1632
 	# The kernel driver should prob also be updated, this can be
 	# found at:
@@ -241,7 +241,7 @@ src_unpack() {
 			${S}/programs/Xserver/hw/xfree86/input/wacom/xf86Wacom.c || die
 		eend 0
 	fi
-	
+
 	# Unpack the MS fonts
 	if [ -n "`use truetype`" -a -z "`use bindist`" ]
 	then
@@ -257,7 +257,7 @@ src_unpack() {
 		done
 		ebegin "Done unpacking Core Fonts"; eend 0
 	fi
-	
+
 	ebegin "Setting up config/cf/host.def"
 	cd ${S}; cp ${FILESDIR}/${PV}/site.def config/cf/host.def || die
 	echo "#define XVendorString \"Gentoo Linux (XFree86 ${PV}, revision ${PR})\"" \
@@ -393,7 +393,7 @@ src_unpack() {
 
 	# 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
@@ -447,7 +447,7 @@ src_unpack() {
 	bzcat ${DISTDIR}/XFree86-locale.alias.bz2 > nls/locale.alias
 	bzcat ${DISTDIR}/XFree86-locale.dir.bz2 > nls/locale.dir
 	bzcat ${DISTDIR}/XFree86-en_US.UTF-8.old.bz2 > nls/Compose/en_US.UTF-8
-	
+
 	if use doc
 	then
 		# These are not included anymore as they are obsolete
@@ -572,7 +572,7 @@ src_install() {
 
 	# Install example config file
 	newins ${S}/programs/Xserver/hw/xfree86/XF86Config XF86Config.example
-	
+
 	# Install MS fonts.
 	if [ -n "`use truetype`" -a -z "`use bindist`" ]
 	then
@@ -651,7 +651,7 @@ src_install() {
 				;;
 		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
@@ -667,7 +667,7 @@ src_install() {
 	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}
@@ -684,7 +684,7 @@ src_install() {
 		cp -a ${WORKDIR}/ukr ${D}/usr/X11R6/lib/X11/fonts
 		eend 0
 	fi
-	
+
 	exeinto /etc/X11
 	# new session management script
 	doexe ${FILESDIR}/${PV}/chooser.sh
@@ -799,12 +799,12 @@ pkg_preinst() {
 	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
@@ -812,15 +812,15 @@ pkg_preinst() {
 		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
@@ -828,7 +828,7 @@ pkg_preinst() {
 		then
 			mkdir -p ${ROOT}/usr/X11R6/lib/X11
 		fi
-		
+
 	    mv -f ${ROOT}/etc/X11/xkb ${ROOT}/usr/X11R6/lib/X11
 	fi
 
@@ -867,7 +867,7 @@ update_XftConfig() {
 			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 \
@@ -887,15 +887,15 @@ pkg_postinst() {
 	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
@@ -927,7 +927,7 @@ pkg_postinst() {
 			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 \
@@ -940,13 +940,13 @@ pkg_postinst() {
 			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" \
@@ -974,7 +974,7 @@ pkg_postinst() {
 			fi
 		done
 		eend 0
-		
+
 		ebegin "Fixing permissions..."
 		find ${ROOT}/usr/X11R6/lib/X11/fonts/ -type f -name 'font.*' \
 			-exec chmod 0644 {} \;
@@ -1025,7 +1025,7 @@ pkg_postinst() {
 		then
 			mkdir -p ${x}
 		fi
-		
+
 		chown root:root ${x}
 		chmod 1777 ${x}
 	done
diff --git a/x11-base/xfree/xfree-4.3.0-r3.ebuild b/x11-base/xfree/xfree-4.3.0-r3.ebuild
index 00364a6981c3..9e25f928d63c 100644
--- a/x11-base/xfree/xfree-4.3.0-r3.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r3.ebuild,v 1.45 2003/09/07 00:48:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r3.ebuild,v 1.46 2003/09/07 07:27:40 msterret 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 ...
@@ -131,11 +131,11 @@ DEPEND=">=sys-apps/baselayout-1.8.3
 	app-arch/unzip
 	pam? ( >=sys-libs/pam-0.75 )
 	truetype? ( app-arch/cabextract )
-	!x11-libs/xft" 
+	!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
@@ -171,10 +171,10 @@ src_unpack() {
 	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).
@@ -201,13 +201,13 @@ src_unpack() {
 	tar -zxf ${DISTDIR}/synaptics-${SYNDRV_VER}.tar.gz || die
 	cd ${S}
 	eend 0
-    
+
 #	ebegin "Adding VIA driver"
 #	cd ${WORKDIR}
 #	unpack XFree86-${PV}-drivers-via-${VIADRV_VER}.tar.bz2
 #	cd ${S}
 #	eend 0
-	
+
 #	ebegin "Updating Matrox HAL driver"
 #	unpack mga-${MGADRV_VER}.tgz
 #	touch ${WORKDIR}/mga/HALlib/mgaHALlib.a
@@ -254,9 +254,9 @@ src_unpack() {
 
 	# Various Patches from all over
 	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
@@ -266,7 +266,7 @@ src_unpack() {
 	# Fix DRI related problems
 	cd ${S}/programs/Xserver/hw/xfree86/
 	epatch ${DISTDIR}/xfree86-dri-resume-v8.patch
-	
+
 	# Update Wacom Driver, hopefully resolving bug #1632
 	# The kernel driver should prob also be updated, this can be
 	# found at:
@@ -280,7 +280,7 @@ src_unpack() {
 			${S}/programs/Xserver/hw/xfree86/input/wacom/xf86Wacom.c || die
 		eend 0
 	fi
-	
+
 	# Unpack the MS fonts
 	if use truetype
 	then
@@ -296,10 +296,10 @@ src_unpack() {
 		done
 		ebegin "Done unpacking Core Fonts"; eend 0
 	fi
-	
+
 	# Fix broken makefiles for -fPIC problem -- see bug #23581
 	mkdir -p ${S}/exports/lib
-	
+
 	ebegin "Setting up config/cf/host.def"
 	cd ${S}; cp ${FILESDIR}/${PV}/site.def config/cf/host.def || die
 	echo "#define XVendorString \"Gentoo Linux (XFree86 ${PV}, revision ${PR})\"" \
@@ -458,7 +458,7 @@ src_unpack() {
 
 	# 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
@@ -517,7 +517,7 @@ src_unpack() {
 	bzcat ${DISTDIR}/XFree86-locale.alias.bz2 > nls/locale.alias
 	bzcat ${DISTDIR}/XFree86-locale.dir.bz2 > nls/locale.dir
 	bzcat ${DISTDIR}/XFree86-en_US.UTF-8.old.bz2 > nls/Compose/en_US.UTF-8
-	
+
 	if use doc
 	then
 		# These are not included anymore as they are obsolete
@@ -649,7 +649,7 @@ src_install() {
 
 	# Install example config file
 	newins ${S}/programs/Xserver/hw/xfree86/XF86Config XF86Config.example
-	
+
 	# Install MS fonts.
 	if use truetype
 	then
@@ -730,7 +730,7 @@ src_install() {
 				;;
 		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
@@ -746,7 +746,7 @@ src_install() {
 	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}
@@ -763,7 +763,7 @@ src_install() {
 		cp -a ${WORKDIR}/ukr ${D}/usr/X11R6/lib/X11/fonts
 		eend 0
 	fi
-	
+
 	exeinto /etc/X11
 	# new session management script
 	doexe ${FILESDIR}/${PV}/chooser.sh
@@ -888,12 +888,12 @@ pkg_preinst() {
 	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
@@ -901,15 +901,15 @@ pkg_preinst() {
 		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
@@ -917,7 +917,7 @@ pkg_preinst() {
 		then
 			mkdir -p ${ROOT}/usr/X11R6/lib/X11
 		fi
-		
+
 	    mv -f ${ROOT}/etc/X11/xkb ${ROOT}/usr/X11R6/lib/X11
 	fi
 
@@ -956,7 +956,7 @@ update_XftConfig() {
 			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 \
@@ -976,15 +976,15 @@ pkg_postinst() {
 	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
@@ -1016,7 +1016,7 @@ pkg_postinst() {
 			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 \
@@ -1029,13 +1029,13 @@ pkg_postinst() {
 			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" \
@@ -1063,7 +1063,7 @@ pkg_postinst() {
 			fi
 		done
 		eend 0
-		
+
 		ebegin "Fixing permissions..."
 		find ${ROOT}/usr/X11R6/lib/X11/fonts/ -type f -name 'font.*' \
 			-exec chmod 0644 {} \;
@@ -1114,7 +1114,7 @@ pkg_postinst() {
 		then
 			mkdir -p ${x}
 		fi
-		
+
 		chown root:root ${x}
 		chmod 1777 ${x}
 	done
@@ -1144,7 +1144,7 @@ pkg_postinst() {
 	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 
+	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 settingse"
diff --git a/x11-base/xfree/xfree-4.3.99.10.ebuild b/x11-base/xfree/xfree-4.3.99.10.ebuild
index 81e4b22e99bb..5b952f8ff430 100644
--- a/x11-base/xfree/xfree-4.3.99.10.ebuild
+++ b/x11-base/xfree/xfree-4.3.99.10.ebuild
@@ -393,7 +393,7 @@ src_unpack() {
 
 	# 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
@@ -687,7 +687,7 @@ src_install() {
 		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
@@ -810,12 +810,12 @@ pkg_preinst() {
 	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
@@ -823,15 +823,15 @@ pkg_preinst() {
 		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
@@ -839,7 +839,7 @@ pkg_preinst() {
 		then
 			mkdir -p ${ROOT}/usr/X11R6/lib/X11
 		fi
-		
+
 	    mv -f ${ROOT}/etc/X11/xkb ${ROOT}/usr/X11R6/lib/X11
 	fi
 
@@ -878,7 +878,7 @@ update_XftConfig() {
 			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 \
@@ -898,15 +898,15 @@ pkg_postinst() {
 	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
@@ -938,7 +938,7 @@ pkg_postinst() {
 			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 \
@@ -951,13 +951,13 @@ pkg_postinst() {
 			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" \
@@ -985,7 +985,7 @@ pkg_postinst() {
 			fi
 		done
 		eend 0
-		
+
 		ebegin "Fixing permissions..."
 		find ${ROOT}/usr/X11R6/lib/X11/fonts/ -type f -name 'font.*' \
 			-exec chmod 0644 {} \;
@@ -1036,7 +1036,7 @@ pkg_postinst() {
 		then
 			mkdir -p ${x}
 		fi
-		
+
 		chown root:root ${x}
 		chmod 1777 ${x}
 	done
diff --git a/x11-base/xfree/xfree-4.3.99.11.ebuild b/x11-base/xfree/xfree-4.3.99.11.ebuild
index dc6d279961ea..35f542b76c77 100644
--- a/x11-base/xfree/xfree-4.3.99.11.ebuild
+++ b/x11-base/xfree/xfree-4.3.99.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.99.11.ebuild,v 1.3 2003/09/07 01:57:11 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.99.11.ebuild,v 1.4 2003/09/07 07:27:40 msterret 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 ...
@@ -199,7 +199,7 @@ src_unpack() {
 	# The 0120 patch is broken, the 0127 may also be broken.
 	mv -f ${PATCH_DIR}/0120*parallel-make* ${PATCH_DIR}/excluded
 	mv -f ${PATCH_DIR}/0127*makefile-fastbuild* ${PATCH_DIR}/excluded
-	
+
 	if use debug
 	then
 		mv -f ${PATCH_DIR}/5901*acecad-debug* ${PATCH_DIR}/excluded
@@ -396,7 +396,7 @@ src_unpack() {
 
 	# 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
@@ -694,7 +694,7 @@ src_install() {
 		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
@@ -817,12 +817,12 @@ pkg_preinst() {
 	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
@@ -830,15 +830,15 @@ pkg_preinst() {
 		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
@@ -846,7 +846,7 @@ pkg_preinst() {
 		then
 			mkdir -p ${ROOT}/usr/X11R6/lib/X11
 		fi
-		
+
 	    mv -f ${ROOT}/etc/X11/xkb ${ROOT}/usr/X11R6/lib/X11
 	fi
 
@@ -885,7 +885,7 @@ update_XftConfig() {
 			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 \
@@ -905,15 +905,15 @@ pkg_postinst() {
 	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
@@ -945,7 +945,7 @@ pkg_postinst() {
 			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 \
@@ -959,13 +959,13 @@ pkg_postinst() {
 			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" \
@@ -993,7 +993,7 @@ pkg_postinst() {
 			fi
 		done
 		eend 0
-		
+
 		ebegin "Fixing permissions..."
 		find ${ROOT}/usr/X11R6/lib/X11/fonts/ -type f -name 'font.*' \
 			-exec chmod 0644 {} \;
@@ -1044,7 +1044,7 @@ pkg_postinst() {
 		then
 			mkdir -p ${x}
 		fi
-		
+
 		chown root:root ${x}
 		chmod 1777 ${x}
 	done
diff --git a/x11-base/xfree/xfree-4.3.99.9.ebuild b/x11-base/xfree/xfree-4.3.99.9.ebuild
index e340ee4e4f35..9ec3df685b74 100644
--- a/x11-base/xfree/xfree-4.3.99.9.ebuild
+++ b/x11-base/xfree/xfree-4.3.99.9.ebuild
@@ -202,13 +202,13 @@ then
 		${S}/programs/Xserver/hw/xfree86/drivers/sis
 	cd ${S}
 	eend 0
-    
+
 	ebegin "Adding VIA driver"
 	cd ${WORKDIR}
 	unpack XFree86-${PV}-drivers-via-${VIADRV_VER}.tar.bz2
 	cd ${S}
 	eend 0
-	
+
 #	ebegin "Updating Matrox HAL driver"
 #	unpack mga-${MGADRV_VER}.tgz
 #	touch ${WORKDIR}/mga/HALlib/mgaHALlib.a
@@ -269,7 +269,7 @@ then
 		eend 0
 	fi
 fi
-	
+
 	# Unpack the MS fonts
 	if [ -n "`use truetype`" ]
 	then
@@ -285,7 +285,7 @@ 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})\"" \
@@ -428,7 +428,7 @@ fi
 
 	# 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
@@ -608,7 +608,7 @@ src_install() {
 
 	# Install example config file
 	newins ${S}/programs/Xserver/hw/xfree86/XF86Config XF86Config.example
-	
+
 	# Install MS fonts.
 	if [ -n "`use truetype`" ]
 	then
@@ -684,7 +684,7 @@ src_install() {
 				;;
 		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
@@ -700,7 +700,7 @@ src_install() {
 	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}
@@ -717,7 +717,7 @@ src_install() {
 		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
@@ -832,12 +832,12 @@ pkg_preinst() {
 	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
@@ -845,15 +845,15 @@ pkg_preinst() {
 		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
@@ -861,7 +861,7 @@ pkg_preinst() {
 		then
 			mkdir -p ${ROOT}/usr/X11R6/lib/X11
 		fi
-		
+
 	    mv -f ${ROOT}/etc/X11/xkb ${ROOT}/usr/X11R6/lib/X11
 	fi
 
@@ -900,7 +900,7 @@ update_XftConfig() {
 			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 \
@@ -920,15 +920,15 @@ pkg_postinst() {
 	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
@@ -960,7 +960,7 @@ pkg_postinst() {
 			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 \
@@ -973,13 +973,13 @@ pkg_postinst() {
 			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" \
@@ -1007,7 +1007,7 @@ pkg_postinst() {
 			fi
 		done
 		eend 0
-		
+
 		ebegin "Fixing permissions..."
 		find ${ROOT}/usr/X11R6/lib/X11/fonts/ -type f -name 'font.*' \
 			-exec chmod 0644 {} \;
@@ -1058,7 +1058,7 @@ pkg_postinst() {
 		then
 			mkdir -p ${x}
 		fi
-		
+
 		chown root:root ${x}
 		chmod 1777 ${x}
 	done
@@ -1088,7 +1088,7 @@ pkg_postinst() {
 	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 
+	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"