From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 E948E158094 for ; Thu, 7 Jul 2022 20:12:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 17D43E0D49; Thu, 7 Jul 2022 20:12:23 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id E9D83E0D49 for ; 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 283F2340DCE for ; Thu, 7 Jul 2022 20:12:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8FCC750D for ; Thu, 7 Jul 2022 20:12:20 +0000 (UTC) From: "Matt Turner" 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" Message-ID: <1657224670.5bb0d5499f28589cbac80de023b7087da7c69780.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/vim/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/vim/vim-8.2.5066-r1.ebuild app-editors/vim/vim-9999.ebuild X-VCS-Directories: app-editors/vim/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 5bb0d5499f28589cbac80de023b7087da7c69780 X-VCS-Branch: master Date: Thu, 7 Jul 2022 20:12:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: db73a868-cc4e-491c-b060-5ffac1e133f0 X-Archives-Hash: 3f9712f49b24c6f015bce2af4b7ac3a9 commit: 5bb0d5499f28589cbac80de023b7087da7c69780 Author: Matt Turner gentoo org> AuthorDate: Thu Jul 7 20:09:34 2022 +0000 Commit: Matt Turner gentoo org> CommitDate: Thu Jul 7 20:11:10 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bb0d549 app-editors/vim: Sync live ebuild Signed-off-by: Matt Turner gentoo.org> app-editors/vim/vim-8.2.5066-r1.ebuild | 2 +- app-editors/vim/vim-9999.ebuild | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app-editors/vim/vim-8.2.5066-r1.ebuild b/app-editors/vim/vim-8.2.5066-r1.ebuild index f66b1592e72b..bcec32097911 100644 --- a/app-editors/vim/vim-8.2.5066-r1.ebuild +++ b/app-editors/vim/vim-8.2.5066-r1.ebuild @@ -118,7 +118,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 # conditionally make the manpager.sh script diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild index 0afdaaef7172..bcec32097911 100644 --- a/app-editors/vim/vim-9999.ebuild +++ b/app-editors/vim/vim-9999.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == 9999* ]] ; then EGIT_REPO_URI="https://github.com/vim/vim.git" else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.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 @@ -80,8 +80,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 @@ -120,7 +118,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 # conditionally make the manpager.sh script