gentoo auto-resync : 11:09:2024 - 12:30:54

14 files changed, 10 insertions, 391 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index de587f87fbae..3095602a88f2 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/focuswriter/Manifest b/app-editors/focuswriter/Manifest
index 0e5a983d0a71..1820525a0871 100644
--- a/app-editors/focuswriter/Manifest
+++ b/app-editors/focuswriter/Manifest
@@ -2,5 +2,5 @@ AUX focuswriter-1.6.0-unbundle-qtsingleapplication.patch 1108 BLAKE2B b17d04cfb5
 DIST focuswriter-1.7.6-src.tar.bz2 10311965 BLAKE2B a1f1627df988d7660f6b90cf984d725ff2366754f01b0ce78e23756a98c716acafa8b4076f4749f117cba6eaabcb6ec61516c032a7ae770eb1b06466a358595e SHA512 45e0bc9b20c73b260aa42dcc9ee79515d3ad95d4c9586f60ab75fb404f73c7443484f238b3705ba3224b852a0d9b8b8db17d9145aebb77513f8597a01ab01d3b
 DIST focuswriter-1.8.8.tar.bz2 10640138 BLAKE2B 78abf8e67cafd4d46fd4628f229d2030b4840b066e4b3d04768ad7df3d6a99f1c03bc7f0a15daef3e9c807e1da7ef6f309ce65e8128a3b77ac0c9a8ff6f2a695 SHA512 f41cb82f4d7d3e397fcbc7e1010e379cb410ac67dd35f1b38e7ae7ac791670e29fe5cc710627ffe196a02f23edd423b53fafa2ff4697e560f28c7cf6e1aba388
 EBUILD focuswriter-1.7.6.ebuild 928 BLAKE2B 9297d46d557cd2d86eeffbdb1b747beb1286044a78637ef39be4d4de1bda26eda15bd287b0e65d804101f28ffff48e14e1bdf530a3d95cce056c1949b29e17be SHA512 7d4cc807b2464597b001bba1b21dcd01a7a25d131a6677426db8afabc73b0c367f8caef4fa2bfc2f7553340c01e3c3bcc0470bf1985b565ac594024a6f5ad260
-EBUILD focuswriter-1.8.8.ebuild 588 BLAKE2B 5ca84d3efcecaa677cb5bf43d03cdbaa18f3fdeb583f8e8a81cdd8e6fe5a35484d9ba51c4c5e3dc9b49214fa217ca8558957bb089f9a1afa56dc54ff70b23c40 SHA512 50e453050f0245ba5d7f2b52d04b78bc7a4248320e28b76946dfaae744ba14f8dffab5b7664b0d5afa19f806afb75c2def62c297110a1c88fd2955afdada2929
+EBUILD focuswriter-1.8.8.ebuild 590 BLAKE2B 1981a22b75b88ea69dff5b243ec52c34e36c6cb098f32ab6055ad25bab034383e1d27d6341777888a3bc65119f185a4bfe71856fc93467fef23ec4b711447f8c SHA512 8514c30cd6cb7e80e3bb09be69dc3189b1909d79d261d1380ad57cfe4b3b0fdc8becc1fb5860976c74dcc50e2df5269736f9fd5a6f0597f78f60a833409a755c
 MISC metadata.xml 313 BLAKE2B 45aa7b68c4e4df98f87084c5d62494d5ece6c4cd71d6e8912b003de7d97a57cef72742e827656d1d7dbc5f1e923d89ce01f946f310f40bbcf76ff3aec0afd9ea SHA512 0a603b26467c39a49061f7474462d39ef4d9f3c6c94a27374a69f4beed54ab4ca23df347bc6cfc744e902e1a1d4c7d003b059a68e46b7fe97421a8cf9df8e7eb
diff --git a/app-editors/focuswriter/focuswriter-1.8.8.ebuild b/app-editors/focuswriter/focuswriter-1.8.8.ebuild
index d48e4a770d50..92703729bd78 100644
--- a/app-editors/focuswriter/focuswriter-1.8.8.ebuild
+++ b/app-editors/focuswriter/focuswriter-1.8.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake xdg
 
 DESCRIPTION="Fullscreen and distraction-free word processor"
 HOMEPAGE="https://gottcode.org/focuswriter/
