[gentoo-commits] proj/devmanual:codesample-indent-fix commit in: ebuild-writing/functions/pkg_pretend/, ebuild-writing/functions/pkg_preinst/, ...

[Göktürk Yüksek]

commit:     8c24be3239906196b973ff14197650e7702e953c
Author:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 22 00:12:40 2017 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Wed Jan  3 05:17:11 2018 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=8c24be32

Change the indentation for ebuild <codesample/> snippets from spaces to tabs

 archs/amd64/text.xml                               |   6 +-
 ebuild-writing/error-handling/text.xml             |   2 +-
 ebuild-writing/functions/pkg_config/text.xml       |  26 ++---
 ebuild-writing/functions/pkg_info/text.xml         |   2 +-
 ebuild-writing/functions/pkg_nofetch/text.xml      |  20 ++--
 ebuild-writing/functions/pkg_postinst/text.xml     |  18 ++--
 ebuild-writing/functions/pkg_postrm/text.xml       |   4 +-
 ebuild-writing/functions/pkg_preinst/text.xml      |   6 +-
 ebuild-writing/functions/pkg_prerm/text.xml        |   6 +-
 ebuild-writing/functions/pkg_pretend/text.xml      |   2 +-
 ebuild-writing/functions/pkg_setup/text.xml        |  28 ++---
 .../src_compile/build-environment/text.xml         |  26 ++---
 .../functions/src_compile/building/text.xml        |  14 +--
 .../functions/src_compile/no-build-system/text.xml |  48 ++++-----
 ebuild-writing/functions/src_compile/text.xml      |  30 +++---
 .../functions/src_configure/configuring/text.xml   |  30 +++---
 ebuild-writing/functions/src_configure/text.xml    |  14 +--
 ebuild-writing/functions/src_install/text.xml      | 116 ++++++++++-----------
 .../functions/src_prepare/epatch/text.xml          |  24 ++---
 ebuild-writing/functions/src_prepare/text.xml      |   6 +-
 ebuild-writing/functions/src_test/text.xml         |  12 +--
 .../functions/src_unpack/cvs-sources/text.xml      |  22 ++--
 .../functions/src_unpack/rpm-sources/text.xml      |  14 +--
 ebuild-writing/functions/src_unpack/text.xml       |  16 +--
 ebuild-writing/messages/text.xml                   |  12 +--
 ebuild-writing/use-conditional-code/text.xml       |  32 +++---
 ebuild-writing/using-eclasses/text.xml             |   2 +-
 ebuild-writing/variables/text.xml                  |  22 ++--
 eclass-writing/text.xml                            |  30 +++---
 general-concepts/autotools/text.xml                |  16 +--
 general-concepts/dependencies/text.xml             |  44 ++++----
 general-concepts/portage-cache/text.xml            |  28 ++---
 general-concepts/use-flags/text.xml                |  24 ++---
 general-concepts/user-environment/text.xml         |   6 +-
 quickstart/text.xml                                |  84 +++++++--------
 tasks-reference/completion/text.xml                |  30 +++---
 tools-reference/bash/text.xml                      |  36 +++----
 tools-reference/cat/text.xml                       |  12 +--
 tools-reference/find/text.xml                      |   4 +-
 tools-reference/sed/text.xml                       |  26 ++---
 40 files changed, 450 insertions(+), 450 deletions(-)

