gentoo auto-resync : 29:03:2025 - 00:32:15

6 files changed, 147 insertions, 6 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 5059263bccf6..4b9289c18308 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 763fd954007e..2f3bb8849ee5 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -6,10 +6,12 @@ DIST neovim-0.10.1.tar.gz 12796966 BLAKE2B 85d98abe03f69ab03d09dc1b39783974af392
 DIST neovim-0.10.2.tar.gz 12801272 BLAKE2B 0cba241ec6466639044decf26728b6c17c3be7970c85b6938fceb05c329d2832c8c46d0113d83aedee458991e4cb27dfad67b3d7b84080a23035ca85ccd57e36 SHA512 6478c53bddff0bf042388464fa1c5114e8fe75c7c41b22e5426783bd2f8406bd3297ffd4bc895ea13e573f0cd28a64755c1f5c063531bb8de477c4e439384418
 DIST neovim-0.10.3.tar.gz 12804352 BLAKE2B 4196154a1f2415f72ed4cdebbde67804212d9be0f364fdb4c053ba0fb608eddad457fd360d7ce764615651288f5890b3283b180fc2ed726208a19fbc6c9fb9c4 SHA512 f1286c42bf0a119fea4575ae64043e43f36cd569d339ced15700c45441e8d8952ea7eac2250063a5aff4552632f0ca7696b442d4d8ffa4f5fce25ddbee0e861b
 DIST neovim-0.10.4.tar.gz 12808381 BLAKE2B 5dae3cef173431ca39320e4640661457e25e9508feee23bb076d82ab3a5934df1961cb63f7329bba7dc0d41bb4e6e889a4cf58754812d1af074a21fc36cdc1c5 SHA512 8dadc24edaaa27e6ecd4db6c19d0183868a8d2809ba122110685f340341d951772ac2eb0c5f7a7ab5f87d3d5d8ae5e81f156c61f04f6d4ebbaa17cd35fb70b64
+DIST neovim-0.11.0.tar.gz 12901255 BLAKE2B 155af14e07dff73ebe825b6233e4536a00de34d183ebe5d440e251098d7d95fd87fbcb3c6de4ed00fec0e2acc126c5bc1ae08a6b41389e4eae2fc126775493a6 SHA512 f898aebffa1d222cdbbc2663b69a6ea55a045c3ddb4e8454bda7b0c6e9abbfc60dce6ea235f535506f6caac9cc1b07c65bdab25374f320cfabc3744336989cf6
 EBUILD neovim-0.10.1-r1.ebuild 3554 BLAKE2B e09720f5c77fd83007375227b31d38228bc4dfa5b17235ac906ffdea99e1a06b794949f7cd6250d3c87b6bb9952c311c84cfdf2b8b4b8a93f28e91b7cdeb5ef6 SHA512 a9b43b4c12622c2638bc0bf72144fcf734fb46f197c241ceb9a59c9ee53ac6e979184b88d23031e31172544404e2c1da6fc1d5b7114f1ea714018c7defd232d2
 EBUILD neovim-0.10.2-r1.ebuild 3475 BLAKE2B 4272d7a26931c9c0067054d3055102d3a1148381f5dd11e1865c47b7c2c815d7626b79ab51c355290fc0e4d5880310435161390d3d73e843070bedcb09da201b SHA512 51f83cedbda106411dd337ee31bd545887c3ff07211d2c5b621018c9aa6305cc658aebe2397fa3013349de4809ac911888ecd720e5da67de052d9cf8ed2081a9
 EBUILD neovim-0.10.2.ebuild 3554 BLAKE2B e09720f5c77fd83007375227b31d38228bc4dfa5b17235ac906ffdea99e1a06b794949f7cd6250d3c87b6bb9952c311c84cfdf2b8b4b8a93f28e91b7cdeb5ef6 SHA512 a9b43b4c12622c2638bc0bf72144fcf734fb46f197c241ceb9a59c9ee53ac6e979184b88d23031e31172544404e2c1da6fc1d5b7114f1ea714018c7defd232d2
 EBUILD neovim-0.10.3.ebuild 3555 BLAKE2B 03ad18fda4756e29d3a8994f48047e8420fe817b8998b8dcff204efe7bf96b7c87ae3246508c2aa5d4e7c015aa228a747eb9e020136e0bffe9c3fcb61d949652 SHA512 e9cc2e2f6bce8afab5871e1f451a62b4413f7ad7658778b0b8e77865b5a75118fdce3e675d08a7380f46a9ef5f10acba3b0d5132017728a4b95ef2adb15991ab
 EBUILD neovim-0.10.4.ebuild 3472 BLAKE2B 05333962022d520b08cceeafb126c2c4957754dc586eecedbd6acd795e897974c47ea2090347b1b86c2836386ad218a811dd132f0e8b0df6941de23e75f601b7 SHA512 b7d5e5371d89464170018552cf5fccf094fbf9230cdece382205693be7239afe6b31c96400429e7da815714f1423fdcb679700a5c6ff3ef3776689bb7010d20a