@@ -12,7 +12,7 @@ SRC_URI="https://gottcode.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3+ LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 BDEPEND="
 	dev-qt/qttools:6[linguist]
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index e9fdc7ec8dc4..24b6a9d8888d 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -1,13 +1,7 @@
-AUX neovim-0.9.0-cmake-release-type.patch 624 BLAKE2B ee230ce39f70bbd7c37c15d1b6e37e664bb5f729d4563b392f904f0e38e67f9416ffb6e23bf7dfc200b334288cd75f89b542e26ad74b7aac796ee6a2662642fc SHA512 af82955921c76e031bb62b5418fb0c116c431bba31e18e43bc3e7fccf8b82a45ef18646bdecd25a98c75d58c9105fdeb2ff23462d97b6105d19c5b5f480dae99
 AUX neovim-0.9.0-cmake_lua_version.patch 583 BLAKE2B 085ef029e0945e410724c586f7a9f0e679af967bfe1d36cb2c4fac7579697f4d1473ef62ddbe9770bb6ef79130a6c5f0d81d3918334b5e3ca83cb951bfb547f5 SHA512 e29fbc7198b71ea8804a1676da6e9e0b3e42d436c1a280fc83dd5e932b490d5210c4cc46639d7592ab3b98ba82d5b1f8046650bc3cdcf53193f8298481611d47
-AUX neovim-0.9.1-cmake-darwin.patch 438 BLAKE2B da56fa8bfd3a01a93c5039cb8b9d02753e6be5b96782537e4c9f7f2c4ebab32f95f42eeb3c193e2ae22acea03c293d808736ca38c7f082ca5fcc57076f16e736 SHA512 87afea0d283eaf261dda76d84e3b09dabc2aaf021877f2457af240581ca22d9bb29cc7fa44c3804727dacd9e8c0d3c0edf5d72e59e34dd5e6496b9a30a0669b8
 AUX neovim-9999-cmake-darwin.patch 353 BLAKE2B d5fb24689ea1451d16f07e4d63308d8f45f48603f2786546f672db3437f3c5ac0b9e5bb8625e2c6d9361abd6a8dfef2ae813fb20755bc3f602ea3ceaf85b2628 SHA512 afacce4b4989efd237b0592c96b33cd8ec432a33faffba978f075a675dd44354e9416da8bb6c1e603f5258aece230118a2ce2cf1e34790090706e0a4aba04c55
-AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a
-AUX sysinit.vim-r1 3131 BLAKE2B 0c64d5750f2db149308021549b327d0835b20bd4cf07f9eafd4efcdf7bc819475bd7b1c4781949265c5c8fcc858cde0bf632a0456e50b6ee6e110dd965c24df6 SHA512 d485765ff5161c2a79f1d0f944588448b94cd7bf8d72ca021312e755f13d241a11c796f117148624a8d66809caebbd747da56367a6805f1d37a4956e112cb325
+AUX sysinit.vim 3131 BLAKE2B 0c64d5750f2db149308021549b327d0835b20bd4cf07f9eafd4efcdf7bc819475bd7b1c4781949265c5c8fcc858cde0bf632a0456e50b6ee6e110dd965c24df6 SHA512 d485765ff5161c2a79f1d0f944588448b94cd7bf8d72ca021312e755f13d241a11c796f117148624a8d66809caebbd747da56367a6805f1d37a4956e112cb325
 DIST neovim-0.10.1.tar.gz 12796966 BLAKE2B 85d98abe03f69ab03d09dc1b39783974af392f707deddef4640b6953ad574f9a455897217c2431c6c2fadb56568b55ac18ed06bbfcc7bbe1c6ab013991e99ee6 SHA512 37e9d45041b059a26fe02717eae7cdbde58f0a35560c590764f5888de67cfa04bee76d6b359ab14b020ac5a661d64908960283347381d334106308504c0df908
