commit: 162e986e4fa8da433f89aa4a9afb36c27c63e466
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Mon Jul 18 21:44:34 2016 +0000
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> 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 <tranquility <AT> 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 @@
<name>Gentoo Vim Project</name>
</maintainer>
<use>
+ <flag name="clipboard">Enable clipboard support through a provider</flag>
<flag name="nvimpager">Install nvimpager symlink to less.sh macro</flag>
<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for
allocations</flag>
+ <flag name="tui">Build the neovim unix tui</flag>
+ <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of
+ <pkg>dev-lang/lua</pkg></flag>
</use>
<upstream>
<remote-id type="github">neovim/neovim</remote-id>
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
}