diff --git a/archs/amd64/text.xml b/archs/amd64/text.xml
index f75e29d..366959d 100644
--- a/archs/amd64/text.xml
+++ b/archs/amd64/text.xml
@@ -336,10 +336,10 @@ In most cases, it's sufficient to use the <c>$(get_libdir)</c> function from
 inherit multilib
 
 src_compile() {
-    econf \
-        --libdir=/usr/$(get_libdir)
+	econf \
+		--libdir=/usr/$(get_libdir)
 
-    emake || die
+	emake || die
 }
 
 src_install() {

diff --git a/ebuild-writing/error-handling/text.xml b/ebuild-writing/error-handling/text.xml
index da9e88d..96dc962 100644
--- a/ebuild-writing/error-handling/text.xml
+++ b/ebuild-writing/error-handling/text.xml
@@ -87,7 +87,7 @@ The correct way to rewrite this is to use an <c>if</c> block:
 
 <codesample lang="ebuild">
 if [[ -f foorc ]] ; then
-    update_foorc || die "Couldn't update foorc!"
+	update_foorc || die "Couldn't update foorc!"
 fi
 </codesample>
 

diff --git a/ebuild-writing/functions/pkg_config/text.xml b/ebuild-writing/functions/pkg_config/text.xml
index 422089f..ce97bd8 100644
--- a/ebuild-writing/functions/pkg_config/text.xml
+++ b/ebuild-writing/functions/pkg_config/text.xml
@@ -34,7 +34,7 @@
 <codesample lang="ebuild">
 pkg_config()
 {
-    eerror "This ebuild does not have a config function."
+	eerror "This ebuild does not have a config function."
 }
 </codesample>
 </body>
@@ -49,18 +49,18 @@ Taken from the <c>mysql</c> ebuilds. Note the use of <c>${ROOT}</c>.
 
 <codesample lang="ebuild">
 pkg_config() {
-    if [ ! -d "${ROOT}"/var/lib/mysql/mysql ] ; then
-        einfo "Press ENTER to create the mysql database and set proper"
-        einfo "permissions on it, or Control-C to abort now..."
-        read
-        "${ROOT}"/usr/bin/mysql_install_db
-    else
-        einfo "Hmm, it appears as though you already have the mysql"
-        einfo "database in place.  If you are having problems trying"
-        einfo "to start mysqld, perhaps you need to manually run"
-        einfo "/usr/bin/mysql_install_db and/or check your config"
-        einfo "file(s) and/or database(s) and/or logfile(s)."
-    fi
+	if [ ! -d "${ROOT}"/var/lib/mysql/mysql ] ; then
+		einfo "Press ENTER to create the mysql database and set proper"
+		einfo "permissions on it, or Control-C to abort now..."
+		read
+		"${ROOT}"/usr/bin/mysql_install_db
+	else
+		einfo "Hmm, it appears as though you already have the mysql"
+		einfo "database in place.  If you are having problems trying"
+		einfo "to start mysqld, perhaps you need to manually run"
+		einfo "/usr/bin/mysql_install_db and/or check your config"
+		einfo "file(s) and/or database(s) and/or logfile(s)."
+	fi
 }
 </codesample>
 </body>

diff --git a/ebuild-writing/functions/pkg_info/text.xml b/ebuild-writing/functions/pkg_info/text.xml
index 44f3c77..8cb3dbb 100644
--- a/ebuild-writing/functions/pkg_info/text.xml
+++ b/ebuild-writing/functions/pkg_info/text.xml
@@ -34,7 +34,7 @@
 <codesample lang="ebuild">
 pkg_info()
 {
-    return
+	return
 }
 </codesample>
 </body>

diff --git a/ebuild-writing/functions/pkg_nofetch/text.xml b/ebuild-writing/functions/pkg_nofetch/text.xml
index a03d552..036ad62 100644
--- a/ebuild-writing/functions/pkg_nofetch/text.xml
+++ b/ebuild-writing/functions/pkg_nofetch/text.xml
@@ -34,13 +34,13 @@
 <codesample lang="ebuild">
 pkg_nofetch()
 {
-    [ -z "${SRC_URI}" ] &amp;&amp; return
+	[ -z "${SRC_URI}" ] &amp;&amp; return
 
-    echo "!!! The following are listed in SRC_URI for ${PN}:"
-    for MYFILE in `echo ${SRC_URI}`; do
-        echo "!!!   $MYFILE"
-    done
-    return
+	echo "!!! The following are listed in SRC_URI for ${PN}:"
+	for MYFILE in `echo ${SRC_URI}`; do
+		echo "!!!   $MYFILE"
+	done
+	return
 }
 </codesample>
 </body>
@@ -51,10 +51,10 @@ pkg_nofetch()
 <body>
 <codesample lang="ebuild">
 pkg_nofetch() {
-    einfo "Please download"
-    einfo "  - ${P}-main.tar.bz2"
-    einfo "  - ${P}-extras.tar.bz2"
-    einfo "from ${HOMEPAGE} and place them in your DISTDIR directory."
+	einfo "Please download"
+	einfo "  - ${P}-main.tar.bz2"
+	einfo "  - ${P}-extras.tar.bz2"
+	einfo "from ${HOMEPAGE} and place them in your DISTDIR directory."
 }
 </codesample>
 <note>

diff --git a/ebuild-writing/functions/pkg_postinst/text.xml b/ebuild-writing/functions/pkg_postinst/text.xml
index 8b86c4c..833dfe4 100644
--- a/ebuild-writing/functions/pkg_postinst/text.xml
+++ b/ebuild-writing/functions/pkg_postinst/text.xml
@@ -34,7 +34,7 @@
 <codesample lang="ebuild">
 pkg_postinst()
 {
-    return
+	return
 }
 </codesample>
 </body>
@@ -45,14 +45,14 @@ pkg_postinst()
 <body>
 <codesample lang="ebuild">
 pkg_postinst() {
-    if $OLD_FLUXBOX_VERSION ; then
-        ewarn "You must restart fluxbox before using the [include] /directory/"
-        ewarn "feature if you are upgrading from an older fluxbox!"
-        ewarn " "
-    fi
-    elog "If you experience font problems, or if fluxbox takes a very"
-    elog "long time to start up, please try the 'disablexmb' USE flag."
-    elog "If that fails, please report bugs upstream."
+	if $OLD_FLUXBOX_VERSION ; then
+		ewarn "You must restart fluxbox before using the [include] /directory/"
+		ewarn "feature if you are upgrading from an older fluxbox!"
+		ewarn " "
+	fi
+	elog "If you experience font problems, or if fluxbox takes a very"
+	elog "long time to start up, please try the 'disablexmb' USE flag."
+	elog "If that fails, please report bugs upstream."
 }
 </codesample>
 </body>

diff --git a/ebuild-writing/functions/pkg_postrm/text.xml b/ebuild-writing/functions/pkg_postrm/text.xml
index fa2a21d..af9e435 100644
--- a/ebuild-writing/functions/pkg_postrm/text.xml
+++ b/ebuild-writing/functions/pkg_postrm/text.xml
@@ -34,7 +34,7 @@
 <codesample lang="ebuild">
 pkg_postrm()
 {
-    return
+	return
 }
 </codesample>
 </body>
@@ -45,7 +45,7 @@ pkg_postrm()
 <body>
 <codesample lang="ebuild">
 pkg_postrm() {
-    fdo-mime_mime_database_update
+	fdo-mime_mime_database_update
 }
 </codesample>
 </body>

diff --git a/ebuild-writing/functions/pkg_preinst/text.xml b/ebuild-writing/functions/pkg_preinst/text.xml
index 9cdeb4a..a68950f 100644
--- a/ebuild-writing/functions/pkg_preinst/text.xml
+++ b/ebuild-writing/functions/pkg_preinst/text.xml
@@ -34,7 +34,7 @@
 <codesample lang="ebuild">
 pkg_preinst()
 {
-    return
+	return
 }
 </codesample>
 </body>
@@ -45,8 +45,8 @@ pkg_preinst()
 <body>
 <codesample lang="ebuild">
 pkg_preinst() {
-    enewgroup foo
-    enewuser foo -1 /bin/false /dev/null foo
+	enewgroup foo
+	enewuser foo -1 /bin/false /dev/null foo
 }
 </codesample>
 </body>

diff --git a/ebuild-writing/functions/pkg_prerm/text.xml b/ebuild-writing/functions/pkg_prerm/text.xml
index d9f8a6f..7e05b0e 100644
--- a/ebuild-writing/functions/pkg_prerm/text.xml
+++ b/ebuild-writing/functions/pkg_prerm/text.xml
@@ -34,7 +34,7 @@
 <codesample lang="ebuild">
 pkg_prerm()
 {
-    return
+	return
 }
 </codesample>
 </body>
@@ -45,8 +45,8 @@ pkg_prerm()
 <body>
 <codesample lang="ebuild">
 pkg_prerm() {
-    # clean up temp files
-    [[ -d "${ROOT}/var/tmp/foo" ]] &amp;&amp; rm -rf "${ROOT}/var/tmp/foo"
+	# clean up temp files
+	[[ -d "${ROOT}/var/tmp/foo" ]] &amp;&amp; rm -rf "${ROOT}/var/tmp/foo"
 }
 </codesample>
 </body>

diff --git a/ebuild-writing/functions/pkg_pretend/text.xml b/ebuild-writing/functions/pkg_pretend/text.xml
index f3a78f6..e0c454c 100644
--- a/ebuild-writing/functions/pkg_pretend/text.xml
+++ b/ebuild-writing/functions/pkg_pretend/text.xml
@@ -38,7 +38,7 @@
 <codesample lang="ebuild">
 pkg_pretend()
 {
-    return
+	return
 }
 </codesample>
 </body>

diff --git a/ebuild-writing/functions/pkg_setup/text.xml b/ebuild-writing/functions/pkg_setup/text.xml
index a7fe9d2..0304d3a 100644
--- a/ebuild-writing/functions/pkg_setup/text.xml
+++ b/ebuild-writing/functions/pkg_setup/text.xml
@@ -34,7 +34,7 @@
 <codesample lang="ebuild">
 pkg_setup()
 {
-    return
+	return
 }
 </codesample>
 </body>
@@ -45,19 +45,19 @@ pkg_setup()
 <body>
 <codesample lang="ebuild">
 pkg_setup() {
-    # We need to know which GUI we're building in several
-    # different places, so work it out here.
-    if use gtk ; then
-        if use gtk2 ; then
-            export mypkg_gui="gtk2"
-        else
-            export mypkg_gui="gtk1"
-        fi
-    elif use motif then
-        export mypkg_gui="motif"
-    else
-        export mypkg_gui="athena"
-    fi
+	# We need to know which GUI we're building in several
+	# different places, so work it out here.
+	if use gtk ; then
+		if use gtk2 ; then
+			export mypkg_gui="gtk2"
+		else
+			export mypkg_gui="gtk1"
+		fi
+	elif use motif then
+		export mypkg_gui="motif"
+	else
+		export mypkg_gui="athena"
+	fi
 }
 </codesample>
 </body>

diff --git a/ebuild-writing/functions/src_compile/build-environment/text.xml b/ebuild-writing/functions/src_compile/build-environment/text.xml
index 8c16587..9d2122e 100644
--- a/ebuild-writing/functions/src_compile/build-environment/text.xml
+++ b/ebuild-writing/functions/src_compile/build-environment/text.xml
@@ -69,9 +69,9 @@ remove.
 </p>
 
 <codesample lang="ebuild">
-    # -fomit-frame-pointer leads to nasty broken code on sparc thanks to a
-    # rather icky asm function
-    use sparc &amp;&amp; filter-flags -fomit-frame-pointer
+	# -fomit-frame-pointer leads to nasty broken code on sparc thanks to a
+	# rather icky asm function
+	use sparc &amp;&amp; filter-flags -fomit-frame-pointer
 </codesample>
 
 <p>
@@ -86,8 +86,8 @@ conservative set of flags.
 </p>
 
 <codesample lang="ebuild">
-    # Our app hates screwy flags
-    strip-flags
+	# Our app hates screwy flags
+	strip-flags
 </codesample>
 
 </body>
@@ -104,8 +104,8 @@ is most commonly used to replace <c>-Os</c> with <c>-O2</c>
 </p>
 
 <codesample lang="ebuild">
-    # Seems to have issues with -Os, switch to -O2
-    replace-flags -Os -O2
+	# Seems to have issues with -Os, switch to -O2
+	replace-flags -Os -O2
 </codesample>
 
 <p>
@@ -116,8 +116,8 @@ the flags to be replaced.
 </p>
 
 <codesample lang="ebuild">
-    # Can't use ultrasparc or ultrasparc3 code, drop to v9
-    replace-cpu-flags ultrasparc ultrasparc3 v9
+	# Can't use ultrasparc or ultrasparc3 code, drop to v9
+	replace-cpu-flags ultrasparc ultrasparc3 v9
 </codesample>
 
 </body>
@@ -133,11 +133,11 @@ functions can be used here.
 </p>
 
 <codesample lang="ebuild">
-    # If we're using selinux, we need to add a -D
-    use selinux &amp;&amp; append-flags "-DWITH_SELINUX"
+	# If we're using selinux, we need to add a -D
+	use selinux &amp;&amp; append-flags "-DWITH_SELINUX"
 
-    # Secure linking needed, since we're setuid root
-    append-ldflags -Wl,-z,now
+	# Secure linking needed, since we're setuid root
+	append-ldflags -Wl,-z,now
 </codesample>
 
 <p>

diff --git a/ebuild-writing/functions/src_compile/building/text.xml b/ebuild-writing/functions/src_compile/building/text.xml
index bed3dd7..679879a 100644
--- a/ebuild-writing/functions/src_compile/building/text.xml
+++ b/ebuild-writing/functions/src_compile/building/text.xml
@@ -53,14 +53,14 @@ example, with <c>sed</c>) to use <c>${CFLAGS}</c> or <c>${LDFLAGS}</c> correctly
 inherit flag-o-matic toolchain-funcs
 
 src_compile() {
-    # -Os not happy
-    replace-flags -Os -O2
+	# -Os not happy
+	replace-flags -Os -O2
 
-    # We have a weird build.sh to work with which ignores our
-    # compiler preferences. yay!
-    sed -i -e "s:cc -O2:$(tc-getCC) ${CFLAGS} ${LDFLAGS}:" build.sh \
-        || die "sed fix failed. Uh-oh..."
-    ./build.sh || die "Build failed!"
+	# We have a weird build.sh to work with which ignores our
+	# compiler preferences. yay!
+	sed -i -e "s:cc -O2:$(tc-getCC) ${CFLAGS} ${LDFLAGS}:" build.sh \
+		|| die "sed fix failed. Uh-oh..."
+	./build.sh || die "Build failed!"
 }
 </codesample>
 

