4 files changed, 4 insertions, 4 deletions
diff --git a/paludis/repositories/e/eapis/4.conf b/paludis/repositories/e/eapis/4.conf
index 3d14ef5de..6b0de629a 100644
--- a/paludis/repositories/e/eapis/4.conf
+++ b/paludis/repositories/e/eapis/4.conf
@@ -54,7 +54,7 @@ ebuild_module_suffixes = 4 3 2 1 0
 utility_path_suffixes = 4 3 2 1 0
 
 ebuild_pretend = \
-    skipname=pretend skipifno=pretend sandbox userpriv : pretend
+    skipname=pretend skipifno=pretend sandbox userpriv : killold initmisc pretend tidyup
 
 dodoc_r = true
 doins_symlink = true
diff --git a/paludis/repositories/e/eapis/exheres-0.conf b/paludis/repositories/e/eapis/exheres-0.conf
index 7b03a83f3..bc80c0cd1 100644
--- a/paludis/repositories/e/eapis/exheres-0.conf
+++ b/paludis/repositories/e/eapis/exheres-0.conf
@@ -166,7 +166,7 @@ ebuild_uninstall = \
     skipname=tidyup skipifno=prerm,postrm tidyup clearenv : loadenv tidyup
 
 ebuild_pretend = \
-    skipname=pretend skipifno=pretend sydbox userpriv : pretend
+    skipname=pretend skipifno=pretend sydbox userpriv : killold initmisc pretend tidyup
 
 ebuild_bad_options = \
     sydbox userpriv : bad_options
diff --git a/paludis/repositories/e/ebuild/0/builtin_tidyup.bash b/paludis/repositories/e/ebuild/0/builtin_tidyup.bash
index 42ebbf635..22ec8210a 100644
--- a/paludis/repositories/e/ebuild/0/builtin_tidyup.bash
+++ b/paludis/repositories/e/ebuild/0/builtin_tidyup.bash
@@ -31,7 +31,7 @@ builtin_tidyup()
             echo chflags -R 0 "${PALUDIS_PACKAGE_BUILDDIR}" 1>&2
             chflags -R 0 "${PALUDIS_PACKAGE_BUILDDIR}" || die "Couldn't remove flags from workdir"
         fi
-        echo rm -fr "${PALUDIS_PACKAGE_BUILDDIR}" 1>&2
+        [[ -z ${PALUDIS_EBUILD_QUIET} ]] && echo rm -fr "${PALUDIS_PACKAGE_BUILDDIR}" 1>&2
         rm -fr "${PALUDIS_PACKAGE_BUILDDIR}" || die "Couldn't remove work"
     fi
 }
diff --git a/paludis/repositories/e/ebuild/exheres-0/builtin_tidyup.bash b/paludis/repositories/e/ebuild/exheres-0/builtin_tidyup.bash
index 26bdb3abb..d66a9ff44 100644
--- a/paludis/repositories/e/ebuild/exheres-0/builtin_tidyup.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/builtin_tidyup.bash
@@ -31,7 +31,7 @@ builtin_tidyup()
             echo chflags -R 0 "${PALUDIS_PACKAGE_BUILDDIR}" 1>&2
             chflags -R 0 "${PALUDIS_PACKAGE_BUILDDIR}" || die "Couldn't remove flags from workdir"
         fi
-        echo rm -fr "${PALUDIS_PACKAGE_BUILDDIR}" 1>&2
+        [[ -z ${PALUDIS_EBUILD_QUIET} ]] && echo rm -fr "${PALUDIS_PACKAGE_BUILDDIR}" 1>&2
         rm -fr "${PALUDIS_PACKAGE_BUILDDIR}" || die "Couldn't remove work"
     fi
 }