From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1344925-garchives=archives.gentoo.org@lists.gentoo.org>
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 4D1B9158086
for <garchives@archives.gentoo.org>; Wed, 1 Dec 2021 17:07:51 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B51512BC04D;
Wed, 1 Dec 2021 17:07:11 +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))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 935B92BC04D
for <gentoo-commits@lists.gentoo.org>; Wed, 1 Dec 2021 17:07: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))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 6CCF6342E48
for <gentoo-commits@lists.gentoo.org>; Wed, 1 Dec 2021 17:07:07 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 054D51FE
for <gentoo-commits@lists.gentoo.org>; Wed, 1 Dec 2021 17:07:06 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1638378416.74eaf6b7cbab24337eae5c07d42871aeb21a330e.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-8.2.0814.ebuild app-editors/vim-core/vim-core-8.2.3428.ebuild app-editors/vim-core/vim-core-8.2.3567.ebuild app-editors/vim-core/vim-core-8.2.3582.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: 74eaf6b7cbab24337eae5c07d42871aeb21a330e
X-VCS-Branch: master
Date: Wed, 1 Dec 2021 17:07:06 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: fce087e3-41bb-4e22-a49d-b0d6e216642f
X-Archives-Hash: 864d81909dfe0da3aa7d16e09b56b0bb
commit: 74eaf6b7cbab24337eae5c07d42871aeb21a330e
Author: Dongsu Park <dpark <AT> linux <DOT> microsoft <DOT> com>
AuthorDate: Wed Dec 1 16:40:27 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 1 17:06:56 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74eaf6b7
app-editors/vim-core: delete configs that conflict with vim[minimal]
Delete skip_defaults_vim config options from /etc/vimrc, to avoid
conflicts with vim[minimal].
Delete /usr/share/vim/vim82/defaults.vim, to avoid conflicts with
vim[minimal].
Signed-off-by: Dongsu Park <dpark <AT> linux.microsoft.com>
Closes: https://github.com/gentoo/gentoo/pull/23115
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-editors/vim-core/vim-core-8.2.0814.ebuild | 6 ++++++
app-editors/vim-core/vim-core-8.2.3428.ebuild | 6 ++++++
app-editors/vim-core/vim-core-8.2.3567.ebuild | 6 ++++++
app-editors/vim-core/vim-core-8.2.3582.ebuild | 6 ++++++
app-editors/vim-core/vim-core-9999.ebuild | 6 ++++++
5 files changed, 30 insertions(+)
diff --git a/app-editors/vim-core/vim-core-8.2.0814.ebuild b/app-editors/vim-core/vim-core-8.2.0814.ebuild
index 7cccceadd8e4..5c1fb6f93cb3 100644
--- a/app-editors/vim-core/vim-core-8.2.0814.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.0814.ebuild
@@ -191,6 +191,9 @@ src_install() {
rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
+ # Delete defaults.vim to avoid conflicts with one from vim[minimal]
+ rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
+
local keep_colors="default"
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
@@ -199,6 +202,9 @@ src_install() {
keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
+ # Delete skip_defaults_vim config not supported by vim[minimal]
+ sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed"
+
eshopts_pop
fi
diff --git a/app-editors/vim-core/vim-core-8.2.3428.ebuild b/app-editors/vim-core/vim-core-8.2.3428.ebuild
index c52a926b699e..40e298a032ae 100644
--- a/app-editors/vim-core/vim-core-8.2.3428.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.3428.ebuild
@@ -193,6 +193,9 @@ src_install() {
rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
+ # Delete defaults.vim to avoid conflicts with one from vim[minimal]
+ rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
+
local keep_colors="default"
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
@@ -201,6 +204,9 @@ src_install() {
keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
+ # Delete skip_defaults_vim config not supported by vim[minimal]
+ sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed"
+
eshopts_pop
fi
diff --git a/app-editors/vim-core/vim-core-8.2.3567.ebuild b/app-editors/vim-core/vim-core-8.2.3567.ebuild
index 7e80dc2f16f9..a6ac59db33c3 100644
--- a/app-editors/vim-core/vim-core-8.2.3567.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.3567.ebuild
@@ -193,6 +193,9 @@ src_install() {
rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
+ # Delete defaults.vim to avoid conflicts with one from vim[minimal]
+ rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
+
local keep_colors="default"
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
@@ -201,6 +204,9 @@ src_install() {
keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
+ # Delete skip_defaults_vim config not supported by vim[minimal]
+ sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed"
+
eshopts_pop
fi
diff --git a/app-editors/vim-core/vim-core-8.2.3582.ebuild b/app-editors/vim-core/vim-core-8.2.3582.ebuild
index 8846e2787bfa..7c85269220f9 100644
--- a/app-editors/vim-core/vim-core-8.2.3582.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.3582.ebuild
@@ -193,6 +193,9 @@ src_install() {
rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
+ # Delete defaults.vim to avoid conflicts with one from vim[minimal]
+ rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
+
local keep_colors="default"
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
@@ -201,6 +204,9 @@ src_install() {
keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
+ # Delete skip_defaults_vim config not supported by vim[minimal]
+ sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed"
+
eshopts_pop
fi
diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild
index 7e80dc2f16f9..a6ac59db33c3 100644
--- a/app-editors/vim-core/vim-core-9999.ebuild
+++ b/app-editors/vim-core/vim-core-9999.ebuild
@@ -193,6 +193,9 @@ src_install() {
rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
+ # Delete defaults.vim to avoid conflicts with one from vim[minimal]
+ rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
+
local keep_colors="default"
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
@@ -201,6 +204,9 @@ src_install() {
keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
+ # Delete skip_defaults_vim config not supported by vim[minimal]
+ sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed"
+
eshopts_pop
fi