aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e/ebuild/exheres-0
diff options
context:
space:
mode:
Diffstat (limited to 'paludis/repositories/e/ebuild/exheres-0')
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/builtin_infovars.bash4
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/builtin_init.bash4
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/builtin_initmisc.bash4
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/builtin_initrm.bash4
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/builtin_killold.bash4
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/builtin_killoldmisc.bash4
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/builtin_killoldrm.bash4
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/builtin_loadenv.bash4
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/builtin_saveenv.bash4
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/builtin_tidyup.bash4
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/builtin_tidyupmisc.bash4
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/builtin_tidyuprm.bash4
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/pkg_config.bash4
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/pkg_info.bash4
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/pkg_postinst.bash4
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/pkg_postrm.bash4
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/pkg_preinst.bash4
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/pkg_prerm.bash4
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/pkg_pretend.bash4
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/pkg_setup.bash4
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/src_compile.bash4
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/src_configure.bash4
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/src_install.bash4
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/src_prepare.bash4
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/src_test.bash4
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/src_unpack.bash4
26 files changed, 26 insertions, 78 deletions
diff --git a/paludis/repositories/e/ebuild/exheres-0/builtin_infovars.bash b/paludis/repositories/e/ebuild/exheres-0/builtin_infovars.bash
index 55dabb65c..b0f48e229 100644
--- a/paludis/repositories/e/ebuild/exheres-0/builtin_infovars.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/builtin_infovars.bash
@@ -26,9 +26,7 @@ builtin_infovars()
exheres_internal_infovars()
{
- if hasq "infovars" ${RESTRICT} ; then
- ebuild_section "Skipping builtin_infovars (RESTRICT)"
- elif hasq "infovars" ${SKIP_FUNCTIONS} ; then
+ if hasq "infovars" ${SKIP_FUNCTIONS} ; then
ebuild_section "Skipping builtin_infovars (SKIP_FUNCTIONS)"
else
if [[ $(type -t pre_builtin_infovars ) == "function" ]] ; then
diff --git a/paludis/repositories/e/ebuild/exheres-0/builtin_init.bash b/paludis/repositories/e/ebuild/exheres-0/builtin_init.bash
index 14335a481..090481b8d 100644
--- a/paludis/repositories/e/ebuild/exheres-0/builtin_init.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/builtin_init.bash
@@ -83,9 +83,7 @@ builtin_init()
exheres_internal_init()
{
- if hasq "init" ${RESTRICT} ; then
- ebuild_section "Skipping builtin_init (RESTRICT)"
- elif hasq "init" ${SKIP_FUNCTIONS} ; then
+ if hasq "init" ${SKIP_FUNCTIONS} ; then
ebuild_section "Skipping builtin_init (SKIP_FUNCTIONS)"
else
ebuild_section "Starting builtin_init"
diff --git a/paludis/repositories/e/ebuild/exheres-0/builtin_initmisc.bash b/paludis/repositories/e/ebuild/exheres-0/builtin_initmisc.bash
index 000dcf80e..6229b7dfe 100644
--- a/paludis/repositories/e/ebuild/exheres-0/builtin_initmisc.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/builtin_initmisc.bash
@@ -69,9 +69,7 @@ builtin_initmisc()
exheres_internal_initmisc()
{
- if hasq "initmisc" ${RESTRICT} ; then
- ebuild_section "Skipping builtin_initmisc (RESTRICT)"
- elif hasq "initmisc" ${SKIP_FUNCTIONS} ; then
+ if hasq "initmisc" ${SKIP_FUNCTIONS} ; then
ebuild_section "Skipping builtin_initmisc (SKIP_FUNCTIONS)"
else
ebuild_section "Starting builtin_initmisc"
diff --git a/paludis/repositories/e/ebuild/exheres-0/builtin_initrm.bash b/paludis/repositories/e/ebuild/exheres-0/builtin_initrm.bash
index c571a1d7f..70ba8a8cb 100644
--- a/paludis/repositories/e/ebuild/exheres-0/builtin_initrm.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/builtin_initrm.bash
@@ -69,9 +69,7 @@ builtin_initrm()
exheres_internal_initrm()
{
- if hasq "initrm" ${RESTRICT} ; then
- ebuild_section "Skipping builtin_initrm (RESTRICT)"
- elif hasq "initrm" ${SKIP_FUNCTIONS} ; then
+ if hasq "initrm" ${SKIP_FUNCTIONS} ; then
ebuild_section "Skipping builtin_initrm (SKIP_FUNCTIONS)"
else
ebuild_section "Starting builtin_initrm"
diff --git a/paludis/repositories/e/ebuild/exheres-0/builtin_killold.bash b/paludis/repositories/e/ebuild/exheres-0/builtin_killold.bash
index b268daa4a..3db2d18c4 100644
--- a/paludis/repositories/e/ebuild/exheres-0/builtin_killold.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/builtin_killold.bash
@@ -33,9 +33,7 @@ builtin_killold()
exheres_internal_killold()
{
- if hasq "killold" ${RESTRICT} ; then
- ebuild_section "Skipping builtin_killold (RESTRICT)"
- elif hasq "killold" ${SKIP_FUNCTIONS} ; then
+ if hasq "killold" ${SKIP_FUNCTIONS} ; then
ebuild_section "Skipping builtin_killold (SKIP_FUNCTIONS)"
else
ebuild_section "Starting builtin_killold"
diff --git a/paludis/repositories/e/ebuild/exheres-0/builtin_killoldmisc.bash b/paludis/repositories/e/ebuild/exheres-0/builtin_killoldmisc.bash
index ae898c7e2..14a02b053 100644
--- a/paludis/repositories/e/ebuild/exheres-0/builtin_killoldmisc.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/builtin_killoldmisc.bash
@@ -33,9 +33,7 @@ builtin_killoldmisc()
exheres_internal_killoldmisc()
{
- if hasq "killoldmisc" ${RESTRICT} ; then
- ebuild_section "Skipping builtin_killoldmisc (RESTRICT)"
- elif hasq "killoldmisc" ${SKIP_FUNCTIONS} ; then
+ if hasq "killoldmisc" ${SKIP_FUNCTIONS} ; then
ebuild_section "Skipping builtin_killoldmisc (SKIP_FUNCTIONS)"
else
ebuild_section "Starting builtin_killoldmisc"
diff --git a/paludis/repositories/e/ebuild/exheres-0/builtin_killoldrm.bash b/paludis/repositories/e/ebuild/exheres-0/builtin_killoldrm.bash
index ad88396e2..7a5bf4534 100644
--- a/paludis/repositories/e/ebuild/exheres-0/builtin_killoldrm.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/builtin_killoldrm.bash
@@ -33,9 +33,7 @@ builtin_killoldrm()
exheres_internal_killoldrm()
{
- if hasq "killoldrm" ${RESTRICT} ; then
- ebuild_section "Skipping builtin_killoldrm (RESTRICT)"
- elif hasq "killoldrm" ${SKIP_FUNCTIONS} ; then
+ if hasq "killoldrm" ${SKIP_FUNCTIONS} ; then
ebuild_section "Skipping builtin_killoldrm (SKIP_FUNCTIONS)"
else
ebuild_section "Starting builtin_killoldrm"
diff --git a/paludis/repositories/e/ebuild/exheres-0/builtin_loadenv.bash b/paludis/repositories/e/ebuild/exheres-0/builtin_loadenv.bash
index 919fd375e..93f5cd12b 100644
--- a/paludis/repositories/e/ebuild/exheres-0/builtin_loadenv.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/builtin_loadenv.bash
@@ -31,9 +31,7 @@ exheres_internal_loadenv()
[[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]] && \
SANDBOX_WRITE="${SANDBOX_WRITE+${SANDBOX_WRITE}:}${PALUDIS_LOADSAVEENV_DIR%/}/"
- if hasq "loadenv" ${RESTRICT} ; then
- ebuild_section "Skipping builtin_loadenv (RESTRICT)"
- elif hasq "loadenv" ${SKIP_FUNCTIONS} ; then
+ if hasq "loadenv" ${SKIP_FUNCTIONS} ; then
ebuild_section "Skipping builtin_loadenv (SKIP_FUNCTIONS)"
else
ebuild_section "Starting builtin_loadenv"
diff --git a/paludis/repositories/e/ebuild/exheres-0/builtin_saveenv.bash b/paludis/repositories/e/ebuild/exheres-0/builtin_saveenv.bash
index 64b4d4ddf..c98e39747 100644
--- a/paludis/repositories/e/ebuild/exheres-0/builtin_saveenv.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/builtin_saveenv.bash
@@ -28,9 +28,7 @@ exheres_internal_saveenv()
local old_sandbox_write="${SANDBOX_WRITE}"
SANDBOX_WRITE="${SANDBOX_WRITE+${SANDBOX_WRITE}:}${PALUDIS_LOADSAVEENV_DIR%/}/"
- if hasq "saveenv" ${RESTRICT} ; then
- ebuild_section "Skipping builtin_saveenv (RESTRICT)"
- elif hasq "saveenv" ${SKIP_FUNCTIONS} ; then
+ if hasq "saveenv" ${SKIP_FUNCTIONS} ; then
ebuild_section "Skipping builtin_saveenv (SKIP_FUNCTIONS)"
else
ebuild_section "Starting builtin_saveenv"
diff --git a/paludis/repositories/e/ebuild/exheres-0/builtin_tidyup.bash b/paludis/repositories/e/ebuild/exheres-0/builtin_tidyup.bash
index f0b8f2580..7ca080f72 100644
--- a/paludis/repositories/e/ebuild/exheres-0/builtin_tidyup.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/builtin_tidyup.bash
@@ -30,9 +30,7 @@ builtin_tidyup()
exheres_internal_tidyup()
{
- if hasq "tidyup" ${RESTRICT} ; then
- ebuild_section "Skipping builtin_tidyup (RESTRICT)"
- elif hasq "tidyup" ${SKIP_FUNCTIONS} ; then
+ if hasq "tidyup" ${SKIP_FUNCTIONS} ; then
ebuild_section "Skipping builtin_tidyup (SKIP_FUNCTIONS)"
else
ebuild_section "Starting builtin_tidyup"
diff --git a/paludis/repositories/e/ebuild/exheres-0/builtin_tidyupmisc.bash b/paludis/repositories/e/ebuild/exheres-0/builtin_tidyupmisc.bash
index fd66ed013..7646996f2 100644
--- a/paludis/repositories/e/ebuild/exheres-0/builtin_tidyupmisc.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/builtin_tidyupmisc.bash
@@ -30,9 +30,7 @@ builtin_tidyupmisc()
exheres_internal_tidyupmisc()
{
- if hasq "tidyupmisc" ${RESTRICT} ; then
- ebuild_section "Skipping builtin_tidyupmisc (RESTRICT)"
- elif hasq "tidyupmisc" ${SKIP_FUNCTIONS} ; then
+ if hasq "tidyupmisc" ${SKIP_FUNCTIONS} ; then
ebuild_section "Skipping builtin_tidyupmisc (SKIP_FUNCTIONS)"
else
ebuild_section "Starting builtin_tidyupmisc"
diff --git a/paludis/repositories/e/ebuild/exheres-0/builtin_tidyuprm.bash b/paludis/repositories/e/ebuild/exheres-0/builtin_tidyuprm.bash
index 3d1ae75c5..13b3b32ee 100644
--- a/paludis/repositories/e/ebuild/exheres-0/builtin_tidyuprm.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/builtin_tidyuprm.bash
@@ -30,9 +30,7 @@ builtin_tidyuprm()
exheres_internal_tidyuprm()
{
- if hasq "tidyuprm" ${RESTRICT} ; then
- ebuild_section "Skipping builtin_tidyuprm (RESTRICT)"
- elif hasq "tidyuprm" ${SKIP_FUNCTIONS} ; then
+ if hasq "tidyuprm" ${SKIP_FUNCTIONS} ; then
ebuild_section "Skipping builtin_tidyuprm (SKIP_FUNCTIONS)"
else
ebuild_section "Starting builtin_tidyuprm"
diff --git a/paludis/repositories/e/ebuild/exheres-0/pkg_config.bash b/paludis/repositories/e/ebuild/exheres-0/pkg_config.bash
index 4b9faa688..3a03225da 100644
--- a/paludis/repositories/e/ebuild/exheres-0/pkg_config.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/pkg_config.bash
@@ -35,9 +35,7 @@ exheres_internal_config()
local old_sandbox_write="${SANDBOX_WRITE}"
[[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]] && SANDBOX_WRITE="${SANDBOX_WRITE+${SANDBOX_WRITE}:}${ROOT%/}/"
- if hasq "config" ${RESTRICT} ; then
- ebuild_section "Skipping pkg_config (RESTRICT)"
- elif hasq "config" ${SKIP_FUNCTIONS} ; then
+ if hasq "config" ${SKIP_FUNCTIONS} ; then
ebuild_section "Skipping pkg_config (SKIP_FUNCTIONS)"
else
ebuild_section "Starting pkg_config"
diff --git a/paludis/repositories/e/ebuild/exheres-0/pkg_info.bash b/paludis/repositories/e/ebuild/exheres-0/pkg_info.bash
index 70d4e5305..9b67bc1b8 100644
--- a/paludis/repositories/e/ebuild/exheres-0/pkg_info.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/pkg_info.bash
@@ -28,9 +28,7 @@ pkg_info()
exheres_internal_info()
{
- if hasq "info" ${RESTRICT} ; then
- ebuild_section "Skipping pkg_info (RESTRICT)"
- elif hasq "info" ${SKIP_FUNCTIONS} ; then
+ if hasq "info" ${SKIP_FUNCTIONS} ; then
ebuild_section "Skipping pkg_info (SKIP_FUNCTIONS)"
else
ebuild_section "Starting pkg_info"
diff --git a/paludis/repositories/e/ebuild/exheres-0/pkg_postinst.bash b/paludis/repositories/e/ebuild/exheres-0/pkg_postinst.bash
index 6c248a352..f1c67f414 100644
--- a/paludis/repositories/e/ebuild/exheres-0/pkg_postinst.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/pkg_postinst.bash
@@ -35,9 +35,7 @@ exheres_internal_postinst()
local old_sandbox_write="${SANDBOX_WRITE}"
[[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]] && SANDBOX_WRITE="${SANDBOX_WRITE+${SANDBOX_WRITE}:}${ROOT%/}/"
- if hasq "postinst" ${RESTRICT} ; then
- ebuild_section "Skipping pkg_postinst (RESTRICT)"
- elif hasq "postinst" ${SKIP_FUNCTIONS} ; then
+ if hasq "postinst" ${SKIP_FUNCTIONS} ; then
ebuild_section "Skipping pkg_postinst (SKIP_FUNCTIONS)"
else
ebuild_section "Starting pkg_postinst"
diff --git a/paludis/repositories/e/ebuild/exheres-0/pkg_postrm.bash b/paludis/repositories/e/ebuild/exheres-0/pkg_postrm.bash
index adb26dca1..5bd40494e 100644
--- a/paludis/repositories/e/ebuild/exheres-0/pkg_postrm.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/pkg_postrm.bash
@@ -35,9 +35,7 @@ exheres_internal_postrm()
local old_sandbox_write="${SANDBOX_WRITE}"
[[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]] && SANDBOX_WRITE="${SANDBOX_WRITE+${SANDBOX_WRITE}:}${ROOT%/}/"
- if hasq "postrm" ${RESTRICT} ; then
- ebuild_section "Skipping pkg_postrm (RESTRICT)"
- elif hasq "postrm" ${SKIP_FUNCTIONS} ; then
+ if hasq "postrm" ${SKIP_FUNCTIONS} ; then
ebuild_section "Skipping pkg_postrm (SKIP_FUNCTIONS)"
else
ebuild_section "Starting pkg_postrm"
diff --git a/paludis/repositories/e/ebuild/exheres-0/pkg_preinst.bash b/paludis/repositories/e/ebuild/exheres-0/pkg_preinst.bash
index 571bb498e..bb8fc9720 100644
--- a/paludis/repositories/e/ebuild/exheres-0/pkg_preinst.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/pkg_preinst.bash
@@ -35,9 +35,7 @@ exheres_internal_preinst()
local old_sandbox_write="${SANDBOX_WRITE}"
[[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]] && SANDBOX_WRITE="${SANDBOX_WRITE+${SANDBOX_WRITE}:}${ROOT%/}/"
- if hasq "preinst" ${RESTRICT} ; then
- ebuild_section "Skipping pkg_preinst (RESTRICT)"
- elif hasq "preinst" ${SKIP_FUNCTIONS} ; then
+ if hasq "preinst" ${SKIP_FUNCTIONS} ; then
ebuild_section "Skipping pkg_preinst (SKIP_FUNCTIONS)"
else
ebuild_section "Starting pkg_preinst"
diff --git a/paludis/repositories/e/ebuild/exheres-0/pkg_prerm.bash b/paludis/repositories/e/ebuild/exheres-0/pkg_prerm.bash
index 2dbfd07d3..47a3c33ee 100644
--- a/paludis/repositories/e/ebuild/exheres-0/pkg_prerm.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/pkg_prerm.bash
@@ -35,9 +35,7 @@ exheres_internal_prerm()
local old_sandbox_write="${SANDBOX_WRITE}"
[[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]] && SANDBOX_WRITE="${SANDBOX_WRITE+${SANDBOX_WRITE}:}${ROOT%/}/"
- if hasq "prerm" ${RESTRICT} ; then
- ebuild_section "Skipping pkg_prerm (RESTRICT)"
- elif hasq "prerm" ${SKIP_FUNCTIONS} ; then
+ if hasq "prerm" ${SKIP_FUNCTIONS} ; then
ebuild_section "Skipping pkg_prerm (SKIP_FUNCTIONS)"
else
ebuild_section "Starting pkg_prerm"
diff --git a/paludis/repositories/e/ebuild/exheres-0/pkg_pretend.bash b/paludis/repositories/e/ebuild/exheres-0/pkg_pretend.bash
index 8dfa434a0..e78158be5 100644
--- a/paludis/repositories/e/ebuild/exheres-0/pkg_pretend.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/pkg_pretend.bash
@@ -28,9 +28,7 @@ pkg_pretend()
exheres_internal_pretend()
{
- if hasq "pretend" ${RESTRICT} ; then
- ebuild_section "Skipping pkg_pretend (RESTRICT)"
- elif hasq "pretend" ${SKIP_FUNCTIONS} ; then
+ if hasq "pretend" ${SKIP_FUNCTIONS} ; then
ebuild_section "Skipping pkg_pretend (SKIP_FUNCTIONS)"
else
echo
diff --git a/paludis/repositories/e/ebuild/exheres-0/pkg_setup.bash b/paludis/repositories/e/ebuild/exheres-0/pkg_setup.bash
index ef68b98c0..1e0bd0f0b 100644
--- a/paludis/repositories/e/ebuild/exheres-0/pkg_setup.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/pkg_setup.bash
@@ -35,9 +35,7 @@ exheres_internal_setup()
local old_sandbox_write="${SANDBOX_WRITE}"
[[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]] && SANDBOX_WRITE="${SANDBOX_WRITE+${SANDBOX_WRITE}:}${ROOT%/}/"
- if hasq "setup" ${RESTRICT} ; then
- ebuild_section "Skipping pkg_setup (RESTRICT)"
- elif hasq "setup" ${SKIP_FUNCTIONS} ; then
+ if hasq "setup" ${SKIP_FUNCTIONS} ; then
ebuild_section "Skipping pkg_setup (SKIP_FUNCTIONS)"
else
ebuild_section "Starting pkg_setup"
diff --git a/paludis/repositories/e/ebuild/exheres-0/src_compile.bash b/paludis/repositories/e/ebuild/exheres-0/src_compile.bash
index 8a03db5b0..0257ffe83 100644
--- a/paludis/repositories/e/ebuild/exheres-0/src_compile.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/src_compile.bash
@@ -40,9 +40,7 @@ exheres_internal_compile()
cd "${WORKDIR}" || die "cd to \${WORKDIR} (\"${WORKDIR}\") failed"
fi
- if hasq "compile" ${RESTRICT} ; then
- ebuild_section "Skipping src_compile (RESTRICT)"
- elif hasq "compile" ${SKIP_FUNCTIONS} ; then
+ if hasq "compile" ${SKIP_FUNCTIONS} ; then
ebuild_section "Skipping src_compile (SKIP_FUNCTIONS)"
else
ebuild_section "Starting src_compile"
diff --git a/paludis/repositories/e/ebuild/exheres-0/src_configure.bash b/paludis/repositories/e/ebuild/exheres-0/src_configure.bash
index d53990bf6..00a5c8d56 100644
--- a/paludis/repositories/e/ebuild/exheres-0/src_configure.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/src_configure.bash
@@ -47,9 +47,7 @@ exheres_internal_configure()
cd "${WORKDIR}" || die "cd to \${WORKDIR} (\"${WORKDIR}\") failed"
fi
- if hasq "configure" ${RESTRICT} ; then
- ebuild_section "Skipping src_configure (RESTRICT)"
- elif hasq "configure" ${SKIP_FUNCTIONS} ; then
+ if hasq "configure" ${SKIP_FUNCTIONS} ; then
ebuild_section "Skipping src_configure (SKIP_FUNCTIONS)"
else
ebuild_section "Starting src_configure"
diff --git a/paludis/repositories/e/ebuild/exheres-0/src_install.bash b/paludis/repositories/e/ebuild/exheres-0/src_install.bash
index 7b52f476e..387c7686a 100644
--- a/paludis/repositories/e/ebuild/exheres-0/src_install.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/src_install.bash
@@ -38,9 +38,7 @@ exheres_internal_install()
cd "${WORKDIR}" || die "cd to \${WORKDIR} (\"${WORKDIR}\") failed"
fi
- if hasq "install" ${RESTRICT} ; then
- ebuild_section "Skipping src_install (RESTRICT)"
- elif hasq "install" ${SKIP_FUNCTIONS} ; then
+ if hasq "install" ${SKIP_FUNCTIONS} ; then
ebuild_section "Skipping src_install (SKIP_FUNCTIONS)"
else
ebuild_section "Starting src_install"
diff --git a/paludis/repositories/e/ebuild/exheres-0/src_prepare.bash b/paludis/repositories/e/ebuild/exheres-0/src_prepare.bash
index 5b1eaa883..ad396536c 100644
--- a/paludis/repositories/e/ebuild/exheres-0/src_prepare.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/src_prepare.bash
@@ -40,9 +40,7 @@ exheres_internal_prepare()
cd "${WORKDIR}" || die "cd to \${WORKDIR} (\"${WORKDIR}\") failed"
fi
- if hasq "prepare" ${RESTRICT} ; then
- ebuild_section "Skipping src_prepare (RESTRICT)"
- elif hasq "prepare" ${SKIP_FUNCTIONS} ; then
+ if hasq "prepare" ${SKIP_FUNCTIONS} ; then
ebuild_section "Skipping src_prepare (SKIP_FUNCTIONS)"
else
ebuild_section "Starting src_prepare"
diff --git a/paludis/repositories/e/ebuild/exheres-0/src_test.bash b/paludis/repositories/e/ebuild/exheres-0/src_test.bash
index fa348fcd7..4fc0d7f9b 100644
--- a/paludis/repositories/e/ebuild/exheres-0/src_test.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/src_test.bash
@@ -56,9 +56,7 @@ exheres_internal_test()
cd "${WORKDIR}" || die "cd to \${WORKDIR} (\"${WORKDIR}\") failed"
fi
- if hasq "test" ${RESTRICT} ; then
- ebuild_section "Skipping src_test (RESTRICT)"
- elif hasq "test" ${SKIP_FUNCTIONS} ; then
+ if hasq "test" ${SKIP_FUNCTIONS} ; then
ebuild_section "Skipping src_test (SKIP_FUNCTIONS)"
else
ebuild_section "Starting src_test"
diff --git a/paludis/repositories/e/ebuild/exheres-0/src_unpack.bash b/paludis/repositories/e/ebuild/exheres-0/src_unpack.bash
index 34ef3718d..ad8f07d6d 100644
--- a/paludis/repositories/e/ebuild/exheres-0/src_unpack.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/src_unpack.bash
@@ -34,9 +34,7 @@ exheres_internal_unpack()
{
cd ${WORKDIR} || die "cd to \${WORKDIR} (\"${WORKDIR}\") failed"
- if hasq "unpack" ${RESTRICT} ; then
- ebuild_section "Skipping src_unpack (RESTRICT)"
- elif hasq "unpack" ${SKIP_FUNCTIONS} ; then
+ if hasq "unpack" ${SKIP_FUNCTIONS} ; then
ebuild_section "Skipping src_unpack (SKIP_FUNCTIONS)"
else
ebuild_section "Starting src_unpack"