+EBUILD neovim-0.11.0.ebuild 3476 BLAKE2B 8684ff645989a15b5ee124c3ae7bb13af3edef9bc1071dd7e76e82f70a0ec7e36f7ee3657e58502a49e173c990930ddd8f83721780cd246507e9a6934d51f935 SHA512 d5cda4b031a89575746882ea535af2c45ec50a80f7023ae66a85cfc05bbd018b4da59c3c2d6b8a3c79c54dfa389ce143cdbc2926a286192c38d5d38a5a3a05ad
 EBUILD neovim-9999.ebuild 3475 BLAKE2B 7264295dc68f17a4651ea57dc586e8aeab089608a45b6baae9cca9dd70a1a222a9a03a90ce87c06646785d5f6795ceddb4359f924c934ab2fad692ce877a3538 SHA512 785b9e27e26f905be4b30b44f8dcb84ab0ad4d84dba53e1da77495261becab4b45ebd927a3e7eed5db4f110660680e7789db9082063a1de56553c673f5592708
 MISC metadata.xml 678 BLAKE2B 45ead4b7163d0750477ac40d5aeaa3baee2cc9f2b90d6fee9d9c18c3433a6eecdcdb16665218538ddb644d2701eff02d397e44c0b84d21b1571ce7ee99354333 SHA512 faef3288490a32cf7fed881d6f35430fcc4f74a38881aee4162b2729472152f56cd2818e093d4cf832d3b74781598050300e4bcc85b0e996fb9b2d8d2da43bac
