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 2EA5415800F for ; Sat, 18 Feb 2023 04:33:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 739A2E0845; Sat, 18 Feb 2023 04:33:10 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 37AC0E0845 for ; Sat, 18 Feb 2023 04:33:10 +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 2519533BEC7 for ; Sat, 18 Feb 2023 04:33:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 371568B4 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.1882a663653da85fc261820369a2a9acb3168a39.sam@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-9.0.1000.ebuild app-editors/vim-core/vim-core-9.0.1157.ebuild app-editors/vim-core/vim-core-9999.ebuild X-VCS-Directories: app-editors/vim-core/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 1882a663653da85fc261820369a2a9acb3168a39 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: 6c4c0bc8-8079-48c6-9403-9d49cd3f3c30 X-Archives-Hash: 4b5745f8220e0a9435726bcdfc7c7c63 commit: 1882a663653da85fc261820369a2a9acb3168a39 Author: Oskari Pirhonen gmail com> AuthorDate: Thu Feb 16 07:10:13 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=1882a663 app-editors/vim-core: remove manual patch application Signed-off-by: Oskari Pirhonen gmail.com> Closes: https://github.com/gentoo/gentoo/pull/29601 Signed-off-by: Sam James gentoo.org> app-editors/vim-core/vim-core-9.0.1000.ebuild | 14 ++++++++------ app-editors/vim-core/vim-core-9.0.1157.ebuild | 14 ++++++++------ app-editors/vim-core/vim-core-9999.ebuild | 14 ++++++++------ 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/app-editors/vim-core/vim-core-9.0.1000.ebuild b/app-editors/vim-core/vim-core-9.0.1000.ebuild index ba583b0f4e11..98d156f8fe5e 100644 --- a/app-editors/vim-core/vim-core-9.0.1000.ebuild +++ b/app-editors/vim-core/vim-core-9.0.1000.ebuild @@ -31,6 +31,13 @@ IUSE="nls acl minimal" DEPEND=">=sys-libs/ncurses-5.2-r2:0" BDEPEND="sys-devel/autoconf" +if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + PATCHES=( + "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches" + ) +fi + pkg_setup() { # people with broken alphabets run into trouble. bug #82186. unset LANG LC_ALL @@ -38,10 +45,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 \ @@ -106,8 +110,6 @@ src_prepare() { # Remove src/auto/configure file. rm -v src/auto/configure || die "rm configure failed" - - eapply_user } src_configure() { diff --git a/app-editors/vim-core/vim-core-9.0.1157.ebuild b/app-editors/vim-core/vim-core-9.0.1157.ebuild index a9836a9b50d9..64e63ae0b84e 100644 --- a/app-editors/vim-core/vim-core-9.0.1157.ebuild +++ b/app-editors/vim-core/vim-core-9.0.1157.ebuild @@ -31,6 +31,13 @@ IUSE="nls acl minimal" DEPEND=">=sys-libs/ncurses-5.2-r2:0" BDEPEND="sys-devel/autoconf" +if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + PATCHES=( + "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches" + ) +fi + pkg_setup() { # people with broken alphabets run into trouble. bug #82186. unset LANG LC_ALL @@ -38,10 +45,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 \ @@ -106,8 +110,6 @@ src_prepare() { # Remove src/auto/configure file. rm -v src/auto/configure || die "rm configure failed" - - eapply_user } src_configure() { diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild index df3192ffe27a..64e63ae0b84e 100644 --- a/app-editors/vim-core/vim-core-9999.ebuild +++ b/app-editors/vim-core/vim-core-9999.ebuild @@ -31,6 +31,13 @@ IUSE="nls acl minimal" DEPEND=">=sys-libs/ncurses-5.2-r2:0" BDEPEND="sys-devel/autoconf" +if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + PATCHES=( + "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches" + ) +fi + pkg_setup() { # people with broken alphabets run into trouble. bug #82186. unset LANG LC_ALL @@ -38,10 +45,7 @@ pkg_setup() { } 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 - fi + default # Fixup a script to use awk instead of nawk sed -i \ @@ -106,8 +110,6 @@ src_prepare() { # Remove src/auto/configure file. rm -v src/auto/configure || die "rm configure failed" - - eapply_user } src_configure() {