Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

app-editors/vim,vim-core: Fix conflicts in installation of defaults.vim #23986

Closed
wants to merge 2 commits into from
Closed

app-editors/vim,vim-core: Fix conflicts in installation of defaults.vim #23986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1f4a9b
app-editors/vim: install defaults.vim only if the file is not installed
dongsupark Jan 27, 2022
cf0572c
app-editors/vim-core: skip installing defaults.vim when installed
dongsupark Jan 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions app-editors/vim-core/vim-core-8.2.0814.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,6 @@ src_install() {
rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"

# Delete defaults.vim to avoid conflicts with one from vim[minimal]
rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"

local keep_colors="default"
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )

Expand All @@ -208,6 +205,13 @@ src_install() {
eshopts_pop
fi

# Delete defaults.vim to avoid conflicts with one from vim.
# If defaults.vim already exists in files installed from vim,
# do not install defaults.vim.
if [[ -f "${vimfiles}/defaults.vim" ]]; then
rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
fi

newbashcomp "${FILESDIR}"/xxd-completion xxd

# install gvim icon since both vim/gvim desktop files reference it
Expand Down
10 changes: 7 additions & 3 deletions app-editors/vim-core/vim-core-8.2.3428.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,6 @@ src_install() {
rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"

# Delete defaults.vim to avoid conflicts with one from vim[minimal]
rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"

local keep_colors="default"
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )

Expand All @@ -210,6 +207,13 @@ src_install() {
eshopts_pop
fi

# Delete defaults.vim to avoid conflicts with one from vim.
# If defaults.vim already exists in files installed from vim,
# do not install defaults.vim.
if [[ -f "${vimfiles}/defaults.vim" ]]; then
rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
fi

newbashcomp "${FILESDIR}"/xxd-completion xxd

# install gvim icon since both vim/gvim desktop files reference it
Expand Down
10 changes: 7 additions & 3 deletions app-editors/vim-core/vim-core-8.2.3567.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,6 @@ src_install() {
rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"

# Delete defaults.vim to avoid conflicts with one from vim[minimal]
rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"

local keep_colors="default"
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )

Expand All @@ -210,6 +207,13 @@ src_install() {
eshopts_pop
fi

# Delete defaults.vim to avoid conflicts with one from vim.
# If defaults.vim already exists in files installed from vim,
# do not install defaults.vim.
if [[ -f "${vimfiles}/defaults.vim" ]]; then
rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
fi

newbashcomp "${FILESDIR}"/xxd-completion xxd

# install gvim icon since both vim/gvim desktop files reference it
Expand Down
10 changes: 7 additions & 3 deletions app-editors/vim-core/vim-core-8.2.3582.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,6 @@ src_install() {
rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"

# Delete defaults.vim to avoid conflicts with one from vim[minimal]
rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"

local keep_colors="default"
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )

Expand All @@ -210,6 +207,13 @@ src_install() {
eshopts_pop
fi

# Delete defaults.vim to avoid conflicts with one from vim.
# If defaults.vim already exists in files installed from vim,
# do not install defaults.vim.
if [[ -f "${vimfiles}/defaults.vim" ]]; then
rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
fi

newbashcomp "${FILESDIR}"/xxd-completion xxd

# install gvim icon since both vim/gvim desktop files reference it
Expand Down
10 changes: 7 additions & 3 deletions app-editors/vim-core/vim-core-8.2.3669.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,6 @@ src_install() {
rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"

# Delete defaults.vim to avoid conflicts with one from vim[minimal]
rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"

local keep_colors="default"
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )

Expand All @@ -210,6 +207,13 @@ src_install() {
eshopts_pop
fi

# Delete defaults.vim to avoid conflicts with one from vim.
# If defaults.vim already exists in files installed from vim,
# do not install defaults.vim.
if [[ -f "${vimfiles}/defaults.vim" ]]; then
rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
fi

newbashcomp "${FILESDIR}"/xxd-completion xxd

# install gvim icon since both vim/gvim desktop files reference it
Expand Down
10 changes: 7 additions & 3 deletions app-editors/vim-core/vim-core-8.2.3741.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,6 @@ src_install() {
rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"

# Delete defaults.vim to avoid conflicts with one from vim[minimal]
rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"

local keep_colors="default"
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )

Expand All @@ -210,6 +207,13 @@ src_install() {
eshopts_pop
fi

# Delete defaults.vim to avoid conflicts with one from vim.
# If defaults.vim already exists in files installed from vim,
# do not install defaults.vim.
if [[ -f "${vimfiles}/defaults.vim" ]]; then
rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
fi

newbashcomp "${FILESDIR}"/xxd-completion xxd

# install gvim icon since both vim/gvim desktop files reference it
Expand Down
10 changes: 7 additions & 3 deletions app-editors/vim-core/vim-core-8.2.3950.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,6 @@ src_install() {
rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"

# Delete defaults.vim to avoid conflicts with one from vim[minimal]
rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"

local keep_colors="default"
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )

Expand All @@ -210,6 +207,13 @@ src_install() {
eshopts_pop
fi

# Delete defaults.vim to avoid conflicts with one from vim.
# If defaults.vim already exists in files installed from vim,
# do not install defaults.vim.
if [[ -f "${vimfiles}/defaults.vim" ]]; then
rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
fi

newbashcomp "${FILESDIR}"/xxd-completion xxd

# install gvim icon since both vim/gvim desktop files reference it
Expand Down
10 changes: 7 additions & 3 deletions app-editors/vim-core/vim-core-9999.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,6 @@ src_install() {
rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"

# Delete defaults.vim to avoid conflicts with one from vim[minimal]
rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"

local keep_colors="default"
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )

Expand All @@ -210,6 +207,13 @@ src_install() {
eshopts_pop
fi

# Delete defaults.vim to avoid conflicts with one from vim.
# If defaults.vim already exists in files installed from vim,
# do not install defaults.vim.
if [[ -f "${vimfiles}/defaults.vim" ]]; then
rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed"
fi

newbashcomp "${FILESDIR}"/xxd-completion xxd

# install gvim icon since both vim/gvim desktop files reference it
Expand Down
6 changes: 4 additions & 2 deletions app-editors/vim/vim-8.2.0814-r100.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,8 +306,10 @@ src_install() {

# Fix an issue of missing defaults.vim when USE=minimal.
if use minimal ; then
insinto ${vimfiles}
doins runtime/defaults.vim
if [[ ! -f "${vimfiles}/defaults.vim" ]]; then
insinto ${vimfiles}
doins runtime/defaults.vim
fi
fi

domenu runtime/vim.desktop
Expand Down
6 changes: 4 additions & 2 deletions app-editors/vim/vim-8.2.3428-r1.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,10 @@ src_install() {

# Fix an issue of missing defaults.vim when USE=minimal.
if use minimal ; then
insinto ${vimfiles}
doins runtime/defaults.vim
if [[ ! -f "${vimfiles}/defaults.vim" ]]; then
insinto ${vimfiles}
doins runtime/defaults.vim
fi
fi

domenu runtime/vim.desktop
Expand Down
6 changes: 4 additions & 2 deletions app-editors/vim/vim-8.2.3567.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,8 +320,10 @@ src_install() {

# Fix an issue of missing defaults.vim when USE=minimal.
if use minimal ; then
insinto ${vimfiles}
doins runtime/defaults.vim
if [[ ! -f "${vimfiles}/defaults.vim" ]]; then
insinto ${vimfiles}
doins runtime/defaults.vim
fi
fi

domenu runtime/vim.desktop
Expand Down
6 changes: 4 additions & 2 deletions app-editors/vim/vim-8.2.3582.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,8 +320,10 @@ src_install() {

# Fix an issue of missing defaults.vim when USE=minimal.
if use minimal ; then
insinto ${vimfiles}
doins runtime/defaults.vim
if [[ ! -f "${vimfiles}/defaults.vim" ]]; then
insinto ${vimfiles}
doins runtime/defaults.vim
fi
fi

domenu runtime/vim.desktop
Expand Down
6 changes: 4 additions & 2 deletions app-editors/vim/vim-8.2.3669.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,8 +320,10 @@ src_install() {

# Fix an issue of missing defaults.vim when USE=minimal.
if use minimal ; then
insinto ${vimfiles}
doins runtime/defaults.vim
if [[ ! -f "${vimfiles}/defaults.vim" ]]; then
insinto ${vimfiles}
doins runtime/defaults.vim
fi
fi

domenu runtime/vim.desktop
Expand Down
6 changes: 4 additions & 2 deletions app-editors/vim/vim-8.2.3741.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,8 +320,10 @@ src_install() {

# Fix an issue of missing defaults.vim when USE=minimal.
if use minimal ; then
insinto ${vimfiles}
doins runtime/defaults.vim
if [[ ! -f "${vimfiles}/defaults.vim" ]]; then
insinto ${vimfiles}
doins runtime/defaults.vim
fi
fi

domenu runtime/vim.desktop
Expand Down
6 changes: 4 additions & 2 deletions app-editors/vim/vim-8.2.3950.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,8 +320,10 @@ src_install() {

# Fix an issue of missing defaults.vim when USE=minimal.
if use minimal ; then
insinto ${vimfiles}
doins runtime/defaults.vim
if [[ ! -f "${vimfiles}/defaults.vim" ]]; then
insinto ${vimfiles}
doins runtime/defaults.vim
fi
fi

domenu runtime/vim.desktop
Expand Down
6 changes: 4 additions & 2 deletions app-editors/vim/vim-9999.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,8 +320,10 @@ src_install() {

# Fix an issue of missing defaults.vim when USE=minimal.
if use minimal ; then
insinto ${vimfiles}
doins runtime/defaults.vim
if [[ ! -f "${vimfiles}/defaults.vim" ]]; then
insinto ${vimfiles}
doins runtime/defaults.vim
fi
fi

domenu runtime/vim.desktop
Expand Down