From 3f89cb507efa8acfcfdec5b90ba17aca85bbdd44 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. Signed-off-by: Dongsu Park Signed-off-by: Patrice Clement Closes: https://github.com/gentoo/gentoo/pull/18496 --- app-editors/vim/vim-8.2.0360.ebuild | 4 +++- app-editors/vim/vim-8.2.0508.ebuild | 4 +++- app-editors/vim/vim-8.2.0638.ebuild | 4 +++- app-editors/vim/vim-8.2.0814.ebuild | 4 +++- app-editors/vim/vim-9999.ebuild | 4 +++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/app-editors/vim/vim-8.2.0360.ebuild b/app-editors/vim/vim-8.2.0360.ebuild index d80d7777de3f0..8a757434c46f5 100644 --- a/app-editors/vim/vim-8.2.0360.ebuild +++ b/app-editors/vim/vim-8.2.0360.ebuild @@ -276,7 +276,9 @@ 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 + 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 diff --git a/app-editors/vim/vim-8.2.0508.ebuild b/app-editors/vim/vim-8.2.0508.ebuild index 5bc04c0d2b05f..372853638330f 100644 --- a/app-editors/vim/vim-8.2.0508.ebuild +++ b/app-editors/vim/vim-8.2.0508.ebuild @@ -276,7 +276,9 @@ 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 + 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 diff --git a/app-editors/vim/vim-8.2.0638.ebuild b/app-editors/vim/vim-8.2.0638.ebuild index 5bc04c0d2b05f..372853638330f 100644 --- a/app-editors/vim/vim-8.2.0638.ebuild +++ b/app-editors/vim/vim-8.2.0638.ebuild @@ -276,7 +276,9 @@ 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 + 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 diff --git a/app-editors/vim/vim-8.2.0814.ebuild b/app-editors/vim/vim-8.2.0814.ebuild index 7becfb7071c65..946d309a7f6f3 100644 --- a/app-editors/vim/vim-8.2.0814.ebuild +++ b/app-editors/vim/vim-8.2.0814.ebuild @@ -276,7 +276,9 @@ 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 + 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 diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild index 5bc04c0d2b05f..372853638330f 100644 --- a/app-editors/vim/vim-9999.ebuild +++ b/app-editors/vim/vim-9999.ebuild @@ -276,7 +276,9 @@ 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 + 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