commit:     0ed7eeb0fc507a550d1d4d4ff941e85ad19ec602
Author:     Kerin Millar <kfm <AT> plushkava <DOT> net>
AuthorDate: Thu May 29 09:54:51 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 29 10:01:55 2025 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=0ed7eeb0

eapi.sh: Format function declarations in tabular fashion

In my estimation, this renders the unit markedly more pleasant to read.

Signed-off-by: Kerin Millar <kfm <AT> plushkava.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 bin/eapi.sh | 335 ++++++++++++------------------------------------------------
 1 file changed, 68 insertions(+), 267 deletions(-)

diff --git a/bin/eapi.sh b/bin/eapi.sh
index fa64458183..ecaaaa62d6 100644
--- a/bin/eapi.sh
+++ b/bin/eapi.sh
@@ -4,282 +4,83 @@
 
 # PHASES
 
-___eapi_has_pkg_pretend() {
-       [[ ${1-${EAPI-0}} != [0-3] ]]
-}
-
-___eapi_has_src_prepare() {
-       [[ ${1-${EAPI-0}} != [01] ]]
-}
-
-___eapi_has_src_configure() {
-       [[ ${1-${EAPI-0}} != [01] ]]
-}
-
-___eapi_default_src_test_disables_parallel_jobs() {
-       [[ ${1-${EAPI-0}} == [0-4] ]]
-}
-
-___eapi_has_S_WORKDIR_fallback() {
-       [[ ${1-${EAPI-0}} == [0-3] ]]
-}
+___eapi_has_pkg_pretend()                          [[ ${1-${EAPI-0}} != [0-3] 
]]
+___eapi_has_src_prepare()                          [[ ${1-${EAPI-0}} != [01]  
]]
+___eapi_has_src_configure()                        [[ ${1-${EAPI-0}} != [01]  
]]
+___eapi_default_src_test_disables_parallel_jobs()  [[ ${1-${EAPI-0}} == [0-4] 
]]
+___eapi_has_S_WORKDIR_fallback()                   [[ ${1-${EAPI-0}} == [0-3] 
]]
 
 # VARIABLES
 
-___eapi_has_prefix_variables() {
-       [[ ${1-${EAPI-0}} != [0-2] ]]
-}
-
-___eapi_has_BROOT() {
-       [[ ${1-${EAPI-0}} != [0-6] ]]
-}
-
-___eapi_has_SYSROOT() {
-       [[ ${1-${EAPI-0}} != [0-6] ]]
-}
-
-___eapi_has_BDEPEND() {
-       [[ ${1-${EAPI-0}} != [0-6] ]]
-}
-
-___eapi_has_IDEPEND() {
-       [[ ${1-${EAPI-0}} != [0-7] ]]
-}
-
-___eapi_has_RDEPEND_DEPEND_fallback() {
-       [[ ${1-${EAPI-0}} == [0-3] ]]
-}
-
-___eapi_has_PORTDIR_ECLASSDIR() {
-       [[ ${1-${EAPI-0}} == [0-6] ]]
-}
-
-___eapi_has_accumulated_PROPERTIES() {
-       [[ ${1-${EAPI-0}} != [0-7] ]]
-}
-
-___eapi_has_accumulated_RESTRICT() {
-       [[ ${1-${EAPI-0}} != [0-7] ]]
-}
+___eapi_has_prefix_variables()         [[ ${1-${EAPI-0}} != [0-2] ]]
+___eapi_has_BROOT()                    [[ ${1-${EAPI-0}} != [0-6] ]]
+___eapi_has_SYSROOT()                  [[ ${1-${EAPI-0}} != [0-6] ]]
+___eapi_has_BDEPEND()                  [[ ${1-${EAPI-0}} != [0-6] ]]
+___eapi_has_IDEPEND()                  [[ ${1-${EAPI-0}} != [0-7] ]]
+___eapi_has_RDEPEND_DEPEND_fallback()  [[ ${1-${EAPI-0}} == [0-3] ]]
+___eapi_has_PORTDIR_ECLASSDIR()        [[ ${1-${EAPI-0}} == [0-6] ]]
+___eapi_has_accumulated_PROPERTIES()   [[ ${1-${EAPI-0}} != [0-7] ]]
+___eapi_has_accumulated_RESTRICT()     [[ ${1-${EAPI-0}} != [0-7] ]]
 
 # HELPERS PRESENCE
 
