gentoo resync : 09.07.2022

3 files changed, 118 insertions, 1 deletions

diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index bf7a9d8bb66d..2bc15e02f35d 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -10,6 +10,7 @@ AUX xemacs-21.5.34-autoloads-parallell-make.patch 8290 BLAKE2B c9bd81b499cd94a95
 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-module-autoloads.patch 5056 BLAKE2B d36535bb6ea75d832dae0300be4e46af7cfb5a657b4ab888337a9b22b66e489a1e2d7a45ca680c1e79b7a7752d0761d9b2324748a6322575fb806496de28d35e SHA512 875b9a59a77174a1c591e54cf70fd1b07d2dc36e2591209a4335c74c89911a06230ebef38d53dab8b2de95e3177253af54dffc3e8b107f4dbce64f5063d447f6
 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
@@ -21,6 +22,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 7346 BLAKE2B 6516c9543c5381cd83964c7170f88db536c88cd0b7457250e33140949d9d77fbc93cb64e54344adee820c222554669702d4ba9591aa69594bf91bdccc1909673 SHA512 ae36bc78eb159759b05b3f367fc1a56b79a92c80bae1d3ba27d481b6475dd95549516a665f358d2ca787e7a50b1e09ecb09834c00a46ff0adec9a015e4954723
+EBUILD xemacs-21.5.34-r9.ebuild 7396 BLAKE2B 1af85c64a63e4783969a554542c3f2bbf1bd0bfbdcca9ea49024952a14768d71c8de06d6b5003322bee61bf571c05a1548023a5d0c2fda609a4634c0a51c75d4 SHA512 57e95f0c1b338b52d1f0f1cbd834e06bb50eec4aafaf0eec350f0c65b347a83cadd5deee9a0528d8b8ec186ee070852fbbfb10018a7f68fdaafc62d8bc87d3ea
 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-module-autoloads.patch b/app-editors/xemacs/files/xemacs-21.5.34-module-autoloads.patch
new file mode 100644
index 000000000000..8b5443dfcb10
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-module-autoloads.patch
@@ -0,0 +1,115 @@
+diff -u b/lisp/update-elc-2.el b/lisp/update-elc-2.el
+--- b/lisp/update-elc-2.el	Mon Jun 27 22:14:53 2022 +0900
++++ b/lisp/update-elc-2.el	Thu Jun 30 16:36:19 2022 +0100
+@@ -144,12 +144,12 @@
+     (load (expand-file-name "auto-autoloads" lisp-directory))
+     (when (featurep 'mule)
+       (load (expand-file-name "mule/auto-autoloads" lisp-directory)))
++    (when (featurep 'modules)
++      (load (expand-file-name "auto-autoloads" module-directory)))
+     ;; We remove all the bad .elcs before any byte-compilation, because
+     ;; 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"
+unchanged:
+--- a/src/Makefile.in.in	Mon Jun 27 13:31:39 2022 +0100
++++ b/src/Makefile.in.in	Mon Jun 27 22:14:53 2022 +0900
+@@ -95,7 +95,12 @@
+ SHELL=/bin/sh
+ RM = rm -f
+ 
+-LISP = $(SRC)/../lisp
++## Earlier versions had $(SRC)/../lisp here, but currently ../lisp is a
++## link to $(SRC)/../lisp in out-of-source builds.  $(SRC)/../lisp breaks
++## the modules build because the autoloads end up in $(SRCMODULES), but
++## update-elc-2.el looks for them in $(BLDMODULES).
++LISP = ../lisp
++
+ ETC = $(SRC)/../etc
+ SRCMODULES = $(SRC)/../modules
+ LIB_SRC = ../lib-src
+@@ -944,10 +949,14 @@
+ 	-$(RM) $(RAW_EXE) $(DUMP_TARGET) $(DUMP_TARGET).dmp $(LIB_SRC)/DOC
+ ##      Remove the generated load files here; they cause lots of problems
+ ##      when they don't work right.
++##      Some older versions tried to put module load files in the SRC tree,
++##      but that breaks module builds, which expect them in the BLD tree,
++##      and that's where they belong anyway.  Clean both.
+ clean: mostlyclean versionclean
+ 	-$(RM) libextcli* $(LISP)/auto-autoloads.el* $(LISP)/custom-load.el* \
+ 	$(LISP)/mule/auto-autoloads.el* $(LISP)/mule/custom-load.el* \
+-	$(SRCMODULES)/auto-autoloads.el* $(SRCMODULES)/custom-load.el*
++	$(SRCMODULES)/auto-autoloads.el* $(SRCMODULES)/custom-load.el* \
++	$(BLDMODULES)/auto-autoloads.el* $(BLDMODULES)/custom-load.el*
+ ## This is used in making a distribution.
+ ## Do not use it on development directories!
+ distclean-noconfig: clean
+only in patch2:
+unchanged:
+--- a/lisp/update-elc.el
++++ b/lisp/update-elc.el
+@@ -87,8 +87,8 @@
+ 
+ (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 source-modules (expand-file-name "../modules" (file-truename source-lisp)))
++(defconst module-directory (expand-file-name "modules" build-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))
+@@ -280,15 +280,13 @@ If any of these files are changed, we need to redump.")
+ 
+   ;; 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)))
++  (mapc
++   #'(lambda (full-dir)
++       (mapc #'(lambda (full-arg)
++		 (when (file-newer-than-file-p full-arg aa-modules)
++		   (setq need-to-rebuild-module-autoloads t)))
++	     (directory-files full-dir t "\\.c$" nil t)))
++   (directory-files source-modules t nil t 'subdirs))
+ 
+   (if dump-target-out-of-date-wrt-dump-files
+       (condition-case nil
+@@ -346,9 +344,22 @@ If any of these files are changed, we need to redump.")
+ 	(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-rebuild-module-autoloads
++	    (list "-eval"
++		  (concat
++		   "(update-autoload-files '("
++		   (mapconcat #'prin1-to-string
++			      (mapcan
++			       #'(lambda (full-dir)
++				   (unless (member*
++					    (file-name-nondirectory full-dir)
++					    '("." "..") :test #'equal)
++				     (directory-files full-dir
++						      t "\\.c$" nil t)))
++			       (directory-files source-modules
++						t nil t 'subdirs))
++			      " ")
++		   ") \"modules\" " (prin1-to-string aa-modules) ")")))
+ 	(if need-to-recompile-autoloads
+ 	    (list "-f" "batch-byte-compile-one-file"
+ 		  aa-lisp))
diff --git a/app-editors/xemacs/xemacs-21.5.34-r9.ebuild b/app-editors/xemacs/xemacs-21.5.34-r9.ebuild
index cbf425e1c83b..e6c5da2b2155 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r9.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r9.ebuild
@@ -69,6 +69,7 @@ src_prepare() {
 	eapply "${FILESDIR}/${P}-process-test-qa.patch"
 	eapply "${FILESDIR}/${P}-autoloads-parallell-make.patch"
 	eapply "${FILESDIR}/${P}-no-lock-on-finder-inf.patch"
+	eapply "${FILESDIR}/${P}-module-autoloads.patch"
 
 	eapply_user