diff options
| author |   Marek Szuba <marecki@gentoo.org> | 2020-12-22 14:59:28 +0000 |
|---|---|---|
| committer | Marek Szuba <marecki@gentoo.org> | 2020-12-22 15:08:08 +0000 |
| commit | c9635cbd84e82d8e46873c7ee5f6911dff69594f (patch) | |
| tree | 9c944e2564a3a75db578db04a9707f2547ba06d3 /app-editors | |
| parent | dev-lua/luv: go back to single-impl mode (diff) | |
| download | gentoo-c9635cbd84e82d8e46873c7ee5f6911dff69594f.tar.gz gentoo-c9635cbd84e82d8e46873c7ee5f6911dff69594f.tar.bz2 gentoo-c9635cbd84e82d8e46873c7ee5f6911dff69594f.zip | |
app-editors/neovim: dev-lua/luv is now single-impl
Signed-off-by: Marek Szuba <marecki@gentoo.org>
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/neovim/files/neovim-0.4.4-cmake_multiimpl_luv.patch | 11 | ||||
| -rw-r--r-- | app-editors/neovim/neovim-0.4.4-r100.ebuild | 3 | ||||
| -rw-r--r-- | 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 62c6a84eae13..000000000000 --- 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 c5a0f1bf7baf..8cd8499a6fa2 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 38e9b6a6c5bc..d10ac87a1704 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() { |