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 210F815808B for ; Fri, 18 Feb 2022 17:57:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A85B2BC001; Fri, 18 Feb 2022 17:57:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 366682BC001 for ; Fri, 18 Feb 2022 17:57:01 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 56B2034352E for ; Fri, 18 Feb 2022 17:57:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EBE92D3 for ; Fri, 18 Feb 2022 17:56:58 +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: <1645206992.90d47914d37a74bf090f7c5fab43bb8f5084b9ae.sam@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.4285.ebuild app-editors/vim/vim-8.2.4328.ebuild X-VCS-Directories: app-editors/vim/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 90d47914d37a74bf090f7c5fab43bb8f5084b9ae X-VCS-Branch: master Date: Fri, 18 Feb 2022 17:56:58 +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: b1b51963-59bd-4798-9933-31c50843127a X-Archives-Hash: d29ba6ff1e8edcc9fe75725e6dbdf77a commit: 90d47914d37a74bf090f7c5fab43bb8f5084b9ae Author: Dongsu Park linux microsoft com> AuthorDate: Fri Feb 18 11:27:16 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Feb 18 17:56:32 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90d47914 app-editors/vim: fix conflicts in 8.2.{4285,4328} We fixed defaults.vim installation conflicts in 49adc5f0272e40ac608a89d268ee12811fcca384, but not for 8.2.4285 and 8.2.4328. Fix the issue for the versions. Bug: https://bugs.gentoo.org/830177 Signed-off-by: Dongsu Park linux.microsoft.com> Signed-off-by: Sam James gentoo.org> app-editors/vim/vim-8.2.4285.ebuild | 6 ++++-- app-editors/vim/vim-8.2.4328.ebuild | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app-editors/vim/vim-8.2.4285.ebuild b/app-editors/vim/vim-8.2.4285.ebuild index a15f1260d55d..2b7c3b0992cc 100644 --- a/app-editors/vim/vim-8.2.4285.ebuild +++ b/app-editors/vim/vim-8.2.4285.ebuild @@ -320,8 +320,10 @@ src_install() { # Fix an issue of missing defaults.vim when USE=minimal. if use minimal ; then - insinto ${vimfiles} - doins runtime/defaults.vim + if [[ ! -f "${vimfiles}/defaults.vim" ]]; then + insinto ${vimfiles} + doins runtime/defaults.vim + fi fi domenu runtime/vim.desktop diff --git a/app-editors/vim/vim-8.2.4328.ebuild b/app-editors/vim/vim-8.2.4328.ebuild index a15f1260d55d..2b7c3b0992cc 100644 --- a/app-editors/vim/vim-8.2.4328.ebuild +++ b/app-editors/vim/vim-8.2.4328.ebuild @@ -320,8 +320,10 @@ src_install() { # Fix an issue of missing defaults.vim when USE=minimal. if use minimal ; then - insinto ${vimfiles} - doins runtime/defaults.vim + if [[ ! -f "${vimfiles}/defaults.vim" ]]; then + insinto ${vimfiles} + doins runtime/defaults.vim + fi fi domenu runtime/vim.desktop