-___eapi_has_dohard() {
-       [[ ${1-${EAPI-0}} == [0-3] ]]
-}
-
-___eapi_has_dosed() {
-       [[ ${1-${EAPI-0}} == [0-3] ]]
-}
-
-___eapi_has_einstall() {
-       [[ ${1-${EAPI-0}} == [0-5] ]]
-}
-
-___eapi_has_dohtml() {
-       [[ ${1-${EAPI-0}} == [0-6] ]]
-}
-
-___eapi_has_dolib_libopts() {
-       [[ ${1-${EAPI-0}} == [0-6] ]]
-}
-
-___eapi_has_docompress() {
-       [[ ${1-${EAPI-0}} != [0-3] ]]
-}
-
-___eapi_has_dostrip() {
-       [[ ${1-${EAPI-0}} != [0-6] ]]
-}
-
-___eapi_has_nonfatal() {
-       [[ ${1-${EAPI-0}} != [0-3] ]]
-}
-
-___eapi_has_doheader() {
-       [[ ${1-${EAPI-0}} != [0-4] ]]
-}
-
-___eapi_has_usex() {
-       [[ ${1-${EAPI-0}} != [0-4] ]]
-}
-
-___eapi_has_get_libdir() {
-       [[ ${1-${EAPI-0}} != [0-5] ]]
-}
-
-___eapi_has_einstalldocs() {
-       [[ ${1-${EAPI-0}} != [0-5] ]]
-}
-
-___eapi_has_eapply() {
-       [[ ${1-${EAPI-0}} != [0-5] ]]
-}
-
-___eapi_has_eapply_user() {
-       [[ ${1-${EAPI-0}} != [0-5] ]]
-}
-
-___eapi_has_in_iuse() {
-       [[ ${1-${EAPI-0}} != [0-5] ]]
-}
-
-___eapi_has_version_functions() {
-       [[ ${1-${EAPI-0}} != [0-6] ]]
-}
-
-___eapi_has_hasq() {
-       [[ ${1-${EAPI-0}} == [0-7] ]]
-}
-
-___eapi_has_hasv() {
-       [[ ${1-${EAPI-0}} == [0-7] ]]
-}
-
-___eapi_has_useq() {
-       [[ ${1-${EAPI-0}} == [0-7] ]]
-}
+___eapi_has_dohard()             [[ ${1-${EAPI-0}} == [0-3] ]]
+___eapi_has_dosed()              [[ ${1-${EAPI-0}} == [0-3] ]]
+___eapi_has_einstall()           [[ ${1-${EAPI-0}} == [0-5] ]]
+___eapi_has_dohtml()             [[ ${1-${EAPI-0}} == [0-6] ]]
+___eapi_has_dolib_libopts()      [[ ${1-${EAPI-0}} == [0-6] ]]
+___eapi_has_docompress()         [[ ${1-${EAPI-0}} != [0-3] ]]
+___eapi_has_dostrip()            [[ ${1-${EAPI-0}} != [0-6] ]]
+___eapi_has_nonfatal()           [[ ${1-${EAPI-0}} != [0-3] ]]
+___eapi_has_doheader()           [[ ${1-${EAPI-0}} != [0-4] ]]
+___eapi_has_usex()               [[ ${1-${EAPI-0}} != [0-4] ]]
+___eapi_has_get_libdir()         [[ ${1-${EAPI-0}} != [0-5] ]]
+___eapi_has_einstalldocs()       [[ ${1-${EAPI-0}} != [0-5] ]]
+___eapi_has_eapply()             [[ ${1-${EAPI-0}} != [0-5] ]]
+___eapi_has_eapply_user()        [[ ${1-${EAPI-0}} != [0-5] ]]
+___eapi_has_in_iuse()            [[ ${1-${EAPI-0}} != [0-5] ]]
+___eapi_has_version_functions()  [[ ${1-${EAPI-0}} != [0-6] ]]
+___eapi_has_hasq()               [[ ${1-${EAPI-0}} == [0-7] ]]
+___eapi_has_hasv()               [[ ${1-${EAPI-0}} == [0-7] ]]
+___eapi_has_useq()               [[ ${1-${EAPI-0}} == [0-7] ]]
 
 # HELPERS BEHAVIOR
 
