diff options
| author | Brian Harring <ferringb@gmail.com> | 2012-09-13 23:00:10 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-09-14 00:13:31 -0700 |
| commit | 7571867c71392b5c61b040884017c00e9d1ecb3f (patch) | |
| tree | 92b8b615b5d01c34b69d378033dc001723fcd7d2 /bin/phase-helpers.sh | |
| parent | 9b19ac5696c487dab58d7c10990fe07fd7f1f731 (diff) | |
| download | portage-7571867c71392b5c61b040884017c00e9d1ecb3f.tar.gz portage-7571867c71392b5c61b040884017c00e9d1ecb3f.tar.bz2 portage-7571867c71392b5c61b040884017c00e9d1ecb3f.zip | |
Convert funcs of phase*.sh to __ prefixed namespace.
Diffstat (limited to 'bin/phase-helpers.sh')
| -rw-r--r-- | bin/phase-helpers.sh | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index 636336685..6a249e1dd 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -409,7 +409,7 @@ econf() { _hasgq() { _hasg "$@" >/dev/null ; } - local phase_func=$(_ebuild_arg_to_phase "$EAPI" "$EBUILD_PHASE") + local phase_func=$(__ebuild_arg_to_phase "$EAPI" "$EBUILD_PHASE") if [[ -n $phase_func ]] ; then if has "$EAPI" 0 1 ; then [[ $phase_func != src_compile ]] && \ @@ -552,7 +552,7 @@ einstall() { fi } -_eapi0_pkg_nofetch() { +__eapi0_pkg_nofetch() { [ -z "${SRC_URI}" ] && return elog "The following are listed in SRC_URI for ${PN}:" @@ -562,18 +562,18 @@ _eapi0_pkg_nofetch() { done } -_eapi0_src_unpack() { +__eapi0_src_unpack() { [[ -n ${A} ]] && unpack ${A} } -_eapi0_src_compile() { +__eapi0_src_compile() { if [ -x ./configure ] ; then econf fi - _eapi2_src_compile + __eapi2_src_compile } -_eapi0_src_test() { +__eapi0_src_test() { # Since we don't want emake's automatic die # support (EAPI 4 and later), and we also don't # want the warning messages that it produces if @@ -599,24 +599,24 @@ _eapi0_src_test() { fi } -_eapi1_src_compile() { - _eapi2_src_configure - _eapi2_src_compile +__eapi1_src_compile() { + __eapi2_src_configure + __eapi2_src_compile } -_eapi2_src_configure() { +__eapi2_src_configure() { if [[ -x ${ECONF_SOURCE:-.}/configure ]] ; then econf fi } -_eapi2_src_compile() { +__eapi2_src_compile() { if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then emake || die "emake failed" fi } -_eapi4_src_install() { +__eapi4_src_install() { if [[ -f Makefile || -f GNUmakefile || -f makefile ]] ; then emake DESTDIR="${D}" install fi |