From ec004a70e0d6258be84fd62fe6a2f9929067818f Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 29 Jan 2024 07:10:35 +0000
Subject: [PATCH] app-editors/vim: Sync with Gentoo

It's from Gentoo commit 83d72770bcd85405144b4a6ad2b427abc11fe62c.
---
 .../app-editors/vim/vim-9.0.1403.ebuild               |  6 +++---
 .../app-editors/vim/vim-9.0.1503.ebuild               |  6 +++---
 .../app-editors/vim/vim-9.0.1627.ebuild               |  6 +++---
 .../app-editors/vim/vim-9.0.1678.ebuild               |  6 +++---
 .../app-editors/vim/vim-9.0.1777.ebuild               |  6 +++---
 .../app-editors/vim/vim-9.0.2092.ebuild               |  6 +++---
 .../app-editors/vim/vim-9.0.2167.ebuild               | 11 ++++++++---
 .../portage-stable/app-editors/vim/vim-9999.ebuild    | 11 ++++++++---
 8 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1403.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1403.ebuild
index 0d0487eb73..b742f953fc 100644
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1403.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1403.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ VIM_VERSION="9.0"
 VIM_PATCHES_VERSION="9.0.1000"
 
 LUA_COMPAT=( lua5-{1..4} luajit )
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE="threads(+)"
 USE_RUBY="ruby27 ruby30 ruby31"
 
@@ -62,7 +62,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 # configure runs the Lua interpreter
 BDEPEND="
-	sys-devel/autoconf
+	dev-build/autoconf
 	lua? ( ${LUA_DEPS} )
 	nls? ( sys-devel/gettext )
 "
diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1503.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1503.ebuild
index 191a1abcf9..b589d64dbd 100644
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1503.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1503.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ VIM_VERSION="9.0"
 VIM_PATCHES_VERSION="9.0.1000"
 
 LUA_COMPAT=( lua5-{1..4} luajit )
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE="threads(+)"
 USE_RUBY="ruby27 ruby30 ruby31"
 
@@ -62,7 +62,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 # configure runs the Lua interpreter
 BDEPEND="
-	sys-devel/autoconf
+	dev-build/autoconf
 	lua? ( ${LUA_DEPS} )
 	nls? ( sys-devel/gettext )
 "
diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1627.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1627.ebuild
index 6daab95846..be5a1d92a8 100644
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1627.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1627.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ VIM_VERSION="9.0"
 VIM_PATCHES_VERSION="9.0.1000"
 
 LUA_COMPAT=( lua5-{1..4} luajit )
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE="threads(+)"
 USE_RUBY="ruby27 ruby30 ruby31"
 
@@ -61,7 +61,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 # configure runs the Lua interpreter
 BDEPEND="
-	sys-devel/autoconf
+	dev-build/autoconf
 	lua? ( ${LUA_DEPS} )
 	nls? ( sys-devel/gettext )
 "
diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1678.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1678.ebuild
index fb932d372b..f230901614 100644
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1678.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1678.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ VIM_VERSION="9.0"
 VIM_PATCHES_VERSION="9.0.1000"
 
 LUA_COMPAT=( lua5-{1..4} luajit )
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE="threads(+)"
 USE_RUBY="ruby27 ruby30 ruby31"
 
@@ -61,7 +61,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 # configure runs the Lua interpreter
 BDEPEND="
-	sys-devel/autoconf
+	dev-build/autoconf
 	lua? ( ${LUA_DEPS} )
 	nls? ( sys-devel/gettext )
 "
diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1777.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1777.ebuild
index d142c1c4c3..c50f555898 100644
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1777.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.1777.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ VIM_VERSION="9.0"
 VIM_PATCHES_VERSION="9.0.1000"
 
 LUA_COMPAT=( lua5-{1..4} luajit )
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE="threads(+)"
 USE_RUBY="ruby27 ruby30 ruby31"
 
@@ -61,7 +61,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 # configure runs the Lua interpreter
 BDEPEND="
-	sys-devel/autoconf
+	dev-build/autoconf
 	lua? ( ${LUA_DEPS} )
 	nls? ( sys-devel/gettext )
 "
diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.2092.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.2092.ebuild
index 0cffc596a8..1b11367414 100644
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.2092.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.2092.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ VIM_VERSION="9.0"
 VIM_PATCHES_VERSION="9.0.2092"
 
 LUA_COMPAT=( lua5-{1..4} luajit )
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE="threads(+)"
 USE_RUBY="ruby27 ruby30 ruby31"
 
@@ -61,7 +61,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 # configure runs the Lua interpreter
 BDEPEND="
-	sys-devel/autoconf
+	dev-build/autoconf
 	lua? ( ${LUA_DEPS} )
 	nls? ( sys-devel/gettext )
 "
diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.2167.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.2167.ebuild
index 854c1a5ce7..89f0524b4b 100644
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.2167.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9.0.2167.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://git.sr.ht/~xxc3nsoredxx/vim-patches/refs/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Vim, an improved vi-style text editor"
@@ -61,7 +61,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 # configure runs the Lua interpreter
 BDEPEND="
-	sys-devel/autoconf
+	dev-build/autoconf
 	lua? ( ${LUA_DEPS} )
 	nls? ( sys-devel/gettext )
 "
@@ -153,6 +153,11 @@ src_prepare() {
 	# (4) Run ./configure (with wrong args) to remake auto/config.mk
 	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
 	rm src/auto/configure || die "rm failed"
+
+	# bug 908961
+	if use elibc_musl ; then
+		sed -i -e '/ja.sjis/d' src/po/Make_all.mak || die
+	fi
 }
 
 src_configure() {
diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9999.ebuild
index b323e4e54d..d3ce80bac4 100644
--- a/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/app-editors/vim/vim-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ VIM_VERSION="9.0"
 VIM_PATCHES_VERSION="9.0.1000"
 
 LUA_COMPAT=( lua5-{1..4} luajit )
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE="threads(+)"
 USE_RUBY="ruby27 ruby30 ruby31"
 
@@ -61,7 +61,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 # configure runs the Lua interpreter
 BDEPEND="
-	sys-devel/autoconf
+	dev-build/autoconf
 	lua? ( ${LUA_DEPS} )
 	nls? ( sys-devel/gettext )
 "
@@ -153,6 +153,11 @@ src_prepare() {
 	# (4) Run ./configure (with wrong args) to remake auto/config.mk
 	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
 	rm src/auto/configure || die "rm failed"
+
+	# bug 908961
+	if use elibc_musl ; then
+		sed -i -e '/ja.sjis/d' src/po/Make_all.mak || die
+	fi
 }
 
 src_configure() {