[gentoo-commits] repo/gentoo:master commit in: app-editors/vim/

[Sam James]

commit:     971d2367313f4fc511c242d3b9903f2178208768
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  4 13:19:39 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct  4 13:26:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=971d2367

app-editors/vim: fix IndirectInherits, sync live

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-editors/vim/vim-9.0.0099-r1.ebuild |  2 +-
 app-editors/vim/vim-9999.ebuild        | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app-editors/vim/vim-9.0.0099-r1.ebuild 
b/app-editors/vim/vim-9.0.0099-r1.ebuild
index 7b427e86607f..512001925c59 100644
--- a/app-editors/vim/vim-9.0.0099-r1.ebuild
+++ b/app-editors/vim/vim-9.0.0099-r1.ebuild
@@ -11,7 +11,7 @@ PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="threads(+)"
 USE_RUBY="ruby27 ruby30 ruby31"
 
-inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 
ruby-single desktop xdg-utils
+inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 
ruby-single toolchain-funcs desktop xdg-utils
 
 if [[ ${PV} == 9999* ]] ; then
        inherit git-r3

diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index cfbe30fe984c..5ffcda64baac 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -11,7 +11,7 @@ PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="threads(+)"
 USE_RUBY="ruby27 ruby30 ruby31"
 
-inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 
ruby-single desktop xdg-utils
+inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 
ruby-single toolchain-funcs desktop xdg-utils
 
 if [[ ${PV} == 9999* ]] ; then
        inherit git-r3
@@ -78,7 +78,7 @@ src_prepare() {
 
        if [[ ${PV} != 9999* ]] ; then
                # Gentoo patches to fix runtime issues, cross-compile errors, 
etc
-               eapply "${WORKDIR}/vim-patches-vim-9.0.0049-patches"
+               eapply "${WORKDIR}"/vim-patches-vim-9.0.0049-patches
        fi
 
        # Fixup a script to use awk instead of nawk
@@ -250,6 +250,14 @@ src_configure() {
        # keep prefix env contained within the EPREFIX
        use prefix && myconf+=( --without-local-dir )
 
+       if tc-is-cross-compiler ; then
+               export vim_cv_getcwd_broken=no \
+                          vim_cv_memmove_handles_overlap=yes \
+                          vim_cv_stat_ignores_slash=yes \
+                          vim_cv_terminfo=yes \
+                          vim_cv_toupper_broken=no
+       fi
+
        econf \
                --with-modified-by=Gentoo-${PVR} \
                "${myconf[@]}"