Skip to content

Commit

Permalink
app-editors/vim: do not create symlink vimdiff for minimal.
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Patrice Clement <[email protected]>
Closes: gentoo#18496
  • Loading branch information
Dongsu Park authored and monsieurp committed Dec 6, 2020
1 parent 635954b commit 3f89cb5
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 5 deletions.
4 changes: 3 additions & 1 deletion app-editors/vim/vim-8.2.0360.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion app-editors/vim/vim-8.2.0508.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion app-editors/vim/vim-8.2.0638.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion app-editors/vim/vim-8.2.0814.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion app-editors/vim/vim-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3f89cb5

Please sign in to comment.