gentoo auto-resync : 18:02:2023 - 08:10:15

4 files changed, 27 insertions, 21 deletions

diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index e14262d7af48..461ded916b8e 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -2,7 +2,7 @@ AUX vim-completion 1004 BLAKE2B dea4230a8d2a57fd1af18df4037504a44382a97ff672410e
 DIST vim-9.0.1000.tar.gz 16842747 BLAKE2B 85edab7d13daa3e84ef0aeb50e3e9bfd31f0634d8e480c105727b0c34318e0adf7f1276dcdac53df8fc416fd8dfb70377cd74ed570752a3e77f07a083fa6c113 SHA512 9d2b914a112948d77b92c8dcafc2f711a83c3fdaf35a28f7f606e77007b9320e2260a0f6b24fc875a817c33c012f077f89730b34e9f12d6f00795c5c806704c8
 DIST vim-9.0.1157.tar.gz 16924574 BLAKE2B 0cdc6cf61f5abdaff0762b98550bfa5bae8f0485ddd0e9947a5fe52390f9da54fc8f5fdae767fb8f5d3ac2b441253917a80ae7f6092f67b69bdc9b6a630df8e2 SHA512 19240a9bcf5900766db42e2894b1bf7b849274711f17dc267671aacd867b334c3d30f39947dde7dd0245f289e9ad801eeb272f34a2ab15d01fac40bf71a54271
 DIST vim-patches-vim-9.0.1000-patches.tar.bz2 3245 BLAKE2B 3bf3d0e314cc3f96d5d9675de196a62c4c8a72645d56ef94b80768571c99cba5cc556442e3bd2dfa8818460fd851fe7bd1ae15999af7225fb271b81c43105843 SHA512 2883441a2001bf7ce89a7f0862f780b71cc0164c8fcb8dbdf7040e1bcbcf408d138d3d77f308aa54c762e9975fa5ec89cfceeabbf721344dfc938870a363667a
-EBUILD vim-9.0.1000.ebuild 10910 BLAKE2B fb6e3c6583d9253ec62c2b8d9aec570168486eb77c7a4d2052dc4a58b33ce7355a132c355e63bc3d3d2e9aa8e049d50cd8054556a82f8bf86f977d31f3dcbcbc SHA512 b03ceae1244b62345b1e2ade2575f770543c7a5dcd6ea23cff6c54c81c6b47ed0c2105fa5a60bea1b2b1614928e194da6cf8adf5964ffabc4bf80278234e9e5c
-EBUILD vim-9.0.1157.ebuild 10918 BLAKE2B bb5b63a3a0277cf43cd709edba3cdbc539e22c5409a0b2bd3b867b0997d04af9f0b983e1bd10c0efb7b07f293d6cd7e767baf81f4799bceb59d2f36a28e64d55 SHA512 38f9465f743d35b4aab941cabe7401581c4780f8459a454572eb3eea35b99afc87e5bff3742a7f4622cb7d467bc923f5be82c62417c9d17e7b795b9242fb922a
-EBUILD vim-9999.ebuild 10918 BLAKE2B bb5b63a3a0277cf43cd709edba3cdbc539e22c5409a0b2bd3b867b0997d04af9f0b983e1bd10c0efb7b07f293d6cd7e767baf81f4799bceb59d2f36a28e64d55 SHA512 38f9465f743d35b4aab941cabe7401581c4780f8459a454572eb3eea35b99afc87e5bff3742a7f4622cb7d467bc923f5be82c62417c9d17e7b795b9242fb922a
+EBUILD vim-9.0.1000.ebuild 10909 BLAKE2B 6d4afbba546a6ba6fc1cefb82294440ec49c205d4ea8077fc0152d3059d210d28752161d0d6dc896ef7d1f1914676ea6e8bc578807b0c7732639c675fab216a6 SHA512 aa9ff4115b5516351a67965aa230dd18fa2d7eb51b7296d98a2e9ce73809e3f5bce7de1a8fb4574d48f9d2d4d6e16653ac6207a8ed89aec520cd11d67d165197
+EBUILD vim-9.0.1157.ebuild 10917 BLAKE2B cdda7d473efff82dcab8bf9054b07975520af281188d7421793536bc358def89ed967508af99ce85843b4c0144cb71d5eda07265fa31335ea3a83bade4503704 SHA512 e5ba9a5d92c4ce55695ca42e92abaec19ca9dd21000c00b6ced857823191b7a228d64a66421e38ddfac03b9e766c8cff17dd759605fca53ac6f1b78d33ab89ac
+EBUILD vim-9999.ebuild 10917 BLAKE2B cdda7d473efff82dcab8bf9054b07975520af281188d7421793536bc358def89ed967508af99ce85843b4c0144cb71d5eda07265fa31335ea3a83bade4503704 SHA512 e5ba9a5d92c4ce55695ca42e92abaec19ca9dd21000c00b6ced857823191b7a228d64a66421e38ddfac03b9e766c8cff17dd759605fca53ac6f1b78d33ab89ac
 MISC metadata.xml 1164 BLAKE2B 39fb0d92234f77f68213d7185ca6c4f9145cca22f8a4c27f8bafeec464232b493bfea9f853ba0d5cd613885728ac0b10f1e11a16910af8fcd211a3a338904264 SHA512 d89a143dc214c3397c2a299b18e3499dc7797a39fbaa731dee2887c9f62b367f1d3f79b7f76b7014ad31caf8ef3bd612c9881b2f72a6b79142684f222483b157
