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

4 files changed, 27 insertions, 21 deletions

diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 6b2cfc269a50..a9827873fd35 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -3,7 +3,7 @@ AUX gvimrc-r1 990 BLAKE2B 5fc0b805458aff22485e3e180ca8c32a62f2cfe49572edffa5725d
 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 gvim-9.0.1000.ebuild 10385 BLAKE2B 01ec055dabf5040cd50af499e2e80d968051f9a67e7042288a1ed84f1f98cfc7319b42c018131a833ed6f22595fcf30e5d2d4937508553dd4bfe8a49cad64150 SHA512 571c54178acf58d297e2a30889b4a7072a4f4dfe89f000124cef715ed87aeb3892421481077f693cba05a0f99d1d832a786844074eea24f30761df487683fb77
-EBUILD gvim-9.0.1157.ebuild 10392 BLAKE2B d5f30a8c74609c4e3ed55d423ee6988463096a04e60d49c487ad9546078c797ce9f61bbd0ccd348595c0ac1912e9ef012d8c57eb922f42792c22e04882fd8058 SHA512 e0b51c6cdf831467c65dc18a431a637c021e6535a8072383b933fd6eb29cce2b42cd220a80cbdd09a5a936103c3f4138a7b10d989f257c92ea7a58a7a01bb9e9
-EBUILD gvim-9999.ebuild 10392 BLAKE2B d5f30a8c74609c4e3ed55d423ee6988463096a04e60d49c487ad9546078c797ce9f61bbd0ccd348595c0ac1912e9ef012d8c57eb922f42792c22e04882fd8058 SHA512 e0b51c6cdf831467c65dc18a431a637c021e6535a8072383b933fd6eb29cce2b42cd220a80cbdd09a5a936103c3f4138a7b10d989f257c92ea7a58a7a01bb9e9
+EBUILD gvim-9.0.1000.ebuild 10385 BLAKE2B 707dcbc5182fbf5e691a2253ce36c9b3227b00ca702642755644f0b0ec69bc4ea2d0d18556d0e74219ecc3ce196545c8ddf4aaeb4ab442615b4bf17b012b6df5 SHA512 93d12b9807a12b8652bbe2b8189d913a12d6741c834101f8e54cdb139133704a74794e2659c4c68593e5fe26f3418c09b40d80e0a9ef751df10b7ef4f7354c87
+EBUILD gvim-9.0.1157.ebuild 10392 BLAKE2B 2bc70d279166e3926f3f97d782066151caa5b33629cd9cf51ccbd6b011cf2eec3ec4f5308cf7cec48a242f43b9629331eebc8fc1bb6cda546ecc4164629c3e10 SHA512 df5b574aaba8a57d81750072892366a70c101c7c838d2eec4f1b6b99b1376cebe291c4c311705a3f279bba1892b72f2014af0b04eacf5ec19bdfcd1014e783b5
+EBUILD gvim-9999.ebuild 10392 BLAKE2B 2bc70d279166e3926f3f97d782066151caa5b33629cd9cf51ccbd6b011cf2eec3ec4f5308cf7cec48a242f43b9629331eebc8fc1bb6cda546ecc4164629c3e10 SHA512 df5b574aaba8a57d81750072892366a70c101c7c838d2eec4f1b6b99b1376cebe291c4c311705a3f279bba1892b72f2014af0b04eacf5ec19bdfcd1014e783b5
 MISC metadata.xml 938 BLAKE2B 14b5a8f0a77608a07d2d8241cf4b48b4b418f905e688962f995495ccd2dc649d1ab2ab14076042d814e8a33df21557f2a76f78e9df5e8eb810f361a5c0930fa5 SHA512 3e6cb69512c6a02fb56e78c7d1f4e5223ba15ce0036df81dc536dd3b4c16bb76bb37f403a767473a2a2a8fa55e075e9f5142f6b7a0037d282569841a1032293f
diff --git a/app-editors/gvim/gvim-9.0.1000.ebuild b/app-editors/gvim/gvim-9.0.1000.ebuild
index 2de60ab53f5d..708d13e40470 100644
--- a/app-editors/gvim/gvim-9.0.1000.ebuild
+++ b/app-editors/gvim/gvim-9.0.1000.ebuild
@@ -80,6 +80,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
+
 # various failures (bugs #630042 and #682320)
 RESTRICT="test"
 
@@ -93,10 +100,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 \
@@ -163,8 +167,6 @@ src_prepare() {
 		sed -i -e \
 			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
 	fi
-
-	eapply_user
 }
 
 src_configure() {
diff --git a/app-editors/gvim/gvim-9.0.1157.ebuild b/app-editors/gvim/gvim-9.0.1157.ebuild
index 29c24d0ea9fb..01f283c88448 100644
--- a/app-editors/gvim/gvim-9.0.1157.ebuild
+++ b/app-editors/gvim/gvim-9.0.1157.ebuild
@@ -80,6 +80,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
+
 # various failures (bugs #630042 and #682320)
 RESTRICT="test"
 
@@ -93,10 +100,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 \
@@ -163,8 +167,6 @@ src_prepare() {
 		sed -i -e \
 			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
 	fi
-
-	eapply_user
 }
 
 src_configure() {
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index 29c24d0ea9fb..01f283c88448 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -80,6 +80,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
+
 # various failures (bugs #630042 and #682320)
 RESTRICT="test"
 
@@ -93,10 +100,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 \
@@ -163,8 +167,6 @@ src_prepare() {
 		sed -i -e \
 			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
 	fi
-
-	eapply_user
 }
 
 src_configure() {