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.

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

app-editors/vim: remove warning due to missing defaults.vim #23115

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions app-editors/vim-core/vim-core-8.2.0814.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,9 @@ 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 @@ -199,6 +202,9 @@ src_install() {
keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )

# Delete skip_defaults_vim config not supported by vim[minimal]
sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed"

eshopts_pop
fi

Expand Down
6 changes: 6 additions & 0 deletions app-editors/vim-core/vim-core-8.2.3428.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,9 @@ 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 @@ -201,6 +204,9 @@ src_install() {
keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )

# Delete skip_defaults_vim config not supported by vim[minimal]
sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed"

eshopts_pop
fi

Expand Down
6 changes: 6 additions & 0 deletions app-editors/vim-core/vim-core-8.2.3567.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,9 @@ 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 @@ -201,6 +204,9 @@ src_install() {
keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )

# Delete skip_defaults_vim config not supported by vim[minimal]
sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed"

eshopts_pop
fi

Expand Down
6 changes: 6 additions & 0 deletions app-editors/vim-core/vim-core-8.2.3582.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,9 @@ 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 @@ -201,6 +204,9 @@ src_install() {
keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )

# Delete skip_defaults_vim config not supported by vim[minimal]
sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed"

eshopts_pop
fi

Expand Down
6 changes: 6 additions & 0 deletions app-editors/vim-core/vim-core-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,9 @@ 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 @@ -201,6 +204,9 @@ src_install() {
keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )

# Delete skip_defaults_vim config not supported by vim[minimal]
sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed"

eshopts_pop
fi

Expand Down
6 changes: 6 additions & 0 deletions app-editors/vim/vim-8.2.0814-r100.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,12 @@ src_install() {
fperms a+x ${vimfiles}/macros/manpager.sh
fi

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

domenu runtime/vim.desktop

newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
Expand Down
6 changes: 6 additions & 0 deletions app-editors/vim/vim-8.2.3428-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,12 @@ src_install() {
fperms a+x ${vimfiles}/macros/manpager.sh
fi

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

domenu runtime/vim.desktop

newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
Expand Down
6 changes: 6 additions & 0 deletions app-editors/vim/vim-8.2.3567.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,12 @@ src_install() {
fperms a+x ${vimfiles}/macros/manpager.sh
fi

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

domenu runtime/vim.desktop

newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
Expand Down
6 changes: 6 additions & 0 deletions app-editors/vim/vim-8.2.3582.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,12 @@ src_install() {
fperms a+x ${vimfiles}/macros/manpager.sh
fi

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

domenu runtime/vim.desktop

newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
Expand Down
6 changes: 6 additions & 0 deletions app-editors/vim/vim-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,12 @@ src_install() {
fperms a+x ${vimfiles}/macros/manpager.sh
fi

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

domenu runtime/vim.desktop

newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
Expand Down