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 35ECF15808B for ; Fri, 18 Feb 2022 03:07:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 74F17E0821; Fri, 18 Feb 2022 03:07:07 +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 52544E0821 for ; Fri, 18 Feb 2022 03:07:07 +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 D78FB34337F for ; Fri, 18 Feb 2022 03:07:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F24F82EE for ; Fri, 18 Feb 2022 03:06:59 +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: <1645152809.49adc5f0272e40ac608a89d268ee12811fcca384.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.0814-r100.ebuild app-editors/vim/vim-8.2.3428-r1.ebuild app-editors/vim/vim-8.2.3567.ebuild app-editors/vim/vim-8.2.3582.ebuild app-editors/vim/vim-8.2.3669.ebuild app-editors/vim/vim-8.2.3741.ebuild app-editors/vim/vim-8.2.3950.ebuild app-editors/vim/vim-9999.ebuild X-VCS-Directories: app-editors/vim/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 49adc5f0272e40ac608a89d268ee12811fcca384 X-VCS-Branch: master Date: Fri, 18 Feb 2022 03:06:59 +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: b0ec969f-1f71-4b1d-a112-50b87733e603 X-Archives-Hash: e2bf506619eb77b8a39073f85f5db7b5 commit: 49adc5f0272e40ac608a89d268ee12811fcca384 Author: Dongsu Park linux microsoft com> AuthorDate: Thu Jan 27 16:23:03 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Feb 18 02:53:29 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49adc5f0 app-editors/vim: install defaults.vim only if the file is not installed Install defaults.vim only if the file is not installed already from vim-core. That's needed for avoiding conflicts between vim and vim-core. Closes: 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.0814-r100.ebuild | 6 ++++-- app-editors/vim/vim-8.2.3428-r1.ebuild | 6 ++++-- app-editors/vim/vim-8.2.3567.ebuild | 6 ++++-- app-editors/vim/vim-8.2.3582.ebuild | 6 ++++-- app-editors/vim/vim-8.2.3669.ebuild | 6 ++++-- app-editors/vim/vim-8.2.3741.ebuild | 6 ++++-- app-editors/vim/vim-8.2.3950.ebuild | 6 ++++-- app-editors/vim/vim-9999.ebuild | 6 ++++-- 8 files changed, 32 insertions(+), 16 deletions(-) diff --git a/app-editors/vim/vim-8.2.0814-r100.ebuild b/app-editors/vim/vim-8.2.0814-r100.ebuild index 0f20c926a800..11f77d9c3dee 100644 --- a/app-editors/vim/vim-8.2.0814-r100.ebuild +++ b/app-editors/vim/vim-8.2.0814-r100.ebuild @@ -306,8 +306,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.3428-r1.ebuild b/app-editors/vim/vim-8.2.3428-r1.ebuild index 6a4b59f53ef1..0b57137c4a67 100644 --- a/app-editors/vim/vim-8.2.3428-r1.ebuild +++ b/app-editors/vim/vim-8.2.3428-r1.ebuild @@ -318,8 +318,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.3567.ebuild b/app-editors/vim/vim-8.2.3567.ebuild index 3ce917bf8851..a16ecf652266 100644 --- a/app-editors/vim/vim-8.2.3567.ebuild +++ b/app-editors/vim/vim-8.2.3567.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.3582.ebuild b/app-editors/vim/vim-8.2.3582.ebuild index a17b74f24534..62135009f599 100644 --- a/app-editors/vim/vim-8.2.3582.ebuild +++ b/app-editors/vim/vim-8.2.3582.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.3669.ebuild b/app-editors/vim/vim-8.2.3669.ebuild index 3ce917bf8851..a16ecf652266 100644 --- a/app-editors/vim/vim-8.2.3669.ebuild +++ b/app-editors/vim/vim-8.2.3669.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.3741.ebuild b/app-editors/vim/vim-8.2.3741.ebuild index 08b5ddc82130..53e69aee9488 100644 --- a/app-editors/vim/vim-8.2.3741.ebuild +++ b/app-editors/vim/vim-8.2.3741.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.3950.ebuild b/app-editors/vim/vim-8.2.3950.ebuild index a15f1260d55d..2b7c3b0992cc 100644 --- a/app-editors/vim/vim-8.2.3950.ebuild +++ b/app-editors/vim/vim-8.2.3950.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-9999.ebuild b/app-editors/vim/vim-9999.ebuild index 3ce917bf8851..a16ecf652266 100644 --- a/app-editors/vim/vim-9999.ebuild +++ b/app-editors/vim/vim-9999.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