-DIST neovim-0.9.5.tar.gz 11590180 BLAKE2B a982ea5704a8e5810c42475198157c3d2255c033f47cba940f9f6414c649167ecafe08c7fe9aeb3154a15566fdf8f5db8d535fa752e467e36ff5d552a7aa2179 SHA512 6e20d0a1d506dc292dd68dabe4b5635f86c019ca832f9927e907377e6d21fe7765b3010f5bba644bb2d7a76c178d55b290af24856a7e3c4083a1aa60bc496775
-EBUILD neovim-0.10.1.ebuild 3543 BLAKE2B 0e2ab034bc31d761bc721a34e5eae56040176f036f741d7b1b47904a0337139c6e3c249fc306ddaf4a1afea62d72b72c21277668f0bfce766e33f6c2fd96d86b SHA512 2ebe2deb9de0d49aad2aa8b1da524d852b98267d4df6b08b1c1f362156dbecb75178b925411a6d5a5fa7f746a87458432a2d92eb4735ea58d10c134d7bbcff2f
-EBUILD neovim-0.9.5-r1.ebuild 3256 BLAKE2B 39745d81e4f2e65895efc0f9045c6127deca6717ff183e0991cea0934e316fdd63dc97711cef3ac2fce19e00d36ee4ecbec38fd8749e761e2d2eb3bf4543d0ef SHA512 cb4b0d98fead556d47e99cafa470b031aa2d5c6c0d2b7073042d74fe2eb25d83915ec11662663f6eeb70a5592aa02155200442a4f35aa263e4bd14acb1417ebc
-EBUILD neovim-0.9.5.ebuild 3237 BLAKE2B cbcd85861bcee37608a5286864531623d09cb943be6851387cd5304837a1157239c613df4bed4f3f885e65e33f8a464696ddc6a758f6b2d770a8018274c577ce SHA512 9476b4ad65b23727c21136c021c43086b837318283a1d0be8e624814ce7b0057157bfd285b41bd62076542baea3fd3f8525b0b44eef3b9183a9cdd5a275bd269
-EBUILD neovim-9999.ebuild 3573 BLAKE2B 2cc37ceaf21cdcb0b574898182f3e9be4806665040ef1908f0fdfe7963aa2ba19f585b373b2c10f69402d0c24db0bd56b9703273411780daecbcc541575a73a7 SHA512 ac7691a7dd8998d2ca17f13e8c075373c1d5c434fe39dcbde512914a0a7f59db9c5cb3ccdf8586b767c64f12c54dc39662d7f93623c75af43b0865663fb2cdb9
+EBUILD neovim-0.10.1-r1.ebuild 3554 BLAKE2B e09720f5c77fd83007375227b31d38228bc4dfa5b17235ac906ffdea99e1a06b794949f7cd6250d3c87b6bb9952c311c84cfdf2b8b4b8a93f28e91b7cdeb5ef6 SHA512 a9b43b4c12622c2638bc0bf72144fcf734fb46f197c241ceb9a59c9ee53ac6e979184b88d23031e31172544404e2c1da6fc1d5b7114f1ea714018c7defd232d2
+EBUILD neovim-9999.ebuild 3557 BLAKE2B a47d9afecae288c109ea3f0faa7eced95dae233ccdb02ca8210762a8c7b004528ad9c6a11c3375ad930454d3c0e49066f0f81e2a2a9a9200190963dd8a9c47c1 SHA512 71fdbecf7de0e7c6a41036a8fc3b9f2ed68b645fadc61077a71a5799f338af7028a660181f6dd05762e7b1ffc0f4f15cf32a0c3a59f34bd9fb7b3dff26e8a001
 MISC metadata.xml 678 BLAKE2B 45ead4b7163d0750477ac40d5aeaa3baee2cc9f2b90d6fee9d9c18c3433a6eecdcdb16665218538ddb644d2701eff02d397e44c0b84d21b1571ce7ee99354333 SHA512 faef3288490a32cf7fed881d6f35430fcc4f74a38881aee4162b2729472152f56cd2818e093d4cf832d3b74781598050300e4bcc85b0e996fb9b2d8d2da43bac