diff --git a/ebuild-writing/functions/src_compile/no-build-system/text.xml b/ebuild-writing/functions/src_compile/no-build-system/text.xml
index d1ecef6..aef02ac 100644
--- a/ebuild-writing/functions/src_compile/no-build-system/text.xml
+++ b/ebuild-writing/functions/src_compile/no-build-system/text.xml
@@ -14,7 +14,7 @@ Here's an example, from <c>app-misc/hilite</c>:
 
 <codesample lang="ebuild">
 src_compile() {
-    $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o ${PN} ${P}.c || die
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o ${PN} ${P}.c || die
 }
 </codesample>
 
@@ -25,29 +25,29 @@ broken build system that doesn't actually work:
 
 <codesample lang="ebuild">
 src_compile() {
-    local x
-    for x in asclock parser symbols config
-    do
-        $(tc-getCC) \
-            ${CFLAGS} ${CPPFLAGS} \
-            -I/usr/include \
-            -Dlinux \
-            -D_POSIX_C_SOURCE=199309L \
-            -D_POSIX_SOURCE \
-            -D_XOPEN_SOURCE \
-            -D_BSD_SOURCE \
-            -D_SVID_SOURCE \
-            -DFUNCPROTO=15 \
-            -DNARROWPROTO \
-            -c -o ${x}.o ${x}.c || die "compile asclock failed"
-    done
-    $(tc-getCC) \
-        ${LDFLAGS} \
-        -o asclock \
-        asclock.o parser.o symbols.o config.o \
-        -L/usr/lib \
-        -L/usr/lib/X11 \
-        -lXpm -lXext -lX11 || die "link asclock failed"
+	local x
+	for x in asclock parser symbols config
+	do
+		$(tc-getCC) \
+			${CFLAGS} ${CPPFLAGS} \
+			-I/usr/include \
+			-Dlinux \
+			-D_POSIX_C_SOURCE=199309L \
+			-D_POSIX_SOURCE \
+			-D_XOPEN_SOURCE \
+			-D_BSD_SOURCE \
+			-D_SVID_SOURCE \
+			-DFUNCPROTO=15 \
+			-DNARROWPROTO \
+			-c -o ${x}.o ${x}.c || die "compile asclock failed"
+	done
+	$(tc-getCC) \
+		${LDFLAGS} \
+		-o asclock \
+		asclock.o parser.o symbols.o config.o \
+		-L/usr/lib \
+		-L/usr/lib/X11 \
+		-lXpm -lXext -lX11 || die "link asclock failed"
 }
 </codesample>
 

diff --git a/ebuild-writing/functions/src_compile/text.xml b/ebuild-writing/functions/src_compile/text.xml
index 89350cb..ef713aa 100644
--- a/ebuild-writing/functions/src_compile/text.xml
+++ b/ebuild-writing/functions/src_compile/text.xml
@@ -36,12 +36,12 @@
 <body>
 <codesample lang="ebuild">
 src_compile() {
-    if [ -x ./configure ]; then
-        econf
-    fi
-    if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-        emake || die "emake failed"
-    fi
+	if [ -x ./configure ]; then
+		econf
+	fi
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake || die "emake failed"
+	fi
 }
 </codesample>
 </body>
