| 1 |
commit: 74eaf6b7cbab24337eae5c07d42871aeb21a330e |
| 2 |
Author: Dongsu Park <dpark <AT> linux <DOT> microsoft <DOT> com> |
| 3 |
AuthorDate: Wed Dec 1 16:40:27 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 1 17:06:56 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74eaf6b7 |
| 7 |
|
| 8 |
app-editors/vim-core: delete configs that conflict with vim[minimal] |
| 9 |
|
| 10 |
Delete skip_defaults_vim config options from /etc/vimrc, to avoid |
| 11 |
conflicts with vim[minimal]. |
| 12 |
Delete /usr/share/vim/vim82/defaults.vim, to avoid conflicts with |
| 13 |
vim[minimal]. |
| 14 |
|
| 15 |
Signed-off-by: Dongsu Park <dpark <AT> linux.microsoft.com> |
| 16 |
Closes: https://github.com/gentoo/gentoo/pull/23115 |
| 17 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 18 |
|
| 19 |
app-editors/vim-core/vim-core-8.2.0814.ebuild | 6 ++++++ |
| 20 |
app-editors/vim-core/vim-core-8.2.3428.ebuild | 6 ++++++ |
| 21 |
app-editors/vim-core/vim-core-8.2.3567.ebuild | 6 ++++++ |
| 22 |
app-editors/vim-core/vim-core-8.2.3582.ebuild | 6 ++++++ |
| 23 |
app-editors/vim-core/vim-core-9999.ebuild | 6 ++++++ |
| 24 |
5 files changed, 30 insertions(+) |
| 25 |
|
| 26 |
diff --git a/app-editors/vim-core/vim-core-8.2.0814.ebuild b/app-editors/vim-core/vim-core-8.2.0814.ebuild |
| 27 |
index 7cccceadd8e4..5c1fb6f93cb3 100644 |
| 28 |
--- a/app-editors/vim-core/vim-core-8.2.0814.ebuild |
| 29 |
+++ b/app-editors/vim-core/vim-core-8.2.0814.ebuild |
| 30 |
@@ -191,6 +191,9 @@ src_install() { |
| 31 |
rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" |
| 32 |
rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" |
| 33 |
|
| 34 |
+ # Delete defaults.vim to avoid conflicts with one from vim[minimal] |
| 35 |
+ rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" |
| 36 |
+ |
| 37 |
local keep_colors="default" |
| 38 |
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) |
| 39 |
|
| 40 |
@@ -199,6 +202,9 @@ src_install() { |
| 41 |
keep_syntax="${keep_syntax}|syntax|nosyntax|synload" |
| 42 |
ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) |
| 43 |
|
| 44 |
+ # Delete skip_defaults_vim config not supported by vim[minimal] |
| 45 |
+ sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed" |
| 46 |
+ |
| 47 |
eshopts_pop |
| 48 |
fi |
| 49 |
|
| 50 |
|
| 51 |
diff --git a/app-editors/vim-core/vim-core-8.2.3428.ebuild b/app-editors/vim-core/vim-core-8.2.3428.ebuild |
| 52 |
index c52a926b699e..40e298a032ae 100644 |
| 53 |
--- a/app-editors/vim-core/vim-core-8.2.3428.ebuild |
| 54 |
+++ b/app-editors/vim-core/vim-core-8.2.3428.ebuild |
| 55 |
@@ -193,6 +193,9 @@ src_install() { |
| 56 |
rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" |
| 57 |
rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" |
| 58 |
|
| 59 |
+ # Delete defaults.vim to avoid conflicts with one from vim[minimal] |
| 60 |
+ rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" |
| 61 |
+ |
| 62 |
local keep_colors="default" |
| 63 |
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) |
| 64 |
|
| 65 |
@@ -201,6 +204,9 @@ src_install() { |
| 66 |
keep_syntax="${keep_syntax}|syntax|nosyntax|synload" |
| 67 |
ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) |
| 68 |
|
| 69 |
+ # Delete skip_defaults_vim config not supported by vim[minimal] |
| 70 |
+ sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed" |
| 71 |
+ |
| 72 |
eshopts_pop |
| 73 |
fi |
| 74 |
|
| 75 |
|
| 76 |
diff --git a/app-editors/vim-core/vim-core-8.2.3567.ebuild b/app-editors/vim-core/vim-core-8.2.3567.ebuild |
| 77 |
index 7e80dc2f16f9..a6ac59db33c3 100644 |
| 78 |
--- a/app-editors/vim-core/vim-core-8.2.3567.ebuild |
| 79 |
+++ b/app-editors/vim-core/vim-core-8.2.3567.ebuild |
| 80 |
@@ -193,6 +193,9 @@ src_install() { |
| 81 |
rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" |
| 82 |
rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" |
| 83 |
|
| 84 |
+ # Delete defaults.vim to avoid conflicts with one from vim[minimal] |
| 85 |
+ rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" |
| 86 |
+ |
| 87 |
local keep_colors="default" |
| 88 |
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) |
| 89 |
|
| 90 |
@@ -201,6 +204,9 @@ src_install() { |
| 91 |
keep_syntax="${keep_syntax}|syntax|nosyntax|synload" |
| 92 |
ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) |
| 93 |
|
| 94 |
+ # Delete skip_defaults_vim config not supported by vim[minimal] |
| 95 |
+ sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed" |
| 96 |
+ |
| 97 |
eshopts_pop |
| 98 |
fi |
| 99 |
|
| 100 |
|
| 101 |
diff --git a/app-editors/vim-core/vim-core-8.2.3582.ebuild b/app-editors/vim-core/vim-core-8.2.3582.ebuild |
| 102 |
index 8846e2787bfa..7c85269220f9 100644 |
| 103 |
--- a/app-editors/vim-core/vim-core-8.2.3582.ebuild |
| 104 |
+++ b/app-editors/vim-core/vim-core-8.2.3582.ebuild |
| 105 |
@@ -193,6 +193,9 @@ src_install() { |
| 106 |
rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" |
| 107 |
rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" |
| 108 |
|
| 109 |
+ # Delete defaults.vim to avoid conflicts with one from vim[minimal] |
| 110 |
+ rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" |
| 111 |
+ |
| 112 |
local keep_colors="default" |
| 113 |
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) |
| 114 |
|
| 115 |
@@ -201,6 +204,9 @@ src_install() { |
| 116 |
keep_syntax="${keep_syntax}|syntax|nosyntax|synload" |
| 117 |
ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) |
| 118 |
|
| 119 |
+ # Delete skip_defaults_vim config not supported by vim[minimal] |
| 120 |
+ sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed" |
| 121 |
+ |
| 122 |
eshopts_pop |
| 123 |
fi |
| 124 |
|
| 125 |
|
| 126 |
diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild |
| 127 |
index 7e80dc2f16f9..a6ac59db33c3 100644 |
| 128 |
--- a/app-editors/vim-core/vim-core-9999.ebuild |
| 129 |
+++ b/app-editors/vim-core/vim-core-9999.ebuild |
| 130 |
@@ -193,6 +193,9 @@ src_install() { |
| 131 |
rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" |
| 132 |
rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" |
| 133 |
|
| 134 |
+ # Delete defaults.vim to avoid conflicts with one from vim[minimal] |
| 135 |
+ rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" |
| 136 |
+ |
| 137 |
local keep_colors="default" |
| 138 |
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) |
| 139 |
|
| 140 |
@@ -201,6 +204,9 @@ src_install() { |
| 141 |
keep_syntax="${keep_syntax}|syntax|nosyntax|synload" |
| 142 |
ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) |
| 143 |
|
| 144 |
+ # Delete skip_defaults_vim config not supported by vim[minimal] |
| 145 |
+ sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed" |
| 146 |
+ |
| 147 |
eshopts_pop |
| 148 |
fi |
Archives