From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1416251-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 53718158094
for <garchives@archives.gentoo.org>; Thu, 7 Jul 2022 20:12:24 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 20577E0D4D;
Thu, 7 Jul 2022 20:12:23 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 02754E0D4D
for <gentoo-commits@lists.gentoo.org>; Thu, 7 Jul 2022 20:12:22 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 0FFCA340DB2
for <gentoo-commits@lists.gentoo.org>; Thu, 7 Jul 2022 20:12:22 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 78FD5474
for <gentoo-commits@lists.gentoo.org>; Thu, 7 Jul 2022 20:12:20 +0000 (UTC)
From: "Matt Turner" <mattst88@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" <mattst88@gentoo.org>
Message-ID: <1657224670.18b55350750f52a6b3f79c37b6af02e1b580bb54.mattst88@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/vim-core/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-editors/vim-core/vim-core-8.2.5066-r1.ebuild app-editors/vim-core/vim-core-9999.ebuild
X-VCS-Directories: app-editors/vim-core/
X-VCS-Committer: mattst88
X-VCS-Committer-Name: Matt Turner
X-VCS-Revision: 18b55350750f52a6b3f79c37b6af02e1b580bb54
X-VCS-Branch: master
Date: Thu, 7 Jul 2022 20:12:20 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: a7155c1b-91cc-446d-b11e-1d986b725b8d
X-Archives-Hash: 5988d760e7cdb840c825f86ab9698fe2
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.