[gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/, app-editors/neovim/files/
commit: a47c50d2df50ed5b07a286bcef267a76967235ae Author: Waldo Lemmer gmail com> AuthorDate: Wed May 8 19:27:00 2024 + Commit: Mike Gilbert gentoo org> CommitDate: Sun May 19 15:28:47 2024 + 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 gmail.com> Closes: https://github.com/gentoo/gentoo/pull/36602 Signed-off-by: Mike Gilbert gentoo.org> app-editors/neovim/files/sysinit.vim-r1| 97 ++ .../{neovim-.ebuild => neovim-0.9.4-r1.ebuild} | 10 +-- .../{neovim-.ebuild => neovim-0.9.5-r1.ebuild} | 15 ++-- app-editors/neovim/neovim-.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 ..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 !~? "ucs-bom" + set fileencodings^=ucs-bom +endif + +" Always check for UTF-8 when trying to determine encodings. +if !~? "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 , see bug #101665. +if "" == + 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") && == "utf-8" && +\ ! && search('[\x80-\xFF]','nw') == 0 && | +\ 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-.ebuild b/app-editors/neovim/neovim-0.9.4-r1.ebuild similarity index 91% copy from app-editors/neovim/neovim-.ebuild copy to app-editors/neovim/neovim-0.9.4-r1.ebuild index f0c3aab23120..a9d362d6c679 100644 --- a/app-editors/neovim/neovim-.ebuild +++ b/app-editors/neovim/neovim-0.9.4-r1.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == ]]; then
[gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/, app-editors/neovim/files/
commit: 32e6dc7b18d9a20c05cf88351524d2ff10ea5f19 Author: Brahmajit Das gmail com> AuthorDate: Mon May 29 12:14:55 2023 + Commit: Sam James gentoo org> CommitDate: Wed May 31 05:49:19 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32e6dc7b app-editors/neovim: drop 0.8.3 Signed-off-by: Brahmajit Das gmail.com> Closes: https://github.com/gentoo/gentoo/pull/31213 Signed-off-by: Sam James gentoo.org> app-editors/neovim/Manifest| 1 - .../neovim/files/neovim-0.8-cmake-darwin.patch | 65 --- .../files/neovim-0.8-cmake_lua_version.patch | 11 -- .../files/neovim-0.8-msgpack-6.0.0-fix.patch | 26 - .../files/neovim-0.8.0-cmake-release-type.patch| 28 - app-editors/neovim/metadata.xml| 1 - app-editors/neovim/neovim-0.8.3.ebuild | 130 - 7 files changed, 262 deletions(-) diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest index e17ae435cf0f..bc6d1781931e 100644 --- a/app-editors/neovim/Manifest +++ b/app-editors/neovim/Manifest @@ -1,3 +1,2 @@ -DIST neovim-0.8.3.tar.gz 11406282 BLAKE2B 67f4d4d1857e4c0416639dd0986f34b3842883ef48b68d90704472b40f1f064798f1f5f3c29e485f04ef8b2ed387132549442e86624b43f2ababff05bc477312 SHA512 0ecf60b564a323eb95eb2e67f7dc7e1c1e7bfc70b08466a66eb668d1b75a7362ca42901cd5a64fda22292375e2921ba61c299ac846f820ac146dc55426813eb8 DIST neovim-0.9.0.tar.gz 11549103 BLAKE2B f07b61f02a11acf678358999ea364b6a64724451a9a75f2d6ca436edc5ead9c6422f1c7e99c4322dc0bb92daacf306e32e214ab34d10f78f28d4ffad17b878c7 SHA512 e42f09f408b83fc34e8f169321e0349d1f851e67a998265c53d2ddb1a4792c3f4777fabe32baf2c7eff7d3745ff60d4a07da542ccd272883f7f4e080b2c9c1bf DIST neovim-0.9.1.tar.gz 11567358 BLAKE2B 7aa56c672f7d26db7d47df39941487de32008b9e78921d71860281e8319b30dc6cd889a029c83b61814baecac947f39a950245ed7e51c35509b30e9b39046a58 SHA512 339efd3d8c1a73aa3b43e8770d6943aeba9e4ce6a3598c0424e388f80759d50b14aa7c60fd435bf2d17997476e06d28b79e7e98670d02ca9ceec031841e8b9b8 diff --git a/app-editors/neovim/files/neovim-0.8-cmake-darwin.patch b/app-editors/neovim/files/neovim-0.8-cmake-darwin.patch deleted file mode 100644 index ad47a46e1a7a.. --- a/app-editors/neovim/files/neovim-0.8-cmake-darwin.patch +++ /dev/null @@ -1,65 +0,0 @@ a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -80,33 +80,6 @@ set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${DEPS_PREFIX}/lib/pkgconfig") - # used for check_c_compiler_flag - include(CheckCCompilerFlag) - --if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") -- # CMake tries to treat /sw and /opt/local as extension of the system path, but -- # that doesn't really work out very well. Once you have a dependency that -- # resides there and have to add it as an include directory, then any other -- # dependency that could be satisfied from there must be--otherwise you can end -- # up with conflicting versions. So, let's make them more of a priority having -- # them be included as one of the first places to look for dependencies. -- list(APPEND CMAKE_PREFIX_PATH /sw /opt/local) -- -- # If the macOS deployment target is not set manually (via $MACOSX_DEPLOYMENT_TARGET), -- # fall back to local system version. Needs to be done both here and in cmake.deps. -- if(NOT CMAKE_OSX_DEPLOYMENT_TARGET) --execute_process(COMMAND sw_vers -productVersion --OUTPUT_VARIABLE MACOS_VERSION --OUTPUT_STRIP_TRAILING_WHITESPACE) --set(CMAKE_OSX_DEPLOYMENT_TARGET "${MACOS_VERSION}") -- endif() -- message("Using deployment target ${CMAKE_OSX_DEPLOYMENT_TARGET}") -- -- # Work around some old, broken detection by CMake for knowing when to use the -- # isystem flag. Apple's compilers have supported this for quite some time -- # now. -- if(CMAKE_C_COMPILER_ID MATCHES "GNU") --set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ") -- endif() --endif() -- - if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Darwin") - # Ignore case when comparing filenames on Windows and Mac. - set(CASE_INSENSITIVE_FILENAME TRUE) a/cmake.deps/CMakeLists.txt -+++ b/cmake.deps/CMakeLists.txt -@@ -112,13 +112,6 @@ if(CMAKE_CXX_COMPILER) - set(DEPS_CXX_COMPILER "${CMAKE_CXX_COMPILER}") - endif() - --if(CMAKE_OSX_SYSROOT) -- set(DEPS_C_COMPILER "${DEPS_C_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}") -- if(DEPS_CXX_COMPILER) --set(DEPS_CXX_COMPILER "${DEPS_CXX_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}") -- endif() --endif() -- - if(CMAKE_OSX_ARCHITECTURES) - string(REPLACE ";" "|" CMAKE_OSX_ARCHITECTURES_ALT_SEP "${CMAKE_OSX_ARCHITECTURES}") - # The LuaJIT build does not like being passed multiple `-arch` flags a/src/nvim/CMakeLists.txt -+++ b/src/nvim/CMakeLists.txt -@@ -181,10 +181,6 @@ get_directory_property(gen_includes INCLUDE_DIRECTORIES) - foreach(gen_include ${gen_includes} ${LUA_PREFERRED_INCLUDE_DIRS}) - list(APPEND gen_cflags "-I${gen_include}") - endforeach()
[gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/, app-editors/neovim/files/
commit: 1ca7a6c04121740ea28ea2325ba222a8807b34d8 Author: Robert Günzler gnzler io> AuthorDate: Sun Apr 23 18:03:08 2023 + Commit: Sam James gentoo org> CommitDate: Sat Apr 29 06:44:18 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ca7a6c0 app-editors/neovim: fix darwin patch for unstable Signed-off-by: Robert Günzler gnzler.io> Closes: https://github.com/gentoo/gentoo/pull/30722 Signed-off-by: Sam James gentoo.org> app-editors/neovim/files/neovim--cmake-darwin.patch | 14 ++ app-editors/neovim/neovim-.ebuild | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app-editors/neovim/files/neovim--cmake-darwin.patch b/app-editors/neovim/files/neovim--cmake-darwin.patch new file mode 100644 index ..1488148298bd --- /dev/null +++ b/app-editors/neovim/files/neovim--cmake-darwin.patch @@ -0,0 +1,14 @@ +--- a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt +@@ -415,11 +415,7 @@ foreach(gen_include ${prop}) + list(APPEND gen_cflags "-I${gen_include}") + endforeach() + endforeach() + +-if(APPLE AND CMAKE_OSX_SYSROOT) +- list(APPEND gen_cflags "-isysroot") +- list(APPEND gen_cflags "${CMAKE_OSX_SYSROOT}") +-endif() + set(gen_cflags ${gen_cflags} -O2) + + set(NVIM_VERSION_GIT_H ${PROJECT_BINARY_DIR}/cmake.config/auto/versiondef_git.h) diff --git a/app-editors/neovim/neovim-.ebuild b/app-editors/neovim/neovim-.ebuild index c7b386d3e5c8..0bae751e05f7 100644 --- a/app-editors/neovim/neovim-.ebuild +++ b/app-editors/neovim/neovim-.ebuild @@ -68,7 +68,7 @@ BDEPEND+=" PATCHES=( "${FILESDIR}/${PN}-0.9.0-cmake_lua_version.patch" - "${FILESDIR}/${PN}-0.9.0-cmake-darwin.patch" + "${FILESDIR}/${PN}--cmake-darwin.patch" ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/, app-editors/neovim/files/
commit: 726e8ac1afece6692ca623b7e68b60fd7b7dfc7f Author: Sam James gentoo org> AuthorDate: Wed Feb 8 19:12:14 2023 + Commit: Sam James gentoo org> CommitDate: Wed Feb 8 19:12:35 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=726e8ac1 Revert "app-editors/neovim: fixes (see commit details)" This reverts commit fca327914eac530d8b37251ba459ae8a454de0e1. Breaks applying patches to 0.8.2/0.8.3. Signed-off-by: Sam James gentoo.org> .../neovim/files/neovim--cmake-darwin.patch| 62 -- .../files/neovim--cmake_lua_version.patch | 12 ++--- app-editors/neovim/neovim-.ebuild | 9 ++-- 3 files changed, 69 insertions(+), 14 deletions(-) diff --git a/app-editors/neovim/files/neovim--cmake-darwin.patch b/app-editors/neovim/files/neovim--cmake-darwin.patch index b2920451743d..ad47a46e1a7a 100644 --- a/app-editors/neovim/files/neovim--cmake-darwin.patch +++ b/app-editors/neovim/files/neovim--cmake-darwin.patch @@ -1,13 +1,65 @@ +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -80,33 +80,6 @@ set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${DEPS_PREFIX}/lib/pkgconfig") + # used for check_c_compiler_flag + include(CheckCCompilerFlag) + +-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") +- # CMake tries to treat /sw and /opt/local as extension of the system path, but +- # that doesn't really work out very well. Once you have a dependency that +- # resides there and have to add it as an include directory, then any other +- # dependency that could be satisfied from there must be--otherwise you can end +- # up with conflicting versions. So, let's make them more of a priority having +- # them be included as one of the first places to look for dependencies. +- list(APPEND CMAKE_PREFIX_PATH /sw /opt/local) +- +- # If the macOS deployment target is not set manually (via $MACOSX_DEPLOYMENT_TARGET), +- # fall back to local system version. Needs to be done both here and in cmake.deps. +- if(NOT CMAKE_OSX_DEPLOYMENT_TARGET) +-execute_process(COMMAND sw_vers -productVersion +-OUTPUT_VARIABLE MACOS_VERSION +-OUTPUT_STRIP_TRAILING_WHITESPACE) +-set(CMAKE_OSX_DEPLOYMENT_TARGET "${MACOS_VERSION}") +- endif() +- message("Using deployment target ${CMAKE_OSX_DEPLOYMENT_TARGET}") +- +- # Work around some old, broken detection by CMake for knowing when to use the +- # isystem flag. Apple's compilers have supported this for quite some time +- # now. +- if(CMAKE_C_COMPILER_ID MATCHES "GNU") +-set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ") +- endif() +-endif() +- + if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Darwin") + # Ignore case when comparing filenames on Windows and Mac. + set(CASE_INSENSITIVE_FILENAME TRUE) +--- a/cmake.deps/CMakeLists.txt b/cmake.deps/CMakeLists.txt +@@ -112,13 +112,6 @@ if(CMAKE_CXX_COMPILER) + set(DEPS_CXX_COMPILER "${CMAKE_CXX_COMPILER}") + endif() + +-if(CMAKE_OSX_SYSROOT) +- set(DEPS_C_COMPILER "${DEPS_C_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}") +- if(DEPS_CXX_COMPILER) +-set(DEPS_CXX_COMPILER "${DEPS_CXX_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}") +- endif() +-endif() +- + if(CMAKE_OSX_ARCHITECTURES) + string(REPLACE ";" "|" CMAKE_OSX_ARCHITECTURES_ALT_SEP "${CMAKE_OSX_ARCHITECTURES}") + # The LuaJIT build does not like being passed multiple `-arch` flags --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt -@@ -440,10 +440,6 @@ get_directory_property(gen_includes INCLUDE_DIRECTORIES) - foreach(gen_include ${prop}) +@@ -181,10 +181,6 @@ get_directory_property(gen_includes INCLUDE_DIRECTORIES) + foreach(gen_include ${gen_includes} ${LUA_PREFERRED_INCLUDE_DIRS}) list(APPEND gen_cflags "-I${gen_include}") endforeach() -if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_OSX_SYSROOT) - list(APPEND gen_cflags "-isysroot") - list(APPEND gen_cflags "${CMAKE_OSX_SYSROOT}") -endif() - set(gen_cflags ${gen_cflags} -O2) - - set(NVIM_VERSION_GIT_H ${PROJECT_BINARY_DIR}/cmake.config/auto/versiondef_git.h) + string(TOUPPER "${CMAKE_BUILD_TYPE}" build_type) + separate_arguments(C_FLAGS_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS}) + separate_arguments(C_FLAGS_${build_type}_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS_${build_type}}) diff --git a/app-editors/neovim/files/neovim--cmake_lua_version.patch b/app-editors/neovim/files/neovim--cmake_lua_version.patch index b14b3b992349..87a898032493 100644 --- a/app-editors/neovim/files/neovim--cmake_lua_version.patch +++ b/app-editors/neovim/files/neovim--cmake_lua_version.patch @@ -1,11 +1,11 @@ a/src/nvim/CMakeLists.txt -+++ b/src/nvim/CMakeLists.txt +--- a/CMakeLists.txt b/CMakeLists.txt @@ -464,7 +464,7 @@ endif() - # The unit test lib requires LuaJIT; it will be skipped if LuaJIT is missing. option(PREFER_LUA "Prefer Lua over LuaJIT in the nvim executable." OFF) + if(PREFER_LUA) - find_package(Lua 5.1 EXACT REQUIRED) +
[gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/, app-editors/neovim/files/
commit: fca327914eac530d8b37251ba459ae8a454de0e1 Author: Vadim Misbakh-Soloviov gentoo org> AuthorDate: Wed Feb 8 15:39:54 2023 + Commit: Vadim Misbakh-Soloviov gentoo org> CommitDate: Wed Feb 8 15:39:54 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fca32791 app-editors/neovim: fixes (see commit details) 1) lua-version and darwin patches are fixed to not fail 2) no more tui conficuration option, see https://github.com/neovim/neovim/commit/9fdcbbb4063daa125e420e0ffe9dae6801c264bc Signed-off-by: Vadim Misbakh-Soloviov gentoo.org> .../neovim/files/neovim--cmake-darwin.patch| 62 ++ .../files/neovim--cmake_lua_version.patch | 12 ++--- app-editors/neovim/neovim-.ebuild | 9 ++-- 3 files changed, 14 insertions(+), 69 deletions(-) diff --git a/app-editors/neovim/files/neovim--cmake-darwin.patch b/app-editors/neovim/files/neovim--cmake-darwin.patch index ad47a46e1a7a..b2920451743d 100644 --- a/app-editors/neovim/files/neovim--cmake-darwin.patch +++ b/app-editors/neovim/files/neovim--cmake-darwin.patch @@ -1,65 +1,13 @@ a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -80,33 +80,6 @@ set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${DEPS_PREFIX}/lib/pkgconfig") - # used for check_c_compiler_flag - include(CheckCCompilerFlag) - --if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") -- # CMake tries to treat /sw and /opt/local as extension of the system path, but -- # that doesn't really work out very well. Once you have a dependency that -- # resides there and have to add it as an include directory, then any other -- # dependency that could be satisfied from there must be--otherwise you can end -- # up with conflicting versions. So, let's make them more of a priority having -- # them be included as one of the first places to look for dependencies. -- list(APPEND CMAKE_PREFIX_PATH /sw /opt/local) -- -- # If the macOS deployment target is not set manually (via $MACOSX_DEPLOYMENT_TARGET), -- # fall back to local system version. Needs to be done both here and in cmake.deps. -- if(NOT CMAKE_OSX_DEPLOYMENT_TARGET) --execute_process(COMMAND sw_vers -productVersion --OUTPUT_VARIABLE MACOS_VERSION --OUTPUT_STRIP_TRAILING_WHITESPACE) --set(CMAKE_OSX_DEPLOYMENT_TARGET "${MACOS_VERSION}") -- endif() -- message("Using deployment target ${CMAKE_OSX_DEPLOYMENT_TARGET}") -- -- # Work around some old, broken detection by CMake for knowing when to use the -- # isystem flag. Apple's compilers have supported this for quite some time -- # now. -- if(CMAKE_C_COMPILER_ID MATCHES "GNU") --set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ") -- endif() --endif() -- - if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Darwin") - # Ignore case when comparing filenames on Windows and Mac. - set(CASE_INSENSITIVE_FILENAME TRUE) a/cmake.deps/CMakeLists.txt -+++ b/cmake.deps/CMakeLists.txt -@@ -112,13 +112,6 @@ if(CMAKE_CXX_COMPILER) - set(DEPS_CXX_COMPILER "${CMAKE_CXX_COMPILER}") - endif() - --if(CMAKE_OSX_SYSROOT) -- set(DEPS_C_COMPILER "${DEPS_C_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}") -- if(DEPS_CXX_COMPILER) --set(DEPS_CXX_COMPILER "${DEPS_CXX_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}") -- endif() --endif() -- - if(CMAKE_OSX_ARCHITECTURES) - string(REPLACE ";" "|" CMAKE_OSX_ARCHITECTURES_ALT_SEP "${CMAKE_OSX_ARCHITECTURES}") - # The LuaJIT build does not like being passed multiple `-arch` flags --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt -@@ -181,10 +181,6 @@ get_directory_property(gen_includes INCLUDE_DIRECTORIES) - foreach(gen_include ${gen_includes} ${LUA_PREFERRED_INCLUDE_DIRS}) +@@ -440,10 +440,6 @@ get_directory_property(gen_includes INCLUDE_DIRECTORIES) + foreach(gen_include ${prop}) list(APPEND gen_cflags "-I${gen_include}") endforeach() -if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_OSX_SYSROOT) - list(APPEND gen_cflags "-isysroot") - list(APPEND gen_cflags "${CMAKE_OSX_SYSROOT}") -endif() - string(TOUPPER "${CMAKE_BUILD_TYPE}" build_type) - separate_arguments(C_FLAGS_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS}) - separate_arguments(C_FLAGS_${build_type}_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS_${build_type}}) + set(gen_cflags ${gen_cflags} -O2) + + set(NVIM_VERSION_GIT_H ${PROJECT_BINARY_DIR}/cmake.config/auto/versiondef_git.h) diff --git a/app-editors/neovim/files/neovim--cmake_lua_version.patch b/app-editors/neovim/files/neovim--cmake_lua_version.patch index 87a898032493..b14b3b992349 100644 --- a/app-editors/neovim/files/neovim--cmake_lua_version.patch +++ b/app-editors/neovim/files/neovim--cmake_lua_version.patch @@ -1,11 +1,11 @@ a/CMakeLists.txt -+++ b/CMakeLists.txt +--- a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt @@ -464,7 +464,7 @@ endif() + # The unit test lib requires LuaJIT; it will be skipped if LuaJIT is missing. option(PREFER_LUA "Prefer Lua over LuaJIT in
[gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/, app-editors/neovim/files/
commit: 6b19b1fec1b69d44e2fd8a8fdc64c874cfa195c8 Author: Sam James gentoo org> AuthorDate: Thu Nov 3 23:57:27 2022 + Commit: Sam James gentoo org> CommitDate: Thu Nov 3 23:58:15 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b19b1fe app-editors/neovim: fix CMake patch for 0.8.0-r1 Fixes: bb9639a94ba59a7b247838d36f6af9a37af61f2d Fixes: 317d433897aa1ecb0138d97df6d9374ace4005b4 Closes: https://bugs.gentoo.org/879305 Signed-off-by: Sam James gentoo.org> ...patch => neovim-0.8.0-cmake-release-type.patch} | 22 +++--- app-editors/neovim/neovim-0.8.0-r1.ebuild | 3 +-- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/app-editors/neovim/files/neovim--cmake-release-type.patch b/app-editors/neovim/files/neovim-0.8.0-cmake-release-type.patch similarity index 50% rename from app-editors/neovim/files/neovim--cmake-release-type.patch rename to app-editors/neovim/files/neovim-0.8.0-cmake-release-type.patch index 8c24b6b6123f..8114e2a92b74 100644 --- a/app-editors/neovim/files/neovim--cmake-release-type.patch +++ b/app-editors/neovim/files/neovim-0.8.0-cmake-release-type.patch @@ -1,16 +1,16 @@ Ensure that :checkhealth is happy with the Gentoo build type. https://bugs.gentoo.org/757744 a/runtime/lua/nvim/health.lua -+++ b/runtime/lua/nvim/health.lua -@@ -149,7 +149,7 @@ local function check_performance() - let s:buildtype = matchstr(execute('version'), '\v\cbuild type:?\s*[^\n\r\t ]+') - if empty(s:buildtype) - call health#report_error('failed to get build type from :version') --elseif s:buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo)' -+elseif s:buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo|Gentoo)' - call health#report_ok(s:buildtype) - else - call health#report_info(s:buildtype) +--- a/runtime/autoload/health/nvim.vim b/runtime/autoload/health/nvim.vim +@@ -135,7 +135,7 @@ function! s:check_performance() abort + let buildtype = matchstr(execute('version'), '\v\cbuild type:?\s*[^\n\r\t ]+') + if empty(buildtype) + call health#report_error('failed to get build type from :version') +- elseif buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo)' ++ elseif buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo|Gentoo)' + call health#report_ok(buildtype) + else + call health#report_info(buildtype) --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -137,12 +137,6 @@ else() diff --git a/app-editors/neovim/neovim-0.8.0-r1.ebuild b/app-editors/neovim/neovim-0.8.0-r1.ebuild index fe675b291f83..60b97a82d314 100644 --- a/app-editors/neovim/neovim-0.8.0-r1.ebuild +++ b/app-editors/neovim/neovim-0.8.0-r1.ebuild @@ -73,13 +73,12 @@ PATCHES=() if [[ ${PV} == ]]; then PATCHES+=( "${FILESDIR}/${PN}--cmake_lua_version.patch" - "${FILESDIR}/${PN}--cmake-release-type.patch" "${FILESDIR}/${PN}--cmake-darwin.patch" ) else PATCHES+=( "${FILESDIR}/${PN}--cmake_lua_version.patch" - "${FILESDIR}/${PN}--cmake-release-type.patch" + "${FILESDIR}/${PN}-0.8.0-cmake-release-type.patch" "${FILESDIR}/${PN}--cmake-darwin.patch" ) fi
[gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/, app-editors/neovim/files/
commit: 89652dfc4741375f7efbbaf5113f04cf63b53a56 Author: Robert Günzler gnzler io> AuthorDate: Mon Aug 1 18:19:41 2022 + Commit: Sam James gentoo org> CommitDate: Sat Aug 13 12:14:29 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89652dfc app-editors/neovim: rebase patches Signed-off-by: Robert Günzler gnzler.io> Closes: https://github.com/gentoo/gentoo/pull/26698 Signed-off-by: Sam James gentoo.org> app-editors/neovim/files/neovim--cmake-darwin.patch| 14 -- .../neovim/files/neovim--cmake-release-type.patch | 13 + .../neovim/files/neovim--cmake_lua_version.patch | 2 +- app-editors/neovim/neovim-.ebuild | 6 +++--- 4 files changed, 29 insertions(+), 6 deletions(-) diff --git a/app-editors/neovim/files/neovim--cmake-darwin.patch b/app-editors/neovim/files/neovim--cmake-darwin.patch index 5b829904a13e..cf3e05716625 100644 --- a/app-editors/neovim/files/neovim--cmake-darwin.patch +++ b/app-editors/neovim/files/neovim--cmake-darwin.patch @@ -1,6 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -80,23 +80,6 @@ set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${DEPS_PREFIX}/lib/pkgconfig") +@@ -80,33 +80,6 @@ set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${DEPS_PREFIX}/lib/pkgconfig") # used for check_c_compiler_flag include(CheckCCompilerFlag) @@ -13,6 +13,16 @@ - # them be included as one of the first places to look for dependencies. - list(APPEND CMAKE_PREFIX_PATH /sw /opt/local) - +- # If the macOS deployment target is not set manually (via $MACOSX_DEPLOYMENT_TARGET), +- # fall back to local system version. Needs to be done both here and in cmake.deps. +- if(NOT CMAKE_OSX_DEPLOYMENT_TARGET) +-execute_process(COMMAND sw_vers -productVersion +-OUTPUT_VARIABLE MACOS_VERSION +-OUTPUT_STRIP_TRAILING_WHITESPACE) +-set(CMAKE_OSX_DEPLOYMENT_TARGET "${MACOS_VERSION}") +- endif() +- message("Using deployment target ${CMAKE_OSX_DEPLOYMENT_TARGET}") +- - # Work around some old, broken detection by CMake for knowing when to use the - # isystem flag. Apple's compilers have supported this for quite some time - # now. @@ -42,7 +52,7 @@ # The LuaJIT build does not like being passed multiple `-arch` flags --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt -@@ -205,10 +205,6 @@ get_directory_property(gen_includes INCLUDE_DIRECTORIES) +@@ -181,10 +181,6 @@ get_directory_property(gen_includes INCLUDE_DIRECTORIES) foreach(gen_include ${gen_includes} ${LUA_PREFERRED_INCLUDE_DIRS}) list(APPEND gen_cflags "-I${gen_include}") endforeach() diff --git a/app-editors/neovim/files/neovim--cmake-release-type.patch b/app-editors/neovim/files/neovim--cmake-release-type.patch new file mode 100644 index ..1d7fb56b51c8 --- /dev/null +++ b/app-editors/neovim/files/neovim--cmake-release-type.patch @@ -0,0 +1,13 @@ +Ensure that :checkhealth is happy with the Gentoo build type. +https://bugs.gentoo.org/757744 +--- a/runtime/autoload/health/nvim.vim b/runtime/autoload/health/nvim.vim +@@ -135,7 +135,7 @@ function! s:check_performance() abort + let buildtype = matchstr(execute('version'), '\v\cbuild type:?\s*[^\n\r\t ]+') + if empty(buildtype) + call health#report_error('failed to get build type from :version') +- elseif buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo)' ++ elseif buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo|Gentoo)' + call health#report_ok(buildtype) + else + call health#report_info(buildtype) diff --git a/app-editors/neovim/files/neovim--cmake_lua_version.patch b/app-editors/neovim/files/neovim--cmake_lua_version.patch index d7e01275fb02..87a898032493 100644 --- a/app-editors/neovim/files/neovim--cmake_lua_version.patch +++ b/app-editors/neovim/files/neovim--cmake_lua_version.patch @@ -1,6 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -384,7 +384,7 @@ +@@ -464,7 +464,7 @@ endif() option(PREFER_LUA "Prefer Lua over LuaJIT in the nvim executable." OFF) if(PREFER_LUA) diff --git a/app-editors/neovim/neovim-.ebuild b/app-editors/neovim/neovim-.ebuild index dc40449cb307..c1e19411b835 100644 --- a/app-editors/neovim/neovim-.ebuild +++ b/app-editors/neovim/neovim-.ebuild @@ -66,18 +66,18 @@ BDEPEND=" ) " -PATCHES=( - "${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch" -) +PATCHES=() if [[ ${PV} == ]]; then PATCHES+=( "${FILESDIR}/${PN}--cmake_lua_version.patch" + "${FILESDIR}/${PN}--cmake-release-type.patch" "${FILESDIR}/${PN}--cmake-darwin.patch" ) else PATCHES+=( "${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch" + "${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch" "${FILESDIR}/${PN}-0.7.2-cmake-darwin.patch"
[gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/, app-editors/neovim/files/
commit: bd47d534eab9e010022944bf9f9e98aa198a6860 Author: Sam James gentoo org> AuthorDate: Tue Jul 5 00:32:52 2022 + Commit: Sam James gentoo org> CommitDate: Tue Jul 5 00:32:52 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd47d534 app-editors/neovim: rebase Darwin patch Closes: https://github.com/gentoo/gentoo/pull/25889 Signed-off-by: Sam James gentoo.org> .../neovim/files/neovim--cmake-darwin.patch| 55 ++ app-editors/neovim/neovim-.ebuild | 12 +++-- 2 files changed, 64 insertions(+), 3 deletions(-) diff --git a/app-editors/neovim/files/neovim--cmake-darwin.patch b/app-editors/neovim/files/neovim--cmake-darwin.patch new file mode 100644 index ..5b829904a13e --- /dev/null +++ b/app-editors/neovim/files/neovim--cmake-darwin.patch @@ -0,0 +1,55 @@ +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -80,23 +80,6 @@ set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${DEPS_PREFIX}/lib/pkgconfig") + # used for check_c_compiler_flag + include(CheckCCompilerFlag) + +-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") +- # CMake tries to treat /sw and /opt/local as extension of the system path, but +- # that doesn't really work out very well. Once you have a dependency that +- # resides there and have to add it as an include directory, then any other +- # dependency that could be satisfied from there must be--otherwise you can end +- # up with conflicting versions. So, let's make them more of a priority having +- # them be included as one of the first places to look for dependencies. +- list(APPEND CMAKE_PREFIX_PATH /sw /opt/local) +- +- # Work around some old, broken detection by CMake for knowing when to use the +- # isystem flag. Apple's compilers have supported this for quite some time +- # now. +- if(CMAKE_COMPILER_IS_GNUCC) +-set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ") +- endif() +-endif() +- + if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Darwin") + # Ignore case when comparing filenames on Windows and Mac. + set(CASE_INSENSITIVE_FILENAME TRUE) +--- a/cmake.deps/CMakeLists.txt b/cmake.deps/CMakeLists.txt +@@ -112,13 +112,6 @@ if(CMAKE_CXX_COMPILER) + set(DEPS_CXX_COMPILER "${CMAKE_CXX_COMPILER}") + endif() + +-if(CMAKE_OSX_SYSROOT) +- set(DEPS_C_COMPILER "${DEPS_C_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}") +- if(DEPS_CXX_COMPILER) +-set(DEPS_CXX_COMPILER "${DEPS_CXX_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}") +- endif() +-endif() +- + if(CMAKE_OSX_ARCHITECTURES) + string(REPLACE ";" "|" CMAKE_OSX_ARCHITECTURES_ALT_SEP "${CMAKE_OSX_ARCHITECTURES}") + # The LuaJIT build does not like being passed multiple `-arch` flags +--- a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt +@@ -205,10 +205,6 @@ get_directory_property(gen_includes INCLUDE_DIRECTORIES) + foreach(gen_include ${gen_includes} ${LUA_PREFERRED_INCLUDE_DIRS}) + list(APPEND gen_cflags "-I${gen_include}") + endforeach() +-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_OSX_SYSROOT) +- list(APPEND gen_cflags "-isysroot") +- list(APPEND gen_cflags "${CMAKE_OSX_SYSROOT}") +-endif() + string(TOUPPER "${CMAKE_BUILD_TYPE}" build_type) + separate_arguments(C_FLAGS_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS}) + separate_arguments(C_FLAGS_${build_type}_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS_${build_type}}) diff --git a/app-editors/neovim/neovim-.ebuild b/app-editors/neovim/neovim-.ebuild index 4316da6d93cc..5f18e490acbb 100644 --- a/app-editors/neovim/neovim-.ebuild +++ b/app-editors/neovim/neovim-.ebuild @@ -68,12 +68,18 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch" - "${FILESDIR}/${PN}-0.4.4-cmake-darwin.patch" ) + if [[ ${PV} == ]]; then - PATCHES+=("${FILESDIR}/${PN}--cmake_lua_version.patch") + PATCHES+=( + "${FILESDIR}/${PN}--cmake_lua_version.patch" + "${FILESDIR}/${PN}--cmake-darwin.patch" + ) else - PATCHES+=("${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch") + PATCHES+=( + "${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch" + "${FILESDIR}/${PN}-0.4.4-cmake-darwin.patch" + ) fi src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/, app-editors/neovim/files/
commit: fe197a5e3a8e68c1eb55ea0ad333a205fc59aade Author: Aaron Bauman gentoo org> AuthorDate: Sun Mar 14 00:18:22 2021 + Commit: Aaron Bauman gentoo org> CommitDate: Sun Mar 14 00:19:08 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe197a5e app-editors/neovim: fix build on Darwin * We don't need no damned automagic here Suggested-by: Sam James gentoo.org> Signed-off-by: Aaron Bauman gentoo.org> .../neovim/files/neovim-0.4.4-cmake-darwin.patch | 61 ++ app-editors/neovim/neovim-0.4.4-r100.ebuild| 1 + 2 files changed, 62 insertions(+) diff --git a/app-editors/neovim/files/neovim-0.4.4-cmake-darwin.patch b/app-editors/neovim/files/neovim-0.4.4-cmake-darwin.patch new file mode 100644 index 000..4fa8bf45bcb --- /dev/null +++ b/app-editors/neovim/files/neovim-0.4.4-cmake-darwin.patch @@ -0,0 +1,61 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 07928e3..08881ee 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -58,23 +58,6 @@ endif() + # used for check_c_compiler_flag + include(CheckCCompilerFlag) + +-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") +- # CMake tries to treat /sw and /opt/local as extension of the system path, but +- # that doesn't really work out very well. Once you have a dependency that +- # resides there and have to add it as an include directory, then any other +- # dependency that could be satisfied from there must be--otherwise you can end +- # up with conflicting versions. So, let's make them more of a priority having +- # them be included as one of the first places to look for dependencies. +- list(APPEND CMAKE_PREFIX_PATH /sw /opt/local) +- +- # Work around some old, broken detection by CMake for knowing when to use the +- # isystem flag. Apple's compilers have supported this for quite some time +- # now. +- if(CMAKE_COMPILER_IS_GNUCC) +-set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ") +- endif() +-endif() +- + if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Darwin") + # Enable fixing case-insensitive filenames for Windows and Mac. + set(USE_FNAME_CASE TRUE) +diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt +index aa81008..0570dc7 100644 +--- a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt +@@ -192,10 +192,6 @@ get_directory_property(gen_includes INCLUDE_DIRECTORIES) + foreach(gen_include ${gen_includes} ${LUA_PREFERRED_INCLUDE_DIRS}) + list(APPEND gen_cflags "-I${gen_include}") + endforeach() +-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_OSX_SYSROOT) +- list(APPEND gen_cflags "-isysroot") +- list(APPEND gen_cflags "${CMAKE_OSX_SYSROOT}") +-endif() + string(TOUPPER "${CMAKE_BUILD_TYPE}" build_type) + separate_arguments(C_FLAGS_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS}) + separate_arguments(C_FLAGS_${build_type}_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS_${build_type}}) +diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt +index edd5882..e503434 100644 +--- a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt +@@ -105,13 +105,6 @@ if(CMAKE_CXX_COMPILER) + set(DEPS_CXX_COMPILER "${CMAKE_CXX_COMPILER}") + endif() + +-if(CMAKE_OSX_SYSROOT) +- set(DEPS_C_COMPILER "${DEPS_C_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}") +- if(DEPS_CXX_COMPILER) +-set(DEPS_CXX_COMPILER "${DEPS_CXX_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}") +- endif() +-endif() +- + # Cross compiling: use these for dependencies built for the + # HOST system, when not crosscompiling these should be the + # same as DEPS_*. Except when targeting Unix in which case \ No newline at end of file diff --git a/app-editors/neovim/neovim-0.4.4-r100.ebuild b/app-editors/neovim/neovim-0.4.4-r100.ebuild index 987745e5962..f501db09c7e 100644 --- a/app-editors/neovim/neovim-0.4.4-r100.ebuild +++ b/app-editors/neovim/neovim-0.4.4-r100.ebuild @@ -63,6 +63,7 @@ RDEPEND=" PATCHES=( "${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch" "${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch" + "${FILESDIR}/${PN}-0.4.4-cmake-darwin.patch" ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/, app-editors/neovim/files/
commit: 7d236a315dd7fb66ed292f881cdc43d2a72de805 Author: Sam James gentoo org> AuthorDate: Tue Jan 19 03:31:25 2021 + Commit: Sam James gentoo org> CommitDate: Tue Jan 19 03:31:25 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d236a31 app-editors/neovim: explicitly mark Gentoo build type as OK No revbump because it's a minor change. Please re-install to pick it up if you're interested. This is completely cosmetic - the Gentoo build is already optimised and NOT debug, but this fixes the warning in :checkhealth. Closes: https://bugs.gentoo.org/757744 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> .../neovim/files/neovim-0.4.4-cmake-release-type.patch | 13 + app-editors/neovim/neovim-0.4.4-r100.ebuild | 5 +++-- app-editors/neovim/neovim-0.4.4.ebuild | 6 +- app-editors/neovim/neovim-.ebuild | 5 +++-- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/app-editors/neovim/files/neovim-0.4.4-cmake-release-type.patch b/app-editors/neovim/files/neovim-0.4.4-cmake-release-type.patch new file mode 100644 index 000..2c9c80a7a69 --- /dev/null +++ b/app-editors/neovim/files/neovim-0.4.4-cmake-release-type.patch @@ -0,0 +1,13 @@ +Ensure that :checkhealth is happy with the Gentoo build type. +https://bugs.gentoo.org/757744 +--- a/runtime/autoload/health/nvim.vim b/runtime/autoload/health/nvim.vim +@@ -118,7 +118,7 @@ function! s:check_performance() abort + let buildtype = matchstr(execute('version'), '\v\cbuild type:?\s*[^\n\r\t ]+') + if empty(buildtype) + call health#report_error('failed to get build type from :version') +- elseif buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo)' ++ elseif buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo|Gentoo)' + call health#report_ok(buildtype) + else + call health#report_info(buildtype) diff --git a/app-editors/neovim/neovim-0.4.4-r100.ebuild b/app-editors/neovim/neovim-0.4.4-r100.ebuild index 8cd8499a6fa..2fdf25560fc 100644 --- a/app-editors/neovim/neovim-0.4.4-r100.ebuild +++ b/app-editors/neovim/neovim-0.4.4-r100.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -61,7 +61,8 @@ RDEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-0.4.4-cmake_lua_version.patch + "${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch" + "${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch" ) src_prepare() { diff --git a/app-editors/neovim/neovim-0.4.4.ebuild b/app-editors/neovim/neovim-0.4.4.ebuild index 2b8b289784e..b9f0be5d76b 100644 --- a/app-editors/neovim/neovim-0.4.4.ebuild +++ b/app-editors/neovim/neovim-0.4.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -55,6 +55,10 @@ RDEPEND=" app-eselect/eselect-vi " +PATCHES=( + "${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch" +) + src_prepare() { # use our system vim dir sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \ diff --git a/app-editors/neovim/neovim-.ebuild b/app-editors/neovim/neovim-.ebuild index d10ac87a170..0663ee9e471 100644 --- a/app-editors/neovim/neovim-.ebuild +++ b/app-editors/neovim/neovim-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -63,7 +63,8 @@ RDEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-0.4.4-cmake_lua_version.patch + "${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch" + "${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch" ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/, app-editors/neovim/files/
commit: c9635cbd84e82d8e46873c7ee5f6911dff69594f Author: Marek Szuba gentoo org> AuthorDate: Tue Dec 22 14:59:28 2020 + Commit: Marek Szuba gentoo org> CommitDate: Tue Dec 22 15:08:08 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9635cbd app-editors/neovim: dev-lua/luv is now single-impl Signed-off-by: Marek Szuba gentoo.org> .../neovim/files/neovim-0.4.4-cmake_multiimpl_luv.patch | 11 --- app-editors/neovim/neovim-0.4.4-r100.ebuild | 3 +-- app-editors/neovim/neovim-.ebuild | 3 +-- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/app-editors/neovim/files/neovim-0.4.4-cmake_multiimpl_luv.patch b/app-editors/neovim/files/neovim-0.4.4-cmake_multiimpl_luv.patch deleted file mode 100644 index 62c6a84eae1..000 --- a/app-editors/neovim/files/neovim-0.4.4-cmake_multiimpl_luv.patch +++ /dev/null @@ -1,11 +0,0 @@ a/cmake/FindLibLUV.cmake -+++ b/cmake/FindLibLUV.cmake -@@ -6,7 +6,7 @@ - - find_package(PkgConfig) - if (PKG_CONFIG_FOUND) -- pkg_check_modules(PC_LIBLUV QUIET luv) -+ pkg_check_modules(PC_LIBLUV QUIET "libluv-${LUA_PRG}") - endif() - - set(LIBLUV_DEFINITIONS ${PC_LIBLUV_CFLAGS_OTHER}) diff --git a/app-editors/neovim/neovim-0.4.4-r100.ebuild b/app-editors/neovim/neovim-0.4.4-r100.ebuild index c5a0f1bf7ba..8cd8499a6fa 100644 --- a/app-editors/neovim/neovim-0.4.4-r100.ebuild +++ b/app-editors/neovim/neovim-0.4.4-r100.ebuild @@ -38,9 +38,9 @@ BDEPEND="${LUA_DEPS} # TODO: add tests, dev-lua/busted has now got luajit support. # bug #584694 DEPEND="${LUA_DEPS} + dev-lua/luv[${LUA_SINGLE_USEDEP}] $(lua_gen_cond_dep ' dev-lua/lpeg[${LUA_USEDEP}] - dev-lua/luv[${LUA_USEDEP}] dev-lua/mpack[${LUA_USEDEP}] ') $(lua_gen_cond_dep ' @@ -62,7 +62,6 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-0.4.4-cmake_lua_version.patch - "${FILESDIR}"/${PN}-0.4.4-cmake_multiimpl_luv.patch ) src_prepare() { diff --git a/app-editors/neovim/neovim-.ebuild b/app-editors/neovim/neovim-.ebuild index 38e9b6a6c5b..d10ac87a170 100644 --- a/app-editors/neovim/neovim-.ebuild +++ b/app-editors/neovim/neovim-.ebuild @@ -38,9 +38,9 @@ BDEPEND="${LUA_DEPS} # TODO: add tests, dev-lua/busted has now got luajit support. # bug #584694 DEPEND="${LUA_DEPS} + dev-lua/luv[${LUA_SINGLE_USEDEP}] $(lua_gen_cond_dep ' dev-lua/lpeg[${LUA_USEDEP}] - dev-lua/luv[${LUA_USEDEP}] dev-lua/mpack[${LUA_USEDEP}] ') $(lua_gen_cond_dep ' @@ -64,7 +64,6 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-0.4.4-cmake_lua_version.patch - "${FILESDIR}"/${PN}-0.4.4-cmake_multiimpl_luv.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/, app-editors/neovim/files/
commit: 6adf2a312c7176e82e8436c55c42d47963a0813e Author: Joonas Niilola gentoo org> AuthorDate: Tue Sep 29 10:18:04 2020 + Commit: Joonas Niilola gentoo org> CommitDate: Tue Sep 29 10:26:00 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6adf2a31 app-editors/neovim: gcc-10 fix for 0.4.3 - non-maintainer commit, but thoroughly tested. Closes: https://bugs.gentoo.org/714130 Signed-off-by: Joonas Niilola gentoo.org> .../neovim/files/neovim-0.4.3-gcc-10-fix.patch | 225 + app-editors/neovim/neovim-0.4.3.ebuild | 2 + 2 files changed, 227 insertions(+) diff --git a/app-editors/neovim/files/neovim-0.4.3-gcc-10-fix.patch b/app-editors/neovim/files/neovim-0.4.3-gcc-10-fix.patch new file mode 100644 index 000..5826d62ce6c --- /dev/null +++ b/app-editors/neovim/files/neovim-0.4.3-gcc-10-fix.patch @@ -0,0 +1,225 @@ +From ebcde1de42588e697e0f4eaed9f6f0ea6a77a2cd Mon Sep 17 00:00:00 2001 +From: Andreas Schneider +Date: Mon, 17 Feb 2020 16:33:55 +0100 +Subject: [PATCH 1/6] nvim:eval: Fix enum declaration for ListLenSpecials + +Instead of declaring an enum, this creates a global variable. As gcc10 +uses -fno-common by default, global variables declared with the same +name more than once is not allowed anymore revealing this issue. + +Each time this header is included, we define the enum name as a global +variable. + +See also https://bugzilla.redhat.com/show_bug.cgi?id=1799680 +--- + src/nvim/eval/typval.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/nvim/eval/typval.h b/src/nvim/eval/typval.h +index 008453b87f2f..5afdedff751b 100644 +--- a/src/nvim/eval/typval.h b/src/nvim/eval/typval.h +@@ -33,7 +33,7 @@ typedef double float_T; + enum { DO_NOT_FREE_CNT = (INT_MAX / 2) }; + + /// Additional values for tv_list_alloc() len argument +-enum { ++enum ListLenSpecials { + /// List length is not known in advance + /// + /// To be used when there is neither a way to know how many elements will be +@@ -49,7 +49,7 @@ enum { + /// + /// To be used when it looks impractical to determine list length. + kListLenMayKnow = -3, +-} ListLenSpecials; ++}; + + /// Maximal possible value of varnumber_T variable + #define VARNUMBER_MAX INT64_MAX + +From b87b4a61476bb65e9200bd2ee93b8a98ca4db84e Mon Sep 17 00:00:00 2001 +From: Andreas Schneider +Date: Mon, 17 Feb 2020 17:17:37 +0100 +Subject: [PATCH 2/6] nvim:viml: Fix enum declaration of ExprParserFlags + +Instead of declaring an enum, this creates a global variable. As gcc10 +uses -fno-common by default, global variables declared with the same +name more than once is not allowed anymore revealing this issue. + +Each time this header is included, we define the enum name as a global +variable. + +See also https://bugzilla.redhat.com/show_bug.cgi?id=1799680 +--- + src/nvim/viml/parser/expressions.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/nvim/viml/parser/expressions.h b/src/nvim/viml/parser/expressions.h +index 23e172da75b2..838a74227182 100644 +--- a/src/nvim/viml/parser/expressions.h b/src/nvim/viml/parser/expressions.h +@@ -326,7 +326,7 @@ struct expr_ast_node { + } data; + }; + +-enum { ++enum ExprParserFlags { + /// Allow multiple expressions in a row: e.g. for :echo + /// + /// Parser will still parse only one of them though. +@@ -345,7 +345,7 @@ enum { + // viml_expressions_parser.c, nvim_parse_expression() flags parsing + // alongside with its documentation and flag sets in check_parsing() + // function in expressions parser functional and unit tests. +-} ExprParserFlags; ++}; + + /// AST error definition + typedef struct { + +From 986db1adb491b5cb5936d2369816236847af26da Mon Sep 17 00:00:00 2001 +From: Andreas Schneider +Date: Mon, 17 Feb 2020 16:36:21 +0100 +Subject: [PATCH 3/6] nvim: Fix enum declaration of RemapValues + +Instead of declaring an enum, this creates a global variable. As gcc10 +uses -fno-common by default, global variables declared with the same +name more than once is not allowed anymore revealing this issue. + +Each time this header is included, we define the enum name as a global +variable. + +See also https://bugzilla.redhat.com/show_bug.cgi?id=1799680 +--- + src/nvim/getchar.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/nvim/getchar.h b/src/nvim/getchar.h +index 01f60ccf4945..f0b52079aad1 100644 +--- a/src/nvim/getchar.h b/src/nvim/getchar.h +@@ -10,12 +10,12 @@ + /// Values for "noremap" argument of ins_typebuf() + /// + /// Also used for map->m_noremap and menu->noremap[]. +-enum { ++enum RemapValues { + REMAP_YES = 0, ///< Allow remapping. + REMAP_NONE = -1, ///< No remapping. + REMAP_SCRIPT = -2, ///< Remap script-local mappings only. + REMAP_SKIP = -3, ///< No remapping for first char. +-} RemapValues; ++}; + + // Argument for flush_buffers(). + typedef enum { + +From
[gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/, app-editors/neovim/files/
commit: 9ee199efa3844017354de72e6f822517895f314e Author: Ole Reifschneider gentoo org> AuthorDate: Sun Dec 6 21:56:23 2015 + Commit: Ole Reifschneider gentoo org> CommitDate: Sun Dec 6 21:57:19 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ee199ef app-editors/neovim: Remove old Package-Manager: portage-2.2.25 app-editors/neovim/Manifest| 1 - app-editors/neovim/files/automagic-jemalloc.patch | 35 --- app-editors/neovim/files/nvimrc| 105 - app-editors/neovim/neovim-0.0.0_pre20151025.ebuild | 80 4 files changed, 221 deletions(-) diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest index fedeb44..ebbad18 100644 --- a/app-editors/neovim/Manifest +++ b/app-editors/neovim/Manifest @@ -1,3 +1,2 @@ -DIST neovim-0.0.0_pre20151025.tar.xz 4947384 SHA256 62b3bd93e0395c3f2d1f829a1e4e444ac081de1acc99114f6ceba7d61a7055a3 SHA512 a0390097cc0cfae401779ddd229a6237fa63522caaa6515dfff025b506b83e2597a10711bae0a1a60770d2a244963aa56af58f734885ce73091a19865a420bf0 WHIRLPOOL becfec39f4aa1a22f48991f17dbca003f38dfa6b085ed6043e34ed7e8522173e4fce4d33873b0385e1b46754ae11db21ce47cbecd12822e5073d38a5fda1 DIST neovim-0.1.0.tar.gz 7644722 SHA256 e8659558103b8f5a65aac84007a12e3581b32736321778028017fd07365cfff8 SHA512 b91e5ce5561155ecb3554f56fd4371219612ed3bc35dfeb60a225eb1dbe1473fce5f573eb996bdb01fd9569f764da86493108665c98dc7555fc44f410befb00a WHIRLPOOL 33d7b88588c214ddc670a7b3cffcfd855699e90b15c5e327ac0c17972fddb73bd519b1a8eb609f8454d6c463f18764f17bc1314b6b27448c5ac4607cdbce1551 DIST neovim-0.1.1.tar.gz 7584560 SHA256 f39bcab23457c66ce0d67dcf8029743703f860413db0070f75d4f0ffad27c6c1 SHA512 7098bef9b81862f009789cff49a063d56d52d2f5c74e2fe68ad65c952c61c07eabeb6be150b369a5a179957f20187de3051caaa30b1e0cb4ec1e9e49b4e77333 WHIRLPOOL 9df0d6d59bdda2def2d8a393eec579f341256aff18c485cbb08c96637c597ee4df73a68a09105e776605194412274df2c82b78f7ca0e0bc1e20d4780fcdfa57f diff --git a/app-editors/neovim/files/automagic-jemalloc.patch b/app-editors/neovim/files/automagic-jemalloc.patch deleted file mode 100644 index a08fc07..000 --- a/app-editors/neovim/files/automagic-jemalloc.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit bb3c3cbee65ef42b2b3048afae008c719bc2056a -Author: Ole Reifschneider-Date: Sat Oct 24 18:48:01 2015 +0200 - -Make jemalloc optional - -Don't enable it automagically if it exists - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 348e138..53e3873 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -260,12 +260,16 @@ if((CLANG_ASAN_UBSAN OR CLANG_MSAN OR CLANG_TSAN) AND NOT CMAKE_C_COMPILER_ID MA - message(FATAL_ERROR "Sanitizers are only supported for Clang.") - endif() - --if(CLANG_ASAN_UBSAN OR CLANG_MSAN OR CLANG_TSAN) -- message(STATUS "Sanitizers have been enabled; don't use jemalloc.") --else() -- find_package(JeMalloc) -- if(JEMALLOC_FOUND) --include_directories(SYSTEM ${JEMALLOC_INCLUDE_DIRS}) -+option(ENABLE_JEMALLOC "enable jemalloc" OFF) -+ -+if (ENABLE_JEMALLOC) -+ if(CLANG_ASAN_UBSAN OR CLANG_MSAN OR CLANG_TSAN) -+message(STATUS "Sanitizers have been enabled; don't use jemalloc.") -+ else() -+find_package(JeMalloc) -+if(JEMALLOC_FOUND) -+ include_directories(SYSTEM ${JEMALLOC_INCLUDE_DIRS}) -+endif() - endif() - endif() - diff --git a/app-editors/neovim/files/nvimrc b/app-editors/neovim/files/nvimrc deleted file mode 100644 index 635fc62..000 --- a/app-editors/neovim/files/nvimrc +++ /dev/null @@ -1,105 +0,0 @@ -" Default Gentoo configuration file for neovim -" Based on the default vimrc shipped by Gentoo with app-editors/vim-core -" $Id$ - -" 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 !~? "ucs-bom" - set fileencodings^=ucs-bom -endif - -" Always check for UTF-8 when trying to determine encodings. -if !~? "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 , see bug #101665. -if "" == - 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-commits] repo/gentoo:master commit in: app-editors/neovim/, app-editors/neovim/files/
commit: 5b486fad4015dc4479a9f413d08534828ae68ba8 Author: Ole Reifschneider gentoo org> AuthorDate: Sun Nov 1 21:58:24 2015 + Commit: Ole Reifschneider gentoo org> CommitDate: Sun Nov 1 21:58:47 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b486fad app-editors/neovim: Bump version to 0.1.0 Package-Manager: portage-2.2.23 app-editors/neovim/Manifest| 1 + app-editors/neovim/files/sysinit.vim | 105 + app-editors/neovim/neovim-0.1.0.ebuild | 78 3 files changed, 184 insertions(+) diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest index 1dbc37f..9c1e930 100644 --- a/app-editors/neovim/Manifest +++ b/app-editors/neovim/Manifest @@ -3,3 +3,4 @@ DIST neovim-0.0.0_pre20150727.tar.xz 4703336 SHA256 da9bd3070ac60691be4e03394754 DIST neovim-0.0.0_pre20150814.tar.xz 4718836 SHA256 e7abdb0b3a44ec3c312b06aa825caca4520f1b857045c45c925e8005e2bf3ada SHA512 638e6807929880c2648bd2d0efde509842423488272926bb3ae89a6681144b86fe5137ef313ae102fe8c2fa82819fe96e0dcc0a8d45e3ccaf18b207cf9c1aad1 WHIRLPOOL f1ca40e0bef46da63c466e0fcc51bcf37c57f64009a680f6e51cb1cf3b0d481011dff33957b5da38dfe8d55978c368efe9d905d4f26a272e915470fab239dcff DIST neovim-0.0.0_pre20151022.tar.xz 4947140 SHA256 8b090b130f6eb47021d872e8e33691cbd6169f7f0650389cfd0a3bfc194bafc5 SHA512 262b37d1937982bd86f436ecc9c055fdbd650a227c7da77d203e26c9a885b32dc584b4b098f7f2bcea31e7fdb40b51c5a7d337ca4b794b0114c1115e642406ea WHIRLPOOL ca6e50a0225bfea9161c2b7432886377e6a9962fdde3f35f8a091fc26b35fb44d87d4a327b56b428dbcee9d91f66fe2365a33b158b92bf1b5cff08d326e91320 DIST neovim-0.0.0_pre20151025.tar.xz 4947384 SHA256 62b3bd93e0395c3f2d1f829a1e4e444ac081de1acc99114f6ceba7d61a7055a3 SHA512 a0390097cc0cfae401779ddd229a6237fa63522caaa6515dfff025b506b83e2597a10711bae0a1a60770d2a244963aa56af58f734885ce73091a19865a420bf0 WHIRLPOOL becfec39f4aa1a22f48991f17dbca003f38dfa6b085ed6043e34ed7e8522173e4fce4d33873b0385e1b46754ae11db21ce47cbecd12822e5073d38a5fda1 +DIST neovim-0.1.0.tar.gz 7644673 SHA256 2a14bbbde800b87f5d1b4e0c145cab9a8fc0513d6e7ad851d43cd3a4d821fd58 SHA512 7a577ee1470e1e9b80368ae10c215465ddfdfdac541bf08d81d68a459a3f9485c8cb1feba1450facb64185021f0d4dfd3bd93c53b98ac1cecbbafbe5e6b1404c WHIRLPOOL 7727371ff70c24be6d2fda9bc626a4fdebe4a03e237f7441a3e1cddb2ff7877d015c7ed1c19744e9e4ce8391d31fd8ac01f99782f1c634aa35783f35ddff7dc8 diff --git a/app-editors/neovim/files/sysinit.vim b/app-editors/neovim/files/sysinit.vim new file mode 100644 index 000..635fc62 --- /dev/null +++ b/app-editors/neovim/files/sysinit.vim @@ -0,0 +1,105 @@ +" Default Gentoo configuration file for neovim +" Based on the default vimrc shipped by Gentoo with app-editors/vim-core +" $Id$ + +" 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 !~? "ucs-bom" + set fileencodings^=ucs-bom +endif + +" Always check for UTF-8 when trying to determine encodings. +if !~? "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 , see bug #101665. +if "" == + 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 + + " In text files, limit the width of text to 78 characters, but be careful + " that we don't override the user's setting. + autocmd BufNewFile,BufRead *.txt +\ if == 0 && ! exists("g:leave_my_textwidth_alone") | +\ setlocal textwidth=78 | +\ endif + + " 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 ("'\"") <=