Apply whitespace checks from repoman to eclasses.

author: Sven Wegener <swegener@gentoo.org> 2006-10-14 20:27:21 +0000
committer: Sven Wegener <swegener@gentoo.org> 2006-10-14 20:27:21 +0000
commit: 0372ecc500e416611bd0640c07dd9b4d5d18cafe (patch)
tree: c9159886d91bd1beb7685866a94dc0c00dece5fa /eclass
parent: Mark 3.1.5-r2 stable on ia64 (diff)
download: gentoo-2-0372ecc500e416611bd0640c07dd9b4d5d18cafe.tar.gz
gentoo-2-0372ecc500e416611bd0640c07dd9b4d5d18cafe.tar.bz2
gentoo-2-0372ecc500e416611bd0640c07dd9b4d5d18cafe.zip
44 files changed, 204 insertions, 201 deletions
diff --git a/eclass/apache-module.eclass b/eclass/apache-module.eclass
index 5cc5c01a2e98..7a6198256862 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.16 2006/10/12 13:41:10 tomk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/apache-module.eclass,v 1.17 2006/10/14 20:27:20 swegener Exp $
 
 inherit depend.apache
 
@@ -107,10 +107,10 @@ apache_mod_file() {
 
 	if [ "${APACHE_VERSION}" == "1" ]; then
 		[ -n "${APACHE1_MOD_FILE}" ] && MOD_FILE="${APACHE1_MOD_FILE}"
-	    [ -z "${MOD_FILE}" ] && MOD_FILE="$(apache_cd_dir)/${PN}.so"
+		[ -z "${MOD_FILE}" ] && MOD_FILE="$(apache_cd_dir)/${PN}.so"
 	else
 		[ -n "${APACHE2_MOD_FILE}" ] && MOD_FILE="${APACHE2_MOD_FILE}"
-	    [ -z "${MOD_FILE}" ] && MOD_FILE="$(apache_cd_dir)/.libs/${PN}.so"
+		[ -z "${MOD_FILE}" ] && MOD_FILE="$(apache_cd_dir)/.libs/${PN}.so"
 	fi
 
 	debug-print apache_mod_file: MOD_FILE=${MOD_FILE}
diff --git a/eclass/commonbox.eclass b/eclass/commonbox.eclass
index 1953bba94c5a..bf80f4154b2e 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.30 2005/08/23 14:55:11 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/commonbox.eclass,v 1.31 2006/10/14 20:27:21 swegener Exp $
 #
 # Author: Seemant Kulleen <seemant@gentoo.org>
 #
@@ -55,9 +55,11 @@ commonprep() {
 
 	for i in `find ${S}/src -name 'Makefile*'`
 	do
-		sed -i -e "s:/styles/Results:/styles/Fury-NG:" \
-		       -e "s:/styles/mbdtex:/styles/Fury-NG:" \
-		       -e "s:/styles/Clean:/styles/Fury-NG:" ${i}
+		sed -i \
+			-e "s:/styles/Results:/styles/Fury-NG:" \
+			-e "s:/styles/mbdtex:/styles/Fury-NG:" \
+			-e "s:/styles/Clean:/styles/Fury-NG:" \
+			${i}
 	done
 
 }
diff --git a/eclass/confutils.eclass b/eclass/confutils.eclass
index fa3ac312da59..c50c0688aa40 100644
--- a/eclass/confutils.eclass
+++ b/eclass/confutils.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/confutils.eclass,v 1.18 2005/09/04 10:54:53 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/confutils.eclass,v 1.19 2006/10/14 20:27:21 swegener Exp $
 #
 # eclass/confutils.eclass
 #		Utility functions to help with configuring a package
@@ -250,7 +250,7 @@ enable_extension_enable () {
 				my_shared="${my_shared},$4"
 			fi
 		elif [ "$4+" != "+" ]; then
-		  my_shared="=$4"
+			my_shared="=$4"
 		fi
 	else
 		if [ "$4+" != "+" ]; then
@@ -290,7 +290,7 @@ enable_extension_enableonly () {
 				my_shared="${my_shared},$4"
 			fi
 		elif [ "$4+" != "+" ]; then
-		  my_shared="=$4"
+			my_shared="=$4"
 		fi
 	else
 		if [ "$4+" != "+" ]; then
@@ -348,7 +348,7 @@ enable_extension_with () {
 				my_shared="${my_shared},$4"
 			fi
 		elif [ "$4+" != "+" ]; then
-		  my_shared="=$4"
+			my_shared="=$4"
 		fi
 	else
 		if [ "$4+" != "+" ]; then
@@ -387,7 +387,7 @@ enable_extension_withonly () {
 				my_shared="${my_shared},$4"
 			fi
 		elif [ "$4+" != "+" ]; then
-		  my_shared="=$4"
+			my_shared="=$4"
 		fi
 	else
 		if [ "$4+" != "+" ]; then
diff --git a/eclass/cvs.eclass b/eclass/cvs.eclass
index 6adc9a3c0dd7..aa68dfce253c 100644
--- a/eclass/cvs.eclass
+++ b/eclass/cvs.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.64 2006/06/15 14:45:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.65 2006/10/14 20:27:21 swegener Exp $
 #
 # Maintainer: vapier@gentoo.org (and anyone who wants to help)
 
@@ -487,14 +487,14 @@ cvs_src_unpack() {
 	local ECVS_LOCALNAME="${ECVS_LOCALNAME}"
 
 	if [ -z "$ECVS_LOCALNAME" ]; then
-	    ECVS_LOCALNAME="$ECVS_MODULE"
+		ECVS_LOCALNAME="$ECVS_MODULE"
 	fi
 
 	local offline_pkg_var="ECVS_OFFLINE_${PN}"
 	if [ "${!offline_pkg_var}" == "1" -o "$ECVS_OFFLINE" == "1" -o "$ECVS_SERVER" == "offline" ]; then
 		# We're not required to fetch anything; the module already
 		# exists and shouldn't be updated.
-	 	if [ -d "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}" ]; then
+		if [ -d "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}" ]; then
 			debug-print "$FUNCNAME: offline mode"
 		else
 			debug-print "$FUNCNAME: Offline mode specified but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found, exiting with error"
diff --git a/eclass/distutils.eclass b/eclass/distutils.eclass
index f671a98a4fb6..12c52e55a372 100644
--- a/eclass/distutils.eclass
+++ b/eclass/distutils.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/distutils.eclass,v 1.35 2006/10/10 19:59:06 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils.eclass,v 1.36 2006/10/14 20:27:21 swegener Exp $
 #
 # Author: Jon Nelson <jnelson@gentoo.org>
 # Current Maintainer: Alastair Tse <liquidx@gentoo.org>
@@ -46,7 +46,7 @@ distutils_src_install() {
 	# - liquidx (14/08/2006)
 	pylibdir="$(${python} -c 'from distutils.sysconfig import get_python_lib; print get_python_lib()')"
 	[ -n "${pylibdir}" ] && dodir "${pylibdir}"
-	
+
 	if has_version ">=dev-lang/python-2.3"; then
 		${python} setup.py install --root=${D} --no-compile "$@" || die
 	else
diff --git a/eclass/ebook.eclass b/eclass/ebook.eclass
index 4e049cd987e7..0ee94cd4d3c3 100644
--- a/eclass/ebook.eclass
+++ b/eclass/ebook.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/ebook.eclass,v 1.25 2005/07/11 15:08:06 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ebook.eclass,v 1.26 2006/10/14 20:27:21 swegener Exp $
 #
 # Author Francisco Gimeno <kikov@fco-gimeno.com>
 # Mantainer José Alberto Suárez López <bass@gentoo.org>
@@ -65,7 +65,7 @@ if [ "${DEVHELPROOT}" = "" ]; then
 fi
 if [ "${RDEPEND}" = "" ]; then
 	RDEPEND="kde? ( dev-util/kdevelop )
-	       !kde? ( >=dev-util/devhelp-0.6 )"
+			!kde? ( >=dev-util/devhelp-0.6 )"
 fi
 if [ "${DESCRIPTION}" = "" ]; then
 	DESCRIPTION="${P} ebook based on $ECLASS eclass"
diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
index 2c7468cafbbb..b6f6d8fa58d3 100644
--- a/eclass/flag-o-matic.eclass
+++ b/eclass/flag-o-matic.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.110 2006/08/01 00:49:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/flag-o-matic.eclass,v 1.111 2006/10/14 20:27:21 swegener Exp $
 #
 # Maintainer: base-system@gentoo.org
 
@@ -528,7 +528,7 @@ replace-sparc64-flags() {
 			CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8}"
 		done
 	else
-	 	for x in ${SPARC64_CPUS}; do
+		for x in ${SPARC64_CPUS}; do
 			CFLAGS="${CFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}"
 		done
 	fi
@@ -538,7 +538,7 @@ replace-sparc64-flags() {
 			CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8}"
 		done
 	else
-	 	for x in ${SPARC64_CPUS}; do
+		for x in ${SPARC64_CPUS}; do
 			CXXFLAGS="${CXXFLAGS/-mcpu=${x}/-mcpu=v8 -mtune=${x}}"
 		done
 	fi
diff --git a/eclass/gnatbuild.eclass b/eclass/gnatbuild.eclass
index 39b2a9579dac..3a865e334320 100644
--- a/eclass/gnatbuild.eclass
+++ b/eclass/gnatbuild.eclass
@@ -1,11 +1,11 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.18 2006/09/08 13:28:17 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.19 2006/10/14 20:27:21 swegener Exp $
 #
 # Author: George Shapovalov <george@gentoo.org>
 # Belongs to: ada herd <ada@gentoo.org>
 #
-# Note: HOMEPAGE and LICENSE are set in appropriate ebuild, as 
+# Note: HOMEPAGE and LICENSE are set in appropriate ebuild, as
 # gnat is developed by FSF and AdaCore "in parallel"
 
 inherit eutils versionator toolchain-funcs flag-o-matic multilib libtool fixheadtails gnuconfig
@@ -56,7 +56,7 @@ PN_GnatPro="gnat-pro"
 # so set it here for what we can..
 if  [[ ${PN} == "${PN_GnatGCC}" ]] || \
 	[[ ${PN} == "${PN_GnatGpl}" ]] || \
-	[[ ${PN} == "asis" ]]; 
+	[[ ${PN} == "asis" ]];
 then
 	GCCVER="${GNATRELEASE}"
 elif [[ ${PN} == "${PN_GnatPro}" ]] ; then
@@ -240,7 +240,7 @@ should_we_eselect_gnat() {
 
 	# if the current config is invalid, we definitely want a new one
 	# Note: due to bash quirkiness, the following must not be 1 line
-	local curr_config 
+	local curr_config
 	curr_config=$(eselect --no-color gnat show | grep ${CTARGET} | awk '{ print $1 }') || return 0
 	[[ -z ${curr_config} ]] && return 0
 
diff --git a/eclass/gnustep-old.eclass b/eclass/gnustep-old.eclass
index f4a63eed50d2..faca0a5b5159 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.9 2005/07/11 15:08:06 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-old.eclass,v 1.10 2006/10/14 20:27:21 swegener Exp $
 
 
 DESCRIPTION="Based on the gnustep eclass."
@@ -125,7 +125,7 @@ egnustepinstall() {
 				GNUSTEP_NETWORK_ROOT=${D}${GNUSTEP_NETWORK_ROOT} \
 				GNUSTEP_SYSTEM_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \
 				GNUSTEP_USER_ROOT=${D}${GNUSTEP_SYSTEM_ROOT} \
-		 		install || die "einstall failed"
+				install || die "einstall failed"
 		fi
 	else
 		die "no Makefile found"
diff --git a/eclass/gst-plugins-bad.eclass b/eclass/gst-plugins-bad.eclass
index bff7c42096e3..e0965c5eb8e0 100644
--- a/eclass/gst-plugins-bad.eclass
+++ b/eclass/gst-plugins-bad.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins-bad.eclass,v 1.6 2006/09/14 21:16:37 zaheerm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins-bad.eclass,v 1.7 2006/10/14 20:27:21 swegener Exp $
 
 #
 # Original Author: Saleem Abdulrasool <compnerd@gentoo.org>
@@ -23,9 +23,9 @@ SRC_URI="http://gstreamer.freedesktop.org/src/gst-plugins-bad/${MY_P}.tar.bz2"
 # 6/2/2006 - zaheerm
 if [ "${PN}" != "${MY_PN}" ]; then
 RDEPEND="=media-libs/gstreamer-0.10*
-		 =media-libs/gst-plugins-base-0.10*
-		 >=dev-libs/glib-2.6
-		 >=dev-libs/liboil-0.3"
+		=media-libs/gst-plugins-base-0.10*
+		>=dev-libs/glib-2.6
+		>=dev-libs/liboil-0.3"
 DEPEND="${RDEPEND}
 		sys-apps/sed
 		sys-devel/gettext"
diff --git a/eclass/gst-plugins-base.eclass b/eclass/gst-plugins-base.eclass
index 06061bc6ebec..9d9b6f3fd119 100644
--- a/eclass/gst-plugins-base.eclass
+++ b/eclass/gst-plugins-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/gst-plugins-base.eclass,v 1.5 2006/09/14 21:16:37 zaheerm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins-base.eclass,v 1.6 2006/10/14 20:27:21 swegener Exp $
 
 # Author : foser <foser@gentoo.org>
 
@@ -83,17 +83,17 @@ gst-plugins-base_src_unpack() {
 	gst-plugins10_find_plugin_dir
 	sed -e "s:\$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces:/usr/$(get_libdir)/libgstinterfaces:" \
 		-e "s:\${top_builddir}/gst-libs/gst/interfaces/libgstinterfaces:/usr/$(get_libdir)/libgstinterfaces:" \
-	        -e "s:\$(top_builddir)/gst-libs/gst/audio/libgstaudio:/usr/$(get_libdir)/libgstaudio:" \
+		-e "s:\$(top_builddir)/gst-libs/gst/audio/libgstaudio:/usr/$(get_libdir)/libgstaudio:" \
 		-e "s:\${top_builddir}/gst-libs/gst/audio/libgstaudio:/usr/$(get_libdir)/libgstaudio:" \
-	        -e "s:\$(top_builddir)/gst-libs/gst/riff/libgstriff:/usr/$(get_libdir)/libgstriff:" \
+		-e "s:\$(top_builddir)/gst-libs/gst/riff/libgstriff:/usr/$(get_libdir)/libgstriff:" \
 		-e "s:\${top_builddir}/gst-libs/gst/riff/libgstriff:/usr/$(get_libdir)/libgstriff:" \
-	        -e "s:\$(top_builddir)/gst-libs/gst/tag/libgsttag:/usr/$(get_libdir)/libgsttag:" \
+		-e "s:\$(top_builddir)/gst-libs/gst/tag/libgsttag:/usr/$(get_libdir)/libgsttag:" \
 		-e "s:\${top_builddir}/gst-libs/gst/tag/libgsttag:/usr/$(get_libdir)/libgsttag:" \
-	        -e "s:\$(top_builddir)/gst-libs/gst/video/libgstvideo:/usr/$(get_libdir)/libgstvideo:" \
+		-e "s:\$(top_builddir)/gst-libs/gst/video/libgstvideo:/usr/$(get_libdir)/libgstvideo:" \
 		-e "s:\${top_builddir}/gst-libs/gst/video/libgstvideo:/usr/$(get_libdir)/libgstvideo:" \
-	        -e "s:\$(top_builddir)/gst-libs/gst/netbuffer/libgstnetbuffer:/usr/$(get_libdir)/libgstnetbuffer:" \
+		-e "s:\$(top_builddir)/gst-libs/gst/netbuffer/libgstnetbuffer:/usr/$(get_libdir)/libgstnetbuffer:" \
 		-e "s:\${top_builddir}/gst-libs/gst/netbuffer/libgstnetbuffer:/usr/$(get_libdir)/libgstnetbuffer:" \
-	        -e "s:\$(top_builddir)/gst-libs/gst/rtp/libgstrtp:/usr/$(get_libdir)/libgstrtp:" \
+		-e "s:\$(top_builddir)/gst-libs/gst/rtp/libgstrtp:/usr/$(get_libdir)/libgstrtp:" \
 		-e "s:\${top_builddir}/gst-libs/gst/rtp/libgstrtp:/usr/$(get_libdir)/libgstrtp:" \
 		-i Makefile.in
 	cd ${S}
diff --git a/eclass/gtk-engines.eclass b/eclass/gtk-engines.eclass
index d0e5282c82c5..3fe4f6df3641 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.34 2005/08/02 10:31:09 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-engines.eclass,v 1.35 2006/10/14 20:27:21 swegener Exp $
 
 # IMPORTANT:
 # This eclass is deprecated and should not be used in new ebuilds.
@@ -208,9 +208,9 @@ gtk-engines_src_install() {
 		if [ "$SLOT" -eq "2" ]
 		then
 			mv ${D}/usr/share/themes/Geramik/gtk/*png \
-			   ${D}/usr/share/themes/Geramik/gtk-2.0
+				${D}/usr/share/themes/Geramik/gtk-2.0
 			mv ${D}/usr/share/themes/Geramik/gtk-2.0/gtkrc-2.0 \
-			   ${D}/usr/share/themes/Geramik/gtk-2.0/gtkrc
+				${D}/usr/share/themes/Geramik/gtk-2.0/gtkrc
 
 			rm -rf ${D}/usr/$(get_libdir)/gtk ${D}/usr/share/themes/Geramik/gtk
 		else
diff --git a/eclass/gtk-engines2.eclass b/eclass/gtk-engines2.eclass
index 0b0ccd017f10..6e8712beccff 100644
--- a/eclass/gtk-engines2.eclass
+++ b/eclass/gtk-engines2.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-engines2.eclass,v 1.14 2005/08/02 10:31:09 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-engines2.eclass,v 1.15 2006/10/14 20:27:21 swegener Exp $
 
 # IMPORTANT:
 # This eclass is deprecated and should not be used in new ebuilds.
@@ -93,12 +93,12 @@ gtk-engines2_src_compile() {
 			cd ${GTK2_S}
 			econf || die "gtk2 configure failed"
 			emake || die "gtk2 make failed"
-	    fi
+		fi
 		if [ -n "${HAS_GTK1}" ]; then
 			cd ${GTK1_S}
 			econf || die "gtk1 configure failed"
 			emake || die "gtk1 make failed"
-	    fi
+		fi
 	else
 		cd ${S}
 		econf ${@} || die "configure failed"
@@ -124,7 +124,7 @@ gtk-engines2_src_install() {
 			for x in ${DEFAULT_DOCS} ${DOCS}; do
 				newdoc ${x} ${x}.gtk1
 			done
-	    fi
+		fi
 	else
 		cd ${S}
 		make DESTDIR=${D} ${@} install || die "install failed"
diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass
index c7a412197d4a..aeb18a3e4ac4 100644
--- a/eclass/java-ant-2.eclass
+++ b/eclass/java-ant-2.eclass
@@ -108,7 +108,7 @@ java-ant_bsfix() {
 
 	local find_args=""
 	[[ "${JAVA_PKG_BSFIX_ALL}" == "yes" ]] || find_args="-maxdepth 1"
-	
+
 	find_args="${find_args} -type f -name ${JAVA_PKG_BSFIX_NAME// / -o -name } "
 
 	local i=0
@@ -117,7 +117,7 @@ java-ant_bsfix() {
 		[[ -z ${line} ]] && continue
 		bsfix_these[${i}]="${line}"
 		let i+=1
-	done <<-EOF 
+	done <<-EOF
 			$(find . ${find_args})
 		EOF
 
diff --git a/eclass/java-gnome.eclass b/eclass/java-gnome.eclass
index add9d223116f..d1a4e57a07fc 100644
--- a/eclass/java-gnome.eclass
+++ b/eclass/java-gnome.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-gnome.eclass,v 1.1 2006/10/08 03:23:17 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-gnome.eclass,v 1.2 2006/10/14 20:27:21 swegener Exp $
 
 #
 # Original Author: Joshua Nichols <nichoj@gentoo.org>
@@ -27,11 +27,11 @@ DEPEND=">=virtual/jdk-1.4
 
 # Do some heuristics to figure out what bindings this package is for
 # This may be overriden when needed from each ebuild
-if [[ -z ${JAVA_GNOME_BINDINGS} ]]; then 
+if [[ -z ${JAVA_GNOME_BINDINGS} ]]; then
 	JAVA_GNOME_BINDINGS=${PN}
 	JAVA_GNOME_BINDINGS=${JAVA_GNOME_BINDINGS/-java/}
 	# skip over glib because it's too good for our heuristic
-	[[ ${JAVA_GNOME_BINDINGS} != "glib" ]] && 
+	[[ ${JAVA_GNOME_BINDINGS} != "glib" ]] &&
 		JAVA_GNOME_BINDINGS=${JAVA_GNOME_BINDINGS/lib/}
 fi
 
@@ -42,7 +42,7 @@ else
 	JAVA_GNOME_JARNAME="${JAVA_GNOME_BINDINGS}.jar"
 fi
 
-# Full path to installed jar 
+# Full path to installed jar
 JAVA_GNOME_JARPATH="${JAVA_PKG_JARDEST}/${JARNAME}"
 
 # pkgconfig file for the package
diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass
index 7d5ae8304f7a..940ea1fdc9ca 100644
--- a/eclass/java-pkg-2.eclass
+++ b/eclass/java-pkg-2.eclass
@@ -44,9 +44,9 @@ java-pkg-2_pkg_setup() {
 }
 
 # ------------------------------------------------------------------------------
-# @note 
+# @note
 #
-# We need to initialize the environment in every function because Portage 
+# We need to initialize the environment in every function because Portage
 # will source /etc/profile between phases and trample all over the env.
 # This is accomplished by phase hooks, which is available with newer versions of
 # portage.
diff --git a/eclass/java-pkg-opt-2.eclass b/eclass/java-pkg-opt-2.eclass
index b754f22bc364..5577f28fd28b 100644
--- a/eclass/java-pkg-opt-2.eclass
+++ b/eclass/java-pkg-opt-2.eclass
@@ -38,9 +38,9 @@ java-pkg-opt-2_pkg_setup() {
 }
 
 # ------------------------------------------------------------------------------
-# @note 
+# @note
 #
-# We need to initialize the environment in every function because Portage 
+# We need to initialize the environment in every function because Portage
 # will source /etc/profile between phases and trample all over the env.
 # This is accomplished by phase hooks, which is available with newer versions of
 # portage.
diff --git a/eclass/java-pkg.eclass b/eclass/java-pkg.eclass
index b456645abe27..6056ddd79da3 100644
--- a/eclass/java-pkg.eclass
+++ b/eclass/java-pkg.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-pkg.eclass,v 1.44 2006/09/29 03:40:18 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg.eclass,v 1.45 2006/10/14 20:27:21 swegener Exp $
 
 inherit multilib
 
@@ -18,10 +18,10 @@ export WANT_JAVA_CONFIG="1"
 # uses java-pkg_pkg_setup
 java-pkg_pkg_setup() {
 	java-pkg_announce-qa-violation "using deprecated eclass java-pkg"
-	
+
 	# We need to do a little magic if java-config-2 is around
 	if has_version "=dev-java/java-config-2*"; then
-		# we only want to enable the Java stuff if 
+		# we only want to enable the Java stuff if
 		# there isn't a Java use flag (means its a pure Java pckage)
 		# or if there is a Java use flag and it is enabled
 		if ! hasq java ${IUSE} || use java; then
diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass
index 7ccc83943142..2acd7eec7805 100644
--- a/eclass/java-vm-2.eclass
+++ b/eclass/java-vm-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/java-vm-2.eclass,v 1.12 2006/09/29 16:51:01 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.13 2006/10/14 20:27:21 swegener Exp $
 
 # -----------------------------------------------------------------------------
 # @eclass-begin
@@ -62,16 +62,16 @@ java-vm-2_pkg_postinst() {
 			java-config-1 --set-system-vm=${P} 2>/dev/null
 		# dirty check to see if we are upgrading current generation-1 system vm
 		elif [[ "${systemvm1}" = ${VMHANDLE}* ]]; then
-		    einfo "Emerging the current generation-1 system-vm..."
+			einfo "Emerging the current generation-1 system-vm..."
 			einfo "Updating its config files."
-		    java-config-1 --set-system-vm=${P} 2>/dev/null
+			java-config-1 --set-system-vm=${P} 2>/dev/null
 		# dirty check to see if current system vm is a jre - replace it with
 		elif [[ "${systemvm1}" = *jre* ]]; then
-		    ewarn "Current generation-1 system-vm is a JRE"
+			ewarn "Current generation-1 system-vm is a JRE"
 			ewarn "For the new and old Java systems to coexist,"
 			ewarn "the generation-1 system-vm must be a JDK."
 			ewarn "Setting generation-1 system-vm to ${VMHANDLE}"
-		    java-config-1 --set-system-vm=${P} 2>/dev/null
+			java-config-1 --set-system-vm=${P} 2>/dev/null
 		fi
 		# else... some other VM is being updated, so we don't have to worry
 	else
@@ -141,7 +141,7 @@ set_java_env() {
 		> ${env_file} || die "sed failed"
 
 	echo "VMHANDLE=\"${VMHANDLE}\"" >> ${env_file}
-	
+
 	# generation-1 compatibility
 	# respect both variables for now...
 	if [[ ${JAVA_SUPPORTS_GENERATION_1} == 'true' && ${JAVA_VM_NO_GENERATION1} != 'true' ]]; then
diff --git a/eclass/java.eclass b/eclass/java.eclass
index c338ee271bf8..0754bb2ae058 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.31 2006/07/07 17:15:05 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java.eclass,v 1.32 2006/10/14 20:27:21 swegener Exp $
 #
 # Author: Karl Trygve Kalleberg <karltk@gentoo.org>
 
@@ -27,7 +27,7 @@ java_pkg_postinst() {
 		# installed. Installing a JRE over an existing JDK will result
 		# in major breakage, see #9289.
 		if [ ! -f "${JAVAC}" ]; then
-			 ewarn "Found no JDK, setting ${VMHANDLE} as default system VM"
+			ewarn "Found no JDK, setting ${VMHANDLE} as default system VM"
 			java_set_default_vm_
 	fi
 	fi
@@ -119,7 +119,7 @@ java_remove-libjsoundalsa() {
 	fi
 }
 
-# Symlinks i386 to i?86. Updates env file to then use i?86 
+# Symlinks i386 to i?86. Updates env file to then use i?86
 # for LD_LIBRARY_PATH. See bug #23579.
 #
 # Takes an argument, which is a directory living in ${D}
@@ -131,12 +131,12 @@ fix-i386-dir() {
 	if use x86; then
 		local host=${CTARGET:-${CHOST}}
 		host=${host%%-*}
-		
+
 		if [[ ${host} != i386 ]]; then
 			local orig_dir="${libdir}/i386"
 			local new_dir="${libdir}/${host}"
 			dosym i386 ${new_dir} || die "Failed to dosym"
-			
+
 
 			sed -i -e "s/i386/${host}/g" \
 				${D}/etc/env.d/java/20${VMHANDLE} || die "Failed to sed"
diff --git a/eclass/kde-source.eclass b/eclass/kde-source.eclass
index 6e1517f5ee17..a7c1119f08ad 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.23 2005/07/11 15:08:06 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-source.eclass,v 1.24 2006/10/14 20:27:21 swegener Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 #
@@ -78,12 +78,12 @@ kde-source_src_unpack() {
 	# the other things are fetched later
 	# (kde-common/admin, <module>/doc/*, <module>/<files>)
 	if [ -n "$KCVS_SUBDIR" ]; then
-	    ECVS_MODULE="$KCVS_MODULE/$KCVS_SUBDIR"
+		ECVS_MODULE="$KCVS_MODULE/$KCVS_SUBDIR"
 	elif [ -n "$KCVS_MODULE" ]; then
-	    ECVS_MODULE="$KCVS_MODULE"
+		ECVS_MODULE="$KCVS_MODULE"
 	else
-	    # default for kde-base ebuilds
-	    ECVS_MODULE="$PN"
+		# default for kde-base ebuilds
+		ECVS_MODULE="$PN"
 	fi
 
 	cvs_src_unpack
@@ -100,8 +100,8 @@ kde-source_src_unpack() {
 	if [ -n "$KCVS_SUBDIR" ]; then
 
 		if [ -n "$KCVS_BRANCH" ]; then
-		    ECVS_BRANCH2="$ECVS_BRANCH"
-		    ECVS_BRANCH="$KCVS_BRANCH"
+			ECVS_BRANCH2="$ECVS_BRANCH"
+			ECVS_BRANCH="$KCVS_BRANCH"
 		fi
 
 		ECVS_MODULE="$KCVS_MODULE" ECVS_LOCAL=yes cvs_src_unpack
@@ -120,7 +120,7 @@ kde-source_src_unpack() {
 		fi
 
 		if [ -n "$KCVS_BRANCH" ]; then
-		    ECVS_BRANCH="$ECVS_BRANCH2"
+			ECVS_BRANCH="$ECVS_BRANCH2"
 		fi
 
 	fi
diff --git a/eclass/matrox.eclass b/eclass/matrox.eclass
index fb9bf5f543c8..283d531876be 100644
--- a/eclass/matrox.eclass
+++ b/eclass/matrox.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/matrox.eclass,v 1.14 2006/01/18 23:59:50 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/matrox.eclass,v 1.15 2006/10/14 20:27:21 swegener Exp $
 #
 # Author: Donnie Berkholz <spyderous@gentoo.org>
 #
@@ -98,7 +98,7 @@ matrox_base_pkg_postinst() {
 		if [ -f /dev/video ]
 		then
 			einfo "NOTE: To be able to use busmastering, you MUST have /dev/video as"
-		    einfo "a directory, which means you must remove anything there first"
+			einfo "a directory, which means you must remove anything there first"
 			einfo "(rm -f /dev/video), and mkdir /dev/video"
 		else
 			mkdir /dev/video
diff --git a/eclass/mozconfig-2.eclass b/eclass/mozconfig-2.eclass
index f40e16ee98e8..2b9018722bae 100644
--- a/eclass/mozconfig-2.eclass
+++ b/eclass/mozconfig-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/mozconfig-2.eclass,v 1.12 2006/10/04 13:58:58 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-2.eclass,v 1.13 2006/10/14 20:27:21 swegener Exp $
 #
 # mozconfig.eclass: the new mozilla.eclass
 
@@ -25,8 +25,8 @@ RDEPEND="|| ( ( x11-libs/libXrender
 	>=x11-libs/pango-1.10.1
 	>=dev-libs/libIDL-0.8.0
 	gnome? ( >=gnome-base/gnome-vfs-2.3.5
-		 >=gnome-base/libgnomeui-2.2.0 )
-	 !<x11-base/xorg-x11-6.7.0-r2
+		>=gnome-base/libgnomeui-2.2.0 )
+	!<x11-base/xorg-x11-6.7.0-r2
 	>=x11-libs/cairo-1.0.0"
 	#According to bugs #18573, #204520, and couple of others in Mozilla's
 	#bugzilla. libmng and mng support has been removed in 2003.
diff --git a/eclass/mozconfig.eclass b/eclass/mozconfig.eclass
index 7a33df545077..bea893cb864e 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.27 2006/10/04 13:58:58 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig.eclass,v 1.28 2006/10/14 20:27:21 swegener Exp $
 #
 # mozconfig.eclass: the new mozilla.eclass
 
@@ -30,7 +30,7 @@ RDEPEND="|| ( ( x11-libs/libXrender
 	>=dev-libs/libIDL-0.8.0
 	gnome? ( >=gnome-base/gnome-vfs-2.3.5 )"
 	#According to bugs #18573, #204520, and couple of others in Mozilla's
-	#bugzilla. libmng and mng support has been removed in 2003.  
+	#bugzilla. libmng and mng support has been removed in 2003.
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index 7fe9dfb9e41a..a1ad3b0bb759 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.35 2006/10/13 22:13:34 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.36 2006/10/14 20:27:21 swegener Exp $
 
 # Author: Francesco Riosa <vivo@gentoo.org>
 # Maintainer: Luca Longinotti <chtekk@gentoo.org>
@@ -81,7 +81,7 @@ mysql_version_is_at_least "5.01.00.00" \
 && IUSE="${IUSE} innodb"
 
 EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst \
-				 pkg_postinst pkg_config pkg_postrm
+				pkg_postinst pkg_config pkg_postrm
 
 # void mysql_init_vars()
 #
diff --git a/eclass/myth.eclass b/eclass/myth.eclass
index 5e8b1ae047c6..7c2e7db0b0d7 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.19 2005/08/23 14:55:11 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/myth.eclass,v 1.20 2006/10/14 20:27:21 swegener Exp $
 #
 # Author: Daniel Ahlberg <aliz@gentoo.org>
 #
@@ -45,7 +45,7 @@ myth_src_unpack() {
 
 	if ! use nls ; then
 		sed -e "s:i18n::" \
-		    -i ${pkg_pro} || die "Disable i18n failed"
+			-i ${pkg_pro} || die "Disable i18n failed"
 	fi
 
 	if use debug ; then
diff --git a/eclass/mythtv-plugins.eclass b/eclass/mythtv-plugins.eclass
index 85c16cefaeef..ed8a7130cce4 100644
--- a/eclass/mythtv-plugins.eclass
+++ b/eclass/mythtv-plugins.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mythtv-plugins.eclass,v 1.18 2006/09/20 03:43:24 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mythtv-plugins.eclass,v 1.19 2006/10/14 20:27:21 swegener Exp $
 #
 # Author: Doug Goldstein <cardoe@gentoo.org>
 #
@@ -14,7 +14,7 @@ MTVCONF=${MTVCONF:=""}
 SLOT="0"
 IUSE="${IUSE} debug mmx"
 
-RDEPEND="${RDEPEND} 
+RDEPEND="${RDEPEND}
 		=media-tv/mythtv-${MY_PV}*"
 DEPEND="${DEPEND}
 		=media-tv/mythtv-${MY_PV}*
@@ -37,7 +37,7 @@ mythtv-plugins_src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	mythtv-fixes_patch 
+	mythtv-fixes_patch
 
 	sed -e 's!PREFIX = /usr/local!PREFIX = /usr!' \
 	-i 'settings.pro' || die "fixing PREFIX to /usr failed"
diff --git a/eclass/nxserver-1.3.2.eclass b/eclass/nxserver-1.3.2.eclass
index 3548ee466975..47136def127a 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.12 2006/03/05 15:41:50 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/nxserver-1.3.2.eclass,v 1.13 2006/10/14 20:27:21 swegener Exp $
 #
 # eclass for handling the different nxserver binaries available
 # from nomachine's website
@@ -122,7 +122,7 @@ nxserver-1.3.2_pkg_postinst() {
 	cp -f /usr/NX/home/nx/.ssh/server.id_dsa.pub.key /usr/NX/home/nx/.ssh/authorized_keys2
 
 	if [ ! -f /usr/NX/var/broadcast.txt ]; then
-	    einfo "Creating NX user registration database"
+		einfo "Creating NX user registration database"
 		touch /usr/NX/var/broadcast.txt
 		chown nx:root /usr/NX/var/broadcast.txt
 
diff --git a/eclass/nxserver-1.4.eclass b/eclass/nxserver-1.4.eclass
index 349ee6216dee..15a5d3b2e141 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.10 2006/03/05 15:43:40 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/nxserver-1.4.eclass,v 1.11 2006/10/14 20:27:21 swegener Exp $
 #
 # eclass for handling the different nxserver binaries available
 # from nomachine's website
@@ -131,7 +131,7 @@ nxserver-1.4_pkg_postinst() {
 	chmod 0600 /usr/NX/home/nx/.ssh/authorized_keys2
 
 	if [ ! -f /usr/NX/var/broadcast.txt ]; then
-	    einfo "Creating NX user registration database"
+		einfo "Creating NX user registration database"
 		touch /usr/NX/var/broadcast.txt
 		chown nx:root /usr/NX/var/broadcast.txt
 
diff --git a/eclass/nxserver.eclass b/eclass/nxserver.eclass
index 587cb7a7db49..607139e6d4d8 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.19 2005/07/11 15:08:06 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/nxserver.eclass,v 1.20 2006/10/14 20:27:21 swegener Exp $
 #
 # eclass for handling the different nxserver binaries available
 # from nomachine's website
@@ -115,7 +115,7 @@ nxserver_pkg_postinst() {
 	cp -f /usr/NX/$l_szHome/.ssh/server.id_dsa.pub.key /usr/NX/$l_szHome/.ssh/authorized_keys2
 
 	if [ ! -f /usr/NX/var/broadcast.txt ]; then
-	    einfo "Creating NX user registration database"
+		einfo "Creating NX user registration database"
 		touch /usr/NX/var/broadcast.txt
 		chown nx:root /usr/NX/var/broadcast.txt
 
diff --git a/eclass/nxserver_1.5.eclass b/eclass/nxserver_1.5.eclass
index 8be47bf8e57d..71727d34e291 100644
--- a/eclass/nxserver_1.5.eclass
+++ b/eclass/nxserver_1.5.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.5.eclass,v 1.3 2006/05/02 22:32:54 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/nxserver_1.5.eclass,v 1.4 2006/10/14 20:27:21 swegener Exp $
 #
 # eclass for handling the different nxserver binaries available
 # from nomachine's website
@@ -17,32 +17,32 @@ RESTRICT="nomirror strip fetch"
 
 SRC_URI="nxserver-${MY_PV}.i386.rpm"
 DEPEND="|| ( (
-		x11-proto/xproto
-		x11-proto/xf86vidmodeproto
-		x11-proto/glproto
-		x11-proto/videoproto
-		x11-proto/xextproto
-		x11-proto/fontsproto
-		x11-libs/libX11
-		x11-libs/libFS
-		x11-libs/libXvMC
-		media-libs/mesa
-		x11-misc/xdialog
-	     )
+			x11-proto/xproto
+			x11-proto/xf86vidmodeproto
+			x11-proto/glproto
+			x11-proto/videoproto
+			x11-proto/xextproto
+			x11-proto/fontsproto
+			x11-libs/libX11
+			x11-libs/libFS
+			x11-libs/libXvMC
+			media-libs/mesa
+			x11-misc/xdialog
+		)
 		virtual/x11
 	)
 	sys-apps/shadow
 	net-misc/openssh
 	!prebuilt? (
-	  =net-misc/nxssh-1.5*
-	  =net-misc/nxproxy-1.5*
-	  =net-misc/nx-x11-1.5*
+		=net-misc/nxssh-1.5*
+		=net-misc/nxproxy-1.5*
+		=net-misc/nx-x11-1.5*
 	)
 	prebuilt? (
-	  !net-misc/nxssh
-	  !net-misc/nxproxy
-	  !net-misc/nx-x11
-	  !net-misc/nxcomp
+		!net-misc/nxssh
+		!net-misc/nxproxy
+		!net-misc/nx-x11
+		!net-misc/nxcomp
 	)"
 
 RDEPEND="media-libs/jpeg
@@ -83,7 +83,7 @@ nxserver_1.5_src_install() {
 	if ! useq prebuilt ; then
 		find usr/NX/lib -type l -exec rm {} \;
 
-	    for x in nxagent nxdesktop nxpasswd nxviewer ; do
+		for x in nxagent nxdesktop nxpasswd nxviewer ; do
 			if [ -f usr/NX/bin/$x ]; then
 				rm -f usr/NX/bin/$x
 			fi
@@ -219,7 +219,7 @@ nxserver_1.5_pkg_postinst() {
 	# TODO:
 	# what does the broadcast.txt file really do?
 	if [ ! -f /usr/NX/var/broadcast.txt ]; then
-	    einfo "Creating NX user registration database"
+		einfo "Creating NX user registration database"
 		touch /usr/NX/var/broadcast.txt
 		chown nx:root /usr/NX/var/broadcast.txt
 
diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index c847cd50c039..1c946febf6d0 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.102 2006/09/02 00:20:13 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.103 2006/10/14 20:27:21 swegener Exp $
 #
 # Author: Seemant Kulleen <seemant@gentoo.org>
 # Maintained by the Perl herd <perl@gentoo.org>
@@ -171,7 +171,7 @@ perl-module_src_install() {
 		rm -rf ${FILE}
 	done
 	find ${D}/usr/share/man -depth -type d 2>/dev/null | xargs -r rmdir 2>/dev/null
-	
+
 	fixlocalpod
 
 	for FILE in `find ${D} -type f |grep -v '.so'`; do
@@ -242,15 +242,15 @@ perlinfo() {
 	VENDOR_ARCH=${installvendorarch}
 
 	if [ "${PREFER_BUILDPL}" == "yes" ]; then
-	   if [ ! -f ${S}/Makefile.PL ] || [ ${PN} == "module-build" ]; then
-		if [ -f ${S}/Build.PL ]; then
-			if [ ${PN} == "module-build" ]; then
-				BUILDER_VER="1" # A bootstrapping if you will
-			else
-				BUILDER_VER=`perl -MModule::Build -e 'print "$Module::Build::VERSION;"' `
+		if [ ! -f ${S}/Makefile.PL ] || [ ${PN} == "module-build" ]; then
+			if [ -f ${S}/Build.PL ]; then
+				if [ ${PN} == "module-build" ]; then
+					BUILDER_VER="1" # A bootstrapping if you will
+				else
+					BUILDER_VER=`perl -MModule::Build -e 'print "$Module::Build::VERSION;"' `
+				fi
 			fi
 		fi
-	   fi
 	fi
 
 	if [ -f /usr/bin/perl ]
@@ -284,16 +284,16 @@ updatepod() {
 	if [ -d "${POD_DIR}" ]
 	then
 		for FILE in `find ${POD_DIR} -type f -name "*.pod.arch"`; do
-		   cat ${FILE} >> ${ARCH_LIB}/perllocal.pod
-		   rm -f ${FILE}
+			cat ${FILE} >> ${ARCH_LIB}/perllocal.pod
+			rm -f ${FILE}
 		done
 		for FILE in `find ${POD_DIR} -type f -name "*.pod.site"`; do
-		   cat ${FILE} >> ${SITE_LIB}/perllocal.pod
-		   rm -f ${FILE}
+			cat ${FILE} >> ${SITE_LIB}/perllocal.pod
+			rm -f ${FILE}
 		done
 		for FILE in `find ${POD_DIR} -type f -name "*.pod.vendor"`; do
-		   cat ${FILE} >> ${VENDOR_LIB}/perllocal.pod
-		   rm -f ${FILE}
+			cat ${FILE} >> ${VENDOR_LIB}/perllocal.pod
+			rm -f ${FILE}
 		done
 	fi
 }
diff --git a/eclass/php-ext.eclass b/eclass/php-ext.eclass
index f31442782c9e..916e5c299493 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.10 2005/07/11 15:08:06 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext.eclass,v 1.11 2006/10/14 20:27:21 swegener Exp $
 #
 # Author: Tal Peer <coredumb@gentoo.org>
 #
@@ -31,7 +31,7 @@ DEPEND="${DEPEND}
 		>=sys-devel/libtool-1.4.3"
 
 RDEPEND="${RDEPEND}
-		 virtual/php"
+		virtual/php"
 
 php-ext_buildinilist () {
 	# work out the list of .ini files to edit/add to
diff --git a/eclass/php-sapi.eclass b/eclass/php-sapi.eclass
index 33d0fb76bf36..362c323cf452 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.89 2006/01/26 06:06:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-sapi.eclass,v 1.90 2006/10/14 20:27:21 swegener Exp $
 # Author: Robin H. Johnson <robbat2@gentoo.org>
 
 inherit eutils flag-o-matic multilib libtool
@@ -62,10 +62,10 @@ esac
 # and then either of db3 or db4
 IUSE="${IUSE} berkdb"
 RDEPEND="${RDEPEND} berkdb? ( =sys-libs/db-1*
-							  || ( >=sys-libs/db-4.0.14-r2
-								   >=sys-libs/db-3.2.9-r9
-							     )
-							)"
+						|| ( >=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
 # in some other way
@@ -293,17 +293,17 @@ php-sapi_src_compile() {
 	if use berkdb; then
 		einfo "Enabling NBDM"
 		myconf="${myconf} --with-ndbm=/usr"
-	 	#Hack to use db4
-	 	if has_version '=sys-libs/db-4*' && grep -q -- '--with-db4' configure; then
-	 		einfo "Enabling DB4"
-	 		myconf="${myconf} --with-db4=/usr"
+		#Hack to use db4
+		if has_version '=sys-libs/db-4*' && grep -q -- '--with-db4' configure; then
+			einfo "Enabling DB4"
+			myconf="${myconf} --with-db4=/usr"
 		elif has_version '=sys-libs/db-3*' && grep -q -- '--with-db3' configure; then
-	 		einfo "Enabling DB3"
-	 		myconf="${myconf} --with-db3=/usr"
+			einfo "Enabling DB3"
+			myconf="${myconf} --with-db3=/usr"
 		else
 			einfo "Enabling DB2"
 			myconf="${myconf} --with-db2=/usr"
-	 	fi
+		fi
 	else
 		einfo "Skipping DB2, DB3, DB4, NDBM support"
 		myconf="${myconf} --without-db3 --without-db4 --without-db2 --without-ndbm"
diff --git a/eclass/php5-sapi-r2.eclass b/eclass/php5-sapi-r2.eclass
index 220088420cb5..53e5ae16590c 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.40 2006/07/05 07:57:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r2.eclass,v 1.41 2006/10/14 20:27:21 swegener Exp $
 #
 # eclass/php5-sapi-r2.eclass
 #               Eclass for building different php5 SAPI instances
@@ -158,7 +158,7 @@ php5-sapi-r2_check_awkward_uses() {
 		eerror "Support will be added once MySQL 4.1 is no longer package-masked"
 		eerror
 		die "mysqli not supported yet"
-	 fi
+	fi
 
 	# recode not available in 5.0.0; upstream bug
 	if useq recode && [ "$PHP_PV" == "5.0.0" ]; then
diff --git a/eclass/python.eclass b/eclass/python.eclass
index dd15f587e52a..5495f1c0e9b3 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.28 2006/08/16 16:24:20 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.29 2006/10/14 20:27:21 swegener Exp $
 #
 # Author: Alastair Tse <liquidx@gentoo.org>
 #
@@ -72,7 +72,7 @@ __python_version_extract() {
 	export PYVER_MAJOR=${verstr:0:1}
 	export PYVER_MINOR=${verstr:2:1}
 	if [ "${verstr:3}x" = ".x" ]; then
-	   export PYVER_MICRO=${verstr:4}
+		export PYVER_MICRO=${verstr:4}
 	fi
 	export PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
 }
diff --git a/eclass/rox.eclass b/eclass/rox.eclass
index ff8f4429219c..c819e0153778 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.14 2006/10/07 16:34:30 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/rox.eclass,v 1.15 2006/10/14 20:27:21 swegener Exp $
 
 # ROX eclass Version 2
 
@@ -37,12 +37,12 @@ DEPEND="${DEPEND}
 
 if [[ -n "${ROX_LIB_VER}" ]]; then
 	DEPEND="${DEPEND}
-			  >=rox-base/rox-lib-${ROX_LIB_VER}"
+		>=rox-base/rox-lib-${ROX_LIB_VER}"
 fi
 
 if [[ -n "${ROX_CLIB_VER}" ]]; then
 	DEPEND="${DEPEND}
-			  >=rox-base/rox-clib-${ROX_CLIB_VER}"
+		>=rox-base/rox-clib-${ROX_CLIB_VER}"
 fi
 
 RDEPEND="${DEPEND}"
@@ -106,22 +106,22 @@ rox_src_install() {
 
 	# set permissions for programs where we have rox_run script (all who using rox-clib )
 	if [ -f "${D}/usr/lib/rox/${APPNAME}/rox_run" ]; then
-	    chmod 755 "${D}/usr/lib/rox/${APPNAME}/rox_run"
+		chmod 755 "${D}/usr/lib/rox/${APPNAME}/rox_run"
 	fi
 
 	# some programs have choice_install script
 	if [ -f "${D}/usr/lib/rox/${APPNAME}/choice_install" ]; then
-	    chmod 755 "${D}/usr/lib/rox/${APPNAME}/choice_install"
+		chmod 755 "${D}/usr/lib/rox/${APPNAME}/choice_install"
 	fi
 
 	# set permissions on all binares files for compiled programs per arch
 	if [ -n "${SET_PERM}" ]; then
-	    ARCH="`uname -m`"
-	    case ${ARCH} in
-		i?86) ARCH=ix86 ;;
-	    esac
-	    PLATFORM="`uname -s`-${ARCH}"
-	    chmod -R 755 "${D}/usr/lib/rox/${APPNAME}/${PLATFORM}"
+		ARCH="`uname -m`"
+		case ${ARCH} in
+			i?86) ARCH=ix86 ;;
+		esac
+		PLATFORM="`uname -s`-${ARCH}"
+		chmod -R 755 "${D}/usr/lib/rox/${APPNAME}/${PLATFORM}"
 	fi
 
 	#create a script in bin to run the application from command line
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index fea2e3636438..8a432ca68447 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.314 2006/10/02 22:35:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.315 2006/10/14 20:27:21 swegener Exp $
 
 HOMEPAGE="http://gcc.gnu.org/"
 LICENSE="GPL-2 LGPL-2.1"
@@ -1032,7 +1032,7 @@ gcc_src_unpack() {
 
 	${ETYPE}_src_unpack || die "failed to ${ETYPE}_src_unpack"
 
-        # protoize don't build on FreeBSD, skip it
+	# protoize don't build on FreeBSD, skip it
 	if ! is_crosscompile && ! use elibc_FreeBSD ; then
 		# enable protoize / unprotoize
 		sed -i -e '/^LANGUAGES =/s:$: proto:' "${S}"/gcc/Makefile.in
diff --git a/eclass/vmware-mod.eclass b/eclass/vmware-mod.eclass
index e1b42345eb87..baef757417df 100644
--- a/eclass/vmware-mod.eclass
+++ b/eclass/vmware-mod.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vmware-mod.eclass,v 1.3 2006/09/27 12:59:56 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vmware-mod.eclass,v 1.4 2006/10/14 20:27:21 swegener Exp $
 
 
 # Ensure vmware comes before linux-mod since we want linux-mod's pkg_preinst and
@@ -27,7 +27,7 @@ S="${WORKDIR}"
 # VMWARE_VER)
 # RESTRICT="userpriv"
 
-EXPORT_FUNCTIONS pkg_setup src_unpack src_install 
+EXPORT_FUNCTIONS pkg_setup src_unpack src_install
 
 # Must define VMWARE_VER to make, otherwise it'll try and run getversion.pl
 BUILD_TARGETS="auto-build VMWARE_VER=${VMWARE_VER} KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
@@ -84,7 +84,7 @@ vmware-mod_src_install() {
 		echo 'KERNEL=="vmmon*", GROUP="'$VMWARE_GROUP'" MODE=660' >> "${D}/etc/udev/rules.d/60-vmware.rules" || die
 		echo 'KERNEL=="vmnet*", GROUP="'$VMWARE_GROUP'" MODE=660' >> "${D}/etc/udev/rules.d/60-vmware.rules" || die
 	fi
-	
+
 	linux-mod_src_install
 }
 
diff --git a/eclass/vmware.eclass b/eclass/vmware.eclass
index f899598825cc..9a3b3d7b8142 100644
--- a/eclass/vmware.eclass
+++ b/eclass/vmware.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vmware.eclass,v 1.14 2006/10/04 13:14:04 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vmware.eclass,v 1.15 2006/10/14 20:27:21 swegener Exp $
 
 # This eclass is for all vmware-* ebuilds in the tree and should contain all
 # of the common components across the multiple packages.
@@ -283,7 +283,7 @@ vmware_src_install() {
 
 	if [ "${product}" == "vmware" -o "${product}" == "vmware-tools" ]
 	then
-	
+
 		# We have to create a bunch of rc directories for the init script
 		vmware_create_initd || die "creating rc directories"
 
diff --git a/eclass/webapp.eclass b/eclass/webapp.eclass
index ffc1622cb02c..36bb4fa199aa 100644
--- a/eclass/webapp.eclass
+++ b/eclass/webapp.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.44 2006/07/11 02:36:23 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.45 2006/10/14 20:27:21 swegener Exp $
 #
 # eclass/webapp.eclass
 #				Eclass for installing applications to run under a web server
@@ -374,7 +374,7 @@ function webapp_pkg_setup ()
 
 			if [ "$?" != "0" ]; then
 				# okay, whatever is there, it isn't webapp-config-compatible
-			    ewarn "You already have something installed in ${my_dir}"
+				ewarn "You already have something installed in ${my_dir}"
 				ewarn
 				ewarn "Whatever is in ${my_dir}, it's not"
 				ewarn "compatible with webapp-config."
diff --git a/eclass/x11.eclass b/eclass/x11.eclass
index 293c108bdc11..f162a9065376 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.9 2006/10/11 02:29:29 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/x11.eclass,v 1.10 2006/10/14 20:27:21 swegener Exp $
 #
 # Author: Seemant Kulleen <seemant@gentoo.org>
 #
@@ -53,7 +53,7 @@ check_version_h() {
 get_KV_info() {
 	check_version_h
 	get_version
-	
+
 	# Not used anywhere, leaving here just in case...
 	export KV_full="${KV_FULL}"
 	export KV_major="${KV_MAJOR}"
diff --git a/eclass/xfce4.eclass b/eclass/xfce4.eclass
index 82f5107300be..47a89a8f90a7 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.21 2005/08/22 16:20:30 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xfce4.eclass,v 1.22 2006/10/14 20:27:21 swegener Exp $
 # Author: Brad Cowan <bcowan@gentoo.org>
 
 # Xfce4 Eclass
@@ -66,37 +66,37 @@ 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"
+		XFCE_CONFIG="${XFCE_CONFIG} --enable-debug=yes"
 	fi
 
 	if [[ ${XFCE_META} = "1" ]]; then
-	    einfo "Meta Build, Nothing to compile."
+		einfo "Meta Build, Nothing to compile."
 	else
-	    econf ${XFCE_CONFIG} || die
+		econf ${XFCE_CONFIG} || die
 
-	    if [[ "${SINGLE_MAKE}" = "1" ]]; then
-		emake -j1 || die
-	    else
-		emake || die
-	    fi
+		if [[ "${SINGLE_MAKE}" = "1" ]]; then
+			emake -j1 || die
+		else
+			emake || die
+		fi
 	fi
 }
 
 xfce4_src_install() {
 	if [[ ${XFCE_META} = "1" ]]; then
-	    einfo "Meta Build, Nothing to install."
+		einfo "Meta Build, Nothing to install."
 	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
+		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
 	fi
 }
 
diff --git a/eclass/xmms-plugin.eclass b/eclass/xmms-plugin.eclass
index d30da682f5a8..d65a1a850f7e 100644
--- a/eclass/xmms-plugin.eclass
+++ b/eclass/xmms-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/xmms-plugin.eclass,v 1.22 2006/06/28 09:36:30 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/xmms-plugin.eclass,v 1.23 2006/10/14 20:27:21 swegener Exp $
 #
 # Jeremy Huddleston <eradicator@gentoo.org>
 # Luis Medinas	<metalgod@gentoo.org>
@@ -33,8 +33,8 @@ HOMEPAGE="http://www.xmms.org"
 LICENSE="GPL-2"
 
 SRC_URI="http://www.xmms.org/files/1.2.x/xmms-${PV}.tar.bz2
-	 ${M4_VER:+${GENTOO_URI}/xmms-${PV}-gentoo-m4-${M4_VER}.tar.bz2}
-	 ${PATCH_VER:+${GENTOO_URI}/xmms-${PV}-gentoo-patches-${PATCH_VER}.tar.bz2}"
+	${M4_VER:+${GENTOO_URI}/xmms-${PV}-gentoo-m4-${M4_VER}.tar.bz2}
+	${PATCH_VER:+${GENTOO_URI}/xmms-${PV}-gentoo-patches-${PATCH_VER}.tar.bz2}"
 
 # Set S to something which exists
 S="${WORKDIR}/xmms-${PV}"
@@ -62,9 +62,10 @@ xmms-plugin_src_unpack() {
 	fi
 
 	cd ${S}/${PLUGIN_PATH}
-	sed -i -e "s:-I\$(top_srcdir)::g" \
-	       -e "s:\$(top_builddir)/libxmms/libxmms.la:/usr/$(get_libdir)/libxmms.la:g" \
-	       Makefile.am || die "Failed to edit Makefile.am"
+	sed -i \
+		-e "s:-I\$(top_srcdir)::g" \
+		-e "s:\$(top_builddir)/libxmms/libxmms.la:/usr/$(get_libdir)/libxmms.la:g" \
+		Makefile.am || die "Failed to edit Makefile.am"
 
 	cd ${S}
author	Sven Wegener <swegener@gentoo.org>	2006-10-14 20:27:21 +0000
committer	Sven Wegener <swegener@gentoo.org>	2006-10-14 20:27:21 +0000
commit	0372ecc500e416611bd0640c07dd9b4d5d18cafe (patch)
tree	c9159886d91bd1beb7685866a94dc0c00dece5fa /eclass
parent	Mark 3.1.5-r2 stable on ia64 (diff)
download	gentoo-2-0372ecc500e416611bd0640c07dd9b4d5d18cafe.tar.gz gentoo-2-0372ecc500e416611bd0640c07dd9b4d5d18cafe.tar.bz2 gentoo-2-0372ecc500e416611bd0640c07dd9b4d5d18cafe.zip