gentoo resync : 14.12.2020

7 files changed, 168 insertions, 21 deletions

diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 91afaca295a3..01db5fae6627 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -1,8 +1,11 @@
 AUX neovim-0.4.3-gcc-10-fix.patch 7417 BLAKE2B 5632a2427337e7b4d1b793381a074d2d7f0822aecb99a83123e8ec4fa4a35a975816a4854d2b596ae1aa63ecb876399c843454b6bd12b759889384d49fb8f0bf SHA512 e29c65e8075972e44ab056fd721208c62d77591a91cc12987bc07339bb2f6373cbf308719d9fa3f7919ec064112475993af64572fad851152da2fc8f0f39d2a4
+AUX neovim-0.4.4-cmake_lua_version.patch 419 BLAKE2B 73477d7fdc2705f2e93cd6dd355ea01fbfc232306e86a13097a1c069ea3248972be9d4da7b175c8c3c7e0fde7581d4ed9b431d73c119e9f8a63a7a15007aba31 SHA512 a1be27ebd18be34fede632f695bacf65699e9dd1a8b219120372b5e0c48691f595ba42725c4f795456b8018d668f471e3a042622a5f541af50c84a089d53c83c
+AUX neovim-0.4.4-cmake_multiimpl_luv.patch 286 BLAKE2B 9aba9e874a86c25d784f7ce0a8e4511e6dc7b5ad044ee9d06aebb7fd71230a8075d6aaad8e0bd9dbea7b6ad3a9b79abb48bfa16700e1320b97d78bbf49345064 SHA512 007d5b037d464dbfee727b51d889db8861e10672f2d1d736af131c81029bb1abdb279df4c17b7a32d34aa6caeba65fd2a97ab43c2c6dc651efed8f0e8d0f213f
 AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a
 DIST neovim-0.4.3.tar.gz 9556199 BLAKE2B 831f4d4950f4fa2cd9c7393824bbb5eb571ae5759d13af9f320e0fa351fa155413a5be580f010f2c7ab43ca7bc10c569ccf6e3ba29efc7f5a035576b030b216d SHA512 e13853fa296eda8618f389c71b6cbbd6f01d561615e80cc92959131dd10e395b1c6732a7d9ef6dbb9fe3ea9da4c11485b464547e2d46b22e59b8a20214e861f5
 DIST neovim-0.4.4.tar.gz 9558246 BLAKE2B b1d44898bb1e1ab40a7e1d7fb4448076c991ebe1a0956674548de82fe7a931d9eaffbf35ba03cf9c88466dcd628a55f1d7bf9e7a13f3dad74424d6d653ded60c SHA512 ca5c2fe1784ac7b0d2117948ba2e9ae5d94e36d22ff9e0967047e1e03e605537672d85543897af335103215ad462c86962f25267d352a77d61bc3d1cafb3c183
