gentoo auto-resync : 18:08:2022 - 02:33:40

3 files changed, 32 insertions, 2 deletions

diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 8a6e26277b9b..c2156aa0f4dc 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -1,4 +1,5 @@
 AUX gvim.svg 4584 BLAKE2B 53d896f90404df6b185d1f4404c22e6bd6035722beb61d2223a6003e7c274cdfd4d97d7274346427d873a8e98a4ad32321c0a3ceab2b436124f90c707045b233 SHA512 78f5fb460281ab5d8b0ff6e28bf24231c1ade5ae46caab2e2d345d82b983ada7d945dd7d603b3e470c77dbd1eb329027852b6ba22afc441d64a1b66a1ee3867a
+AUX vim-9.0-fix-create-timer-for-cros-compiling.patch 851 BLAKE2B 27b7e6db6a75a5b58e90f57de969e5c7c57ce663ec243cfac8391b9befb52da776245c0255694b335e17251d1423264ff12ba1cfcad2a2957f6c6d05b62c9967 SHA512 271e04e1e683de89cf77aa9d48d502382496fa1b2176ca511d4cbf5cecf9a026442c8142d0cf8d273c23d15f81fdc26f9be00dff91cd516e563f2b2dc2937f9b
 AUX vimrc-r6 7488 BLAKE2B 959724b9fbb54755553ae6448bf7ff9991288a2473af122ec769157060465559c7fef6481f1e773936df1d3b7c2344376bb8ea405542b7b17b2deb8d03544623 SHA512 60dcb1d954103d3fc9943c884b9891627adf70801d819dc65972887d516720b5a2db0db234ba891cca7269e0b117b73f34ab6dee851bc057b9abf518b52e967e
 AUX xxd-completion 461 BLAKE2B 1f36c4877fffd68e951d80c1a64cd2d458d92555a99fd06e29513da8caa6c28c27e44131b2873258e3ff5a0ab232d66f75a8f051ccf7a4d940b3b0102e6967dd SHA512 fc92426ea657e86ff765aa5a60736cdc70db938156dd8946db0a30c54d3f557bd8af421f1713bd750e779ccacd73f8f290a12a5e71ed48259fe1e6dece2de19c
 DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7bc254f11038bde275ae4e6f56513a14e0268fdc1032ae847d1d7f8539f8a657217011770ccb4685998f34722383ec7bfb1a15 SHA512 00bc8eb8b20a4a6f3bbd179bb90d42fa6727c8eaae5b625e95e52c33638d456ef36d06b51c542ecaffb237c0b4f7aa72dc3bae7fe00144d55ab0d2fa51950f3b
@@ -11,6 +12,6 @@ DIST vim-patches-vim-9.0.0049-patches.tar.gz 2743 BLAKE2B dff3e215b235e1cbc2c62b
 EBUILD vim-core-8.2.4586-r1.ebuild 6932 BLAKE2B c68dabf5622f757054b43501f5f01610a237736fb29d26c65f79e2e2edbb45e08651114c2f1563ac91e80d26edded1d33e139dfb9b31dca5a5550d8b14bb391b SHA512 ec8ec83e16c023db06a0f8e33e4cda656c10da8c475fc316f175c18dc26d70066e74e1e9dc9ed7ca68112ee6e82c7c3acdccbe50e7287cbcf23aa1ad1c410d67
 EBUILD vim-core-8.2.5066-r3.ebuild 7002 BLAKE2B 853cfa96f312cbabb2513f4dece34987af22d6ddcea6a41f47aa5ee37798dfd6c00dc97d26dc5729ee546dff2b287081ee885cfa6aa556f6c20962dfb4196210 SHA512 f21c04836f1664602c529c84507d24776b833baff0c224abf237b7a1505424a2ebf2d23dcd7cf56a4534204df85dd058271f0c2d0e89d6f3be0e83cb1c3a5b52
 EBUILD vim-core-9.0.0049-r2.ebuild 6925 BLAKE2B 9ee6fba158dae1b52f3bd7a2194bb94b857efb0b88f60e95a96befcb294f2da0349a6719329373e6228dd4617f9cd2ec72ede6e58e567cda47f0b58ecc5f4125 SHA512 75168e6af0527045d763db29df0b034c6abe1006f7f2a1ceb6242c531eca467870ee416a84d9c72d492ee8249a6ed19633d6a893d153e1b99c59df2f24062562
