aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-21 19:25:36 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-22 19:17:00 +0100
commit3dfbd4486e6d01b340716ac73f653434c96eebef (patch)
tree00dc2faf03bd3d0a30c31be6b20358cd5b10f64f
parent3b6c0d2c842258d93c9c7a1087a6704085a4e5aa (diff)
downloadpaludis-3dfbd4486e6d01b340716ac73f653434c96eebef.tar.gz
paludis-3dfbd4486e6d01b340716ac73f653434c96eebef.tar.xz
Don't skip pkg_{setup,{pre,post}_{inst,rm}} on 0
-rw-r--r--paludis/repositories/e/eapis/0.conf14
-rw-r--r--paludis/repositories/e/eapis/2.conf6
-rw-r--r--paludis/repositories/e/eapis/4.conf6
3 files changed, 13 insertions, 13 deletions
diff --git a/paludis/repositories/e/eapis/0.conf b/paludis/repositories/e/eapis/0.conf
index dca560dc1..099b44e91 100644
--- a/paludis/repositories/e/eapis/0.conf
+++ b/paludis/repositories/e/eapis/0.conf
@@ -106,23 +106,23 @@ ebuild_functions = \
ebuild_install = \
skipname=killold : killold ; \
skipname=init userpriv sandbox : init saveenv ; \
- skipname=setup skipifno=setup clearenv : loadenv setup saveenv ; \
+ skipname=setup clearenv : loadenv setup saveenv ; \
skipname=unpack skipifno=*sources,unpack sandbox userpriv clearenv : loadenv unpack saveenv ; \
skipname=compile skipifno=*sources,unpack,compile sandbox userpriv clearenv : loadenv compile saveenv ; \
skipname=test skipifno=*sources,unpack,compile,test sandbox userpriv clearenv optional_tests : loadenv test saveenv ; \
skipname=install skipifno=install sandbox clearenv : loadenv install saveenv ; \
skipname=strip strip : ; \
- skipname=preinst skipifno=preinst clearenv prepost : loadenv preinst saveenv ; \
+ skipname=preinst clearenv prepost : loadenv preinst saveenv ; \
skipname=merge merge : ; \
- skipname=postinst skipifno=postinst clearenv prepost : loadenv postinst saveenv ; \
+ skipname=postinst clearenv prepost : loadenv postinst saveenv ; \
skipname=tidyup tidyup clearenv : loadenv tidyup
ebuild_uninstall = \
- skipname=killold skipifno=prerm,postrm : killold ; \
- skipname=prerm skipifno=prerm,postrm : initmisc prerm saveenv ; \
+ skipname=killold : killold ; \
+ skipname=prerm : initmisc prerm saveenv ; \
unmerge : ; \
- skipname=postrm skipifno=prerm,postrm clearenv : loadenv postrm ; \
- skipname=tidyup skipifno=prerm,postrm clearenv : loadenv tidyup
+ skipname=postrm clearenv : loadenv postrm ; \
+ skipname=tidyup clearenv : loadenv tidyup
ebuild_pretend =
diff --git a/paludis/repositories/e/eapis/2.conf b/paludis/repositories/e/eapis/2.conf
index 3cfa02b2e..006393766 100644
--- a/paludis/repositories/e/eapis/2.conf
+++ b/paludis/repositories/e/eapis/2.conf
@@ -14,7 +14,7 @@ ebuild_functions = ${ebuild_functions} src_prepare src_configure
ebuild_install = \
skipname=killold : killold ; \
skipname=init userpriv sandbox : init saveenv ; \
- skipname=setup skipifno=setup clearenv : loadenv setup saveenv ; \
+ skipname=setup clearenv : loadenv setup saveenv ; \
skipname=unpack skipifno=*sources,unpack sandbox userpriv clearenv : loadenv unpack saveenv ; \
skipname=prepare skipifno=*sources,unpack,prepare sandbox userpriv clearenv : loadenv prepare saveenv ; \
skipname=configure skipifno=*sources,unpack,prepare,configure sandbox userpriv clearenv : loadenv configure saveenv ; \
@@ -22,9 +22,9 @@ ebuild_install = \
skipname=test skipifno=*sources,unpack,prepare,configure,compile,test sandbox userpriv clearenv optional_tests : loadenv test saveenv ; \
skipname=install skipifno=install sandbox clearenv : loadenv install saveenv ; \
skipname=strip strip : ; \
- skipname=preinst skipifno=preinst clearenv prepost : loadenv preinst saveenv ; \
+ skipname=preinst clearenv prepost : loadenv preinst saveenv ; \
skipname=merge merge : ; \
- skipname=postinst skipifno=postinst clearenv prepost : loadenv postinst saveenv ; \
+ skipname=postinst clearenv prepost : loadenv postinst saveenv ; \
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 e40a3283a..31e66ec52 100644
--- a/paludis/repositories/e/eapis/4.conf
+++ b/paludis/repositories/e/eapis/4.conf
@@ -12,7 +12,7 @@ merger_options = ${merger_options} preserve_mtimes
ebuild_install = \
skipname=killold : killold ; \
skipname=init userpriv sandbox : init saveenv ; \
- skipname=setup skipifno=setup clearenv : loadenv setup saveenv ; \
+ skipname=setup clearenv : loadenv setup saveenv ; \
skipname=unpack skipifno=*sources,unpack sandbox userpriv clearenv : loadenv unpack saveenv ; \
skipname=prepare skipifno=*sources,unpack,prepare sandbox userpriv clearenv : loadenv prepare saveenv ; \
skipname=configure skipifno=*sources,unpack,prepare,configure sandbox userpriv clearenv : loadenv configure saveenv ; \
@@ -20,9 +20,9 @@ ebuild_install = \
skipname=test skipifno=*sources,unpack,prepare,configure,compile,test sandbox userpriv clearenv optional_tests : loadenv test saveenv ; \
skipname=install skipifno=*sources,unpack,prepare,configure,compile,test,install sandbox clearenv : loadenv install saveenv ; \
skipname=strip strip : ; \
- skipname=preinst skipifno=preinst clearenv prepost : loadenv preinst saveenv ; \
+ skipname=preinst clearenv prepost : loadenv preinst saveenv ; \
skipname=merge merge : ; \
- skipname=postinst skipifno=postinst clearenv prepost : loadenv postinst saveenv ; \
+ skipname=postinst clearenv prepost : loadenv postinst saveenv ; \
skipname=tidyup tidyup clearenv : loadenv tidyup
ebuild_info = \