From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1443467-garchives=archives.gentoo.org@lists.gentoo.org>
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 DCA01158094
	for <garchives@archives.gentoo.org>; Tue,  4 Oct 2022 13:29:17 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 506BCE0951;
	Tue,  4 Oct 2022 13:29:16 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id AC4FDE0951
	for <gentoo-commits@lists.gentoo.org>; Tue,  4 Oct 2022 13:29:15 +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))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id A1331340F7D
	for <gentoo-commits@lists.gentoo.org>; Tue,  4 Oct 2022 13:29:13 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 00D99615
	for <gentoo-commits@lists.gentoo.org>; Tue,  4 Oct 2022 13:29:11 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1664890095.81356e617ff426315f8260c4ed8f0f99453e07b6.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/vim/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-editors/vim/vim-9.0.0399.ebuild
X-VCS-Directories: app-editors/vim/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 81356e617ff426315f8260c4ed8f0f99453e07b6
X-VCS-Branch: master
Date: Tue,  4 Oct 2022 13:29:11 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 2bdd9962-e34a-4619-8664-1c231bc1fb7c
X-Archives-Hash: 015928dd3f51cb4511bf560b68db086f

commit:     81356e617ff426315f8260c4ed8f0f99453e07b6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  4 13:28:15 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct  4 13:28:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81356e61

app-editors/vim: sync live

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-editors/vim/vim-9.0.0399.ebuild | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/app-editors/vim/vim-9.0.0399.ebuild b/app-editors/vim/vim-9.0.0399.ebuild
index 4694afaa8f52..5ffcda64baac 100644
--- a/app-editors/vim/vim-9.0.0399.ebuild
+++ b/app-editors/vim/vim-9.0.0399.ebuild
@@ -11,7 +11,7 @@ PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="threads(+)"
 USE_RUBY="ruby27 ruby30 ruby31"
 
-inherit bash-completion-r1 desktop flag-o-matic lua-single python-single-r1 ruby-single toolchain-funcs vim-doc xdg-utils
+inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single toolchain-funcs desktop xdg-utils
 
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
@@ -46,6 +46,7 @@ RDEPEND="
 		$(lua_gen_impl_dep 'deprecated' lua5-1)
 	)
 	~app-editors/vim-core-${PV}
+	!<app-editors/vim-core-8.2.4328-r1
 	vim-pager? ( app-editors/vim-core[-minimal] )
 	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
@@ -63,7 +64,6 @@ BDEPEND="
 	lua? ( ${LUA_DEPS} )
 	nls? ( sys-devel/gettext )
 "
-PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
 
 pkg_setup() {
 	# people with broken alphabets run into trouble. bug #82186.
@@ -224,6 +224,10 @@ src_configure() {
 		fi
 
 		if use lua; then
+			# -DLUA_COMPAT_OPENLIB=1 is required to enable the
+			# deprecated (in 5.1) luaL_openlib API (#874690)
+			use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1
+
 			myconf+=(
 				--enable-luainterp
 				$(use_with lua_single_target_luajit luajit)
@@ -289,12 +293,21 @@ src_test() {
 	# http://www.softpanorama.org/Editors/Vimorama/vim_regular_expressions.shtml.
 	#
 	# Skipped tests:
+	# - Test_expand_star_star
+	# Hangs because of a recursive symlink in /usr/include/nodejs (bug #616680)
 	# - Test_exrc
-	#   - Looks in wrong location? (bug #742710)
+	# Looks in wrong location? (bug #742710)
+	# - Test_job_tty_in_out
+	# Fragile and depends on TERM(?)
+	# - Test_spelldump_bang
+	# Hangs.
 	# - Test_fuzzy_completion_env
-	#   - Too sensitive to leaked environment variables.
-	#   - "Expected 'echo $VIMRUNTIME' but got 'echo $ENV_UNSET'"
-	export TEST_SKIP_PAT='\(Test_exrc\|Test_fuzzy_completion_env\)'
+	# Too sensitive to leaked environment variables.
+	# - Test_term_mouse_multiple_clicks_to_select_mode
+	# Hangs.
+	# - Test_spelldump
+	# Hangs.
+	export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\|Test_fuzzy_completion_env\|Test_term_mouse_multiple_clicks_to_select_mode\|Test_spelldump\)'
 
 	emake -j1 -C src/testdir nongui
 }