gentoo resync : 29.12.2022

4 files changed, 288 insertions, 1 deletions

diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 692ea4d684a4..bf7a9d8bb66d 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -6,10 +6,12 @@ AUX xemacs-21.4.24-ncurses-tinfo.patch 538 BLAKE2B ef09bb366ebb79cd9bd3e089098ae
 AUX xemacs-21.4.24-strsignal.patch 4452 BLAKE2B f5f8d35a15f6c1aa59d6d31a8c4ed46b057f6af01ed8bb42cada466c6b95ba9633dbe8f0af5aa7a4779cc2c98bab42c629f4f16eb38aa558913a630a961110c5 SHA512 2858c5937f0a9f80f72f7f78f38ebd6abe9d65b79d44a817579c6346a46f20c42756291f399d464b4cc994dfc3ec9e2e1a32613d915f92f3c79ebf0f90cd7c64
 AUX xemacs-21.5.34-ar.patch 2238 BLAKE2B 2bcf0ebcec74fcf6c2c10755da8cf5975efd39e4c746f61bf70e914e44787aea27ba4aace239ae93e37865e959d6f832e208ad7700772d1e8da64f07d98791e1 SHA512 f297b854277fab85539ab70814bc0827345ad6e098138f55296d23935a6e5a23bc1d04bade23b4f5202735246ebe86ea82b0f3e4a50df5360761b6d922589d10
 AUX xemacs-21.5.34-as-needed.patch 921 BLAKE2B 18b67b2330cda62bb08fccdba8f71d0213f463aeb7e360b8b7f8cd791718cf89f44999858dea9b51a4c1f94b47b6774addd5a1ab9c36d65036f3890925847bb1 SHA512 3b55683346e6a0cac0b0b21ce21f3bc0ca4d2734307a20ce556cdea084e821d9c9be3c69db329ec1546bc249bfa5cae136e393e858bd53105db9152627514285
+AUX xemacs-21.5.34-autoloads-parallell-make.patch 8290 BLAKE2B c9bd81b499cd94a9551844922cbdf42f7df86a7b1812f3c18f782feb01c2e79fa9d2c4c7a6a115ac1deb8b661be6ac0190bfb8290bca89c83191a5956d82139b SHA512 b8230825ffccd146cd459a806fbeb096948dd8d0cc5ed0884b7441d49db21325e1bfc5c450b758ca1c200bfea4903d5e875d169567028616c54c5a56448bc59c
 AUX xemacs-21.5.34-configure-libc-version.patch 957 BLAKE2B ae69bc6a5d3858571fec40d65bd097c65909fdccb282dbc05fe7014e654f73736f742c68ac24b8118c209b05dc399e2d1cc6109f288ae049e48bfee140d71d1f SHA512 e41b6fd7601dbd59c775e62f390e17c194eab9360cce2ae3d03e1b5f4f7fc59080ecd76401eab5211c2f0ab4fea4baf9746e10675ba00f05115067008cce5a6f
 AUX xemacs-21.5.34-gcc5.patch 1194 BLAKE2B 1b042f7a7034fa7066279e91d96e6f1c2f962273b4aa26ca3a6bfb5cf737572d97c1d7f11dc87a15e44a2516e9112cb8f4ba8d916feb856bab15beeecce6cbe9 SHA512 276f3e10334c3809f625e69ea0d56585fd429e9aced65331bd1ca0ced467bcf526cee43925b4c4dc381723883348877782e1c234db00e60c3d74a78021a2330b
 AUX xemacs-21.5.34-glibc-macro.patch 1369 BLAKE2B cd03d4c6d3629ab186c60a869cd99483dec1192dddecb91466e72c83b3f2969a0f02ae34953da3511edc80bd17ed880168b98f661fab1a0642d4e2944cc0411c SHA512 6397267d99649f62a20a0a1f2bc380360ed7689691adde515421286b3bcad55dbb0cea246427e03f904fd829624060ad7ae66a67c63f16f3b3c1f88803022176
 AUX xemacs-21.5.34-ncurses-tinfo.patch 699 BLAKE2B 0978b118040b1399bb042efbdfa54968a701b37a5b2f505f4dd1af9971b38c0a52cbe8fb9272ecc19c030bfa79fe28d56df358484116eadf3db9396b7ce09d17 SHA512 814b01388e7eb5963307dd5cd136725dd6d0d206b1a4e8ffc2ca8dabdd0070a58122fb4faa943efead1fe70f6309819177870630e05e5c02b51dc5e2aa0bd765
