commit: a47c50d2df50ed5b07a286bcef267a76967235ae Author: Waldo Lemmer <waldolemmer1 <AT> gmail <DOT> com> AuthorDate: Wed May 8 19:27:00 2024 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sun May 19 15:28:47 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a47c50d2
app-editors/neovim: remove textwidth autocommands vimrc registered an autocommand that set textwidth=78 for all *.txt buffers. This has sparked a few discussions, including this [1] forum post and bug 559800. Overriding the upstream default of textwidth=0 is not a good idea. This commit removes the relevant autocommand and revbumps all versions of the package. [1]: https://forums.gentoo.org/viewtopic-p-8450986.html Bug: https://bugs.gentoo.org/559800 Signed-off-by: Waldo Lemmer <waldolemmer1 <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/36602 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> app-editors/neovim/files/sysinit.vim-r1 | 97 ++++++++++++++++++++++ .../{neovim-9999.ebuild => neovim-0.9.4-r1.ebuild} | 10 +-- .../{neovim-9999.ebuild => neovim-0.9.5-r1.ebuild} | 15 ++-- app-editors/neovim/neovim-9999.ebuild | 2 +- 4 files changed, 113 insertions(+), 11 deletions(-) diff --git a/app-editors/neovim/files/sysinit.vim-r1 b/app-editors/neovim/files/sysinit.vim-r1 new file mode 100644 index 000000000000..de47eef7299e --- /dev/null +++ b/app-editors/neovim/files/sysinit.vim-r1 @@ -0,0 +1,97 @@ +" Default Gentoo configuration file for neovim +" Based on the default vimrc shipped by Gentoo with app-editors/vim-core + +" You can override any of these settings on a global basis via the +" "/etc/vim/nvimrc.local" file, and on a per-user basis via "~/.nvimrc". +" You may need to create these. + +" Neovim comes with sensible defaults, see: +" https://github.com/neovim/neovim/issues/2676 +" Most of the general settings from Gentoo's vimrc have been dropped here. +" We add only some necessary fixes and a few Gentoo specific settings. + +" {{{ Locale settings +" If we have a BOM, always honour that rather than trying to guess. +if &fileencodings !~? "ucs-bom" + set fileencodings^=ucs-bom +endif + +" Always check for UTF-8 when trying to determine encodings. +if &fileencodings !~? "utf-8" + " If we have to add this, the default encoding is not Unicode. + let g:added_fenc_utf8 = 1 + set fileencodings+=utf-8 +endif +" }}} + +" {{{ Fix &shell, see bug #101665. +if "" == &shell + if executable("/bin/bash") + set shell=/bin/bash + elseif executable("/bin/sh") + set shell=/bin/sh + endif +endif +"}}} + +" {{{ Our default /bin/sh is bash, not ksh, so syntax highlighting for .sh +" files should default to bash. See :help sh-syntax and bug #101819. +if has("eval") + let is_bash=1 +endif +" }}} + +" {{{ Autocommands +if has("autocmd") + +augroup gentoo + au! + + " Gentoo-specific settings for ebuilds. These are the federally-mandated + " required tab settings. See the following for more information: + " http://www.gentoo.org/proj/en/devrel/handbook/handbook.xml + " Note that the rules below are very minimal and don't cover everything. + " Better to emerge app-vim/gentoo-syntax, which provides full syntax, + " filetype and indent settings for all things Gentoo. + au BufRead,BufNewFile *.e{build,class} set ts=4 sw=4 noexpandtab + + " When editing a file, always jump to the last cursor position + autocmd BufReadPost * + \ if ! exists("g:leave_my_cursor_position_alone") | + \ if line("'\"") > 0 && line ("'\"") <= line("$") | + \ exe "normal g'\"" | + \ endif | + \ endif + + " When editing a crontab file, set backupcopy to yes rather than auto. See + " :help crontab and bug #53437. + autocmd FileType crontab set backupcopy=yes + + " If we previously detected that the default encoding is not UTF-8 + " (g:added_fenc_utf8), assume that a file with only ASCII characters (or no + " characters at all) isn't a Unicode file, but is in the default encoding. + " Except of course if a byte-order mark is in effect. + autocmd BufReadPost * + \ if exists("g:added_fenc_utf8") && &fileencoding == "utf-8" && + \ ! &bomb && search('[\x80-\xFF]','nw') == 0 && &modifiable | + \ set fileencoding= | + \ endif + + " Strip trailing spaces on write + autocmd BufWritePre *.e{build,class} + \ if ! exists("g:leave_my_trailing_space_alone") | + \ :%s/\s\+$//e | + \ endif + +augroup END + +endif " has("autocmd") +" }}} + +" {{{ nvimrc.local +if filereadable("/etc/vim/nvimrc.local") + source /etc/vim/nvimrc.local +endif +" }}} + +" vim: set tw=80 sw=2 sts=2 et foldmethod=marker : diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-0.9.4-r1.ebuild similarity index 91% copy from app-editors/neovim/neovim-9999.ebuild copy to app-editors/neovim/neovim-0.9.4-r1.ebuild index f0c3aab23120..a9d362d6c679 100644 --- a/app-editors/neovim/neovim-9999.ebuild +++ b/app-editors/neovim/neovim-0.9.4-r1.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/neovim/neovim.git"; else SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos" fi LICENSE="Apache-2.0 vim" @@ -51,7 +51,7 @@ DEPEND="${LUA_DEPS} >=dev-libs/libuv-1.46.0:= >=dev-libs/libvterm-0.3.3 >=dev-libs/msgpack-3.0.0:= - >=dev-libs/tree-sitter-0.20.9:= + >=dev-libs/tree-sitter-0.20.8:= >=dev-libs/libtermkey-0.22 >=dev-libs/unibilium-2.0.0:0= " @@ -67,7 +67,8 @@ BDEPEND+=" PATCHES=( "${FILESDIR}/${PN}-0.9.0-cmake_lua_version.patch" - "${FILESDIR}/${PN}-9999-cmake-darwin.patch" + "${FILESDIR}/${PN}-0.9.1-cmake-darwin.patch" + "${FILESDIR}/${PN}-0.9.0-cmake-release-type.patch" ) src_prepare() { @@ -81,7 +82,6 @@ src_prepare() { } src_configure() { - ln -s "${BROOT}"/usr/bin/luajit "${BUILD_DIR}"/luajit || die # TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now local mycmakeargs=( # appends -flto @@ -97,7 +97,7 @@ src_install() { # install a default configuration file insinto /etc/vim - doins "${FILESDIR}"/sysinit.vim + newins "${FILESDIR}"/sysinit.vim-r1 sysinit.vim # conditionally install a symlink for nvimpager if use nvimpager; then diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-0.9.5-r1.ebuild similarity index 85% copy from app-editors/neovim/neovim-9999.ebuild copy to app-editors/neovim/neovim-0.9.5-r1.ebuild index f0c3aab23120..539c462636df 100644 --- a/app-editors/neovim/neovim-9999.ebuild +++ b/app-editors/neovim/neovim-0.9.5-r1.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/neovim/neovim.git"; else SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos" fi LICENSE="Apache-2.0 vim" @@ -51,7 +51,7 @@ DEPEND="${LUA_DEPS} >=dev-libs/libuv-1.46.0:= >=dev-libs/libvterm-0.3.3 >=dev-libs/msgpack-3.0.0:= - >=dev-libs/tree-sitter-0.20.9:= + >=dev-libs/tree-sitter-0.20.8:= >=dev-libs/libtermkey-0.22 >=dev-libs/unibilium-2.0.0:0= " @@ -67,7 +67,8 @@ BDEPEND+=" PATCHES=( "${FILESDIR}/${PN}-0.9.0-cmake_lua_version.patch" - "${FILESDIR}/${PN}-9999-cmake-darwin.patch" + "${FILESDIR}/${PN}-0.9.1-cmake-darwin.patch" + "${FILESDIR}/${PN}-0.9.0-cmake-release-type.patch" ) src_prepare() { @@ -81,7 +82,11 @@ src_prepare() { } src_configure() { - ln -s "${BROOT}"/usr/bin/luajit "${BUILD_DIR}"/luajit || die + # Upstream default to LTO on non-debug builds + # Let's expose it as a USE flag because upstream + # have preferences for how we should use LTO + # if we want it on (not just -flto) + # ... but allow turning it off. # TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now local mycmakeargs=( # appends -flto @@ -97,7 +102,7 @@ src_install() { # install a default configuration file insinto /etc/vim - doins "${FILESDIR}"/sysinit.vim + newins "${FILESDIR}"/sysinit.vim-r1 sysinit.vim # conditionally install a symlink for nvimpager if use nvimpager; then diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild index f0c3aab23120..53e5cb6cc9d9 100644 --- a/app-editors/neovim/neovim-9999.ebuild +++ b/app-editors/neovim/neovim-9999.ebuild @@ -97,7 +97,7 @@ src_install() { # install a default configuration file insinto /etc/vim - doins "${FILESDIR}"/sysinit.vim + newins "${FILESDIR}"/sysinit.vim-r1 sysinit.vim # conditionally install a symlink for nvimpager if use nvimpager; then
