| 1 |
commit: c9635cbd84e82d8e46873c7ee5f6911dff69594f |
| 2 |
Author: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 22 14:59:28 2020 +0000 |
| 4 |
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 22 15:08:08 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9635cbd |
| 7 |
|
| 8 |
app-editors/neovim: dev-lua/luv is now single-impl |
| 9 |
|
| 10 |
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> |
| 11 |
|
| 12 |
.../neovim/files/neovim-0.4.4-cmake_multiimpl_luv.patch | 11 ----------- |
| 13 |
app-editors/neovim/neovim-0.4.4-r100.ebuild | 3 +-- |
| 14 |
app-editors/neovim/neovim-9999.ebuild | 3 +-- |
| 15 |
3 files changed, 2 insertions(+), 15 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
deleted file mode 100644 |
| 19 |
index 62c6a84eae1..00000000000 |
| 20 |
--- a/app-editors/neovim/files/neovim-0.4.4-cmake_multiimpl_luv.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,11 +0,0 @@ |
| 23 |
---- a/cmake/FindLibLUV.cmake |
| 24 |
-+++ b/cmake/FindLibLUV.cmake |
| 25 |
-@@ -6,7 +6,7 @@ |
| 26 |
- |
| 27 |
- find_package(PkgConfig) |
| 28 |
- if (PKG_CONFIG_FOUND) |
| 29 |
-- pkg_check_modules(PC_LIBLUV QUIET luv) |
| 30 |
-+ pkg_check_modules(PC_LIBLUV QUIET "libluv-${LUA_PRG}") |
| 31 |
- endif() |
| 32 |
- |
| 33 |
- set(LIBLUV_DEFINITIONS ${PC_LIBLUV_CFLAGS_OTHER}) |
| 34 |
|
| 35 |
diff --git a/app-editors/neovim/neovim-0.4.4-r100.ebuild b/app-editors/neovim/neovim-0.4.4-r100.ebuild |
| 36 |
index c5a0f1bf7ba..8cd8499a6fa 100644 |
| 37 |
--- a/app-editors/neovim/neovim-0.4.4-r100.ebuild |
| 38 |
+++ b/app-editors/neovim/neovim-0.4.4-r100.ebuild |
| 39 |
@@ -38,9 +38,9 @@ BDEPEND="${LUA_DEPS} |
| 40 |
# TODO: add tests, dev-lua/busted has now got luajit support. |
| 41 |
# bug #584694 |
| 42 |
DEPEND="${LUA_DEPS} |
| 43 |
+ dev-lua/luv[${LUA_SINGLE_USEDEP}] |
| 44 |
$(lua_gen_cond_dep ' |
| 45 |
dev-lua/lpeg[${LUA_USEDEP}] |
| 46 |
- dev-lua/luv[${LUA_USEDEP}] |
| 47 |
dev-lua/mpack[${LUA_USEDEP}] |
| 48 |
') |
| 49 |
$(lua_gen_cond_dep ' |
| 50 |
@@ -62,7 +62,6 @@ RDEPEND=" |
| 51 |
|
| 52 |
PATCHES=( |
| 53 |
"${FILESDIR}"/${PN}-0.4.4-cmake_lua_version.patch |
| 54 |
- "${FILESDIR}"/${PN}-0.4.4-cmake_multiimpl_luv.patch |
| 55 |
) |
| 56 |
|
| 57 |
src_prepare() { |
| 58 |
|
| 59 |
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild |
| 60 |
index 38e9b6a6c5b..d10ac87a170 100644 |
| 61 |
--- a/app-editors/neovim/neovim-9999.ebuild |
| 62 |
+++ b/app-editors/neovim/neovim-9999.ebuild |
| 63 |
@@ -38,9 +38,9 @@ BDEPEND="${LUA_DEPS} |
| 64 |
# TODO: add tests, dev-lua/busted has now got luajit support. |
| 65 |
# bug #584694 |
| 66 |
DEPEND="${LUA_DEPS} |
| 67 |
+ dev-lua/luv[${LUA_SINGLE_USEDEP}] |
| 68 |
$(lua_gen_cond_dep ' |
| 69 |
dev-lua/lpeg[${LUA_USEDEP}] |
| 70 |
- dev-lua/luv[${LUA_USEDEP}] |
| 71 |
dev-lua/mpack[${LUA_USEDEP}] |
| 72 |
') |
| 73 |
$(lua_gen_cond_dep ' |
| 74 |
@@ -64,7 +64,6 @@ RDEPEND=" |
| 75 |
|
| 76 |
PATCHES=( |
| 77 |
"${FILESDIR}"/${PN}-0.4.4-cmake_lua_version.patch |
| 78 |
- "${FILESDIR}"/${PN}-0.4.4-cmake_multiimpl_luv.patch |
| 79 |
) |
| 80 |
|
| 81 |
src_prepare() { |
Archives