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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9980D158083 for ; Tue, 10 Sep 2024 20:42:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 969EEE29CF; Tue, 10 Sep 2024 20:42:47 +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 73B16E29CF for ; Tue, 10 Sep 2024 20:42:47 +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 285BD34131D for ; Tue, 10 Sep 2024 20:42:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7FC3616D8 for ; Tue, 10 Sep 2024 20:42:44 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1726000961.7d23a4b913b15114783ddedff9457bb0ebfa5488.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/, app-editors/neovim/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/neovim/Manifest app-editors/neovim/files/neovim-0.9.0-cmake-release-type.patch app-editors/neovim/files/neovim-0.9.1-cmake-darwin.patch app-editors/neovim/neovim-0.9.5-r1.ebuild app-editors/neovim/neovim-0.9.5.ebuild X-VCS-Directories: app-editors/neovim/ app-editors/neovim/files/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 7d23a4b913b15114783ddedff9457bb0ebfa5488 X-VCS-Branch: master Date: Tue, 10 Sep 2024 20:42:44 +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: 1c0d4653-357f-46db-a673-8a5efb11d9b6 X-Archives-Hash: 090ad45ad51dbc5345f654091db404a2 commit: 7d23a4b913b15114783ddedff9457bb0ebfa5488 Author: Matt Turner gentoo org> AuthorDate: Tue Sep 10 20:42:00 2024 +0000 Commit: Matt Turner gentoo org> CommitDate: Tue Sep 10 20:42:41 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d23a4b9 app-editors/neovim: Drop old versions Signed-off-by: Matt Turner gentoo.org> app-editors/neovim/Manifest | 1 - .../files/neovim-0.9.0-cmake-release-type.patch | 17 --- .../neovim/files/neovim-0.9.1-cmake-darwin.patch | 14 --- app-editors/neovim/neovim-0.9.5-r1.ebuild | 120 --------------------- app-editors/neovim/neovim-0.9.5.ebuild | 120 --------------------- 5 files changed, 272 deletions(-) diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest index d975faf5401b..a4a46f388c4e 100644 --- a/app-editors/neovim/Manifest +++ b/app-editors/neovim/Manifest @@ -1,2 +1 @@ DIST neovim-0.10.1.tar.gz 12796966 BLAKE2B 85d98abe03f69ab03d09dc1b39783974af392f707deddef4640b6953ad574f9a455897217c2431c6c2fadb56568b55ac18ed06bbfcc7bbe1c6ab013991e99ee6 SHA512 37e9d45041b059a26fe02717eae7cdbde58f0a35560c590764f5888de67cfa04bee76d6b359ab14b020ac5a661d64908960283347381d334106308504c0df908 -DIST neovim-0.9.5.tar.gz 11590180 BLAKE2B a982ea5704a8e5810c42475198157c3d2255c033f47cba940f9f6414c649167ecafe08c7fe9aeb3154a15566fdf8f5db8d535fa752e467e36ff5d552a7aa2179 SHA512 6e20d0a1d506dc292dd68dabe4b5635f86c019ca832f9927e907377e6d21fe7765b3010f5bba644bb2d7a76c178d55b290af24856a7e3c4083a1aa60bc496775 diff --git a/app-editors/neovim/files/neovim-0.9.0-cmake-release-type.patch b/app-editors/neovim/files/neovim-0.9.0-cmake-release-type.patch deleted file mode 100644 index b6026437f7bf..000000000000 --- a/app-editors/neovim/files/neovim-0.9.0-cmake-release-type.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 521ef93..a637866 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -114,12 +114,6 @@ set(NVIM_API_LEVEL 11) # Bump this after any API change. - set(NVIM_API_LEVEL_COMPAT 0) # Adjust this after a _breaking_ API change. - set(NVIM_API_PRERELEASE false) - --# Default to -O2 on release builds. --if(CMAKE_C_FLAGS_RELEASE MATCHES "-O3") -- message(STATUS "Replacing -O3 in CMAKE_C_FLAGS_RELEASE with -O2") -- string(REPLACE "-O3" "-O2" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}") --endif() -- - # Build-type: RelWithDebInfo - - # /Og means something different in MSVC diff --git a/app-editors/neovim/files/neovim-0.9.1-cmake-darwin.patch b/app-editors/neovim/files/neovim-0.9.1-cmake-darwin.patch deleted file mode 100644 index 1488148298bd..000000000000 --- a/app-editors/neovim/files/neovim-0.9.1-cmake-darwin.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/src/nvim/CMakeLists.txt -+++ b/src/nvim/CMakeLists.txt -@@ -415,11 +415,7 @@ foreach(gen_include ${prop}) - list(APPEND gen_cflags "-I${gen_include}") - endforeach() - endforeach() - --if(APPLE AND CMAKE_OSX_SYSROOT) -- list(APPEND gen_cflags "-isysroot") -- list(APPEND gen_cflags "${CMAKE_OSX_SYSROOT}") --endif() - set(gen_cflags ${gen_cflags} -O2) - - set(NVIM_VERSION_GIT_H ${PROJECT_BINARY_DIR}/cmake.config/auto/versiondef_git.h) diff --git a/app-editors/neovim/neovim-0.9.5-r1.ebuild b/app-editors/neovim/neovim-0.9.5-r1.ebuild deleted file mode 100644 index 539c462636df..000000000000 --- a/app-editors/neovim/neovim-0.9.5-r1.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# RelWithDebInfo sets -Og -g -CMAKE_BUILD_TYPE=Release -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 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos" -fi - -LICENSE="Apache-2.0 vim" -SLOT="0" -IUSE="+nvimpager test" - -# Upstream say the test library needs LuaJIT -# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377 -REQUIRED_USE="${LUA_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-3.1 - >=sys-devel/gettext-0.20.1 - virtual/libiconv - virtual/libintl - virtual/pkgconfig -" -# Check https://github.com/neovim/neovim/blob/master/third-party/CMakeLists.txt for -# new dependency bounds and so on on bumps (obviously adjust for right branch/tag). -DEPEND="${LUA_DEPS} - >=dev-lua/luv-1.45.0[${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-1.46.0:= - >=dev-libs/libvterm-0.3.3 - >=dev-libs/msgpack-3.0.0:= - >=dev-libs/tree-sitter-0.20.8:= - >=dev-libs/libtermkey-0.22 - >=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.9.0-cmake_lua_version.patch" - "${FILESDIR}/${PN}-0.9.1-cmake-darwin.patch" - "${FILESDIR}/${PN}-0.9.0-cmake-release-type.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 - - # https://forums.gentoo.org/viewtopic-p-8750050.html - xdg_environment_reset - 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=( - # appends -flto - -DENABLE_LTO=OFF - -DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)") - -DLUA_PRG="${ELUA}" - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - - # install a default configuration file - insinto /etc/vim - newins "${FILESDIR}"/sysinit.vim-r1 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.9.5.ebuild b/app-editors/neovim/neovim-0.9.5.ebuild deleted file mode 100644 index 59f60e257bdd..000000000000 --- a/app-editors/neovim/neovim-0.9.5.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# RelWithDebInfo sets -Og -g -CMAKE_BUILD_TYPE=Release -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 ~ppc ~ppc64 ~riscv x86 ~x64-macos" -fi - -LICENSE="Apache-2.0 vim" -SLOT="0" -IUSE="+nvimpager test" - -# Upstream say the test library needs LuaJIT -# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377 -REQUIRED_USE="${LUA_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-3.1 - >=sys-devel/gettext-0.20.1 - virtual/libiconv - virtual/libintl - virtual/pkgconfig -" -# Check https://github.com/neovim/neovim/blob/master/third-party/CMakeLists.txt for -# new dependency bounds and so on on bumps (obviously adjust for right branch/tag). -DEPEND="${LUA_DEPS} - >=dev-lua/luv-1.45.0[${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-1.46.0:= - >=dev-libs/libvterm-0.3.3 - >=dev-libs/msgpack-3.0.0:= - >=dev-libs/tree-sitter-0.20.8:= - >=dev-libs/libtermkey-0.22 - >=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.9.0-cmake_lua_version.patch" - "${FILESDIR}/${PN}-0.9.1-cmake-darwin.patch" - "${FILESDIR}/${PN}-0.9.0-cmake-release-type.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 - - # https://forums.gentoo.org/viewtopic-p-8750050.html - xdg_environment_reset - 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=( - # appends -flto - -DENABLE_LTO=OFF - -DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)") - -DLUA_PRG="${ELUA}" - ) - 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 -}