gentoo auto-resync : 14:10:2023 - 11:10:46

6 files changed, 28 insertions, 24 deletions

diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 54b458af0220..85802d7424d2 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/gnuserv/Manifest b/app-emacs/gnuserv/Manifest
index 2f3c6ab7dad1..b46b94d16d4e 100644
--- a/app-emacs/gnuserv/Manifest
+++ b/app-emacs/gnuserv/Manifest
@@ -1,15 +1,15 @@
 AUX 50gnuserv-gentoo.el 237 BLAKE2B 53e2fb102e832b852ebd23d3a7cda10a1cde7e1733818dd357edaa0ba67e66d925ea589195dd5b797ba37e62f44e26706669594f875409fb6afb294bba05d549 SHA512 24edf596178da29d68add510382241bf257ccb6ed0f9bd1aa65a2bda268b2fa506be616f70c75628d82cc8fda06617f5a4b58e602a9dc082476ac4ad4f0e047d
 AUX gnuclient.desktop 608 BLAKE2B b50695688d76ec34dae2fb68b4865769ab531a2a5add76a48c71eac6542ea3736f6e2239f1b05775e88bee3bc2ccfc6e50bc0c49a6eacbb277d822bb2cfb3003 SHA512 35616b5fe182f4127635454f4af89b307c0c52653878ef163efee4741c4b5fe5ab88d78f89ebfe499cc02516d2a7093c49dc2232a2768e952acd61651ff16468
-AUX gnuserv-3.12.8-advice.patch 1929 BLAKE2B bc203551fc3da1b846af2645289f92f03647b35464389f1bc68a6747e1e2227029e85b3262726be0e4cbb1d86277b1eb2f5fd0053155f835af9acbebe989d41c SHA512 940f57465686f76d50782f456880fb558152a9fcf4ca146783ebeb95620debe5835ea4a0980031387463d4ca353fce3ae599b679d835e4cb47f5cbf18e6f59bf
+AUX gnuserv-3.12.8-advice.patch 1414 BLAKE2B f6243ab071c87f835368f3e2bb9dc56ba2a54179bdc575bcbc97aea226f3104b0ce5de06d0fd0ef2a9f2fcfcf81ea0f8fd5d61cad29532d8f7b66915087692fb SHA512 b70d8b919c342115264f15f04e07f191cd8f81aabe7f0772d41da3740762abe5d020d66614a19e59454e5fa54e2207c03b527d59fb6b0db02ad8988fba0ddb50
 AUX gnuserv-3.12.8-backquotes.patch 509 BLAKE2B 4770c01e4650301d1922b2c87e5cd723feb016fb5d5224aec715761a81b4f66614c7a535101764432a80c26f8e9c13d2fc3cbd1ab8122b5e608d3aeea3de73b3 SHA512 9ccdf8b4fe0ce45528ecec67782785b5d1ec82e5fd14d444b3f091d9c76add8052de3384e0b54fff479f4bc5729966ce520e62343159a7e251fce1e3841b5229
 AUX gnuserv-3.12.8-cl.patch 6759 BLAKE2B 996ed95c137625adb6641324cc4c4408a10ae3f4a12daa69355f74d4579d09d48bc2456d2f5eaa93c6c6c0f111846def33b14466106fc318cd4c10a406b288c3 SHA512 fef9c9c01d177fbf6526fe8dd416ce4898aea3bf7d2418183c1f8bc69048139a1202533678cf2aee6d468b9bc899f6975847677860942f47f3e135b0add1a2cc