-___eapi_best_version_and_has_version_support_--host-root() {
-       [[ ${1-${EAPI-0}} == [56] ]]
-}
-
-___eapi_best_version_and_has_version_support_-b_-d_-r() {
-       [[ ${1-${EAPI-0}} != [0-6] ]]
-}
-
-___eapi_unpack_supports_xz() {
-       [[ ${1-${EAPI-0}} != [0-2] ]]
-}
-
-___eapi_unpack_supports_txz() {
-       [[ ${1-${EAPI-0}} != [0-5] ]]
-}
-
-___eapi_unpack_supports_7z() {
-       [[ ${1-${EAPI-0}} == [0-7] ]]
-}
-
-___eapi_unpack_supports_lha() {
-       [[ ${1-${EAPI-0}} == [0-7] ]]
-}
-
-___eapi_unpack_supports_rar() {
-       [[ ${1-${EAPI-0}} == [0-7] ]]
-}
-
-___eapi_econf_passes_--disable-dependency-tracking() {
-       [[ ${1-${EAPI-0}} != [0-3] ]]
-}
-
-___eapi_econf_passes_--disable-silent-rules() {
-       [[ ${1-${EAPI-0}} != [0-4] ]]
-}
-
-___eapi_econf_passes_--datarootdir() {
-       [[ ${1-${EAPI-0}} != [0-7] ]]
-}
-
-___eapi_econf_passes_--disable-static() {
-       [[ ${1-${EAPI-0}} != [0-7] ]]
-}
-
-___eapi_econf_passes_--docdir_and_--htmldir() {
-       [[ ${1-${EAPI-0}} != [0-5] ]]
-}
-
-___eapi_econf_passes_--with-sysroot() {
-       [[ ${1-${EAPI-0}} != [0-6] ]]
-}
-
-___eapi_use_enable_and_use_with_support_empty_third_argument() {
-       [[ ${1-${EAPI-0}} != [0-3] ]]
-}
-
-___eapi_dodoc_supports_-r() {
-       [[ ${1-${EAPI-0}} != [0-3] ]]
-}
-
-___eapi_doins_and_newins_preserve_symlinks() {
-       [[ ${1-${EAPI-0}} != [0-3] ]]
-}
-
-___eapi_newins_supports_reading_from_standard_input() {
-       [[ ${1-${EAPI-0}} != [0-4] ]]
-}
-
-___eapi_helpers_can_die() {
-       [[ ${1-${EAPI-0}} != [0-3] ]]
-}
-
-___eapi_unpack_is_case_sensitive() {
-       [[ ${1-${EAPI-0}} == [0-5] ]]
-}
-
-___eapi_unpack_supports_absolute_paths() {
-       [[ ${1-${EAPI-0}} != [0-5] ]]
-}
-
-___eapi_die_can_respect_nonfatal() {
-       [[ ${1-${EAPI-0}} != [0-5] ]]
-}
-
-___eapi_domo_respects_into() {
-       [[ ${1-${EAPI-0}} == [0-6] ]]
-}
-
-___eapi_has_DESTTREE_INSDESTTREE() {
-       [[ ${1-${EAPI-0}} == [0-6] ]]
-}
-
-___eapi_has_dosym_r() {
-       [[ ${1-${EAPI-0}} != [0-7] ]]
-}
-
-___eapi_usev_has_second_arg() {
-       [[ ${1-${EAPI-0}} != [0-7] ]]
-}
-
-___eapi_doconfd_respects_insopts() {
-       [[ ${1-${EAPI-0}} == [0-7] ]]
-}
-
-___eapi_doenvd_respects_insopts() {
-       [[ ${1-${EAPI-0}} == [0-7] ]]
-}
-
-___eapi_doheader_respects_insopts() {
-       [[ ${1-${EAPI-0}} == [0-7] ]]
-}
-
-___eapi_doinitd_respects_exeopts() {
-       [[ ${1-${EAPI-0}} == [0-7] ]]
-}
+___eapi_best_version_and_has_version_support_--host-root()      [[ 
${1-${EAPI-0}} == [56]  ]]
+___eapi_best_version_and_has_version_support_-b_-d_-r()         [[ 
${1-${EAPI-0}} != [0-6] ]]
+___eapi_unpack_supports_xz()                                    [[ 
${1-${EAPI-0}} != [0-2] ]]
+___eapi_unpack_supports_txz()                                   [[ 
${1-${EAPI-0}} != [0-5] ]]
+___eapi_unpack_supports_7z()                                    [[ 
${1-${EAPI-0}} == [0-7] ]]
+___eapi_unpack_supports_lha()                                   [[ 
${1-${EAPI-0}} == [0-7] ]]
+___eapi_unpack_supports_rar()                                   [[ 
${1-${EAPI-0}} == [0-7] ]]
+___eapi_econf_passes_--disable-dependency-tracking()            [[ 
${1-${EAPI-0}} != [0-3] ]]
+___eapi_econf_passes_--disable-silent-rules()                   [[ 
${1-${EAPI-0}} != [0-4] ]]
+___eapi_econf_passes_--datarootdir()                            [[ 
${1-${EAPI-0}} != [0-7] ]]
+___eapi_econf_passes_--disable-static()                         [[ 
${1-${EAPI-0}} != [0-7] ]]
+___eapi_econf_passes_--docdir_and_--htmldir()                   [[ 
${1-${EAPI-0}} != [0-5] ]]
+___eapi_econf_passes_--with-sysroot()                           [[ 
${1-${EAPI-0}} != [0-6] ]]
+___eapi_use_enable_and_use_with_support_empty_third_argument()  [[ 
${1-${EAPI-0}} != [0-3] ]]
+___eapi_dodoc_supports_-r()                                     [[ 
${1-${EAPI-0}} != [0-3] ]]
+___eapi_doins_and_newins_preserve_symlinks()                    [[ 
${1-${EAPI-0}} != [0-3] ]]
+___eapi_newins_supports_reading_from_standard_input()           [[ 
${1-${EAPI-0}} != [0-4] ]]
+___eapi_helpers_can_die()                                       [[ 
${1-${EAPI-0}} != [0-3] ]]
+___eapi_unpack_is_case_sensitive()                              [[ 
${1-${EAPI-0}} == [0-5] ]]
+___eapi_unpack_supports_absolute_paths()                        [[ 
${1-${EAPI-0}} != [0-5] ]]
+___eapi_die_can_respect_nonfatal()                              [[ 
${1-${EAPI-0}} != [0-5] ]]
+___eapi_domo_respects_into()                                    [[ 
${1-${EAPI-0}} == [0-6] ]]
+___eapi_has_DESTTREE_INSDESTTREE()                              [[ 
${1-${EAPI-0}} == [0-6] ]]
+___eapi_has_dosym_r()                                           [[ 
${1-${EAPI-0}} != [0-7] ]]
+___eapi_usev_has_second_arg()                                   [[ 
${1-${EAPI-0}} != [0-7] ]]
+___eapi_doconfd_respects_insopts()                              [[ 
${1-${EAPI-0}} == [0-7] ]]
+___eapi_doenvd_respects_insopts()                               [[ 
${1-${EAPI-0}} == [0-7] ]]
+___eapi_doheader_respects_insopts()                             [[ 
${1-${EAPI-0}} == [0-7] ]]
+___eapi_doinitd_respects_exeopts()                              [[ 
${1-${EAPI-0}} == [0-7] ]]
 
 # OTHERS
 