-EBUILD vim-core-9.0.0099.ebuild 6917 BLAKE2B 09da3702c657058648d56dda8db857593fdf41bec90bf7ab929090d6e3b697e9d93820d407d07d5f3a65b77d93e868b0eab8357d5de48e9871ed7e74a8ba6622 SHA512 632b96898fddf497e18a8a66d746af702ac9bf50bf7cb39a110dc934688781485e5c4f1e6b865c27ffedc4b80c3371d0becd6abc1ced76931939e577aa2c959c
+EBUILD vim-core-9.0.0099.ebuild 6990 BLAKE2B 886453393183dac68f063714f279cfdfe09e12f63a9ffdfec8c9f37639b74805e8eac08d71f103b9e9aa77dc889cded7ca63f36614d70c13e32aca6595893b32 SHA512 692cea9a03b9c0b840d3f18416ce72b2c6e2a890afe86d65084f9d917b534d638c98a76434ca95364b406eafab205059d97d7a6723f9de202ab870e902f0f5be
 EBUILD vim-core-9999.ebuild 6925 BLAKE2B 9ee6fba158dae1b52f3bd7a2194bb94b857efb0b88f60e95a96befcb294f2da0349a6719329373e6228dd4617f9cd2ec72ede6e58e567cda47f0b58ecc5f4125 SHA512 75168e6af0527045d763db29df0b034c6abe1006f7f2a1ceb6242c531eca467870ee416a84d9c72d492ee8249a6ed19633d6a893d153e1b99c59df2f24062562
 MISC metadata.xml 373 BLAKE2B ed379c0c7c1b4317edd219c1257015713213d1b19255435ad216273def371f59f88ea7f3e72caf99b6b8d53b7ace2691347c8b06e5961bc4e91ac34ae77d0622 SHA512 58485928380299dee5f390b2af01dd36f4d4ed2f30fc5d8e400f0bef18f00b62b060e865b3cd24292289264870ebe89397d19d8f068b402a5748f569eb75efe7
diff --git a/app-editors/vim-core/files/vim-9.0-fix-create-timer-for-cros-compiling.patch b/app-editors/vim-core/files/vim-9.0-fix-create-timer-for-cros-compiling.patch
new file mode 100644
index 000000000000..5247a80754cc
--- /dev/null
+++ b/app-editors/vim-core/files/vim-9.0-fix-create-timer-for-cros-compiling.patch
@@ -0,0 +1,28 @@
+From bba26c9ed9d4ddc82afd0343f145dc9e14b91498 Mon Sep 17 00:00:00 2001
+From: Varsha Teratipally <teratipally@google.com>
+Date: Tue, 2 Aug 2022 22:18:29 +0000
+Subject: [PATCH] Configure check for timer_create may give wrong error.
+Give a warning instead of an error
+
+Partial solution from github.com/vim/vim/commit/5f6cae8b8a49c435556e32f84d067cd0b4d28e4c
+
+---
+ src/configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/configure.ac b/src/configure.ac
+index e8522ec05..41f41dee3 100644
+--- a/src/configure.ac
++++ b/src/configure.ac
+@@ -3850,7 +3850,7 @@ static void set_flag(union sigval sv) {}
+     ])],
+     vim_cv_timer_create=yes,
+     vim_cv_timer_create=no),
+-    AC_MSG_ERROR(cross-compiling: please set 'vim_cv_timer_create')
++    AC_MSG_WARN(cross-compiling: please set 'vim_cv_timer_create')
+     )]
+ )
+ 
+-- 
+
+
diff --git a/app-editors/vim-core/vim-core-9.0.0099.ebuild b/app-editors/vim-core/vim-core-9.0.0099.ebuild
index f01043a5b22c..8bea948c71c7 100644
--- a/app-editors/vim-core/vim-core-9.0.0099.ebuild
+++ b/app-editors/vim-core/vim-core-9.0.0099.ebuild
@@ -42,7 +42,8 @@ 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"
+		eapply "${WORKDIR}"/vim-patches-vim-9.0.0049-patches
+		eapply "${FILESDIR}"/vim-9.0-fix-create-timer-for-cros-compiling.patch
 	fi
 
 	# Fixup a script to use awk instead of nawk