[gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/, app-editors/neovim/files/

["Marek Szuba" <marecki@gentoo.org>]

commit:     c9635cbd84e82d8e46873c7ee5f6911dff69594f
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 22 14:59:28 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Dec 22 15:08:08 2020 +0000
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 <marecki <AT> 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-9999.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..00000000000
--- 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-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index 38e9b6a6c5b..d10ac87a170 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.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() {