diff --git a/app-editors/neovim/files/neovim-0.9.0-cmake-release-type.patch b/app-editors/neovim/files/neovim-0.9.0-cmake-release-type.patch
deleted file mode 100644
index b6026437f7bf..000000000000
--- a/app-editors/neovim/files/neovim-0.9.0-cmake-release-type.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 521ef93..a637866 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -114,12 +114,6 @@ set(NVIM_API_LEVEL 11)         # Bump this after any API change.
- set(NVIM_API_LEVEL_COMPAT 0)  # Adjust this after a _breaking_ API change.
- set(NVIM_API_PRERELEASE false)
- 
--# Default to -O2 on release builds.
--if(CMAKE_C_FLAGS_RELEASE MATCHES "-O3")
--  message(STATUS "Replacing -O3 in CMAKE_C_FLAGS_RELEASE with -O2")
--  string(REPLACE "-O3" "-O2" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
--endif()
--
- # Build-type: RelWithDebInfo
- 
- # /Og means something different in MSVC
diff --git a/app-editors/neovim/files/neovim-0.9.1-cmake-darwin.patch b/app-editors/neovim/files/neovim-0.9.1-cmake-darwin.patch
deleted file mode 100644
index 1488148298bd..000000000000
--- a/app-editors/neovim/files/neovim-0.9.1-cmake-darwin.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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/files/sysinit.vim b/app-editors/neovim/files/sysinit.vim
index 92b802f345cf..de47eef7299e 100644
--- a/app-editors/neovim/files/sysinit.vim
+++ b/app-editors/neovim/files/sysinit.vim
@@ -55,13 +55,6 @@ augroup gentoo
   " 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 &tw == 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") |
diff --git a/app-editors/neovim/files/sysinit.vim-r1 b/app-editors/neovim/files/sysinit.vim-r1
deleted file mode 100644
index de47eef7299e..000000000000
--- a/app-editors/neovim/files/sysinit.vim-r1
+++ /dev/null
@@ -1,97 +0,0 @@
-" 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-0.10.1.ebuild b/app-editors/neovim/neovim-0.10.1-r1.ebuild
index 7137cf2df1a4..b73b16f4c014 100644
--- a/app-editors/neovim/neovim-0.10.1.ebuild
+++ b/app-editors/neovim/neovim-0.10.1-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 ~ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86 ~x64-macos"
 fi
 
 LICENSE="Apache-2.0 vim"
