QA: Apply whitespace checks from repoman to eclasses.

107 files changed, 946 insertions, 988 deletions

diff --git a/eclass/64-bit.eclass b/eclass/64-bit.eclass
index f3abd2d233a0..3444bf5c7f29 100644
--- a/eclass/64-bit.eclass
+++ b/eclass/64-bit.eclass
@@ -1,15 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/64-bit.eclass,v 1.6 2005/05/05 02:58:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/64-bit.eclass,v 1.7 2005/07/11 15:08:06 swegener Exp $
 
 # Recognize 64-bit arches...
 # Example:
 #      64-bit && epatch ${P}-64bit.patch
-# 
+#
+
 64-bit() {
 	[[ ${PN} != "R" && ${PN} != "rxvt-unicode" ]] && die "DO NOT USE THIS ECLASS"
 
-	case "${ARCH}" in 
+	case "${ARCH}" in
 		alpha|*64) return 0 ;;
 		*)         return 1 ;;
 	esac
diff --git a/eclass/alternatives.eclass b/eclass/alternatives.eclass
index e25f7d769c2a..e5cbcffa2dfd 100644
--- a/eclass/alternatives.eclass
+++ b/eclass/alternatives.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/alternatives.eclass,v 1.11 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/alternatives.eclass,v 1.12 2005/07/11 15:08:06 swegener Exp $
 
 # Author :     Alastair Tse <liquidx@gentoo.org> (03 Oct 2003)
 # Short Desc:  Creates symlink to the latest version of multiple slotted
@@ -12,18 +12,18 @@
 #  latest version. However, depending on the order the user has merged them,
 #  more often than not, the symlink maybe clobbered by the older versions.
 #
-#  This eclass provides a convenience function that needs to be given a 
+#  This eclass provides a convenience function that needs to be given a
 #  list of alternatives (descending order of recent-ness) and the symlink.
 #  It will choose the latest version if can find installed and create
-#  the desired symlink. 
+#  the desired symlink.
 #
-#  There are two ways to use this eclass. First is by declaring two variables 
-#  $SOURCE and $ALTERNATIVES where $SOURCE is the symlink to be created and 
+#  There are two ways to use this eclass. First is by declaring two variables
+#  $SOURCE and $ALTERNATIVES where $SOURCE is the symlink to be created and
 #  $ALTERNATIVES is a list of alternatives. Second way is the use the function
 #  alternatives_makesym() like the example below.
 #
 # Example:
-#  
+#
 #  pkg_postinst() {
 #      alternatives_makesym "/usr/bin/python" "/usr/bin/python2.3" "/usr/bin/python2.2"
 #  }
@@ -37,18 +37,18 @@
 #  pkg_postinst() {
 #     alternatives_auto_makesym "/usr/bin/python" "/usr/bin/python[0-9].[0-9]"
 #  }
-# 
+#
 #  This will use bash pathname expansion to fill a list of alternatives it can
 #  link to. It is probably more robust against version upgrades. You should
 #  consider using this unless you are want to do something special.