-AUX gnuserv-3.12.8-devices.patch 1760 BLAKE2B 9b4cbade139b5916af2f7f886235ca04b8b682777a96d44e2d30fc09f2dfdd8b915fa0b1a1a44b791db02c33e18e1f062dfc4e271290808ef7de8950da64673c SHA512 eff32afe14f4ff90323c5ff1edb4f3e2d1b998a1a445d69a9b8b29ddb7a936628ca1939ded3ddf134d15599da14feae9f55ab54c267eaaadd95b4a0cb64ac7ab
+AUX gnuserv-3.12.8-devices.patch 2448 BLAKE2B 85e9b84cea7b5990691d7d66a63e1078aa7036efda046aea0a19e39dfc16cea39ec40af4c68978395e6e513cca2e43c9caa38e63ce260d9461741355154ca795 SHA512 d138fe554f39aaa675f114e8f149d10f5c38b5313a212737d1bcb021fdee4448bf6312fa8699c20987365156366beefebd52cf60e00e1b673e5b930634cd8ac1
 AUX gnuserv-3.12.8-emacs-28.patch 1300 BLAKE2B b74b904b37af0460682d6c7c5b0b0d79ec41feb646f69bbe38c0db2698d3e8d133b56eb831c6149b0f22725ef5f85c2b27d60100b18ce5c62ce30ec18a928403 SHA512 1cf554a682254ea8c84b8e81e76a2cb08cee18e3b919a9889b745ea97234aad4e3e0099e48fd13a57b881cb2d17a495e59a42d8fbda30d94b2391d0d11ae2ba5
 AUX gnuserv-3.12.8-gnudoit.patch 374 BLAKE2B 9c39f3fd1b881e4a2b4dde712b56824e99da89140d17b5a3996e35eb5d7c0a9d47933e041834c0249010c4932a69633aa93a38ce16bdd3158f52f22549f9db2f SHA512 ba3be5bee1bd23363dc41d77a45028497e1a4a8270358bf4c6eacacaca85e5b52717991885f8d4bb754c613f535d4934d0e199ccd088f78f15bcf78beaa524bd
 AUX gnuserv-3.12.8-no-custom.patch 1031 BLAKE2B ad7ba75b645ba2e43252a0f6e4e7749f3b7f063d913fb00d15f890d035ae29f2d31c84a01f39712661bef1c5a5d1864651c9d12bc4266e4358af65a293021dac SHA512 1e73b6ed8e68240b0beea1dbe764b5562b9563328b34c51d4668713a69aac03c1d3ea0e3e19561e78db766ba513b49ea11bbff87f03bb375402caef228f4197b
 AUX gnuserv-3.12.8-process-query.patch 554 BLAKE2B 94f09a1e86ea787a05e51ed5e2742174067b7cca0fbe2fe83619b6f829048172a9e46f70f8e2c22f2787f43390730f07520553e7d659ccfd451869b1a074d707 SHA512 bc01b928003cf5050934972eeb7830b14957693c1484b061dbcf1809176388b75297b6884b7f5c963e59d8ec4a7cc4d9bf9ec265b414574a7de6bb5875f6b607
-AUX gnuserv-3.12.8-warnings.patch 2487 BLAKE2B 5cd3e343073b750bb4009adecc370ed6b30dc0b9c381121463cf22f88112e434430d9c8058d7266836d1ea5621a2b34aad45d5f02ec8fd098e1962994cc07cb3 SHA512 111d915260b92dd88f9a6753f4df6a73372cfde50def38f986ea90b8d9bbdf545547f650de5c742c5d2e3208661152d031afd4f550f963cadafa9894f616b040
+AUX gnuserv-3.12.8-warnings.patch 2487 BLAKE2B 39581dce0cfdfb6d9769eefe0a99af2f9d2d091dbab5ce06c942df3348d06581e88ed8968192f13d15598045ab3752b5f96342e88e9ff3305f609117d41fcea5 SHA512 269b69c5618730a02694b25941c2de0cc94f516fd2bd8e80f339527f9f683e3052840240d34dede4b2686a4cdc90dcfbaeb26ab394dad255e5ada773b9df16f6
 DIST gnuserv-3.12.8.tar.gz 124070 BLAKE2B 7531d85f6cd1873f75499c37230907f96ac484e1d58a4a3459f44d3bfaa6a6124d44f99a7c27d1fa3deb16b1cc29d08313b911cdc1782a1c5b24bd702ef4c9ba SHA512 e8f387a554c22fb2eb166d388085b9d68a0d865ae56ab71f3ffe09ff46bef04a4ba5b05ca51a1110e1dff67ae2cd6acc8b18a0fb9df9299dbbf4a001f0924f31
 EBUILD gnuserv-3.12.8-r5.ebuild 1752 BLAKE2B affe2261d573ec8d003c89fe509cb52f0d6237db66ae25e8716819e9e097639cd8d96899b119d7bd6058b132ca3cf5375a50083a9dd2d78d90ba201544c89a16 SHA512 5a9ecfb745a7d70da2cf367330a8505654dd0f05f61e884cd086844214689bb7ed7f0ca4f020825483bab6a73ac6b259d928803ba4bb13b4aceeadd7570a5e06
-EBUILD gnuserv-3.12.8-r7.ebuild 1996 BLAKE2B 7269ee940e86aaeb2cab7b77fd7efdb614a708a7aa784e65453e9e0473057d976b669b5c2ce29585edbd8dfda24490c0fc642319e660e5a4ff73ea8f80bfe536 SHA512 a11742b5e282e4cbc555802a57063d36a6e87aabee71d9f0db249f2bd0a437f678d97a5019ccd107518a7177278067d099485d58b41fd214bece6cc3a1185262
+EBUILD gnuserv-3.12.8-r8.ebuild 1996 BLAKE2B 7269ee940e86aaeb2cab7b77fd7efdb614a708a7aa784e65453e9e0473057d976b669b5c2ce29585edbd8dfda24490c0fc642319e660e5a4ff73ea8f80bfe536 SHA512 a11742b5e282e4cbc555802a57063d36a6e87aabee71d9f0db249f2bd0a437f678d97a5019ccd107518a7177278067d099485d58b41fd214bece6cc3a1185262
 MISC metadata.xml 260 BLAKE2B a187a6020d68e0ac53c6bb25461b0988c938fb112a8a7e3a906b827269347d70f8366594d404329695b4fa52fff2cde7fbc51d501e674bf8adc821a4141ccfcf SHA512 2ff2d68bb3c552f006474e86ecab8ebbcfcb35588384c045a665d305f79c739c4d80c0ea639a71c39123b8c5c1b3a96977ee8c0c3e973449a732ac3ac8f2c3a3
diff --git a/app-emacs/gnuserv/files/gnuserv-3.12.8-advice.patch b/app-emacs/gnuserv/files/gnuserv-3.12.8-advice.patch
index f4ac28efa662..90d4938751e2 100644
--- a/app-emacs/gnuserv/files/gnuserv-3.12.8-advice.patch
+++ b/app-emacs/gnuserv/files/gnuserv-3.12.8-advice.patch
@@ -2,7 +2,7 @@ defadvice is obsolete in Emacs 30.
 
 --- gnuserv-3.12.8/gnuserv-compat.el
 +++ gnuserv-3.12.8/gnuserv-compat.el
-@@ -112,38 +112,35 @@
+@@ -112,28 +112,27 @@
    ;; can do!  If the device doesn't represent a live frame, we create
    ;; the frame as requested.
  
@@ -24,19 +24,6 @@ defadvice is obsolete in Emacs 30.
 +
 +  (advice-add 'make-frame :around #'gnuserv-compat-make-frame)
  