diff --git a/app-editors/neovim/neovim-0.9.5-r1.ebuild b/app-editors/neovim/neovim-0.9.5-r1.ebuild
deleted file mode 100644
index 539c462636df..000000000000
--- a/app-editors/neovim/neovim-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# RelWithDebInfo sets -Og -g
-CMAKE_BUILD_TYPE=Release
-LUA_COMPAT=( lua5-{1..2} luajit )
-inherit cmake lua-single optfeature xdg
-
-DESCRIPTION="Vim-fork focused on extensibility and agility"
-HOMEPAGE="https://neovim.io"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	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 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="+nvimpager test"
-
-# Upstream say the test library needs LuaJIT
-# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377
-REQUIRED_USE="${LUA_REQUIRED_USE} test? ( lua_single_target_luajit )"
-# TODO: Get tests running
-RESTRICT="!test? ( test ) test"
-
-# Upstream build scripts invoke the Lua interpreter
-BDEPEND="${LUA_DEPS}
-	>=dev-util/gperf-3.1
-	>=sys-devel/gettext-0.20.1
-	virtual/libiconv
-	virtual/libintl
-	virtual/pkgconfig
-"
-# Check https://github.com/neovim/neovim/blob/master/third-party/CMakeLists.txt for
-# new dependency bounds and so on on bumps (obviously adjust for right branch/tag).
-DEPEND="${LUA_DEPS}
-	>=dev-lua/luv-1.45.0[${LUA_SINGLE_USEDEP}]
-	$(lua_gen_cond_dep '
-		dev-lua/lpeg[${LUA_USEDEP}]
-		dev-lua/mpack[${LUA_USEDEP}]
-	')
-	$(lua_gen_cond_dep '
-		dev-lua/LuaBitOp[${LUA_USEDEP}]
-	' lua5-{1,2})
-	>=dev-libs/libuv-1.46.0:=
-	>=dev-libs/libvterm-0.3.3
-	>=dev-libs/msgpack-3.0.0:=
-	>=dev-libs/tree-sitter-0.20.8:=
-	>=dev-libs/libtermkey-0.22
-	>=dev-libs/unibilium-2.0.0:0=
-"
-RDEPEND="
-	${DEPEND}
-	app-eselect/eselect-vi
-"
-BDEPEND+="
-	test? (
-		$(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]')
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.0-cmake_lua_version.patch"
-	"${FILESDIR}/${PN}-0.9.1-cmake-darwin.patch"
-	"${FILESDIR}/${PN}-0.9.0-cmake-release-type.patch"
-)
-
-src_prepare() {
-	# Use our system vim dir
-	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
-		-i src/nvim/globals.h || die
-
-	# https://forums.gentoo.org/viewtopic-p-8750050.html
-	xdg_environment_reset
-	cmake_src_prepare
-}
-
-src_configure() {
-	# 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
-		-DENABLE_LTO=OFF
-		-DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)")
-		-DLUA_PRG="${ELUA}"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# install a default configuration file
-	insinto /etc/vim
-	newins "${FILESDIR}"/sysinit.vim-r1 sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard
-	optfeature "Python plugin support" dev-python/pynvim
-	optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client
-	optfeature "remote/nvr support" dev-python/neovim-remote
-}
diff --git a/app-editors/neovim/neovim-0.9.5.ebuild b/app-editors/neovim/neovim-0.9.5.ebuild
deleted file mode 100644
index 59f60e257bdd..000000000000
--- a/app-editors/neovim/neovim-0.9.5.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# RelWithDebInfo sets -Og -g
-CMAKE_BUILD_TYPE=Release
-LUA_COMPAT=( lua5-{1..2} luajit )
-inherit cmake lua-single optfeature xdg
-
-DESCRIPTION="Vim-fork focused on extensibility and agility"
-HOMEPAGE="https://neovim.io"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	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 ~ppc ~ppc64 ~riscv x86 ~x64-macos"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="+nvimpager test"
-
-# Upstream say the test library needs LuaJIT
-# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377
-REQUIRED_USE="${LUA_REQUIRED_USE} test? ( lua_single_target_luajit )"
-# TODO: Get tests running
-RESTRICT="!test? ( test ) test"
-
-# Upstream build scripts invoke the Lua interpreter
-BDEPEND="${LUA_DEPS}
-	>=dev-util/gperf-3.1
-	>=sys-devel/gettext-0.20.1
-	virtual/libiconv
-	virtual/libintl
-	virtual/pkgconfig
-"
-# Check https://github.com/neovim/neovim/blob/master/third-party/CMakeLists.txt for
-# new dependency bounds and so on on bumps (obviously adjust for right branch/tag).
-DEPEND="${LUA_DEPS}
-	>=dev-lua/luv-1.45.0[${LUA_SINGLE_USEDEP}]
-	$(lua_gen_cond_dep '
-		dev-lua/lpeg[${LUA_USEDEP}]
-		dev-lua/mpack[${LUA_USEDEP}]
-	')
-	$(lua_gen_cond_dep '
-		dev-lua/LuaBitOp[${LUA_USEDEP}]
-	' lua5-{1,2})
-	>=dev-libs/libuv-1.46.0:=
-	>=dev-libs/libvterm-0.3.3
-	>=dev-libs/msgpack-3.0.0:=
-	>=dev-libs/tree-sitter-0.20.8:=
-	>=dev-libs/libtermkey-0.22
-	>=dev-libs/unibilium-2.0.0:0=
-"
-RDEPEND="
-	${DEPEND}
-	app-eselect/eselect-vi
-"
-BDEPEND+="
-	test? (
-		$(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]')
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.0-cmake_lua_version.patch"
-	"${FILESDIR}/${PN}-0.9.1-cmake-darwin.patch"
-	"${FILESDIR}/${PN}-0.9.0-cmake-release-type.patch"
-)
-
-src_prepare() {
-	# Use our system vim dir
-	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
-		-i src/nvim/globals.h || die
-
-	# https://forums.gentoo.org/viewtopic-p-8750050.html
-	xdg_environment_reset
-	cmake_src_prepare
-}
-
-src_configure() {
-	# 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
-		-DENABLE_LTO=OFF
-		-DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)")
-		-DLUA_PRG="${ELUA}"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# install a default configuration file
-	insinto /etc/vim
-	doins "${FILESDIR}"/sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard
-	optfeature "Python plugin support" dev-python/pynvim
-	optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client
-	optfeature "remote/nvr support" dev-python/neovim-remote
-}
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index a322637e75c8..edf16933b50b 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -105,7 +105,7 @@ src_install() {
 
 	# install a default configuration file
 	insinto /etc/vim
-	newins "${FILESDIR}"/sysinit.vim-r1 sysinit.vim
+	doins "${FILESDIR}"/sysinit.vim
 
 	# symlink tree-sitter parsers
 	dodir /usr/share/nvim/runtime
diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest
index f9c0e030687a..1a1a735832da 100644
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@@ -1,6 +1,6 @@
 AUX okteta-0.26.13-doctools-optional.patch 1002 BLAKE2B c56d0c5de30895f2de11b09ad4095de93f3ed7d4f83cc049788995ebad13774887792c46d93748f3232138ed1092eb0b2e2b52ca1f37d9fe2bec7c435e070bff SHA512 ec7f3cd8eb53e667ce80418f86e62ea541929150d97e3c306ef25db9eb408f291e1d744720a9e4c1abb76f5cf35001fd559eb9946736e9ca4f5bf315913fe7f3
 DIST okteta-0.26.15.tar.xz 1090764 BLAKE2B 3e96aca3bc1ec1aceb22de23f7aa954c7a41b1b074207bf59acb3be27ababb7a368044b231f587604c42dba16c002fd8f0df488b1828f564b0eb79cd64622fec SHA512 8e63b20ad3e1d238a6006fca834b355825015088a3dff82866e1197c2802e4a3cc57644d50b44407203bea2c2d4a132c89d402e52e4525d257de9a8cde87f1db
-DIST okteta-0.26.16.tar.xz 1090268 BLAKE2B 73834ded6d286611cfd06d4851c655b943a3ff796d08ee43a0dc864f73a0d7ef0b60301054faa59732afccc5272742855989598f5ac6eaa60888afabbba98da8 SHA512 e18f54b4c0ce665dcf91b6a338d3abae4c062fe07bfea6ca14a03b8f2ba91207bdb67e03faa2fd90eaa49ed844b2549046612b75ecb9462cb6dfac71f0c0b141
+DIST okteta-0.26.17.tar.xz 1090720 BLAKE2B f062e2fe2be54d4895fdc27e545885621e6e31932e23f8f098e88bb4b1dc01d08e2376621bfbed7e729e0b264a2a46ded8819ce0041e86e0f17e150ac875137f SHA512 0ef8c43802596e124dfeaff1edfc1f77d239fbbe6daaa70eda6f48e77ae3d09ea730da8757a9a52986efc822d8e9692587636fd9ecbf1ce7689362a48079d6b9
 EBUILD okteta-0.26.15.ebuild 1806 BLAKE2B 0cb330e140e5a19f2ac4835bd6306d590cfab69512eaf9f4aa38406e56046be4919e4a756fe3b3c093bab7bba5667099602e8a52ff67d20d65b3aa1a6eec289b SHA512 acf4b732ba645846e93cf554b749959e1b18d56ebf75c94685e415ac65e0c58f63a6c848bab07b57dea092fc35f7f2fa56a07ad46227bc2970a38794e92018de
-EBUILD okteta-0.26.16.ebuild 1809 BLAKE2B 9f6368d41d53554051e591ee8d5e1898638e565612ca4b8bdc12d7ff5e7bfb9be39b9a6e5b9b8480d1c5d98b19e62509e86b94144bcdf72b1205666a4df1ea51 SHA512 262c6742588efa7262e2af392617ca3bb7e169eee84384ba866437252ebdebe5e5d9ecca8046d168277a6454ab14c35db94b4370eb90830604b731c7226ba08b
+EBUILD okteta-0.26.17.ebuild 1809 BLAKE2B 9f6368d41d53554051e591ee8d5e1898638e565612ca4b8bdc12d7ff5e7bfb9be39b9a6e5b9b8480d1c5d98b19e62509e86b94144bcdf72b1205666a4df1ea51 SHA512 262c6742588efa7262e2af392617ca3bb7e169eee84384ba866437252ebdebe5e5d9ecca8046d168277a6454ab14c35db94b4370eb90830604b731c7226ba08b
 MISC metadata.xml 409 BLAKE2B efa27a2a8769a56200077d2d606e930a14fe7b8dad531386da39675c501ea7298939b6c197b668379430840b002c0a5ff34da592fcb2af18734649cb5d527f6c SHA512 0966b96a06e7315574724c75c6c3c680b6ea7da71278885ae65d214ca6a18a4b2d11b101221caa89ef5682d91f7a4cc7c2108f9741072cb12f97e95af0bcb09b
diff --git a/app-editors/okteta/okteta-0.26.16.ebuild b/app-editors/okteta/okteta-0.26.17.ebuild
index efad0b46cf69..efad0b46cf69 100644
--- a/app-editors/okteta/okteta-0.26.16.ebuild
+++ b/app-editors/okteta/okteta-0.26.17.ebuild