Skip to content
This repository has been archived by the owner on May 30, 2023. It is now read-only.

app-editors/vim: sync with gentoo to fix missing defaults.vim #260

Merged
merged 4 commits into from
Dec 10, 2021

Conversation

dongsupark
Copy link
Contributor

@dongsupark dongsupark commented Dec 9, 2021

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.

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 entries added in the respective changelog/ directory (user-facing change, bug fix, security fix, update)

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.
@dongsupark dongsupark marked this pull request as ready for review December 10, 2021 08:28
@dongsupark dongsupark requested a review from a team December 10, 2021 08:28
@dongsupark
Copy link
Contributor Author

CI passed

@krnowak
Copy link
Contributor

krnowak commented Dec 10, 2021

One question: why do we need libsodium in portage-stable if you disabled the crypt use flag?

@dongsupark
Copy link
Contributor Author

Because the crypt USE flag is still enabled in the SDK profile.
SDK: USE=crypt -minimal. vim, vim-core, libsodium installed
amd64 & arm64: USE=-crypt minimal. only vim installed. vim-core and libsodium are not installed.

In theory we could simply remove libsodium from SDK as well.
But unlike the board packages, SDK has always had a full-blown version of vim, so I thought we would rather keep the crypt USE flag and libsodium.

@krnowak
Copy link
Contributor

krnowak commented Dec 10, 2021

Thanks. Let's keep it like that then.

Copy link
Contributor

@krnowak krnowak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

@dongsupark dongsupark merged commit 0de3300 into flatcar-3066 Dec 10, 2021
@dongsupark dongsupark deleted the dongsu/vim-missing-defaults-3066 branch December 10, 2021 09:29
@dongsupark
Copy link
Contributor Author

cherry-picked to flatcar-3033.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
alpha beta bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants