From 2771f79232c273bc2a57d23bf335dd81ccf6af28 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 5 Dec 2021 02:47:11 +0000 Subject: gentoo resync : 05.12.2021 --- app-editors/neovim/Manifest | 6 +- app-editors/neovim/neovim-0.5.0.ebuild | 113 ------------------------------- app-editors/neovim/neovim-0.6.0.ebuild | 118 +++++++++++++++++++++++++++++++++ app-editors/neovim/neovim-9999.ebuild | 21 +++--- 4 files changed, 134 insertions(+), 124 deletions(-) delete mode 100644 app-editors/neovim/neovim-0.5.0.ebuild create mode 100644 app-editors/neovim/neovim-0.6.0.ebuild (limited to 'app-editors/neovim') diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest index b518c1d2d7ae..1cc25ca9ab30 100644 --- a/app-editors/neovim/Manifest +++ b/app-editors/neovim/Manifest @@ -3,10 +3,10 @@ AUX neovim-0.4.4-cmake-release-type.patch 627 BLAKE2B 87c6e6fd487b923ec4146f2cb3 AUX neovim-0.4.4-cmake_lua_version.patch 419 BLAKE2B 73477d7fdc2705f2e93cd6dd355ea01fbfc232306e86a13097a1c069ea3248972be9d4da7b175c8c3c7e0fde7581d4ed9b431d73c119e9f8a63a7a15007aba31 SHA512 a1be27ebd18be34fede632f695bacf65699e9dd1a8b219120372b5e0c48691f595ba42725c4f795456b8018d668f471e3a042622a5f541af50c84a089d53c83c AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a DIST neovim-0.4.4.tar.gz 9558246 BLAKE2B b1d44898bb1e1ab40a7e1d7fb4448076c991ebe1a0956674548de82fe7a931d9eaffbf35ba03cf9c88466dcd628a55f1d7bf9e7a13f3dad74424d6d653ded60c SHA512 ca5c2fe1784ac7b0d2117948ba2e9ae5d94e36d22ff9e0967047e1e03e605537672d85543897af335103215ad462c86962f25267d352a77d61bc3d1cafb3c183 -DIST neovim-0.5.0.tar.gz 10337976 BLAKE2B e7630e96fdd1a159ca68c8f61ed473a7fa7d0c5ebf7485e42c47f314f1a3031ac3f63519f4789d7244b9677f9fa9b2aabbffa1e11d97456255c44348acb814d3 SHA512 f6649f804faabb4104d3b28283932e40358c23990961f4ca7b380089318da312e59242746cee06387f4d881dd6514abbfec79c4063482383adfb4106e9e7a3a4 DIST neovim-0.5.1.tar.gz 10349190 BLAKE2B eb7e0c6a0742369c4a0fbc32a0f0e5d595f03470fb10287c39dde2f86db433a21798acee49d2cc363f18843950ef76d1376f5e52358d0b19a4b1e090c0d620a6 SHA512 a5a976c4998e821e0d9a9038d3f0c9e7c424a951f6bfc6d75898916d6a004ac668f31a34c3472fc4fca6b1d9652ac662b06780dd04dc6a77ecdc81564ec05709 +DIST neovim-0.6.0.tar.gz 10592213 BLAKE2B f0f4654b6ae37b29c903ec54175b7dc6742c9f8dadd3242119a0288df4e3262ff5d9cb7ccd41fd8b1431db828ddb806714ced62ef1893cb923cf84badd47e3d8 SHA512 c007d076fb89288fe0496fa243fc6f485b0b33120c96b0bf37d8fe6469c672eb641fefbc3f7262ec726e40910c44d37ff7efb1723c05ba920ff6ae512b1d43e6 EBUILD neovim-0.4.4-r101.ebuild 2831 BLAKE2B a40b6c9e26029ad0576b02980b2110ea5c4d4472d412f316d70124b4780cd1d63268c7e86f4115674697605b1af1171a8da43a985dcf629f5376a6e0377525a9 SHA512 f368803117ef4db403ea11dfba1c626bfc638e1ef278ec77e38de69043045632ed0aa2d40356ea8bc7a2ce74fef1086a879afc4da6cadcd820b5585ec1cd57ec -EBUILD neovim-0.5.0.ebuild 2885 BLAKE2B c1897e51862089f380d35a3d54cef1c7105661b7987d0b5f9423910ea81d1d6c29af312398e22f7765b1496ebb695c4f50461b4a437837785127139be988da39 SHA512 48de0cc9496fd2c4f589abddc0c19c161535b69d3900bfe528a36e746774f98dc28e32f6698671943540a37a9227b756be5fadd605d39f29bcbe654dedb6f56e EBUILD neovim-0.5.1.ebuild 2892 BLAKE2B aa157a38f7bd8a9a92b1a8ea2867adb56e973b817e6a1e813f9e37b97ee0c7f4f9e8bc2022ad1ffe55c2e4d227821eb6913e3eb03e97aae21a1fc5b6e0a3feef SHA512 1ec971589b5d84c3a89a79ddb670e89b340656fefca2a203c41f16f913f08b00879848e7bed80465fdf119731052558381c97db32bb07a71ae22907384e47bca -EBUILD neovim-9999.ebuild 2885 BLAKE2B c1897e51862089f380d35a3d54cef1c7105661b7987d0b5f9423910ea81d1d6c29af312398e22f7765b1496ebb695c4f50461b4a437837785127139be988da39 SHA512 48de0cc9496fd2c4f589abddc0c19c161535b69d3900bfe528a36e746774f98dc28e32f6698671943540a37a9227b756be5fadd605d39f29bcbe654dedb6f56e +EBUILD neovim-0.6.0.ebuild 2928 BLAKE2B 32f7efda71fda938c0a278da9bfe7e54a870b536eb9a660b0f0f6ed72851b9b53147426a700948bfdebf8cc2a28b7343ad04014efb6c3d79000dd4ac3335dbeb SHA512 5eb55f224e87ea23461eaff00e93363a42e19b98e38f840e7d057c3eac36ba79c4717fcb543e623a85601bbe3de6e91a4761d04fa924fd1d585d9b896e01683b +EBUILD neovim-9999.ebuild 2928 BLAKE2B 32f7efda71fda938c0a278da9bfe7e54a870b536eb9a660b0f0f6ed72851b9b53147426a700948bfdebf8cc2a28b7343ad04014efb6c3d79000dd4ac3335dbeb SHA512 5eb55f224e87ea23461eaff00e93363a42e19b98e38f840e7d057c3eac36ba79c4717fcb543e623a85601bbe3de6e91a4761d04fa924fd1d585d9b896e01683b MISC metadata.xml 536 BLAKE2B 48c85cdbe749584904a6719545308b55f130375464c55d6f458171707a2b72586bca6780b52bab3b379a2e0c471ec47026c1203edd4696fe38639f5718cc4896 SHA512 114c7fe41230c2aade3de44b37e51ae84a907b6fcb899732991f8013126214540f4b72e60b44c0993312ec8d7c8cc8c96eae8b9e0f78bd0d2cefb7497e5d16e8 diff --git a/app-editors/neovim/neovim-0.5.0.ebuild b/app-editors/neovim/neovim-0.5.0.ebuild deleted file mode 100644 index 99aa8bbbb72f..000000000000 --- a/app-editors/neovim/neovim-0.5.0.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..2} luajit ) - -inherit cmake lua-single optfeature xdg - -DESCRIPTION="Vim-fork focused on extensibility and agility." -HOMEPAGE="https://neovim.io" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - 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 ~x64-macos" -fi - -LICENSE="Apache-2.0 vim" -SLOT="0" -IUSE="+lto +nvimpager +tui" - -REQUIRED_USE="${LUA_REQUIRED_USE}" -# Upstream say the test library needs LuaJIT -# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377 -#REQUIRED_USE="test? ( lua_single_target_luajit )" -#RESTRICT="!test? ( test )" - -# Upstream build scripts invoke the Lua interpreter -BDEPEND="${LUA_DEPS} - dev-util/gperf - virtual/libiconv - virtual/libintl - virtual/pkgconfig -" -# TODO: add tests, dev-lua/busted has now got luajit support. -# bug #584694 -DEPEND="${LUA_DEPS} - dev-lua/luv[${LUA_SINGLE_USEDEP}] - $(lua_gen_cond_dep ' - dev-lua/lpeg[${LUA_USEDEP}] - dev-lua/mpack[${LUA_USEDEP}] - ') - $(lua_gen_cond_dep ' - dev-lua/LuaBitOp[${LUA_USEDEP}] - ' lua5-{1,2}) - dev-libs/libuv:0= - >=dev-libs/libvterm-0.1.2 - dev-libs/msgpack:0= - dev-libs/tree-sitter:= - tui? ( - dev-libs/libtermkey - >=dev-libs/unibilium-2.0.0:0= - ) -" -RDEPEND=" - ${DEPEND} - app-eselect/eselect-vi -" - -PATCHES=( - "${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch" - "${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch" - "${FILESDIR}/${PN}-0.4.4-cmake-darwin.patch" -) - -src_prepare() { - # use our system vim dir - sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \ - -i src/nvim/globals.h || die - - cmake_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. - # TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now - local mycmakeargs=( - -DENABLE_LTO=$(usex lto) - -DFEAT_TUI=$(usex tui) - -DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)") - -DLUA_PRG="${ELUA}" - -DMIN_LOG_LEVEL=3 - ) - cmake_src_configure -} - -src_install() { - cmake_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 ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager - fi -} - -pkg_postinst() { - xdg_pkg_postinst - optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard - optfeature "Python plugin support" dev-python/pynvim - optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client - optfeature "remote/nvr support" dev-python/neovim-remote -} diff --git a/app-editors/neovim/neovim-0.6.0.ebuild b/app-editors/neovim/neovim-0.6.0.ebuild new file mode 100644 index 000000000000..54ffbbed750b --- /dev/null +++ b/app-editors/neovim/neovim-0.6.0.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..2} luajit ) + +inherit cmake lua-single optfeature xdg + +DESCRIPTION="Vim-fork focused on extensibility and agility" +HOMEPAGE="https://neovim.io" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + 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 ~riscv ~x86 ~x64-macos" +fi + +LICENSE="Apache-2.0 vim" +SLOT="0" +IUSE="+lto +nvimpager test +tui" + +REQUIRED_USE="${LUA_REQUIRED_USE}" +# Upstream say the test library needs LuaJIT +# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377 +REQUIRED_USE="test? ( lua_single_target_luajit )" +# TODO: Get tests running +RESTRICT="!test? ( test ) test" + +# Upstream build scripts invoke the Lua interpreter +BDEPEND="${LUA_DEPS} + dev-util/gperf + virtual/libiconv + virtual/libintl + virtual/pkgconfig +" +DEPEND="${LUA_DEPS} + dev-lua/luv[${LUA_SINGLE_USEDEP}] + $(lua_gen_cond_dep ' + dev-lua/lpeg[${LUA_USEDEP}] + dev-lua/mpack[${LUA_USEDEP}] + ') + $(lua_gen_cond_dep ' + dev-lua/LuaBitOp[${LUA_USEDEP}] + ' lua5-{1,2}) + dev-libs/libuv:0= + >=dev-libs/libvterm-0.1.2 + dev-libs/msgpack:0= + dev-libs/tree-sitter:= + tui? ( + dev-libs/libtermkey + >=dev-libs/unibilium-2.0.0:0= + ) +" +RDEPEND=" + ${DEPEND} + app-eselect/eselect-vi +" +BDEPEND=" + test? ( + $(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]') + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch" + "${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch" + "${FILESDIR}/${PN}-0.4.4-cmake-darwin.patch" +) + +src_prepare() { + # Use our system vim dir + sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \ + -i src/nvim/globals.h || die + + cmake_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. + # TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now + local mycmakeargs=( + -DENABLE_LTO=$(usex lto) + -DFEAT_TUI=$(usex tui) + -DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)") + -DLUA_PRG="${ELUA}" + -DMIN_LOG_LEVEL=3 + ) + cmake_src_configure +} + +src_install() { + cmake_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 ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager + fi +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard + optfeature "Python plugin support" dev-python/pynvim + optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client + optfeature "remote/nvr support" dev-python/neovim-remote +} diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild index 99aa8bbbb72f..54ffbbed750b 100644 --- a/app-editors/neovim/neovim-9999.ebuild +++ b/app-editors/neovim/neovim-9999.ebuild @@ -7,7 +7,7 @@ LUA_COMPAT=( lua5-{1..2} luajit ) inherit cmake lua-single optfeature xdg -DESCRIPTION="Vim-fork focused on extensibility and agility." +DESCRIPTION="Vim-fork focused on extensibility and agility" HOMEPAGE="https://neovim.io" if [[ ${PV} == 9999 ]]; then @@ -15,18 +15,19 @@ 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 ~x64-macos" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos" fi LICENSE="Apache-2.0 vim" SLOT="0" -IUSE="+lto +nvimpager +tui" +IUSE="+lto +nvimpager test +tui" REQUIRED_USE="${LUA_REQUIRED_USE}" # Upstream say the test library needs LuaJIT # https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377 -#REQUIRED_USE="test? ( lua_single_target_luajit )" -#RESTRICT="!test? ( test )" +REQUIRED_USE="test? ( lua_single_target_luajit )" +# TODO: Get tests running +RESTRICT="!test? ( test ) test" # Upstream build scripts invoke the Lua interpreter BDEPEND="${LUA_DEPS} @@ -35,8 +36,6 @@ BDEPEND="${LUA_DEPS} virtual/libintl virtual/pkgconfig " -# TODO: add tests, dev-lua/busted has now got luajit support. -# bug #584694 DEPEND="${LUA_DEPS} dev-lua/luv[${LUA_SINGLE_USEDEP}] $(lua_gen_cond_dep ' @@ -59,6 +58,11 @@ RDEPEND=" ${DEPEND} app-eselect/eselect-vi " +BDEPEND=" + test? ( + $(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]') + ) +" PATCHES=( "${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch" @@ -67,7 +71,7 @@ PATCHES=( ) src_prepare() { - # use our system vim dir + # Use our system vim dir sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \ -i src/nvim/globals.h || die @@ -106,6 +110,7 @@ src_install() { pkg_postinst() { xdg_pkg_postinst + optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard optfeature "Python plugin support" dev-python/pynvim optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client -- cgit v1.2.3