diff --git a/app-editors/vim/vim-9.0.1000.ebuild b/app-editors/vim/vim-9.0.1000.ebuild
index 3a6b2790f37b..c3de4d218ee4 100644
--- a/app-editors/vim/vim-9.0.1000.ebuild
+++ b/app-editors/vim/vim-9.0.1000.ebuild
@@ -68,6 +68,13 @@ BDEPEND="
 "
 PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
 
+if [[ ${PV} != 9999* ]]; then
+	# Gentoo patches to fix runtime issues, cross-compile errors, etc
+	PATCHES=(
+		"${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches"
+	)
+fi
+
 pkg_setup() {
 	# people with broken alphabets run into trouble. bug #82186.
 	unset LANG LC_ALL
@@ -78,10 +85,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/vim-patches-vim-${VIM_PATCHES_VERSION}-patches
-	fi
+	default
 
 	# Fixup a script to use awk instead of nawk
 	sed -i -e \
@@ -153,8 +157,6 @@ 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"
-
-	eapply_user
 }
 
 src_configure() {
diff --git a/app-editors/vim/vim-9.0.1157.ebuild b/app-editors/vim/vim-9.0.1157.ebuild
index a41d999afbf2..40a78fc412a4 100644
--- a/app-editors/vim/vim-9.0.1157.ebuild
+++ b/app-editors/vim/vim-9.0.1157.ebuild
@@ -68,6 +68,13 @@ BDEPEND="
 "
 PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
 
+if [[ ${PV} != 9999* ]]; then
+	# Gentoo patches to fix runtime issues, cross-compile errors, etc
+	PATCHES=(
+		"${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches"
+	)
+fi
+
 pkg_setup() {
 	# people with broken alphabets run into trouble. bug #82186.
 	unset LANG LC_ALL
@@ -78,10 +85,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/vim-patches-vim-${VIM_PATCHES_VERSION}-patches
-	fi
+	default
 
 	# Fixup a script to use awk instead of nawk
 	sed -i -e \
@@ -153,8 +157,6 @@ 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"
-
-	eapply_user
 }
 
 src_configure() {
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index a41d999afbf2..40a78fc412a4 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -68,6 +68,13 @@ BDEPEND="
 "
 PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
 
+if [[ ${PV} != 9999* ]]; then
+	# Gentoo patches to fix runtime issues, cross-compile errors, etc
+	PATCHES=(
+		"${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches"
+	)
+fi
+
 pkg_setup() {
 	# people with broken alphabets run into trouble. bug #82186.
 	unset LANG LC_ALL
@@ -78,10 +85,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/vim-patches-vim-${VIM_PATCHES_VERSION}-patches
-	fi
+	default
 
 	# Fixup a script to use awk instead of nawk
 	sed -i -e \
@@ -153,8 +157,6 @@ 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"
-
-	eapply_user
 }
 
 src_configure() {