-# 
+#
 
 # automatic deduction based on a symlink and a regex mask
 alternatives_auto_makesym() {
 	local SYMLINK REGEX ALT myregex
 	SYMLINK=$1
 	REGEX=$2
-	if [ "${REGEX:0:1}" != "/" ] 
+	if [ "${REGEX:0:1}" != "/" ]
 	then
 		#not an absolute path:
 		#inherit the root directory of our main link path for our regex search
@@ -68,7 +68,7 @@ alternatives_makesym() {
 	local ALTERNATIVES=""
 	local SYMLINK=""
 	local alt pref
-	
+
 	# usage: alternatives_makesym <resulting symlink> [alternative targets..]
 	SYMLINK=$1
 	# this trick removes the trailing / from ${ROOT}
@@ -78,7 +78,7 @@ alternatives_makesym() {
 
 	# step through given alternatives from first to last
 	# and if one exists, link it and finish.
-	
+
 	for alt in ${ALTERNATIVES}; do
 		if [ -f "${pref}${alt}" ]; then
 			#are files in same directory?
@@ -95,7 +95,7 @@ alternatives_makesym() {
 			break
 		fi
 	done
-	
+
 	# report any errors
 	if [ ! -L ${pref}${SYMLINK} ]; then
 		ewarn "Unable to establish ${pref}${SYMLINK} symlink"
@@ -106,13 +106,13 @@ alternatives_makesym() {
 			 ! -f "`readlink ${pref}${SYMLINK}`" ]; then
 			ewarn "${pref}${SYMLINK} is a dead symlink."
 		fi
-	fi		
-}		
+	fi
+}
 
 alternatives_pkg_postinst() {
 	if [ -n "${ALTERNATIVES}" -a -n "${SOURCE}" ]; then
 		alternatives_makesym ${SOURCE} ${ALTERNATIVES}
-	fi		
+	fi
 }
 
 alternatives_pkg_postrm() {
@@ -122,4 +122,3 @@ alternatives_pkg_postrm() {
 }
 
 EXPORT_FUNCTIONS pkg_postinst pkg_postrm
-
diff --git a/eclass/aolserver.eclass b/eclass/aolserver.eclass
index d3177abf42a5..e23cd7962fbc 100644
--- a/eclass/aolserver.eclass
+++ b/eclass/aolserver.eclass
@@ -1,13 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/aolserver.eclass,v 1.7 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/aolserver.eclass,v 1.8 2005/07/11 15:08:06 swegener Exp $
 
 # Authors:
 #	Ian Leitch <port001@gentoo.org>
 
+EXPORT_FUNCTIONS src_compile src_install pkg_postinst
 
-DEPEND="$DEPEND www-servers/aolserver"
-RDEPEND="$RDEPEND www-servers/aolserver"
+DEPEND="www-servers/aolserver"
+RDEPEND="${DEPEND}"
 
 NS_CONF="/usr/share/aolserver" # /include/ is implied by the Makefile
 NS_BASE="/usr/lib/aolserver"
@@ -17,12 +18,12 @@ HOMEPAGE="http://www.aolserver.com"
 LICENSE="MPL-1.1"
 SLOT="0"
 
-src_compile() {
+aolserver_src_compile() {
 
 	emake NSBUILD=1 INST=${NS_CONF} AOLSERVER=${NS_CONF} ${MAKE_FLAGS} || die "emake failed"
 }
 
-src_install() {
+aolserver_src_install() {
 
 	find ${S} -type d -name CVS -prune | xargs rm -rf
 
@@ -46,7 +47,7 @@ src_install() {
 	done
 }
 
-pkg_postinst() {
+aolserver_pkg_postinst() {
 
 	echo
 	einfo "To enable the use of ${PN} you must add the module to your AOLServer configuration"
diff --git a/eclass/apache-module.eclass b/eclass/apache-module.eclass
index 9a81a1154027..2ee4df33f969 100644
--- a/eclass/apache-module.eclass
+++ b/eclass/apache-module.eclass
@@ -1,7 +1,7 @@
 # Copyright 2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Michael Tindal <urilith@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/apache-module.eclass,v 1.11 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/apache-module.eclass,v 1.12 2005/07/11 15:08:06 swegener Exp $
 
 inherit depend.apache
 
@@ -162,9 +162,9 @@ apache1_src_compile() {
 ## this function can also set the executable permission on files listed in EXECFILES.
 ## The configuration file name is listed in APACHE1_MOD_CONF without the .conf extensions,
 ## so if you configuration is 55_mod_foo.conf, APACHE1_MOD_CONF would be 55_mod_foo.
-## DOCFILES contains the list of files you want filed as documentation. The name of the 
+## DOCFILES contains the list of files you want filed as documentation. The name of the
 ## module can also be specified using the APACHE1_MOD_FILE or defaults to
-## .libs/${PN}.so. 
+## .libs/${PN}.so.
 ####
 apache1_src_install() {
 	debug-print-function apache1_src_install
@@ -182,7 +182,7 @@ apache1_src_install() {
 		insinto ${APACHE1_MODULES_CONFDIR}
 		doins ${FILESDIR}/${APACHE1_MOD_CONF}.conf || die "internal ebuild error: '${FILESDIR}/${APACHE1_MOD_CONF}.conf' not found."
 	fi
-	
+
 	cd ${S}
 
 	if [ -n "${DOCFILES}" ] ; then
@@ -251,7 +251,7 @@ apache2_pkg_setup() {
 	fi
 
 }
-				
+
 ####
 ## apache2_src_compile
 ##
@@ -337,7 +337,7 @@ apache2_pkg_postinst() {
 		else
 			INSTALLED_MPM_SAFE="${INSTALLED_MPM_SAFE} ${mpm}"
 		fi
-		
+
 		if [ -n "${INSTALLED_MPM_UNSAFE}" ] ; then
 			ewarn "You have one or more MPMs installed that will not work with"
 			ewarn "this module (${PN}). Please make sure that you only enable"
@@ -347,7 +347,6 @@ apache2_pkg_postinst() {
 
 	fi
 
-	
 }
 
 ######
diff --git a/eclass/aspell-dict.eclass b/eclass/aspell-dict.eclass
index 997f02b212d8..275ac74be421 100644
--- a/eclass/aspell-dict.eclass
+++ b/eclass/aspell-dict.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/aspell-dict.eclass,v 1.33 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/aspell-dict.eclass,v 1.34 2005/07/11 15:08:06 swegener Exp $
 #
 # Author: Seemant Kulleen <seemant@gentoo.org>
 #
@@ -26,11 +26,11 @@ SLOT="0"
 if [ x${ASPOSTFIX} = x6 ] ; then
 	RDEPEND=">=app-text/aspell-0.60
 		sys-apps/which"
-        KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+	KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 else
 	RDEPEND=">=app-text/aspell-0.50
 		sys-apps/which"
-        KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64"
+	KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64"
 fi
 
 PROVIDE="virtual/aspell-dict"
diff --git a/eclass/base.eclass b/eclass/base.eclass
index 6bfb021362c4..9d77ea343738 100644
--- a/eclass/base.eclass
+++ b/eclass/base.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.26 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.27 2005/07/11 15:08:06 swegener Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 #
@@ -50,7 +50,7 @@ base_src_unpack() {
 
 	shift
 	done
-    
+
 }
 
 base_src_compile() {
@@ -76,10 +76,10 @@ base_src_compile() {
 		base_src_compile configure make
 		;;
 	esac
-	
+
 	shift
 	done
-    
+
 }
 
 base_src_install() {
diff --git a/eclass/bash-completion.eclass b/eclass/bash-completion.eclass
index d8434ae57f0c..02f103b32b44 100644
--- a/eclass/bash-completion.eclass
+++ b/eclass/bash-completion.eclass
@@ -1,21 +1,20 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v 1.14 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v 1.15 2005/07/11 15:08:06 swegener Exp $
 #
 # Simple eclass that provides an interface for installing
 # contributed (ie not included in bash-completion proper)
 # bash-completion scripts.
 #
 # Author: Aaron Walker <ka0ttic@gentoo.org>
-# 
+#
 # Please assign any bug reports to shell-tools@gentoo.org.
 
 EXPORT_FUNCTIONS pkg_postinst
 
-IUSE="${IUSE} bash-completion"
+IUSE="bash-completion"
 
-RDEPEND="${RDEPEND}
-	bash-completion? ( app-shells/bash-completion-config )"
+RDEPEND="bash-completion? ( app-shells/bash-completion-config )"
 
 # dobashcompletion <file> <new file>
 #	First arg, <file>, is required and is the location of the bash-completion
diff --git a/eclass/ccc.eclass b/eclass/ccc.eclass
index 431f0f750957..cc68199b7d29 100644
--- a/eclass/ccc.eclass
+++ b/eclass/ccc.eclass
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ccc.eclass,v 1.17 2005/07/06 20:23:20 agriffis Exp $
-# 
+# $Header: /var/cvsroot/gentoo-x86/eclass/ccc.eclass,v 1.18 2005/07/11 15:08:06 swegener Exp $
+#
 # Authors:	Tavis Ormandy <taviso@gentoo.org>
 #			Aron Griffis <agriffis@gentoo.org>
 #
 # functions to make ebuilds more ccc friendly.
-# 
+#
 # 16/6/2003 - Added otsify()
 # 18/6/2003 - regex tweaks.
 # 22/7/2003 - newdepend
@@ -23,9 +23,9 @@ inherit flag-o-matic
 # supported equivalent.
 #
 # you might see an error like this if you need this:
-# 	
-# 	cc: Error: regexec.c, line 209: In the definition of the function "regexec", 
-# 	the promoted type of pmatch is incompatible with the type of the corresponding 
+#
+# 	cc: Error: regexec.c, line 209: In the definition of the function "regexec",
+# 	the promoted type of pmatch is incompatible with the type of the corresponding
 # 	parameter in a prior declaration. (promotmatch)
 # 	    regmatch_t pmatch[];
 # 	    ---------------^
@@ -42,12 +42,12 @@ inherit flag-o-matic
 # example:
 #
 # 	is-ccc && hide-restrict-arr
-# 	
+#
 #### is-cxx ####
 # Returns success if dec c++ compiler is being used.
 #
 #### replace-ccc-g ####
-# Try to replace -g with -g3 
+# Try to replace -g with -g3
 #
 #### ccc-elf-check </path/to/binary> ####
 # Return success if binary was compiled with ccc
@@ -62,16 +62,16 @@ inherit flag-o-matic
 # 		is pretty safe, but the archive detection may not
 # 		be as reliable.
 #### create-so </usr/lib/library.a> <library.so> ####
-# Make the shared library (.so) specified from the archive (.a) 
-# specified. LDFLAGS will be honoured. if you need a different 
-# `soname` (DT_SONAME) from the shared lib filename, you will have 
+# Make the shared library (.so) specified from the archive (.a)
+# specified. LDFLAGS will be honoured. if you need a different
+# `soname` (DT_SONAME) from the shared lib filename, you will have
 # to do it manually ;)
 #
 # example:
 # 	is-ccc && \
 # 		create-so /usr/lib/libcoolstuff.a libcoolstuff.so.${PV}
 # 	dosym /usr/lib/libcoolstuff.so.${PV} /usr/lib/libcoolstuff.so
-#	
+#
 # NOTE: -lots will be used by default, this is ccc.eclass after all :)
 # NOTE: .${PV} is optional, of course.
 # NOTE: dolib.so will manage installation
@@ -98,19 +98,19 @@ inherit flag-o-matic
 
 ccc-fixup()
 {
-	# helper function to fixup files                                                              
-	# and show differences when debugging                                                         
+	# helper function to fixup files
+	# and show differences when debugging
 	#
 	# store the backup suffix.
-	local files list suffix=ccc-fixup-${$} 
-	
+	local files list suffix=ccc-fixup-${$}
+
 	while read files
 	do
 		sed --in-place=.${suffix} ${1} ${files} || return 1
 		list="${list} ${files}"
 	done
-	
-	[ ! "$DEBUG_CCC_ECLASS" ] && return 0	
+
+	[ ! "$DEBUG_CCC_ECLASS" ] && return 0
 	# if theres a backup, diff it.
 	for i in ${list}
 	do
@@ -129,7 +129,7 @@ hide-restrict-arr()
 	#
 	# example:
 	#           regmatch_t __pmatch[__restrict_arr]
-	#           
+	#
 
 	find ${WORKDIR} -iname '*.h' | \
 		xargs | ccc-fixup 's#\(\[__restrict\)_arr\]#\1\]#g'
@@ -189,7 +189,7 @@ ccc-elf-check()
 		grep -E '^\ [0-9]{2,}\ .note\ ' | \
 			awk '{print $6,$3}' | \
 			line`
-		# check if that got anything. 
+		# check if that got anything.
 		[ ! "${elf_note_offset}" ] && return 1
 		# dump contents of section, and check for compaq signature.
 		hexdump -s 0x${elf_note_offset% *} -n $((0x${elf_note_offset#* })) -e '"%_p"' ${myBINARY} | \
@@ -217,7 +217,7 @@ create-so()
 		${LD:-ld} -shared -o ${T}/${2##*/} -soname `basename ${2/${so_version}}` \
 				-whole-archive ${1} -no-whole-archive -lots ${LDFLAGS}
 	fi
-	# hand installation over to dolib.so 
+	# hand installation over to dolib.so
 	dolib.so ${T}/${2##*/}
 }
 
@@ -227,7 +227,7 @@ append-ldflags()
 }
 
 # flag-o-matic clone
-# 
+#
 #is-ldflags()
 #{
 #	for x in ${LDFLAGS}
@@ -262,29 +262,29 @@ filter-ldflags()
 otsify()
 {
 	[ "$DEBUG_CCC_ECLASS" ] && local ar_args="v"
-	
+
 	# confirm argument exists, and is an archive (eg *.a)
-	# if it is, extract libots members into tempdir, then 
+	# if it is, extract libots members into tempdir, then
 	# append them to argument, regenerate index and then return.
-	
+
 	if [ "${1##*.}" == "a" ] && [ -f "${1}" ]; then
 		einfo "otsifying `basename ${1}` ..."
-		
+
 		mkdir ${T}/ccc-otsify-${$}
 		cd ${T}/ccc-otsify-${$}
-		
+
 		einfo "	extracting archive members from libots ..."
 		ar ${ar_args}x /usr/lib/libots.a || {
 			eerror "	unable to extract libots members."
 			return 1
 		}
-		
+
 		einfo "	appending libots members to `basename ${1}` ..."
 		ar ${ar_args}q ${1} ${T}/ccc-otsify-${$}/*.o || {
 			eerror "	failed to append libots members to ${1}."
 			return 1
 		}
-		
+
 		einfo  "	regenerating `basename ${1}` archive index ..."
 		ranlib ${1} || ewarn "	ranlib returned an error, probably not important."
 		einfo "otsification completed succesfully."
diff --git a/eclass/check-kernel.eclass b/eclass/check-kernel.eclass
index 5e78855b2835..c2fbe0380292 100644
--- a/eclass/check-kernel.eclass
+++ b/eclass/check-kernel.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/check-kernel.eclass,v 1.7 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/check-kernel.eclass,v 1.8 2005/07/11 15:08:06 swegener Exp $
 
 # Author: Martin Schlemmer <azarah@gentoo.org>
 # Eclass'd by: Seemant Kulleen <seemant@gentoo.org>
@@ -37,7 +37,7 @@ get_KV_info() {
 
 is_2_4_kernel() {
 	get_KV_info
-	
+
 	if [ "${KV_major}" -eq 2 -a "${KV_minor}" -eq 4 ]
 	then
 		return 0
@@ -48,7 +48,7 @@ is_2_4_kernel() {
 
 is_2_5_kernel() {
 	get_KV_info
-	
+
 	if [ "${KV_major}" -eq 2 -a "${KV_minor}" -eq 5 ]
 	then
 		return 0
diff --git a/eclass/common-lisp.eclass b/eclass/common-lisp.eclass
index e7cebbc99ca0..35408d6f340b 100644
--- a/eclass/common-lisp.eclass
+++ b/eclass/common-lisp.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/common-lisp.eclass,v 1.12 2005/07/11 12:40:25 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/common-lisp.eclass,v 1.13 2005/07/11 15:08:06 swegener Exp $
 #
 # Author Matthew Kennedy <mkennedy@gentoo.org>
 #
@@ -12,7 +12,7 @@ inherit common-lisp-common
 CLPACKAGE=
 DEPEND="dev-lisp/common-lisp-controller"
 
-EXPORT_FUNCTIONS pkg_postinst pkg_postrm
+EXPORT_FUNCTIONS pkg_preinst pkg_postinst pkg_postrm
 
 common-lisp_pkg_postinst() {
 	if [ -z "${CLPACKAGE}" ]; then
@@ -43,7 +43,7 @@ common-lisp_pkg_postrm() {
 # In pkg_preinst, we remove the FASL files for the previous version of
 # the source.
 #
-pkg_preinst() {
+common-lisp_pkg_preinst() {
 	if [ -z "${CLPACKAGE}" ]; then
 		die "CLPACKAGE was empty or undefined upon call to pkg_preinst"
 	else
diff --git a/eclass/commonbox.eclass b/eclass/commonbox.eclass
index 87fd1c162c64..1b08dcbd0f4d 100644
--- a/eclass/commonbox.eclass
+++ b/eclass/commonbox.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/commonbox.eclass,v 1.28 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/commonbox.eclass,v 1.29 2005/07/11 15:08:06 swegener Exp $
 #
 # Author: Seemant Kulleen <seemant@gentoo.org>
 #
@@ -21,7 +21,7 @@ DEPEND="dev-util/pkgconfig
 RDEPEND="nls? ( sys-devel/gettext )
 	x11-misc/commonbox-utils
 	x11-themes/commonbox-styles"
-	
+
 PROVIDE="virtual/blackbox"
 
 myconf=""
@@ -59,7 +59,7 @@ commonprep() {
 		       -e "s:/styles/mbdtex:/styles/Fury-NG:" \
 		       -e "s:/styles/Clean:/styles/Fury-NG:" ${i}
 	done
-	
+
 }
 
 commonbox_src_compile() {
@@ -109,10 +109,10 @@ commonbox_src_compile() {
 	fi
 
 	[ ! -z "${FORCEXFT}" ] && echo "#define XFT 1" >> ${S}/config.h
-	
+
 	emake \
 		pkgdatadir=/usr/share/commonbox || die
-		
+
 }
 
 
@@ -127,7 +127,7 @@ commonbox_src_install() {
 	if [ "${MYBIN}" != "${PN}" ]
 	then
 		mv ${D}/usr/bin/${PN} ${D}/usr/bin/${MYBIN}
-	
+
 		# same to manpage
 		rm ${D}/usr/share/man/man1/${PN}.1
 		mv doc/${PN}.1 doc/${MYBIN}.1
@@ -141,9 +141,9 @@ commonbox_src_install() {
 		dodir /usr/share/commonbox/${MYBIN}
 		mv ${D}/usr/share/${PN}/nls ${D}/usr/share/commonbox/${MYBIN}
 	)
-	
+
 	rmdir ${D}/usr/share/${MYBIN}
-	
+
 	dodir /etc/X11/Sessions
 	echo "/usr/bin/${MYBIN}" > ${D}/etc/X11/Sessions/${MYBIN}
 	fperms a+x /etc/X11/Sessions/${MYBIN}
diff --git a/eclass/confutils.eclass b/eclass/confutils.eclass
index af0d5d808c76..c230b5e86b2e 100644
--- a/eclass/confutils.eclass
+++ b/eclass/confutils.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/confutils.eclass,v 1.16 2005/06/11 15:44:03 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/confutils.eclass,v 1.17 2005/07/11 15:08:06 swegener Exp $
 #
 # eclass/confutils.eclass
 #		Utility functions to help with configuring a package
@@ -12,7 +12,7 @@
 #
 # ========================================================================
 
-IUSE="$IUSE sharedext"
+IUSE="sharedext"
 
 # ========================================================================
 
@@ -179,7 +179,7 @@ enable_extension_disable () {
 }
 
 # ========================================================================
-# enable_extension_enable () 
+# enable_extension_enable ()
 #
 # This function is like use_enable(), except that it knows about
 # enabling modules as shared libraries, and it supports passing
@@ -219,7 +219,7 @@ enable_extension_enable () {
 }
 
 # ========================================================================
-# enable_extension_enableonly () 
+# enable_extension_enableonly ()
 #
 # This function is like use_enable(), except that it knows about
 # enabling modules as shared libraries, and it supports passing
diff --git a/eclass/cron.eclass b/eclass/cron.eclass
index 149bb41e60cf..31e4ce98ab2a 100644
--- a/eclass/cron.eclass
+++ b/eclass/cron.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/cron.eclass,v 1.7 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/cron.eclass,v 1.8 2005/07/11 15:08:06 swegener Exp $
 
 # Original Author: Aaron Walker <ka0ttic@gentoo.org>
 #
@@ -20,12 +20,10 @@ EXPORT_FUNCTIONS pkg_postinst
 
 SLOT="0"
 
-DEPEND="${DEPEND}
-	virtual/libc
+DEPEND="virtual/libc
 	>=sys-apps/sed-4.0.5"
 
-RDEPEND="${RDEPEND}
-	!virtual/cron
+RDEPEND="!virtual/cron
 	virtual/mta
 	>=sys-process/cronbase-0.2.1-r3"
 
diff --git a/eclass/cvs.eclass b/eclass/cvs.eclass
index d41d0419e548..aab6827e514c 100644
--- a/eclass/cvs.eclass
+++ b/eclass/cvs.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.57 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.58 2005/07/11 15:08:06 swegener Exp $
 
 # Current Maintainer: Tal Peer <coredumb@gentoo.org>
 # Original Author:    Dan Armak <danarmak@gentoo.org>
@@ -157,7 +157,7 @@
 # add cvs to deps
 # ssh is used for ext auth
 # sudo is used to run as a specified user
-DEPEND="$DEPEND dev-util/cvs app-admin/sudo"
+DEPEND="dev-util/cvs app-admin/sudo"
 
 if [ "$ECVS_AUTH" == "ext" ]; then
 	#default to ssh
@@ -165,7 +165,7 @@ if [ "$ECVS_AUTH" == "ext" ]; then
 	if [ "$CVS_RSH" != "ssh" ]; then
 		die "Support for ext auth with clients other than ssh has not been implemented yet"
 	fi
-	DEPEND="$DEPEND net-misc/openssh"
+	DEPEND="${DEPEND} net-misc/openssh"
 fi
 
 # called from cvs_src_unpack
@@ -190,16 +190,15 @@ cvs_fetch() {
 	# should be effective every time cvs_fetch is called, and not just
 	# every time cvs.eclass is inherited
 
-
 	# Handle parameter for local (non-recursive) fetching
-	
+
 	if [ -n "$ECVS_LOCAL" ]; then
 		ECVS_UP_OPTS="$ECVS_UP_OPTS -l"
 		ECVS_CO_OPTS="$ECVS_CO_OPTS -l"
 	fi
 
 	# Handle ECVS_BRANCH option
-	# 
+	#
 	# Because CVS auto-switches branches, we just have to pass the
 	# correct -rBRANCH option when updating.
 
@@ -340,7 +339,7 @@ cvs_fetch() {
 			einfo "Running $cmdupdate"
 			eval $cmdupdate || die "cvs update command failed"
 		elif [ "${mode}" == "checkout" ]; then
-			einfo "Running $cmdcheckout" 
+			einfo "Running $cmdcheckout"
 			eval $cmdcheckout|| die "cvs checkout command failed"
 		fi
 	elif [ "${ECVS_AUTH}" == "ext" ] || [ "${ECVS_AUTH}" == "no" ]; then
@@ -415,7 +414,7 @@ EOF
 			echo "os.execv('/usr/bin/ssh', newarglist)" \
 				>> "${CVS_RSH}"
 
-            chmod a+x "${CVS_RSH}"
+			chmod a+x "${CVS_RSH}"
 
 			# Make sure DISPLAY is set (SSH will not use SSH_ASKPASS
 			# if DISPLAY is not set)
@@ -425,7 +424,7 @@ EOF
 
 			# Create a dummy executable to echo $ECVS_PASS
 
-            export SSH_ASKPASS="${T}/cvs_sshechopass"
+			export SSH_ASKPASS="${T}/cvs_sshechopass"
 			if [ "${ECVS_AUTH}" != "no" ]; then
 				echo -en "#!/bin/bash\necho \"$ECVS_PASS\"\n" \
 					> "${SSH_ASKPASS}"
@@ -436,15 +435,15 @@ EOF
 			fi
 			chmod a+x "${SSH_ASKPASS}"
 		fi
-            
+
 		if [ "${mode}" == "update" ]; then
 			einfo "Running $cmdupdate"
 			eval $cmdupdate || die "cvs update command failed"
 		elif [ "${mode}" == "checkout" ]; then
-			einfo "Running $cmdcheckout" 
+			einfo "Running $cmdcheckout"
 			eval $cmdcheckout|| die "cvs checkout command failed"
 		fi
-		
+
 		# Restore environment variable values
 		export CVS_RSH="${CVS_ECLASS_ORIG_CVS_RSH}"
 		if [ "${CVS_ECLASS_ORIG_SSH_ASKPASS+set}" == "set" ]; then
@@ -545,7 +544,7 @@ cvs_src_unpack() {
 		# e.g. kde-source_src_unpack
 		export PATCHES=""
 	fi
-	
+
 	einfo "CVS module ${ECVS_MODULE} is now in ${WORKDIR}"
 }
 
diff --git a/eclass/db.eclass b/eclass/db.eclass
index 698e97ed176f..2511c12d67b1 100644
--- a/eclass/db.eclass
+++ b/eclass/db.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/db.eclass,v 1.19 2005/07/06 20:28:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/db.eclass,v 1.20 2005/07/11 15:08:06 swegener Exp $
 # This is a common location for functions used in the sys-libs/db ebuilds
 
 IUSE="doc"
@@ -44,7 +44,7 @@ db_fix_so () {
 		ln -sf ${target}/db.h .
 		ln -sf ${target}/db_185.h .
 	elif [ ! -e "${target}/db.h" ]; then
-		if [ -n ${target} ]; then 
+		if [ -n ${target} ]; then
 			ewarn "Could not find ${target}/db.h"
 		else
 			einfo "Apparently you just removed the last instance of $PN. Removing the symlinks"
@@ -81,7 +81,7 @@ db_src_install_headerslot() {
 db_src_install_usrlibcleanup() {
 	# Clean out the symlinks so that they will not be recorded in the
 	# contents (bug #60732)
-	
+
 	if [ "${D}" = "" ]; then
 		die "Calling clean_links while \$D not defined"
 	fi
@@ -89,6 +89,6 @@ db_src_install_usrlibcleanup() {
 	find ${D}/usr/lib -maxdepth 1 -type l -name 'libdb[1._-]*so' -exec rm \{} \;
 	find ${D}/usr/lib -maxdepth 1 -type l -name 'libdb[1._-]*so.[23]' -exec rm \{} \;
 	find ${D}/usr/lib -maxdepth 1 -type l -name 'libdb[1._-]*a' -exec rm \{} \;
-	
+
 	rm -f ${D}/usr/include/db.h ${D}/usr/include/db_185.h
 }
diff --git a/eclass/debug.eclass b/eclass/debug.eclass
index 6581232b3624..5fc184f7fbf4 100644
--- a/eclass/debug.eclass
+++ b/eclass/debug.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/debug.eclass,v 1.23 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/debug.eclass,v 1.24 2005/07/11 15:08:06 swegener Exp $
 #
 # Author: Spider
 #
@@ -13,7 +13,7 @@ IUSE="debug"
 if useq debug; then
 	# Do _NOT_ strip symbols in the build! Need both lines for Portage 1.8.9+
 	DEBUG="yes"
-	RESTRICT="$RESTRICT nostrip"
+	RESTRICT="${RESTRICT} nostrip"
 	# Remove omit-frame-pointer as some useless folks define that all over the place. they should be shot with a 16 gauge slingshot at least :)
 	# force debug information
 	export CFLAGS="${CFLAGS/-fomit-frame-pointer/} -g"
diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass
index 460a75e058e8..93069f3e4772 100644
--- a/eclass/depend.apache.eclass
+++ b/eclass/depend.apache.eclass
@@ -1,6 +1,6 @@
 # Copyright 2004-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/eclass/depend.apache.eclass,v 1.17 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/depend.apache.eclass,v 1.18 2005/07/11 15:08:06 swegener Exp $
 
 ######
 ## Apache Common Variables
@@ -84,7 +84,7 @@ APACHE2_MODULESDIR="${APACHE2_BASEDIR}/modules"
 ## Dependencies for apache 1.x and apache 2.x
 ##  - apache2 must be at least version 2.0.52-r3, this is lowest version
 ##    containing our new overall changes -- trapni (Jan 21 2005)
-##  - apache1 must be at least version 1.3.33-r1, but how to 
+##  - apache1 must be at least version 1.3.33-r1, but how to
 ##    define the DEPEND here? (FIXME) -- trapni (Jan 21 2005)
 ##     - currently not possible - bug #4315 -- vericgar (Jan 21 2005)
 ####
@@ -135,7 +135,7 @@ need_apache2() {
 }
 
 ####
-## DO NOT CHANGE THIS FUNCTION UNLESS YOU UNDERSTAND THE CONSEQUENCES IT 
+## DO NOT CHANGE THIS FUNCTION UNLESS YOU UNDERSTAND THE CONSEQUENCES IT
 ## WILL HAVE ON THE CACHE! There MUST be a apache2? () block in DEPEND for
 ## things to work correct in the dependency calculation stage.
 ####
diff --git a/eclass/distutils.eclass b/eclass/distutils.eclass
index ce69194c6a97..b17c2334090c 100644
--- a/eclass/distutils.eclass
+++ b/eclass/distutils.eclass
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils.eclass,v 1.27 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils.eclass,v 1.28 2005/07/11 15:08:06 swegener Exp $
 #
 # Author: Jon Nelson <jnelson@gentoo.org>
 # Current Maintainer: Alastair Tse <liquidx@gentoo.org>
 #
 # The distutils eclass is designed to allow easier installation of
-# distutils-based python modules and their incorporation into 
+# distutils-based python modules and their incorporation into
 # the Gentoo Linux system.
 #
 # - Features:
@@ -21,10 +21,9 @@
 
 inherit python eutils
 
-
 # This helps make it possible to add extensions to python slots.
 # Normally only a -py21- ebuild would set PYTHON_SLOT_VERSION.
-if [ "${PYTHON_SLOT_VERSION}" = 2.1 ] ; then 
+if [ "${PYTHON_SLOT_VERSION}" = 2.1 ] ; then
 	DEPEND="=dev-lang/python-2.1*"
 	python="python2.1"
 else
@@ -41,7 +40,7 @@ distutils_src_install() {
 		${python} setup.py install --root=${D} --no-compile "$@" || die
 	else
 		${python} setup.py install --root=${D} "$@" || die
-	fi		
+	fi
 
 	DDOCS="CHANGELOG COPYRIGHT KNOWN_BUGS MAINTAINERS PKG-INFO"
 	DDOCS="${DDOCS} CONTRIBUTORS LICENSE COPYING*"
@@ -52,12 +51,12 @@ distutils_src_install() {
 	done
 
 	[ -n "${DOCS}" ] && dodoc ${DOCS}
-	
+
 	# deprecated! please use DOCS instead.
 	[ -n "${mydoc}" ] && dodoc ${mydoc}
 }
 
-# generic pyc/pyo cleanup script. 
+# generic pyc/pyo cleanup script.
 
 distutils_pkg_postrm() {
 	PYTHON_MODNAME=${PYTHON_MODNAME:-${PN}}
@@ -72,9 +71,9 @@ distutils_pkg_postrm() {
 			done
 		else
 			python_mod_cleanup
-		fi			
+		fi
 		eend 0
-	fi		
+	fi
 }
 
 # this is a generic optimization, you should override it if your package
@@ -82,15 +81,15 @@ distutils_pkg_postrm() {
 
 distutils_pkg_postinst() {
 	PYTHON_MODNAME=${PYTHON_MODNAME:-${PN}}
-	
+
 	if has_version ">=dev-lang/python-2.3"; then
 		python_version
 		for pymod in "${PYTHON_MODNAME}"; do
 			if [ -d "${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/${pymod}" ]; then
 				python_mod_optimize ${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/${pymod}
 			fi
-		done			
-	fi		
+		done
+	fi
 }
 
 # e.g. insinto ${ROOT}/usr/include/python${PYVER}
@@ -115,6 +114,4 @@ distutils_python_tkinter() {
 	fi
 }
 
-
 EXPORT_FUNCTIONS src_compile src_install pkg_postinst pkg_postrm
-
diff --git a/eclass/ebook.eclass b/eclass/ebook.eclass
index a08ca0137af0..4e049cd987e7 100644
--- a/eclass/ebook.eclass
+++ b/eclass/ebook.eclass
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ebook.eclass,v 1.24 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ebook.eclass,v 1.25 2005/07/11 15:08:06 swegener Exp $
 #
 # Author Francisco Gimeno <kikov@fco-gimeno.com>
 # Mantainer José Alberto Suárez López <bass@gentoo.org>
-# 
+#
 # Latest changes thanks to Kris Verbeeck
-# The ebook eclass defines some default functions and variables to 
-# install ebooks. 
+# The ebook eclass defines some default functions and variables to
+# install ebooks.
 
 HOMEPAGE="http://lidn.sourceforge.net"
 
@@ -24,13 +24,13 @@ KEYWORDS="x86 ppc amd64"
 #  EBOOKVERSION: the version of the book, i.e: 1.2
 #	      Required
 #  SRC: the main file to download. Default: ${EBOOKNAME}-${EBOOKVERSION}
-#  EBOOKDESTDIR: directory inside ${DEVHELPROOT}/books/${EBOOKDIR} where is 
-#          installed the book. By default: ${EBOOKNAME}-${EBOOKVERSION} 
+#  EBOOKDESTDIR: directory inside ${DEVHELPROOT}/books/${EBOOKDIR} where is
+#          installed the book. By default: ${EBOOKNAME}-${EBOOKVERSION}
 #          ( sometimes it is only ${EBOOKNAME} so you will need to modify it )
 #  EBOOKSRCDIR: directory where is the unpacked book in html
-#  BOOKDEVHELPFILE: book.devhelp is copied with the name  
+#  BOOKDEVHELPFILE: book.devhelp is copied with the name
 #          ${EBOOKNAME}-${EBOOKVERSION} by default.
-#  BOOKDESTDIR: directory to put into the ebook in html. By default: 
+#  BOOKDESTDIR: directory to put into the ebook in html. By default:
 #	   ${EBOOKNAME}-${EBOOKVERSION}.
 #  NOVERSION: if it's not empty, then, remove -${EBOOKVERSION} from all
 #          vars...
@@ -44,7 +44,7 @@ else
 fi
 _ebookdestdir="${_src}"
 _ebooksrcdir="${_src}"
-_ebookdevhelpfile="${_src}"    
+_ebookdevhelpfile="${_src}"
 
 if [ "${EBOOKEXT}" = "" ]; then
 	ext="tar.gz"
@@ -57,7 +57,7 @@ if [ "${SRC}" = "" ]; then
 fi
 if [ "${SRC_URI}" = "" ]; then
 	SRC_URI="http://lidn.sourceforge.net/books_download/${SRC}.${ext}"
-fi    
+fi
 
 # Default directory to install de ebook devhelped book
 if [ "${DEVHELPROOT}" = "" ]; then
@@ -88,7 +88,7 @@ ebook_src_unpack() {
 
 ebook_src_install() {
 	debug-print-function $FUNCNAME $*
-	
+
 	dodir ${DEVHELPROOT}/books
 	dodir ${DEVHELPROOT}/books/${EBOOKDESTDIR}
 	echo EBOOKSRCDIR= ${EBOOKSRCDIR}
diff --git a/eclass/eclipse-ext.eclass b/eclass/eclipse-ext.eclass
index 9232183d5b30..2ead6f2c6259 100644
--- a/eclass/eclipse-ext.eclass
+++ b/eclass/eclipse-ext.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eclipse-ext.eclass,v 1.10 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eclipse-ext.eclass,v 1.11 2005/07/11 15:08:06 swegener Exp $
 
 # Author: Karl Trygve Kalleberg <karltk@gentoo.org>
 # Maintainer: Karl Trygve Kalleberg <karltk@gentoo.org>
@@ -187,32 +187,32 @@ function pkg_postinst() {
 
 eclipse-ext_get-classpath() {
 
-        local file=$1
-        local envvar="classpath"
+	local file=$1
+	local envvar="classpath"
 
-        if [ "$1" == "build.properties" ] ; then
-                if [ ! -z "$2" ] ; then
-                        envvar="$2"
-                fi
-        fi
+	if [ "$1" == "build.properties" ] ; then
+		if [ ! -z "$2" ] ; then
+			envvar="$2"
+		fi
+	fi
 
-        echo "$(cat ${FILESDIR}/build.properties-${PV} | sed "s/.*=//" | tr ';' ' ')"
+	echo "$(cat ${FILESDIR}/build.properties-${PV} | sed "s/.*=//" | tr ';' ' ')"
 }
 
 _path-dissecter() {
-        echo $1 | sed -r "s/.*\/([^/]+)_([0-9.]+)\/(.*)/\\${2}/"
+	echo $1 | sed -r "s/.*\/([^/]+)_([0-9.]+)\/(.*)/\\${2}/"
 }
 
 _get-plugin-name() {
-        _path-dissecter $1 1
+	_path-dissecter $1 1
 }
 
 _get-plugin-version() {
-        _path-dissecter $1 2
+	_path-dissecter $1 2
 }
 
 _get-plugin-content() {
-        _path-dissecter $1 3
+	_path-dissecter $1 3
 }
 
 # ---------------------------------------------------------------------------
@@ -229,19 +229,18 @@ _get-plugin-content() {
 # ---------------------------------------------------------------------------
 eclipse-ext_resolve-jars() {
 
-        local resolved=""
-
-        for x in $1 ; do
-                local jarfile=$(_get-plugin-content $x)
-                local name="$(_get-plugin-name $x)"
-                local x=$(echo ${eclipse_ext_platformdir}/plugins/${name}_*/${jarfile})
-                if [ -f ${x} ] ; then
-                        resolved="${resolved}:$x"
-                else
-                        :
-                        #echo "Warning: did not find ${name}"
-                fi
-        done
-        echo ${resolved}
-}
+	local resolved=""
 
+	for x in $1 ; do
+		local jarfile=$(_get-plugin-content $x)
+		local name="$(_get-plugin-name $x)"
+		local x=$(echo ${eclipse_ext_platformdir}/plugins/${name}_*/${jarfile})
+		if [ -f ${x} ] ; then
+			resolved="${resolved}:$x"
+		else
+			:
+			#echo "Warning: did not find ${name}"
+		fi
+	done
+	echo ${resolved}
+}
diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index 2c3af542fca4..d3f01be9cdcd 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.12 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.13 2005/07/11 15:08:06 swegener Exp $
 #
 # Copyright 2002-2003 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003 Jeremy Maitin-Shepard <jbms@attbi.com>
@@ -133,4 +133,3 @@ elisp-comp() {
 # tab-width: 4 ***
 # indent-tabs-mode: t ***
 # End: ***
-
diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass
index 41cc81317347..2f57d629138b 100644
--- a/eclass/elisp.eclass
+++ b/eclass/elisp.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v 1.13 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v 1.14 2005/07/11 15:08:06 swegener Exp $
 #
 # Copyright 2002-2003 Matthew Kennedy <mkennedy@gentoo.org>
 # Copyright 2003 Jeremy Maitin-Shepard <jbms@attbi.com>
@@ -31,7 +31,7 @@ elisp_src_unpack() {
 	if [ "${SIMPLE_ELISP}" = 't' ]
 		then
 		cd ${S} && mv ${P}.el ${PN}.el
-	fi 
+	fi
 }
 
 elisp_src_compile() {
diff --git a/eclass/embassy-2.9.eclass b/eclass/embassy-2.9.eclass
index 8e1ac055e0cb..78a1106cae1e 100644
--- a/eclass/embassy-2.9.eclass
+++ b/eclass/embassy-2.9.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/embassy-2.9.eclass,v 1.6 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/embassy-2.9.eclass,v 1.7 2005/07/11 15:08:06 swegener Exp $
 
 # Author Olivier Fisette <ribosome@gentoo.org>
 
@@ -12,7 +12,6 @@
 
 inherit eutils multilib
 
-
 # EMBOSS version needed for the EMBASSY packages
 EBOV="2.9.0"
 # The EMBASSY package name, retrieved from the inheriting ebuild's name
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index 7cb8e4141528..02fae233b15d 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.189 2005/07/06 20:45:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.190 2005/07/11 15:08:06 swegener Exp $
 #
 # Author: Martin Schlemmer <azarah@gentoo.org>
 #
@@ -69,11 +69,11 @@ gen_usr_ldscript() {
 	for lib in "${@}" ; do
 		cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
 		/* GNU ld script
-		   Since Gentoo has critical dynamic libraries 
-		   in /lib, and the static versions in /usr/lib, 
+		   Since Gentoo has critical dynamic libraries
+		   in /lib, and the static versions in /usr/lib,
 		   we need to have a "fake" dynamic lib in /usr/lib,
 		   otherwise we run into linking problems.
-		
+
 		   See bug http://bugs.gentoo.org/4411 for more info.
 		 */
 		GROUP ( /${libdir}/${lib} )
@@ -902,7 +902,7 @@ domenu() {
 			for j in "${i}"/*.desktop ; do
 				doins "${j}"
 			done
-		fi	
+		fi
 	done
 }
 newmenu() {
@@ -920,7 +920,7 @@ doicon() {
 			for j in "${i}"/*.png ; do
 				doins "${j}"
 			done
-		fi	
+		fi
 	done
 }
 newicon() {
diff --git a/eclass/findlib.eclass b/eclass/findlib.eclass
index 91cc5a8877e9..6aa906158d2d 100644
--- a/eclass/findlib.eclass
+++ b/eclass/findlib.eclass
@@ -1,11 +1,11 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/findlib.eclass,v 1.4 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/findlib.eclass,v 1.5 2005/07/11 15:08:06 swegener Exp $
 #
 # Author : Matthieu Sozeau <mattam@gentoo.org>
 #
 # ocamlfind (a.k.a. findlib) eclass
-# 
+#
 
 
 # From this findlib version there is proper stublibs support.
@@ -29,7 +29,7 @@ findlib_src_preinst() {
 	# destdir is the ocaml sitelib
 	local destdir=`ocamlfind printconf destdir`
 
-	dodir ${destdir} || die "dodir failed"	
+	dodir ${destdir} || die "dodir failed"
 	export OCAMLFIND_DESTDIR=${D}${destdir}
 
 	# stublibs style
diff --git a/eclass/fixheadtails.eclass b/eclass/fixheadtails.eclass
index 599633b5ba7f..58170e4a6667 100644
--- a/eclass/fixheadtails.eclass
+++ b/eclass/fixheadtails.eclass
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/fixheadtails.eclass,v 1.8 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/fixheadtails.eclass,v 1.9 2005/07/11 15:08:06 swegener Exp $
 #
 # Author John Mylchreest <johnm@gentoo.org>
 
-DEPEND="${DEPEND} >=sys-apps/sed-4"
+DEPEND=">=sys-apps/sed-4"
 
 # ht_fix_all
 # This fixes all files within the current directory.
diff --git a/eclass/font.eclass b/eclass/font.eclass
index 68cc2d4805ba..e4ceffb955c5 100644
--- a/eclass/font.eclass
+++ b/eclass/font.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/font.eclass,v 1.14 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/font.eclass,v 1.15 2005/07/11 15:08:06 swegener Exp $
 
 # Author: foser <foser@gentoo.org>
 
@@ -21,13 +21,12 @@ FONT_S="${S}" # Dir containing the fonts
 
 DOCS="" # Docs to install
 
-IUSE="${IUSE} X"
+IUSE="X"
 
-DEPEND="${DEPEND} \
-	X? ( virtual/x11 ) \
+DEPEND="X? ( virtual/x11 )
 	media-libs/fontconfig"
 
-# 
+#
 # Public functions
 #
 
@@ -69,7 +68,7 @@ font_src_install() {
 	cd "${FONT_S}"
 
 	insinto "/usr/share/fonts/${PN}"
-	
+
 	for suffix in ${FONT_SUFFIX}; do
 		doins *.${suffix}
 	done
diff --git a/eclass/fortran.eclass b/eclass/fortran.eclass
index 234ab032b177..2e5a9df93cec 100644
--- a/eclass/fortran.eclass
+++ b/eclass/fortran.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/fortran.eclass,v 1.8 2005/07/08 06:18:30 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/fortran.eclass,v 1.9 2005/07/11 15:08:06 swegener Exp $
 #
 # Author: Danny van Dyk <kugelfang@gentoo.org>
 #
@@ -112,17 +112,17 @@ need_fortran() {
 				MY_FORTRAN="$(basename ${F2C})"
 			fi
 		fi
-		
+
 		# default to g77
 		use debug && echo "MY_FORTRAN: \"${MY_FORTRAN}\""
 		MY_FORTRAN=${MY_FORTRAN:=g77}
 		use debug && echo "MY_FORTRAN: \"${MY_FORTRAN}\""
-		
+
 		if ! hasq ${MY_FORTRAN} ${AVAILABLE}; then
 			eerror "Current Fortran Compiler is set to ${MY_FORTRAN}, which is not usable with this package !"
 			die "Wrong Fortran Compiler !"
 		fi
-		
+
 		case ${MY_FORTRAN} in
 			g77|ifc|f2c)
 				FORTRANC="${MY_FORTRAN}"
diff --git a/eclass/fox.eclass b/eclass/fox.eclass
index 6b9374b35582..7fc8efcd55b6 100644
--- a/eclass/fox.eclass
+++ b/eclass/fox.eclass
@@ -1,22 +1,22 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v 1.3 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v 1.4 2005/07/11 15:08:06 swegener Exp $
 
 # fox eclass
 #
-# This eclass allows building SLOT-able FOX Toolkit installations 
-# (x11-libs/fox: headers, libs, and docs), which are by design 
-# parallel-installable, while installing only one version of the utils 
+# This eclass allows building SLOT-able FOX Toolkit installations
+# (x11-libs/fox: headers, libs, and docs), which are by design
+# parallel-installable, while installing only one version of the utils
 # (dev-util/reswrap) and apps (app-editors/adie, sci-calculators/calculator,
 # x11-misc/pathfinder, and x11-misc/shutterbug).
 #
 # Version numbering follows the kernel-style odd-even minor version
-# designation.  Even-number minor versions are API stable, which patch 
-# releases aimed mostly at the library; apps generally won't need to be 
+# designation.  Even-number minor versions are API stable, which patch
+# releases aimed mostly at the library; apps generally won't need to be
 # bumped for a patch release.
 #
-# Odd-number versions are development branches with their own SLOT and 
-# are API unstable; changes are made to the apps, and likely need to be 
+# Odd-number versions are development branches with their own SLOT and
+# are API unstable; changes are made to the apps, and likely need to be
 # bumped together with the library.
 #
 # Here are sample [R]DEPENDs for the fox apps, based on the first versions
@@ -49,7 +49,7 @@ IUSE="debug doc profile"
 # from fox-1.0
 FOX_APPS="adie calculator pathfinder"
 # from fox-1.2+
-if [ "${FOXVER}" != "1.0" ] ; then 
+if [ "${FOXVER}" != "1.0" ] ; then
 	FOX_APPS="${FOX_APPS} shutterbug"
 	FOX_CHART="chart"
 fi
@@ -66,8 +66,7 @@ if [ "${PN}" != reswrap ] ; then
 	RESWRAP_DEP="dev-util/reswrap"
 fi
 
-DEPEND="${RDEPEND}
-	${DOXYGEN_DEP}
+DEPEND="${DOXYGEN_DEP}
 	${RESWRAP_DEP}
 	=sys-devel/automake-1.4*
 	>=sys-apps/sed-4"
@@ -127,7 +126,7 @@ fox_src_unpack() {
 fox_src_compile() {
 	local myconf
 	use debug && myconf="${myconf} --enable-debug" \
-		|| myconf="${myconf} --enable-release" 
+		|| myconf="${myconf} --enable-release"
 
 	econf \
 		${FOXCONF} \
@@ -196,7 +195,7 @@ fox_src_install () {
 }
 
 fox_pkg_postinst() {
-	if [ -z "${FOX_COMPONENT}" ] ; then 
+	if [ -z "${FOX_COMPONENT}" ] ; then
 		echo
 		einfo "Multiple versions of the FOX Toolkit library may now be installed"
 		einfo "in parallel SLOTs on the same system."
diff --git a/eclass/freedict.eclass b/eclass/freedict.eclass
index c06b2f1032d1..553cee8122a7 100644
--- a/eclass/freedict.eclass
+++ b/eclass/freedict.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/freedict.eclass,v 1.12 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/freedict.eclass,v 1.13 2005/07/11 15:08:06 swegener Exp $
 
 # Author: Seemant Kulleen <seemant@gentoo.org>
 # This eclass exists to ease the installation of freedict translation
@@ -10,7 +10,6 @@
 
 inherit eutils
 
-
 IUSE=""
 
 MY_P=${PN/freedict-/}
diff --git a/eclass/games-etmod.eclass b/eclass/games-etmod.eclass
index 065576ead095..d340865506fa 100644
--- a/eclass/games-etmod.eclass
+++ b/eclass/games-etmod.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/games-etmod.eclass,v 1.8 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/games-etmod.eclass,v 1.9 2005/07/11 15:08:06 swegener Exp $
 
 inherit games
 
@@ -147,6 +147,6 @@ cat << EOF > ${T}/et-${MOD_NAME}-ded.conf.d
 $(<${PORTDIR}/header.txt)
 
 # Any extra options you want to pass to the dedicated server
-${MOD_NAME}_OPTS="+set com_hunkmegs 64 +set com_zonemegs 32" 
+${MOD_NAME}_OPTS="+set com_hunkmegs 64 +set com_zonemegs 32"
 EOF
 }
diff --git a/eclass/gdesklets.eclass b/eclass/gdesklets.eclass
index fb5d952956db..202ddbe544df 100644
--- a/eclass/gdesklets.eclass
+++ b/eclass/gdesklets.eclass
@@ -1,6 +1,6 @@
 # Copyright 2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/eclass/gdesklets.eclass,v 1.7 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gdesklets.eclass,v 1.8 2005/07/11 15:08:06 swegener Exp $
 #
 # Authors:	Joe Sapp <nixphoeni@gentoo.org>
 #		Mike Gardiner <obz@gentoo.org>
@@ -27,32 +27,32 @@ SRC_URI="http://gdesklets.gnomedesktop.org/files/${MY_P}.tar.gz"
 # Ebuild writer shouldn't need to touch these (except maybe $RDEPEND)
 SLOT="0"
 IUSE=""
-RDEPEND="${RDEPEND} >=gnome-extra/gdesklets-core-0.34.3"
+RDEPEND=">=gnome-extra/gdesklets-core-0.34.3"
 
 GDESKLETS_INST_DIR="/usr/$(get_libdir)/gdesklets"
 
 gdesklets_src_install() {
-	
+
 	debug-print-function $FUNCNAME $*
-	
+
 	has_version ">=gnome-extra/gdesklets-core-0.33.1" || \
 				GDESKLETS_INST_DIR="/usr/share/gdesklets"
-	
+
 	# This should be done by the gdesklets-core ebuild
-	# It makes the Displays or Controls directory in the 
+	# It makes the Displays or Controls directory in the
 	# global installation directory if it doesn't exist
 	[[ -d ${GDESKLETS_INST_DIR}/Displays ]] || \
 		dodir ${GDESKLETS_INST_DIR}/Displays
-	
+
 	# The displays only need to be readable
 	insopts -m0744
-	
+
 	# Check to see if DISPLAY is set for the
 	# gdesklets-control-getid script to run without
 	# error
 	[ -z "${DISPLAY}" ] && DISPLAY=""
 	export DISPLAY
-	
+
 	# First, install the Sensor (if there is one)
 	if [[ -n "${SENSOR_NAME}" ]]; then
 		for SENS in ${SENSOR_NAME[@]}; do
@@ -60,127 +60,127 @@ gdesklets_src_install() {
 			/usr/bin/python "Install_${SENS}_Sensor.bin" \
 					--nomsg ${D}${GDESKLETS_INST_DIR}/Sensors || \
 					die "Couldn't Install Sensor"
-			
+
 			chown -R root:root ${D}${GDESKLETS_INST_DIR}/Sensors/${SENSOR_NAME}
 		done # for in ${SENSOR_NAME}
 	fi # if -n "${SENSOR_NAME}"
-	
+
 	# This finds the Displays
 	DISPLAY_FILES=(`find . -iname "*.display"`)
-	
+
 	GD_INSDIR=""
-	
+
 	# There is more than likely only one display per package
 	if [[ -n "${DISPLAY_FILES[@]}" ]]; then
 		# Base installation directory for displays
 		GD_INSDIR="${GDESKLETS_INST_DIR}/Displays/${DESKLET_NAME}"
-		
-		# This creates the subdirectory of ${DESKLET_NAME} 
+
+		# This creates the subdirectory of ${DESKLET_NAME}
 		# in the global Displays directory
 		[[ -d ${GD_INSDIR} ]] || \
 			dodir ${GD_INSDIR}
-		
-		# For each of the Display files, there may be 
+
+		# For each of the Display files, there may be
 		# scripts included inline which don't necessarily
 		# follow any naming scheme.
 		# So for each of them, determine what those scripts are
 		# and install them.
 		for DSP in ${DISPLAY_FILES[@]}; do
-			
+
 			einfo "Installing Display `basename ${DSP} .display`"
 			insinto ${GD_INSDIR}
 			doins ${DSP}
-			
+
 			SCRIPTS=$(grep "script uri" ${DSP} | \
 				sed -e 's:.*<script uri=": :g' -e 's:"/>.*: :g')
-			
+
 			# For each one of the scripts, change to its
 			# base directory and change the install location
 			# so it gets installed at the proper place
 			# relative to the display.
 			for SCR in ${SCRIPTS[@]}; do
-				
+
 				cd `dirname ${DSP}`/`dirname ${SCR}`
-				
+
 				insinto ${GD_INSDIR}/`dirname ${SCR}`
 				doins `basename ${SCR}`
-				
+
 				cd ${S}/`dirname ${DSP}`
-				
+
 			done # for in ${SCRIPTS}
-			
+
 			# Install the graphics for this display.
 			# If there are multiple displays in this
 			# directory, this will be done more than
-			# once.  It's the only solution I can 
+			# once.  It's the only solution I can
 			# come up with for now...
 			GFX=(`find . \
 					-iname "*.png" -o -iname "*.svg" \
 					-o -iname "*.jpg" -o -iname "*.gif" \
 					-o -iname "*.xcf"`)
-			
+
 			for G in ${GFX[@]}; do
-				
+
 				insinto ${GD_INSDIR}/`dirname ${G}`
 				doins ${G}
-				
+
 			done # for in ${GFX}
-			
+
 			cd ${S}
-			
+
 		done # for in ${DISPLAY_FILES}
-	
+
 	fi
-	
+
 	# Make sure that it only finds Controls and not Sensors
 	# If it uses a Sensor, it shouldn't use a Control (since
 	# Sensors are deprecated).
-	if [[ -z "${SENSOR_NAME}" ]]; then 
-		
+	if [[ -z "${SENSOR_NAME}" ]]; then
+
 		# Base installation directory for Controls
 		GD_INSDIR="${GDESKLETS_INST_DIR}/Controls"
-		
+
 		CONTROL_INITS=$(find . -iname "__init__.py" | grep [Cc]ontrols)
-		
+
 		# There are possibly multiple Controls packaged with the display.
 		# For each __init__.py found, there must be a Control associated with it.
 		for CTRL in ${CONTROL_INITS[@]}; do
-			
+
 			cd `dirname ${CTRL}`
 			CTRL_NAME=$( PYTHON_DONTCOMPILE=1 ${GDESKLETS_INST_DIR}/gdesklets-control-getid `pwd` )
 			einfo "Installing Control ${CTRL_NAME}"
-			# This creates the subdirectory of ${CTRL_NAME} 
-                	# in the global Controls directory
+			# This creates the subdirectory of ${CTRL_NAME}
+			# in the global Controls directory
 			[[ -d ${GD_INSDIR}/${CTRL_NAME} ]] || \
 				dodir ${GD_INSDIR}/${CTRL_NAME}
-			
+
 			insinto ${GD_INSDIR}/${CTRL_NAME}
-			
+
 			doins -r *
-			
+
 			cd ${S}
-			
+
 		done # for in ${CONTROL_INITS}
-	
+
 	fi # if no Sensors
-	
+
 	# Install any remaining graphics and other files
 	# that are sitting in ${S}.
-	
+
 	GFX=$(find . -maxdepth 1 \
 		-iname "*.png" -o -iname "*.svg" \
 		-o -iname "*.jpg" -o -iname "*.gif" \
 		-o -iname "*.xcf")
-	
+
 	if [[ -n "${GFX}" ]]; then
 		# Install to the Displays directory of the Desklet
 		insinto ${GDESKLETS_INST_DIR}/Displays/${DESKLET_NAME}
 		doins ${GFX}
 	fi # if -n "${GFX}"
-	
+
 	# Install some docs if so requested
 	[[ -n "${DOCS}" ]] && dodoc ${DOCS}
-	
+
 }
 
 
diff --git a/eclass/gems.eclass b/eclass/gems.eclass
index 57690a2eab53..9ba6d31a3be1 100644
--- a/eclass/gems.eclass
+++ b/eclass/gems.eclass
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gems.eclass,v 1.5 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gems.eclass,v 1.6 2005/07/11 15:08:06 swegener Exp $
 #
 # Author: Rob Cakebread <pythonhead@gentoo.org>
 # Current Maintainer: Rob Cakebread <pythonhead@gentoo.org>
 #
 # The gems eclass is designed to allow easier installation of
-# gems-based ruby packagess and their incorporation into 
+# gems-based ruby packagess and their incorporation into
 # the Gentoo Linux system.
 #
 # - Features:
@@ -49,8 +49,8 @@ gems_src_install() {
 
 	dodir ${GEMSDIR}
 	gem install ${GEM_SRC} -v ${PV} -l -i ${D}/${GEMSDIR} || die "gem install failed"
-	
-	if [ -d ${D}/${GEMSDIR}/bin ] ; then 
+
+	if [ -d ${D}/${GEMSDIR}/bin ] ; then
 		exeinto /usr/bin
 		for exe in ${D}/${GEMSDIR}/bin/* ; do
 			doexe ${exe}
@@ -62,6 +62,4 @@ gems_src_compile() {
 	true
 }
 
-
 EXPORT_FUNCTIONS src_unpack src_compile src_install
-
diff --git a/eclass/ghc-package.eclass b/eclass/ghc-package.eclass
index bf1f70107861..63cb9b4c82c2 100644
--- a/eclass/ghc-package.eclass
+++ b/eclass/ghc-package.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ghc-package.eclass,v 1.13 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ghc-package.eclass,v 1.14 2005/07/11 15:08:06 swegener Exp $
 #
 # Author: Andres Loeh <kosmikus@gentoo.org>
 #
@@ -97,7 +97,7 @@ ghc-setup-pkg() {
 # fixes the library and import directories path
 # of the package configuration file
 ghc-fixlibpath() {
-    sed -i "s|$1|$(ghc-libdir)|g" ${S}/$(ghc-localpkgconf)
+	sed -i "s|$1|$(ghc-libdir)|g" ${S}/$(ghc-localpkgconf)
 	if [[ -n "$2" ]]; then
 		sed -i "s|$2|$(ghc-libdir)/imports|g" ${S}/$(ghc-localpkgconf)
 	fi
diff --git a/eclass/gnat.eclass b/eclass/gnat.eclass
index a31eb410ea10..a0df50ae4a7d 100644
--- a/eclass/gnat.eclass
+++ b/eclass/gnat.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnat.eclass,v 1.8 2005/07/06 20:20:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnat.eclass,v 1.9 2005/07/11 15:08:06 swegener Exp $
 #
 # Author: David Holm <dholm@gentoo.org>
 #
@@ -10,6 +10,7 @@
 
 inherit flag-o-matic
 
+EXPORT_FUNCTIONS pkg_setup
 
 DEPEND="dev-lang/gnat"
 
@@ -27,7 +28,7 @@ gnat_filter_flags() {
 		-fsigned-char -fno-strict-aliasing -pipe
 }
 
-pkg_setup() {
+gnat_pkg_setup() {
 	export ADAC=${ADAC:-gnatgcc}
 	export ADAMAKE=${ADAMAKE:-gnatmake}
 	export ADABIND=${ADABIND:-gnatbind}
diff --git a/eclass/gnome.org.eclass b/eclass/gnome.org.eclass
index ade40ba266cc..ffb8de3fe239 100644
--- a/eclass/gnome.org.eclass
+++ b/eclass/gnome.org.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome.org.eclass,v 1.9 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome.org.eclass,v 1.10 2005/07/11 15:08:06 swegener Exp $
 #
 # Authors:
 # Spidler <spidler@gentoo.org>
@@ -12,4 +12,3 @@
 [ -z "${GNOME_TARBALL_SUFFIX}" ] && export GNOME_TARBALL_SUFFIX="bz2"
 PVP=(${PV//[-\._]/ })
 SRC_URI="mirror://gnome/sources/${PN}/${PVP[0]}.${PVP[1]}/${P}.tar.${GNOME_TARBALL_SUFFIX}"
-
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 7d84068da725..fc85bb1578f7 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.52 2005/07/06 20:36:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.53 2005/07/11 15:08:06 swegener Exp $
 #
 # Authors:
 # Bruce A. Locke <blocke@shivan.org>
@@ -17,7 +17,7 @@ USE_DESTDIR=""          # use make DESTDIR=${D} install rather than einstall
 IUSE="debug doc"
 use debug && G2CONF="${G2CONF} --enable-debug=yes"
 
-DEPEND="${DEPEND} >=sys-apps/sed-4"
+DEPEND=">=sys-apps/sed-4"
 
 gnome2_src_configure() {
 
@@ -82,7 +82,7 @@ gnome2_gconf_install() {
 	then
 		unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 		export GCONF_CONFIG_SOURCE=`${ROOT}/usr/bin/gconftool-2 --get-default-source`
-		einfo "Installing GNOME 2 GConf schemas"	
+		einfo "Installing GNOME 2 GConf schemas"
 		grep "obj /etc/gconf/schemas" ${ROOT}/var/db/pkg/*/${PF}/CONTENTS | sed 's:obj \([^ ]*\) .*:\1:' | while read F; do
 			if [ -e "${F}" ]; then
 				# echo "DEBUG::gconf install  ${F}"
@@ -99,7 +99,7 @@ gnome2_gconf_uninstall() {
 	then
 		unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 		export GCONF_CONFIG_SOURCE=`${ROOT}/usr/bin/gconftool-2 --get-default-source`
-		einfo "Uninstalling GNOME 2 GConf schemas"	
+		einfo "Uninstalling GNOME 2 GConf schemas"
 		cat ${ROOT}/var/db/pkg/*/${PN}-${PVR}/CONTENTS | grep "obj /etc/gconf/schemas" | sed 's:obj \([^ ]*\) .*:\1:' |while read F; do
 			# echo "DEBUG::gconf install  ${F}"
 			${ROOT}/usr/bin/gconftool-2  --makefile-uninstall-rule ${F} 1>/dev/null
@@ -113,18 +113,18 @@ gnome2_omf_fix() {
 	# workaround/patch against omf.make or omf-install/Makefile.in
 	# in order to remove redundant scrollkeeper-updates.
 	# - <liquidx@gentoo.org>
-	
+
 	local omf_makefiles
 
 	omf_makefiles="$@"
 
 	[ -f ${S}/omf-install/Makefile.in ] \
 		&& omf_makefiles="${omf_makefiles} ${S}/omf-install/Makefile.in"
-		
+
 	# FIXME: does this really work? because omf.make only gets included
 	#        when autoconf/automake is run. You should directly patch
 	#        the Makefile.in's
-	
+
 	[ -f ${S}/omf.make ] \
 		&& omf_makefiles="${omf_makefiles} ${S}/omf.make"
 
@@ -169,8 +169,5 @@ gnome2_pkg_postrm() {
 
 }
 
-
 #EXPORT_FUNCTIONS src_compile src_install pkg_postinst pkg_prerm  pkg_postrm
 EXPORT_FUNCTIONS src_compile src_install pkg_postinst pkg_postrm
-
-
diff --git a/eclass/gnustep-funcs.eclass b/eclass/gnustep-funcs.eclass
index 438280f8c9f4..932fdff1dcad 100644
--- a/eclass/gnustep-funcs.eclass
+++ b/eclass/gnustep-funcs.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-funcs.eclass,v 1.9 2005/07/10 18:52:04 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-funcs.eclass,v 1.10 2005/07/11 15:08:06 swegener Exp $
 
 inherit toolchain-funcs eutils
 
@@ -73,7 +73,7 @@ egnustep_env() {
 	GNUSTEP_SYSTEM_ROOT="$(egnustep_prefix)/System"
 	if [ -f ${GNUSTEP_SYSTEM_ROOT}/Library/Makefiles/GNUstep.sh ] ; then
 		. ${GNUSTEP_SYSTEM_ROOT}/Library/Makefiles/GNUstep-reset.sh
-		if [ -f /etc/conf.d/gnustep.env ]; then 
+		if [ -f /etc/conf.d/gnustep.env ]; then
 			. /etc/conf.d/gnustep.env
 		else
 			GNUSTEP_SYSTEM_ROOT="/usr/GNUstep/System"
@@ -85,7 +85,7 @@ egnustep_env() {
 		__GS_NETWORK_ROOT=${GNUSTEP_NETWORK_ROOT}
 		__GS_USER_ROOT=${GNUSTEP_USER_ROOT}
 		__GS_USER_ROOT_SUFFIX=$(dirname ${GNUSTEP_USER_ROOT#*$USER}/prune)/
-		
+
 		# "gs_prefix" is the prefix that GNUstep is installed into, e.g.
 		#  gs_prefix=/usr/GNUstep => GNUSTEP_SYSTEM_ROOT=${gs_prefix}/System
 		local gs_prefix=`egnustep_prefix`
@@ -190,7 +190,7 @@ egnustep_package_config_info() {
 	if [ -f ${FILESDIR}/config-${PN}.sh ]; then
 		einfo "Make sure to set happy defaults for this package by executing:"
 		einfo "  `egnustep_install_domain`/Tools/Gentoo/config-${PN}.sh"
-		einfo "as the user you will run the package as." 
+		einfo "as the user you will run the package as."
 	fi
 }
 
@@ -334,4 +334,3 @@ ffi_not_available_info() {
 }
 
 ###########################################################################
-
diff --git a/eclass/gnustep-old.eclass b/eclass/gnustep-old.eclass
index 86e9eccb2497..f4a63eed50d2 100644
--- a/eclass/gnustep-old.eclass
+++ b/eclass/gnustep-old.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-old.eclass,v 1.8 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-old.eclass,v 1.9 2005/07/11 15:08:06 swegener Exp $
 
 
 DESCRIPTION="Based on the gnustep eclass."
@@ -37,7 +37,7 @@ egnustepmake() {
 	getsourcedir
 
 	addwrite /root/GNUstep/Defaults/.GNUstepDefaults.lck
-	addpredict /root/GNUstep	
+	addpredict /root/GNUstep
 
 	cd ${S}
 
@@ -73,7 +73,7 @@ egnustepmake() {
 			fi
 		fi
 	fi
-	
+
 	if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then
 		make \
 			HOME=$TMP/fakehome \
@@ -89,15 +89,15 @@ egnustepinstall() {
 	getsourcedir
 
 	addwrite /root/GNUstep/Defaults/.GNUstepDefaults.lck
-	addpredict /root/GNUstep	
+	addpredict /root/GNUstep
 
 	cd ${S}
-	
+
 	if [ -f /usr/GNUstep/System/Makefiles/GNUstep.sh ] ; then
-                source /usr/GNUstep/System/Makefiles/GNUstep.sh
-        else
-                die "gnustep-make not installed!"
-        fi
+		source /usr/GNUstep/System/Makefiles/GNUstep.sh
+	else
+		die "gnustep-make not installed!"
+	fi
 
 	mkdir -p $TMP/fakehome/GNUstep
 
@@ -106,7 +106,7 @@ egnustepinstall() {
 		# Should all the roots point at GNUSTEP_SYSTEM_ROOT to force
 		# install?
 		# GNUSTEP_USER_ROOT must be GNUSTEP_SYSTEM_ROOT, some malformed
-		# Makefiles install there. 
+		# Makefiles install there.
 		if [ "${PN}" = "gnustep-base" ] || [ "${PN}" = "gnustep-gui" ] || [ "${PN}" = "gnustep-back" ] ; then
 			# for some reason, they need less tending to...
 			make \
@@ -115,12 +115,12 @@ egnustepinstall() {
 				GNUSTEP_INSTALLATION_DIR=${D}${GNUSTEP_SYSTEM_ROOT} \
 				INSTALL_ROOT_DIR=${D} \
 				install || die "einstall failed"
-		else 
+		else
 			make \
 				GNUSTEP_USER_ROOT=$TMP/fakehome/GNUstep \
 				HOME=$TMP/fakehome \
-        	        	GNUSTEP_INSTALLATION_DIR=${D}${GNUSTEP_SYSTEM_ROOT} \
-                		INSTALL_ROOT_DIR=${D} \
+				GNUSTEP_INSTALLATION_DIR=${D}${GNUSTEP_SYSTEM_ROOT} \
+				INSTALL_ROOT_DIR=${D} \
 				GNUSTEP_LOCAL_ROOT=${D}${GNUSTEP_LOCAL_ROOT} \
 				GNUSTEP_NETWORK_ROOT=${D}${GNUSTEP_NETWORK_ROOT} \
 				GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \
@@ -128,7 +128,7 @@ egnustepinstall() {
 		 		install || die "einstall failed"
 		fi
 	else
-		die "no Makefile found" 
+		die "no Makefile found"
 	fi
 	return 0
 }
diff --git a/eclass/gnustep.eclass b/eclass/gnustep.eclass
index 1b652028ced4..beea6bab02e7 100644
--- a/eclass/gnustep.eclass
+++ b/eclass/gnustep.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep.eclass,v 1.31 2005/07/10 18:52:04 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep.eclass,v 1.32 2005/07/11 15:08:06 swegener Exp $
 
 inherit gnustep-funcs eutils flag-o-matic
 
@@ -15,10 +15,7 @@ DESCRIPTION="EClass designed to facilitate building GNUstep Apps, Frameworks, an
 # ##### Set the next USE flags ***per ebuild*** in IUSE, ***not here***
 # "doc" - set in ebuild that inherits to enable doc specific code in eclass
 IUSE="debug profile verbose"
-if use debug; then
-	RESTRICT="nostrip"
-fi
-if use profile; then
+if use debug || use profile; then
 	RESTRICT="nostrip"
 fi
 ###########################################################################
@@ -91,9 +88,9 @@ gnustep_pkg_setup() {
 		#  as well as having less specific -march options
 		replace-flags -march=pentium-m -march=pentium3
 		filter-flags -march=k8
-    	filter-flags -march=athlon64
-	    filter-flags -march=opteron
-		
+		filter-flags -march=athlon64
+		filter-flags -march=opteron
+
 		strip-unsupported-flags
 	elif test_version_info 3.4
 	then
@@ -126,4 +123,3 @@ gnustep_pkg_postinst() {
 ###########################################################################
 
 EXPORT_FUNCTIONS pkg_setup src_compile src_install pkg_postinst
-
diff --git a/eclass/gst-plugins.eclass b/eclass/gst-plugins.eclass
index 687c4031f9ce..9b1eeae56773 100644
--- a/eclass/gst-plugins.eclass
+++ b/eclass/gst-plugins.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins.eclass,v 1.27 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins.eclass,v 1.28 2005/07/11 15:08:06 swegener Exp $
 
 # Author : foser <foser@gentoo.org>
 
@@ -9,9 +9,9 @@
 # eclass to make external gst-plugins emergable on a per-plugin basis
 # to solve the problem with gst-plugins generating far too much unneeded deps
 #
-# 3rd party applications using gstreamer now should depend on a set of plugins as 
-# defined in the source, in case of spider usage obtain recommended plugins to use from 
-# Gentoo developers responsible for gstreamer <gnome@gentoo.org>, the application developer 
+# 3rd party applications using gstreamer now should depend on a set of plugins as
+# defined in the source, in case of spider usage obtain recommended plugins to use from
+# Gentoo developers responsible for gstreamer <gnome@gentoo.org>, the application developer
 # or the gstreamer team.
 
 inherit eutils
@@ -30,7 +30,7 @@ MY_P=gst-plugins-${PV}
 # All relevant configure options for gst-plugins
 # need a better way to extract these
 # gstreamer 0.6
-my_gst_plugins="dxr3 oss qcam v4l v4l2 vcd vga cdrom xvideo a52dec aalib aalibtest alsa arts artstest artsc audiofile avifile cdparanoia dvdread dvdnav esd esdtest flac ffmpeg gnome_vfs gsm hermes http jack jpeg ladspa lame lcs libdv libfame libfametest libpng mad mikmod libmikmodtest mjpegtools mpeg2dec openquicktime raw1394 rtp sdl sdltest shout shout2 shout2test sidplay smoothwave snapshot swfdec tarkin vorbis vorbistest xmms libmmx atomic tests examples" 
+my_gst_plugins="dxr3 oss qcam v4l v4l2 vcd vga cdrom xvideo a52dec aalib aalibtest alsa arts artstest artsc audiofile avifile cdparanoia dvdread dvdnav esd esdtest flac ffmpeg gnome_vfs gsm hermes http jack jpeg ladspa lame lcs libdv libfame libfametest libpng mad mikmod libmikmodtest mjpegtools mpeg2dec openquicktime raw1394 rtp sdl sdltest shout shout2 shout2test sidplay smoothwave snapshot swfdec tarkin vorbis vorbistest xmms libmmx atomic tests examples"
 # gstreamer 0.8
 my_gst_plugins="${my_gst_plugins} divx faad gdk_pixbuf ogg sndfile x pango speex xvid mpeg2enc mplex musicbrainz nas librfb libcaca ivorbis faac theora kio osx_audio osx_video sunaudio artsc dts libvisual dirac libmng opengl gst_v4l gst_v4l2 libmms musepack directfb polyp cairo spc wavpack cdio amrnb"
 
@@ -42,7 +42,7 @@ GST_PLUGINS_BUILD=${PN/gst-plugins-/}
 # Actual build dir, is the same as the configure switch name most of the time
 GST_PLUGINS_BUILD_DIR=${PN/gst-plugins-/}
 
-# general common gst-plugins ebuild entries 
+# general common gst-plugins ebuild entries
 DESCRIPTION="${BUILD_GST_PLUGINS} plugin for gstreamer"
 HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-plugins.html"
 LICENSE="GPL-2"
@@ -82,7 +82,7 @@ gst-plugins_find_plugin_dir() {
 ###
 
 gst-plugins_src_configure() {
-	
+
 	# disable any external plugin besides the plugin we want
 	local plugin gst_conf
 
@@ -146,7 +146,7 @@ gst-plugins_src_unpack() {
 		makefiles="Makefile sys/Makefile sys/${GST_PLUGINS_BUILD_DIR}/Makefile"
 	elif [ -d "${S}/ext/${GST_PLUGINS_BUILD_DIR}" ]; then
 		makefiles="Makefile ext/Makefile ext/${GST_PLUGINS_BUILD_DIR}/Makefile"
-	fi				
+	fi
 	sed -e "s:ac_config_files=.*:ac_config_files='${makefiles}':" \
 		-i ${S}/configure
 
diff --git a/eclass/gtk-engines.eclass b/eclass/gtk-engines.eclass
index ddc531914910..365c11b5392a 100644
--- a/eclass/gtk-engines.eclass
+++ b/eclass/gtk-engines.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-engines.eclass,v 1.32 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-engines.eclass,v 1.33 2005/07/11 15:08:06 swegener Exp $
 #
 # The gtk-engines eclass is inherited by all gtk-engines-* ebuilds.
 #
@@ -29,7 +29,7 @@ inherit eutils
 
 KEYWORDS="x86 ppc alpha sparc hppa amd64"
 
-DEPEND="${DEPEND} virtual/x11"
+DEPEND="virtual/x11"
 
 case "${SLOT}" in
 	"1" )
@@ -51,22 +51,22 @@ ENGINE=${PN/gtk-engines-/}
 case "${ENGINE}" in
 	"cleanice" )
 		[ "$SLOT" -eq "2" ] && MY_PN="gtk-engines-cleanice2" ;;
-		
+
 	"crux" )
 		MY_PN="crux" ;;
-		
+
 	"eazel" )
 		MY_PN="eazel-engine" ;;
 
 	"flat" )
 		[ "$SLOT" -eq "2" ] && MY_PN="gtk-flat-theme-2.0" ;;
-	
+
 	"geramik" )
 		MY_PN="3952-Geramik" ;;
-		
+
 	"lighthouseblue" )
 		MY_PN="lighthouseblue" ;;
-		
+
 	"metal" | "notif" | "pixbuf" | "pixmap" | "raleigh" | "redmond95" )
 		MY_PN="gtk-engines"
 		if [ "$SLOT" -eq "2" ]
@@ -80,23 +80,23 @@ case "${ENGINE}" in
 			# force debug information
 			CFLAGS="${CFLAGS} -g"
 			CXXFLAGS="${CXXFLAGS} -g"
-			
+
 		else
 			DEPEND="${DEPEND} >=media-libs/imlib-1.8"
 		fi
 		;;
-		
+
 	"mist" )
 		MY_PN="GTK-mist-engine" ;;
-	
+
 	"thinice" )
 		[ "$SLOT" -eq "2" ] && MY_PN="gtk-thinice-engine" ;;
-		
+
 	"xenophilia" )
 		MY_PN="xenophilia"
 		INSTALL_FONTS=1
 		;;
-		
+
 	"xfce" )
 		MY_PN="gtk-xfce-engine" ;;
 esac
@@ -108,32 +108,32 @@ MY_P="${MY_PN}-${PV}"
 if [ "X${ENGINE}" = "Xthinice" ] && [ "$SLOT" -eq "2" ]
 then
 	SRC_URI="http://thinice.sourceforge.net/${MY_P}.tar.gz"
-	
+
 elif [ "X${ENGINE}" = "Xmist" ]
 then
 	SRC_URI="http://ftp.gnome.org/pub/GNOME/teams/art.gnome.org/themes/gtk2/${MY_P}.tar.gz"
-	
+
 elif [ "X${ENGINE}" = "Xflat" ] && [ "$SLOT" -eq "2" ]
 then
 	SRC_URI="http://download.freshmeat.net/themes/gtk2flat/gtk2flat-default.tar.gz"
-	
+
 elif [ "X${ENGINE}" = "Xgeramik" ]
 then
 	SRC_URI="http://www.kde-look.org/content/files/${MY_P}.tar.gz"
-	
+
 elif [ "X${ENGINE}" = "Xxfce" ]
 then
 	SRC_URI="mirror://sourceforge/xfce/${MY_P}.tar.gz"
-	
+
 elif [ "X${ENGINE}" = "Xlighthouseblue" ]
 then
 	SRC_URI="mirror://sourceforge/lighthouseblue/${MY_P}.tar.gz"
-	
+
 elif [ "X${ENGINE}" = "Xcrux" ]
 then
 	PVP=(${PV//[-\._]/ })
 	SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.bz2"
-	
+
 elif [ "X${MY_PN}" = "Xgtk-engines" ] && [ "$SLOT" -eq "2" ]
 then
 	PVP=(${PV//[-\._]/ })
@@ -159,9 +159,9 @@ gtk-engines_src_unpack() {
 
 gtk-engines_src_compile() {
 	econf || die "./configure failed"
-	
+
 	[ "X${MY_PN}" = "Xgtk-engines" ] && cd ${ENGINE}
-	
+
 	emake || die "Compilation failed"
 }
 
@@ -172,7 +172,7 @@ gtk-engines_src_install() {
 	if [ "X${ENGINE}" = "Xxenophilia" ]
 	then
 		dodir /usr/X11R6/$(get_libdir)/X11/fonts/misc
-		
+
 		mv fonts/Makefile fonts/Makefile.orig
 		sed -e 's:/usr:${D}/usr:' \
 			-e 's:local:misc:' \
@@ -212,7 +212,7 @@ gtk-engines_src_install() {
 		else
 			rm -rf ${D}/usr/$(get_libdir)/gtk-2.0 ${D}/usr/share/themes/Geramik/gtk-2.0
 		fi
-		
+
 	elif [ "X${ENGINE}" = "Xlighthouseblue" ]
 	then
 		if [ "$SLOT" -eq "2" ]
@@ -224,7 +224,7 @@ gtk-engines_src_install() {
 				${D}/usr/share/themes/LighthouseBlue/gtk-2.0
 		fi
 	fi
-	
+
 	for doc in AUTHORS BUGS ChangeLog CONFIGURATION COPYING CUSTOMIZATION \
 		NEWS README THANKS TODO
 	do
@@ -256,5 +256,5 @@ fonts_notice() {
 	einfo ""
 	einfo "  xset fp rehash"
 }
-										
+
 EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst pkg_postrm
diff --git a/eclass/gtk-engines2.eclass b/eclass/gtk-engines2.eclass
index ae4d62221a41..cf3628a1b2e2 100644
--- a/eclass/gtk-engines2.eclass
+++ b/eclass/gtk-engines2.eclass
@@ -1,9 +1,9 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-engines2.eclass,v 1.11 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-engines2.eclass,v 1.12 2005/07/11 15:08:06 swegener Exp $
 
 # Author: Alastair Tse <liquidx@gentoo.org>
-# 
+#
 # This is a utility eclass for installing GTK+ Theme Engines. It detects
 # whether gtk+-1 and/or gtk+-2 is installed and sets up variables to help with
 # installing the engines into the right position.
@@ -17,11 +17,11 @@
 # *** NOTE *** If your engine has both GTK+1 and GTK+2 versions :
 #
 #  Set the following variables if they are in different directories:
-# 
+#
 #  GTK1_S  -- GTK+1 Source Directory
 #  GTK2_S  -- GTK+2 Source Directory
 #
-#  Also note you should not set DEPEND and let the eclass set the dependencies 
+#  Also note you should not set DEPEND and let the eclass set the dependencies
 #
 # Comments:
 #
@@ -33,12 +33,12 @@
 # in this case. We install the whole package of themes available, both
 # GTK+1 and GTK+2 if available. We assume that the user would want both
 # since the space savings are negligible.
-# 
+#
 # Note that this deals specifically with GTK ENGINES and not GTK THEMES. Some
 # engines have themes that accompany them, and they are thus installed. You
 # should not be using this eclass (it won't help anyway) if you are making
 # a pure GTK+ theme ebuild.
-# 
+#
 # - liquidx@gentoo.org (16 Jun 2003)
 
 inherit eutils
@@ -52,7 +52,7 @@ HOMEPAGE="http://art.gnome.org/ http://themes.freshmeat.net/"
 if has_version "=x11-libs/gtk+-1.2*"; then
 	HAS_GTK1=1
 	GTK1_ENGINES_DIR=/usr/$(get_libdir)/gtk/themes/engines
-fi	
+fi
 
 if has_version ">=x11-libs/gtk+-2" || use gtk2; then
 	HAS_GTK2=1
@@ -79,14 +79,14 @@ if ! has_version "x11-libs/gtk+"; then
 	use gtk2 \
 		&& HAS_GTK2=1 \
 		|| HAS_GTK1=1
-fi		
+fi
 
 # --- if GTK1_S and GTK2_S is set, then we do both themes,
 # --- otherwise, just do the normal src_compile/install wrap.
 
 gtk-engines2_src_compile() {
-	
-	if [ -n "${GTK2_S}" -a -n "${GTK1_S}" ]; then 
+
+	if [ -n "${GTK2_S}" -a -n "${GTK1_S}" ]; then
 		if [ -n "${HAS_GTK2}" ]; then
 			cd ${GTK2_S}
 			econf || die "gtk2 configure failed"
@@ -108,7 +108,7 @@ DEFAULT_DOCS="COPYING README NEWS AUTHORS ChangeLog INSTALL"
 
 gtk-engines2_src_install() {
 
-	if [ -n "${GTK2_S}" -a -n "${GTK1_S}" ]; then 
+	if [ -n "${GTK2_S}" -a -n "${GTK1_S}" ]; then
 		if [ -n "${HAS_GTK2}" ]; then
 			cd ${GTK2_S}
 			make DESTDIR=${D} install || die "gtk2 install failed"
@@ -121,14 +121,13 @@ gtk-engines2_src_install() {
 			make DESTDIR=${D} install || die "gtk1 install failed"
 			for x in ${DEFAULT_DOCS} ${DOCS}; do
 				newdoc ${x} ${x}.gtk1
-			done		
+			done
 	    fi
 	else
 		cd ${S}
 		make DESTDIR=${D} ${@} install || die "install failed"
 		dodoc ${DEFAULT_DOCS} ${DOCS}
-   	fi		
+	fi
 }
 
 EXPORT_FUNCTIONS src_compile src_install
-
diff --git a/eclass/gtk-sharp-component.eclass b/eclass/gtk-sharp-component.eclass
index 8ba3b2260cac..d5014a71691c 100644
--- a/eclass/gtk-sharp-component.eclass
+++ b/eclass/gtk-sharp-component.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-component.eclass,v 1.18 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-component.eclass,v 1.19 2005/07/11 15:08:06 swegener Exp $
 
 # Author : Peter Johanson <latexer@gentoo.org>
 # Based off of original work in gst-plugins.eclass by <foser@gentoo.org>
@@ -58,8 +58,7 @@ SRC_URI="${SOURCE_SERVER}/${MY_P}.tar.gz
 S=${WORKDIR}/${MY_P}
 
 # Make sure we're building with the same version.
-DEPEND="${DEPEND}
-	=dev-dotnet/${MY_P}*
+DEPEND="=dev-dotnet/${MY_P}*
 	sys-devel/automake
 	sys-devel/autoconf
 	>=sys-apps/sed-4"
@@ -109,7 +108,6 @@ gtk-sharp-component_fix_makefiles() {
 	fi
 }
 
-	
 gtk-sharp-component_src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -134,12 +132,12 @@ gtk-sharp-component_src_unpack() {
 	sed -i -e "s:sample::" ${S}/Makefile.in || die
 
 	cd ${S}/${GTK_SHARP_COMPONENT_BUILD_DIR}
-	
+
 	gtk-sharp-component_fix_makefiles
 }
 
 gtk-sharp-component_src_configure() {
-	
+
 	# disable any external plugin besides the plugin we want
 	local component deps gtk_sharp_conf
 
diff --git a/eclass/horde.eclass b/eclass/horde.eclass
index 956ad10f2d9c..b2f7d47e1c8b 100644
--- a/eclass/horde.eclass
+++ b/eclass/horde.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/horde.eclass,v 1.23 2005/07/06 23:07:38 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/horde.eclass,v 1.24 2005/07/11 15:08:06 swegener Exp $
 #
 # Help manage the horde project http://www.horde.org/
 #
@@ -9,7 +9,7 @@
 # SNAP additions by Jonathan Polansky <jpolansky@lsit.ucsb.edu>
 #
 # This eclass provides generic functions to make the writing of horde
-# ebuilds fairly trivial since there are many horde applications and 
+# ebuilds fairly trivial since there are many horde applications and
 # they all share the same basic install process.
 
 # EHORDE_SNAP
@@ -131,7 +131,7 @@ horde_pkg_postinst() {
 	if [[ ${EHORDE_CVS} = "true" ]] ; then
 		ewarn
 		ewarn "Use these CVS versions at your own risk."
-		ewarn "They tend to break things when working with" 
+		ewarn "They tend to break things when working with"
 		ewarn "the non CVS versions of horde."
 	fi
 	if use vhosts ; then
diff --git a/eclass/jakarta-commons.eclass b/eclass/jakarta-commons.eclass
index f6af5a7820c5..69035354f412 100644
--- a/eclass/jakarta-commons.eclass
+++ b/eclass/jakarta-commons.eclass
@@ -1,34 +1,32 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/jakarta-commons.eclass,v 1.18 2005/07/06 20:49:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/jakarta-commons.eclass,v 1.19 2005/07/11 15:08:06 swegener Exp $
 
 inherit base java-pkg
 
-IUSE="${IUSE} jikes junit"
+IUSE="jikes junit"
 
 DESCRIPTION="Based on the $ECLASS eclass"
 HOMEPAGE="http://jakarta.apache.org/"
 
 # deps on the build tools
-DEPEND="$DEPEND
-        >=virtual/jdk-1.3
-        >=dev-java/ant-1.4
-        >=dev-java/log4j-1.2
-        junit? ( >=dev-java/junit-3.7 )
-        jikes? ( >=dev-java/jikes-1.18 )"
+DEPEND=">=virtual/jdk-1.3
+	>=dev-java/ant-1.4
+	>=dev-java/log4j-1.2
+	junit? ( >=dev-java/junit-3.7 )
+	jikes? ( >=dev-java/jikes-1.18 )"
 
-RDEPEND="$RDEPEND >=virtual/jdk-1.3"
-SLOT="$SLOT"
+RDEPEND=">=virtual/jdk-1.3"
 
 #jakarta-commons_src_unpack() {
 #
 #	debug-print-function $FUNCNAME $*
-#	
+#
 #	# call base_src_unpack, which implements most of the functionality and has sections,
 #	# unlike this function. The change from base_src_unpack to kde_src_unpack is thus
 #	# wholly transparent for ebuilds.
 #	base_src_unpack $*
-#	
+#
 #	cd ${S}
 #	debug-print "$FUNCNAME: Unpacked to $PWD"
 #}
diff --git a/eclass/java-pkg.eclass b/eclass/java-pkg.eclass
index 22ca691a3728..1b63ca797257 100644
--- a/eclass/java-pkg.eclass
+++ b/eclass/java-pkg.eclass
@@ -1,9 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg.eclass,v 1.25 2005/07/06 20:23:20 agriffis Exp $
-
-IUSE="${IUSE}"
-SLOT="${SLOT}"
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg.eclass,v 1.26 2005/07/11 15:08:06 swegener Exp $
 
 pkglistpath="${T}/java-pkg-list"
 
@@ -193,7 +190,7 @@ java-pkg_dojar()
 	java-pkg_do_write_
 }
 
-java-pkg_newjar() 
+java-pkg_newjar()
 {
 	if [ -z "${T}" ] || [ -z "${2}" ] ; then
 		die "java-pkg_newjar: Nothing defined to do"
@@ -347,7 +344,7 @@ java-pkg_sointo()
 java-pkg_dosrc() {
 	java-pkg_do_init_
 
-	[ $# -lt 1 ] && die "${FUNCNAME[0]}: at least one argument needed" 
+	[ $# -lt 1 ] && die "${FUNCNAME[0]}: at least one argument needed"
 
 	local target="${shareroot}/source/"
 
diff --git a/eclass/java.eclass b/eclass/java.eclass
index 36f74e5c55bf..42fab717f175 100644
--- a/eclass/java.eclass
+++ b/eclass/java.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/java.eclass,v 1.22 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java.eclass,v 1.23 2005/07/11 15:08:06 swegener Exp $
 #
 # Author: Karl Trygve Kalleberg <karltk@gentoo.org>
 
@@ -100,4 +100,3 @@ java_mozilla_clean_() {
 		rm -f ${file}
 	done
 }
-
diff --git a/eclass/kde-dist.eclass b/eclass/kde-dist.eclass
index 234f86c5250f..14fd22cbcfa4 100644
--- a/eclass/kde-dist.eclass
+++ b/eclass/kde-dist.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-dist.eclass,v 1.66 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-dist.eclass,v 1.67 2005/07/11 15:08:06 swegener Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 #
@@ -11,7 +11,7 @@ inherit kde
 
 # kde 3.1 prereleases have tarball versions of 3.0.6 ff
 unset SRC_URI
-case "$PV" in
+case "${PV}" in
 	1*)			SRC_PATH="stable/3.0.2/src/${P}.tar.bz2";; # backward compatibility for unmerging ebuilds
 	2.2.2a)			SRC_PATH="2.2.2/src/${PN}-${PV/a/}.tar.bz2" ;;
 	2.2.2*)			SRC_PATH="2.2.2/src/${P}.tar.bz2" ;;
@@ -23,11 +23,11 @@ case "$PV" in
 	3.4.0)			SRC_PATH="stable/3.4/src/${P}.tar.bz2" ;;
 	3*)			SRC_PATH="stable/${PV}/src/${P}.tar.bz2" ;;
 	5)			SRC_URI="" # cvs ebuilds, no SRC_URI needed
-				debug-print "$ECLASS: cvs detected" ;;
-	*)			debug-print "$ECLASS: Error: unrecognized version $PV, could not set SRC_URI" ;;
+				debug-print "${ECLASS}: cvs detected" ;;
+	*)			debug-print "${ECLASS}: Error: unrecognized version $PV, could not set SRC_URI" ;;
 esac
-[ -n "$SRC_PATH" ] && SRC_URI="$SRC_URI mirror://kde/$SRC_PATH"
-debug-print "$ECLASS: finished, SRC_URI=$SRC_URI"
+[ -n "${SRC_PATH}" ] && SRC_URI="${SRC_URI} mirror://kde/${SRC_PATH}"
+debug-print "${ECLASS}: finished, SRC_URI=${SRC_URI}"
 
 need-kde ${PV}
 
@@ -39,7 +39,7 @@ need-kde ${PV}
 DESCRIPTION="KDE ${PV} - "
 HOMEPAGE="http://www.kde.org/"
 LICENSE="GPL-2"
-SLOT="$KDEMAJORVER.$KDEMINORVER"
+SLOT="${KDEMAJORVER}.${KDEMINORVER}"
 
 # add blockers on split packages derived from this one
 for x in $(get-child-packages ${CATEGORY}/${PN}); do
diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass
index 15696a7b75de..dfb9b2c1917c 100644
--- a/eclass/kde-functions.eclass
+++ b/eclass/kde-functions.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.116 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.117 2005/07/11 15:08:06 swegener Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 #
@@ -423,7 +423,7 @@ deprange-list() {
 	if [ "${MAXVER%.*}" != "$BASEVER" ]; then
 		die "deprange(): unsupported parameters $MINVER $MAXVER - BASEVER must be identical"
 	fi
-	
+
 	# Get version suffixes
 	local MINSUFFIX MAXSUFFIX
 	if [ "$MINVER" != "${MINVER/_}" ]; then
@@ -438,7 +438,7 @@ deprange-list() {
 	else
 		SUFFIXLESSMAXVER=$MAXVER
 	fi
-	
+
 	# Separate out the optional lower bound revision number
 	if [ "$MINVER" != "${MINVER/-}" ]; then
 		local MINREV=${MINVER##*-}
@@ -462,13 +462,13 @@ deprange-list() {
 		# If the range bounds differ only by their suffixes
 		elif [ "$MINMINOR" == "$MAXMINOR" ]; then
 			NEWDEP="$(deprange-iterate-suffixes ~$PACKAGE-$BASEVER.$MINMINOR $MINSUFFIX $MAXSUFFIX)"
-			
+
 			# Revision constraint on lower bound
 			if [ -n "$MINREV" ]; then
 				NEWDEP="$NEWDEP
 						$(deprange-iterate-numbers =$PACKAGE-$BASEVER.${MINMINOR}_$MINSUFFIX-r $MINREV 99)"
 			fi
-			
+
 		# If the minor version numbers are different too
 		else
 
@@ -476,14 +476,14 @@ deprange-list() {
 			if [ -n "$MAXSUFFIX" ]; then
 				NEWDEP="$(deprange-iterate-suffixes ~$PACKAGE-$BASEVER.$MAXMINOR alpha1 $MAXSUFFIX)"
 			fi
-			
+
 			# regular versions in between
 			if [ -n "$MINREV" -a -z "$MINSUFFIX" ]; then
 				let MAXMINOR++
 			fi
 			NEWDEP="$NEWDEP
 					$(deprange-iterate-numbers ~${PACKAGE}-${BASEVER}. $MINMINOR $MAXMINOR)"
-		
+
 			# Min version's allowed suffixes
 			if [ -n "$MINSUFFIX" ]; then
 				NEWDEP="$NEWDEP
@@ -500,7 +500,7 @@ deprange-list() {
 						$(deprange-iterate-numbers $BASE ${MINREV#r} 99)"
 			fi
 		fi
-		
+
 		# Output
 		echo -n $NEWDEP
 	done
@@ -522,13 +522,13 @@ deprange-iterate-numbers() {
 # eg: deprange-iterate-suffixes ~kde-base/libkonq-3.4.0 alpha8 beta2
 deprange-iterate-suffixes() {
 	local NAME=$1 MINSUFFIX=$2 MAXSUFFIX=$3
-	
+
 	# Separate out the optional lower bound revision number
 	if [ "$MINSUFFIX" != "${MINSUFFIX/-}" ]; then
 		local MINREV=${MINSUFFIX##*-}
 	fi
 	MINSUFFIX=${MINSUFFIX%-*}
-	
+
 	# Separate out the version suffixes
 	local MINalpha MINbeta MINpre MINrc
 	if [ "$MINSUFFIX" != "${MINSUFFIX/alpha}" ]; then
@@ -554,20 +554,20 @@ deprange-iterate-suffixes() {
 	else
 		die "deprange(): version suffix $MAXSUFFIX (probably _pN) not supported"
 	fi
-	
+
 	local started="" NEWDEP="" var
-	
+
 	# Loop over version suffixes
 	for suffix in rc pre beta alpha; do
 		local upper="" lower=""
-		
+
 		# If -n $started, we've encountered the upper bound in a previous iteration
 		# and so we use the maximum allowed upper bound for this prefix
 		if [ -n "$started" ]; then
 			upper=10
-			
+
 		else
-		
+
 			# Test for the upper bound in the current iteration
 			var=MAX$suffix
 			if [ -n "${!var}" ]; then
@@ -575,29 +575,29 @@ deprange-iterate-suffixes() {
 				started=yes
 			fi
 		fi
-		
+
 		# If the upper bound has been found
 		if [ -n "$upper" ]; then
-		
+
 			# Test for the lower bound in the current iteration (of the loop over prefixes)
 			var=MIN$suffix
 			if [ -n "${!var}" ]; then
 				lower=${!var}
-				
+
 				# If the lower bound has a revision number, don't touch that yet
 				if [ -n "$MINREV" ]; then
 					let lower++
 				fi
-				
+
 			# If not found, we go down to the minimum allowed for this prefix
 			else
 				lower=1
 			fi
-			
+
 			# Add allowed versions with this prefix
 			NEWDEP="$NEWDEP
 					$(deprange-iterate-numbers ${NAME}_${suffix} $lower $upper)"
-					
+
 			# If we've encountered the lower bound on this iteration, don't consider additional prefixes
 			if [ -n "${!var}" ]; then
 				break
@@ -929,7 +929,7 @@ kde_remove_flag() {
 }
 
 # is this a kde-base ebuid?
-if [ "$CATEGORY" == "kde-base" ]; then
-	debug-print "$ECLASS: KDEBASE ebuild recognized"
+if [ "${CATEGORY}" == "kde-base" ]; then
+	debug-print "${ECLASS}: KDEBASE ebuild recognized"
 	export KDEBASE="true"
 fi
diff --git a/eclass/kde-meta.eclass b/eclass/kde-meta.eclass
index afb24e20a6dd..148a5f6ce774 100644
--- a/eclass/kde-meta.eclass
+++ b/eclass/kde-meta.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-meta.eclass,v 1.40 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-meta.eclass,v 1.41 2005/07/11 15:08:06 swegener Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 # Simone Gotti <motaboy@gentoo.org>
@@ -8,7 +8,7 @@
 # This is the kde-meta eclass which supports broken-up kde-base packages.
 
 inherit kde multilib
-IUSE="$IUSE kdexdeltas" 
+IUSE="$IUSE kdexdeltas"
 
 # only broken-up ebuilds can use this eclass
 if [ -z "$KMNAME" ]; then
@@ -16,7 +16,7 @@ if [ -z "$KMNAME" ]; then
 fi
 
 # Replace the $myPx mess - it was ugly as well as not general enough for 3.4.0-rc1
-# The following code should set TARBALLVER (the version in the tarball's name) 
+# The following code should set TARBALLVER (the version in the tarball's name)
 # and TARBALLDIRVER (the version of the toplevel directory inside the tarball).
 case "$PV" in
 	3.4.0_alpha1)	TARBALLDIRVER="3.3.90"; TARBALLVER="3.3.90" ;;
@@ -36,14 +36,14 @@ TARBALL="$KMNAME-$TARBALLVER.tar.bz2"
 # BEGIN adapted from kde-dist.eclass, code for older versions removed for cleanness
 if [ "$KDEBASE" = "true" ]; then
 	unset SRC_URI
-	
+
 	need-kde $PV
-	
+
 	DESCRIPTION="KDE ${PV} - "
 	HOMEPAGE="http://www.kde.org/"
 	LICENSE="GPL-2"
 	SLOT="$KDEMAJORVER.$KDEMINORVER"
-	
+
 	# Main tarball for normal downloading style
 	# Note that we set SRC_PATH, and add it to SRC_URI later on
 	case "$PV" in
@@ -52,7 +52,7 @@ if [ "$KDEBASE" = "true" ]; then
 		3*)			SRC_PATH="stable/$TARBALLVER/src/$TARBALL" ;;
 		*)			die "$ECLASS: Error: unrecognized version $PV, could not set SRC_URI" ;;
 	esac
-	
+
 	# Base tarball and xdeltas for patch downloading style
 	# Note that we use XDELTA_BASE, XDELTA_DELTA again in src_unpack()
 	# For future versions, add all applicable xdeltas (from x.y.0) in correct order to XDELTA_DELTA
@@ -73,9 +73,9 @@ if [ "$KDEBASE" = "true" ]; then
 					# don't have prerelease tarballs handy
 		3.4.1)		XDELTA_BASE="stable/3.4/src/$KMNAME-3.4.0.tar.bz2"
 				XDELTA_DELTA="stable/3.4.1/src/$KMNAME-3.4.0-3.4.1.tar.xdelta"
-				;;			
+				;;
 		*)		;;
-	esac	
+	esac
 
 elif [ "$KMNAME" == "koffice" ]; then
 	SRC_PATH="stable/koffice-$PV/src/koffice-$PV.tar.bz2"
@@ -84,7 +84,7 @@ elif [ "$KMNAME" == "koffice" ]; then
 			SRC_PATH="stable/koffice-$PV/src/koffice-$PV.tar.bz2"
 			XDELTA_BASE=""
 			XDELTA_DELTA=""
-			;;	
+			;;
 		1.3.5)
 			SRC_PATH="stable/koffice-$PV/src/koffice-$PV.tar.bz2"
 			XDELTA_BASE="stable/koffice-1.3.4/src/koffice-1.3.4.tar.bz2"
@@ -113,7 +113,7 @@ if [ -n "$XDELTA_BASE" ]; then # depends on $PV only, so is safe to modify SRC_U
 else # xdelta don't available, for example with kde 3.4 alpha/beta/rc ebuilds.
 	SRC_URI="$SRC_URI mirror://kde/$SRC_PATH"
 fi
-	
+
 debug-print "$ECLASS: finished, SRC_URI=$SRC_URI"
 
 # Necessary dep for xdeltas. Hope like hell it doesn't worm its way into RDEPEND
@@ -133,13 +133,13 @@ fi
 
 # TODO FIX: Temporary place for code common to all ebuilds derived from any one metapackage.
 
-# kdebase: all configure.in's talk about java. Need to investigate which ones 
+# kdebase: all configure.in's talk about java. Need to investigate which ones
 # actually need it.
 if [ "$KMNAME" == "kdebase" ]; then
 	IUSE="$IUSE java"
 	DEPEND="$DEPEND java? ( || ( virtual/jdk virtual/jre ) )"
 	RDEPEND="$RDEPEND java? ( || ( virtual/jdk virtual/jre ) )"
-	
+
 	# bug 82032: the configure check for java is unnecessary as well as broken
 	myconf="$myconf --without-java"
 fi
@@ -147,7 +147,7 @@ fi
 # TODO FIX ends
 
 # Set the following variables in the ebuild. Only KMNAME must be set, the rest are optional.
-# A directory or file can be a path with any number of components (eg foo/bar/baz.h). 
+# A directory or file can be a path with any number of components (eg foo/bar/baz.h).
 # Do not include the same item in more than one of KMMODULE, KMMEXTRA, KMCOMPILEONLY, KMEXTRACTONLY, KMCOPYLIB.
 #
 # KMNAME: name of the metapackage (eg kdebase, kdepim). Must be set before inheriting this eclass
@@ -161,7 +161,7 @@ fi
 # Makefiles are created automagically to compile/install the correct files. Observe these rules:
 # - Don't specify the same file in more than one of the three variables.
 # - When using KMEXTRA, remember to add the doc/foo dir for the extra dirs if one exists.
-# - KMEXTRACTONLY take effect over an entire directory tree, you can override it defining 
+# - KMEXTRACTONLY take effect over an entire directory tree, you can override it defining
 # KMEXTRA, KMCOMPILEONLY for every subdir that must have a different behavior.
 # eg. you have this tree:
 # foo/bar
@@ -174,7 +174,7 @@ fi
 #
 # IMPORTANT!!! you can't define a KMCOMPILEONLY SUBDIR if its parents are defined as KMEXTRA or KMMODULE. or it will be installed anywhere. To avoid this probably are needed some chenges to the generated Makefile.in.
 #
-# KMCOPYLIB: Contains an even number of $IFS (i.e. whitespace) -separated words. 
+# KMCOPYLIB: Contains an even number of $IFS (i.e. whitespace) -separated words.
 # Each two consecutive words, libname and dirname, are considered. symlinks are created under $S/$dirname
 # pointing to $PREFIX/lib/libname*.
 
@@ -211,7 +211,7 @@ function change_makefiles() {
 
 	cd $1
 	debug-print "We are in `pwd`"
-	
+
 	# check if the dir is defined as KMEXTRACTONLY or if it was defined is KMEXTRACTONLY in the parent dir, this is valid only if it's not also defined as KMMODULE, KMEXTRA or KMCOMPILEONLY. They will ovverride KMEXTRACTONLY, but only in the current dir.
 	isextractonly="false"
 	if ( ( hasq "$1" $KMEXTRACTONLYFULLPATH || [ $2 = "true" ] ) && \
@@ -219,7 +219,7 @@ function change_makefiles() {
 		isextractonly="true"
 	fi
 	debug-print "isextractonly = $isextractonly"
-	
+
 	dirlistfullpath=
 	for item in *; do
 		if [ -d "$item" ] && [ "$item" != "CVS" ] && [ "$S/$item" != "$S/admin" ]; then
@@ -228,10 +228,10 @@ function change_makefiles() {
 		fi
 	done
 	debug-print "dirlist = $dirlistfullpath"
-	
+
 	for directory in $dirlistfullpath; do
-		
-		if ( hasq "$1" $KMEXTRACTONLYFULLPATH || [ $2 = "true" ] ); then 
+
+		if ( hasq "$1" $KMEXTRACTONLYFULLPATH || [ $2 = "true" ] ); then
 			change_makefiles $directory 'true'
 		else
 			change_makefiles $directory 'false'
@@ -239,12 +239,12 @@ function change_makefiles() {
 		# come back to our dir
 		cd $1
 	done
-	
+
 	cd $1
 	debug-print "Come back to `pwd`"
 	debug-print "dirlist = $dirlistfullpath"
 	if [ $isextractonly = "true" ] || [ ! -f Makefile.am ] ; then
-		# if this is a latest subdir 
+		# if this is a latest subdir
 		if [ -z "$dirlistfullpath" ]; then
 			debug-print "dirlist is empty => we are in the latest subdir"
 			echo 'all:' > Makefile.am
@@ -282,19 +282,19 @@ function kde-meta_src_unpack() {
 	debug-print-function $FUNCNAME $*
 
 	set_common_variables
-	
+
 	sections="$@"
 	[ -z "$sections" ] && sections="unpack makefiles"
 	for section in $sections; do
 	case $section in
 	unpack)
-		
+
 		# kdepim packages all seem to rely on libkdepim/kdepimmacros.h
 		# also, all kdepim Makefile.am's reference doc/api/Doxyfile.am
 		if [ "$KMNAME" == "kdepim" ]; then
 			KMEXTRACTONLY="$KMEXTRACTONLY libkdepim/kdepimmacros.h doc/api"
 		fi
-		
+
 		# Create final list of stuff to extract
 		extractlist=""
 		for item in admin Makefile.am Makefile.am.in configure.in.in configure.in.mid configure.in.bot \
@@ -324,21 +324,21 @@ function kde-meta_src_unpack() {
 			KMTARPARAMS="$KMTARPARAMS -j"
 		fi
 		cd $WORKDIR
-		
+
 		echo ">>> Extracting from tarball..."
 		# Note that KMTARPARAMS is also used by an ebuild
 		tar -xpf $TARFILE $KMTARPARAMS $extractlist	2> /dev/null
-		
+
 		# Avoid syncing if possible
 		# No idea what the above comment means...
 		if [ -n "$RAWTARBALL" ]; then
 			rm -f $T/$RAWTARBALL
 		fi
-		
+
 		# Default $S is based on $P not $myP; rename the extracted dir to fit $S
 		mv $KMNAME-$TARBALLDIRVER $P || die
 		S=$WORKDIR/$P
-		
+
 		# Copy over KMCOPYLIB items
 		libname=""
 		for x in $KMCOPYLIB; do
@@ -358,15 +358,15 @@ function kde-meta_src_unpack() {
 				libname=""
 			fi
 		done
-	
+
 		# apply any patches
 		kde_src_unpack autopatch
-	
+
 		# kdebase: Remove the installation of the "startkde" script.
 		if [ "$KMNAME" == "kdebase" ]; then
 			sed -i -e s:"bin_SCRIPTS = startkde"::g ${S}/Makefile.am.in
 		fi
-		
+
 		# Visiblity stuff is way broken! Just disable it when it's present
 		# until upstream finds a way to have it working right.
 		if grep KDE_ENABLE_HIDDEN_VISIBILITY configure.in &> /dev/null || ! [[ -f configure ]]; then
@@ -384,7 +384,7 @@ function kde-meta_src_unpack() {
 		# Create Makefile.am files
 		create_fullpaths
 		change_makefiles $S "false"
-	
+
 		# for ebuilds with extended src_unpack
 		cd $S
 
@@ -395,10 +395,10 @@ function kde-meta_src_unpack() {
 
 function kde-meta_src_compile() {
 	debug-print-function $FUNCNAME $*
-	
-	set_common_variables	
 
-	# kdebase: all configure.in's talk about java. Need to investigate which ones 
+	set_common_variables
+
+	# kdebase: all configure.in's talk about java. Need to investigate which ones
 	# actually need it.
 	if [ "$KMNAME" == "kdebase" ]; then
 		if use java ; then
@@ -411,7 +411,7 @@ function kde-meta_src_compile() {
 			myconf="$myconf --without-java"
 		fi
 	fi
-	
+
 	# confcache support. valid only for my (danarmak's) port of stuart's confcache to portage .51,
 	# not for stuart's orig version or ferringb's ebuild-daemon version.
 	# this could be replaced by just using econf, but i don't want to make that change in kde.eclass
@@ -423,7 +423,7 @@ function kde-meta_src_compile() {
 		if [ "$section" == "configure" ]; then
 			# don't log makefile.common stuff in confcache
 			[ ! -f "Makefile.in" ] && make -f admin/Makefile.common
- 			confcache_start
+			confcache_start
 			myconf="$EXTRA_ECONF $myconf"
 		fi
 		kde_src_compile $section
@@ -435,9 +435,9 @@ function kde-meta_src_compile() {
 
 function kde-meta_src_install() {
 	debug-print-function $FUNCNAME $*
-	
+
 	set_common_variables
-	
+
 	if [ "$1" == "" ]; then
 		kde-meta_src_install make dodoc
 	fi
@@ -445,7 +445,7 @@ function kde-meta_src_install() {
 		case $1 in
 		    make)
 				for dir in $KMMODULE $KMEXTRA $DOCS; do
-					if [ -d $S/$dir ]; then 
+					if [ -d $S/$dir ]; then
 						cd $S/$dir
 						make DESTDIR=${D} destdir=${D} install || die
 					fi
@@ -460,7 +460,7 @@ function kde-meta_src_install() {
 		esac
 		shift
 	done
-}	
+}
 
 EXPORT_FUNCTIONS src_unpack src_compile src_install
 
diff --git a/eclass/kde-source.eclass b/eclass/kde-source.eclass
index 55fa8e26d862..6e1517f5ee17 100644
--- a/eclass/kde-source.eclass
+++ b/eclass/kde-source.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-source.eclass,v 1.22 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-source.eclass,v 1.23 2005/07/11 15:08:06 swegener Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 #
@@ -63,10 +63,10 @@ SRC_URI=""
 
 
 if [ -n "$KCVS_SUBDIR" -o -n "$KCVS_MODULE" ]; then
-    S="$WORKDIR/$KCVS_MODULE"
+	S="$WORKDIR/$KCVS_MODULE"
 else
-    # default for kde-base ebuilds
-    S="$WORKDIR/${ECVS_MODULE:-$PN}"
+	# default for kde-base ebuilds
+	S="$WORKDIR/${ECVS_MODULE:-$PN}"
 fi
 
 
@@ -86,7 +86,7 @@ kde-source_src_unpack() {
 	    ECVS_MODULE="$PN"
 	fi
 
-        cvs_src_unpack
+	cvs_src_unpack
 
 	# subdirs of kde modules get special treatment that is designed for
 	# subdirs which are separate selfcontained apps and only need
@@ -98,12 +98,12 @@ kde-source_src_unpack() {
 	# ECVS_LOCALNAME note: disabled when KCVS_SUBDIR is enabled because the logic
 	# of how it should work is unclear and I don't see any need for it here anyway
 	if [ -n "$KCVS_SUBDIR" ]; then
-	
+
 		if [ -n "$KCVS_BRANCH" ]; then
 		    ECVS_BRANCH2="$ECVS_BRANCH"
 		    ECVS_BRANCH="$KCVS_BRANCH"
 		fi
-		
+
 		ECVS_MODULE="$KCVS_MODULE" ECVS_LOCAL=yes cvs_src_unpack
 
 		# we need the <module>/doc/<name> directory too,
@@ -118,7 +118,7 @@ kde-source_src_unpack() {
 		if [ -z "$KCVS_SUBDIR_NODOC" ] && [ -d "$ECVS_TOP_DIR/$KCVS_MODULE/doc/$KCVS_SUBDIR" -o "$ECVS_SERVER" != "offline" ]; then
 			ECVS_MODULE="${KCVS_MODULE}/doc/${KCVS_SUBDIR}" cvs_src_unpack
 		fi
-		
+
 		if [ -n "$KCVS_BRANCH" ]; then
 		    ECVS_BRANCH="$ECVS_BRANCH2"
 		fi
diff --git a/eclass/kde.eclass b/eclass/kde.eclass
index 570b28fa4d3a..728beea28cf8 100644
--- a/eclass/kde.eclass
+++ b/eclass/kde.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.123 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.124 2005/07/11 15:08:06 swegener Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 #
@@ -39,14 +39,14 @@ kde_pkg_setup() {
 
 kde_src_unpack() {
 	debug-print-function $FUNCNAME $*
-	
+
 	# call base_src_unpack, which implements most of the functionality and has sections,
 	# unlike this function. The change from base_src_unpack to kde_src_unpack is thus
 	# wholly transparent for ebuilds.
 	base_src_unpack $*
-	
+
 	# kde-specific stuff stars here
-	
+
 	# fix the 'languageChange undeclared' bug group: touch all .ui files, so that the
 	# makefile regenerate any .cpp and .h files depending on them.
 	cd $S
@@ -59,7 +59,7 @@ kde_src_unpack() {
 		debug-print "$FUNCNAME: touching .ui files..."
 		touch $UIFILES
 	fi
-	
+
 	# Visiblity stuff is way broken! Just disable it when it's present
 	# until upstream finds a way to have it working right.
 	if grep KDE_ENABLE_HIDDEN_VISIBILITY configure.in &> /dev/null || ! [[ -f configure ]]; then
@@ -85,9 +85,9 @@ kde_src_compile() {
 	export HOME="$T/fakehome"
 	addwrite "${QTDIR}/etc/settings"
 	# things that should access the real homedir
-	[ -d "$REALHOME/.ccache" ] && ln -sf "$REALHOME/.ccache" "$HOME/"	
+	[ -d "$REALHOME/.ccache" ] && ln -sf "$REALHOME/.ccache" "$HOME/"
 	[ -n "$UNSERMAKE" ] && addwrite "/usr/kde/unsermake"
-	
+
 	while [ "$1" ]; do
 
 		case $1 in
@@ -115,7 +115,7 @@ kde_src_compile() {
 				debug-print "$FUNCNAME::configure: myconf=$myconf"
 
 				# rebuild configure script, etc
-				# This can happen with e.g. a cvs snapshot			
+				# This can happen with e.g. a cvs snapshot
 				if [ ! -f "./configure" ] || [ -n "$UNSERMAKE" ]; then
 					for x in Makefile.cvs admin/Makefile.common; do
 						if [ -f "$x" ] && [ -z "$makefile" ]; then makefile="$x"; fi
@@ -128,7 +128,7 @@ kde_src_compile() {
 				fi
 
 				export PATH="${KDEDIR}/bin:${PATH}"
-				
+
 				# configure doesn't need to know about the other KDEs installed.
 				# in fact, if it does, it sometimes tries to use the wrong dcopidl, etc.
 				# due to the messed up way configure searches for things
@@ -150,7 +150,7 @@ kde_src_compile() {
 				./configure \
 					${myconf} \
 					|| die "died running ./configure, $FUNCNAME:configure"
-					
+
 				# Seems ./configure add -O2 by default but hppa don't want that but we need -ffunction-sections
 				if [ "${ARCH}" = "hppa" ]
 				then
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 40ccdaadec4c..7cadb0ed55cf 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.134 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.135 2005/07/11 15:08:06 swegener Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -169,7 +169,7 @@ detect_version() {
 					mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}.tar.bz2"
 		UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV}.bz2"
 	fi
-	
+
 	# We need to set this using OKV, but we need to set it before we do any
 	# messing around with OKV based on RELEASETYPE
 	KV_FULL=${OKV}${EXTRAVERSION}
@@ -209,7 +209,7 @@ detect_version() {
 }
 
 kernel_is() {
-	[[ -z ${OKV} ]] && detect_version	
+	[[ -z ${OKV} ]] && detect_version
 	local operator test value x=0 y=0 z=0
 
 	case ${1} in
@@ -225,7 +225,7 @@ kernel_is() {
 		for((y=0; y<$((3 - ${#x})); y++)); do value="${value}0"; done
 		value="${value}${x}"
 		z=$((${z} + 1))
-		
+
 		case ${z} in
 		  1) for((y=0; y<$((3 - ${#KV_MAJOR})); y++)); do test="${test}0"; done;
 			 test="${test}${KV_MAJOR}";;
@@ -258,7 +258,7 @@ kernel_header_destdir() {
 if [[ ${ETYPE} == sources ]]; then
 	DEPEND="!build? ( sys-apps/sed
 					  >=sys-devel/binutils-2.11.90.0.31 )
-			doc? ( app-text/docbook-sgml-utils 
+			doc? ( app-text/docbook-sgml-utils
 				   app-text/xmlto )"
 	RDEPEND="${DEPEND}
 			!build? ( >=sys-libs/ncurses-5.2
@@ -272,7 +272,7 @@ if [[ ${ETYPE} == sources ]]; then
 elif [[ ${ETYPE} == headers ]]; then
 	DESCRIPTION="Linux system headers"
 	IUSE="${IUSE}"
-	
+
 	if [[ ${CTARGET} = ${CHOST} ]]; then
 		DEPEND="!virtual/os-headers"
 		PROVIDE="virtual/kernel virtual/os-headers"
@@ -289,7 +289,7 @@ fi
 #==============================================================
 unpack_2_4() {
 	# Kernel ARCH != portage ARCH
-	local ARCH=$(tc-arch-kernel)	
+	local ARCH=$(tc-arch-kernel)
 
 	cd ${S}
 	# this file is required for other things to build properly,
@@ -347,7 +347,7 @@ compile_headers() {
 	# if it exists.
 	[[ -n ${KBUILD_OUTPUT} ]] && unset KBUILD_OUTPUT
 
-	# if we couldnt obtain HOSTCFLAGS from the Makefile, 
+	# if we couldnt obtain HOSTCFLAGS from the Makefile,
 	# then set it to something sane
 	local HOSTCFLAGS=$(getfilevar HOSTCFLAGS ${S}/Makefile)
 	HOSTCFLAGS=${HOSTCFLAGS:--Wall -Wstrict-prototypes -O2 -fomit-frame-pointer}
@@ -355,7 +355,7 @@ compile_headers() {
 	# Kernel ARCH != portage ARCH
 	local KARCH=$(tc-arch-kernel)
 
-	# When cross-compiling, we need to set the ARCH/CROSS_COMPILE 
+	# When cross-compiling, we need to set the ARCH/CROSS_COMPILE
 	# variables properly or bad things happen !
 	local xmakeopts="ARCH=${KARCH}"
 	if [[ ${CTARGET} != ${CHOST} ]]; then
@@ -522,7 +522,7 @@ preinst_headers() {
 #==============================================================
 postinst_sources() {
 	local MAKELINK=0
-	
+
 	# if we have USE=symlink, then force K_SYMLINK=1
 	use symlink && K_SYMLINK=1
 
@@ -531,10 +531,10 @@ postinst_sources() {
 		[[ -h ${ROOT}usr/src/linux ]] && rm ${ROOT}usr/src/linux
 		MAKELINK=1
 	fi
-	
+
 	# if the link doesnt exist, lets create it
 	[[ ! -h ${ROOT}usr/src/linux ]] && MAKELINK=1
-	
+
 	if [[ ${MAKELINK} == 1 ]]; then
 		cd ${ROOT}usr/src
 		ln -sf linux-${KV_FULL} linux
@@ -601,7 +601,7 @@ setup_headers() {
 unipatch() {
 	local i x y z extention PIPE_CMD UNIPATCH_DROP KPATCH_DIR PATCH_DEPTH ELINE
 	local STRICT_COUNT PATCH_LEVEL myLC_ALL myLANG
-	
+
 	# set to a standard locale to ensure sorts are ordered properly.
 	myLC_ALL="${LC_ALL}"
 	myLANG="${LANG}"
@@ -760,7 +760,7 @@ unipatch() {
 
 	# clean up  KPATCH_DIR's - fixes bug #53610
 	for x in ${KPATCH_DIR}; do rm -Rf ${x}; done
-	
+
 	LC_ALL="${myLC_ALL}"
 	LANG="${myLANG}"
 }
@@ -781,12 +781,12 @@ getfilevar() {
 		basefname=$(basename ${2})
 		basedname=$(dirname ${2})
 		unset ARCH
-		
+
 		cd ${basedname}
 		echo -e "include ${basefname}\ne:\n\t@echo \$(${1})" | \
 			make ${BUILD_FIXES} -s -f - e 2>/dev/null
 		cd ${workingdir}
-		 
+
 		ARCH=${xarch}
 	fi
 }
diff --git a/eclass/kernel-mod.eclass b/eclass/kernel-mod.eclass
index 3bdd5884abca..b9c679004547 100644
--- a/eclass/kernel-mod.eclass
+++ b/eclass/kernel-mod.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-mod.eclass,v 1.12 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-mod.eclass,v 1.13 2005/07/11 15:08:06 swegener Exp $
 
 # This eclass provides help for compiling external kernel modules from
 # source.
@@ -85,7 +85,7 @@ kernel-mod_getversion ()
 
 kernel-mod_configoption_present ()
 {
-        [ -e "${KERNEL_DIR}/.config" ] || die "kernel has not been configured yet"
+	[ -e "${KERNEL_DIR}/.config" ] || die "kernel has not been configured yet"
 
 	if egrep "^CONFIG_${1}=[ym]" ${ROOT}/usr/src/linux/.config >/dev/null
 	then
@@ -161,7 +161,7 @@ kernel-mod_checkzlibinflate_configured ()
 	LINENO_START="`head -n $LINENO_END ${KERNEL_DIR}/lib/Config.in | grep -n 'if \[' | tail -n 1 | cut -d : -f 1`"
 	(( LINENO_AMOUNT = $LINENO_END - $LINENO_START ))
 	(( LINENO_END = $LINENO_END - 1 ))
-	
+
 	SYMBOLS="`head -n $LINENO_END ${KERNEL_DIR}/lib/Config.in | tail -n $LINENO_AMOUNT | sed -e 's/^.*\(CONFIG_[^\" ]*\).*/\1/g;'`"
 
 	# okay, now we have a list of symbols
@@ -208,34 +208,34 @@ kernel-mod_src_compile ()
 kernel-mod_is_2_4_kernel() {
 	kernel-mod_getversion
 
-    if [ "${KV_MAJOR}" -eq 2 -a "${KV_MINOR}" -eq 4 ]
-    then
-        return 0
-    else
-        return 1
-    fi
+	if [ "${KV_MAJOR}" -eq 2 -a "${KV_MINOR}" -eq 4 ]
+	then
+		return 0
+	else
+		return 1
+	fi
 }
 
 kernel-mod_is_2_5_kernel() {
 	kernel-mod_getversion
 
-    if [ "${KV_MAJOR}" -eq 2 -a "${KV_MINOR}" -eq 5 ]
-    then
-        return 0
-    else
-        return 1
-    fi
+	if [ "${KV_MAJOR}" -eq 2 -a "${KV_MINOR}" -eq 5 ]
+	then
+		return 0
+	else
+		return 1
+	fi
 }
 
 kernel-mod_is_2_6_kernel() {
 	kernel-mod_getversion
 
-    if [ "${KV_MAJOR}" -eq 2 -a "${KV_MINOR}" -eq 6 ]
-    then
-        return 0
-    else
-        return 1
-    fi
+	if [ "${KV_MAJOR}" -eq 2 -a "${KV_MINOR}" -eq 6 ]
+	then
+		return 0
+	else
+		return 1
+	fi
 }
 
 EXPORT_FUNCTIONS src_compile
diff --git a/eclass/kernel.eclass b/eclass/kernel.eclass
index 721abc0a29cd..e3f004e50aba 100644
--- a/eclass/kernel.eclass
+++ b/eclass/kernel.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel.eclass,v 1.58 2005/07/06 20:20:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel.eclass,v 1.59 2005/07/11 15:08:06 swegener Exp $
 #
 # This eclass contains the common functions to be used by all lostlogic
 # based kernel ebuilds
@@ -17,7 +17,7 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
 	fi
 fi
 
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/" 
+HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
 LICENSE="GPL-2"
 IUSE="build"
 
@@ -101,7 +101,7 @@ kernel_universal_unpack() {
 
 	if kernel_is_2_4 || [ ${ETYPE} == "headers" ]
 	then
-		# this file is required for other things to build properly, 
+		# this file is required for other things to build properly,
 		# so we autogenerate it
 		set_arch_to_kernel
 		make mrproper || die "make mrproper died"
@@ -177,7 +177,7 @@ kernel_src_install() {
 }
 
 kernel_pkg_preinst() {
-	if [ "$ETYPE" = "headers" ] 
+	if [ "$ETYPE" = "headers" ]
 	then
 		[ -L ${ROOT}usr/include/linux ] && rm ${ROOT}usr/include/linux
 		[ -L ${ROOT}usr/include/asm ] && rm ${ROOT}usr/include/asm
diff --git a/eclass/kmod.eclass b/eclass/kmod.eclass
index fd2e3d0e5266..4d72e944fdfb 100644
--- a/eclass/kmod.eclass
+++ b/eclass/kmod.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kmod.eclass,v 1.16 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kmod.eclass,v 1.17 2005/07/11 15:08:06 swegener Exp $
 
 # !!!!!!!!!!
 #
@@ -22,7 +22,7 @@
 
 # Variables you can use to change behavior
 #
-# KMOD_SOURCES - space seperated list of source to unpack in 
+# KMOD_SOURCES - space seperated list of source to unpack in
 #					   src_unpack() if you don't want ${A} unpacked.
 #
 # KMOD_KOUTPUT_PATCH - Patch to apply in src_unpack() if a seperate output
@@ -46,7 +46,7 @@ kmod_get_make_var ()
 }
 
 # getconfigvar() - Prints the value of a certain config varaible from the
-#				current kernel's config file. Will return "n" for an unset 
+#				current kernel's config file. Will return "n" for an unset
 #				option
 
 kmod_get_config_var()
@@ -128,7 +128,7 @@ get_kernel_info()
 		KV_MK_OUTPUT="${KV_MK_OUTPUT/\$(SUBLEVEL)/${KV_MK_PATCH}}"
 		KV_MK_OUTPUT="${KV_MK_OUTPUT/\$(EXTRAVERSION)/${KV_MK_TYPE}}"
 	fi
-	
+
 	if [ "$KV_MK_VERSION_FULL" != "${KV_DIR_VERSION_FULL}" ]; then
 		ewarn
 		ewarn "The kernel Makefile says that this is a ${KV_MK_VERSION_FULL} kernel"
@@ -233,7 +233,7 @@ kmod_do_buildpatches()
 			epatch ${KMOD_KOUTPUT_PATCH}
 	fi
 }
-	
+
 kmod_src_unpack ()
 {
 	check_KV
@@ -302,9 +302,9 @@ is_kernel() {
 	fi
 
 	if [ "${KV_MAJOR}" -eq "${1}" -a "${KV_MINOR}" -eq "${2}" ]
-	then    
+	then
 		return 0
-	else    
+	else
 		return 1
 	fi
 }
diff --git a/eclass/latex-package.eclass b/eclass/latex-package.eclass
index b3cac87c9734..62c2ed1d833d 100644
--- a/eclass/latex-package.eclass
+++ b/eclass/latex-package.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/latex-package.eclass,v 1.24 2005/07/06 20:20:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/latex-package.eclass,v 1.25 2005/07/11 15:08:06 swegener Exp $
 #
 # Author Matthew Turk <satai@gentoo.org>
 #
@@ -34,7 +34,7 @@
 #
 # The eClass automatically takes care of rehashing TeX's cache (ls-lR) after
 # installation and after removal, as well as creating final documentation from
-# TeX files that come with the source.  Note that we break TeX layout standards 
+# TeX files that come with the source.  Note that we break TeX layout standards
 # by placing documentation in /usr/share/doc/${PN}
 #
 # For examples of basic installations, check out dev-tex/aastex and
diff --git a/eclass/libtool.eclass b/eclass/libtool.eclass
index c4c983d98254..2fcdbd2944c4 100644
--- a/eclass/libtool.eclass
+++ b/eclass/libtool.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.49 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.50 2005/07/11 15:08:06 swegener Exp $
 #
 # Author: Martin Schlemmer <azarah@gentoo.org>
 #
@@ -86,7 +86,7 @@ ELT_walk_patches() {
 			if [[ -n ${x} && -f ${x} ]] ; then
 				local ltver=$(VER_to_int "${version}")
 				local ptver=$(VER_to_int "${x##*/}")
-				
+
 				# If libtool version smaller than patch version, skip patch.
 				[[ ${ltver} -lt ${ptver} ]] && continue
 				# For --remove-internal-dep ...
diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass
index 7b7cf66a505a..19c7aeec009f 100644
--- a/eclass/linux-info.eclass
+++ b/eclass/linux-info.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.28 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.29 2005/07/11 15:08:06 swegener Exp $
 #
 # Description: This eclass is used as a central eclass for accessing kernel
 #			   related information for sources already installed.
@@ -15,13 +15,13 @@
 
 # A Couple of env vars are available to effect usage of this eclass
 # These are as follows:
-# 
+#
 # Env Var	Option		Description
 # KERNEL_DIR	<string>	The directory containing kernel the target kernel
 #				sources.
 # CONFIG_CHECK	<string>	a list of .config options to check for before
 #				proceeding with the install. ie: CONFIG_CHECK="MTRR"
-#				You can also check that an option doesn't exist by 
+#				You can also check that an option doesn't exist by
 #				prepending it with an exclamation mark (!).
 #				ie: CONFIG_CHECK="!MTRR"
 # ERROR_CFG		<string>	The error message to display when the above check
@@ -34,7 +34,7 @@
 
 # There are also a couple of variables which are set by this, and shouldn't be
 # set by hand. These are as follows:
-# 
+#
 # Env Var		Option		Description
 # KV_FULL		<string>	The full kernel version. ie: 2.6.9-gentoo-johnm-r1
 # KV_MAJOR		<integer>	The kernel major version. ie: 2
@@ -61,8 +61,8 @@ KERNEL_DIR="${KERNEL_DIR:-${ROOT}usr/src/linux}"
 # Bug fixes
 # fix to bug #75034
 case ${ARCH} in
-    ppc)     	BUILD_FIXES="${BUILD_FIXES} TOUT=${T}/.tmp_gas_check";;
-    ppc64)      BUILD_FIXES="${BUILD_FIXES} TOUT=${T}/.tmp_gas_check";;
+	ppc)	BUILD_FIXES="${BUILD_FIXES} TOUT=${T}/.tmp_gas_check";;
+	ppc64)	BUILD_FIXES="${BUILD_FIXES} TOUT=${T}/.tmp_gas_check";;
 esac
 
 # These are legacy wrappers for toolchain-funcs.
@@ -189,12 +189,12 @@ kernel_is() {
 		esac
 	done
 
-	[ ${test} ${operator} ${value} ] && return 0 || return 1 
+	[ ${test} ${operator} ${value} ] && return 0 || return 1
 }
 
 get_version() {
 	local kbuild_output
-	
+
 	# no need to execute this twice assuming KV_FULL is populated.
 	# we can force by unsetting KV_FULL
 	[ -n "${KV_FULL}" ] && return 0
@@ -207,7 +207,7 @@ get_version() {
 	qeinfo "Determining the location of the kernel source code"
 	[ -h "${KERNEL_DIR}" ] && KV_DIR="$(readlink -f ${KERNEL_DIR})"
 	[ -d "${KERNEL_DIR}" ] && KV_DIR="${KERNEL_DIR}"
-	
+
 	if [ -z "${KV_DIR}" ]
 	then
 		qeerror "Unable to find kernel sources at ${KERNEL_DIR}"
@@ -231,17 +231,17 @@ get_version() {
 		qeerror "Please ensure that ${KERNEL_DIR} points to a complete set of Linux sources"
 		return 1
 	fi
-	
+
 	# OK so now we know our sources directory, but they might be using
 	# KBUILD_OUTPUT, and we need this for .config and localversions-*
 	# so we better find it eh?
 	# do we pass KBUILD_OUTPUT on the CLI?
 	OUTPUT_DIR="${OUTPUT_DIR:-${KBUILD_OUTPUT}}"
-	
+
 	# And if we didn't pass it, we can take a nosey in the Makefile
 	kbuild_output="$(getfilevar KBUILD_OUTPUT ${KV_DIR}/Makefile)"
 	OUTPUT_DIR="${OUTPUT_DIR:-${kbuild_output}}"
-	
+
 	# And contrary to existing functions I feel we shouldn't trust the
 	# directory name to find version information as this seems insane.
 	# so we parse ${KV_DIR}/Makefile
@@ -249,14 +249,14 @@ get_version() {
 	KV_MINOR="$(getfilevar PATCHLEVEL ${KV_DIR}/Makefile)"
 	KV_PATCH="$(getfilevar SUBLEVEL ${KV_DIR}/Makefile)"
 	KV_EXTRA="$(getfilevar EXTRAVERSION ${KV_DIR}/Makefile)"
-	
+
 	if [ -z "${KV_MAJOR}" -o -z "${KV_MINOR}" -o -z "${KV_PATCH}" ]
 	then
 		qeerror "Could not detect kernel version."
 		qeerror "Please ensure that ${KERNEL_DIR} points to a complete set of Linux sources."
 		return 1
 	fi
-	
+
 	# and in newer versions we can also pull LOCALVERSION if it is set.
 	# but before we do this, we need to find if we use a different object directory.
 	# This *WILL* break if the user is using localversions, but we assume it was
@@ -270,7 +270,7 @@ get_version() {
 	then
 		qeinfo "Found kernel object directory:"
 		qeinfo "    ${KV_OUT_DIR}"
-		
+
 		KV_LOCAL="$(cat ${KV_OUT_DIR}/localversion* 2>/dev/null)"
 	fi
 	# and if we STILL haven't got it, then we better just set it to KV_DIR
@@ -329,7 +329,7 @@ get_running_version() {
 check_kernel_built() {
 	# if we haven't determined the version yet, we need too.
 	get_version;
-	
+
 	if [ ! -f "${KV_OUT_DIR}/include/linux/version.h" ]
 	then
 		eerror "These sources have not yet been prepared."
@@ -348,7 +348,7 @@ check_kernel_built() {
 check_modules_supported() {
 	# if we haven't determined the version yet, we need too.
 	get_version;
-	
+
 	if ! linux_chkconfig_builtin "MODULES"
 	then
 		eerror "These sources do not support loading external modules."
@@ -406,13 +406,13 @@ check_extra_config() {
 				# Support the new syntax first.
 				local_error="ERROR_${config}"
 				local_error="${!local_error}"
-				
+
 				# then fall back on the older syntax.
 				if [[ -z ${local_error} ]] ; then
 					local_error="${config}_ERROR"
 					local_error="${!local_error}"
 				fi
-				
+
 				[[ -n ${local_error} ]] && eerror "  ${local_error}" || \
 					eerror "  CONFIG_${config}:\tshould be set in the kernel configuration, but isn't"
 				error=1
@@ -432,7 +432,7 @@ check_extra_config() {
 check_zlibinflate() {
 	# if we haven't determined the version yet, we need too.
 	get_version;
-	
+
 	# although I restructured this code - I really really really dont support it!
 
 	# bug #27882 - zlib routines are only linked into the kernel
@@ -441,28 +441,27 @@ check_zlibinflate() {
 	# plus, for the cloop module, it appears that there's no way
 	# to get cloop.o to include a static zlib if CONFIG_MODVERSIONS
 	# is on
-	
-local	INFLATE
-local	DEFLATE
+
+	local INFLATE
+	local DEFLATE
 
 	einfo "Determining the usability of ZLIB_INFLATE support in your kernel"
-	
+
 	ebegin "checking ZLIB_INFLATE"
 	getfilevar_isbuiltin CONFIG_ZLIB_INFLATE ${KV_DIR}/.config
 	eend $?
 	[ "$?" != 0 ] && die
-	
+
 	ebegin "checking ZLIB_DEFLATE"
 	getfilevar_isbuiltin CONFIG_ZLIB_DEFLATE ${KV_DIR}/.config
 	eend $?
 	[ "$?" != 0 ] && die
-	
-	
+
 	local LINENO_START
 	local LINENO_END
 	local SYMBOLS
 	local x
-	
+
 	LINENO_END="$(grep -n 'CONFIG_ZLIB_INFLATE y' ${KV_DIR}/lib/Config.in | cut -d : -f 1)"
 	LINENO_START="$(head -n $LINENO_END ${KV_DIR}/lib/Config.in | grep -n 'if \[' | tail -n 1 | cut -d : -f 1)"
 	(( LINENO_AMOUNT = $LINENO_END - $LINENO_START ))
@@ -478,7 +477,7 @@ local	DEFLATE
 			return 0
 		fi
 	done
-	
+
 	eerror
 	eerror "This kernel module requires ZLIB library support."
 	eerror "You have enabled zlib support in your kernel, but haven't enabled"
diff --git a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass
index 9b243e4e939c..4f9b0c3ae8e1 100644
--- a/eclass/linux-mod.eclass
+++ b/eclass/linux-mod.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.48 2005/07/07 12:36:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.49 2005/07/11 15:08:06 swegener Exp $
 
 # Description: This eclass is used to interface with linux-info in such a way
 #              to provide the functionality required and initial functions
@@ -14,7 +14,7 @@
 
 # A Couple of env vars are available to effect usage of this eclass
 # These are as follows:
-# 
+#
 # Env Var		Option		Default		Description
 # KERNEL_DIR		<string>	/usr/src/linux	The directory containing kernel
 #							the target kernel sources.
@@ -25,20 +25,20 @@
 # BUILD_TARGETS		<string>	clean modules	The build targets to pass to
 #							make.
 # MODULE_NAMES		<string>			This is the modules which are
-#							to be built automatically using 
-#							the default pkg_compile/install. 
-#							They are explained properly 
-#							below. It will only make  
+#							to be built automatically using
+#							the default pkg_compile/install.
+#							They are explained properly
+#							below. It will only make
 #							BUILD_TARGETS once in any
 #							directory.
 
 # MODULE_NAMES - Detailed Overview
-# 
+#
 # The structure of each MODULE_NAMES entry is as follows:
 # modulename(libdir:srcdir:objdir)
 # for example:
 # MODULE_NAMES="module_pci(pci:${S}/pci:${S}) module_usb(usb:${S}/usb:${S})"
-# 
+#
 # what this would do is
 #  cd ${S}/pci
 #  make ${BUILD_PARAMS} ${BUILD_TARGETS}
@@ -102,7 +102,7 @@ unpack_pcmcia_sources() {
 
 	if [[ -f "${1}" ]]; then
 		PCMCIA_SOURCE_DIR="${WORKDIR}/pcmcia-cs/"
-	
+
 		ebegin "Decompressing pcmcia-cs sources"
 		mkdir -p ${PCMCIA_SOURCE_DIR}
 		tar -xjf ${1} -C ${PCMCIA_SOURCE_DIR}
@@ -142,7 +142,7 @@ pcmcia_src_unpack() {
 use_m() {
 	# if we haven't determined the version yet, we need too.
 	get_version;
-	
+
 	# if the kernel version is greater than 2.6.6 then we should use
 	# M= instead of SUBDIRS=
 	[ ${KV_MAJOR} -eq 2 -a ${KV_MINOR} -gt 5 -a ${KV_PATCH} -gt 5 ] && \
@@ -163,7 +163,7 @@ convert_to_m() {
 update_depmod() {
 	# if we haven't determined the version yet, we need too.
 	get_version;
-	
+
 	ebegin "Updating module dependencies for ${KV_FULL}"
 	if [ -r ${KV_OUT_DIR}/System.map ]
 	then
@@ -190,7 +190,7 @@ update_modules() {
 move_old_moduledb() {
 	local OLDDIR=${ROOT}/usr/share/module-rebuild/
 	local NEWDIR=${ROOT}/var/lib/module-rebuild/
-	
+
 	if [[ -f ${OLDDIR}/moduledb ]]; then
 		[[ ! -d ${NEWDIR} ]] && mkdir -p ${NEWDIR}
 		[[ ! -f ${NEWDIR}/moduledb ]] && \
@@ -211,7 +211,7 @@ update_moduledb() {
 	if [[ -z $(grep ${CATEGORY}/${PN}-${PVR} ${MODULEDB_DIR}/moduledb) ]]; then
 		einfo "Adding module to moduledb."
 		echo "a:1:${CATEGORY}/${PN}-${PVR}" >> ${MODULEDB_DIR}/moduledb
-	fi	
+	fi
 }
 
 remove_moduledb() {
@@ -259,7 +259,7 @@ generate_modulesd() {
 		[[ ${module_additions} -eq 0 ]]	&& unset module_additions
 		[[ ${module_examples} -eq 0 ]] 	&& unset module_examples
 
-		# If we specify we dont want it, then lets exit, otherwise we assume 
+		# If we specify we dont want it, then lets exit, otherwise we assume
 		# that if its set, we do want it.
 		[[ ${module_enabled} == no ]] && return 0
 
@@ -310,7 +310,7 @@ generate_modulesd() {
 			echo  "# ------------------------------" >> ${module_config}
 			myIFS="${IFS}"
 			IFS="$(echo -en "\n\b")"
-			
+
 			for t in ${module_modinfo}
 			do
 				myVAR="$(echo ${t#*:} | grep -e " [0-9][ =]" | sed "s:.*\([01][= ]\).*:\1:")"
@@ -319,7 +319,7 @@ generate_modulesd() {
 					module_opts="${module_opts} ${t%%:*}:${myVAR}"
 				fi
 				echo -e "# ${t%%:*}:\t${t#*:}" >> ${module_config}
-			done			
+			done
 			IFS="${myIFS}"
 			echo '' >> ${module_config}
 		fi
@@ -360,7 +360,7 @@ generate_modulesd() {
 			done
 			echo '' >> ${module_config}
 		fi
-		
+
 		#-----------------------------------------------------------------------
 
 		# then we install it
@@ -377,9 +377,9 @@ generate_modulesd() {
 display_postinst() {
 	# if we haven't determined the version yet, we need too.
 	get_version;
-	
+
 	local modulename moduledir sourcedir moduletemp file i
-	
+
 	file=${ROOT}/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}
 	file=${file/\/\///}
 
@@ -408,7 +408,7 @@ display_postinst() {
 find_module_params() {
 	local matched_offset=0 matched_opts=0 test="${@}" temp_var result
 	local i=0 y=0 z=0
-	
+
 	for((i=0; i<=${#test}; i++))
 	do
 		case ${test:${i}:1} in
@@ -419,7 +419,7 @@ find_module_params() {
 					matched_offset[${matched_opts}]="${i}";;
 		esac
 	done
-	
+
 	for((i=0; i<=${matched_opts}; i++))
 	do
 		# i			= offset were working on
@@ -433,7 +433,7 @@ find_module_params() {
 				z=$((${z} - 1))
 				tempvar=${test:${y}:${z}};;
 		esac
-		
+
 		case ${i} in
 			0)	result="${result} modulename:${tempvar}";;
 			1)	result="${result} libdir:${tempvar}";;
@@ -441,7 +441,7 @@ find_module_params() {
 			3)	result="${result} objdir:${tempvar}";;
 		esac
 	done
-	
+
 	echo ${result}
 }
 
@@ -460,7 +460,7 @@ linux-mod_src_compile() {
 	unset ARCH
 
 	BUILD_TARGETS=${BUILD_TARGETS:-clean module}
-	
+
 	for i in ${MODULE_IGNORE}
 	do
 		MODULE_NAMES=${MODULE_NAMES//${i}(*}
@@ -476,7 +476,7 @@ linux-mod_src_compile() {
 		libdir=${libdir:-misc}
 		srcdir=${srcdir:-${S}}
 		objdir=${objdir:-${srcdir}}
-		
+
 		if [ ! -f "${srcdir}/.built" ];
 		then
 			cd ${srcdir}
@@ -500,7 +500,7 @@ linux-mod_src_compile() {
 
 linux-mod_src_install() {
 	local modulename libdir srcdir objdir i n
-	
+
 	for i in ${MODULE_IGNORE}
 	do
 		MODULE_NAMES=${MODULE_NAMES//${i}(*}
@@ -522,7 +522,7 @@ linux-mod_src_install() {
 		insinto ${ROOT}lib/modules/${KV_FULL}/${libdir}
 		doins ${modulename}.${KV_OBJ}
 		cd ${OLDPWD}
-		
+
 		generate_modulesd ${objdir}/${modulename}
 	done
 }
diff --git a/eclass/mailer.eclass b/eclass/mailer.eclass
index 98994c189a28..023361fdad48 100644
--- a/eclass/mailer.eclass
+++ b/eclass/mailer.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mailer.eclass,v 1.13 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mailer.eclass,v 1.14 2005/07/11 15:08:06 swegener Exp $
 
 #
 # Original Authors: Fernando J. Pereda <ferdy@gentoo.org>
@@ -31,7 +31,7 @@
 
 IUSE="mailwrapper"
 RDEPEND="mailwrapper? (
-		|| ( 
+		|| (
 			net-mail/mailer-config
 			app-admin/eselect
 		)
diff --git a/eclass/mono.eclass b/eclass/mono.eclass
index 6ee603aaf25b..d4b3afdc4dbb 100644
--- a/eclass/mono.eclass
+++ b/eclass/mono.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mono.eclass,v 1.5 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mono.eclass,v 1.6 2005/07/11 15:08:06 swegener Exp $
 #
 # Author : foser <foser@gentoo.org>
 #
@@ -8,6 +8,6 @@
 # right now only circumvents a sandbox violation by setting a mono env var
 
 
-# >=mono-0.92 versions using mcs -pkg:foo-sharp require shared memory, so we set the 
+# >=mono-0.92 versions using mcs -pkg:foo-sharp require shared memory, so we set the
 # shared dir to ${T} so that ${T}/.wapi can be used during the install process.
 export MONO_SHARED_DIR=${T}
diff --git a/eclass/mozconfig.eclass b/eclass/mozconfig.eclass
index 187c304847ec..4800e7de2b5e 100644
--- a/eclass/mozconfig.eclass
+++ b/eclass/mozconfig.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig.eclass,v 1.13 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig.eclass,v 1.14 2005/07/11 15:08:06 swegener Exp $
 #
 # mozconfig.eclass: the new mozilla.eclass
 
@@ -53,7 +53,7 @@ mozconfig_init() {
 	####################################
 
 	case ${PN} in
-		mozilla) 
+		mozilla)
 			# The other builds have an initial --enable-extensions in their
 			# .mozconfig.  The "default" set in configure applies to mozilla
 			# specifically.
diff --git a/eclass/mozilla-launcher.eclass b/eclass/mozilla-launcher.eclass
index 0c50d142cbff..6b7243c3fa01 100644
--- a/eclass/mozilla-launcher.eclass
+++ b/eclass/mozilla-launcher.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozilla-launcher.eclass,v 1.8 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozilla-launcher.eclass,v 1.9 2005/07/11 15:08:06 swegener Exp $
 
 
 # update_mozilla_launcher_symlinks
@@ -64,7 +64,7 @@ install_mozilla_launcher_stub() {
 	dodir /usr/bin
 	cat <<EOF >${D}/usr/bin/${name}
 #!/bin/sh
-# 
+#
 # Stub script to run mozilla-launcher.  We used to use a symlink here
 # but OOo brokenness makes it necessary to use a stub instead:
 # http://bugs.gentoo.org/show_bug.cgi?id=78890
diff --git a/eclass/mozilla.eclass b/eclass/mozilla.eclass
index 7939d183a010..422bf67a5910 100644
--- a/eclass/mozilla.eclass
+++ b/eclass/mozilla.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozilla.eclass,v 1.30 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozilla.eclass,v 1.31 2005/07/11 15:08:06 swegener Exp $
 #
 # You probably don't want to change this eclass.  Newer ebuilds use
 # mozconfig.eclass instead.
@@ -29,7 +29,7 @@ RDEPEND="virtual/x11
 		>=x11-libs/gtk+-2.2.0
 		>=dev-libs/glib-2.2.0
 		>=x11-libs/pango-1.2.1
-		>=dev-libs/libIDL-0.8.0 
+		>=dev-libs/libIDL-0.8.0
 		gnome? ( >=gnome-base/gnome-vfs-2.3.5 ) )
 	!gtk2? (
 		=x11-libs/gtk+-1.2*
@@ -266,11 +266,11 @@ mozilla_conf() {
 		[[ ${PV} < 1.0 ]] && myext="${myext},typeaheadfind"
 		use mozdevelop && myext="${myext},venkman"
 		use gnome && use gtk2 && myext="${myext},gnomevfs"
-		
+
 		myconf="${myconf} \
 			--enable-single-profile \
 			--enable-extensions=${myext}"
-			
+
 		mozilla_annotate "n/a on ${PN}" \
 			--disable-mailnews \
 			--disable-composer \
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index 08c92a41a5f2..284f3ce7b4ae 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.29 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.30 2005/07/11 15:08:06 swegener Exp $
 #
 # Author: Jeremy Huddleston <eradicator@gentoo.org>
 #
@@ -192,7 +192,7 @@ get_abi_FAKE_TARGETS() { get_abi_var FAKE_TARGETS "${@}"; }
 get_abi_CDEFINE() { get_abi_var CDEFINE "${@}"; }
 get_abi_LIBDIR() { get_abi_var LIBDIR "${@}"; }
 
-# Return a list of the ABIs we want to install for with 
+# Return a list of the ABIs we want to install for with
 # the last one in the list being the default.
 get_install_abis() {
 	local order=""
@@ -202,7 +202,7 @@ get_install_abis() {
 		return 0
 	fi
 
-	if hasq multilib-pkg-force ${RESTRICT} || 
+	if hasq multilib-pkg-force ${RESTRICT} ||
 	   { hasq multilib-pkg ${FEATURES} && hasq multilib-pkg ${RESTRICT}; }; then
 		for x in ${MULTILIB_ABIS}; do
 			if [ "${x}" != "${DEFAULT_ABI}" ]; then
@@ -463,7 +463,7 @@ create_ml_includes-tidy_path() {
 
 		# Remove trailing /
 		[ "${removed##*/}" = "" ] && removed=${removed%/*}
-		
+
 		echo ${removed}
 	fi
 }
diff --git a/eclass/myth.eclass b/eclass/myth.eclass
index 746af90613a1..2eefa8980331 100644
--- a/eclass/myth.eclass
+++ b/eclass/myth.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/myth.eclass,v 1.17 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/myth.eclass,v 1.18 2005/07/11 15:08:06 swegener Exp $
 #
 # Author: Daniel Ahlberg <aliz@gentoo.org>
 #
@@ -48,11 +48,11 @@ myth_src_unpack() {
 		    -i ${pkg_pro} || die "Disable i18n failed"
 	fi
 
-        if use debug ; then
+	if use debug ; then
 		FEATURES="${FEATURES} nostrip"
-                sed -e 's:#CONFIG += debug:CONFIG += debug:' \
-                    -e 's:CONFIG += release:#CONFIG += release:' \
-                    -i 'settings.pro' || die "enable debug failed"
+		sed -e 's:#CONFIG += debug:CONFIG += debug:' \
+			-e 's:CONFIG += release:#CONFIG += release:' \
+			-i 'settings.pro' || die "enable debug failed"
 	fi
 
 	setup_pro
@@ -75,7 +75,7 @@ myth_src_compile() {
 					myconf="${myconf} --disable-${x}"
 				fi
 			done
-		fi 
+		fi
 
 		econf ${myconf}
 	fi
diff --git a/eclass/mythtv-plugins.eclass b/eclass/mythtv-plugins.eclass
index ab09c4015abb..4d57a2d2f2d8 100644
--- a/eclass/mythtv-plugins.eclass
+++ b/eclass/mythtv-plugins.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mythtv-plugins.eclass,v 1.7 2005/07/06 20:54:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mythtv-plugins.eclass,v 1.8 2005/07/11 15:08:06 swegener Exp $
 #
 # Author: Doug Goldstein <cardoe@gentoo.org
 #
@@ -19,13 +19,13 @@ DEPEND=">=sys-apps/sed-4"
 mythtv-plugins_src_unpack() {
 	unpack ${A}
 	cd ${S}
-	
+
 	sed -e 's!PREFIX = /usr/local!PREFIX = /usr!' \
 	-i 'settings.pro' || die "fixing PREFIX to /usr failed"
-	
+
 	sed -e "s!QMAKE_CXXFLAGS_RELEASE = -O3 -march=pentiumpro -fomit-frame-pointer!QMAKE_CXXFLAGS_RELEASE = ${CXXFLAGS}!" \
 	-i 'settings.pro' || die "Fixing QMake's CXXFLAGS failed"
-	
+
 	sed -e "s!QMAKE_CFLAGS_RELEASE = \$\${QMAKE_CXXFLAGS_RELEASE}!QMAKE_CFLAGS_RELEASE = ${CFLAGS}!" \
 	-i 'settings.pro' || die "Fixing Qmake's CFLAGS failed"
 
@@ -37,12 +37,12 @@ mythtv-plugins_src_unpack() {
 
 mythtv-plugins_src_compile() {
 	cd ${S}
-	
+
 	if use debug; then
 		sed -e 's!CONFIG += release!CONFIG += debug!' \
 		-i 'settings.pro' || die "switching to debug build failed"
 	fi
-	
+
 #	if ( use x86 && ! use mmx ) || ! use amd64 ; then
 	if ( ! use mmx ); then
 		sed -e 's!DEFINES += HAVE_MMX!DEFINES -= HAVE_MMX!' \
diff --git a/eclass/nsplugins.eclass b/eclass/nsplugins.eclass
index 9662789948e9..7b1e3d6dd020 100644
--- a/eclass/nsplugins.eclass
+++ b/eclass/nsplugins.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/nsplugins.eclass,v 1.18 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/nsplugins.eclass,v 1.19 2005/07/11 15:08:06 swegener Exp $
 #
 # Author: Martin Schlemmer <azarah@gentoo.org>
 #
@@ -26,7 +26,7 @@ src_mv_plugins() {
 	dosym /usr/$(get_libdir)/${PLUGINS_DIR} $1
 }
 
-# This function move plugins in pkg_preinst() in old dir to 
+# This function move plugins in pkg_preinst() in old dir to
 # ${ROOT}/usr/$(get_libdir)/${PLUGIN_DIR}.  First argument should be
 # the full path (without $ROOT) to old plugin dir.
 pkg_mv_plugins() {
diff --git a/eclass/nxserver-1.3.2.eclass b/eclass/nxserver-1.3.2.eclass
index 0e74742e8fbe..4dd41cc4b5ed 100644
--- a/eclass/nxserver-1.3.2.eclass
+++ b/eclass/nxserver-1.3.2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/nxserver-1.3.2.eclass,v 1.10 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/nxserver-1.3.2.eclass,v 1.11 2005/07/11 15:08:06 swegener Exp $
 #
 # eclass for handling the different nxserver binaries available
 # from nomachine's website
@@ -17,21 +17,21 @@ RESTRICT="nomirror strip"
 
 SRC_URI="nxserver-${MY_PV}.i386.rpm"
 DEPEND="$DEPEND
-		 >=net-misc/nxclient-1.3.2"
+	>=net-misc/nxclient-1.3.2"
 
 RDEPEND="$RDEPEND
-	     >=media-libs/jpeg-6b-r3
-         >=sys-libs/glibc-2.3.2-r1
-		 >=sys-libs/zlib-1.1.4-r1
-		 virtual/x11
-		 >=net-misc/openssh-3.6.1_p2
-		 >=dev-lang/perl-5.8.0-r12"
+	>=media-libs/jpeg-6b-r3
+	>=sys-libs/glibc-2.3.2-r1
+	>=sys-libs/zlib-1.1.4-r1
+	virtual/x11
+	>=net-misc/openssh-3.6.1_p2
+	>=dev-lang/perl-5.8.0-r12"
 
 DEPEND="$DEPEND
-        >=sys-apps/shadow-4.0.3-r6
-		>=net-misc/openssh-3.6.1_p2
-		>=net-misc/nxssh-1.3.2
-		>=net-misc/nxproxy-1.3.2"
+	>=sys-apps/shadow-4.0.3-r6
+	>=net-misc/openssh-3.6.1_p2
+	>=net-misc/nxssh-1.3.2
+	>=net-misc/nxproxy-1.3.2"
 
 S="${WORKDIR}"
 
@@ -102,7 +102,7 @@ nxserver_pkg_postinst() {
 
 	einfo "Adding user 'nx' for the NX server"
 	enewuser nx -1 /usr/NX/bin/nxserver /usr/NX/home/nx
-	
+
 	# we do this to move the home directory of older installs
 
 	einfo "Setting home directory of user 'nx' to /usr/NX/home/nx"
diff --git a/eclass/nxserver-1.4.eclass b/eclass/nxserver-1.4.eclass
index 267ad9c36242..ec41c8b89363 100644
--- a/eclass/nxserver-1.4.eclass
+++ b/eclass/nxserver-1.4.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/nxserver-1.4.eclass,v 1.7 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/nxserver-1.4.eclass,v 1.8 2005/07/11 15:08:06 swegener Exp $
 #
 # eclass for handling the different nxserver binaries available
 # from nomachine's website
@@ -17,21 +17,19 @@ SLOT="0"
 RESTRICT="nomirror strip"
 
 SRC_URI="nxserver-${MY_PV}.i386.rpm"
-DEPEND="$DEPEND
-        >=sys-apps/shadow-4.0.3-r6
-		>=net-misc/openssh-3.6.1_p2
-		=net-misc/nxssh-1.4*
-		=net-misc/nxproxy-1.4*
-		=net-misc/nxclient-1.4*
-		=net-misc/nx-x11-1.4*"
-
-RDEPEND="$RDEPEND
-	     >=media-libs/jpeg-6b-r3
-         >=sys-libs/glibc-2.3.2-r1
-		 >=sys-libs/zlib-1.1.4-r1
-		 virtual/x11
-		 >=net-misc/openssh-3.6.1_p2
-		 >=dev-lang/perl-5.8.0-r12"
+DEPEND=">=sys-apps/shadow-4.0.3-r6
+	>=net-misc/openssh-3.6.1_p2
+	=net-misc/nxssh-1.4*
+	=net-misc/nxproxy-1.4*
+	=net-misc/nxclient-1.4*
+	=net-misc/nx-x11-1.4*"
+
+RDEPEND=">=media-libs/jpeg-6b-r3
+	>=sys-libs/glibc-2.3.2-r1
+	>=sys-libs/zlib-1.1.4-r1
+	virtual/x11
+	>=net-misc/openssh-3.6.1_p2
+	>=dev-lang/perl-5.8.0-r12"
 
 S="${WORKDIR}"
 
@@ -68,7 +66,7 @@ nxserver_src_install() {
 	done
 
 	# remove libraries installed by other packages
-	for x in usr/NX/lib/*.so.* ; do 
+	for x in usr/NX/lib/*.so.* ; do
 		if [ -f $x ]; then
 			rm -f $x
 		fi
diff --git a/eclass/nxserver.eclass b/eclass/nxserver.eclass
index 8a3af19e61bf..587cb7a7db49 100644
--- a/eclass/nxserver.eclass
+++ b/eclass/nxserver.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/nxserver.eclass,v 1.18 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/nxserver.eclass,v 1.19 2005/07/11 15:08:06 swegener Exp $
 #
 # eclass for handling the different nxserver binaries available
 # from nomachine's website
@@ -16,17 +16,15 @@ KEYWORDS="x86 -ppc -sparc -alpha -mips"
 RESTRICT="nomirror strip"
 
 SRC_URI="nxserver-${MY_PV}.i386.rpm"
-RDEPEND="$RDEPEND
-	     >=media-libs/jpeg-6b-r3
-         >=sys-libs/glibc-2.3.2-r1
-		 >=sys-libs/zlib-1.1.4-r1
-		 virtual/x11
-		 >=net-misc/openssh-3.6.1_p2
-		 >=dev-lang/perl-5.8.0-r12"
-
-DEPEND="$DEPEND
-        >=sys-apps/shadow-4.0.3-r6
-		>=net-misc/openssh-3.6.1_p2"
+RDEPEND=">=media-libs/jpeg-6b-r3
+	>=sys-libs/glibc-2.3.2-r1
+	>=sys-libs/zlib-1.1.4-r1
+	virtual/x11
+	>=net-misc/openssh-3.6.1_p2
+	>=dev-lang/perl-5.8.0-r12"
+
+DEPEND=">=sys-apps/shadow-4.0.3-r6
+	>=net-misc/openssh-3.6.1_p2"
 
 S="${WORKDIR}"
 
diff --git a/eclass/pcmcia.eclass b/eclass/pcmcia.eclass
index 7da9831c1503..3911fae44dad 100644
--- a/eclass/pcmcia.eclass
+++ b/eclass/pcmcia.eclass
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/pcmcia.eclass,v 1.8 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/pcmcia.eclass,v 1.9 2005/07/11 15:08:06 swegener Exp $
 
-# pcmcia.eclass - This eclass facilities writing ebuilds for driver packages 
+# pcmcia.eclass - This eclass facilities writing ebuilds for driver packages
 # that may need to build against the pcmcia-cs drivers, depending on kernel
 # support, pcmcia-cs version installed, etc.
 
@@ -16,7 +16,7 @@
 # if this information is needed. These will be blank if kernel PCMCIA support
 # is detected.
 
-# Functions - pcmcia_src_unpack unpacks and patches as needed the pcmcia-cs 
+# Functions - pcmcia_src_unpack unpacks and patches as needed the pcmcia-cs
 # sources in ${WORKDIR}/${PCMCIA_SOURCE_DIR} and set the two variables.
 
 # pcmcia_configure will configure the pcmcia-cs sources if that is needed
diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index d2629ef947d3..54d9bb9bde72 100644
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.75 2005/07/07 01:22:30 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.76 2005/07/11 15:08:06 swegener Exp $
 #
 # Author: Seemant Kulleen <seemant@gentoo.org>
 # Maintained by the Perl herd <perl@gentoo.org>
@@ -41,7 +41,7 @@ EXPORT_FUNCTIONS pkg_setup pkg_preinst pkg_postinst pkg_prerm pkg_postrm \
 # of file collision features by giving us a single exportable function to deal
 # with the pods. Modifications to the eclass provided by Yaakov S
 # <yselkowitz@hotmail.com> in bug 83622
-# 
+#
 # <later the same day>
 # The long awaited (by me) fix for automagically detecting and dealing
 # with module-build dependancies. I've chosen not to make it a default dep since
@@ -121,11 +121,11 @@ perl-module_src_test() {
 }
 
 perl-module_src_install() {
-	
+
 	perlinfo
-	
+
 	test -z ${mytargets} && mytargets="install"
-					 
+
 	if [ -z ${BUILDER_VER} ]; then
 		make ${myinst} ${mytargets} || die
 	else
@@ -157,7 +157,7 @@ perl-module_pkg_setup() {
 
 
 perl-module_pkg_preinst() {
-	
+
 	perlinfo
 }
 
@@ -167,7 +167,7 @@ perl-module_pkg_postinst() {
 }
 
 perl-module_pkg_prerm() {
-	
+
 	updatepod
 }
 
@@ -180,22 +180,22 @@ perlinfo() {
 
 	eval `perl '-V:version'`
 	PERL_VERSION=${version}
-	
+
 	eval `perl '-V:installsitearch'`
 	SITE_ARCH=${installsitearch}
-	
+
 	eval `perl '-V:installsitearch'`
 	SITE_LIB=${installsitearch}
-	
+
 	eval `perl '-V:installarchlib'`
 	ARCH_LIB=${installarchlib}
-	
+
 	eval `perl '-V:installvendorlib'`
 	VENDOR_LIB=${installvendorlib}
 
 	eval `perl '-V:installvendorarch'`
 	VENDOR_ARCH=${installvendorarch}
-	
+
 	if [ -f ${S}/Build.PL ]; then
 		if [ ${PN} == "module-build" ]; then
 			BUILDER_VER="1" # A bootstrapping if you will
@@ -205,7 +205,7 @@ perlinfo() {
 	fi
 
 	if [ -f /usr/bin/perl ]
-	then 
+	then
 		POD_DIR="/usr/share/perl/gentoo-pods/${version}"
 	fi
 }
@@ -223,9 +223,9 @@ fixlocalpod() {
 		cat ${D}/${POD_DIR}/${P}.pod >>${D}/${POD_DIR}/${P}.pod.arch
 		rm -f ${D}/${ARCH_LIB}/perllocal.pod
 	fi
-	
+
 	if [ -f ${D}${SITE_LIB}/perllocal.pod ];
-	then 
+	then
 		touch ${D}/${POD_DIR}/${P}.pod
 		sed -e "s:${D}::g" \
 			${D}${SITE_LIB}/perllocal.pod >> ${D}/${POD_DIR}/${P}.pod
@@ -235,7 +235,7 @@ fixlocalpod() {
 	fi
 
 	if [ -f ${D}${VENDOR_LIB}/perllocal.pod ];
-	then 
+	then
 		touch ${D}/${POD_DIR}/${P}.pod
 		sed -e "s:${D}::g" \
 			${D}${VENDOR_LIB}/perllocal.pod >> ${D}/${POD_DIR}/${P}.pod
diff --git a/eclass/php-ext-base.eclass b/eclass/php-ext-base.eclass
index b43e145a8620..77167dfa5282 100644
--- a/eclass/php-ext-base.eclass
+++ b/eclass/php-ext-base.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-base.eclass,v 1.18 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-base.eclass,v 1.19 2005/07/11 15:08:06 swegener Exp $
 #
 # Author: Tal Peer <coredumb@gentoo.org>
 # Author: Stuart Herbert <stuart@gentoo.org>
@@ -28,7 +28,7 @@ EXPORT_FUNCTIONS src_install
 [ -z "$PHP_EXT_INI" ] && PHP_EXT_INI="yes"
 
 # find out where to install extensions
-EXT_DIR="`php-config --extension-dir 2>/dev/null`" 
+EXT_DIR="`php-config --extension-dir 2>/dev/null`"
 
 # ---end ebuild configurable settings
 
@@ -46,7 +46,7 @@ php-ext-base_buildinilist () {
 	if [ -z "${PHPSAPILIST}" ]; then
 		PHPSAPILIST="apache1 apache2 cli cgi"
 	fi
-	
+
 	PHPINIFILELIST=
 
 	for x in ${PHPSAPILIST} ; do
@@ -58,7 +58,7 @@ php-ext-base_buildinilist () {
 			PHPINIFILELIST="${PHPINIFILELIST} etc/php/${x}-php5/php.ini"
 		fi
 	done
-	
+
 	if [ "${PHPINIFILELIST}+" = "+" ] ; then
 		# backwards support for the old location
 
@@ -94,7 +94,7 @@ php-ext-base_addextension () {
 
 	php-ext-base_addtoinifiles "$ext_type" "$ext_file" "Extension added"
 }
-	
+
 php-ext-base_setting_is_present () {
 	grep "^$1=$2" /$3 > /dev/null 2>&1
 }
diff --git a/eclass/php-ext.eclass b/eclass/php-ext.eclass
index e7990ba916a1..f31442782c9e 100644
--- a/eclass/php-ext.eclass
+++ b/eclass/php-ext.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext.eclass,v 1.9 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext.eclass,v 1.10 2005/07/11 15:08:06 swegener Exp $
 #
 # Author: Tal Peer <coredumb@gentoo.org>
 #
@@ -30,7 +30,7 @@ DEPEND="${DEPEND}
 		>=sys-devel/m4-1.4
 		>=sys-devel/libtool-1.4.3"
 
-RDEPEND="${RDEPEND} 
+RDEPEND="${RDEPEND}
 		 virtual/php"
 
 php-ext_buildinilist () {
@@ -39,7 +39,7 @@ php-ext_buildinilist () {
 	if [ -z "${PHPSAPILIST}" ]; then
 		PHPSAPILIST="apache1 apache2 cli"
 	fi
-	
+
 	PHPINIFILELIST=""
 
 	for x in ${PHPSAPILIST} ; do
@@ -47,7 +47,7 @@ php-ext_buildinilist () {
 			PHPINIFILELIST="${PHPINIFILELIST} /etc/php/${x}-php4/php.ini"
 		fi
 	done
-	
+
 	if [[ ${PHPINIFILELIST} = "" ]]; then
 		msg="No PHP ini files found for this extension"
 		eerror ${msg}
@@ -67,7 +67,7 @@ php-ext_src_compile() {
 
 php-ext_src_install() {
 	chmod +x build/shtool
-	#this will usually be /usr/lib/php/extensions/no-debug-no-zts-20020409/ 
+	#this will usually be /usr/lib/php/extensions/no-debug-no-zts-20020409/
 	#but i prefer not taking this risk
 	EXT_DIR="`php-config --extension-dir 2>/dev/null`"
 	insinto $EXT_DIR
@@ -103,7 +103,7 @@ php-ext_addextension () {
 		php-ext_addextensiontoinifile "$ext" "$1" "$x"
 	done
 }
-	
+
 php-ext_setting_is_present () {
 	grep "^$1=" $2 > /dev/null 2>&1
 }
@@ -124,5 +124,3 @@ php-ext_addtoinifiles () {
 		php-ext_addtoinifile $1 $2 $x
 	done
 }
-	
-
diff --git a/eclass/php-sapi.eclass b/eclass/php-sapi.eclass
index d73d7e6df2de..101211bf7c15 100644
--- a/eclass/php-sapi.eclass
+++ b/eclass/php-sapi.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-sapi.eclass,v 1.74 2005/07/11 08:11:41 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-sapi.eclass,v 1.75 2005/07/11 15:08:06 swegener Exp $
 # Author: Robin H. Johnson <robbat2@gentoo.org>
 
 inherit eutils flag-o-matic multilib libtool
@@ -34,7 +34,7 @@ if [ "${PHPSAPI}" != "cli" ]; then
 	SRC_URI="${SRC_URI} mirror://gentoo/php-4.3.2-fopen-url-secure.patch"
 fi
 
-# Patch for bug 50991, 49420 
+# Patch for bug 50991, 49420
 # Make sure the correct include_path is used.
 SRC_URI="${SRC_URI} mirror://gentoo/php-4.3.6-includepath.diff http://dev.gentoo.org/~robbat2/distfiles/php-4.3.6-includepath.diff"
 
@@ -65,10 +65,10 @@ esac
 # we need db-1.* for ndbm
 # and then either of db3 or db4
 IUSE="${IUSE} berkdb"
-RDEPEND="${RDEPEND} berkdb? ( =sys-libs/db-1* 
-							  || ( >=sys-libs/db-4.0.14-r2 
+RDEPEND="${RDEPEND} berkdb? ( =sys-libs/db-1*
+							  || ( >=sys-libs/db-4.0.14-r2
 								   >=sys-libs/db-3.2.9-r9
-							     ) 
+							     )
 							)"
 
 # Everything is in this list is dynamically linked agaist or needed at runtime
@@ -77,49 +77,47 @@ RDEPEND="${RDEPEND} berkdb? ( =sys-libs/db-1*
 # 2004/03/28 - stuart - added dependency on the php manual snapshot
 
 RDEPEND="${RDEPEND}
-   >=sys-libs/cracklib-2.7-r8
-   app-arch/bzip2
-   X? ( virtual/x11 )
-   crypt? ( >=dev-libs/libmcrypt-2.4 >=app-crypt/mhash-0.8 )
-   curl? ( >=net-misc/curl-7.10.2 )
-   x86? ( firebird? ( >=dev-db/firebird-1.0 ) )
-   freetds? ( >=dev-db/freetds-0.53 )
-   gd-external? ( media-libs/gd >=media-libs/jpeg-6b 
-                  >=media-libs/libpng-1.2.5 )
-   gd? ( >=media-libs/jpeg-6b >=media-libs/libpng-1.2.5 )
-   gdbm? ( >=sys-libs/gdbm-1.8.0 )
-   !alpha? ( !amd64? ( java? ( =virtual/jdk-1.4* dev-java/java-config ) ) )
-   jpeg? ( >=media-libs/jpeg-6b )
-   ldap? ( >=net-nds/openldap-1.2.11 )
-   mysql? ( >=dev-db/mysql-3.23.26 )
-   nls? ( sys-devel/gettext )
-   odbc? ( >=dev-db/unixODBC-1.8.13 )
-   pam? ( >=sys-libs/pam-0.75 )
-   pdflib? ( =media-libs/pdflib-5* >=media-libs/jpeg-6b 
-             >=media-libs/libpng-1.2.5 >=media-libs/tiff-3.5.5 )
-   png? ( >=media-libs/libpng-1.2.5 )
-   postgres? ( >=dev-db/postgresql-7.1 )
-   qt? ( >=x11-libs/qt-2.3.0 )
-   snmp? ( net-analyzer/net-snmp )
-   spell? ( app-text/aspell )
-   ssl? ( >=dev-libs/openssl-0.9.5 )
-   tiff? ( >=media-libs/tiff-3.5.5 )
-   xml2? ( dev-libs/libxml2 >=dev-libs/libxslt-1.0.30 )
-   truetype? ( =media-libs/freetype-2* =media-libs/freetype-1* 
-               media-libs/t1lib )
-   >=net-libs/libwww-5.3.2
-   >=app-text/sablotron-0.97
-   dev-libs/expat
-   sys-libs/zlib 
-   virtual/mta
-   >=sys-apps/file-4.02
-   yaz? ( dev-libs/yaz )
-   doc? ( app-doc/php-docs )
-   gmp? ( dev-libs/gmp )
-   mssql? ( dev-db/freetds )
-   kerberos? ( virtual/krb5 )
-   "
-
+	>=sys-libs/cracklib-2.7-r8
+	app-arch/bzip2
+	X? ( virtual/x11 )
+	crypt? ( >=dev-libs/libmcrypt-2.4 >=app-crypt/mhash-0.8 )
+	curl? ( >=net-misc/curl-7.10.2 )
+	x86? ( firebird? ( >=dev-db/firebird-1.0 ) )
+	freetds? ( >=dev-db/freetds-0.53 )
+	gd-external? ( media-libs/gd >=media-libs/jpeg-6b
+		>=media-libs/libpng-1.2.5 )
+	gd? ( >=media-libs/jpeg-6b >=media-libs/libpng-1.2.5 )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	!alpha? ( !amd64? ( java? ( =virtual/jdk-1.4* dev-java/java-config ) ) )
+	jpeg? ( >=media-libs/jpeg-6b )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	mysql? ( >=dev-db/mysql-3.23.26 )
+	nls? ( sys-devel/gettext )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	pam? ( >=sys-libs/pam-0.75 )
+	pdflib? ( =media-libs/pdflib-5* >=media-libs/jpeg-6b
+		>=media-libs/libpng-1.2.5 >=media-libs/tiff-3.5.5 )
+	png? ( >=media-libs/libpng-1.2.5 )
+	postgres? ( >=dev-db/postgresql-7.1 )
+	qt? ( >=x11-libs/qt-2.3.0 )
+	snmp? ( net-analyzer/net-snmp )
+	spell? ( app-text/aspell )
+	ssl? ( >=dev-libs/openssl-0.9.5 )
+	tiff? ( >=media-libs/tiff-3.5.5 )
+	xml2? ( dev-libs/libxml2 >=dev-libs/libxslt-1.0.30 )
+	truetype? ( =media-libs/freetype-2* =media-libs/freetype-1*
+		media-libs/t1lib )
+	>=net-libs/libwww-5.3.2
+	>=app-text/sablotron-0.97
+	dev-libs/expat
+	sys-libs/zlib
+	virtual/mta
+	>=sys-apps/file-4.02
+	yaz? ( dev-libs/yaz )
+	doc? ( app-doc/php-docs )
+	gmp? ( dev-libs/gmp )
+	mssql? ( dev-db/freetds )
+	kerberos? ( virtual/krb5 )"
 
 # USE structure doesn't support ~x86
 #if hasq '~x86' $ACCEPT_KEYWORDS; then
@@ -128,8 +126,8 @@ RDEPEND="${RDEPEND}
 #fi
 
 # libswf is ONLY available on x86
-RDEPEND="${RDEPEND} flash? ( 
-		x86? ( media-libs/libswf ) 
+RDEPEND="${RDEPEND} flash? (
+		x86? ( media-libs/libswf )
 		>=media-libs/ming-0.2a )"
 
 #The new XML extension in PHP5 requires libxml2-2.5.10
@@ -156,7 +154,7 @@ DEPEND="${DEPEND} !dev-libs/9libs"
 DEPEND="${DEPEND} !dev-libs/libiconv"
 
 #Waiting for somebody to want this:
-#cyrus? ( net-mail/cyrus-imapd net-mail/cyrus-imap-admin dev-libs/cyrus-imap-dev ) 
+#cyrus? ( net-mail/cyrus-imapd net-mail/cyrus-imap-admin dev-libs/cyrus-imap-dev )
 
 # this is because dev-php/php provides all of the PEAR stuff and some other
 # required odds and ends, and only as of this version number.
@@ -218,7 +216,7 @@ php-sapi_check_java_config() {
 		eerror
 		eerror "PHP will not build using the Kaffe Java Virtual Machine."
 		eerror "Please change your JVM to either Blackdown or Sun's."
-		eerror 
+		eerror
 		eerror "To build PHP without Java support, please re-run this emerge"
 		eerror "and place the line:"
 		eerror "  USE='-java'"
@@ -245,7 +243,7 @@ php-sapi_src_unpack() {
 	# ( ewarn "You have the xml USE flag turned off. Previously this"
 	#   ewarn "disabled XML support in PHP. However PEAR has a hard"
 	#   ewarn "dependancy on it, so they are now enabled." )
-	
+
 	if use fdftk; then
 		has_version app-text/fdftk || \
 		die "app-text/fdftk is required for FDF support! Portage isn't up to the DEPEND structure for it yet"
@@ -262,7 +260,7 @@ php-sapi_src_unpack() {
 	uclibctoolize
 
 	# no longer needed and breaks pear - Tal, 20031223
-	
+
 	# fix PEAR installer for our packaging
 	# we keep a backup of it as we need it at the end of the install
 	#cp pear/PEAR/Registry.php pear/PEAR/Registry.old
@@ -327,13 +325,13 @@ php-sapi_src_compile() {
 	use X && myconf="${myconf} --with-xpm-dir=/usr/X11R6" LDFLAGS="${LDFLAGS} -L/usr/X11R6/lib"
 	myconf="${myconf} `use_with gmp`"
 	myconf="${myconf} `use_with mssql mssql /usr`"
-	
+
 	# This chunk is intended for png/tiff/jpg, as there are several things that need them, indepentandly!
 	REQUIREPNG=
 	REQUIREJPG=
 	REQUIRETIFF=
 	if use pdflib; then
-		myconf="${myconf} --with-pdflib=/usr" 
+		myconf="${myconf} --with-pdflib=/usr"
 		REQUIREPNG=1 REQUIREJPG=1 REQUIRETIFF=1
 	else
 		myconf="${myconf} --without-pdflib"
@@ -358,17 +356,17 @@ php-sapi_src_compile() {
 	use jpeg && REQUIREJPG=1
 	use tiff && REQUIRETIFF=1
 	if [ -n "${REQUIREPNG}" ]; then
-		myconf="${myconf} --with-png=/usr --with-png-dir=/usr" 
+		myconf="${myconf} --with-png=/usr --with-png-dir=/usr"
 	else
 		myconf="${myconf} --without-png"
 	fi
 	if [ -n "${REQUIREJPG}" ]; then
-		myconf="${myconf} --with-jpeg=/usr --with-jpeg-dir=/usr --enable-exif" 
+		myconf="${myconf} --with-jpeg=/usr --with-jpeg-dir=/usr --enable-exif"
 	else
-		myconf="${myconf} --without-jpeg" 
+		myconf="${myconf} --without-jpeg"
 	fi
 	if [ -n "${REQUIRETIFF}" ]; then
-		myconf="${myconf} --with-tiff=/usr --with-tiff-dir=/usr" 
+		myconf="${myconf} --with-tiff=/usr --with-tiff-dir=/usr"
 		LDFLAGS="${LDFLAGS} -ltiff"
 	else
 		myconf="${myconf} --without-tiff"
@@ -426,14 +424,14 @@ php-sapi_src_compile() {
 		ewarn "Skipping IMAP-SSL support."
 	fi
 
-	
+
 	# These were previously optional, but are now included directly as PEAR needs them.
 	# Zlib is needed for XML
 	myconf="${myconf} --with-zlib=/usr --with-zlib-dir=/usr"
 	LIBS="${LIBS} -lxmlparse -lxmltok"
 	myconf="${myconf} --with-sablot=/usr"
-	myconf="${myconf} --enable-xslt" 
-	myconf="${myconf} --with-xslt-sablot" 
+	myconf="${myconf} --enable-xslt"
+	myconf="${myconf} --with-xslt-sablot"
 	myconf="${myconf} --with-xmlrpc"
 	myconf="${myconf} --enable-wddx"
 	myconf="${myconf} --with-xml"
@@ -453,7 +451,7 @@ php-sapi_src_compile() {
 	myconf="${myconf} --with-crack=/usr"
 	# DEPEND - nothing
 	myconf="${myconf} --with-cdb"
-	
+
 	# No DEPENDancies
 	myconf="${myconf} --enable-pcntl"
 	myconf="${myconf} --enable-bcmath"
@@ -495,7 +493,7 @@ php-sapi_src_compile() {
 
 	einfo "Using INI file: ${PHPINIDIRECTORY}/${PHPINIFILENAME}"
 	myconf="${myconf} \
-		--with-config-file-path=${PHPINIDIRECTORY}" 
+		--with-config-file-path=${PHPINIDIRECTORY}"
 
 	myconf="${myconf} --libdir=/usr/${libdir}/php"
 
@@ -521,7 +519,7 @@ php-sapi_src_compile() {
 	filter-flags "-D_LARGEFILE_SOURCE"
 
 	#fixes bug #14067
-	# changed order to run it in reverse for bug #32022 and #12021 
+	# changed order to run it in reverse for bug #32022 and #12021
 	replace-flags "-march=k6-3" "-march=i586"
 	replace-flags "-march=k6-2" "-march=i586"
 	replace-flags "-march=k6" "-march=i586"
@@ -563,7 +561,7 @@ php-sapi_src_install() {
 
 	# get the extension dir
 	PHPEXTDIR="`${D}/usr/bin/php-config.${PN} --extension-dir`"
-	
+
 	for doc in LICENSE EXTENSIONS CREDITS INSTALL README.* TODO* NEWS; do
 		[ -s "$doc" ] && dodoc $doc
 	done
@@ -604,7 +602,7 @@ php-sapi_src_install() {
 		patch ${phpinisrc} <${DISTDIR}/php-4.3.2-fopen-url-secure.patch
 	fi
 
-	# Patch for bug 50991, 49420 
+	# Patch for bug 50991, 49420
 	# Make sure the correct include_path is used.
 	einfo "Setting correct include_path"
 	patch ${phpinisrc} <${DISTDIR}/php-4.3.6-includepath.diff
diff --git a/eclass/php5-sapi-r1.eclass b/eclass/php5-sapi-r1.eclass
index 50527eeb0c7c..88b6380702b4 100644
--- a/eclass/php5-sapi-r1.eclass
+++ b/eclass/php5-sapi-r1.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r1.eclass,v 1.12 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r1.eclass,v 1.13 2005/07/11 15:08:06 swegener Exp $
 #
 # eclass/php5-sapi-r1.eclass
 #               Eclass for building different php5 SAPI instances
@@ -12,7 +12,7 @@
 #
 # ========================================================================
 
-inherit eutils confutils libtool 
+inherit eutils confutils libtool
 
 
 # set MY_P in the ebuild
@@ -70,7 +70,7 @@ DEPEND="$DEPEND
 	wddx? ( dev-libs/expat )
 	xpm? ( virtual/x11 )
 	xsl? ( dev-libs/libxslt )
-	zlib? ( sys-libs/zlib ) "
+	zlib? ( sys-libs/zlib )"
 
 # this would be xml2?, but PEAR requires XML support
 # and we always want to build PEAR.
@@ -131,7 +131,7 @@ php5-sapi-r1_check_awkward_uses() {
 		eerror
 		eerror "We have not been able to add iodbc support to Gentoo yet, as we"
 		eerror "have experienced difficulties in reaching www.iodbc.org."
-		eerror 
+		eerror
 		eerror "For now, please use the 'odbc' USE flag instead."
 		eerror
 		die "iodbc support incomplete; gentoo bug"
@@ -231,7 +231,7 @@ php5-sapi-r1_check_awkward_uses() {
 	fi
 
 	if useq mysql; then
-		enable_extension_with		"mysql"			"mysql"			1 
+		enable_extension_with		"mysql"			"mysql"			1
 		enable_extension_with		"mysql-sock"	"mysql"			0 "/var/run/mysqld/mysqld.sock"
 	fi
 	if useq mysqli; then
@@ -273,7 +273,7 @@ php5-sapi-r1_check_awkward_uses() {
 
 	# GD library support
 	confutils_use_depend_any "truetype" "gd" "gd-external"
-	
+
 	# ldap support
 	confutils_use_depend_all "sasl" "ldap"
 
@@ -311,7 +311,7 @@ php5-sapi-r1_pkg_setup() {
 
 php5-sapi-r1_src_unpack() {
 	unpack ${A}
-	# Fix for HTTP auth bug, #59755 
+	# Fix for HTTP auth bug, #59755
 	[ "x${PV}" == "x5.0.0" ] && epatch ${FILESDIR}/php-5.0.0-httpauthfix.patch
 
 	cd ${S}
@@ -438,7 +438,7 @@ php5-sapi-r1_src_compile() {
 
 php5-sapi-r1_src_install() {
 	addpredict /usr/share/snmp/mibs/.index
-	
+
 	useq sharedext && PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-modules"
 	make INSTALL_ROOT=${D} $PHP_INSTALLTARGETS || die "install failed"
 
@@ -454,7 +454,7 @@ php5-sapi-r1_src_install() {
 	local phpinisrc=php.ini-dist
 	einfo "Setting extension_dir in php.ini"
 	sed -e "s|^extension_dir .*$|extension_dir = ${PHPEXTDIR}|g" -i ${phpinisrc}
-	
+
 	# A patch for PHP for security. PHP-CLI interface is exempt, as it cannot be
 	# fed bad data from outside.
 	if [ "${PHPSAPI}" != "cli" ]; then
@@ -466,7 +466,7 @@ php5-sapi-r1_src_install() {
 	sed -e 's|^;include_path .*|include_path = ".:/usr/lib/php"|' -i ${phpinisrc}
 
 	if useq sharedext; then
-		for x in `ls ${D}${PHPEXTDIR}/*.so | sort`; do 
+		for x in `ls ${D}${PHPEXTDIR}/*.so | sort`; do
 			echo "extension=`basename ${x}`" >> ${phpinisrc}
 		done;
 	fi
diff --git a/eclass/php5-sapi-r2.eclass b/eclass/php5-sapi-r2.eclass
index 5665e0e211f4..d6a5b04c014e 100644
--- a/eclass/php5-sapi-r2.eclass
+++ b/eclass/php5-sapi-r2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r2.eclass,v 1.25 2005/07/10 13:34:05 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r2.eclass,v 1.26 2005/07/11 15:08:06 swegener Exp $
 #
 # eclass/php5-sapi-r2.eclass
 #               Eclass for building different php5 SAPI instances
@@ -307,7 +307,7 @@ php5-sapi-r2_check_awkward_uses() {
 
 	# GD library support
 	confutils_use_depend_any "truetype" "gd" "gd-external"
-	
+
 	# ldap support
 	confutils_use_depend_all "sasl" "ldap"
 
@@ -493,7 +493,7 @@ php5-sapi-r2_src_compile() {
 php5-sapi-r2_src_install() {
 	cd ${PHP_S}
 	addpredict /usr/share/snmp/mibs/.index
-	
+
 	useq sharedext && PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-modules"
 	make INSTALL_ROOT=${D} $PHP_INSTALLTARGETS || die "install failed"
 
@@ -504,7 +504,7 @@ php5-sapi-r2_src_install() {
 	local phpinisrc=php.ini-dist
 	einfo "Setting extension_dir in php.ini"
 	sed -e "s|^extension_dir .*$|extension_dir = ${PHPEXTDIR}|g" -i ${phpinisrc}
-	
+
 	# A patch for PHP for security. PHP-CLI interface is exempt, as it cannot be
 	# fed bad data from outside.
 	if [ "${PHPSAPI}" != "cli" ]; then
@@ -516,7 +516,7 @@ php5-sapi-r2_src_install() {
 	sed -e 's|^;include_path .*|include_path = ".:/usr/lib/php"|' -i ${phpinisrc}
 
 	if useq sharedext; then
-		for x in `ls ${D}${PHPEXTDIR}/*.so | sort`; do 
+		for x in `ls ${D}${PHPEXTDIR}/*.so | sort`; do
 			echo "extension=`basename ${x}`" >> ${phpinisrc}
 		done;
 	fi
diff --git a/eclass/php5-sapi-r3.eclass b/eclass/php5-sapi-r3.eclass
index 0c0896333129..e509c4ace1a0 100644
--- a/eclass/php5-sapi-r3.eclass
+++ b/eclass/php5-sapi-r3.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r3.eclass,v 1.13 2005/07/10 13:34:05 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r3.eclass,v 1.14 2005/07/11 15:08:06 swegener Exp $
 #
 # ########################################################################
 #
@@ -315,7 +315,7 @@ php5-sapi-r3_check_awkward_uses() {
 
 	# GD library support
 	confutils_use_depend_any "truetype" "gd" "gd-external"
-	
+
 	# ldap support
 	confutils_use_depend_all "sasl" "ldap"
 
@@ -491,7 +491,7 @@ php5-sapi-r3_src_compile() {
 php5-sapi-r3_src_install() {
 	cd ${PHP_S}
 	addpredict /usr/share/snmp/mibs/.index
-	
+
 	useq sharedext && PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-modules"
 	make INSTALL_ROOT=${D} $PHP_INSTALLTARGETS || die "install failed"
 
@@ -502,7 +502,7 @@ php5-sapi-r3_src_install() {
 	local phpinisrc=php.ini-dist
 	einfo "Setting extension_dir in php.ini"
 	sed -e "s|^extension_dir .*$|extension_dir = ${PHPEXTDIR}|g" -i ${phpinisrc}
-	
+
 	# A patch for PHP for security. PHP-CLI interface is exempt, as it cannot be
 	# fed bad data from outside.
 	if [ "${PHPSAPI}" != "cli" ]; then
@@ -514,7 +514,7 @@ php5-sapi-r3_src_install() {
 	sed -e 's|^;include_path .*|include_path = ".:/usr/lib/php"|' -i ${phpinisrc}
 
 	if useq sharedext; then
-		for x in `ls ${D}${PHPEXTDIR}/*.so | sort`; do 
+		for x in `ls ${D}${PHPEXTDIR}/*.so | sort`; do
 			echo "extension=`basename ${x}`" >> ${phpinisrc}
 		done;
 	fi
diff --git a/eclass/php5-sapi.eclass b/eclass/php5-sapi.eclass
index e4e468b7f8c5..9616ef488041 100644
--- a/eclass/php5-sapi.eclass
+++ b/eclass/php5-sapi.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi.eclass,v 1.52 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi.eclass,v 1.53 2005/07/11 15:08:06 swegener Exp $
 #
 # eclass/php5-sapi.eclass
 #		Eclass for building different php5 SAPI instances
@@ -12,7 +12,7 @@
 #
 # ========================================================================
 
-inherit eutils confutils libtool 
+inherit eutils confutils libtool
 
 
 # set MY_P in the ebuild
@@ -120,7 +120,7 @@ php5-sapi_check_awkward_uses() {
 		eerror
 		eerror "We have not been able to add iodbc support to Gentoo yet, as we"
 		eerror "have experienced difficulties in reaching www.iodbc.org."
-		eerror 
+		eerror
 		eerror "For now, please use the 'odbc' USE flag instead."
 		eerror
 		die "iodbc support incomplete; gentoo bug"
@@ -220,7 +220,7 @@ php5-sapi_check_awkward_uses() {
 	fi
 
 	if useq mysql; then
-		enable_extension_with		"mysql"			"mysql"			1 
+		enable_extension_with		"mysql"			"mysql"			1
 		enable_extension_with		"mysql-sock"	"mysql"			0 "/var/run/mysqld/mysqld.sock"
 	fi
 	if useq mysqli; then
@@ -262,7 +262,7 @@ php5-sapi_check_awkward_uses() {
 
 	# GD library support
 	confutils_use_depend_any "truetype" "gd" "gd-external"
-	
+
 	# ldap support
 	confutils_use_depend_all "sasl" "ldap"
 
@@ -311,7 +311,7 @@ php5-sapi_pkg_setup() {
 
 php5-sapi_src_unpack() {
 	unpack ${A}
-	# Fix for HTTP auth bug, #59755 
+	# Fix for HTTP auth bug, #59755
 	[ "x${PV}" == "x5.0.0" ] && epatch ${FILESDIR}/php-5.0.0-httpauthfix.patch
 
 	cd ${S}
@@ -437,7 +437,7 @@ php5-sapi_src_compile() {
 
 php5-sapi_src_install() {
 	addpredict /usr/share/snmp/mibs/.index
-	
+
 	useq sharedext && PHP_INSTALLTARGETS="${PHP_INSTALLTARGETS} install-modules"
 	make INSTALL_ROOT=${D} $PHP_INSTALLTARGETS || die "install failed"
 
@@ -453,7 +453,7 @@ php5-sapi_src_install() {
 	local phpinisrc=php.ini-dist
 	einfo "Setting extension_dir in php.ini"
 	sed -e "s|^extension_dir .*$|extension_dir = ${PHPEXTDIR}|g" -i ${phpinisrc}
-	
+
 	# A patch for PHP for security. PHP-CLI interface is exempt, as it cannot be
 	# fed bad data from outside.
 	if [ "${PHPSAPI}" != "cli" ]; then
@@ -465,7 +465,7 @@ php5-sapi_src_install() {
 	sed -e 's|^;include_path .*|include_path = ".:/usr/lib/php"|' -i ${phpinisrc}
 
 	if useq sharedext; then
-		for x in `ls ${D}${PHPEXTDIR}/*.so | sort`; do 
+		for x in `ls ${D}${PHPEXTDIR}/*.so | sort`; do
 			echo "extension=`basename ${x}`" >> ${phpinisrc}
 		done;
 	fi
diff --git a/eclass/python.eclass b/eclass/python.eclass
index 42f4d66b5597..7d6c27d31be8 100644
--- a/eclass/python.eclass
+++ b/eclass/python.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.20 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.21 2005/07/11 15:08:06 swegener Exp $
 #
 # Author: Alastair Tse <liquidx@gentoo.org>
 #
@@ -65,7 +65,7 @@ __python_version_extract() {
 	export PYVER_MAJOR=${verstr:0:1}
 	export PYVER_MINOR=${verstr:2:1}
 	export PYVER_MICRO=${verstr:4}
-	export PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"	
+	export PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
 }
 
 python_version() {
diff --git a/eclass/qt3.eclass b/eclass/qt3.eclass
index 64dbadce8340..85d4b9ca3787 100644
--- a/eclass/qt3.eclass
+++ b/eclass/qt3.eclass
@@ -1,6 +1,6 @@
 # Copyright 2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt3.eclass,v 1.3 2005/07/09 22:39:15 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt3.eclass,v 1.4 2005/07/11 15:08:06 swegener Exp $
 #
 # Author Caleb Tennis <caleb@gentoo.org>
 #
@@ -58,7 +58,7 @@ qt_min_version_list() {
 				fi
 			done
 			;;
-		*)    
+		*)
 			die "qt_min_version called with invalid parameter: \"$1\""
 			;;
 	esac
diff --git a/eclass/rox.eclass b/eclass/rox.eclass
index 43bc1707a44b..474144d24986 100644
--- a/eclass/rox.eclass
+++ b/eclass/rox.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/rox.eclass,v 1.5 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/rox.eclass,v 1.6 2005/07/11 15:08:06 swegener Exp $
 
 # ROX eclass Version 2
 
@@ -40,7 +40,7 @@ rox_src_compile() {
 	#Some packages need to be compiled.
 	chmod 755 ./AppRun
 	if [ -d "src/" ]; then
-		./AppRun --compile || die "Failed to compile the package" 
+		./AppRun --compile || die "Failed to compile the package"
 		rm -rf src
 	fi
 }
@@ -53,7 +53,7 @@ rox_src_install() {
 	fi
 	insinto /usr/lib/rox
 	doins -r ${APPNAME}
-	#set correct permisions on files, in case they are wrong 
+	#set correct permisions on files, in case they are wrong
 	chmod 755 ${D}/usr/lib/rox/${APPNAME}/AppRun
 	chmod 755 ${D}/usr/lib/rox/${APPNAME}/AppletRun
 
@@ -78,7 +78,7 @@ rox_src_install() {
 	    case $ARCH in
 		i?86) ARCH=ix86 ;;
 	    esac
-	    PLATFORM="`uname -s`-$ARCH" 
+	    PLATFORM="`uname -s`-$ARCH"
 	    chmod -R 755 ${D}/usr/lib/rox/${APPNAME}/${PLATFORM}
 	fi
 
diff --git a/eclass/rpm.eclass b/eclass/rpm.eclass
index dada38141505..b5b25c595e63 100644
--- a/eclass/rpm.eclass
+++ b/eclass/rpm.eclass
@@ -1,11 +1,11 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/rpm.eclass,v 1.13 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/rpm.eclass,v 1.14 2005/07/11 15:08:06 swegener Exp $
 
 # Author : Alastair Tse <liquidx@gentoo.org> (21 Jun 2003)
 #
 # Convienence class for extracting RPMs
-# 
+#
 # Basically, rpm_src_unpack does:
 #
 # 1. uses rpm_unpack to unpack a rpm file using rpmoffset and cpio
@@ -21,11 +21,11 @@
 # it will use that instead of the less reliable rpmoffset. This means if a
 # particular rpm cannot be read using rpmoffset, you just need to put :
 #
-# DEPEND="app-arch/rpm" 
+# DEPEND="app-arch/rpm"
 #
 # in your ebuild and it will install and use rpm2cpio instead. If you wish
 # to force your ebuild to use rpmoffset in the presence of rpm2cpio, define:
-# 
+#
 # USE_RPMOFFSET_ONLY="1"
 
 
@@ -45,7 +45,7 @@ rpm_unpack() {
 	else
 		rpmoff=`rpmoffset < ${rpmfile}`
 		[ -z "${rpmoff}" ] && return 1
-		
+
 		decompcmd="gzip -dc"
 		if [ -n "`dd if=${rpmfile} skip=${rpmoff} bs=1 count=3 2>/dev/null | file - | grep bzip2`" ]; then
 			decompcmd="bzip2 -dc"
@@ -53,14 +53,14 @@ rpm_unpack() {
 		dd ibs=${rpmoff} skip=1 if=${rpmfile} 2> /dev/null \
 			| ${decompcmd} \
 			| cpio -idmu --no-preserve-owner --quiet || return 1
-	fi	
-	
+	fi
+
 	return 0
 }
 
 rpm_src_unpack() {
 	local x prefix ext myfail OLD_DISTDIR
-	
+
 	for x in ${A}; do
 		myfail="failure unpacking ${x}"
 		ext=${x##*.}
@@ -70,7 +70,7 @@ rpm_src_unpack() {
 			prefix=${x%.rpm}
 			cd ${WORKDIR}
 			rpm_unpack ${DISTDIR}/${x} || die "${myfail}"
-			
+
 			# find all tar.gz files and extract for srpms
 			if [ "${prefix##*.}" = "src" ]; then
 				OLD_DISTDIR=${DISTDIR}
@@ -84,14 +84,13 @@ rpm_src_unpack() {
 					rm -f ${t}
 				done
 				DISTDIR=${OLD_DISTDIR}
-			fi				
+			fi
 			;;
 		*)
 			unpack ${x}
 			;;
 		esac
 	done
-			
 }
 
 EXPORT_FUNCTIONS src_unpack
diff --git a/eclass/sgml-catalog.eclass b/eclass/sgml-catalog.eclass
index b3d7c03c5bad..b84e1bd31987 100644
--- a/eclass/sgml-catalog.eclass
+++ b/eclass/sgml-catalog.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/sgml-catalog.eclass,v 1.10 2005/07/06 20:20:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/sgml-catalog.eclass,v 1.11 2005/07/11 15:08:06 swegener Exp $
 #
 # Author Matthew Turk <satai@gentoo.org>
 
@@ -13,73 +13,73 @@ declare -i catcounter
 let "catcounter=0"
 
 sgml-catalog_cat_include() {
-    debug-print function $FUNCNAME $*
-    toinstall["catcounter++"]="${1}:${2}"
+	debug-print function $FUNCNAME $*
+	toinstall["catcounter++"]="${1}:${2}"
 }
 
 sgml-catalog_cat_doinstall() {
-    debug-print function $FUNCNAME $*
-    /usr/bin/install-catalog --add $1 $2 &>/dev/null
+	debug-print function $FUNCNAME $*
+	/usr/bin/install-catalog --add $1 $2 &>/dev/null
 }
 
 sgml-catalog_cat_doremove() {
-    debug-print function $FUNCNAME $*
-    /usr/bin/install-catalog --remove $1 $2 &>/dev/null
+	debug-print function $FUNCNAME $*
+	/usr/bin/install-catalog --remove $1 $2 &>/dev/null
 }
 
 sgml-catalog_pkg_postinst() {
-    debug-print function $FUNCNAME $*
-    declare -i topindex
-    topindex="catcounter-1"
-    for i in `seq 0 ${topindex}`
-    do
-        arg1=`echo ${toinstall[$i]} | cut -f1 -d\:`
-        arg2=`echo ${toinstall[$i]} | cut -f2 -d\:`
-        if [ ! -e $arg2 ]
-        then
-            ewarn "${arg2} doesn't appear to exist, although it ought to!"
-            continue
-        fi
-        einfo "Now adding $arg2 to $arg1 and /etc/sgml/catalog"
-        sgml-catalog_cat_doinstall $arg1 $arg2
-    done
-    sgml-catalog_cleanup
+	debug-print function $FUNCNAME $*
+	declare -i topindex
+	topindex="catcounter-1"
+	for i in `seq 0 ${topindex}`
+	do
+		arg1=`echo ${toinstall[$i]} | cut -f1 -d\:`
+		arg2=`echo ${toinstall[$i]} | cut -f2 -d\:`
+		if [ ! -e ${arg2} ]
+		then
+			ewarn "${arg2} doesn't appear to exist, although it ought to!"
+			continue
+		fi
+		einfo "Now adding ${arg2} to ${arg1} and /etc/sgml/catalog"
+		sgml-catalog_cat_doinstall ${arg1} ${arg2}
+	done
+	sgml-catalog_cleanup
 }
 
 sgml-catalog_pkg_prerm() {
-    sgml-catalog_cleanup
+	sgml-catalog_cleanup
 }
 
 sgml-catalog_pkg_postrm() {
-    debug-print function $FUNCNAME $*
-    declare -i topindex
-    topindex="catcounter-1"
-    for i in `seq 0 ${topindex}`
-    do
-        arg1=`echo ${toinstall[$i]} | cut -f1 -d\:`
-        arg2=`echo ${toinstall[$i]} | cut -f2 -d\:`
-        if [ -e $arg2 ] 
-        then
-            ewarn "${arg2} still exists!  Not removing from ${arg1}" 
-            ewarn "This is normal behavior for an upgrade ..."
-            continue
-        fi
-        einfo "Now removing $arg1 from $arg2 and /etc/sgml/catalog"
-        sgml-catalog_cat_doremove $arg1 $arg2
-    done
+	debug-print function $FUNCNAME $*
+	declare -i topindex
+	topindex="catcounter-1"
+	for i in `seq 0 ${topindex}`
+	do
+		arg1=`echo ${toinstall[$i]} | cut -f1 -d\:`
+		arg2=`echo ${toinstall[$i]} | cut -f2 -d\:`
+		if [ -e ${arg2} ]
+		then
+			ewarn "${arg2} still exists!  Not removing from ${arg1}"
+			ewarn "This is normal behavior for an upgrade ..."
+			continue
+		fi
+		einfo "Now removing $arg1 from $arg2 and /etc/sgml/catalog"
+		sgml-catalog_cat_doremove ${arg1} ${arg2}
+	done
 }
 
 sgml-catalog_cleanup() {
-    if [ -e /usr/bin/gensgmlenv ]
-    then
-        einfo Regenerating SGML environment variables ...
-        gensgmlenv
-        grep -v export /etc/sgml/sgml.env > /etc/env.d/93sgmltools-lite
-    fi
+	if [ -e /usr/bin/gensgmlenv ]
+	then
+		einfo Regenerating SGML environment variables ...
+		gensgmlenv
+		grep -v export /etc/sgml/sgml.env > /etc/env.d/93sgmltools-lite
+	fi
 }
 
 sgml-catalog_src_compile() {
-    return
+	return
 }
 
 EXPORT_FUNCTIONS pkg_postrm pkg_postinst src_compile pkg_prerm
diff --git a/eclass/ssl-cert.eclass b/eclass/ssl-cert.eclass
index aa477c17d203..fca4242ce7f1 100644
--- a/eclass/ssl-cert.eclass
+++ b/eclass/ssl-cert.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.8 2005/07/06 21:01:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ssl-cert.eclass,v 1.9 2005/07/11 15:08:06 swegener Exp $
 #
 # Author: Max Kalika <max@gentoo.org>
 #
@@ -12,7 +12,7 @@
 DEPEND="ssl? ( dev-libs/openssl )"
 IUSE="ssl"
 
-# Initializes variables and generates the needed 
+# Initializes variables and generates the needed
 # OpenSSL configuration file and a CA serial file
 #
 # Access: private
@@ -56,7 +56,7 @@ gen_cnf() {
 		emailAddress       = ${SSL_EMAIL}
 	EOF
 	eend $?
-	
+
 	return $?
 }
 
diff --git a/eclass/stardict.eclass b/eclass/stardict.eclass
index afe3f73e596c..e913af5d38b9 100644
--- a/eclass/stardict.eclass
+++ b/eclass/stardict.eclass
@@ -1,11 +1,11 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/stardict.eclass,v 1.9 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/stardict.eclass,v 1.10 2005/07/11 15:08:06 swegener Exp $
 
 # Author : Alastair Tse <liquidx@gentoo.org>
 #
 # Convienence class to do stardict dictionary installations.
-# 
+#
 # Usage:
 #   - Variables to set :
 #      * FROM_LANG     -  From this language
@@ -23,8 +23,8 @@ if [ -n "${FROM_LANG}" -a -n "${TO_LANG}" ]; then
 	DESCRIPTION="Stardict Dictionary ${FROM_LANG} to ${TO_LANG}"
 elif [ -z "${DESCRIPTION}" ]; then
 	DESCRIPTION="Another Stardict Dictionary"
-fi	
-	
+fi
+
 HOMEPAGE="http://stardict.sourceforge.net/"
 SRC_URI="mirror://sourceforge/stardict/${DICT_P}.tar.bz2"
 
diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass
index 8b3f0d0cb496..2102104d87af 100644
--- a/eclass/subversion.eclass
+++ b/eclass/subversion.eclass
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.22 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.23 2005/07/11 15:08:06 swegener Exp $
 
 ## --------------------------------------------------------------------------- #
 # Author: Akinori Hattori <hattya@gentoo.org>
-# 
+#
 # The subversion eclass is written to fetch the software sources from
 # subversion repositories like the cvs eclass.
 #
diff --git a/eclass/tetex-2.eclass b/eclass/tetex-2.eclass
index a434b487119a..08638a183fcb 100644
--- a/eclass/tetex-2.eclass
+++ b/eclass/tetex-2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/tetex-2.eclass,v 1.3 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/tetex-2.eclass,v 1.4 2005/07/11 15:08:06 swegener Exp $
 #
 # Author: Jaromir Malenko <malenko@email.cz>
 # Author: Mamoru KOMACHI <usata@gentoo.org>
@@ -20,7 +20,7 @@ tetex-2_src_unpack() {
 	unpack ${TETEX_TEXMF_SRC}
 	sed -i -e "s/-sys//g" ${T}/texmf-update || die
 
-	# fix up misplaced listings.sty in the 2.0.2 archive. 
+	# fix up misplaced listings.sty in the 2.0.2 archive.
 	# this should be fixed in the next release <obz@gentoo.org>
 	mv source/latex/listings/listings.sty tex/latex/listings/ || die
 
diff --git a/eclass/tetex-3.eclass b/eclass/tetex-3.eclass
index 8b6b083f0bb3..506ab2bca53b 100644
--- a/eclass/tetex-3.eclass
+++ b/eclass/tetex-3.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/tetex-3.eclass,v 1.6 2005/07/06 21:01:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/tetex-3.eclass,v 1.7 2005/07/11 15:08:06 swegener Exp $
 #
 # Author: Jaromir Malenko <malenko@email.cz>
 # Author: Mamoru KOMACHI <usata@gentoo.org>
@@ -33,7 +33,7 @@ DEPEND="X? ( motif? ( lesstif? ( x11-libs/lesstif )
 
 tetex-3_pkg_setup() {
 	tetex_pkg_setup
-	
+
 	ewarn
 	ewarn "teTeX 3.0 ebuild will remove config files stored in /usr/share/texmf."
 	ewarn "Please make a backup before upgrading if you changed anything."
@@ -82,7 +82,7 @@ tetex-3_src_compile() {
 
 tetex-3_src_install() {
 
-	tetex_src_install	
+	tetex_src_install
 
 	dodir /etc/env.d
 	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c"' > ${D}/etc/env.d/98tetex
diff --git a/eclass/tetex.eclass b/eclass/tetex.eclass
index 4c1ae57a903a..e793160ccbff 100644
--- a/eclass/tetex.eclass
+++ b/eclass/tetex.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/tetex.eclass,v 1.40 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/tetex.eclass,v 1.41 2005/07/11 15:08:06 swegener Exp $
 #
 # Author: Jaromir Malenko <malenko@email.cz>
 # Author: Mamoru KOMACHI <usata@gentoo.org>
@@ -128,12 +128,12 @@ EOF
 				sed -i -e "/^HOMETEXMF/s:\$HOME/texmf:\$HOME/Library/texmf:" ${S}/texk/kpathsea/texmf.in || die "sed texmf.in failed."
 			fi
 			;;
-    		all)
-    			tetex_src_unpack unpack patch
+		all)
+			tetex_src_unpack unpack patch
 			;;
-    	esac
-    	shift
-    done
+	esac
+	shift
+	done
 }
 
 tetex_src_compile() {
diff --git a/eclass/tla.eclass b/eclass/tla.eclass
index 6caa1ffd4d44..939b45828e9a 100644
--- a/eclass/tla.eclass
+++ b/eclass/tla.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/tla.eclass,v 1.7 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/tla.eclass,v 1.8 2005/07/11 15:08:06 swegener Exp $
 #
 # Original Author:    Jeffrey Yasskin <jyasskin@mail.utexas.edu>
 #
@@ -22,7 +22,7 @@
 SRC_URI=""
 
 # You shouldn't change these settings yourself! The ebuild/eclass inheriting
-# this eclass will take care of that. 
+# this eclass will take care of that.
 
 # --- begin ebuild-configurable settings
 
@@ -109,7 +109,7 @@ tla_fetch() {
 	local tla_archive=`$ETLA_TLA_CMD parse-package-name --arch $ETLA_VERSION`
 	local tla_version=`$ETLA_TLA_CMD parse-package-name --package-version $ETLA_VERSION`
 	#local tla_revision=`$ETLA_TLA_CMD parse-package-name --lvl $ETLA_VERSION`
-	
+
 	# determine checkout or update mode and change to the right directory.
 	if [ ! -d "$ETLA_TOP_DIR/$ETLA_CACHE_DIR/{arch}" ]; then
 		mode=get
@@ -139,7 +139,7 @@ tla_fetch() {
 	local cmdupdate="${ETLA_TLA_CMD} ${ETLA_UPDATE_CMD} ${ETLA_VERSION}"
 
 	if [ "${mode}" == "get" ]; then
-		einfo "Running $cmdget" 
+		einfo "Running $cmdget"
 		eval $cmdget || die "tla get command failed"
 	elif [ "${mode}" == "update" ]; then
 		einfo "Running $cmdupdate"
@@ -171,7 +171,7 @@ tla_src_unpack() {
 
 	einfo "Fetching tla version $ETLA_VERSION into $ETLA_TOP_DIR ..."
 	tla_fetch
-	
+
 	einfo "Copying $ETLA_CACHE_DIR from $ETLA_TOP_DIR ..."
 	debug-print "Copying $ETLA_CACHE_DIR from $ETLA_TOP_DIR ..."
 
@@ -195,7 +195,7 @@ tla_src_unpack() {
 	#	# tla_src_unpack may be called several times
 	#	export PATCHES=""
 	#fi
-	
+
 	einfo "Version ${ETLA_VERSION} is now in ${WORKDIR}/${P}"
 
 }
diff --git a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass
index 0217eb3170ff..6e66bd5514de 100644
--- a/eclass/toolchain-binutils.eclass
+++ b/eclass/toolchain-binutils.eclass
@@ -1,9 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v 1.41 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v 1.42 2005/07/11 15:08:06 swegener Exp $
 
-# We install binutils into CTARGET-VERSION specific directories.  This lets 
-# us easily merge multiple versions for multiple targets (if we wish) and 
+# We install binutils into CTARGET-VERSION specific directories.  This lets
+# us easily merge multiple versions for multiple targets (if we wish) and
 # then switch the versions on the fly (with `binutils-config`).
 
 inherit eutils libtool flag-o-matic gnuconfig
@@ -93,7 +93,7 @@ tc-binutils_apply_patches() {
 
 toolchain-binutils_src_unpack() {
 	tc-binutils_unpack
-	tc-binutils_apply_patches	
+	tc-binutils_apply_patches
 }
 
 toolchain-binutils_src_compile() {
@@ -130,14 +130,14 @@ toolchain-binutils_src_compile() {
 	emake -j1 headers -C bfd || die "make headers-bfd failed"
 	emake all || die "emake failed"
 
-	# only build info pages if we user wants them, and if 
+	# only build info pages if we user wants them, and if
 	# we have makeinfo (may not exist when we bootstrap)
 	if ! has noinfo ${FEATURES} ; then
 		if type -p makeinfo ; then
 			make info || die "make info failed"
 		fi
 	fi
-	# we nuke the manpages when we're left with junk 
+	# we nuke the manpages when we're left with junk
 	# (like when we bootstrap, no perl -> no manpages)
 	find . -name '*.1' -a -size 0 | xargs rm -f
 }
@@ -177,10 +177,10 @@ toolchain-binutils_src_install() {
 	dodir /usr/${CTARGET}/{bin,include,lib}
 	prepman ${DATAPATH}
 
-	# Now, some binutils are tricky and actually provide 
-	# for multiple TARGETS.  Really, we're talking just 
-	# 32bit/64bit support (like mips/ppc/sparc).  Here 
-	# we want to tell binutils-config that it's cool if 
+	# Now, some binutils are tricky and actually provide
+	# for multiple TARGETS.  Really, we're talking just
+	# 32bit/64bit support (like mips/ppc/sparc).  Here
+	# we want to tell binutils-config that it's cool if
 	# it generates multiple sets of binutil symlinks.
 	# e.g. sparc gets {sparc,sparc64}-unknown-linux-gnu
 	local targ=${CTARGET/-*}
@@ -191,7 +191,6 @@ toolchain-binutils_src_install() {
 		mips*|powerpc|sparc*)
 			FAKE_TARGETS="${FAKE_TARGETS} ${CTARGET/-/64-}";;
 	esac
-	
 
 	# Generate an env.d entry for this binutils
 	cd "${S}"
@@ -237,7 +236,7 @@ toolchain-binutils_pkg_postinst() {
 toolchain-binutils_pkg_postrm() {
 	local current_profile=$(binutils-config -c ${CTARGET})
 
-	# If no other versions exist, then uninstall for this 
+	# If no other versions exist, then uninstall for this
 	# target ... otherwise, switch to the newest version
 	# Note: only do this if this version is unmerged.  We
 	#       rerun binutils-config if this is a remerge, as
diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass
index 3d375bbe5ffb..60c1bcb8a8f1 100644
--- a/eclass/toolchain-funcs.eclass
+++ b/eclass/toolchain-funcs.eclass
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.39 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.40 2005/07/11 15:08:06 swegener Exp $
 #
 # Author: Toolchain Ninjas <ninjas@gentoo.org>
 #
-# This eclass contains (or should) functions to get common info 
+# This eclass contains (or should) functions to get common info
 # about the toolchain (libc/compiler/binutils/etc...)
 
 inherit multilib
@@ -87,7 +87,7 @@ tc-is-cross-compiler() {
 }
 
 
-# Parse information from CBUILD/CHOST/CTARGET rather than 
+# Parse information from CBUILD/CHOST/CTARGET rather than
 # use external variables from the profile.
 tc-ninja_magic_to_arch() {
 ninj() { [[ ${type} == "kern" ]] && echo $1 || echo $2 ; }
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index d5e43f26bf3d..8802c8f315b4 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.173 2005/07/10 01:45:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.174 2005/07/11 15:08:06 swegener Exp $
 
 HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
 LICENSE="GPL-2 LGPL-2.1"
@@ -666,7 +666,7 @@ create_gcc_env_entry() {
 		for abi in $(get_all_abis) ; do
 			[[ ${abi} == ${DEFAULT_ABI} ]] && continue
 
-			MULTIDIR=$(${XGCC} $(get_abi_CFLAGS ${abi}) --print-multi-directory)			
+			MULTIDIR=$(${XGCC} $(get_abi_CFLAGS ${abi}) --print-multi-directory)
 			if [[ ${MULTIDIR} == "." ]] ; then
 				LDPATH="${LDPATH}:${LIBPATH}"
 			else
@@ -811,9 +811,9 @@ gcc-compiler_pkg_prerm() {
 }
 
 gcc-compiler_pkg_postrm() {
-	# to make our lives easier (and saner), we do the fix_libtool stuff here.   
-	# rather than checking SLOT's and trying in upgrade paths, we just see if 
-	# the common libstdc++.la exists in the ${LIBPATH} of the gcc that we are 
+	# to make our lives easier (and saner), we do the fix_libtool stuff here.
+	# rather than checking SLOT's and trying in upgrade paths, we just see if
+	# the common libstdc++.la exists in the ${LIBPATH} of the gcc that we are
 	# unmerging.  if it does, that means this was a simple re-emerge.
 
 	# clean up the cruft left behind by cross-compilers
@@ -931,8 +931,8 @@ gcc_src_unpack() {
 
 	# disable --as-needed from being compiled into gcc specs
 	# natively when using >=sys-devel/binutils-2.15.90.0.1 this is
-	# done to keep our gcc backwards compatible with binutils. 
-	# gcc 3.4.1 cvs has patches that need back porting.. 
+	# done to keep our gcc backwards compatible with binutils.
+	# gcc 3.4.1 cvs has patches that need back porting..
 	# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14992 (May 3 2004)
 	if [[ ${GCCMAJOR} -lt 4 ]] ; then
 		sed -i -e s/HAVE_LD_AS_NEEDED/USE_LD_AS_NEEDED/g ${S}/gcc/config.in
@@ -1049,7 +1049,7 @@ gcc_do_configure() {
 	confgcc="${confgcc} --host=${CHOST}"
 	if is_crosscompile ; then
 		# Straight from the GCC install doc:
-		# "GCC has code to correctly determine the correct value for target 
+		# "GCC has code to correctly determine the correct value for target
 		# for nearly all native systems. Therefore, we highly recommend you
 		# not provide a configure target when configuring a native compiler."
 		confgcc="${confgcc} --target=${CTARGET}"
@@ -1078,12 +1078,12 @@ gcc_do_configure() {
 	einfo "running ${ETYPE}-configure"
 	${ETYPE}-configure || die
 
-	# if not specified, assume we are building for a target that only 
+	# if not specified, assume we are building for a target that only
 	# requires C support
 	GCC_LANG=${GCC_LANG:-c}
 	confgcc="${confgcc} --enable-languages=${GCC_LANG}"
 
-	# When building a stage1 cross-compiler (just C compiler), we have to 
+	# When building a stage1 cross-compiler (just C compiler), we have to
 	# disable a bunch of features or gcc goes boom
 	if is_crosscompile && [[ ${GCC_LANG} == "c" ]] ; then
 		confgcc="${confgcc} --disable-shared --disable-threads --without-headers"
@@ -1092,7 +1092,7 @@ gcc_do_configure() {
 	fi
 	# __cxa_atexit is "essential for fully standards-compliant handling of
 	# destructors", but apparently requires glibc.
-	# --enable-sjlj-exceptions : currently the unwind stuff seems to work 
+	# --enable-sjlj-exceptions : currently the unwind stuff seems to work
 	# for statically linked apps but not dynamic
 	# so use setjmp/longjmp exceptions by default
 	if is_uclibc ; then
@@ -1213,7 +1213,7 @@ gcc_do_make() {
 }
 
 # This function will add ${GCC_CONFIG_VER} to the names of all shared libraries in the
-# directory specified to avoid filename collisions between multiple slotted 
+# directory specified to avoid filename collisions between multiple slotted
 # non-versioned gcc targets. If no directory is specified, it is assumed that
 # you want -all- shared objects to have ${GCC_CONFIG_VER} added. Example
 #
@@ -1370,7 +1370,7 @@ gcc-library_src_install() {
 		mkdir -p ${WORKDIR}/${GCC_LIB_USE_SUBDIR}/
 		mv "${D}"${LIBPATH}/* ${WORKDIR}/${GCC_LIB_USE_SUBDIR}/
 		mv ${WORKDIR}/${GCC_LIB_USE_SUBDIR}/ "${D}"${LIBPATH}
-		
+
 		dodir /etc/env.d
 		echo "LDPATH=\"${LIBPATH}/${GCC_LIB_USE_SUBDIR}/\"" >> "${D}"/etc/env.d/99${PN}
 	fi
@@ -1486,7 +1486,7 @@ gcc-compiler_src_install() {
 
 		# I do not know if this will break gcj stuff, so I'll only do it for
 		#   objc for now; basically "ffi.h" is the correct file to include,
-		#   but it gets installed in .../GCCVER/include and yet it does 
+		#   but it gets installed in .../GCCVER/include and yet it does
 		#   "#include <ffitarget.h>" which (correctly, as it's an "extra" file)
 		#   is installed in .../GCCVER/include/libffi; the following fixes
 		#   ffi.'s include of ffitarget.h - Armando Di Cianno <fafhrd@gentoo.org>
@@ -1499,15 +1499,15 @@ gcc-compiler_src_install() {
 
 	# Setup symlinks to multilib ABIs for crosscompiled gccs
 	if is_crosscompile && is_multilib; then
-		CHOST_x86="i686-pc-linux-gnu" 
-		CHOST_amd64="x86_64-pc-linux-gnu" 
-		CHOST_o32="mips-unknown-linux-gnu" 
-		CHOST_n32="mips64-unknown-linux-gnu" 
-		CHOST_n64="mips64-unknown-linux-gnu" 
-		CHOST_ppc="powerpc-unknown-linux-gnu" 
-		CHOST_ppc64="powerpc64-unknown-linux-gnu" 
-		CHOST_sparc32="sparc-unknown-linux-gnu" 
-		CHOST_sparc64="sparc64-unknown-linux-gnu" 
+		CHOST_x86="i686-pc-linux-gnu"
+		CHOST_amd64="x86_64-pc-linux-gnu"
+		CHOST_o32="mips-unknown-linux-gnu"
+		CHOST_n32="mips64-unknown-linux-gnu"
+		CHOST_n64="mips64-unknown-linux-gnu"
+		CHOST_ppc="powerpc-unknown-linux-gnu"
+		CHOST_ppc64="powerpc64-unknown-linux-gnu"
+		CHOST_sparc32="sparc-unknown-linux-gnu"
+		CHOST_sparc64="sparc64-unknown-linux-gnu"
 
 		case $(tc-arch) in
 		amd64)
@@ -1868,7 +1868,7 @@ should_we_gcc_config() {
 	# if the current config is invalid, we definitely want a new one
 	env -i gcc-config -c ${CTARGET} >&/dev/null || return 0
 
-	# if the previously selected config has the same major.minor (branch) as 
+	# if the previously selected config has the same major.minor (branch) as
 	# the version we are installing, then it will probably be uninstalled
 	# for being in the same SLOT, make sure we run gcc-config.
 	local curr_config_ver=$(env -i gcc-config -c ${CTARGET} | awk -F - '{ print $5 }')
@@ -1883,9 +1883,9 @@ should_we_gcc_config() {
 	else
 		# if we're installing a genuinely different compiler version,
 		# we should probably tell the user -how- to switch to the new
-		# gcc version, since we're not going to do it for him/her.  
-		# We don't want to switch from say gcc-3.3 to gcc-3.4 right in 
-		# the middle of an emerge operation (like an 'emerge -e world' 
+		# gcc version, since we're not going to do it for him/her.
+		# We don't want to switch from say gcc-3.3 to gcc-3.4 right in
+		# the middle of an emerge operation (like an 'emerge -e world'
 		# which could install multiple gcc versions).
 		einfo "The current gcc config appears valid, so it will not be"
 		einfo "automatically switched for you.  If you would like to"
diff --git a/eclass/vim-plugin.eclass b/eclass/vim-plugin.eclass
index 84f9de428dae..bfecd43108dd 100644
--- a/eclass/vim-plugin.eclass
+++ b/eclass/vim-plugin.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim-plugin.eclass,v 1.13 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim-plugin.eclass,v 1.14 2005/07/11 15:08:06 swegener Exp $
 #
 # This eclass simplifies installation of app-vim plugins into
 # /usr/share/vim/vimfiles.  This is a version-independent directory
@@ -38,7 +38,7 @@ vim-plugin_src_install() {
 		fi
 		rm -f "${f}"
 	done
-	
+
 	# Install remainder of plugin
 	cd ${WORKDIR}
 	dodir /usr/share/vim
@@ -54,7 +54,7 @@ vim-plugin_pkg_postinst() {
 vim-plugin_pkg_postrm() {
 	update_vim_helptags		# from vim-doc
 	update_vim_afterscripts	# see below
-	
+
 	# Remove empty dirs; this allows
 	# /usr/share/vim to be removed if vim-core is unmerged
 	find /usr/share/vim/vimfiles -depth -type d -exec rmdir {} \; 2>/dev/null
diff --git a/eclass/vim.eclass b/eclass/vim.eclass
index fac32591acb7..b9008d35ac9f 100644
--- a/eclass/vim.eclass
+++ b/eclass/vim.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.112 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.113 2005/07/11 15:08:06 swegener Exp $
 
 # Authors:
 # 	Ryan Phillips <rphillips@gentoo.org>
@@ -43,9 +43,9 @@ if version_is_at_least 6.3.1 ; then
 	inherit bash-completion
 fi
 
-EXPORT_FUNCTIONS src_unpack pkg_setup
+EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install src_test pkg_postinst pkg_postrm
 
-IUSE="$IUSE selinux nls acl"
+IUSE="selinux nls acl"
 
 if version_is_at_least "6.3.075" ; then
 	IUSE="${IUSE} termcap-compat"
@@ -325,7 +325,7 @@ END
 
 }
 
-src_compile() {
+vim_src_compile() {
 	local myconf confrule
 
 	# Fix bug 37354: Disallow -funroll-all-loops on amd64
@@ -503,7 +503,7 @@ src_compile() {
 	[[ $(get_major_version ) -ge 7 ]] && [[ -f src/kvim ]] && mv src/{k,g}vim
 }
 
-src_install() {
+vim_src_install() {
 	if [[ "${MY_PN}" == "vim-core" ]] ; then
 		dodir /usr/{bin,share/{man/man1,vim}}
 		cd src || die "cd src failed"
@@ -679,7 +679,7 @@ update_vim_symlinks() {
 	# have triggers like are done in rpm-land.
 }
 
-pkg_postinst() {
+vim_pkg_postinst() {
 	# Update documentation tags (from vim-doc.eclass)
 	update_vim_helptags
 
@@ -755,7 +755,7 @@ pkg_postinst() {
 	update_vim_symlinks
 }
 
-pkg_postrm() {
+vim_pkg_postrm() {
 	# Update documentation tags (from vim-doc.eclass)
 	update_vim_helptags
 
@@ -768,7 +768,7 @@ pkg_postrm() {
 	fi
 }
 
-src_test() {
+vim_src_test() {
 
 	if [[ "${MY_PN}" == "vim-core" ]] ; then
 		einfo "No testing needs to be done for vim-core"
@@ -829,4 +829,3 @@ src_test() {
 	make VIMPROG=${testprog} nongui \
 		|| die "At least one test failed"
 }
-
diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass
index 7ea197420645..017580cf1e04 100644
--- a/eclass/virtualx.eclass
+++ b/eclass/virtualx.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.22 2005/07/06 20:20:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.23 2005/07/11 15:08:06 swegener Exp $
 #
 # Author: Martin Schlemmer <azarah@gentoo.org>
 #
@@ -38,10 +38,10 @@ virtualmake() {
 
 		# We really do not want SANDBOX enabled here
 		export SANDBOX_DISABLED="1"
-		
+
 		local i=0
 		XDISPLAY=$(i=0; while [[ -f /tmp/.X${i}-lock ]] ; do i=$((${i}+1));done; echo ${i})
-		
+
 		# If we are in a chrooted environment, and there is already a
 		# X server started outside of the chroot, Xvfb will fail to start
 		# on the same display (most cases this is :0 ), so make sure
@@ -57,7 +57,7 @@ virtualmake() {
 		#
 		${XVFB} :${XDISPLAY} -screen 0 800x600x24 &>/dev/null &
 		sleep 2
-		
+
 		local start=${XDISPLAY}
 		while [[ ! -f /tmp/.X${XDISPLAY}-lock ]] ; do
 			# Stop trying after 15 tries
@@ -84,7 +84,7 @@ virtualmake() {
 		export SANDBOX_DISABLED="${OLD_SANDBOX_DISABLED}"
 
 		einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..."
-		
+
 		export DISPLAY=:${XDISPLAY}
 		#Do not break on error, but setup $retval, as we need
 		#to kill Xvfb
diff --git a/eclass/webapp-apache.eclass b/eclass/webapp-apache.eclass
index 8b43546a9264..031094cd6eee 100644
--- a/eclass/webapp-apache.eclass
+++ b/eclass/webapp-apache.eclass
@@ -1,11 +1,11 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/webapp-apache.eclass,v 1.24 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/webapp-apache.eclass,v 1.25 2005/07/11 15:08:06 swegener Exp $
 #
 # Author: Stuart Herbert <stuart@gentoo.org>
-# 
+#
 # Based on discussions held on gentoo-dev mailing list, and a bug report
-# contributed by Ian Leitch <port001@w0r.mine.nu> in bug #14870, 
+# contributed by Ian Leitch <port001@w0r.mine.nu> in bug #14870,
 # and robbat2's mod_php ebuild
 #
 # This package will be offically depreciated when vhost-config and
@@ -36,8 +36,8 @@ function webapp-apache-detect ()
 	fi
 
 	APACHECONF="/etc/apache${CONFVER}/conf/apache${CONFVER}.conf"
-    APACHECONF_COMMON="/etc/apache${CONFVER}/conf/commonapache${CONFVER}.conf"
-    APACHECONF_DIR="/etc/apache${CONFVER}/conf/"
+	APACHECONF_COMMON="/etc/apache${CONFVER}/conf/commonapache${CONFVER}.conf"
+	APACHECONF_DIR="/etc/apache${CONFVER}/conf/"
 	WEBAPP_SERVER="Apache v${APACHEVER}"
 }
 
@@ -47,7 +47,7 @@ function webapp-detect () {
 	webapp-apache-detect || return 1
 	webapp-determine-installowner
 	webapp-determine-htdocsdir
-    webapp-determine-cgibindir
+	webapp-determine-cgibindir
 
 	# explicit return here to ensure the return code
 	# from webapp-determine-cgibindir above isn't returned instead
@@ -57,7 +57,7 @@ function webapp-detect () {
 
 function webapp-mkdirs () {
 	webapp-determine-htdocsdir
-    webapp-determine-cgibindir
+	webapp-determine-cgibindir
 
 	keepdir "$HTTPD_ROOT"
 	fowners "$HTTPD_USER":"$HTTPD_GROUP" "$HTTPD_ROOT"
@@ -81,8 +81,8 @@ function webapp-determine-htdocsdir ()
 
 function webapp-determine-cgibindir ()
 {
-    #HTTPD_CGIBIN="`grep 'ScriptAlias /cgi-bin/' ${APACHECONF_COMMON} | cut -d ' ' -f 7`"
-    #[ -z "${HTTPD_CGIBIN}" ] && HTTPD_CGIBIN="/home/httpd/cgi-bin/"
+	#HTTPD_CGIBIN="`grep 'ScriptAlias /cgi-bin/' ${APACHECONF_COMMON} | cut -d ' ' -f 7`"
+	#[ -z "${HTTPD_CGIBIN}" ] && HTTPD_CGIBIN="/home/httpd/cgi-bin/"
 	# temporary fix for webapps
 	HTTPD_CGIBIN="/var/www/localhost/cgi-bin/"
 }
diff --git a/eclass/webapp.eclass b/eclass/webapp.eclass
index 6ca8b1248017..351597e3e9ba 100644
--- a/eclass/webapp.eclass
+++ b/eclass/webapp.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.33 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.34 2005/07/11 15:08:06 swegener Exp $
 #
 # eclass/webapp.eclass
 #				Eclass for installing applications to run under a web server
@@ -201,7 +201,7 @@ function webapp_runbycgibin ()
 #
 # The ownership of the file is NOT set until the application is installed
 # using the webapp-config tool.
-# 
+#
 # @param	$1 - file to be owned by the webserver user:group combo
 #
 # ------------------------------------------------------------------------
@@ -209,9 +209,9 @@ function webapp_runbycgibin ()
 function webapp_serverowned ()
 {
 	webapp_checkfileexists "$1" "$D"
-	local MY_FILE="`webapp_strip_appdir \"$1\"`" 
+	local MY_FILE="`webapp_strip_appdir \"$1\"`"
 	MY_FILE="`webapp_strip_cwd \"$MY_FILE\"`"
-	
+
 	einfo "(server owned) $MY_FILE"
 	echo "$MY_FILE" >> "${D}${WA_SOLIST}"
 }
@@ -248,7 +248,7 @@ function webapp_server_configfile ()
 	#
 	# do NOT change the naming convention used here without changing all
 	# the other scripts that also rely upon these names
- 
+
 	einfo "($1) config file '$my_file'"
 	cp "$2" "${D}${MY_SERVERCONFIGDIR}/${my_file}"
 }
@@ -282,7 +282,7 @@ function webapp_sqlscript ()
 	#
 	# do NOT change the naming convention used here without changing all
 	# the other scripts that also rely upon these names
- 
+
 	# are we dealing with an 'upgrade'-type script?
 	if [ -n "$3" ]; then
 		# yes we are
@@ -347,7 +347,7 @@ function webapp_pkg_setup ()
 	G_HOSTNAME="localhost"
 	. "${ETC_CONFIG}" || die "Unable to open file ${ETC_CONFIG}"
 
-	# are we installing a webapp-config solution over the top of a 
+	# are we installing a webapp-config solution over the top of a
 	# non-webapp-config solution?
 
 	if ! use vhosts ; then
@@ -466,7 +466,7 @@ function webapp_pkg_postinst ()
 
 	# if 'vhosts' is not set in your USE flags, we install a copy of
 	# this application in /var/www/localhost/htdocs/${PN}/ for you
-	
+
 	if ! use vhosts ; then
 		echo
 		einfo "vhosts USE flag not set - auto-installing using webapp-config"
@@ -487,7 +487,7 @@ function webapp_pkg_postinst ()
 		else
 			einfo "${PN}-${PVR} is not installed - using install mode"
 		fi
-	
+
 		my_cmd="/usr/sbin/webapp-config $my_mode -h localhost -u root -d $INSTALL_DIR ${PN} ${PVR}"
 		einfo "Running $my_cmd"
 		$my_cmd
diff --git a/eclass/wxlib.eclass b/eclass/wxlib.eclass
index 051b76f21665..01a6c19f34a9 100644
--- a/eclass/wxlib.eclass
+++ b/eclass/wxlib.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/wxlib.eclass,v 1.10 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/wxlib.eclass,v 1.11 2005/07/11 15:08:06 swegener Exp $
 
 # Author Diego Pettenò <flameeyes@gentoo.org>
 # Maintained by wxwidgets herd
@@ -38,7 +38,7 @@ S=${WORKDIR}/wxWidgets-${PV}
 # $3: all the extra parameters to pass to configure script
 configure_build() {
 	export LANG='C'
-	
+
 	mkdir ${S}/$1_build
 	cd ${S}/$1_build
 	# odbc works with ansi only:
@@ -69,7 +69,7 @@ configure_build() {
 subconfigure() {
 	debug_conf=""
 	if use debug; then
-		debug_conf="--enable-debug --enable-debug_gdb"	
+		debug_conf="--enable-debug --enable-debug_gdb"
 	fi
 	${S}/configure \
 		--host=${CHOST} \
diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass
index 1fff24989981..a9a1e4baccd5 100644
--- a/eclass/wxwidgets.eclass
+++ b/eclass/wxwidgets.eclass
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/wxwidgets.eclass,v 1.12 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/wxwidgets.eclass,v 1.13 2005/07/11 15:08:07 swegener Exp $
 #
 # Author Rob Cakebread <pythonhead@gentoo.org>
 
 # This eclass helps you find the correct wx-config script so ebuilds
-# can use gtk, gtk2 or gtk2+unicode versions of wxGTK 
+# can use gtk, gtk2 or gtk2+unicode versions of wxGTK
 
 # FUNCTIONS:
 # need-wxwidgets:
diff --git a/eclass/x11.eclass b/eclass/x11.eclass
index c0fdbc6d1586..074a0b835723 100644
--- a/eclass/x11.eclass
+++ b/eclass/x11.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/x11.eclass,v 1.7 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x11.eclass,v 1.8 2005/07/11 15:08:07 swegener Exp $
 #
 # Author: Seemant Kulleen <seemant@gentoo.org>
 #
@@ -11,7 +11,7 @@
 # the USE variable "expertxfree" is switched on, at least for xfree.
 
 
-vcards() {	
+vcards() {
 	has "$1" ${VIDEO_CARDS} && return 0
 	return 1
 }
diff --git a/eclass/xfce4.eclass b/eclass/xfce4.eclass
index e068cfecdd0f..26bd6f50758e 100644
--- a/eclass/xfce4.eclass
+++ b/eclass/xfce4.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/xfce4.eclass,v 1.18 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfce4.eclass,v 1.19 2005/07/11 15:08:07 swegener Exp $
 # Author: Brad Cowan <bcowan@gentoo.org>
 
 # Xfce4 Eclass
@@ -17,8 +17,8 @@ else
 fi
 
 if [[ ${GOODIES_PLUGIN} = "1" ]]; then
-	[[ -z ${MY_P} ]] && MY_P="${PN}-plugin-${PV}"    
-	SRC_URI="http://download.berlios.de/xfce-goodies/${MY_P}${COMPRESS}"    
+	[[ -z ${MY_P} ]] && MY_P="${PN}-plugin-${PV}"
+	SRC_URI="http://download.berlios.de/xfce-goodies/${MY_P}${COMPRESS}"
 	[[ -z ${XFCE_VERSION} ]] && XFCE_VERSION="4.2.0"
 	RDEPEND="${RDEPEND} >=xfce-base/xfce4-panel-${XFCE_VERSION}"
 fi
@@ -63,13 +63,13 @@ DEPEND="${RDEPEND}
 
 xfce4_src_compile() {
 	if [[ "${DEBUG_OFF}" = "1" ]] && use debug; then
-	    XFCE_CONFIG="${XFCE_CONFIG}" 
+	    XFCE_CONFIG="${XFCE_CONFIG}"
 	elif use debug; then
 	    XFCE_CONFIG="${XFCE_CONFIG} --enable-debug=yes"
-	fi 
-	
+	fi
+
 	if [[ ${XFCE_META} = "1" ]]; then
-	    einfo "Meta Build, Nothing to compile."   
+	    einfo "Meta Build, Nothing to compile."
 	else
 	    econf ${XFCE_CONFIG} || die
 
@@ -84,13 +84,13 @@ xfce4_src_compile() {
 xfce4_src_install() {
 	if [[ ${XFCE_META} = "1" ]]; then
 	    einfo "Meta Build, Nothing to install."
-	else    
+	else
 	    if [[ "${WANT_EINSTALL}" = "1" ]]; then
 		einstall || die
 	    else
 		make DESTDIR=${D} install || die
 	    fi
-	
+
 	    if use doc; then
 		dodoc ${XFCE_DOCS} AUTHORS INSTALL README COPYING ChangeLog HACKING NEWS THANKS TODO
 	    fi
diff --git a/eclass/zproduct.eclass b/eclass/zproduct.eclass
index 5f8df214f773..74fc67315a2c 100644
--- a/eclass/zproduct.eclass
+++ b/eclass/zproduct.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/zproduct.eclass,v 1.20 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/zproduct.eclass,v 1.21 2005/07/11 15:08:07 swegener Exp $
 # Author: Jason Shoemaker <kutsuya@gentoo.org>
 
 # This eclass is designed to streamline the construction of
@@ -42,29 +42,31 @@ zproduct_src_install()
 		case ${1} in
 			do_zpfolders)
 				## Create .zfolders.lst from $ZPROD_LIST.
-				debug-print-section do_zpfolders 
+				debug-print-section do_zpfolders
 				for N in ${ZPROD_LIST} ; do
 					echo ${N} >> ${D}/${DOT_ZFOLDER_FPATH}
-				done ;;					
+				done
+				;;
 			do_docs)
-				#*Moves txt docs 
-				debug-print-section do_docs 
+				#*Moves txt docs
+				debug-print-section do_docs
 				docs_move
 				for ZPROD in ${ZPROD_LIST} ; do
 					docs_move ${ZPROD}/
-				done ;;
+				done
+				;;
 			do_install)
 				debug-print-section do_install
 				# Copy everything that's left to ${D}${ZP_DIR}
 				# modified to not copy ownership (QA)
-				cp --recursive --no-dereference --preserve=timestamps,mode,links ${S}/* ${D}/${ZP_DIR}/${PF} ;;
-						
+				cp --recursive --no-dereference --preserve=timestamps,mode,links ${S}/* ${D}/${ZP_DIR}/${PF}
+				;;
 			all)
-				debug-print-section all 
+				debug-print-section all
 				zproduct_src_install do_zpfolders do_docs do_install ;;
 		esac
 		shift
-	done	
+	done
 	debug-print "${FUNCNAME}: result is ${RESULT}"
 }
 
@@ -73,7 +75,7 @@ docs_move()
 	# if $1 == "/", then this breaks.
 	if [ -n "$1" ] ; then
 		docinto $1
-	else 
+	else
 		docinto /
 	fi
 	dodoc $1HISTORY.txt $1README{.txt,} $1INSTALL{.txt,} > /dev/null
@@ -101,7 +103,7 @@ zproduct_pkg_postinst()
 	# make shure there is nothing writable in the new dir, and all is readable
 	chmod -R go-w,a+rX ${ZP_DIR}/${PF}
 	einfo ">>> Installing ${PF} into the \"$(zope-config --zidef-get)\" zinstance ..."
-	${ROOT}/usr/sbin/zprod-manager add ${ZP_DIR}/${PF} 
+	${ROOT}/usr/sbin/zprod-manager add ${ZP_DIR}/${PF}
 }
 
 # This function is deprecated! Still used, until a new system developed.