This repository has been archived by the owner on May 30, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 11
app-editors/vim: sync with gentoo to fix missing defaults.vim #260
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vim >= 8.2.3428 prints out a warning on missing file, when it is built with USE="minimal" and `app-editors/vim-core` is not installed. ``` $ vim E1187: Failed to source defaults.vim Press ENTER or type command to continue ``` To remove warning, explicitly install /usr/share/vim/vim82/defaults.vim. This issue was fixed via gentoo/gentoo#23115. That fix was already included in #255, but only for main. That's why we need to fix it also in maintenance branches. Gentoo ref: fc72192754c8a1ff9014fd739a2d07056b25ed1e
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]. To remove warning, explicitly install /usr/share/vim/vim82/defaults.vim. This issue was fixed via gentoo/gentoo#23115. That fix was already included in #255, but only for main. That's why we need to fix it also in maintenance branches. Gentoo ref: 74eaf6b7cbab24337eae5c07d42871aeb21a330e
Import new ebuilds for dev-libs/libsodium, which is needed by app-editors/vim[crypt], only in SDK.
CI passed |
One question: why do we need libsodium in portage-stable if you disabled the crypt use flag? |
Because the In theory we could simply remove libsodium from SDK as well. |
Thanks. Let's keep it like that then. |
krnowak
approved these changes
Dec 10, 2021
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good.
cherry-picked to flatcar-3033. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
vim >= 8.2.3428 prints out a warning on missing file, when it is built with USE="minimal" and
app-editors/vim-core
is not installed.To remove warning, explicitly install /usr/share/vim/vim82/defaults.vim.
This issue was fixed via gentoo/gentoo#23115.
That fix was already included in #255, but only for main.
That's why we need to fix it also in maintenance branches.
Also add corresponding fixes for vim-core and libsodium.
Gentoo ref: gentoo/gentoo@fc72192, gentoo/gentoo@74eaf6b .
This PR should be merged together with flatcar-archive/coreos-overlay#1493.
Testing done
CI passed: http://jenkins.infra.kinvolk.io:8080/job/os/job/manifest/4355/cldsv
changelog/
directory (user-facing change, bug fix, security fix, update)