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

[Matt Turner]

commit:     18b55350750f52a6b3f79c37b6af02e1b580bb54
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  7 20:09:23 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Jul  7 20:11:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18b55350

app-editors/vim-core: Sync live ebuild

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 app-editors/vim-core/vim-core-8.2.5066-r1.ebuild | 2 +-
 app-editors/vim-core/vim-core-9999.ebuild        | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app-editors/vim-core/vim-core-8.2.5066-r1.ebuild 
b/app-editors/vim-core/vim-core-8.2.5066-r1.ebuild
index 4798b25ef622..2ab640fe7da3 100644
--- a/app-editors/vim-core/vim-core-8.2.5066-r1.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.5066-r1.ebuild
@@ -80,7 +80,7 @@ src_prepare() {
        # which isn't even in the source file being invalid, we'll do some 
trickery
        # to make the error never occur. bug 66162 (02 October 2004 ciaranm)
        find "${S}" -name '*.c' | while read c; do
-           echo >> "$c" || die "echo failed"
+               echo >> "$c" || die "echo failed"
        done
 
        # Try to avoid sandbox problems. Bug #114475.

diff --git a/app-editors/vim-core/vim-core-9999.ebuild 
b/app-editors/vim-core/vim-core-9999.ebuild
index 3663d9c774fc..2ab640fe7da3 100644
--- a/app-editors/vim-core/vim-core-9999.ebuild
+++ b/app-editors/vim-core/vim-core-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]] ; then
        EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
 else
        SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> 
vim-${PV}.tar.gz
-               
https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz";
+               
https://dev.gentoo.org/~mattst88/distfiles/vim-8.2.5066-gentoo-patches.tar.xz";
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 S="${WORKDIR}"/vim-${PV}
@@ -44,8 +44,6 @@ pkg_setup() {
 
 src_prepare() {
        if [[ ${PV} != 9999* ]] ; then
-               rm "${WORKDIR}"/patches/006-vim-8.0.0617-crosscompile.patch || 
die
-
                # Gentoo patches to fix runtime issues, cross-compile errors, 
etc
                eapply "${WORKDIR}"/patches
        fi
@@ -82,7 +80,7 @@ src_prepare() {
        # which isn't even in the source file being invalid, we'll do some 
trickery
        # to make the error never occur. bug 66162 (02 October 2004 ciaranm)
        find "${S}" -name '*.c' | while read c; do
-           echo >> "$c" || die "echo failed"
+               echo >> "$c" || die "echo failed"
        done
 
        # Try to avoid sandbox problems. Bug #114475.