gentoo auto-resync : 05:02:2023 - 15:17:02

3 files changed, 9 insertions, 148 deletions

diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index c1400fac1ac1..7159e18aaf0c 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -2,11 +2,9 @@ AUX neovim-0.8.0-cmake-release-type.patch 1087 BLAKE2B a3cad7ee2803fe189200eea59
 AUX neovim-9999-cmake-darwin.patch 2938 BLAKE2B eea54402913fb3c1b2aa5b1acc1d307f2b43ed3fb18b489f8341becc281280417222c2996cb5e353a6fb0c42792184c65f670cae931eb08356dc0659e8fcd7e6 SHA512 cfa0719bf069dd1eca885df658b9722b7701a78afc9a498df4a1e868f8bb8e1eb3c5f990003901bd3ed20a29d73d644ff7438f024b43217b90f9a92f9e88bc2a
 AUX neovim-9999-cmake_lua_version.patch 433 BLAKE2B bf24bad4c0e0f7f902172e35771ff8d2fdadbaa14460b0757f0a3ae5e8be083da6149a7025c70cf5de3f6fb853dc2563d0b83891dabcf18a7745a699b6173e17 SHA512 245e5427a79d7ab3cbea66ee2b27aee5020ae9db2784f2aa3945773bbff629c721da1dc562b0142e9e870e159be888457893d253339cf2f5988c5c0e63ec4973
 AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a
-DIST neovim-0.8.0.tar.gz 11387355 BLAKE2B 341f0fa10f0001324c87c26e7c0047334c25808901034f073945c3977dde4dda44b03869be1f530398d549f0b13dafae0eb82766464875ced2cd26621a0c5d88 SHA512 e9504e33df292043656b0ef064e465069c93d4be52bbe29ec33c111f3e00ed83647148d653e3f143e2243dac537eede6a9351990bd858ac20abc8edbc5249432
-DIST neovim-0.8.1.tar.gz 11387691 BLAKE2B fecdf430c854f36839332e1fd3b8fc4878a9d8a04adc83182d43a82047946de05f58c794b045678123a4f2ab820ec20e7f0fedb8f3bacc87071d27c1024f84db SHA512 b4059a8a0a3caedf15f4160f2342306f6f1d625f8f8499491efd6b4440e275de95a63aa857395f844cbc871432359f96abbca138f6278d1228366d6fb4c4f1a6
 DIST neovim-0.8.2.tar.gz 11401444 BLAKE2B 2b652e98fa68c64f547777396726b80c28493841f2ec5acc01ef5dd659f0babce0baf3d5575cec1d08dd924b1855b21f13b75d2de9d117fcc125b1ec7945376e SHA512 f6c9ad09618c9f8ebb4fe522f55fd3381cc4b6d079d912a0d2ef6ca5f48ed6c4c66805c14695469e2b3d2be2266a9b60e5fc698116cd655fd92ef0f4705fdbb2
-EBUILD neovim-0.8.0-r1.ebuild 3460 BLAKE2B f18a80495bb7c241656d61aea52628610b55804e967f38b2257d44a54e48f8d270463731c543529bde973d43dc89ca172a07ca73a195b966cf712dc8aae9fc0d SHA512 263962b8cca03ab83b7a8b3120adf1ef76a3f9b2445a71b940c33bae9fce260eb9a6a188e2e924edde010447328f31a01a4d182d2581c04ea3c8edbe7d75fd6d
-EBUILD neovim-0.8.1.ebuild 3461 BLAKE2B bfeddeff2247519b07d257859d998060e635abd6db97908e6966c1ccbe9b121070b68bef226b0c31bd8afb70c1cd19bb327ec15db7abb488de76c2df631b321a SHA512 b010aefb5b843dc90593bfcdfb476c1aaf56fcdff1b81ad1d877f463aa004d409753d2d19fc1eb2caf33a009336e86170f040e4912ed5eb7dcf4ed3fd88b0f00
+DIST neovim-0.8.3.tar.gz 11406282 BLAKE2B 67f4d4d1857e4c0416639dd0986f34b3842883ef48b68d90704472b40f1f064798f1f5f3c29e485f04ef8b2ed387132549442e86624b43f2ababff05bc477312 SHA512 0ecf60b564a323eb95eb2e67f7dc7e1c1e7bfc70b08466a66eb668d1b75a7362ca42901cd5a64fda22292375e2921ba61c299ac846f820ac146dc55426813eb8
 EBUILD neovim-0.8.2.ebuild 3342 BLAKE2B 09ea1bcb11aced98fa9e7aded0c212a0c0978316f3adc1a2119ec32d15d0d059ea05e11adc3cd064ea24928b48bf1ff2d26c77399391efe2327b9c7f016b2827 SHA512 63768f48d8cbd4e72f13410b68d9718337b60f36b193e408d981ae051e835be41a953a41ff6210cd0c188253ea7fb63ba9c9235ed1ebe331fe825bd97ecea4db