@@ -51,9 +51,9 @@ src_compile() {
 <body>
 <codesample lang="ebuild">
 src_compile() {
-    if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-        emake || die "emake failed"
-    fi
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake || die "emake failed"
+	fi
 }
 </codesample>
 </body>
@@ -69,14 +69,14 @@ src_compile() {
 <body>
 <codesample lang="ebuild">
 src_compile() {
-    use sparc &amp;&amp; filter-flags -fomit-frame-pointer
-    append-ldflags -Wl,-z,now
+	use sparc &amp;&amp; filter-flags -fomit-frame-pointer
+	append-ldflags -Wl,-z,now
 
-    econf \
-        $(use_enable ssl ) \
-        $(use_enable perl perlinterp )
+	econf \
+		$(use_enable ssl ) \
+		$(use_enable perl perlinterp )
 
-    emake || die "Make failed!"
+	emake || die "Make failed!"
 }
 </codesample>
 <note>

diff --git a/ebuild-writing/functions/src_configure/configuring/text.xml b/ebuild-writing/functions/src_configure/configuring/text.xml
index 4ae1101..a31dc4e 100644
--- a/ebuild-writing/functions/src_configure/configuring/text.xml
+++ b/ebuild-writing/functions/src_configure/configuring/text.xml
@@ -30,18 +30,18 @@ where appropriate, be used to generate these switches.
 
 <codesample lang="ebuild">
 src_configure() {
-    # We have optional perl, python and ruby support
-    econf \
-        $(use_enable perl ) \
-        $(use_enable python ) \
-        $(use_enable ruby )
+	# We have optional perl, python and ruby support
+	econf \
+		$(use_enable perl ) \
+		$(use_enable python ) \
+		$(use_enable ruby )
 }
 
 src_configure() {
-    # Our package optional IPv6 support which uses --with rather than
-    # --enable / --disable
+	# Our package optional IPv6 support which uses --with rather than
+	# --enable / --disable
 
-    econf $(use_with ipv6 )
+	econf $(use_with ipv6 )
 }
 </codesample>
 
@@ -54,17 +54,17 @@ argument forms:
 
 <codesample lang="ebuild">
 src_configure() {
-    # Our package has optional perl, python and ruby support
-    econf \
-        $(use_enable perl perlinterp ) \
-        $(use_enable python pythoninterp ) \
-        $(use_enable ruby rubyinterp )
+	# Our package has optional perl, python and ruby support
+	econf \
+		$(use_enable perl perlinterp ) \
+		$(use_enable python pythoninterp ) \
+		$(use_enable ruby rubyinterp )
 
-    # ...
+	# ...
 }
 
 src_configure() {
-    econf $(use_with X x11 )
+	econf $(use_with X x11 )
 }
 </codesample>
 

diff --git a/ebuild-writing/functions/src_configure/text.xml b/ebuild-writing/functions/src_configure/text.xml
index 0740309..5bc5803 100644
--- a/ebuild-writing/functions/src_configure/text.xml
+++ b/ebuild-writing/functions/src_configure/text.xml
@@ -38,8 +38,8 @@
 <codesample lang="ebuild">
 src_configure() {
 	if [[ -x ${ECONF_SOURCE:-.}/configure ]] ; then
-        econf
-    fi
+		econf
+	fi
 }
 </codesample>
 </body>
@@ -50,12 +50,12 @@ src_configure() {
 <body>
 <codesample lang="ebuild">
 src_configure() {
-    use sparc &amp;&amp; filter-flags -fomit-frame-pointer
-    append-ldflags -Wl,-z,now
+	use sparc &amp;&amp; filter-flags -fomit-frame-pointer
+	append-ldflags -Wl,-z,now
 
-    econf \
-        $(use_enable ssl ) \
-        $(use_enable perl perlinterp )
+	econf \
+		$(use_enable ssl ) \
+		$(use_enable perl perlinterp )
 }
 </codesample>
 </body>

diff --git a/ebuild-writing/functions/src_install/text.xml b/ebuild-writing/functions/src_install/text.xml
index a1746d9..308c718 100644
--- a/ebuild-writing/functions/src_install/text.xml
+++ b/ebuild-writing/functions/src_install/text.xml
@@ -38,7 +38,7 @@ following:
 <codesample lang="ebuild">
 src_install()
 {
-    return
+	return
 }
 </codesample>
 <p>
@@ -68,10 +68,10 @@ For EAPIs 6 and later, the default <c>src_install</c> function is the following:
 </p>
 <codesample lang="ebuild">
 src_install() {
-    if [[ -f Makefile ]] || [[ -f GNUmakefile ]] || [[ -f makefile ]] ; then
-        emake DESTDIR="${D}" install
-    fi
-    einstalldocs
+	if [[ -f Makefile ]] || [[ -f GNUmakefile ]] || [[ -f makefile ]] ; then
+		emake DESTDIR="${D}" install
+	fi
+	einstalldocs
 }
 </codesample>
 <important>The following examples assume EAPI 4 or later</important>
@@ -84,8 +84,8 @@ src_install() {
 
 <codesample lang="ebuild">
 src_install() {
-    emake DESTDIR="${D}" install
-    dodoc README CHANGES
+	emake DESTDIR="${D}" install
+	dodoc README CHANGES
 }
 </codesample>
 
@@ -102,7 +102,7 @@ install to a non-root location. If possible, this should be used:
 </p>
 
 <codesample lang="ebuild">
-    emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install
 </codesample>
 
 <note>
@@ -120,8 +120,8 @@ if you hit an error.
 </p>
 
 <codesample lang="ebuild">
-    einstall
-    dodoc README CHANGES
+	einstall
+	dodoc README CHANGES
 </codesample>
 
 <note>
@@ -146,8 +146,8 @@ compilation required) themes:
 </p>
 
 <codesample lang="ebuild">
-    dodir /usr/share/foo-styles/
-    cp -R "${S}/" "${D}/" || die "Install failed!"
+	dodir /usr/share/foo-styles/
+	cp -R "${S}/" "${D}/" || die "Install failed!"
 </codesample>
 
 <p>
@@ -158,52 +158,52 @@ upon the <c>sys-fs/udev</c> install:
 
 <codesample lang="ebuild">
 src_install() {
-    dobin udevinfo
-    dobin udevtest
-    into /
-    dosbin udev
-    dosbin udevd
-    dosbin udevsend
-    dosbin udevstart
-    dosbin extras/scsi_id/scsi_id
-    dosbin extras/volume_id/udev_volume_id
-
-    exeinto /etc/udev/scripts
-    doexe extras/ide-devfs.sh
-    doexe extras/scsi-devfs.sh
-    doexe extras/cdsymlinks.sh
-    doexe extras/dvb.sh
-
-    insinto /etc/udev
-    newins "${FILESDIR}/udev.conf.post_050" udev.conf
-    doins extras/cdsymlinks.conf
-
-    # For devfs style layout
-    insinto /etc/udev/rules.d/
-    newins etc/udev/gentoo/udev.rules 50-udev.rules
-
-    # scsi_id configuration
-    insinto /etc
-    doins extras/scsi_id/scsi_id.config
-
-    # set up symlinks in /etc/hotplug.d/default
-    dodir /etc/hotplug.d/default
-    dosym ../../../sbin/udevsend /etc/hotplug.d/default/10-udev.hotplug
-
-    # set up the /etc/dev.d directory tree
-    dodir /etc/dev.d/default
-    dodir /etc/dev.d/net
-    exeinto /etc/dev.d/net
-    doexe etc/dev.d/net/hotplug.dev
-
-    doman *.8
-    doman extras/scsi_id/scsi_id.8
-
-    dodoc ChangeLog FAQ HOWTO-udev_for_dev README TODO
-    dodoc docs/{overview,udev-OLS2003.pdf,udev_vs_devfs,RFC-dev.d,libsysfs.txt}
-    dodoc docs/persistent_naming/* docs/writing_udev_rules/*
-
-    newdoc extras/volume_id/README README_volume_id
+	dobin udevinfo
+	dobin udevtest
+	into /
+	dosbin udev
+	dosbin udevd
+	dosbin udevsend
+	dosbin udevstart
+	dosbin extras/scsi_id/scsi_id
+	dosbin extras/volume_id/udev_volume_id
+
+	exeinto /etc/udev/scripts
+	doexe extras/ide-devfs.sh
+	doexe extras/scsi-devfs.sh
+	doexe extras/cdsymlinks.sh
+	doexe extras/dvb.sh
+
+	insinto /etc/udev
+	newins "${FILESDIR}/udev.conf.post_050" udev.conf
+	doins extras/cdsymlinks.conf
+
+	# For devfs style layout
+	insinto /etc/udev/rules.d/
+	newins etc/udev/gentoo/udev.rules 50-udev.rules
+
+	# scsi_id configuration
+	insinto /etc
+	doins extras/scsi_id/scsi_id.config
+
+	# set up symlinks in /etc/hotplug.d/default
+	dodir /etc/hotplug.d/default
+	dosym ../../../sbin/udevsend /etc/hotplug.d/default/10-udev.hotplug
+
+	# set up the /etc/dev.d directory tree
+	dodir /etc/dev.d/default
+	dodir /etc/dev.d/net
+	exeinto /etc/dev.d/net
+	doexe etc/dev.d/net/hotplug.dev
+
+	doman *.8
+	doman extras/scsi_id/scsi_id.8
+
+	dodoc ChangeLog FAQ HOWTO-udev_for_dev README TODO
+	dodoc docs/{overview,udev-OLS2003.pdf,udev_vs_devfs,RFC-dev.d,libsysfs.txt}
+	dodoc docs/persistent_naming/* docs/writing_udev_rules/*
+
+	newdoc extras/volume_id/README README_volume_id
 }
 </codesample>
 

diff --git a/ebuild-writing/functions/src_prepare/epatch/text.xml b/ebuild-writing/functions/src_prepare/epatch/text.xml
index b873661..65386dd 100644
--- a/ebuild-writing/functions/src_prepare/epatch/text.xml
+++ b/ebuild-writing/functions/src_prepare/epatch/text.xml
@@ -29,10 +29,10 @@ fails. The following is taken from <c>app-misc/detox</c>:
 
 <codesample lang="ebuild">
 src_unpack() {
-    unpack ${A}
-    cd "${S}"
-    epatch "${FILESDIR}/${P}-destdir.patch"
-    epatch "${FILESDIR}/${P}-parallel_build.patch"
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-destdir.patch"
+	epatch "${FILESDIR}/${P}-parallel_build.patch"
 }
 </codesample>
 
@@ -49,10 +49,10 @@ be compressed). For example, from <c>app-admin/showconsole</c>:
 
 <codesample lang="ebuild">
 src_unpack() {
-    unpack ${A}
-    cd "${S}"
-    epatch "${WORKDIR}/${P}-suse-update.patch.bz2"
-    epatch "${FILESDIR}/${PV}-no-TIOCGDEV.patch"
+	unpack ${A}
+	cd "${S}"
+	epatch "${WORKDIR}/${P}-suse-update.patch.bz2"
+	epatch "${FILESDIR}/${PV}-no-TIOCGDEV.patch"
 }
 </codesample>
 <p>As stated before, if you are using EAPI >=2, you should apply the patches in the <uri link="::ebuild-writing/functions/src_prepare">src_prepare</uri> function</p>
@@ -85,10 +85,10 @@ A simple example:
 
 <codesample lang="ebuild">
 src_unpack() {
-    unpack ${A}
-    cd "${S}"
-    EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" \
-        EPATCH_FORCE="yes" epatch
+	unpack ${A}
+	cd "${S}"
+	EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" epatch
 }
 </codesample>
 

diff --git a/ebuild-writing/functions/src_prepare/text.xml b/ebuild-writing/functions/src_prepare/text.xml
index 932190e..2a30581 100644
--- a/ebuild-writing/functions/src_prepare/text.xml
+++ b/ebuild-writing/functions/src_prepare/text.xml
@@ -48,10 +48,10 @@ src_prepare() {
 <body>
 <codesample lang="ebuild">
 src_prepare() {
-    epatch "${FILESDIR}/${PV}/${P}-fix-bogosity.patch"
-    use pam &amp;&amp; epatch "${FILESDIR}/${PV}/${P}-pam.patch"
+	epatch "${FILESDIR}/${PV}/${P}-fix-bogosity.patch"
+	use pam &amp;&amp; epatch "${FILESDIR}/${PV}/${P}-pam.patch"
 
-    sed -i -e 's/"ispell"/"aspell"/' src/defaults.h || die "Sed failed!"
+	sed -i -e 's/"ispell"/"aspell"/' src/defaults.h || die "Sed failed!"
 }
 </codesample>
 </body>

diff --git a/ebuild-writing/functions/src_test/text.xml b/ebuild-writing/functions/src_test/text.xml
index 56dd113..135eb39 100644
--- a/ebuild-writing/functions/src_test/text.xml
+++ b/ebuild-writing/functions/src_test/text.xml
@@ -49,14 +49,14 @@ src_test() {
 <body>
 <codesample lang="ebuild">
 src_test() {
-    cd "${S}"/src/testdir || die
+	cd "${S}"/src/testdir || die
 
-    # Test 49 won't work inside a portage environment
-    sed -i -e 's~test49.out~~g' Makefile || die
+	# Test 49 won't work inside a portage environment
+	sed -i -e 's~test49.out~~g' Makefile || die
 
-    # Try to run the non-gui tests only
-    # pass -j1 if tests do not support being run in parallel
-    emake -j1 test-nongui
+	# Try to run the non-gui tests only
+	# pass -j1 if tests do not support being run in parallel
+	emake -j1 test-nongui
 }
 </codesample>
 </body>

diff --git a/ebuild-writing/functions/src_unpack/cvs-sources/text.xml b/ebuild-writing/functions/src_unpack/cvs-sources/text.xml
index b8ee2a4..6f00270 100644
--- a/ebuild-writing/functions/src_unpack/cvs-sources/text.xml
+++ b/ebuild-writing/functions/src_unpack/cvs-sources/text.xml
@@ -148,17 +148,17 @@ inherit cvs
 SRC_URI=""
 
 src_unpack() {
-    ECVS_SERVER="cvs.sourceforge.net:/cvsroot/vim"
-    ECVS_USER="anonymous"
-    ECVS_PASS=""
-    ECVS_AUTH="pserver"
-    if [[ $(get_major_version ) -ge 7 ]] ; then
-        ECVS_MODULE="vim7"
-    else
-        ECVS_MODULE="vim"
-    fi
-    ECVS_TOP_DIR="${DISTDIR}/cvs-src/${ECVS_MODULE}"
-    cvs_src_unpack
+	ECVS_SERVER="cvs.sourceforge.net:/cvsroot/vim"
+	ECVS_USER="anonymous"
+	ECVS_PASS=""
+	ECVS_AUTH="pserver"
+	if [[ $(get_major_version ) -ge 7 ]] ; then
+		ECVS_MODULE="vim7"
+	else
+		ECVS_MODULE="vim"
+	fi
+	ECVS_TOP_DIR="${DISTDIR}/cvs-src/${ECVS_MODULE}"
+	cvs_src_unpack
 }
 </codesample>
 

diff --git a/ebuild-writing/functions/src_unpack/rpm-sources/text.xml b/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
index 9382109..0142b2f 100644
--- a/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
+++ b/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
@@ -25,10 +25,10 @@ manner such as:
 
 <codesample lang="ebuild">
 src_unpack () {
-    rpm_src_unpack ${A}
-    cd "${S}"
+	rpm_src_unpack ${A}
+	cd "${S}"
 
-    use ssl &amp;&amp; epatch "${FILESDIR}/${PV}/${P}-ssl.patch"
+	use ssl &amp;&amp; epatch "${FILESDIR}/${PV}/${P}-ssl.patch"
 }
 </codesample>
 
@@ -83,10 +83,10 @@ RESTRICT="mirror"
 S=${WORKDIR}/fetchmail-$(get_version_component_range 1-3)
 
 src_unpack () {
-    rpm_src_unpack ${A}
-    cd "${S}"
-    EPATCH_SOURCE="${WORKDIR}" EPATCH_SUFFIX="patch" \
-        EPATCH_FORCE="yes" epatch
+	rpm_src_unpack ${A}
+	cd "${S}"
+	EPATCH_SOURCE="${WORKDIR}" EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" epatch
 }
 </codesample>
 

diff --git a/ebuild-writing/functions/src_unpack/text.xml b/ebuild-writing/functions/src_unpack/text.xml
index 542b3fb..a964a74 100644
--- a/ebuild-writing/functions/src_unpack/text.xml
+++ b/ebuild-writing/functions/src_unpack/text.xml
@@ -33,9 +33,9 @@
 <body>
 <codesample lang="ebuild">
 src_unpack() {
-    if [ "${A}" != "" ]; then
-        unpack ${A}
-    fi
+	if [ "${A}" != "" ]; then
+		unpack ${A}
+	fi
 }
 </codesample>
 </body>
@@ -46,13 +46,13 @@ src_unpack() {
 <body>
 <codesample lang="ebuild">
 src_unpack() {
-    unpack ${A}
-    cd "${S}"
+	unpack ${A}
+	cd "${S}"
 
-    epatch "${FILESDIR}/${PV}/${P}-fix-bogosity.patch"
-    use pam &amp;&amp; epatch "${FILESDIR}/${PV}/${P}-pam.patch"
+	epatch "${FILESDIR}/${PV}/${P}-fix-bogosity.patch"
+	use pam &amp;&amp; epatch "${FILESDIR}/${PV}/${P}-pam.patch"
 
-    sed -i -e 's/"ispell"/"aspell"/' src/defaults.h || die "Sed failed!"
+	sed -i -e 's/"ispell"/"aspell"/' src/defaults.h || die "Sed failed!"
 }
 </codesample>
 <note>

diff --git a/ebuild-writing/messages/text.xml b/ebuild-writing/messages/text.xml
index 1012edf..f8b81d6 100644
--- a/ebuild-writing/messages/text.xml
+++ b/ebuild-writing/messages/text.xml
@@ -45,9 +45,9 @@ with a green asterisk.  On earlier versions, elog behaves just like einfo.
 
 <codesample lang="ebuild">
 pkg_postinst() {
-    elog "You will need to set up your /etc/foo/foo.conf file before"
-    elog "running foo for the first time. For details, please see the"
-    elog "foo.conf(5) manual page."
+	elog "You will need to set up your /etc/foo/foo.conf file before"
+	elog "running foo for the first time. For details, please see the"
+	elog "foo.conf(5) manual page."
 }
 </codesample>
 
@@ -61,8 +61,8 @@ logged by default.
 
 <codesample lang="ebuild">
 src_compile() {
-    einfo "Starting a silent compile that takes hours."
-    ./build
+	einfo "Starting a silent compile that takes hours."
+	./build
 }
 </codesample>
 
@@ -129,7 +129,7 @@ Here is an example of a bad message:
 <codesample lang="ebuild">
 i=10
 while ((i--)) ; do
-    ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
+	ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
 done
 </codesample>
 

diff --git a/ebuild-writing/use-conditional-code/text.xml b/ebuild-writing/use-conditional-code/text.xml
index bc95f84..b949fc0 100644
--- a/ebuild-writing/use-conditional-code/text.xml
+++ b/ebuild-writing/use-conditional-code/text.xml
@@ -25,25 +25,25 @@ statement. See <uri link="::ebuild-writing/error-handling/#die and Subshells"/>.
 </note>
 
 <codesample lang="ebuild">
-    # USE conditional blocks...
-    if use livecd ; then
-        # remove some extra files for a small livecd install
-        rm -fr "${vimfiles}"/{compiler,doc,ftplugin,indent}
-    fi
+	# USE conditional blocks...
+	if use livecd ; then
+		# remove some extra files for a small livecd install
+		rm -fr "${vimfiles}"/{compiler,doc,ftplugin,indent}
+	fi
 
-    # Inverse USE conditional blocks...
-    if ! use cscope ; then
-        # the --disable-cscope configure arg doesn't quite work properly,
-        # so sed it out of feature.h if we're not USEing cscope.
-        sed -i -e '/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
-    fi
+	# Inverse USE conditional blocks...
+	if ! use cscope ; then
+		# the --disable-cscope configure arg doesn't quite work properly,
+		# so sed it out of feature.h if we're not USEing cscope.
+		sed -i -e '/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
+	fi
 
-    # USE conditional statements...
-    use ssl &amp;&amp; epatch "${FILESDIR}/${P}-ssl.patch"
-    use sparc &amp;&amp; filter-flags -fomit-frame-pointer
+	# USE conditional statements...
+	use ssl &amp;&amp; epatch "${FILESDIR}/${P}-ssl.patch"
+	use sparc &amp;&amp; filter-flags -fomit-frame-pointer
 
-    # Inverse USE conditional statements...
-    use ncurses || epatch "${FILESDIR}/${P}-no-ncurses.patch"
+	# Inverse USE conditional statements...
+	use ncurses || epatch "${FILESDIR}/${P}-no-ncurses.patch"
 </codesample>
 
 <p>

diff --git a/ebuild-writing/using-eclasses/text.xml b/ebuild-writing/using-eclasses/text.xml
index 133e6a9..912e330 100644
--- a/ebuild-writing/using-eclasses/text.xml
+++ b/ebuild-writing/using-eclasses/text.xml
@@ -48,7 +48,7 @@ SLOT="0"
 KEYWORDS="alpha ~amd64 ~x86 ~x86-fbsd"
 
 RDEPEND=">=sys-libs/ncurses-5.2
-    >=sys-libs/readline-4.1"
+	>=sys-libs/readline-4.1"
 DEPEND="${RDEPEND}"
 
 src_prepare() {

diff --git a/ebuild-writing/variables/text.xml b/ebuild-writing/variables/text.xml
index 5c800ad..66efdb7 100644
--- a/ebuild-writing/variables/text.xml
+++ b/ebuild-writing/variables/text.xml
@@ -337,10 +337,10 @@ packages <d/> downloading sparc binaries on ppc would be a waste of bandwidth.
 
 <codesample lang="ebuild">
 SRC_URI="http://example.com/files/${P}-core.tar.bz2
-    x86?   ( http://example.com/files/${P}/${P}-sse-asm.tar.bz2 )
-    ppc?   ( http://example.com/files/${P}/${P}-vmx-asm.tar.bz2 )
-    sparc? ( http://example.com/files/${P}/${P}-vis-asm.tar.bz2 )
-    doc?   ( http://example.com/files/${P}/${P}-docs.tar.bz2 )"
+	x86?   ( http://example.com/files/${P}/${P}-sse-asm.tar.bz2 )
+	ppc?   ( http://example.com/files/${P}/${P}-vmx-asm.tar.bz2 )
+	sparc? ( http://example.com/files/${P}/${P}-vis-asm.tar.bz2 )
+	doc?   ( http://example.com/files/${P}/${P}-docs.tar.bz2 )"
 </codesample>
 
 <p>
@@ -351,13 +351,13 @@ generally to install <e>all</e> available components.
 
 <codesample lang="ebuild">
 SRC_URI="http://example.com/files/${P}-core.tar.bz2
-        examplecards_foo?  ( http://example.com/files/${P}-foo.tar.bz2 )
-        examplecards_bar?  ( http://example.com/files/${P}-bar.tar.bz2 )
-        examplecards_baz?  ( http://example.com/files/${P}-baz.tar.bz2 )
-        !examplecards_foo? ( !examplecards_bar? ( !examplecards_baz? (
-            http://example.com/files/${P}-foo.tar.bz2
-            http://example.com/files/${P}-bar.tar.bz2
-            http://example.com/files/${P}-baz.tar.bz2 ) ) )"
+	examplecards_foo?  ( http://example.com/files/${P}-foo.tar.bz2 )
+	examplecards_bar?  ( http://example.com/files/${P}-bar.tar.bz2 )
+	examplecards_baz?  ( http://example.com/files/${P}-baz.tar.bz2 )
+	!examplecards_foo? ( !examplecards_bar? ( !examplecards_baz? (
+		http://example.com/files/${P}-foo.tar.bz2
+		http://example.com/files/${P}-bar.tar.bz2
+		http://example.com/files/${P}-baz.tar.bz2 ) ) )"
 </codesample>
 
 </body>

diff --git a/eclass-writing/text.xml b/eclass-writing/text.xml
index 9064616..db7d9f1 100644
--- a/eclass-writing/text.xml
+++ b/eclass-writing/text.xml
@@ -627,11 +627,11 @@ a single function, <c>domacosapp</c>.
 # [new-file] is given, it will be used as the new (installed) name of
 # the file. Otherwise &lt;app-file&gt; is installed as-is.
 domacosapp() {
-    [[ -z "${1}" ]] &amp;&amp; die "usage: domacosapp &lt;file&gt; [new file]"
-    if use ppc-macos ; then
-        insinto /Applications
-        newins "$1" "${2:-${1}}" || die "Failed to install ${1}"
-    fi
+	[[ -z "${1}" ]] &amp;&amp; die "usage: domacosapp &lt;file&gt; [new file]"
+	if use ppc-macos ; then
+		insinto /Applications
+		newins "$1" "${2:-${1}}" || die "Failed to install ${1}"
+	fi
 }
 </codesample>
 
@@ -667,7 +667,7 @@ eclass-defined defaults <d/> for example, say we had <c>fnord.eclass</c>:
 EXPORT_FUNCTIONS src_compile
 
 fnord_src_compile() {
-    do_stuff || die
+	do_stuff || die
 }
 </codesample>
 
@@ -679,9 +679,9 @@ Then an ebuild could do this:
 inherit fnord.eclass
 
 src_compile() {
-    do_pre_stuff || die
-    fnord_src_compile
-    do_post_stuff || die
+	do_pre_stuff || die
+	fnord_src_compile
+	do_post_stuff || die
 }
 </codesample>
 
@@ -722,7 +722,7 @@ DEPEND="&gt;=sys-devel/jmake-2"
 # Passes all arguments through to the appropriate &quot;jmake configure&quot;
 # command.
 jmake-configure() {
-    jmake configure --prefix=/usr "$@"
+	jmake configure --prefix=/usr "$@"
 }
 
 # @FUNCTION: jmake-build
@@ -731,15 +731,15 @@ jmake-configure() {
 # First builds all dependencies, and then passes through its arguments
 # to the appropriate &quot;jmake build&quot; command.
 jmake-build() {
-    jmake dep &amp;&amp; jmake build "$@"
+	jmake dep &amp;&amp; jmake build "$@"
 }
 
 # @FUNCTION: jmake-src_compile
 # @DESCRIPTION:
 # Calls jmake-configure() and jmake-build() to compile a jmake project.
 jmake_src_compile() {
-    jmake-configure || die "configure failed"
-    jmake-build || die "build failed"
+	jmake-configure || die "configure failed"
+	jmake-build || die "build failed"
 }
 </codesample>
 
@@ -769,8 +769,8 @@ for an eclass to invoke die from the global scope.  For example:
 # @BLURB: Calls die when used with an invalid EAPI.
 
 case ${EAPI:-0} in
-  0) die "this eclass doesn't support EAPI 0" ;;
-  *) ;;
+	0) die "this eclass doesn't support EAPI 0" ;;
+	*) ;;
 esac
 </codesample>
 </body>

diff --git a/general-concepts/autotools/text.xml b/general-concepts/autotools/text.xml
index 554943a..beb3ff6 100644
--- a/general-concepts/autotools/text.xml
+++ b/general-concepts/autotools/text.xml
@@ -129,18 +129,18 @@ EAPI=5
 inherit autotools
 
 src_prepare() {
-    # Remove problematic LDFLAGS declaration
-    sed -i -e '/^LDFLAGS/d' src/Makefile.am || die
+	# Remove problematic LDFLAGS declaration
+	sed -i -e '/^LDFLAGS/d' src/Makefile.am || die
 
-    # Rerun autotools
-    einfo "Regenerating autotools files..."
-    WANT_AUTOCONF=2.5 eautoconf
-    WANT_AUTOMAKE=1.9 eautomake
+	# Rerun autotools
+	einfo "Regenerating autotools files..."
+	WANT_AUTOCONF=2.5 eautoconf
+	WANT_AUTOMAKE=1.9 eautomake
 }
 
 src_compile() {
-    econf $(use_enable nls)
-    emake
+	econf $(use_enable nls)
+	emake
 }
 </codesample>
 

diff --git a/general-concepts/dependencies/text.xml b/general-concepts/dependencies/text.xml
index 7c8caeb..e43390c 100644
--- a/general-concepts/dependencies/text.xml
+++ b/general-concepts/dependencies/text.xml
@@ -104,8 +104,8 @@ A basic <c>DEPEND</c> specification might look like the following:
 
 <codesample lang="ebuild">
 DEPEND="dev-lang/ruby
-    dev-ruby/ruby-gtk2
-    dev-ruby/mysql-ruby"
+	dev-ruby/ruby-gtk2
+	dev-ruby/mysql-ruby"
 </codesample>
 
 <p>
@@ -308,7 +308,7 @@ the package name, where 'SLOT' is the <c>SLOT</c> of the package wanted:
 
 <codesample lang="ebuild">
 DEPEND="qt3? ( x11-libs/qt:3 )
-    gtk? ( x11-libs/gtk+:2 )
+	gtk? ( x11-libs/gtk+:2 )
 </codesample>
 
 <p>
@@ -317,7 +317,7 @@ To depend on a specific version or version-range within a SLOT we use:
 
 <codesample lang="ebuild">
 DEPEND="qt3? ( ~x11-libs/qt-3.3.8:3 )
-    gtk? ( >=x11-libs/gtk+-2.24.9:2 )
+	gtk? ( >=x11-libs/gtk+-2.24.9:2 )
 </codesample>
 
 <subsection>
@@ -353,7 +353,7 @@ For example:
 
 <codesample lang="ebuild">
 RDEPEND="media-libs/cogl:1.0=
-    gnutls? ( &gt;=net-libs/gnutls-2.8:= )"
+	gnutls? ( &gt;=net-libs/gnutls-2.8:= )"
 </codesample>
 
 </body>
@@ -372,8 +372,8 @@ To depend upon a certain package if and only if a given <c>USE</c> flag is set:
 
 <codesample lang="ebuild">
 DEPEND="perl? ( dev-lang/perl )
-    ruby? ( &gt;=dev-lang/ruby-1.8 )
-    python? ( dev-lang/python )"
+	ruby? ( &gt;=dev-lang/ruby-1.8 )
+	python? ( dev-lang/python )"
 </codesample>
 
 <p>
@@ -398,20 +398,20 @@ This can be nested:
 
 <codesample lang="ebuild">
 DEPEND="!build? (
-    gcj? (
-        gtk? (
-            x11-libs/libXt
-            x11-libs/libX11
-            x11-libs/libXtst
-            x11-proto/xproto
-            x11-proto/xextproto
-            >=x11-libs/gtk+-2.2
-            x11-libs/pango
-        )
-        >=media-libs/libart_lgpl-2.1
-    )
-    >=sys-libs/ncurses-5.2-r2
-    nls? ( sys-devel/gettext )
+	gcj? (
+		gtk? (
+			x11-libs/libXt
+			x11-libs/libX11
+			x11-libs/libXtst
+			x11-proto/xproto
+			x11-proto/xextproto
+			>=x11-libs/gtk+-2.2
+			x11-libs/pango
+		)
+		>=media-libs/libart_lgpl-2.1
+	)
+	>=sys-libs/ncurses-5.2-r2
+	nls? ( sys-devel/gettext )
 )"
 </codesample>
 
@@ -564,7 +564,7 @@ following, which should be used instead:
 
 <codesample lang="ebuild">
 DEPEND="use-flag?  ( app-misc/foo )
-    !use-flag? ( app-misc/bar )"
+	!use-flag? ( app-misc/bar )"
 </codesample>
 
 <p>

diff --git a/general-concepts/portage-cache/text.xml b/general-concepts/portage-cache/text.xml
index f185f62..f985d56 100644
--- a/general-concepts/portage-cache/text.xml
+++ b/general-concepts/portage-cache/text.xml
@@ -18,9 +18,9 @@ So, the following will not work:
 <codesample lang="ebuild">
 # DO NOT DO THIS!
 if ! has_version "x11-libs/gtk+" ; then
-    DEPEND="${DEPEND}
-            gtk?  ( >=x11-libs/gtk+-2 )
-            !gtk? ( =x11-libs/gtk+-1.2* )"
+	DEPEND="${DEPEND}
+		gtk?  ( >=x11-libs/gtk+-2 )
+		!gtk? ( =x11-libs/gtk+-1.2* )"
 fi
 </codesample>
 
@@ -33,17 +33,17 @@ However, this is legal, since <c>versionator.eclass</c> works upon <c>PV</c>, an
 inherit versionator
 
 if [[ $(get_major_version) -ge 7 ]] ; then
-    IUSE="${IUSE} tcltk mzscheme"
-    DEPEND="${DEPEND}
-        tcltk?    ( dev-lang/tcl )
-        mzscheme? ( dev-lisp/mzscheme )"
-    RDEPEND="${RDEPEND}
-        tcltk?    ( dev-lang/tcl )
-        mzscheme? ( dev-lisp/mzscheme )"
+	IUSE="${IUSE} tcltk mzscheme"
+	DEPEND="${DEPEND}
+		tcltk?    ( dev-lang/tcl )
+		mzscheme? ( dev-lisp/mzscheme )"
+	RDEPEND="${RDEPEND}
+		tcltk?    ( dev-lang/tcl )
+		mzscheme? ( dev-lisp/mzscheme )"
 
-    if [[ "${MY_PN}" != "vim-core" ]] ; then
-        RDEPEND="${RDEPEND} !&lt;app-vim/align-30-r1"
-    fi
+	if [[ "${MY_PN}" != "vim-core" ]] ; then
+		RDEPEND="${RDEPEND} !&lt;app-vim/align-30-r1"
+	fi
 fi
 </codesample>
 </body>
@@ -65,7 +65,7 @@ do:
 
 <codesample lang="ebuild">
 if [[ "${PN##*-}" == "cvs" ]] ; then
-    inherit cvs
+	inherit cvs
 fi
 </codesample>
 

diff --git a/general-concepts/use-flags/text.xml b/general-concepts/use-flags/text.xml
index 4728d0f..88da628 100644
--- a/general-concepts/use-flags/text.xml
+++ b/general-concepts/use-flags/text.xml
@@ -192,21 +192,21 @@ RDEPEND="fakemedia? ( >=media-libs/fakemedia-1-1 )"
 
 <codesample lang="ebuild">
 src_compile() {
-    local myconf
+	local myconf
 
-    if use ssl &amp;&amp; use gnutls ; then
-        myconf="${myconf} --enable-ssl --with-ssl=gnutls"
-    elif use ssl &amp;&amp; ! use gnutls ; then
-        myconf="${myconf} --enable-ssl --with-ssl=openssl"
-    else
-        myconf="${myconf} --disable-ssl"
-    fi
+	if use ssl &amp;&amp; use gnutls ; then
+		myconf="${myconf} --enable-ssl --with-ssl=gnutls"
+	elif use ssl &amp;&amp; ! use gnutls ; then
+		myconf="${myconf} --enable-ssl --with-ssl=openssl"
+	else
+	myconf="${myconf} --disable-ssl"
+	fi
 
-    econf \
-        # Other stuff
-        ${myconf}
+	econf \
+		# Other stuff
+		${myconf}
 
-    emake || die "make failed"
+	emake || die "make failed"
 }
 </codesample>
 

diff --git a/general-concepts/user-environment/text.xml b/general-concepts/user-environment/text.xml
index b7a0926..d28b844 100644
--- a/general-concepts/user-environment/text.xml
+++ b/general-concepts/user-environment/text.xml
@@ -30,10 +30,10 @@ The simplest way to unset all locale-related variables is:
 
 <codesample lang="ebuild">
 pkg_setup() {
-    # Unset all locale related variables, they can make the
-    # build fail.
+	# Unset all locale related variables, they can make the
+	# build fail.
 
-    eval unset ${!LC_*} LANG
+	eval unset ${!LC_*} LANG
 }
 </codesample>
 </body>

diff --git a/quickstart/text.xml b/quickstart/text.xml
index b9bc7aa..a8c1752 100644
--- a/quickstart/text.xml
+++ b/quickstart/text.xml
@@ -48,13 +48,13 @@ SLOT="0"
 KEYWORDS="~mips ~sparc ~x86"
 
 src_configure() {
-    econf --with-posix-regex
+	econf --with-posix-regex
 }
 
 src_install() {
-    emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install
 
-    dodoc FAQ NEWS README
+	dodoc FAQ NEWS README
 }
 </codesample>
 </body>
@@ -219,16 +219,16 @@ KEYWORDS="~hppa ~mips sparc x86"
 
 RDEPEND="dev-libs/popt"
 DEPEND="${RDEPEND}
-    sys-devel/flex
-    sys-devel/bison"
+	sys-devel/flex
+	sys-devel/bison"
 
 src_configure() {
-    econf --with-popt
+	econf --with-popt
 }
 
 src_install() {
-    emake DESTDIR="${D}" install
-    dodoc README CHANGES
+	emake DESTDIR="${D}" install
+	dodoc README CHANGES
 }
 </codesample>
 
@@ -285,21 +285,21 @@ KEYWORDS="~hppa ~mips ~sparc ~x86"
 
 RDEPEND="dev-libs/popt"
 DEPEND="${RDEPEND}
-    sys-devel/flex
-    sys-devel/bison"
+	sys-devel/flex
+	sys-devel/bison"
 
 src_prepare() {
-    epatch "${FILESDIR}"/${P}-destdir.patch \
-        "${FILESDIR}"/${P}-parallel_build.patch
+	epatch "${FILESDIR}"/${P}-destdir.patch \
+		"${FILESDIR}"/${P}-parallel_build.patch
 }
 
 src_configure() {
-    econf --with-popt
+	econf --with-popt
 }
 
 src_install() {
-    emake DESTDIR="${D}" install
-    dodoc README CHANGES
+	emake DESTDIR="${D}" install
+	dodoc README CHANGES
 }
 </codesample>
 
@@ -342,11 +342,11 @@ IUSE="nls"
 DEPEND="!sys-libs/glibc"
 
 src_configure() {
-    econf $(use_enable nls)
+	econf $(use_enable nls)
 }
 
 src_install() {
-    emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install
 }
 </codesample>
 
@@ -385,42 +385,42 @@ KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="crypt imlib ipv6 ldap nls pda ssl xface"
 
 RDEPEND="=x11-libs/gtk+-2*
-    crypt? ( >=app-crypt/gpgme-0.4.5 )
-    imlib? ( media-libs/imlib2 )
-    ldap? ( >=net-nds/openldap-2.0.11 )
-    pda? ( app-pda/jpilot )
-    ssl? ( dev-libs/openssl )
-    xface? ( >=media-libs/compface-1.4 )
-    app-misc/mime-types
-    x11-misc/shared-mime-info"
+	crypt? ( >=app-crypt/gpgme-0.4.5 )
+	imlib? ( media-libs/imlib2 )
+	ldap? ( >=net-nds/openldap-2.0.11 )
+	pda? ( app-pda/jpilot )
+	ssl? ( dev-libs/openssl )
+	xface? ( >=media-libs/compface-1.4 )
+	app-misc/mime-types
+	x11-misc/shared-mime-info"
 DEPEND="${RDEPEND}
-    dev-util/pkgconfig
-    nls? ( >=sys-devel/gettext-0.12.1 )"
+	dev-util/pkgconfig
+	nls? ( >=sys-devel/gettext-0.12.1 )"
 
 src_prepare() {
-    epatch "${FILESDIR}"/${PN}-namespace.diff \
-        "${FILESDIR}"/${PN}-procmime.diff
+	epatch "${FILESDIR}"/${PN}-namespace.diff \
+		"${FILESDIR}"/${PN}-procmime.diff
 }
 
 src_configure() {
-    econf \
-        $(use_enable nls) \
-        $(use_enable ssl) \
-        $(use_enable crypt gpgme) \
-        $(use_enable pda jpilot) \
-        $(use_enable ldap) \
-        $(use_enable ipv6) \
-        $(use_enable imlib) \
-        $(use_enable xface compface)
+	econf \
+		$(use_enable nls) \
+		$(use_enable ssl) \
+		$(use_enable crypt gpgme) \
+		$(use_enable pda jpilot) \
+		$(use_enable ldap) \
+		$(use_enable ipv6) \
+		$(use_enable imlib) \
+		$(use_enable xface compface)
 }
 
 src_install() {
-    emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install
 
-    doicon sylpheed.png
-    domenu sylpheed.desktop
+	doicon sylpheed.png
+	domenu sylpheed.desktop
 
-    dodoc [A-Z][A-Z]* ChangeLog*
+	dodoc [A-Z][A-Z]* ChangeLog*
 }
 </codesample>
 

diff --git a/tasks-reference/completion/text.xml b/tasks-reference/completion/text.xml
index 5d31211..fd36099 100644
--- a/tasks-reference/completion/text.xml
+++ b/tasks-reference/completion/text.xml
@@ -162,20 +162,20 @@ the following can be used as a template for creating new completion functions:
 
 <codesample lang="ebuild" numbering="lines">
 _foo() {
-    local cur prev opts
-    COMPREPLY=()
-    cur="${COMP_WORDS[COMP_CWORD]}"
-    prev="${COMP_WORDS[COMP_CWORD-1]}"
-    opts=""
+	local cur prev opts
+	COMPREPLY=()
+	cur="${COMP_WORDS[COMP_CWORD]}"
+	prev="${COMP_WORDS[COMP_CWORD-1]}"
+	opts=""
 
-    if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
-        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
-        return 0
-    fi
+	if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
+		COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+		return 0
+	fi
 
-    case "${prev}" in
-      # ...
-    esac
+	case "${prev}" in
+		# ...
+	esac
 }
 complete -F _foo foo
 </codesample>
@@ -272,9 +272,9 @@ complete -F _foo foo
       (and -f for short) that takes any kind file, you could do:
       <codesample lang="ebuild">
 case "${prev}" in
-    -f|--file)
-        COMPREPLY=( $(compgen -f ? ${cur}) )
-        ;;
+	-f|--file)
+		COMPREPLY=( $(compgen -f ? ${cur}) )
+	;;
 esac</codesample>
     </ti>
   </tr>

diff --git a/tools-reference/bash/text.xml b/tools-reference/bash/text.xml
index 053f6c3..8071ce0 100644
--- a/tools-reference/bash/text.xml
+++ b/tools-reference/bash/text.xml
@@ -23,7 +23,7 @@ The basic conditional operator is the <c>if</c> statement:
 
 <codesample lang="ebuild">
 if something ; then
-    do_stuff
+	do_stuff
 fi
 </codesample>
 
@@ -40,13 +40,13 @@ Multiple pronged selection can be done using <c>else</c> and <c>elif</c>:
 
 <codesample lang="ebuild">
 if something ; then
-    do_stuff
+	do_stuff
 elif something_else ; then
-    do_other_stuff
+	do_other_stuff
 elif full_moon ; then
-    howl
+	howl
 else
-    turn_into_a_newt
+	turn_into_a_newt
 fi
 </codesample>
 
@@ -57,10 +57,10 @@ following will <b>not</b> work:
 
 <codesample lang="ebuild">
 if some_stuff ; then
-    # A statement is required here. a blank or a comment
-    # isn't enough!
+	# A statement is required here. a blank or a comment
+	# isn't enough!
 else
-    einfo "Not some stuff"
+	einfo "Not some stuff"
 fi
 </codesample>
 
@@ -71,10 +71,10 @@ If you really don't want to restructure the block, you can use a single colon
 
 <codesample lang="ebuild">
 if some_stuff ; then
-    # Do nothing
-    :
+	# Do nothing
+	:
 else
-    einfo "Not some stuff"
+	einfo "Not some stuff"
 fi
 </codesample>
 
@@ -93,17 +93,17 @@ needed.
 <codesample lang="ebuild">
 # is $foo zero length?
 if [[ -z "${foo}" ]] ; then
-    die "Please set foo"
+	die "Please set foo"
 fi
 
 # is $foo equal to "moo"?
 if [[ "${foo}" == "moo" ]] ; then
-    einfo "Hello Larry"
+	einfo "Hello Larry"
 fi
 
 # does "${ROOT}/etc/deleteme" exist?
 if [[ -f "${ROOT}/etc/deleteme" ]] ; then
-    einfo "Please delete ${ROOT}/etc/readme manually!"
+	einfo "Please delete ${ROOT}/etc/readme manually!"
 fi
 </codesample>
 
@@ -632,7 +632,7 @@ task upon multiple items.
 
 <codesample lang="ebuild">
 for myvar in "the first" "the second" "and the third" ; do
-    einfo "This is ${myvar}"
+	einfo "This is ${myvar}"
 done
 </codesample>
 
@@ -643,7 +643,7 @@ event a given number of times.
 
 <codesample lang="ebuild">
 for (( i = 1 ; i &lt;= 10 ; i++ )) ; do
-    einfo "i is ${i}"
+	einfo "i is ${i}"
 done
 </codesample>
 
@@ -654,7 +654,7 @@ ebuilds.
 
 <codesample lang="ebuild">
 while hungry ; do
-    eat_cookies
+	eat_cookies
 done
 </codesample>
 
@@ -664,7 +664,7 @@ This is most commonly used to iterate over lines in a file:
 
 <codesample lang="ebuild">
 while read myline ; do
-    einfo "It says ${myline}"
+	einfo "It says ${myline}"
 done &lt; some_file
 </codesample>
 

diff --git a/tools-reference/cat/text.xml b/tools-reference/cat/text.xml
index 7b13468..f2f38b7 100644
--- a/tools-reference/cat/text.xml
+++ b/tools-reference/cat/text.xml
@@ -50,12 +50,12 @@ On the other hand, <c>cat</c> is exceptionally useful for so-called
 
 <codesample lang="ebuild">
 src_install() {
-    # ...
-    cat &lt;&lt;- EOF &gt; "${D}/etc/mail/trusted-users" || die
-        # trusted-users - users that can send mail as others without a warning
-        # apache, mailman, majordomo, uucp are good candidates
-    EOF
-    # ...
+	# ...
+	cat &lt;&lt;- EOF &gt; "${D}/etc/mail/trusted-users" || die
+		# trusted-users - users that can send mail as others without a warning
+		# apache, mailman, majordomo, uucp are good candidates
+	EOF
+	# ...
 }
 </codesample>
 

diff --git a/tools-reference/find/text.xml b/tools-reference/find/text.xml
index 8601a51..a7ab55c 100644
--- a/tools-reference/find/text.xml
+++ b/tools-reference/find/text.xml
@@ -137,7 +137,7 @@ and spaces in their names:
 
 <codesample lang="ebuild">
 for f in $(find "${S}" -type f) ; do
-    einfo "Doing unholy things to ${f}"
+	einfo "Doing unholy things to ${f}"
 done
 </codesample>
 
@@ -150,7 +150,7 @@ to <c>while</c> and <c>read</c> for changing the delimiter):
 
 <codesample lang="ebuild">
 while IFS="" read -d $'\0' -r f ; do
-    einfo "Calling down holy vengance upon ${f}"
+	einfo "Calling down holy vengance upon ${f}"
 done &lt; &lt;(find "${S}" -type f -print0)
 </codesample>
 

diff --git a/tools-reference/sed/text.xml b/tools-reference/sed/text.xml
index 1b01b02..02c8c32 100644
--- a/tools-reference/sed/text.xml
+++ b/tools-reference/sed/text.xml
@@ -15,7 +15,7 @@ doing this is via <c>sed</c>:
 # This plugin is mapped to the 'h' key by default, which conflicts with some
 # other mappings. Change it to use 'H' instead.
 sed -i 's/\(noremap &lt;buffer&gt; \)h/\1H/' info.vim \
-    || die 'sed failed'
+	|| die 'sed failed'
 </codesample>
 
 <p>
@@ -30,9 +30,9 @@ be set to <c>r0</c> if we don't have a <c>-r</c> component in our version.
 # for the line in version.h.in which contains "__fluxbox_version" and append
 # our content to it.
 if [[ "${PR}" == "r0" ]] ; then
-    suffix="gentoo"
+	suffix="gentoo"
 else
-    suffix="gentoo-${PR}"
+	suffix="gentoo-${PR}"
 fi
 sed -i \
     -e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
@@ -50,11 +50,11 @@ from the plugin files and convert it to Vim help format.
 # problems for us during the unmerge. Fortunately, sed can fix this
 # for us. First, we extract the documentation:
 sed -e '1,/^" HelpExtractorDoc:$/d' \
-    "${S}"/plugin/ZoomWin.vim > ${S}/doc/ZoomWin.txt \
-    || die "help extraction failed"
+	"${S}"/plugin/ZoomWin.vim > ${S}/doc/ZoomWin.txt \
+	|| die "help extraction failed"
 # Then we remove the help extraction code from the plugin file:
 sed -i -e '/^" HelpExtractor:$/,$d' "${S}"/plugin/ZoomWin.vim \
-    || die "help extract remove failed"
+	|| die "help extract remove failed"
 </codesample>
 
 <p>
@@ -77,11 +77,11 @@ The basic form of a call is:
 
 <codesample lang="ebuild">
 sed [ option flags ] \
-    -e 'first command' \
-    -e 'second command' \
-    -e 'and so on' \
-    input-file > output-file \
-    || die "Oops, sed didn't work!"
+	-e 'first command' \
+	-e 'second command' \
+	-e 'and so on' \
+	input-file > output-file \
+	|| die "Oops, sed didn't work!"
 </codesample>
 
 <p>
@@ -114,7 +114,7 @@ with <c>"different content"</c>. This is done as follows:
 # replace all instances of "some text" with "different content" in
 # somefile.txt
 sed -i -e 's/some text/different content/g' somefile.txt || \
-    die "Sed broke!"
+	die "Sed broke!"
 </codesample>
 
 <note>
@@ -136,7 +136,7 @@ are allowed, although backslash and any form of brackets should be avoided.
 <codesample lang="ebuild">
 # replace all instances of "/usr/local" with "/usr"
 sed -i -e 's~/usr/local~/usr~g' somefile.txt || \
-    die "sed broke"
+	die "sed broke"
 </codesample>
 
 <p>