From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B96191382C5 for ; Tue, 22 Dec 2020 15:08:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E9EE4E0963; Tue, 22 Dec 2020 15:08:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CED55E0982 for ; Tue, 22 Dec 2020 15:08:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6E8E034157A for ; Tue, 22 Dec 2020 15:08:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E9741309 for ; Tue, 22 Dec 2020 15:08:15 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1608649688.c9635cbd84e82d8e46873c7ee5f6911dff69594f.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/, app-editors/neovim/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/neovim/files/neovim-0.4.4-cmake_multiimpl_luv.patch app-editors/neovim/neovim-0.4.4-r100.ebuild app-editors/neovim/neovim-9999.ebuild X-VCS-Directories: app-editors/neovim/files/ app-editors/neovim/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: c9635cbd84e82d8e46873c7ee5f6911dff69594f X-VCS-Branch: master Date: Tue, 22 Dec 2020 15:08:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 96054480-ffef-4236-b6d8-b067a67ec5ad X-Archives-Hash: 8d51422705c661bc3011f59a8a2bcd3b commit: c9635cbd84e82d8e46873c7ee5f6911dff69594f Author: Marek Szuba gentoo org> AuthorDate: Tue Dec 22 14:59:28 2020 +0000 Commit: Marek Szuba gentoo 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 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() {