Make SKIP_FUNCTIONS=tidyup work

9 files changed, 12 insertions, 12 deletions

diff --git a/paludis/repositories/e/eapis/0.conf b/paludis/repositories/e/eapis/0.conf
index 39739e738..cbbe6cdd8 100644
--- a/paludis/repositories/e/eapis/0.conf
+++ b/paludis/repositories/e/eapis/0.conf
@@ -114,14 +114,14 @@ ebuild_install = \
     skipname=preinst skipifno=preinst clearenv prepost : loadenv preinst saveenv ; \
     skipname=merge merge : ; \
     skipname=postinst skipifno=postinst clearenv prepost : loadenv postinst saveenv ; \
-    skipname=tidyup tidyup : tidyup
+    skipname=tidyup tidyup clearenv : loadenv tidyup
 
 ebuild_uninstall = \
     skipname=killold skipifno=prerm,postrm : killold ; \
     skipname=prerm skipifno=prerm,postrm : initmisc prerm saveenv ; \
     unmerge : ; \
     skipname=postrm skipifno=prerm,postrm clearenv : loadenv postrm ; \
-    skipname=tidyup skipifno=prerm,postrm : tidyup
+    skipname=tidyup skipifno=prerm,postrm clearenv : loadenv tidyup
 
 ebuild_pretend =
 
diff --git a/paludis/repositories/e/eapis/2.conf b/paludis/repositories/e/eapis/2.conf
index e95d5d61e..3cfa02b2e 100644
--- a/paludis/repositories/e/eapis/2.conf
+++ b/paludis/repositories/e/eapis/2.conf
@@ -25,7 +25,7 @@ ebuild_install = \
     skipname=preinst skipifno=preinst clearenv prepost : loadenv preinst saveenv ; \
     skipname=merge merge : ; \
     skipname=postinst skipifno=postinst clearenv prepost : loadenv postinst saveenv ; \
-    skipname=tidyup tidyup : tidyup
+    skipname=tidyup tidyup clearenv : loadenv tidyup
 
 ebuild_new_upgrade_phase_order = true
 
diff --git a/paludis/repositories/e/eapis/4.conf b/paludis/repositories/e/eapis/4.conf
index 4046369f1..63fc5a49c 100644
--- a/paludis/repositories/e/eapis/4.conf
+++ b/paludis/repositories/e/eapis/4.conf
@@ -23,7 +23,7 @@ ebuild_install = \
     skipname=preinst skipifno=preinst clearenv prepost : loadenv preinst saveenv ; \
     skipname=merge merge : ; \
     skipname=postinst skipifno=postinst clearenv prepost : loadenv postinst saveenv ; \
-    skipname=tidyup tidyup : tidyup
+    skipname=tidyup tidyup clearenv : loadenv tidyup
 
 ebuild_info = \
     : killold ; \
diff --git a/paludis/repositories/e/eapis/exheres-0.conf b/paludis/repositories/e/eapis/exheres-0.conf
index b214f011f..bf5647de2 100644
--- a/paludis/repositories/e/eapis/exheres-0.conf
+++ b/paludis/repositories/e/eapis/exheres-0.conf
@@ -145,14 +145,14 @@ ebuild_install = \
     skipname=preinst skipifno=preinst sydbox clearenv prepost : loadenv preinst saveenv ; \
     skipname=merge merge : ; \
     skipname=postinst skipifno=postinst sydbox clearenv prepost : loadenv postinst saveenv ; \
-    skipname=tidyup tidyup : tidyup
+    skipname=tidyup tidyup clearenv : loadenv tidyup
 
 ebuild_uninstall = \
     skipname=killold skipifno=prerm,postrm : killold ; \
     skipname=prerm skipifno=prerm,postrm sydbox : initmisc prerm saveenv ; \
     unmerge : ; \
     skipname=postrm skipifno=prerm,postrm sydbox clearenv : loadenv postrm ; \
-    skipname=tidyup skipifno=prerm,postrm tidyup : tidyup
+    skipname=tidyup skipifno=prerm,postrm tidyup clearenv : loadenv tidyup
 
 ebuild_pretend = \
     skipname=pretend skipifno=pretend sydbox userpriv : pretend
