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

4 files changed, 27 insertions, 21 deletions

diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index fa40922bf662..edbb97178335 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -4,7 +4,7 @@ AUX xxd-completion 461 BLAKE2B 1f36c4877fffd68e951d80c1a64cd2d458d92555a99fd06e2
 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-core-9.0.1000.ebuild 7075 BLAKE2B 2ed2e3e862cd9699472eaa55eac69ca5653650c61ee29dd1d05b9d77e943e30b4467801c75fd58c7a3ab65da769de294c0d394bbdf6b9267775a772b063dd9dd SHA512 991eb8ff6cfd9dbbfa184be8db0e6c39f2822a1a6020a67d6b1e3bc88311ebe65b9305e0e649cc34e4467ebe0bff5035ace5ca4844a4a26e0ff73faafbda5016
-EBUILD vim-core-9.0.1157.ebuild 7083 BLAKE2B 82931fd1cae0dc8fb60d1ad24555b772a36158224e15718bad869a2f6803a93deaf3db56f51a111a26e29c9fa20b0962aa3b7f5381cd58313ed24599edc5e8c5 SHA512 a2aa321082eef49ac9184c036d65ba97f31427be16ebdee9b37f99ada76ef28514d1095d42b1bd38c726603c13128dce86b339fc463d1686116cc37c4a3c5d8d
-EBUILD vim-core-9999.ebuild 7069 BLAKE2B 9e1c6bc4327b7e676e366038c04828d7f28950549df15945a10938f260f20e31577c42bd5389c277bf1b9ca16507e191f8fd7383c0697900a70c084c9ed29b78 SHA512 4e30d55547fc38ec8bf970f2c5e9a8285b7b03a93ad7ceac96d2cba3fe5428dda702ae8fefd812fc3fbd9e7829c54bf8ab1f1d7c05547c1a132ddab85a539b29
+EBUILD vim-core-9.0.1000.ebuild 7074 BLAKE2B 246ca5088a92093925a630ab291794baf71cd2ed5ba8be4b6969809b02dfc2477944ccfc83196e9055d0a7add75a2a691337126a2c965b95b64864cce7f9fb99 SHA512 2a004f1a4d4b0d889951c43167801b19238eaec0d8d67db293449dcc1083217327e0a4130b8e1ffbde623295a2524fc4af454c896dd53259f04fd48686a6b856
+EBUILD vim-core-9.0.1157.ebuild 7082 BLAKE2B f2555ae93ae5f57bb6f4da63bc901baad0647c3d0068d76b6d6d363f628f2b6c45e447b3782e64b18cd4fc674ddc731e22dcaf72b4a9ac576f54dbb8427d7440 SHA512 9a92b20066c2d4a726f0c5e2a38ff859ece8c7d6a83e171d64feabbf335d63346a04d3a18773ccf454b84aec7042d389d7aac7fb0a4b697b7e11f01556376a7b
+EBUILD vim-core-9999.ebuild 7082 BLAKE2B f2555ae93ae5f57bb6f4da63bc901baad0647c3d0068d76b6d6d363f628f2b6c45e447b3782e64b18cd4fc674ddc731e22dcaf72b4a9ac576f54dbb8427d7440 SHA512 9a92b20066c2d4a726f0c5e2a38ff859ece8c7d6a83e171d64feabbf335d63346a04d3a18773ccf454b84aec7042d389d7aac7fb0a4b697b7e11f01556376a7b
 MISC metadata.xml 634 BLAKE2B 3f1b64411e3535e9d5f1541e104f3616be4793999c526dd87f478cc948ac4c564bd68a6477ca713cd2e73f775098a835dc071d66ba35d2a0abc9572e1107c2ce SHA512 b472d227fb1e3c97b0ede3ea67beb4969ef3ced95d040eef6f3ff35d4a669dddf5ad4db22bd1dd3178c4f2ea76b4ec49ad780b5c94c14324da5fd57607d4d32e
diff --git a/app-editors/vim-core/vim-core-9.0.1000.ebuild b/app-editors/vim-core/vim-core-9.0.1000.ebuild
index ba583b0f4e11..98d156f8fe5e 100644
--- a/app-editors/vim-core/vim-core-9.0.1000.ebuild
+++ b/app-editors/vim-core/vim-core-9.0.1000.ebuild
@@ -31,6 +31,13 @@ IUSE="nls acl minimal"
 DEPEND=">=sys-libs/ncurses-5.2-r2:0"
 BDEPEND="sys-devel/autoconf"
 
+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
@@ -38,10 +45,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 \
@@ -106,8 +110,6 @@ src_prepare() {
 
 	# Remove src/auto/configure file.
 	rm -v src/auto/configure || die "rm configure failed"
-
-	eapply_user
 }
 
 src_configure() {
diff --git a/app-editors/vim-core/vim-core-9.0.1157.ebuild b/app-editors/vim-core/vim-core-9.0.1157.ebuild
index a9836a9b50d9..64e63ae0b84e 100644
--- a/app-editors/vim-core/vim-core-9.0.1157.ebuild
+++ b/app-editors/vim-core/vim-core-9.0.1157.ebuild
@@ -31,6 +31,13 @@ IUSE="nls acl minimal"
 DEPEND=">=sys-libs/ncurses-5.2-r2:0"
 BDEPEND="sys-devel/autoconf"
 
+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
@@ -38,10 +45,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 \
@@ -106,8 +110,6 @@ src_prepare() {
 
 	# Remove src/auto/configure file.
 	rm -v src/auto/configure || die "rm configure failed"
-
-	eapply_user
 }
 
 src_configure() {
diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild
index df3192ffe27a..64e63ae0b84e 100644
--- a/app-editors/vim-core/vim-core-9999.ebuild
+++ b/app-editors/vim-core/vim-core-9999.ebuild
@@ -31,6 +31,13 @@ IUSE="nls acl minimal"
 DEPEND=">=sys-libs/ncurses-5.2-r2:0"
 BDEPEND="sys-devel/autoconf"
 
+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
@@ -38,10 +45,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/vim-patches-vim-9.0.0049-patches
-	fi
+	default
 
 	# Fixup a script to use awk instead of nawk
 	sed -i \
@@ -106,8 +110,6 @@ src_prepare() {
 
 	# Remove src/auto/configure file.
 	rm -v src/auto/configure || die "rm configure failed"
-
-	eapply_user
 }
 
 src_configure() {