commit: f60946ba6398fac3388cb690d6c687b03d7d8d4d Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Sep 29 23:53:08 2020 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Sep 30 00:03:40 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f60946ba
app-editors/neovim: bump to 0.4.4 * Bump to 0.4.4 * Pave the way for tests, but we can't yet because dev-lua/busted lacks luajit support (needed for tests). * Make LTO optional. Bug: https://bugs.gentoo.org/584694 Closes: https://bugs.gentoo.org/744184 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Sam James <sam <AT> gentoo.org> app-editors/neovim/Manifest | 1 + app-editors/neovim/metadata.xml | 1 + app-editors/neovim/neovim-0.4.3.ebuild | 4 ---- .../{neovim-0.4.3.ebuild => neovim-0.4.4.ebuild} | 22 ++++++++++++++-------- app-editors/neovim/neovim-9999.ebuild | 22 +++++++++++++++------- 5 files changed, 31 insertions(+), 19 deletions(-) diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest index d94440938b4..4eb16e981f8 100644 --- a/app-editors/neovim/Manifest +++ b/app-editors/neovim/Manifest @@ -1 +1,2 @@ DIST neovim-0.4.3.tar.gz 9556199 BLAKE2B 831f4d4950f4fa2cd9c7393824bbb5eb571ae5759d13af9f320e0fa351fa155413a5be580f010f2c7ab43ca7bc10c569ccf6e3ba29efc7f5a035576b030b216d SHA512 e13853fa296eda8618f389c71b6cbbd6f01d561615e80cc92959131dd10e395b1c6732a7d9ef6dbb9fe3ea9da4c11485b464547e2d46b22e59b8a20214e861f5 +DIST neovim-0.4.4.tar.gz 9558246 BLAKE2B b1d44898bb1e1ab40a7e1d7fb4448076c991ebe1a0956674548de82fe7a931d9eaffbf35ba03cf9c88466dcd628a55f1d7bf9e7a13f3dad74424d6d653ded60c SHA512 ca5c2fe1784ac7b0d2117948ba2e9ae5d94e36d22ff9e0967047e1e03e605537672d85543897af335103215ad462c86962f25267d352a77d61bc3d1cafb3c183 diff --git a/app-editors/neovim/metadata.xml b/app-editors/neovim/metadata.xml index 73806d95e8a..b263ac23770 100644 --- a/app-editors/neovim/metadata.xml +++ b/app-editors/neovim/metadata.xml @@ -6,6 +6,7 @@ <name>Gentoo Vim Project</name> </maintainer> <use> + <flag name="lto">Build with Link Time Optimization (LTO)</flag> <flag name="nvimpager">Install nvimpager symlink to less.sh macro</flag> <flag name="tui">Build the neovim unix tui</flag> </use> diff --git a/app-editors/neovim/neovim-0.4.3.ebuild b/app-editors/neovim/neovim-0.4.3.ebuild index 3c3a8cc28cb..b2b35d2f82a 100644 --- a/app-editors/neovim/neovim-0.4.3.ebuild +++ b/app-editors/neovim/neovim-0.4.3.ebuild @@ -26,7 +26,6 @@ BDEPEND=" virtual/libintl virtual/pkgconfig " - DEPEND=" dev-libs/libuv:0= >=dev-libs/libvterm-0.1.2 @@ -45,7 +44,6 @@ DEPEND=" >=dev-libs/unibilium-2.0.0:0= ) " - RDEPEND=" ${DEPEND} app-eselect/eselect-vi @@ -53,8 +51,6 @@ RDEPEND=" CMAKE_BUILD_TYPE=Release -PATCHES=( "${FILESDIR}"/${P}-gcc-10-fix.patch ) - src_prepare() { # use our system vim dir sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \ diff --git a/app-editors/neovim/neovim-0.4.3.ebuild b/app-editors/neovim/neovim-0.4.4.ebuild similarity index 74% copy from app-editors/neovim/neovim-0.4.3.ebuild copy to app-editors/neovim/neovim-0.4.4.ebuild index 3c3a8cc28cb..d10522f3c6b 100644 --- a/app-editors/neovim/neovim-0.4.3.ebuild +++ b/app-editors/neovim/neovim-0.4.4.ebuild @@ -13,12 +13,16 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/neovim/neovim.git"; else SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 x86" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi LICENSE="Apache-2.0 vim" SLOT="0" -IUSE="+luajit +nvimpager +tui" +IUSE="+lto +luajit +nvimpager +tui" +# Upstream say the test library needs LuaJIT +# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377 +#REQUIRED_USE="test? ( luajit )" +#RESTRICT="!test? ( test )" BDEPEND=" dev-util/gperf @@ -26,7 +30,8 @@ BDEPEND=" virtual/libintl virtual/pkgconfig " - +# Once dev-lua/busted has luajit support, we can add tests. +# bug #584694 DEPEND=" dev-libs/libuv:0= >=dev-libs/libvterm-0.1.2 @@ -45,16 +50,11 @@ DEPEND=" >=dev-libs/unibilium-2.0.0:0= ) " - RDEPEND=" ${DEPEND} app-eselect/eselect-vi " -CMAKE_BUILD_TYPE=Release - -PATCHES=( "${FILESDIR}"/${P}-gcc-10-fix.patch ) - src_prepare() { # use our system vim dir sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \ @@ -64,7 +64,13 @@ src_prepare() { } src_configure() { + # Upstream default to LTO on non-debug builds + # Let's expose it as a USE flag because upstream + # have preferences for how we should use LTO + # if we want it on (not just -flto) + # ... but allow turning it off. local mycmakeargs=( + -DENABLE_LTO=$(usex lto) -DFEAT_TUI=$(usex tui) -DPREFER_LUA=$(usex luajit no yes) ) diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild index 6944c0791a4..ae758e6e27b 100644 --- a/app-editors/neovim/neovim-9999.ebuild +++ b/app-editors/neovim/neovim-9999.ebuild @@ -13,12 +13,16 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/neovim/neovim.git"; else SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi LICENSE="Apache-2.0 vim" SLOT="0" -IUSE="+luajit +nvimpager +tui" +IUSE="+lto +luajit +nvimpager +tui" +# Upstream say the test library needs LuaJIT +# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377 +#REQUIRED_USE="test? ( luajit )" +#RESTRICT="!test? ( test )" BDEPEND=" dev-util/gperf @@ -26,11 +30,12 @@ BDEPEND=" virtual/libintl virtual/pkgconfig " - +# Once dev-lua/busted has luajit support, we can add tests. +# bug #584694 DEPEND=" dev-libs/libutf8proc:= dev-libs/libuv:0= - >=dev-libs/libvterm-0.1 + >=dev-libs/libvterm-0.1.2 dev-libs/msgpack:0= dev-lua/lpeg[luajit=] dev-lua/luv[luajit=] @@ -46,14 +51,11 @@ DEPEND=" >=dev-libs/unibilium-2.0.0:0= ) " - RDEPEND=" ${DEPEND} app-eselect/eselect-vi " -CMAKE_BUILD_TYPE=Release - src_prepare() { # use our system vim dir sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \ @@ -63,7 +65,13 @@ src_prepare() { } src_configure() { + # Upstream default to LTO on non-debug builds + # Let's expose it as a USE flag because upstream + # have preferences for how we should use LTO + # if we want it on (not just -flto) + # ... but allow turning it off. local mycmakeargs=( + -DENABLE_LTO=$(usex lto) -DFEAT_TUI=$(usex tui) -DPREFER_LUA=$(usex luajit no yes) )