-___eapi_enables_failglob_in_global_scope() {
-       [[ ${1-${EAPI-0}} != [0-5] ]]
-}
-
-___eapi_bash_3_2() {
-       [[ ${1-${EAPI-0}} == [0-5] ]]
-}
-
-___eapi_bash_4_2() {
-       [[ ${1-${EAPI-0}} == [67] ]]
-}
-
-___eapi_bash_5_0() {
-       [[ ${1-${EAPI-0}} != [0-7] ]]
-}
-
-___eapi_has_ENV_UNSET() {
-       [[ ${1-${EAPI-0}} != [0-6] ]]
-}
-
-___eapi_has_strict_keepdir() {
-       [[ ${1-${EAPI-0}} != [0-7] ]]
-}
+___eapi_enables_failglob_in_global_scope()  [[ ${1-${EAPI-0}} != [0-5] ]]
+___eapi_bash_3_2()                          [[ ${1-${EAPI-0}} == [0-5] ]]
+___eapi_bash_4_2()                          [[ ${1-${EAPI-0}} == [67]  ]]
+___eapi_bash_5_0()                          [[ ${1-${EAPI-0}} != [0-7] ]]
+___eapi_has_ENV_UNSET()                     [[ ${1-${EAPI-0}} != [0-6] ]]
+___eapi_has_strict_keepdir()                [[ ${1-${EAPI-0}} != [0-7] ]]

Reply via email to