-EBUILD neovim-0.4.3.ebuild 1895 BLAKE2B ceb2d111b6d52d10592ab2da6dd507ac5050420b56443a57356d18e5220a081204d5a0331ce788187bb2494ad8f68cae95fc24e36eb57bdf7a892ab93e64d195 SHA512 074b04fa5ae321a293382f1ba21677374352788cb2b166fea99dd9369d07a3af62ded6b7b6f9bb735d9573d95e2bf870d15c9a4acaaba750fe3c1f37f8d99c6a
-EBUILD neovim-0.4.4.ebuild 2348 BLAKE2B 58b011421a7cae8fd3c09d214a4bba0acd3eda43d5a08353170bc3c7268da080ae6fd8f891b36be77cadc1430506282e13d3e50dd4d6119014c0d1b43265f6ef SHA512 8106a227003985d3c35eca795abf2b587cd8e27b115e2e50c064a45e406605c6fa21eaee35eb85e3de5422ddd91a62745f6907f6b92904788c3c24b742890955
-EBUILD neovim-9999.ebuild 2372 BLAKE2B eefb333a5041d8bd4cc131c92aad6292a3928ecccb6c1afae5ac67608697085016af5c7928944d877a73fc26fdce5ac2fe14cbde397611a3e7e8b94f6e728a99 SHA512 109c49c8b12258d7e4cb7cde1b4ece99c8fb0faf362fab0df719609f9693c250241f30cf54764a7406ad6f5df2f0c471a13332447f6a6b1ee2659a52eaf535f3
+EBUILD neovim-0.4.3.ebuild 1896 BLAKE2B ba5466ec3e33e1e13da42edaf4c13003f62ca0ccb7495d1e76cd716c28619444bfe4c6fa61f49aef1982296553e04c504c33cb93ff7366702728438768ca9853 SHA512 c6d6ec282f937beab1171f57bcf55a3efb97f8d0676a57c43a477f44586c2ee7fa9c59967fee332ddb3164ba754be5f26af9be2f249a31968fada653235432d1
+EBUILD neovim-0.4.4-r100.ebuild 2726 BLAKE2B 162e67550f15f0e5ca5d161c4d0b8cc67dc0889c20d83d1beaa0675b2523262a5d4e597ac2099e6584b3d9876934c95e5ac99a3ac9a1b63d6b878d33ae37c720 SHA512 98a0bc6486c5bf9d82baaf49e2a5844c59e7d480a7541f133e121470e6d998fb4d0b3d7168fed53bf7ec28ce3fbf2b11756e1ca0742e518d09a10b7874fbafea
+EBUILD neovim-0.4.4.ebuild 2348 BLAKE2B 449d78658d067df46ec85097b9730653e45e7def1cfefbe3a8967c4bbd3864b3db37c348f66382baff8788a1f5e76083fcc27327794bf78a14db565874f86c00 SHA512 58c9992a9621ee2932f440a9b18c67ca9982338c164c95d4cb16274cd4f42dc91c6d5bf1aa9bf6178d2ff7a5ace75ba168635638e1b44d1add0607ac16eb5dc5
+EBUILD neovim-9999.ebuild 2774 BLAKE2B 33139cd79cec2f8ef864d3b779bbb84a859065d471a56520f9f6e40be625a2902079c445693336ef0d2edfd68f185f3d9261ebe065d695dab143800d93c1f25c SHA512 4873649e3c097077e949f66099704692209ff725c7408b1242f14584f0abdccc7af08285740ec6d3eb050f7185f032979c5b69e74756058f3d99bac7d2755d61
 MISC metadata.xml 535 BLAKE2B 7cebdc1b7adafafdcc2fe266f8696ad0dff927e8a9383ee34ac66e2c8910d3863d1f7603f2a82dec75f586ab22814d7268475ae3ce02fc3dca12a665e1e8ce5e SHA512 71fcf593a1b9587e6af0e30e851fb17e8552568a4e8bd38341c150ada7dbf72f962250f3306403c0be2d334932f63fe183850efe1c67d515ba79577cdf7aa561
