From 728b8e7495aae42e100648b394a136affb9b2db3 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Fri, 4 Dec 2020 10:30:37 +0100 Subject: [PATCH] app-editors/vim: do not create symlink vimdiff for minimal A symlink `vimdiff` should not be created, if the USE flag `minimal` is enabled. Otherwise running `vimdiff` results in failure like that: ``` $ vimdiff aaa bbb This Vim was not compiled with the diff feature. ``` --- .../vim/{vim-8.2.0360.ebuild => vim-8.2.0360-r1.ebuild} | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/app-editors/vim/{vim-8.2.0360.ebuild => vim-8.2.0360-r1.ebuild} (98%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-editors/vim/vim-8.2.0360.ebuild b/sdk_container/src/third_party/coreos-overlay/app-editors/vim/vim-8.2.0360-r1.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/app-editors/vim/vim-8.2.0360.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-editors/vim/vim-8.2.0360-r1.ebuild index 0138f2a387..ab80c36b35 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-editors/vim/vim-8.2.0360.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-editors/vim/vim-8.2.0360-r1.ebuild @@ -276,7 +276,10 @@ src_install() { # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are # managed by eselect-vi dobin src/vim - dosym vim /usr/bin/vimdiff + # Flatcar: disable vimdiff symlink if minimal + if ! use minimal ; then + dosym vim /usr/bin/vimdiff + fi dosym vim /usr/bin/rvim dosym vim /usr/bin/rview if use vim-pager ; then