+AUX xemacs-21.5.34-no-lock-on-finder-inf.patch 3946 BLAKE2B 195cb81df5ff7aecdb5f616178388a620d05e41975697df238928c2209a15652762aefb461eb681e3b6eb0f1736127d45101b6da478d2bb01d7b0735d0a94329 SHA512 754031e82c4c5236a3119973ee9d6635fc93a1d5b27eb4ae1ada2bf06ae45fbd306f00dc3bd8fbd1df9b855b1b031b24801bf1ba4c6f5e8f66903b151a3d0781
 AUX xemacs-21.5.34-process-test-qa.patch 501 BLAKE2B 11130d14b564181e35820acd99266e2fb8ba18b742f993ac6161d6b6cc04b8a14f92f4ddd8f21912e1521db88b8b6df0efa47df5dfd2cb1fe0bc20338d9553fa SHA512 03676ffa352871e278cf1cffb8bdc1e1c9052b49517d4009079734b5ff1de647e9808fb4c8a620ab9a8ec5dcbe02a454df0e11ef1f9e7867014c8fec830c90f5
 AUX xemacs-21.5.34-strsignal.patch 4675 BLAKE2B 09297a6e4979fdcf36fa7807072236ceebff1cfbee01c6d5034b93c0725833fbfe1da0488eb4e9d588ed0c49356835310989cdd2bfa819f5ad94a5a13378e4d2 SHA512 c5eb3a7e25b4ede9046b00b8d949fbdc07a430bec1095906888c3361a4b354ab6625353c168f3544a65c77226ae6f7762f07850a97087a0ac75b2556b1b661b2
 AUX xemacs.desktop 1061 BLAKE2B 47941fc8b380e08aad13e44fc1899ee73ef502dbbf5d8be4eaa23c301b5d25a8c334971a1d89f8cfa551dce909891edaac6a7df956c912396fc8cfb88a720a6b SHA512 6542fc7777af888ae711d386918e712e1d106635f70e65af77d1e809156baba9831fc4c8bd2cb7e7c6f9ab0ab18ddfb92709ac2909aa613471101454599bdb69
@@ -19,6 +21,6 @@ DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31
 EBUILD xemacs-21.4.24-r5.ebuild 7114 BLAKE2B 051a221c2973c4d54741e89ecd3152cc95b65ac63318099c98c73c16ce5ba43dc940331371ee88c79af6023c7c9ac8a4720d99483e5ce91688d0858a302a5fa7 SHA512 fefe0fb6d1c3f9ff66a50acdbe0e2c9769df01b5447a8e25fd9243733da728d16c9ac5d54539d40c0a0dc83cdc5c3e949d661c7c9b6c9aabe63cbbf78ff8f287
 EBUILD xemacs-21.4.24-r6.ebuild 7139 BLAKE2B a8e8c5c1cc41f60ebf88f454d7198936df70c47ccca00c5abd10a901d2e8a2c003699d336d0ce018385fe2cacea2cc0d53cce24c174293216f1b8beb6a2266c5 SHA512 c7c09d1195d6f5bf291b463700d1caa05fa3803ab8f7a4b29ed7cfdf2c1e2beccb24a14fc904992e66c0190d6fb70db936e348512f479cc5aec42b072bff6b49
 EBUILD xemacs-21.5.34-r8.ebuild 7339 BLAKE2B be0b1d94b9ab0e113c14d9563b82a4feb2c9fd7601597269efa608df7eba950b03dc6f5502c5b439962eac2fedd953285f4a45d7f212e5e34147a7530b66e4a8 SHA512 e44fcec4cf5eee02f3800c153f35295454f0d8c3f10cda3d30245518e7199f997908333a1d7f9f37ca79dd2264bd397b06cfac89e6be7f6ab0113beff7ae824f