diff --git a/app-editors/neovim/files/neovim-0.4.4-cmake_lua_version.patch b/app-editors/neovim/files/neovim-0.4.4-cmake_lua_version.patch
new file mode 100644
index 000000000000..4703dee52613
--- /dev/null
+++ b/app-editors/neovim/files/neovim-0.4.4-cmake_lua_version.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -384,7 +384,7 @@
+ option(PREFER_LUA "Prefer Lua over LuaJIT in the nvim executable." OFF)
+ 
+ if(PREFER_LUA)
+-  find_package(Lua 5.1 REQUIRED)
++  find_package(Lua ${PREFER_LUA} EXACT REQUIRED)
+   set(LUA_PREFERRED_INCLUDE_DIRS ${LUA_INCLUDE_DIR})
+   set(LUA_PREFERRED_LIBRARIES ${LUA_LIBRARIES})
+   # Passive (not REQUIRED): if LUAJIT_FOUND is not set, nvim-test is skipped.
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
new file mode 100644
index 000000000000..62c6a84eae13
--- /dev/null
+++ b/app-editors/neovim/files/neovim-0.4.4-cmake_multiimpl_luv.patch
@@ -0,0 +1,11 @@
+--- 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.3.ebuild b/app-editors/neovim/neovim-0.4.3.ebuild
index b6a404f65c14..55644dda6a6f 100644
--- a/app-editors/neovim/neovim-0.4.3.ebuild
+++ b/app-editors/neovim/neovim-0.4.3.ebuild
@@ -36,7 +36,7 @@ DEPEND="
 	net-libs/libnsl
 	luajit? ( dev-lang/luajit:2 )
 	!luajit? (
-		dev-lang/lua:=
+		dev-lang/lua:0=
 		dev-lua/LuaBitOp
 	)
 	tui? (
diff --git a/app-editors/neovim/neovim-0.4.4-r100.ebuild b/app-editors/neovim/neovim-0.4.4-r100.ebuild
new file mode 100644
index 000000000000..c5a0f1bf7baf
--- /dev/null
+++ b/app-editors/neovim/neovim-0.4.4-r100.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~x86"
+fi
+
+LICENSE="Apache-2.0 vim"
+SLOT="0"
+IUSE="+lto +nvimpager +tui"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+# Upstream say the test library needs LuaJIT
+# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377
+#REQUIRED_USE="test? ( lua_single_target_luajit )"
+#RESTRICT="!test? ( test )"
+
+# Upstream build scripts invoke the Lua interpreter
+BDEPEND="${LUA_DEPS}
+	dev-util/gperf
+	virtual/libiconv
+	virtual/libintl
+	virtual/pkgconfig
+"
+# TODO: add tests, dev-lua/busted has now got luajit support.
+# bug #584694
+DEPEND="${LUA_DEPS}
+	$(lua_gen_cond_dep '
+		dev-lua/lpeg[${LUA_USEDEP}]
+		dev-lua/luv[${LUA_USEDEP}]
+		dev-lua/mpack[${LUA_USEDEP}]
+	')
+	$(lua_gen_cond_dep '
+		dev-lua/LuaBitOp[${LUA_USEDEP}]
+	' lua5-{1,2})
+	dev-libs/libuv:0=
+	>=dev-libs/libvterm-0.1.2
+	dev-libs/msgpack:0=
+	net-libs/libnsl
+	tui? (
+		dev-libs/libtermkey
+		>=dev-libs/unibilium-2.0.0:0=
+	)
+"
+RDEPEND="
+	${DEPEND}
+	app-eselect/eselect-vi
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.4-cmake_lua_version.patch
+	"${FILESDIR}"/${PN}-0.4.4-cmake_multiimpl_luv.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
+
+	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.
+	local mycmakeargs=(
+		-DENABLE_LTO=$(usex lto)
+		-DFEAT_TUI=$(usex tui)
+		-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-0.4.4.ebuild b/app-editors/neovim/neovim-0.4.4.ebuild
index d10522f3c6b7..4bb6be68f96e 100644
--- a/app-editors/neovim/neovim-0.4.4.ebuild
+++ b/app-editors/neovim/neovim-0.4.4.ebuild
@@ -13,7 +13,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 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0 vim"
@@ -42,7 +42,7 @@ DEPEND="
 	net-libs/libnsl
 	luajit? ( dev-lang/luajit:2 )
 	!luajit? (
-		dev-lang/lua:=
+		dev-lang/lua:0=
 		dev-lua/LuaBitOp
 	)
 	tui? (
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index ae758e6e27bd..38e9b6a6c5bc 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=7
 
-inherit cmake optfeature xdg
+LUA_COMPAT=( lua5-{1..2} luajit )
+
+inherit cmake lua-single optfeature xdg
 
 DESCRIPTION="Vim-fork focused on extensibility and agility."
 HOMEPAGE="https://neovim.io"
@@ -18,34 +20,38 @@ fi
 
 LICENSE="Apache-2.0 vim"
 SLOT="0"
-IUSE="+lto +luajit +nvimpager +tui"
+IUSE="+lto +nvimpager +tui"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
 # Upstream say the test library needs LuaJIT
 # https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377
-#REQUIRED_USE="test? ( luajit )"
+#REQUIRED_USE="test? ( lua_single_target_luajit )"
 #RESTRICT="!test? ( test )"
 
-BDEPEND="
+# Upstream build scripts invoke the Lua interpreter
+BDEPEND="${LUA_DEPS}
 	dev-util/gperf
 	virtual/libiconv
 	virtual/libintl
 	virtual/pkgconfig
 "
-# Once dev-lua/busted has luajit support, we can add tests.
+# TODO: add tests, dev-lua/busted has now got luajit support.
 # bug #584694
-DEPEND="
+DEPEND="${LUA_DEPS}
+	$(lua_gen_cond_dep '
+		dev-lua/lpeg[${LUA_USEDEP}]
+		dev-lua/luv[${LUA_USEDEP}]
+		dev-lua/mpack[${LUA_USEDEP}]
+	')
+	$(lua_gen_cond_dep '
+		dev-lua/LuaBitOp[${LUA_USEDEP}]
+	' lua5-{1,2})
 	dev-libs/libutf8proc:=
 	dev-libs/libuv:0=
 	>=dev-libs/libvterm-0.1.2
 	dev-libs/msgpack:0=
-	dev-lua/lpeg[luajit=]
-	dev-lua/luv[luajit=]
-	dev-lua/mpack[luajit=]
+	dev-libs/tree-sitter:=
 	net-libs/libnsl
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? (
-		dev-lang/lua:=
-		dev-lua/LuaBitOp
-	)
 	tui? (
 		dev-libs/libtermkey
 		>=dev-libs/unibilium-2.0.0:0=
@@ -56,6 +62,11 @@ RDEPEND="
 	app-eselect/eselect-vi
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.4-cmake_lua_version.patch
+	"${FILESDIR}"/${PN}-0.4.4-cmake_multiimpl_luv.patch
+)
+
 src_prepare() {
 	# use our system vim dir
 	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
@@ -73,7 +84,8 @@ src_configure() {
 	local mycmakeargs=(
 		-DENABLE_LTO=$(usex lto)
 		-DFEAT_TUI=$(usex tui)
-		-DPREFER_LUA=$(usex luajit no yes)
+		-DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)")
+		-DLUA_PRG="${ELUA}"
 	)
 	cmake_src_configure
 }