diff --git a/paludis/repositories/e/eapis/paludis-1.conf b/paludis/repositories/e/eapis/paludis-1.conf
index 6253ff51e..a07302886 100644
--- a/paludis/repositories/e/eapis/paludis-1.conf
+++ b/paludis/repositories/e/eapis/paludis-1.conf
@@ -116,14 +116,14 @@ ebuild_install = \
     skipname=preinst skipifno=preinst sandbox clearenv prepost : loadenv preinst saveenv ; \
     skipname=merge merge : ; \
     skipname=postinst skipifno=postinst sandbox clearenv prepost : loadenv postinst saveenv ; \
-    skipname=tidyup tidyup : tidyup
+    skipname=tidyup tidyup clearenv : loadenv tidyup
 
 ebuild_uninstall = \
     skipname=killold skipifno=prerm,postrm : killold ; \
     skipname=prerm skipifno=prerm,postrm sandbox : initmisc prerm saveenv ; \
     unmerge : ; \
     skipname=postrm skipifno=prerm,postrm sandbox clearenv : loadenv postrm ; \
-    skipname=tidyup skipifno=prerm,postrm tidyup : tidyup
+    skipname=tidyup skipifno=prerm,postrm tidyup clearenv : loadenv tidyup
 
 ebuild_pretend = \
     skipname=pretend skipifno=pretend sandbox userpriv : pretend
diff --git a/paludis/repositories/e/eapis/pbin-1+0.conf b/paludis/repositories/e/eapis/pbin-1+0.conf
index 319b7d293..a4b46a4f4 100644
--- a/paludis/repositories/e/eapis/pbin-1+0.conf
+++ b/paludis/repositories/e/eapis/pbin-1+0.conf
@@ -31,7 +31,7 @@ ebuild_install = \
     skipname=preinst clearenv prepost : loadenv preinst saveenv ; \
     skipname=merge merge : ; \
     skipname=postinst clearenv prepost : loadenv postinst saveenv ; \
-    skipname=tidyup tidyup : tidyup
+    skipname=tidyup tidyup clearenv : loadenv tidyup
 
 description_generated_using = Generated using
 description_generated_time = Generated time
diff --git a/paludis/repositories/e/eapis/pbin-1+1.conf b/paludis/repositories/e/eapis/pbin-1+1.conf
index fe01a5829..8cd1a5937 100644
--- a/paludis/repositories/e/eapis/pbin-1+1.conf
+++ b/paludis/repositories/e/eapis/pbin-1+1.conf
@@ -31,7 +31,7 @@ ebuild_install = \
     skipname=preinst clearenv prepost : loadenv preinst saveenv ; \
     skipname=merge merge : ; \
     skipname=postinst clearenv prepost : loadenv postinst saveenv ; \
-    skipname=tidyup tidyup : tidyup
+    skipname=tidyup tidyup clearenv : loadenv tidyup
 
 description_generated_using = Generated using
 description_generated_time = Generated time
diff --git a/paludis/repositories/e/eapis/pbin-1+exheres-0.conf b/paludis/repositories/e/eapis/pbin-1+exheres-0.conf
index fec47f3ff..c06b85687 100644
--- a/paludis/repositories/e/eapis/pbin-1+exheres-0.conf
+++ b/paludis/repositories/e/eapis/pbin-1+exheres-0.conf
@@ -32,7 +32,7 @@ ebuild_install = \
     skipname=preinst clearenv prepost : loadenv preinst saveenv ; \
     skipname=merge merge : ; \
     skipname=postinst clearenv prepost : loadenv postinst saveenv ; \
-    skipname=tidyup tidyup : tidyup
+    skipname=tidyup tidyup clearenv : loadenv tidyup
 
 description_generated_using = Generated using
 description_generated_time = Generated time
diff --git a/paludis/repositories/e/eapis/pbin-1+paludis-1.conf b/paludis/repositories/e/eapis/pbin-1+paludis-1.conf
index ba74f78ce..edcaec965 100644
--- a/paludis/repositories/e/eapis/pbin-1+paludis-1.conf
+++ b/paludis/repositories/e/eapis/pbin-1+paludis-1.conf
@@ -32,7 +32,7 @@ ebuild_install = \
     skipname=preinst clearenv prepost : loadenv preinst saveenv ; \
     skipname=merge merge : ; \
     skipname=postinst clearenv prepost : loadenv postinst saveenv ; \
-    skipname=tidyup tidyup : tidyup
+    skipname=tidyup tidyup clearenv : loadenv tidyup
 
 description_generated_using = Generated using
 description_generated_time = Generated time