+EBUILD neovim-0.8.3.ebuild 3345 BLAKE2B d834d7fdca30070d16b1636ee129e5e733a58fdd701807da03e1f4f66c1512822e364d2ea099197fc19b7b2ac95297efa5f000f0576ae80de4b68c731b8e73a2 SHA512 8fd60aea8285e0d72786aeb3c39fc049b77912b62963bad2c577425818661d3a03862a442a8921d0df7ff5c184099cf3a95579199cdcb7fe0ddb21cce07a1705
 EBUILD neovim-9999.ebuild 3345 BLAKE2B 99383cf0fc60f7b3a26d5ecf0764c62ec0e915543527a946f5b87ee2b187331698f3cf121d9318d9dc5f3a323b75dc749331c8b43392f9dd631f768fa4754c43 SHA512 362e23b5dd98a03593ffabae9dc7174a6c7f5735a380548da529a71b723956443cf94f39d44eba6e8609684a73726096b67133e3c28fc9f45dd08be603857bd7
 MISC metadata.xml 795 BLAKE2B cd2ca0a1f0024ef58bf71ae5b8e50da205213b110f42b62cbcaa10ce6b1edd3fdc724afbb996f29aae52765e29a9342fd22b43b6de8c27b532bd5f094e14b160 SHA512 e36e72c448a6e430668e7a1fd45e9c83e8a396e6b23177fc61ce6e8e8996184b84f3d9f282a9faf5b3cbea845189578437f356f92414393b3cfeb2ea313d9644
diff --git a/app-editors/neovim/neovim-0.8.1.ebuild b/app-editors/neovim/neovim-0.8.1.ebuild
deleted file mode 100644
index d5cf82cfe04e..000000000000
--- a/app-editors/neovim/neovim-0.8.1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2022 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 ~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-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.44.2[${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.44.2:=
-	>=dev-libs/libvterm-0.3
-	>=dev-libs/msgpack-3.0.0:=
-	>=dev-libs/tree-sitter-0.20.2:=
-	tui? (
-		>=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=()
-
-if [[ ${PV} == 9999 ]]; then
-	PATCHES+=(
-		"${FILESDIR}/${PN}-9999-cmake_lua_version.patch"
-		"${FILESDIR}/${PN}-9999-cmake-darwin.patch"
-	)
-else
-	PATCHES+=(
-		"${FILESDIR}/${PN}-9999-cmake_lua_version.patch"
-		"${FILESDIR}/${PN}-0.8.0-cmake-release-type.patch"
-		"${FILESDIR}/${PN}-9999-cmake-darwin.patch"
-	)
-fi
-
-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=(
-		-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.8.0-r1.ebuild b/app-editors/neovim/neovim-0.8.3.ebuild
index 04ef8a88991d..3b3878d8fc9c 100644
--- a/app-editors/neovim/neovim-0.8.0-r1.ebuild
+++ b/app-editors/neovim/neovim-0.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ 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 ~riscv x86 ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
 fi
 
 LICENSE="Apache-2.0 vim"
@@ -68,18 +68,14 @@ BDEPEND="
 	)
 "
 
-PATCHES=()
+PATCHES=(
+	"${FILESDIR}/${PN}-9999-cmake_lua_version.patch"
+	"${FILESDIR}/${PN}-9999-cmake-darwin.patch"
+)
 
-if [[ ${PV} == 9999 ]]; then
-	PATCHES+=(
-		"${FILESDIR}/${PN}-9999-cmake_lua_version.patch"
-		"${FILESDIR}/${PN}-9999-cmake-darwin.patch"
-	)
-else
+if [[ ${PV} != 9999 ]]; then
 	PATCHES+=(
-		"${FILESDIR}/${PN}-9999-cmake_lua_version.patch"
 		"${FILESDIR}/${PN}-0.8.0-cmake-release-type.patch"
-		"${FILESDIR}/${PN}-9999-cmake-darwin.patch"
 	)
 fi