-   ;; Advise `delete-frame' to run `delete-device-hook'.  This might be a
-   ;; little too hacky, but it seems to work!  If someone actually tries
-   ;; to do something device specific then it will probably blow up!
--  (defadvice delete-frame (before
--			   gnuserv-compat-delete-frame
--			   first
--			   nil
--			   activate)
-+  (defun gnuserv-compat-delete-frame (&optional frame _force)
-     (run-hook-with-args 'delete-device-hook frame))
- 
-+  (advice-add 'delete-frame :before #'gnuserv-compat-delete-frame)
-+
    ;; Advise `filtered-frame-list' to ignore the optional device
    ;; argument.  Here we don't follow the mapping of devices to frames.
    ;; We just assume that any frame satisfying the predicate will do.
diff --git a/app-emacs/gnuserv/files/gnuserv-3.12.8-devices.patch b/app-emacs/gnuserv/files/gnuserv-3.12.8-devices.patch
index 0c509a7cd842..faab53e6da1e 100644
--- a/app-emacs/gnuserv/files/gnuserv-3.12.8-devices.patch
+++ b/app-emacs/gnuserv/files/gnuserv-3.12.8-devices.patch
@@ -2,9 +2,29 @@ Function device-class from devices.el is not used, but collides with
 a function of the same name in frame.el of Emacs 29. So, inline what
 we need, and drop devices.el altogether.
 
+Define delete-device-hook as an alias of delete-frame-functions, so we
+need no advice for delete-frame.
+
 --- gnuserv-3.12.8/gnuserv-compat.el
 +++ gnuserv-3.12.8/gnuserv-compat.el
-@@ -153,9 +153,39 @@
+@@ -125,16 +125,6 @@
+ 	  (setq ad-return-value device))
+       ad-do-it))
+ 
+-  ;; Advise `delete-frame' to run `delete-device-hook'.  This might be a
+-  ;; little too hacky, but it seems to work!  If someone actually tries
+-  ;; to do something device specific then it will probably blow up!
+-  (defadvice delete-frame (before
+-			   gnuserv-compat-delete-frame
+-			   first
+-			   nil
+-			   activate)
+-    (run-hook-with-args 'delete-device-hook frame))
+-
+   ;; Advise `filtered-frame-list' to ignore the optional device
+   ;; argument.  Here we don't follow the mapping of devices to frames.
+   ;; We just assume that any frame satisfying the predicate will do.
+@@ -153,9 +143,36 @@
  (if (string-match "XEmacs" (emacs-version))
      nil
  
@@ -14,6 +34,7 @@ we need, and drop devices.el altogether.
 +  (defalias 'device-live-p 'frame-live-p)
 +  (defalias 'frame-device 'identity)
 +  (defalias 'make-tty-device 'ignore)
++  (defvaralias 'delete-device-hook 'delete-frame-functions)
 +
 +  (defun make-x-device (&optional display)
 +    (if display
@@ -26,10 +47,6 @@ we need, and drop devices.el altogether.
 +  the toolbar, glyphs, etc."
 +    (and (cdr-safe (assq 'display (frame-parameters device))) t))
 +
-+  (defvar delete-device-hook nil
-+    "Function or functions to call when a device is deleted.
-+  One argument, the to-be-deleted device.")
-+
 +  (defun delete-device (device &optional force)
 +    "Delete DEVICE, permanently eliminating it from use.
 +  Normally, you cannot delete the last non-minibuffer-only frame (you must
diff --git a/app-emacs/gnuserv/files/gnuserv-3.12.8-warnings.patch b/app-emacs/gnuserv/files/gnuserv-3.12.8-warnings.patch
index 113d7f0f5f37..5310f357621f 100644
--- a/app-emacs/gnuserv/files/gnuserv-3.12.8-warnings.patch
+++ b/app-emacs/gnuserv/files/gnuserv-3.12.8-warnings.patch
@@ -11,7 +11,7 @@ Fix some byte-compiler warnings
      nil
    
    ;; XEmacs `make-frame' takes an optional device to create the frame
-@@ -150,7 +150,7 @@
+@@ -140,7 +140,7 @@
  ;; part we use devices.el from the Emacs-W3 distribution.  In some
  ;; places the implementation seems wrong, so we "fix" it!
  
diff --git a/app-emacs/gnuserv/gnuserv-3.12.8-r7.ebuild b/app-emacs/gnuserv/gnuserv-3.12.8-r8.ebuild
index 4cb5f7e12303..4cb5f7e12303 100644
--- a/app-emacs/gnuserv/gnuserv-3.12.8-r7.ebuild
+++ b/app-emacs/gnuserv/gnuserv-3.12.8-r8.ebuild