-EBUILD xemacs-21.5.34-r9.ebuild 7233 BLAKE2B 9ff5ea0f933aaf5511d2d9cff98a316aa4b136d1d78fbf91b195409f17b8a1b7b7cdf72d57bdc8f0cc8a9d624db25dcd0e7927937bfbdc59cf0db85ea1e8251c SHA512 0456dc211ccc9fd19f3351c1108bc3064a86576aaef1943016676e898245102c520af7dcfe8eb211b82e081fae1f6e90c27390fd7e98e7d822be45a48edaf189
+EBUILD xemacs-21.5.34-r9.ebuild 7346 BLAKE2B 6516c9543c5381cd83964c7170f88db536c88cd0b7457250e33140949d9d77fbc93cb64e54344adee820c222554669702d4ba9591aa69594bf91bdccc1909673 SHA512 ae36bc78eb159759b05b3f367fc1a56b79a92c80bae1d3ba27d481b6475dd95549516a665f358d2ca787e7a50b1e09ecb09834c00a46ff0adec9a015e4954723
 EBUILD xemacs-21.5.9999.ebuild 7224 BLAKE2B d3907244a27a25b0def8ec0f47d82a54a7356632c5024d7e740ee8992bbc6da9a309a480599a10fda686731da78ae2fe23610b112e81575b2dda785adf23d60c SHA512 1bca46da3f9fe5749c7bc144899c005a982cf84d30692eb107be5298f92288308984ce31eeafda9887056f7ffd09bc06f4077c8e124a46b9ff46ad6fe42268c5
 MISC metadata.xml 683 BLAKE2B 060e4f7830a96404813a550debecf83c2de3993183d41638362ed01a3a6240bdd33a83c0db5e31a2f2e821046fb1c15199688271c27611689aac1bdf02bcde14 SHA512 176625d3c972766aaecd10125e69b4cdcbedff958b842b2ac2b6a39d728ec868b3311ef13f6854122063810c5125f48d73cd1e68083de5ddf3ef85f7f2b09cdc
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-autoloads-parallell-make.patch b/app-editors/xemacs/files/xemacs-21.5.34-autoloads-parallell-make.patch
new file mode 100644
index 000000000000..9a86046be992
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-autoloads-parallell-make.patch
@@ -0,0 +1,184 @@
+--- a/lisp/update-elc-2.el.orig	2022-06-16 21:58:48.748641021 +0200
++++ b/lisp/update-elc-2.el	2022-06-16 21:58:48.748641021 +0200
+@@ -137,37 +137,10 @@
+   (let ((dir (car command-line-args-left)))
+     ;; don't depend on being able to autoload `update-autoload-files'!
+     (load "autoload")
+-    (autoload 'cl-compile-time-init "cl-macs")
+     (load "bytecomp")
+     (load "byte-optimize")
+-    ;; #### the API used here is deprecated, convert to one with explicit
+-    ;; arguments when it is available
+-    ;; update-elc.el signals us to rebuild the autoloads when necessary.
+-    ;; in some cases it will rebuild the autoloads itself, but doing it this
+-    ;; way is slow, so we avoid it when possible.
+-    (when (file-exists-p (expand-file-name "REBUILD_AUTOLOADS"
+-					   invocation-directory))
+-      ;; if we were instructed to rebuild the autoloads, force the file
+-      ;; to be touched even w/o changes; otherwise, we won't ever stop
+-      ;; being told to rebuild them.
+-      (update-autoload-files dir "auto" nil t)
+-      (byte-recompile-file (expand-file-name "auto-autoloads.el" dir) 0)
+-      (when (featurep 'mule)
+-	(let ((muledir (expand-file-name "../lisp/mule" (file-truename dir))))
+-	  ;; force here just like above.
+-	  (update-autoload-files muledir "mule" nil t)
+-	  (byte-recompile-file (expand-file-name "auto-autoloads.el" dir) 0))))
+-    (when (featurep 'modules)
+-      (let* ((moddir (expand-file-name "../modules" (file-truename dir)))
+-	     (autofile (expand-file-name "auto-autoloads.el" moddir)))
+-	(update-autoload-files 
+-	 (delete (concat (file-name-as-directory moddir) ".")
+-		 (delete (concat (file-name-as-directory moddir) "..")
+-			 (directory-files moddir t nil nil 0)))
+-	 "modules" autofile)
+-	(byte-recompile-file autofile 0)))
+-    ;; now load the (perhaps newly rebuilt) autoloads; we were called with
+-    ;; -no-autoloads so they're not already loaded.
++    ;; now load the autoloads; we were called with -no-autoloads so they're not
++    ;; already loaded.
+     (load (expand-file-name "auto-autoloads" lisp-directory))
+     (when (featurep 'mule)
+       (load (expand-file-name "mule/auto-autoloads" lisp-directory)))
+@@ -175,6 +148,8 @@
+     ;; there may be dependencies between one .el and another (even across
+     ;; directories), and we don't want to load an out-of-date .elc while
+     ;; byte-compiling a file.
++    (when (featurep 'modules)
++      (load (expand-file-name "auto-autoloads" module-directory)))
+     (message "Removing old or spurious .elcs in directory tree `%s'..." dir)
+     (do-update-elc-2 dir nil nil)
+     (message "Removing old or spurious .elcs in directory tree `%s'...done"
+--- a/lisp/update-elc.el.orig	2022-06-16 21:58:48.748641021 +0200
++++ b/lisp/update-elc.el	2022-06-16 21:58:48.748641021 +0200
+@@ -54,8 +54,11 @@
+ (defvar update-elc-files-to-compile nil)
+ (defvar need-to-rebuild-autoloads nil)
+ (defvar need-to-rebuild-mule-autoloads nil)
++(defvar need-to-rebuild-module-autoloads nil)
+ (defvar need-to-recompile-autoloads nil)
+ (defvar need-to-recompile-mule-autoloads nil)
++(defvar need-to-recompile-module-autoloads nil)
++
+ (defvar exe-target nil)
+ (defvar dump-target nil)
+ (defvar dump-target-out-of-date-wrt-dump-files nil)
+@@ -84,10 +87,14 @@
+ 
+ (defvar source-lisp-mule (expand-file-name "mule" source-lisp))
+ (defvar source-directory (expand-file-name ".." source-lisp))
++(defconst module-directory (expand-file-name "modules" source-directory))
++
+ (defvar aa-lisp (expand-file-name "auto-autoloads.el" source-lisp))
+ (defvar aac-lisp (expand-file-name "auto-autoloads.elc" source-lisp))
+ (defvar aa-lisp-mule (expand-file-name "auto-autoloads.el" source-lisp-mule))
+ (defvar aac-lisp-mule (expand-file-name "auto-autoloads.elc" source-lisp-mule))
++(defvar aa-modules (expand-file-name "auto-autoloads.el" module-directory))
++(defvar aac-modules (expand-file-name "auto-autoloads.elc" module-directory))
+ 
+ (setq load-path (list source-lisp))
+ 
+@@ -130,7 +137,8 @@
+ 
+ (defvar lisp-files-ignored-when-checking-for-autoload-updating
+   '("custom-load.el"
+-    "auto-autoloads.el")
++    "auto-autoloads.el"
++    "finder-inf.el")
+   "Lisp files that should not trigger auto-autoloads rebuilding.")
+ 
+ (defun update-elc-chop-extension (file)
+@@ -270,6 +278,18 @@
+ 	  (setq all-files-in-dir (cdr all-files-in-dir))))
+       (setq dirs-to-check (cdr dirs-to-check))))
+ 
++  ;; Check for the module autoloads separately, given the need to run
++  ;; directory-files on subdirectories.
++  (let ((autoload-file
++        (expand-file-name "auto-autoloads.el" module-directory)))
++    (mapc
++     #'(lambda (full-dir)
++        (mapc #'(lambda (full-arg)
++                  (when (file-newer-than-file-p full-arg autoload-file)
++                    (setq need-to-rebuild-module-autoloads t)))
++              (directory-files full-dir t "\\.c$" nil t)))
++     (directory-files module-directory t nil t 'subdirs)))
++
+   (if dump-target-out-of-date-wrt-dump-files
+       (condition-case nil
+ 	  (write-region-internal
+@@ -297,6 +317,14 @@
+ 	  (file-newer-than-file-p aa-lisp-mule aac-lisp-mule))
+   (setq need-to-recompile-mule-autoloads t))
+ 
++(when (or need-to-rebuild-module-autoloads
++         ;; not necessary but ...  see comment above.
++         (eq (file-exists-p aa-modules) nil)
++         ;; no need to check for file-exists of .elc due to definition
++         ;; of file-newer-than-file-p
++         (file-newer-than-file-p aa-modules aac-modules))
++  (setq need-to-recompile-module-autoloads t))
++
+ (when (not (featurep 'mule))
+   ;; sorry charlie.
+   (setq need-to-rebuild-mule-autoloads nil
+@@ -318,15 +346,18 @@
+ 	(if need-to-rebuild-mule-autoloads
+ 	    (list "-f" "batch-update-directory-autoloads"
+ 		  "mule" source-lisp-mule))
++        (if need-to-rebuild-module-autoloads
++            (list "-f" "batch-update-directory-autoloads"
++                  "auto" module-directory))
+ 	(if need-to-recompile-autoloads
+ 	    (list "-f" "batch-byte-compile-one-file"
+ 		  aa-lisp))
+ 	(if need-to-recompile-mule-autoloads
+ 	    (list "-f" "batch-byte-compile-one-file"
+-		  aa-lisp-mule)))))
+-  (condition-case nil
+-      (delete-file (expand-file-name "src/REBUILD_AUTOLOADS" build-directory))
+-    (file-error nil))
++                  aa-lisp-mule))
++        (if need-to-recompile-module-autoloads
++            (list "-f" "batch-byte-compile-one-file"
++                  aa-modules)))))
+   (cond ((and (not update-elc-files-to-compile)
+ 	      (not need-to-rebuild-autoloads)
+ 	      (not need-to-rebuild-mule-autoloads)
+@@ -335,17 +366,25 @@
+ 	 ;; (1) Nothing to do at all.
+ 	 )
+ 	((not update-elc-files-to-compile)
+-	 ;; (2) We have no files to byte-compile, but we do need to
+-	 ;;     regenerate and compile the auto-autoloads file, so signal
+-	 ;;     update-elc-2 to do it.  This is much faster than loading
+-	 ;;     all the .el's and doing it here. (We only need to rebuild
+-	 ;;     the autoloads here when we have files to compile, since
+-	 ;;     they may depend on the updated autoloads.)
+-	 (condition-case nil
+-	     (write-region-internal
+-	      "foo" nil (expand-file-name "src/REBUILD_AUTOLOADS" build-directory))
+-	   (file-error nil))
+-	 )
++         ;; (2) We have no files to byte-compile, but we do need to regenerate
++         ;;     and compile the auto-autoloads file. Don't pass this on to
++         ;;     update-elc-2.el to do, since that gives dependency problems
++         ;;     with parallel builds (make -j and friends). Completely fine to
++         ;;     use the compiled Lisp infrastructure for this, though, since we
++         ;;     know it's up to date.
++         (setq command-line-args
++               (append
++                '("-l" "loadup-el.el" "run-temacs"
++                  "-batch" "-no-packages" "-no-autoloads"
++                  "-eval" "(setq stack-trace-on-error t)"
++                  "-eval" "(setq load-always-display-messages t)"
++                  "-l" "bytecomp.elc" "-l" "autoload.elc")
++                do-autoload-commands))
++         (write-sequence "\nNeed to regenerate auto-autoload files... "
++                         'external-debugging-output)
++         (let ((load-ignore-elc-files nil)
++               (purify-flag nil))
++           (load "loadup.el")))
+ 	(t
+ 	 (let ((bc-bootstrap
+ 		(mapcar #'(lambda (arg) 
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-no-lock-on-finder-inf.patch b/app-editors/xemacs/files/xemacs-21.5.34-no-lock-on-finder-inf.patch
new file mode 100644
index 000000000000..a37fc5e95fe0
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-no-lock-on-finder-inf.patch
@@ -0,0 +1,99 @@
+# HG changeset patch
+# User Aidan Kehoe <kehoea@parhasard.net>
+# Date 1656333099 -3600
+#      Mon Jun 27 13:31:39 2022 +0100
+# Node ID c6966a009d0dc3b546c9d843141c1fb5daa89b9e
+# Parent  16e37125d7ea85048e89197ce8fe83f44b00ccc5
+Don't create a lock file when generating finder-inf.el
+
+lisp/ChangeLog addition:
+
+2022-06-27  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* finder.el (finder-compile-keywords):
+	Don't use the save-buffer infrastructure when generating
+	finder-inf.el, since that leads to lock files, making parallel
+	builds less likely to work. Thank you Mats Lidell and the Gentoo
+	users!
+
+src/ChangeLog addition:
+
+2022-06-27  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* Makefile.in.in ($(LISP)/finder-inf.el):
+	Don't remove finder-inf.el before regenerating it, Lisp will
+	overwrite it.
+
+diff -r 16e37125d7ea -r c6966a009d0d lisp/finder.el
+--- a/lisp/finder.el	Sun Jun 26 19:14:02 2022 +0300
++++ b/lisp/finder.el	Mon Jun 27 13:31:39 2022 +0100
+@@ -151,7 +151,7 @@
+ arguments compiles from `load-path'."
+   (save-excursion
+     ;; XEmacs change
+-    (find-file (expand-file-name "finder-inf.el" lisp-directory))
++    (set-buffer (generate-new-buffer "finder-inf.el"))
+     (let ((processed nil)
+ 	  (directory-abbrev-alist
+ 	   (append
+@@ -160,11 +160,12 @@
+                                      "")))
+ 		    finder-abbreviate-directory-list)
+ 	    directory-abbrev-alist))
+-	  (using-load-path))
++	  using-load-path second-line-marker finder-scratch)
+       (or dirs (setq dirs load-path))
+       (setq using-load-path (equal dirs load-path))
+       (erase-buffer)
+       (insert ";;; finder-inf.el --- keyword-to-package mapping\n")
++      (setq second-line-marker (point-marker))
+       (insert ";; Keywords: help\n")
+       (insert ";;; Commentary:\n")
+       (insert ";; Don't edit this file.  It's generated by finder.el\n\n")
+@@ -180,7 +181,8 @@
+ 		(if (not finder-compile-keywords-quiet)
+ 		    (message "Processing %s ..." f))
+ 		(save-excursion
+-		  (set-buffer (get-buffer-create "*finder-scratch*"))
++		  (set-buffer (setq finder-scratch
++                                    (get-buffer-create "*finder-scratch*")))
+ 		  (buffer-disable-undo (current-buffer))
+ 		  (erase-buffer)
+ 		  (insert-file-contents (expand-file-name f d))
+@@ -210,10 +212,23 @@
+ 	    (directory-files d nil "^[^=].*\\.el$"))))
+        dirs)
+       (insert "))\n\n(provide 'finder-inf)\n\n;;; finder-inf.el ends here\n")
+-      (kill-buffer "*finder-scratch*")
++      (if finder-scratch (kill-buffer finder-scratch))
+       (unless noninteractive
+ 	(eval-current-buffer)) ; So we get the new keyword list immediately
+-      (basic-save-buffer))))
++      (goto-char (point-min))
++      (if (re-search-forward "[^\x00-\x7f]" nil t)
++          (progn
++            (goto-char (point-min))
++            (if (re-search-forward "[^\x00-\xff]" nil t)
++                (progn (goto-char second-line-marker)
++                       (insert ";;; -*- coding: escape-quoted -*-\n")
++                       (setq buffer-file-coding-system 'iso-8859-1-unix))
++              (goto-char second-line-marker)
++              (insert ";;; -*- coding: iso-8859-1 -*-\n")
++              (setq buffer-file-coding-system 'escape-quoted-unix)))
++        (setq buffer-file-coding-system 'no-conversion-unix))
++      (write-region (point-min) (point-max)
++                    (expand-file-name "finder-inf.el" lisp-directory)))))
+ 
+ (defun finder-compile-keywords-make-dist ()
+   "Regenerate `finder-inf.el' for the Emacs distribution."
+diff -r 16e37125d7ea -r c6966a009d0d src/Makefile.in.in
+--- a/src/Makefile.in.in	Sun Jun 26 19:14:02 2022 +0300
++++ b/src/Makefile.in.in	Mon Jun 27 13:31:39 2022 +0100
+@@ -590,7 +590,6 @@
+ 
+ $(LISP)/finder-inf.el: update-elc-2
+ 	@echo "Building finder database ..."
+-	$(RM) $(LISP)/finder-inf.el
+ 	$(XEMACS_BATCH)	-eval "(setq finder-compile-keywords-quiet t)" \
+ 		-eval "(setq lisp-directory \"$(LISP)\")" \
+ 		-l finder -f finder-compile-keywords
diff --git a/app-editors/xemacs/xemacs-21.5.34-r9.ebuild b/app-editors/xemacs/xemacs-21.5.34-r9.ebuild
index bba9dbfeb9b6..cbf425e1c83b 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r9.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r9.ebuild
@@ -67,6 +67,8 @@ src_prepare() {
 	eapply "${FILESDIR}/${P}-ar.patch"
 	eapply "${FILESDIR}/${P}-strsignal.patch"
 	eapply "${FILESDIR}/${P}-process-test-qa.patch"
+	eapply "${FILESDIR}/${P}-autoloads-parallell-make.patch"
+	eapply "${FILESDIR}/${P}-no-lock-on-finder-inf.patch"
 
 	eapply_user