diff --git a/app-editors/neovim/neovim-0.11.0.ebuild b/app-editors/neovim/neovim-0.11.0.ebuild
new file mode 100644
index 000000000000..28e03762f8bb
--- /dev/null
+++ b/app-editors/neovim/neovim-0.11.0.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2025 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).
+# List of required tree-sitter parsers is taken from cmake.deps/deps.txt
+DEPEND="${LUA_DEPS}
+	>=dev-lua/luv-1.50.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/libutf8proc-2.10.0:=
+	>=dev-libs/libuv-1.50.0:=
+	>=dev-libs/libvterm-0.3.3
+	>=dev-libs/msgpack-3.0.0:=
+	>=dev-libs/tree-sitter-0.25.3:=
+	=dev-libs/tree-sitter-c-0.23*
+	=dev-libs/tree-sitter-lua-0.3*
+	=dev-libs/tree-sitter-markdown-0.4*
+	=dev-libs/tree-sitter-query-0.5*
+	=dev-libs/tree-sitter-vim-0.5*
+	=dev-libs/tree-sitter-vimdoc-3*
+	>=dev-libs/unibilium-2.1.2: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}-9999-cmake-darwin.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() {
+	# 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="${LUA}"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# install a default configuration file
+	insinto /etc/vim
+	doins "${FILESDIR}"/sysinit.vim
+
+	# symlink tree-sitter parsers
+	dodir /usr/share/nvim/runtime
+	for parser in c lua markdown query vim vimdoc; do
+		dosym ../../../../$(get_libdir)/libtree-sitter-${parser}.so /usr/share/nvim/runtime/parser/${parser}.so
+	done
+
+	# 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/qhexedit2/Manifest b/app-editors/qhexedit2/Manifest
index c8a283bd562a..56f43d5b2841 100644
--- a/app-editors/qhexedit2/Manifest
+++ b/app-editors/qhexedit2/Manifest
@@ -5,6 +5,6 @@ AUX qhexedit2-0.8.6-sip5.patch 2295 BLAKE2B 8a689da202adf6169ed34eb7c7fc0c824451
 AUX qhexedit2-0.8.9-fix-crash.patch 1437 BLAKE2B 8a58e4dc74de1fb5120ea7fc53df92f07d38023dede7bd4e778c7ad1de22ac981269d28fc80c1c61b7a1e448a812b4452b5a9494d486b71ff07e2e1cd07ffa24 SHA512 e8abff741616cbaf842942ff426b7ce6e43e88cd42f5c3ad282b7654ba727cacb2d3eb197656769ff1b9ff9a819a7ef61df594a686b2b339f0b67c8cfc8b55df
 DIST qhexedit2-0.8.10.tar.gz 353275 BLAKE2B 475d718f5ed05bbfded5b38f42672decff09310b27964d9c1680212302ef8cd1a9cedadf9860cc5200bae78e7ac66d5cbd14ac139d91ed025b8228bd7836947f SHA512 e245bea0f2edca69b821f6fcb64114f7307b536e1eaf15b3a05e4f50b7ea2038b64b4d3a3a1f1f56b76b0b570aae21ee3cc1497e2d43d5fd145029fe565c1c58
 DIST qhexedit2-0.8.9_p20210525.tar.gz 342178 BLAKE2B baffe5b5e1130476162f23a91420cc86675a162c39539c9f07685cecc82571817625202814006221f96b56e94c0325fd7a6d8f2294041b426054f809c9967bad SHA512 d8a5159433a1212085371473cc7a89c4888c6af6b1416a34e3ea9d1ef9ae19411af32bea2e2fb256a024d6f2d05c733d285314cfc17f37dae065d7407a9c0d2c
-EBUILD qhexedit2-0.8.10.ebuild 2035 BLAKE2B 486ceb951889a7fa4c823fc3ac27004e1856ed3b27907a0692292d025117c7a295019a2c1294be6f574f80576d9286804dfc3476a0244f6f2112fe8b643d92af SHA512 1252c8bd71914f27b7e2642df1ffa913f7e4827a489350277672beb622dc37f9519db03873a0bdcbd7516187889635f4f998cd49a8e6426e0de8944e82d250ff
-EBUILD qhexedit2-0.8.9_p20210525-r3.ebuild 2391 BLAKE2B 4fac665bc28b4e3eb78b51064e12d97f1f00a5d15d0371bce6d628da51a77d3755cfbe04d93dd3698901bb87fd5e7c65a2f88e0193f70eb04afa132bd8a27afe SHA512 8224a7ab6d842447e478db2e67e29ca84888194833b1773067d692e4cce630bc77ac607957cac6b17777807f437b5e4440edbde6f20f480bc88fe16980783b2b
+EBUILD qhexedit2-0.8.10-r1.ebuild 2302 BLAKE2B 994e75d60fe04a24f7d4b5255b6b0897b9fc180f42a6b167818880f988d29c9a95253669582b0fc51c812bde65c38c5053e0e445457762ec28e55547a7868723 SHA512 7379374fa00b1fc0fc0b937976d9571f988638dd57a1de253af3acf6af2c4c647ad6fdd830ba66b93acf9489fa1422dab68145ede013a733d1a835ff6517a133
+EBUILD qhexedit2-0.8.9_p20210525-r4.ebuild 2658 BLAKE2B 94378eb800df5a49e7d587adf7abeb2eb3d411f346ad15350e92f6ebeb7e1db430d084b64772838d1cf454d9fe432e35510c2c684087f000c3022649d56781e0 SHA512 6a0673baf2e8d4ae98dcf21d7c35dea10cf290282f26b2e6f4dd6d2884fec2667dc1ae73240ae038060fbb5da2f07c1a69dab73603b05f60d48e990298ec4c9e
 MISC metadata.xml 877 BLAKE2B f7343c25b4643b468d75938b4af93a8e52e10ebb1bc774c3caada33d202d0ea938789bc9400584fc78098b05c7a029c9be781f37302ac8edf7cae40659f6d9a9 SHA512 897f7435ec755c6689192e762172fc02a10ea043d7ba2662eb88dd7db4856dbe82e95c3b7fed890ee6dd2f8b11a3dd77e25af4ec56b69cb7191c5805b31371b3
diff --git a/app-editors/qhexedit2/qhexedit2-0.8.10.ebuild b/app-editors/qhexedit2/qhexedit2-0.8.10-r1.ebuild
index 8bccefc0be85..e453b38b41d6 100644
--- a/app-editors/qhexedit2/qhexedit2-0.8.10.ebuild
+++ b/app-editors/qhexedit2/qhexedit2-0.8.10-r1.ebuild
@@ -59,7 +59,13 @@ src_compile() {
 		export PATH="$(qt6_get_bindir):${PATH}"
 		python_build() {
 			pushd "${S}" || die
-			sip-build || die
+			# sip-build is not able to handle CFLAGS and CXXFLAGS
+			# so we need to pass them as QMAKE_CFLAGS and QMAKE_CXXFLAGS
+			# https://bugs.gentoo.org/952787
+			sip-build \
+				--qmake-setting "QMAKE_CFLAGS += ${CFLAGS}" \
+				--qmake-setting "QMAKE_CXXFLAGS += ${CXXFLAGS}" \
+				|| die
 			popd || die
 		}
 		python_foreach_impl run_in_build_dir python_build
diff --git a/app-editors/qhexedit2/qhexedit2-0.8.9_p20210525-r3.ebuild b/app-editors/qhexedit2/qhexedit2-0.8.9_p20210525-r4.ebuild
index facd3ab0add9..c74e154f49b5 100644
--- a/app-editors/qhexedit2/qhexedit2-0.8.9_p20210525-r3.ebuild
+++ b/app-editors/qhexedit2/qhexedit2-0.8.9_p20210525-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit python-r1 qmake-utils
 
 EGIT_COMMIT="541139125be034b90b6811a84faa1413e357fd94"
@@ -69,7 +69,13 @@ src_compile() {
 		export PATH="$(qt5_get_bindir):${PATH}"
 		python_build() {
 			pushd "${S}" || die
-			sip-build || die
+			# sip-build is not able to handle CFLAGS and CXXFLAGS
+			# so we need to pass them as QMAKE_CFLAGS and QMAKE_CXXFLAGS
+			# https://bugs.gentoo.org/952787
+			sip-build \
+				--qmake-setting "QMAKE_CFLAGS += ${CFLAGS}" \
+				--qmake-setting "QMAKE_CXXFLAGS += ${CXXFLAGS}" \
+				|| die
 			popd || die
 		}
 		python_foreach_impl run_in_build_dir python_build