diff options
Diffstat (limited to 'paludis/repositories/e/ebuild/0')
24 files changed, 24 insertions, 72 deletions
diff --git a/paludis/repositories/e/ebuild/0/builtin_infovars.bash b/paludis/repositories/e/ebuild/0/builtin_infovars.bash index e21bbafae..1c7c429e7 100644 --- a/paludis/repositories/e/ebuild/0/builtin_infovars.bash +++ b/paludis/repositories/e/ebuild/0/builtin_infovars.bash @@ -26,9 +26,7 @@ builtin_infovars() ebuild_f_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/0/builtin_init.bash b/paludis/repositories/e/ebuild/0/builtin_init.bash index 855ce688f..0dea0e28a 100644 --- a/paludis/repositories/e/ebuild/0/builtin_init.bash +++ b/paludis/repositories/e/ebuild/0/builtin_init.bash @@ -83,9 +83,7 @@ builtin_init() ebuild_f_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/0/builtin_initmisc.bash b/paludis/repositories/e/ebuild/0/builtin_initmisc.bash index 274d94a61..2386de8ae 100644 --- a/paludis/repositories/e/ebuild/0/builtin_initmisc.bash +++ b/paludis/repositories/e/ebuild/0/builtin_initmisc.bash @@ -69,9 +69,7 @@ builtin_initmisc() ebuild_f_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/0/builtin_initrm.bash b/paludis/repositories/e/ebuild/0/builtin_initrm.bash index b9ea60f4d..ca137613b 100644 --- a/paludis/repositories/e/ebuild/0/builtin_initrm.bash +++ b/paludis/repositories/e/ebuild/0/builtin_initrm.bash @@ -69,9 +69,7 @@ builtin_initrm() ebuild_f_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/0/builtin_killold.bash b/paludis/repositories/e/ebuild/0/builtin_killold.bash index 450f590e3..2fec908cb 100644 --- a/paludis/repositories/e/ebuild/0/builtin_killold.bash +++ b/paludis/repositories/e/ebuild/0/builtin_killold.bash @@ -33,9 +33,7 @@ builtin_killold() ebuild_f_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/0/builtin_killoldmisc.bash b/paludis/repositories/e/ebuild/0/builtin_killoldmisc.bash index 506772fdd..55623af85 100644 --- a/paludis/repositories/e/ebuild/0/builtin_killoldmisc.bash +++ b/paludis/repositories/e/ebuild/0/builtin_killoldmisc.bash @@ -33,9 +33,7 @@ builtin_killoldmisc() ebuild_f_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/0/builtin_killoldrm.bash b/paludis/repositories/e/ebuild/0/builtin_killoldrm.bash index a5e5669e1..555ac943d 100644 --- a/paludis/repositories/e/ebuild/0/builtin_killoldrm.bash +++ b/paludis/repositories/e/ebuild/0/builtin_killoldrm.bash @@ -33,9 +33,7 @@ builtin_killoldrm() ebuild_f_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/0/builtin_loadenv.bash b/paludis/repositories/e/ebuild/0/builtin_loadenv.bash index 36de8f4cf..fe1c916c5 100644 --- a/paludis/repositories/e/ebuild/0/builtin_loadenv.bash +++ b/paludis/repositories/e/ebuild/0/builtin_loadenv.bash @@ -31,9 +31,7 @@ ebuild_f_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/0/builtin_saveenv.bash b/paludis/repositories/e/ebuild/0/builtin_saveenv.bash index f2f3468ad..b227b3299 100644 --- a/paludis/repositories/e/ebuild/0/builtin_saveenv.bash +++ b/paludis/repositories/e/ebuild/0/builtin_saveenv.bash @@ -28,9 +28,7 @@ ebuild_f_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/0/builtin_tidyup.bash b/paludis/repositories/e/ebuild/0/builtin_tidyup.bash index 27f8bba02..445c3b344 100644 --- a/paludis/repositories/e/ebuild/0/builtin_tidyup.bash +++ b/paludis/repositories/e/ebuild/0/builtin_tidyup.bash @@ -30,9 +30,7 @@ builtin_tidyup() ebuild_f_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/0/builtin_tidyupmisc.bash b/paludis/repositories/e/ebuild/0/builtin_tidyupmisc.bash index 8dbc35a0d..3e47aa7dd 100644 --- a/paludis/repositories/e/ebuild/0/builtin_tidyupmisc.bash +++ b/paludis/repositories/e/ebuild/0/builtin_tidyupmisc.bash @@ -30,9 +30,7 @@ builtin_tidyupmisc() ebuild_f_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/0/builtin_tidyuprm.bash b/paludis/repositories/e/ebuild/0/builtin_tidyuprm.bash index ba4127679..a282d34c6 100644 --- a/paludis/repositories/e/ebuild/0/builtin_tidyuprm.bash +++ b/paludis/repositories/e/ebuild/0/builtin_tidyuprm.bash @@ -30,9 +30,7 @@ builtin_tidyuprm() ebuild_f_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/0/pkg_config.bash b/paludis/repositories/e/ebuild/0/pkg_config.bash index e119a9a6e..c8160a6b1 100644 --- a/paludis/repositories/e/ebuild/0/pkg_config.bash +++ b/paludis/repositories/e/ebuild/0/pkg_config.bash @@ -30,9 +30,7 @@ ebuild_f_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 if [[ $(type -t pre_pkg_config ) == "function" ]] ; then diff --git a/paludis/repositories/e/ebuild/0/pkg_info.bash b/paludis/repositories/e/ebuild/0/pkg_info.bash index 856730d79..1990df624 100644 --- a/paludis/repositories/e/ebuild/0/pkg_info.bash +++ b/paludis/repositories/e/ebuild/0/pkg_info.bash @@ -23,9 +23,7 @@ pkg_info() ebuild_f_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 if [[ $(type -t pre_pkg_info ) == "function" ]] ; then diff --git a/paludis/repositories/e/ebuild/0/pkg_postinst.bash b/paludis/repositories/e/ebuild/0/pkg_postinst.bash index de74ee342..3fe06e819 100644 --- a/paludis/repositories/e/ebuild/0/pkg_postinst.bash +++ b/paludis/repositories/e/ebuild/0/pkg_postinst.bash @@ -30,9 +30,7 @@ ebuild_f_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 if [[ $(type -t pre_pkg_postinst ) == "function" ]] ; then diff --git a/paludis/repositories/e/ebuild/0/pkg_postrm.bash b/paludis/repositories/e/ebuild/0/pkg_postrm.bash index 8dc437b19..d027ec85f 100644 --- a/paludis/repositories/e/ebuild/0/pkg_postrm.bash +++ b/paludis/repositories/e/ebuild/0/pkg_postrm.bash @@ -30,9 +30,7 @@ ebuild_f_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 if [[ $(type -t pre_pkg_postrm ) == "function" ]] ; then diff --git a/paludis/repositories/e/ebuild/0/pkg_preinst.bash b/paludis/repositories/e/ebuild/0/pkg_preinst.bash index cbfb00910..5bfb42729 100644 --- a/paludis/repositories/e/ebuild/0/pkg_preinst.bash +++ b/paludis/repositories/e/ebuild/0/pkg_preinst.bash @@ -30,9 +30,7 @@ ebuild_f_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 if [[ $(type -t pre_pkg_preinst ) == "function" ]] ; then diff --git a/paludis/repositories/e/ebuild/0/pkg_prerm.bash b/paludis/repositories/e/ebuild/0/pkg_prerm.bash index 81c72cd7b..8f2824aaf 100644 --- a/paludis/repositories/e/ebuild/0/pkg_prerm.bash +++ b/paludis/repositories/e/ebuild/0/pkg_prerm.bash @@ -30,9 +30,7 @@ ebuild_f_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 if [[ $(type -t pre_pkg_prerm ) == "function" ]] ; then diff --git a/paludis/repositories/e/ebuild/0/pkg_pretend.bash b/paludis/repositories/e/ebuild/0/pkg_pretend.bash index 046470d61..cd5a4c90e 100644 --- a/paludis/repositories/e/ebuild/0/pkg_pretend.bash +++ b/paludis/repositories/e/ebuild/0/pkg_pretend.bash @@ -23,9 +23,7 @@ pkg_pretend() ebuild_f_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/0/pkg_setup.bash b/paludis/repositories/e/ebuild/0/pkg_setup.bash index 523444986..f5fabae3f 100644 --- a/paludis/repositories/e/ebuild/0/pkg_setup.bash +++ b/paludis/repositories/e/ebuild/0/pkg_setup.bash @@ -30,9 +30,7 @@ ebuild_f_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 if [[ $(type -t pre_pkg_setup ) == "function" ]] ; then diff --git a/paludis/repositories/e/ebuild/0/src_compile.bash b/paludis/repositories/e/ebuild/0/src_compile.bash index 282dba87c..ec8aff162 100644 --- a/paludis/repositories/e/ebuild/0/src_compile.bash +++ b/paludis/repositories/e/ebuild/0/src_compile.bash @@ -36,9 +36,7 @@ ebuild_f_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 if [[ $(type -t pre_src_compile ) == "function" ]] ; then diff --git a/paludis/repositories/e/ebuild/0/src_install.bash b/paludis/repositories/e/ebuild/0/src_install.bash index 44d51d6e2..50baf67c0 100644 --- a/paludis/repositories/e/ebuild/0/src_install.bash +++ b/paludis/repositories/e/ebuild/0/src_install.bash @@ -33,9 +33,7 @@ ebuild_f_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 if [[ $(type -t pre_src_install ) == "function" ]] ; then diff --git a/paludis/repositories/e/ebuild/0/src_test.bash b/paludis/repositories/e/ebuild/0/src_test.bash index e44c0ab77..37aeeb625 100644 --- a/paludis/repositories/e/ebuild/0/src_test.bash +++ b/paludis/repositories/e/ebuild/0/src_test.bash @@ -56,9 +56,7 @@ ebuild_f_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 if [[ $(type -t pre_src_test ) == "function" ]] ; then diff --git a/paludis/repositories/e/ebuild/0/src_unpack.bash b/paludis/repositories/e/ebuild/0/src_unpack.bash index 84d47bd31..5cc8831dc 100644 --- a/paludis/repositories/e/ebuild/0/src_unpack.bash +++ b/paludis/repositories/e/ebuild/0/src_unpack.bash @@ -29,9 +29,7 @@ ebuild_f_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 if [[ $(type -t pre_src_unpack ) == "function" ]] ; then |