From 162e986e4fa8da433f89aa4a9afb36c27c63e466 Mon Sep 17 00:00:00 2001 From: Aric Belsito Date: Mon, 18 Jul 2016 14:44:34 -0700 Subject: 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 --- app-editors/neovim/metadata.xml | 4 ++ app-editors/neovim/neovim-0.1.5-r1.ebuild | 78 +++++++++++++++++++++++++++++++ app-editors/neovim/neovim-9999.ebuild | 35 +++++++------- 3 files changed, 100 insertions(+), 17 deletions(-) create mode 100644 app-editors/neovim/neovim-0.1.5-r1.ebuild (limited to 'app-editors') diff --git a/app-editors/neovim/metadata.xml b/app-editors/neovim/metadata.xml index 94ebef115d57..0671c79ddf39 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-0.1.5-r1.ebuild b/app-editors/neovim/neovim-0.1.5-r1.ebuild new file mode 100644 index 000000000000..d7e6db05ab16 --- /dev/null +++ b/app-editors/neovim/neovim-0.1.5-r1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit cmake-utils + +DESCRIPTION="Vim-fork focused on extensibility and agility." +HOMEPAGE="https://neovim.io" +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="git://github.com/neovim/neovim.git" +else + SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi + +LICENSE="Apache-2.0 vim" +SLOT="0" +IUSE="+clipboard +luajit +nvimpager python ruby +tui +jemalloc" + +CDEPEND=">=dev-libs/libuv-1.2.0 + >=dev-libs/msgpack-1.0.0 + 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=] + jemalloc? ( dev-libs/jemalloc ) +" +DEPEND="${CDEPEND} + virtual/libiconv + virtual/libintl" +RDEPEND="${CDEPEND} + python? ( dev-python/neovim-python-client ) + ruby? ( dev-ruby/neovim-ruby-client ) + clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )" + +CMAKE_BUILD_TYPE=RelWithDebInfo + +src_prepare() { + # use our system vim dir + sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \ + -i src/nvim/globals.h || die + + # add eclass to bash filetypes + sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DFEAT_TUI=$(usex tui) + -DENABLE_JEMALLOC=$(usex jemalloc) + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + # install a default configuration file + insinto /etc/vim + doins "${FILESDIR}"/sysinit.vim + + # conditionally install a symlink for nvimpager + if use nvimpager; then + dosym /usr/share/nvim/runtime/macros/less.sh /usr/bin/nvimpager + fi +} diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild index f23db6ef499e..d7e6db05ab16 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 } -- cgit v1.2.3-65-gdbad