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 7E0A215800F for ; Sat, 18 Feb 2023 04:33:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9E5E7E07F9; Sat, 18 Feb 2023 04:33:09 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 86811E07F9 for ; Sat, 18 Feb 2023 04:33:09 +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 9A8CA335DE8 for ; Sat, 18 Feb 2023 04:33:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0EB648AB for ; Sat, 18 Feb 2023 04:33:07 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1676694759.8ef01b5deddc1b8633d99907f2941ee8a85d60f1.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/gvim/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/gvim/gvim-9.0.1000.ebuild app-editors/gvim/gvim-9.0.1157.ebuild app-editors/gvim/gvim-9999.ebuild X-VCS-Directories: app-editors/gvim/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8ef01b5deddc1b8633d99907f2941ee8a85d60f1 X-VCS-Branch: master Date: Sat, 18 Feb 2023 04:33:07 +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: 80c6b973-62e5-4984-ac22-6c5d64691ff1 X-Archives-Hash: 0d031ab734dd34052d9ece4152529d35 commit: 8ef01b5deddc1b8633d99907f2941ee8a85d60f1 Author: Oskari Pirhonen gmail com> AuthorDate: Thu Feb 16 07:07:20 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sat Feb 18 04:32:39 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ef01b5d app-editors/gvim: remove manual patch application Signed-off-by: Oskari Pirhonen gmail.com> Signed-off-by: Sam James gentoo.org> app-editors/gvim/gvim-9.0.1000.ebuild | 14 ++++++++------ app-editors/gvim/gvim-9.0.1157.ebuild | 14 ++++++++------ app-editors/gvim/gvim-9999.ebuild | 14 ++++++++------ 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/app-editors/gvim/gvim-9.0.1000.ebuild b/app-editors/gvim/gvim-9.0.1000.ebuild index 2de60ab53f5d..708d13e40470 100644 --- a/app-editors/gvim/gvim-9.0.1000.ebuild +++ b/app-editors/gvim/gvim-9.0.1000.ebuild @@ -80,6 +80,13 @@ BDEPEND=" " PDEPEND="!minimal? ( app-vim/gentoo-syntax )" +if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + PATCHES=( + "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches" + ) +fi + # various failures (bugs #630042 and #682320) RESTRICT="test" @@ -93,10 +100,7 @@ pkg_setup() { } src_prepare() { - if [[ ${PV} != 9999* ]]; then - # Gentoo patches to fix runtime issues, cross-compile errors, etc - eapply "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches" - fi + default # Fixup a script to use awk instead of nawk sed -i -e \ @@ -163,8 +167,6 @@ src_prepare() { sed -i -e \ '/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope" fi - - eapply_user } src_configure() { diff --git a/app-editors/gvim/gvim-9.0.1157.ebuild b/app-editors/gvim/gvim-9.0.1157.ebuild index 29c24d0ea9fb..01f283c88448 100644 --- a/app-editors/gvim/gvim-9.0.1157.ebuild +++ b/app-editors/gvim/gvim-9.0.1157.ebuild @@ -80,6 +80,13 @@ BDEPEND=" " PDEPEND="!minimal? ( app-vim/gentoo-syntax )" +if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + PATCHES=( + "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches" + ) +fi + # various failures (bugs #630042 and #682320) RESTRICT="test" @@ -93,10 +100,7 @@ pkg_setup() { } src_prepare() { - if [[ ${PV} != 9999* ]]; then - # Gentoo patches to fix runtime issues, cross-compile errors, etc - eapply "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches" - fi + default # Fixup a script to use awk instead of nawk sed -i -e \ @@ -163,8 +167,6 @@ src_prepare() { sed -i -e \ '/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope" fi - - eapply_user } src_configure() { diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild index 29c24d0ea9fb..01f283c88448 100644 --- a/app-editors/gvim/gvim-9999.ebuild +++ b/app-editors/gvim/gvim-9999.ebuild @@ -80,6 +80,13 @@ BDEPEND=" " PDEPEND="!minimal? ( app-vim/gentoo-syntax )" +if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + PATCHES=( + "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches" + ) +fi + # various failures (bugs #630042 and #682320) RESTRICT="test" @@ -93,10 +100,7 @@ pkg_setup() { } src_prepare() { - if [[ ${PV} != 9999* ]]; then - # Gentoo patches to fix runtime issues, cross-compile errors, etc - eapply "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches" - fi + default # Fixup a script to use awk instead of nawk sed -i -e \ @@ -163,8 +167,6 @@ src_prepare() { sed -i -e \ '/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope" fi - - eapply_user } src_configure() {