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 C8A65138330 for ; Sat, 27 Aug 2016 21:52:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5BF0721C012; Sat, 27 Aug 2016 21:52:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D7F1321C012 for ; Sat, 27 Aug 2016 21:52:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2881634087C for ; Sat, 27 Aug 2016 21:52:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DA1BB1B9B for ; Sat, 27 Aug 2016 21:52:41 +0000 (UTC) From: "Ole Reifschneider" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ole Reifschneider" Message-ID: <1472333897.162e986e4fa8da433f89aa4a9afb36c27c63e466.tranquility@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/neovim/metadata.xml app-editors/neovim/neovim-0.1.5-r1.ebuild app-editors/neovim/neovim-9999.ebuild X-VCS-Directories: app-editors/neovim/ X-VCS-Committer: tranquility X-VCS-Committer-Name: Ole Reifschneider X-VCS-Revision: 162e986e4fa8da433f89aa4a9afb36c27c63e466 X-VCS-Branch: master Date: Sat, 27 Aug 2016 21:52:41 +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-Archives-Salt: 34c6eb52-9b0e-4b2f-8c40-eeaec8b9fbe6 X-Archives-Hash: 5722e299bcdeabc66d779a1a77f2bcf3 commit: 162e986e4fa8da433f89aa4a9afb36c27c63e466 Author: Aric Belsito gmail com> AuthorDate: Mon Jul 18 21:44:34 2016 +0000 Commit: Ole Reifschneider gentoo org> CommitDate: Sat Aug 27 21:38:17 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=162e986e app-editors/neovim: Readjust dependencies luajit is no longer a hard dependency, so we can depend on either dev-lang/luajit, or dev-lang/lua the perl support was erroneous, given that there is no perl client yet. the tui is now optional, so other ui's can be used instead. Add a clipboard use flag so neovim can copy to the clipboard. Update to EAPI=6. Signed-off-by: Ole Reifschneider gentoo.org> app-editors/neovim/metadata.xml | 4 +++ .../{neovim-9999.ebuild => neovim-0.1.5-r1.ebuild} | 35 +++++++++++----------- app-editors/neovim/neovim-9999.ebuild | 35 +++++++++++----------- 3 files changed, 40 insertions(+), 34 deletions(-) diff --git a/app-editors/neovim/metadata.xml b/app-editors/neovim/metadata.xml index 94ebef1..0671c79 100644 --- a/app-editors/neovim/metadata.xml +++ b/app-editors/neovim/metadata.xml @@ -6,8 +6,12 @@ Gentoo Vim Project + Enable clipboard support through a provider Install nvimpager symlink to less.sh macro Use dev-libs/jemalloc for allocations + Build the neovim unix tui + Use dev-lang/luajit instead of + dev-lang/lua neovim/neovim diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-0.1.5-r1.ebuild similarity index 74% copy from app-editors/neovim/neovim-9999.ebuild copy to app-editors/neovim/neovim-0.1.5-r1.ebuild index f23db6e..d7e6db0 100644 --- a/app-editors/neovim/neovim-9999.ebuild +++ b/app-editors/neovim/neovim-0.1.5-r1.ebuild @@ -2,8 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 -inherit cmake-utils flag-o-matic +EAPI=6 +inherit cmake-utils DESCRIPTION="Vim-fork focused on extensibility and agility." HOMEPAGE="https://neovim.io" @@ -17,26 +17,31 @@ fi LICENSE="Apache-2.0 vim" SLOT="0" -IUSE="+nvimpager perl python ruby +jemalloc" +IUSE="+clipboard +luajit +nvimpager python ruby +tui +jemalloc" -CDEPEND="dev-lang/luajit:2 - >=dev-libs/libtermkey-0.17 - >=dev-libs/libuv-1.2.0 +CDEPEND=">=dev-libs/libuv-1.2.0 >=dev-libs/msgpack-1.0.0 - >=dev-libs/unibilium-1.1.1 + luajit? ( dev-lang/luajit:2 ) + !luajit? ( + dev-lang/lua:= + dev-lua/LuaBitOp + ) + tui? ( + >=dev-libs/libtermkey-0.17 + >=dev-libs/unibilium-1.1.1 + ) dev-libs/libvterm - dev-lua/lpeg[luajit] - dev-lua/mpack[luajit] + dev-lua/lpeg[luajit=] + dev-lua/mpack[luajit=] jemalloc? ( dev-libs/jemalloc ) " DEPEND="${CDEPEND} virtual/libiconv virtual/libintl" RDEPEND="${CDEPEND} - perl? ( dev-lang/perl ) python? ( dev-python/neovim-python-client ) ruby? ( dev-ruby/neovim-ruby-client ) -" + clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )" CMAKE_BUILD_TYPE=RelWithDebInfo @@ -52,13 +57,9 @@ src_prepare() { } src_configure() { - export USE_BUNDLED_DEPS=OFF - append-cflags "-Wno-error" local mycmakeargs=( - $(cmake-utils_use_enable jemalloc JEMALLOC) - -DLIBUNIBILIUM_USE_STATIC=OFF - -DLIBTERMKEY_USE_STATIC=OFF - -DLIBVTERM_USE_STATIC=OFF + -DFEAT_TUI=$(usex tui) + -DENABLE_JEMALLOC=$(usex jemalloc) ) cmake-utils_src_configure } diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild index f23db6e..d7e6db0 100644 --- a/app-editors/neovim/neovim-9999.ebuild +++ b/app-editors/neovim/neovim-9999.ebuild @@ -2,8 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 -inherit cmake-utils flag-o-matic +EAPI=6 +inherit cmake-utils DESCRIPTION="Vim-fork focused on extensibility and agility." HOMEPAGE="https://neovim.io" @@ -17,26 +17,31 @@ fi LICENSE="Apache-2.0 vim" SLOT="0" -IUSE="+nvimpager perl python ruby +jemalloc" +IUSE="+clipboard +luajit +nvimpager python ruby +tui +jemalloc" -CDEPEND="dev-lang/luajit:2 - >=dev-libs/libtermkey-0.17 - >=dev-libs/libuv-1.2.0 +CDEPEND=">=dev-libs/libuv-1.2.0 >=dev-libs/msgpack-1.0.0 - >=dev-libs/unibilium-1.1.1 + luajit? ( dev-lang/luajit:2 ) + !luajit? ( + dev-lang/lua:= + dev-lua/LuaBitOp + ) + tui? ( + >=dev-libs/libtermkey-0.17 + >=dev-libs/unibilium-1.1.1 + ) dev-libs/libvterm - dev-lua/lpeg[luajit] - dev-lua/mpack[luajit] + dev-lua/lpeg[luajit=] + dev-lua/mpack[luajit=] jemalloc? ( dev-libs/jemalloc ) " DEPEND="${CDEPEND} virtual/libiconv virtual/libintl" RDEPEND="${CDEPEND} - perl? ( dev-lang/perl ) python? ( dev-python/neovim-python-client ) ruby? ( dev-ruby/neovim-ruby-client ) -" + clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )" CMAKE_BUILD_TYPE=RelWithDebInfo @@ -52,13 +57,9 @@ src_prepare() { } src_configure() { - export USE_BUNDLED_DEPS=OFF - append-cflags "-Wno-error" local mycmakeargs=( - $(cmake-utils_use_enable jemalloc JEMALLOC) - -DLIBUNIBILIUM_USE_STATIC=OFF - -DLIBTERMKEY_USE_STATIC=OFF - -DLIBVTERM_USE_STATIC=OFF + -DFEAT_TUI=$(usex tui) + -DENABLE_JEMALLOC=$(usex jemalloc) ) cmake-utils_src_configure }