commit: 6dd94f84c0fa2fe338bbeaf9d4ff20ba69a948b9 Author: Bernardo Meurer <bernardo <AT> standard <DOT> ai> AuthorDate: Fri Sep 20 19:45:46 2019 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Sep 26 17:34:18 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dd94f84
app-editors/neovim: bump 0.4.2 Closes: https://bugs.gentoo.org/694574 Closes: https://bugs.gentoo.org/691864 Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Bernardo Meurer <bernardo <AT> standard.ai> Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> app-editors/neovim/Manifest | 1 + .../{neovim-9999.ebuild => neovim-0.4.2.ebuild} | 42 +++++++++++----------- app-editors/neovim/neovim-9999.ebuild | 42 +++++++++++----------- 3 files changed, 45 insertions(+), 40 deletions(-) diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest index 075e54e5d8c..6f355fb6642 100644 --- a/app-editors/neovim/Manifest +++ b/app-editors/neovim/Manifest @@ -1 +1,2 @@ DIST neovim-0.3.8.tar.gz 9233661 BLAKE2B 252a64d2ac5ca1f8e1695d3f0f694ac333d9d9179dc4c428a279534e455de4b8d2c0dc6e638f775bb28a940fc1254bad426f7cee1bffaa2dbf84deefe49d41dc SHA512 431d3df859b430570e3f927328b862945a15b1ac041108599670d32af6cccac9361a143fc6af27847529629a43a5e0a0afd98b1c826d4ee1e7570de3cf14f9c7 +DIST neovim-0.4.2.tar.gz 9552134 BLAKE2B 4004a2e2788344ab96c97f145acc4f75680961ad004fcaa017731557899bbed24c6003b799c1496067a3ca75d8a4c2e63344b9646e8dab0ed00c9fa329d90ab2 SHA512 cc0de18ee7ca5105a0dd9f5f06b4d58335618b22c4dc3d584a024683785ff9d541c7f5131742b8a818ac9acb2218da92f9b8a881d56c4b963237918e589fac22 diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-0.4.2.ebuild similarity index 79% copy from app-editors/neovim/neovim-9999.ebuild copy to app-editors/neovim/neovim-0.4.2.ebuild index ca75f7a61c9..7726bfae3ed 100644 --- a/app-editors/neovim/neovim-9999.ebuild +++ b/app-editors/neovim/neovim-0.4.2.ebuild @@ -20,46 +20,48 @@ LICENSE="Apache-2.0 vim" SLOT="0" IUSE="+clipboard +luajit +nvimpager python remote ruby +tui" -CDEPEND=">=dev-libs/libuv-1.2.0:0= - >=dev-libs/msgpack-1.0.0:0= +BDEPEND=" + dev-util/gperf + virtual/libiconv + virtual/libintl + virtual/pkgconfig +" + +DEPEND=" + dev-libs/libuv:0= + >=dev-libs/libvterm-0.1 + dev-libs/msgpack:0= + dev-lua/lpeg[luajit=] + dev-lua/luv[luajit=] + dev-lua/mpack[luajit=] + net-libs/libnsl luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:= dev-lua/LuaBitOp ) tui? ( - >=dev-libs/libtermkey-0.21.1 + dev-libs/libtermkey >=dev-libs/unibilium-2.0.0:0= ) - dev-libs/libvterm - dev-lua/lpeg[luajit=] - dev-lua/mpack[luajit=] - net-libs/libnsl" - -DEPEND=" - ${CDEPEND} - dev-util/gperf - virtual/libintl - virtual/libiconv - app-eselect/eselect-vi" +" RDEPEND=" - ${CDEPEND} + ${DEPEND} + app-eselect/eselect-vi python? ( dev-python/neovim-python-client ) ruby? ( dev-ruby/neovim-ruby-client ) remote? ( dev-python/neovim-remote ) - clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )" + clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) ) +" CMAKE_BUILD_TYPE=Release src_prepare() { # use our system vim dir - sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \ + 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 } diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild index ca75f7a61c9..7726bfae3ed 100644 --- a/app-editors/neovim/neovim-9999.ebuild +++ b/app-editors/neovim/neovim-9999.ebuild @@ -20,46 +20,48 @@ LICENSE="Apache-2.0 vim" SLOT="0" IUSE="+clipboard +luajit +nvimpager python remote ruby +tui" -CDEPEND=">=dev-libs/libuv-1.2.0:0= - >=dev-libs/msgpack-1.0.0:0= +BDEPEND=" + dev-util/gperf + virtual/libiconv + virtual/libintl + virtual/pkgconfig +" + +DEPEND=" + dev-libs/libuv:0= + >=dev-libs/libvterm-0.1 + dev-libs/msgpack:0= + dev-lua/lpeg[luajit=] + dev-lua/luv[luajit=] + dev-lua/mpack[luajit=] + net-libs/libnsl luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:= dev-lua/LuaBitOp ) tui? ( - >=dev-libs/libtermkey-0.21.1 + dev-libs/libtermkey >=dev-libs/unibilium-2.0.0:0= ) - dev-libs/libvterm - dev-lua/lpeg[luajit=] - dev-lua/mpack[luajit=] - net-libs/libnsl" - -DEPEND=" - ${CDEPEND} - dev-util/gperf - virtual/libintl - virtual/libiconv - app-eselect/eselect-vi" +" RDEPEND=" - ${CDEPEND} + ${DEPEND} + app-eselect/eselect-vi python? ( dev-python/neovim-python-client ) ruby? ( dev-ruby/neovim-ruby-client ) remote? ( dev-python/neovim-remote ) - clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )" + clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) ) +" CMAKE_BUILD_TYPE=Release src_prepare() { # use our system vim dir - sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \ + 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 }
