From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 20611158086 for ; Wed, 1 Dec 2021 12:18:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CB9352BC001; Wed, 1 Dec 2021 12:18:07 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EE7582BC001 for ; Wed, 1 Dec 2021 12:18:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E5852342BE6 for ; Wed, 1 Dec 2021 12:18:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2760610C for ; Wed, 1 Dec 2021 12:18:04 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1638361062.7d92fb6108b4abd32a285de88cba2ed8819e9683.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/neovim/Manifest app-editors/neovim/neovim-0.6.0.ebuild app-editors/neovim/neovim-9999.ebuild X-VCS-Directories: app-editors/neovim/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7d92fb6108b4abd32a285de88cba2ed8819e9683 X-VCS-Branch: master Date: Wed, 1 Dec 2021 12:18:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 894aa8e2-4bda-48dd-be03-f0b1e5a69e05 X-Archives-Hash: a31291c77eecb258e8f3aa13c7bb2eda commit: 7d92fb6108b4abd32a285de88cba2ed8819e9683 Author: Sam James gentoo org> AuthorDate: Wed Dec 1 12:17:42 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Dec 1 12:17:42 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d92fb61 app-editors/neovim: add 0.6.0 Signed-off-by: Sam James gentoo.org> app-editors/neovim/Manifest | 1 + .../{neovim-9999.ebuild => neovim-0.6.0.ebuild} | 21 +++++++++++++-------- app-editors/neovim/neovim-9999.ebuild | 21 +++++++++++++-------- 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest index e0a3ebb99498..65e60f15859a 100644 --- a/app-editors/neovim/Manifest +++ b/app-editors/neovim/Manifest @@ -1,3 +1,4 @@ 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 diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-0.6.0.ebuild similarity index 87% copy from app-editors/neovim/neovim-9999.ebuild copy to app-editors/neovim/neovim-0.6.0.ebuild index 99aa8bbbb72f..54ffbbed750b 100644 --- a/app-editors/neovim/neovim-9999.ebuild +++ b/app-editors/neovim/neovim-0.6.0.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 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