gentoo auto-resync : 17:11:2024 - 03:03:09

33 files changed, 78 insertions, 63 deletions

diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index cc54066e9e7d..3650a306146c 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/actionscript-mode/Manifest b/app-emacs/actionscript-mode/Manifest
index 6e69eba72ed5..b677d317f9a7 100644
--- a/app-emacs/actionscript-mode/Manifest
+++ b/app-emacs/actionscript-mode/Manifest
@@ -1,4 +1,4 @@
-AUX 50actionscript-mode-gentoo.el 270 BLAKE2B e3ad9140ed1c92d78fdd3aa60855bacce78f798c8cecfcab158c04340da231bc5a0338fa3d8bd111d1770527a9b00bbeb123e50f4e71d7e9e673f70aaeb41462 SHA512 0e991f231e57ff72f992670f6469f36409fc89243afc5d6955b9035fa835cd4af2b107d59031a692c07c3d66b3e6e82941659619e344fef5a5b3b4c423437a3e
+AUX 50actionscript-mode-gentoo.el 343 BLAKE2B 1d269f22e0909f71a354109d2b7bd7ac0837ad57140a107ecf2cd7f9537858cf31d99372069b484acb7d974a604f2204124d726039f3e6793c990c4c7ccd8cba SHA512 80e1a3f777da3300d62f76d585b50a29958aaa6c821b69dae42ba9e29fbec08af89b0b2dd2aafa344f80e7a2642be349792ace68873607b56adbe9e820663bdc
 DIST actionscript-mode-7.2.2_p20180527.tar.gz 8446 BLAKE2B 4ce386be79ee4059e99cfef523036733a7c16a4bf24950dc77bd66ab03f9e07476507589fbc1a337f1f54cd4bf75234d2307ea630d642ee3306f2390e16fa0e1 SHA512 251877acec4ea79c03a67b3de441633080b421b5e84ef04d072e02916eb3e1c7b89beb18a897fe8165a0b39247da5a01c8d2b6980887dbf15ab3c5d38c39f279
 EBUILD actionscript-mode-7.2.2_p20180527.ebuild 525 BLAKE2B 1fd1602e443c88d44e084192f5778ed74c51ca8830db5f92da2255e9b062a6f622634ee006cf82e7ba53892d0115252e006b6e9160c08d25182190605a3dcc79 SHA512 d9672cc6f6471714e237279bfe117ddb23faeb212267c190bfc0468262a06a3a91a5f9dd95d04c06a3724ca2d68ee4c89b655632044f43194aee33a021cc8d64
 MISC metadata.xml 374 BLAKE2B a072197648074bc23ad55da71610aa22b297d40a35ffea017089045553d9310ea9fec8beb502929c00135146b091d05cdd8013e5e29411d1e04164a9a2d3fe7b SHA512 d7fb385695246e22ebd8da5bac1b5f2da1140470afe10269a26b3ae9b28a06908027b63d0b53b1fadd8eba7161f3d0a82bcc3bc68e4c3f76e03dee6f1db7a259
diff --git a/app-emacs/actionscript-mode/files/50actionscript-mode-gentoo.el b/app-emacs/actionscript-mode/files/50actionscript-mode-gentoo.el
index 7b6ca265923d..15c1aa9352c8 100644
--- a/app-emacs/actionscript-mode/files/50actionscript-mode-gentoo.el
+++ b/app-emacs/actionscript-mode/files/50actionscript-mode-gentoo.el
@@ -2,4 +2,5 @@
 (autoload 'actionscript-mode "actionscript-mode"
   "Major mode for editing Actionscript files." t)
 (add-to-list 'auto-mode-alist '("\\.as\\'" . actionscript-mode))
-(eval-after-load "actionscript-mode" '(load "actionscript-config"))
+;; we cannot use require because the file doesn't provide the feature
+(with-eval-after-load 'actionscript-mode (load "actionscript-config"))
diff --git a/app-emacs/dired-sort-menu/Manifest b/app-emacs/dired-sort-menu/Manifest
index c0267bc77976..05ed90b0b3b2 100644
--- a/app-emacs/dired-sort-menu/Manifest
+++ b/app-emacs/dired-sort-menu/Manifest
@@ -1,4 +1,4 @@
-AUX 50dired-sort-menu-gentoo.el 108 BLAKE2B 3c5c9399b4e005090445f758f6735ec2e0336ea823ad3148436455593b7b5db704d4d967267ccc4c019ef87e669e927e4c3ed81055a4f9c382a54842667cf834 SHA512 58400af888ca10b5865b993d1086174d8a79a19c4db6190ee3977b49579411108841dfdf86ae6ed781742bed5b931645a49f1a5ed8a5385f27b809c8a3ea1a43
+AUX 50dired-sort-menu-gentoo.el 95 BLAKE2B 7efb56772033c12d5b863e20e9d8ef44fe3618abac98af210e8174ff7b5e6bf1dde763ec1829d5b288fce8cc4aa00d53d740db9934a2661083ef75ab1042470d SHA512 f2fc7d65a1e6b4b22e3cd8de13492e910922dcbd54c6c53ae2544e78302a4d7dec92f3495912645a68635e737b97d84996d97cb6614bda9f34375b4fb8464c8b
 DIST dired-sort-menu-1.26.tar.gz 9770 BLAKE2B c594e8577ab78ca376056ff1f6afc23f61a5a6ce8b0ed914d71a91bdb9bfbb77e4cedf1e8db81bb9afc56e346305f587bdc83e8c6c3427377a3370bdf92f27a6 SHA512 aab746704636c01b7319574274786ce4bdb36e94b738a8cf2fdfd22aaddf8a68d9ac274a0f6c34caaed505f8ccfe8ad932a64f560d2e312ac161af528d63a577
-EBUILD dired-sort-menu-1.26.ebuild 353 BLAKE2B e5b16a03a5f248a55892c35ef8686e175f13128eff0b1ed0d3d616f938635d02f147d5147aa5265a9d7421695a674d1d6a649960dc0efff71d1c947082809f05 SHA512 949fcb32fb094d15a27a8d541f6ec054cf50443d43e3f6faded52867e5f76accfc4158afd99c722893e16144e3bb0e74330880b86afd35197daaca98c965a209
+EBUILD dired-sort-menu-1.26-r1.ebuild 353 BLAKE2B e5b16a03a5f248a55892c35ef8686e175f13128eff0b1ed0d3d616f938635d02f147d5147aa5265a9d7421695a674d1d6a649960dc0efff71d1c947082809f05 SHA512 949fcb32fb094d15a27a8d541f6ec054cf50443d43e3f6faded52867e5f76accfc4158afd99c722893e16144e3bb0e74330880b86afd35197daaca98c965a209
 MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
diff --git a/app-emacs/dired-sort-menu/dired-sort-menu-1.26.ebuild b/app-emacs/dired-sort-menu/dired-sort-menu-1.26-r1.ebuild
index ab34969fcc1b..ab34969fcc1b 100644
--- a/app-emacs/dired-sort-menu/dired-sort-menu-1.26.ebuild
+++ b/app-emacs/dired-sort-menu/dired-sort-menu-1.26-r1.ebuild
diff --git a/app-emacs/dired-sort-menu/files/50dired-sort-menu-gentoo.el b/app-emacs/dired-sort-menu/files/50dired-sort-menu-gentoo.el
index 07e02ebcbd1b..ea0f9fb68b01 100644
--- a/app-emacs/dired-sort-menu/files/50dired-sort-menu-gentoo.el
+++ b/app-emacs/dired-sort-menu/files/50dired-sort-menu-gentoo.el
@@ -1,3 +1,2 @@
 (add-to-list 'load-path "@SITELISP@")
-(add-hook 'dired-load-hook
-	  (lambda () (require 'dired-sort-menu)))
+(with-eval-after-load 'dired (require 'dired-sort-menu))
diff --git a/app-emacs/fedi/Manifest b/app-emacs/fedi/Manifest
index 885557f91cb1..63fc439f6320 100644
--- a/app-emacs/fedi/Manifest
+++ b/app-emacs/fedi/Manifest
@@ -1,3 +1,3 @@
 DIST fedi-0.2.tar.gz 23341 BLAKE2B 588fefb92404d9c654c9c6a62a4404ec6ba624bbb16e64532a863d460feb7cea3aeb924f86f04d543dcb842dff7c54858628cda2170d228be5fb7590f55c77ee SHA512 e6f9a27ef9beb45df7e3fbb8dba54965135e378c37fbcdaea95e6ce8c46cb0f7b5219220c245d5cf40636e8219932a5b6bd86251ee655674d8e453d249376218
-EBUILD fedi-0.2.ebuild 757 BLAKE2B 506c7241f159ccec85c2ff4b7297e536c32db9c3223897a0e1f9c82eb2eab94062ea885087ad3b9a122e7fb0f4f863234a77e62933c0454fa30fb5fcf7ff6b79 SHA512 a39527f6ae4d4d97cb0eb8fdfbedecb61a906e120fc0b08e9c34e721bb321f25d2815546a7379ceb826a9c39e886d08bd68dd2e59fe8c080c2993fa1d01e0d2b
+EBUILD fedi-0.2.ebuild 723 BLAKE2B 5d5294785a9b7f212c3bf9695aa8f1f0ffaa39ed029f8203bb3bb959f2630b2f319a81a3c25ea395a5f2604013e968c4dcdf5b18b3b247c7d05af990646449ac SHA512 2844d6ba534836604fb42b063d234c94ff1376b9ddc886183620eccadc1b6b967782d08d42f1a6d4f0faa808d326e46c8a3a6e0092b6c5ec6ef42e71fb474fed
 MISC metadata.xml 500 BLAKE2B 21914526169004f4946ddf3a30103ccff339ef38afb15e6f5b1a2ce4cb38b8f8d6c6bdff1597e0a214f7d20f55e9ae560dbeb253a7921291b2306a8d193708d5 SHA512 3f3a15ee858d0c6eefb2da58a0bf0529c1f611b348ff48b25a003a028785fc88e55c1e5ea91cd13b7a7ae3719b70ba0f4c94540f044a3273b64b2246e312c52f
diff --git a/app-emacs/fedi/fedi-0.2.ebuild b/app-emacs/fedi/fedi-0.2.ebuild
index 2a89507c0b2c..951366b0f50c 100644
--- a/app-emacs/fedi/fedi-0.2.ebuild
+++ b/app-emacs/fedi/fedi-0.2.ebuild
@@ -26,11 +26,8 @@ LICENSE="GPL-3+"
 SLOT="0"
 
 RDEPEND="
+	>=app-editors/emacs-${NEED_EMACS}[json(+)]
 	app-emacs/markdown-mode
-	|| (
-		>=app-editors/emacs-31.0
-		>=app-editors/emacs-${NEED_EMACS}[json]
-	)
 "
 BDEPEND="
 	${RDEPEND}
diff --git a/app-emacs/flycheck-package/Manifest b/app-emacs/flycheck-package/Manifest
index ceaf27fada21..53207fa71e7d 100644
--- a/app-emacs/flycheck-package/Manifest
+++ b/app-emacs/flycheck-package/Manifest
@@ -1,4 +1,4 @@
-AUX 50flycheck-package-gentoo.el 180 BLAKE2B 71f9e4b2b97d60c5755696276cddb3a3a800ae82567040be96f18ecb1757373d3c3748895c6098c288c17368b895c03c4bd156703ce5e411a1d1c222908b425b SHA512 0193e889449676410d1d69a3cae8a5f05f0685a57f203f0d8211671e18bb921cd74441a21e686ad95c5954184f6abd83f5f23c904ae4eff3c1d0fbe8ecdab5b0
+AUX 50flycheck-package-gentoo.el 179 BLAKE2B 76b4d01df64569a45666186aff58282f06c346943d0f6ba634b01d01853c39f3ca687ab8eadef2755433521ddb30d663d8c8ef1db2ebe4bdc27862f0b7510d36 SHA512 849255e9d8b28cc88280e7ec51086dad52fae670c078467e96d2fb882dc8cf69ac72776555ed4289b65f8cc46c7e13755df2d806d357c27a65cef1ae1dda03c2
 DIST flycheck-package-0.14.tar.gz 3214 BLAKE2B 8e4eafdd34d4e0e5e00f15ae0684725d4ddff867bc13913012068da95bd3233b8c05e60b7d746b4941c6e4bce02299acfbecf1cae1d4754fd12e61a4fbbc761d SHA512 c1a94ae2c3c460843225f121f4e9c837c8fc86e958987e9a31b95aafc9999c9a7475491f08ed16a5cc95085be5dedee045b08b9ee114688a722b612cef096bfa
 EBUILD flycheck-package-0.14.ebuild 497 BLAKE2B 229cc83029bcec0a4035a2ae16a81cbb30ee25cb04c12730522060b8bad1891d82ce54e673f95a2225722ecd141d399520f198fd96e7da10647d97ed5a259790 SHA512 45a1d2028c4a78bd6df809348c8cf594841241298d0ac1ac66a13810c5e640e2e794ff2017a23a48224401694dca17213a376bbee0eb5f4a39395df1a2a565e4
 MISC metadata.xml 437 BLAKE2B b47bdd888e348e9ca8af3d52f11507e18c663da00787d07903f8b3cbb8153c0d84634b4eeee8661f75ad85b11b45384e4fcdce23c915a35451aef9584deb11f5 SHA512 cbbee6ca976d2f76aace10bd48aa88a0165a80990f5d47387816eed1f1351dc3ef88a445ee9de6b4f2999dca487b9290fff72e4df18d1fe92f590ef7714259e5
diff --git a/app-emacs/flycheck-package/files/50flycheck-package-gentoo.el b/app-emacs/flycheck-package/files/50flycheck-package-gentoo.el
index 834c2c4d32fe..5a0ea1500e24 100644
--- a/app-emacs/flycheck-package/files/50flycheck-package-gentoo.el
+++ b/app-emacs/flycheck-package/files/50flycheck-package-gentoo.el
@@ -1,4 +1,4 @@
 (add-to-list 'load-path "@SITELISP@")
 (autoload 'flycheck-package-setup "flycheck-package"
   "Setup flycheck-package." t nil)
-(eval-after-load 'flycheck '(flycheck-package-setup))
+(eval-after-load 'flycheck #'flycheck-package-setup)
diff --git a/app-emacs/mediawiki/Manifest b/app-emacs/mediawiki/Manifest
index f98c582bd914..6952173ceb71 100644
--- a/app-emacs/mediawiki/Manifest
+++ b/app-emacs/mediawiki/Manifest
@@ -1,4 +1,4 @@
-AUX 50mediawiki-gentoo-2.2.9.el 410 BLAKE2B 805a4fb5639dd443d2a2da196ec95d1c22644ffcba68687d82dd0822c79070f19ce83c2a2979cfa64559d868d847967f8bb6c19e5909c182cc53f9ab47c26ded SHA512 8915b44c0f01f6cdc0c9c2badb84b59ef4ad10e8ec30f3fdf7331ce37386ae3152f7e851cdc6dd4540eecdfdd672232eeae295a208994e177a3485e535dc00db
+AUX 50mediawiki-gentoo-2.2.9.el 409 BLAKE2B a190186a71c7436b21ed79c378de4bb17bc90d6cec4576428900b9e45329fb0c12f4f9e5952983d1cf27fc4445625f9a1deedde0b170598b2526b6e348a87e20 SHA512 17aaf1703377a2cfb132a0797078297b8a5fee5f9ae0ff2dd033a14e30319dcd32772cd46818cd4f770aa3557f26593b4fb2f6afbdd5dd524c663050b3166b8f
 AUX mediawiki-2.2.9-user-agent.patch 1138 BLAKE2B 283c88605aecb7fcfaf9883f4c3926036281a528fee133db1e4a43769ed7e98d0f996b6ec9313a6d62df720bca10586af18b7a9c2bc7a3bfeae301d90050d441 SHA512 0f30bd86e4fac425b98822f1e18bd98b71fa69bafa34d235a8aa380f2588f26958bcace8c09490a9fdf8dd28d289263cb98b3d7f2e67fdafa5e8822d2c76cead
 DIST mediawiki-2.2.9.tar.gz 36595 BLAKE2B a044008115e545d043045e943762072981b5bcc7776e5f38480a2170168929989b990d90b225f3416a8ce9052d3a310bb77ac6ac1d273f112180ff2bddeb850c SHA512 7586558b953c3e2a41b792db55ba9b3520b07377a555c2dd38829c0be24f3388313dfaa049520c632d6fd3a471cb777ba662f723c56cd59c307b68faf9d8adb0
 DIST mediawiki-2.3.1.tar.gz 36613 BLAKE2B d37ff59fd2685445cc30f8faf26f95eafbdae682acee68a8f4061d9d042ff2bd7cfa85fd1999e4ddc31e659605bc244d10b4d2477991015c09840809f936e357 SHA512 d2fe0c76e3d856131a3876a062a333e75d3d2c84c9e88865b1cf9516f8888ad81b4d90d9fc576fe14e051390c1504349c9f3b7cac71a34b8d59ed4824a434efd
diff --git a/app-emacs/mediawiki/files/50mediawiki-gentoo-2.2.9.el b/app-emacs/mediawiki/files/50mediawiki-gentoo-2.2.9.el
index cc9c5b714fb3..097086f8756c 100644
--- a/app-emacs/mediawiki/files/50mediawiki-gentoo-2.2.9.el
+++ b/app-emacs/mediawiki/files/50mediawiki-gentoo-2.2.9.el
@@ -3,9 +3,9 @@
   "Open a wiki page specified by NAME from the mediawiki engine" t)
 (autoload 'mediawiki-site "mediawiki"
   "Set up mediawiki.el for a site." t)
-(eval-after-load "mediawiki"
-  '(add-to-list
-    'mediawiki-site-alist
-    '("Gentoo" "https://wiki.gentoo.org/" "" "" nil "Main Page")
-    nil
-    (lambda (a b) (equal (car a) (car b)))))
+(with-eval-after-load 'mediawiki
+  (add-to-list
+   'mediawiki-site-alist
+   '("Gentoo" "https://wiki.gentoo.org/" "" "" nil "Main Page")
+   nil
+   (lambda (a b) (equal (car a) (car b)))))
diff --git a/app-emacs/moccur-edit/Manifest b/app-emacs/moccur-edit/Manifest
index efa3107a98c6..05458e8dc91d 100644
--- a/app-emacs/moccur-edit/Manifest
+++ b/app-emacs/moccur-edit/Manifest
@@ -1,4 +1,4 @@
-AUX 60moccur-edit-gentoo.el 97 BLAKE2B e84ce2acdd1a2b4a6551bab2e0059d22591c972825ce4d93e0f8a1c0849ef94c222cae82a183c741ca67fc2c5bebc0a50bc5a561d877ec5e14922b36ebe970a7 SHA512 21f05dfd28e00f0eda98bd2668d9fe4416db39ebc50e5708ba5097fc0ff66358d17342b4b30a50a6effd86097ed79f778ec84b078de2bd106f4e0de26004d801
+AUX 60moccur-edit-gentoo.el 98 BLAKE2B 4cbed23f9ca1e4fe21d570588be1b4489371c5ff2e727eccb4b6fbf62f43af15debca9cbb0ae206cfc5f789dc83846fd5fc84a6b8877b1e64c156424e8ab5a2e SHA512 37c6d4b58b73100c2763fbabac42fbc2fcc9445786aafd4d579e619c5fb35efde0a7df6e9614dbbe0f35f73035163f6c0dec94d9835d1300e0741ae30bd6e52c
 DIST moccur-edit-2.16.el.bz2 4325 BLAKE2B a93b09e6a4a844ede92878f70873d56fe7e91142c8702e839b3d44b06f64daf99f73c119453d365586f18c1c69bfe962d5864d79e6c20574f344599204d82825 SHA512 dcb6e2a6336534bf475790c5b80fc86ef8a6ee6d7525a7c45a0050e0f9df3d5d4fdc52151af7ff2ef5c72785affef151c488a12e6b6d723511303bb836d03025
 EBUILD moccur-edit-2.16.ebuild 525 BLAKE2B f7e367426304fe85cc2638259373fdd70013a1ede11473ba7fbc62987cb276b27c6fcf5f4818de67531c3a7f5501d2e9a4cd50da097c69b509beecfb0deac839 SHA512 071d659db1c17222d25490b5781893c82aced1759743ff11545c9762ef6c807819de19d9188420c9c91e118f840a54a43899c34a7e3f28936e022c3e9e115ae0
 MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
diff --git a/app-emacs/moccur-edit/files/60moccur-edit-gentoo.el b/app-emacs/moccur-edit/files/60moccur-edit-gentoo.el
index 7f1bc222e638..896fa0504ee8 100644
--- a/app-emacs/moccur-edit/files/60moccur-edit-gentoo.el
+++ b/app-emacs/moccur-edit/files/60moccur-edit-gentoo.el
@@ -1,3 +1,2 @@
 (add-to-list 'load-path "@SITELISP@")
-(eval-after-load "color-moccur"
-  '(require 'moccur-edit))
+(with-eval-after-load 'color-moccur (require 'moccur-edit))
diff --git a/app-emacs/nxml-docbook5-schemas/Manifest b/app-emacs/nxml-docbook5-schemas/Manifest
index 06791098fbb8..c99a0ae72548 100644
--- a/app-emacs/nxml-docbook5-schemas/Manifest
+++ b/app-emacs/nxml-docbook5-schemas/Manifest
@@ -1,4 +1,4 @@
-AUX 60nxml-docbook5-schemas-gentoo.el 206 BLAKE2B ae9d1fe1da9c86d14796c09597ca34b10dd0e28abb02fdeac4607b8d950bfdf636f5f3c1de49cd5b9cf1fa808513522ab43272f3c26361b871ad0d630a942ed6 SHA512 5592edb5663066fcccaf5b05c3df671b4069d4d259376a8a91ef3f7ae5990687b15dfdf40e6f7aa6cc7d62b7cdaa5090fd851de0ed2718d20ecfe3e3a78530ea
+AUX 60nxml-docbook5-schemas-gentoo.el 222 BLAKE2B 8d4edcb335df7cc4aa193f1587fc048290772d5413f972f88f250e36c4f229788a50a8b6ae6845780db1e9952148a98caeb4c2197a63b47517a0044cbd294e91 SHA512 3b2cbd5d2024e46d0f25bf58b65c29b837b337a5b781628e1064598744d52540a1e261461ee3552fe868a0e7d1a6c2c0d94ac7f5c000ba43c7896577e4a6a790
 AUX schemas.xml 198 BLAKE2B 723ce69dc7b0e63267b0e7b93965ad238b9a919f088aa5dd7611a84c7ebe0a053ae5d8e33ddd6dbf6584f6a9a5406cdf2c727c00907dbd8d5da344405c47bfe2 SHA512 1f41a1e907ae92637845803cdc0c569ad444c9c03a0ba5d9c3f909d42e41353a84f20ca50dbf4f49c0f96836af5c0d5ff0b1f034dbb9b8a45f6083a3ae955ada
 DIST docbookxi-5.1.rnc 361312 BLAKE2B 374c622718b0c9969561a76874fe878570af4fd2a1288f79c8b51c1474ac75e7e98cddd2be7bedadf8271aefccd770cf70ac4499d45187b327c0a50e402b1a48 SHA512 28191653224a301a3ce7541ca1fcc5d526b76fcce00533adbdc16507ddaa768efedebe31b0fade6b8ea7b28d3d33e9656363dfc667eab227280bf6061673a31c
 EBUILD nxml-docbook5-schemas-5.1.ebuild 630 BLAKE2B a78cad9375dc90fd0b8d404a6f72831c65d73a2c528d97763a2ca7c769e48f940dc5dbfa263427f6a9049dc49f22a3e87389272942acd55b50a742b34166a413 SHA512 1abe4eda77aa0c594c32270ed609cdd5bd2f3f06f1d32050bdca393df4f34e4d7f943d37fc07a54721165fac85c187e078fd0d3a7da83103dcb2e9bb0844ab2d
diff --git a/app-emacs/nxml-docbook5-schemas/files/60nxml-docbook5-schemas-gentoo.el b/app-emacs/nxml-docbook5-schemas/files/60nxml-docbook5-schemas-gentoo.el
index c574746e6576..ac768184362c 100644
--- a/app-emacs/nxml-docbook5-schemas/files/60nxml-docbook5-schemas-gentoo.el
+++ b/app-emacs/nxml-docbook5-schemas/files/60nxml-docbook5-schemas-gentoo.el
@@ -1,5 +1,5 @@
 ;; This must be executed after rng-schema-locating-files
 ;; is set in rng-loc (which is part of nxml-mode).
-(eval-after-load "rng-loc"
-  '(add-to-list 'rng-schema-locating-files
-		"@SITEETC@/schemas.xml"))
+(with-eval-after-load 'rng-loc
+  (add-to-list 'rng-schema-locating-files
+               "@SITEETC@/schemas.xml"))
diff --git a/app-emacs/nxml-gentoo-schemas/Manifest b/app-emacs/nxml-gentoo-schemas/Manifest
index bcde92e0bec2..0d4cee756418 100644
--- a/app-emacs/nxml-gentoo-schemas/Manifest
+++ b/app-emacs/nxml-gentoo-schemas/Manifest
@@ -1,4 +1,6 @@
-AUX 60nxml-gentoo-schemas-gentoo.el 206 BLAKE2B ae9d1fe1da9c86d14796c09597ca34b10dd0e28abb02fdeac4607b8d950bfdf636f5f3c1de49cd5b9cf1fa808513522ab43272f3c26361b871ad0d630a942ed6 SHA512 5592edb5663066fcccaf5b05c3df671b4069d4d259376a8a91ef3f7ae5990687b15dfdf40e6f7aa6cc7d62b7cdaa5090fd851de0ed2718d20ecfe3e3a78530ea
+AUX 60nxml-gentoo-schemas-gentoo.el 222 BLAKE2B 8d4edcb335df7cc4aa193f1587fc048290772d5413f972f88f250e36c4f229788a50a8b6ae6845780db1e9952148a98caeb4c2197a63b47517a0044cbd294e91 SHA512 3b2cbd5d2024e46d0f25bf58b65c29b837b337a5b781628e1064598744d52540a1e261461ee3552fe868a0e7d1a6c2c0d94ac7f5c000ba43c7896577e4a6a790
 DIST nxml-gentoo-schemas-20241031.tar.xz 8996 BLAKE2B 9ea6eae66a8d4f23f50307b43824b0276719cadc4484f216b5859f70571d7b7912b4d7443cc6bc97fcd8525906901caadff54a9704c2f8571a5f991907ff185a SHA512 5419e207c37d5759ab8be2dc0f5b607410d9f6a244bc44759319af3678f199ba159a158a62813138bf82bc2098583f949f706c45fc48a6c4de7767bbb0da70a2
+DIST nxml-gentoo-schemas-20241116.tar.xz 8816 BLAKE2B f334655d695d0555311c89357ec798b9f803da2cef3483f5e305deb5890097c990ebe4cc87c1dd9f4ffc56b2c739ac70702a43f19f61b6cc5c6d50f5ccc41321 SHA512 d47210e980279f615646a3ffd970784578d7b0428eb312b11390b6a094242dcfb4b5e4ba1a3e89812394d309575490912c2b9020d70d12e97df26fe8d886f4ab
 EBUILD nxml-gentoo-schemas-20241031.ebuild 606 BLAKE2B 16c6a73775f19431296790421390886fd723afa64a36d9c72c1b03153d50a68b0085a6c0bfd4965cd9f233896f5a24938a5b2f6f503878457cba3c5f5dd08b26 SHA512 ec1a316f9ae5e80d04a5451c335becc07032bb772d06f905fdabb374d0dfa2a6c651fe8f0c7018cd9a5ec1341a0a928d37276004fd79eab156231c8c04cee828
+EBUILD nxml-gentoo-schemas-20241116.ebuild 613 BLAKE2B ff42198215d8cef26563e7e64300cdafbc35c9d05a790b1e2c4024ee3756e6e1d14683070c0e53972c44291e5573d206ff1c99ba5cd2e43bb377596cbbbab85f SHA512 a560ff748dea49d961c8e17e4095262f4a63fb95acff9be274cfc70b0b27ed7b06100dbd48c0b09ca650343c315b4e5af4b64424df226253ea31c2bbf65e4817
 MISC metadata.xml 370 BLAKE2B 2af6298a56b5da7f2c32b4bed09ae442df3068aecaddf3be04c6d6d4abed1f23430d14a54bb33b13580cfeca7177e2da00c8eab62d17a84427ad1201e105572b SHA512 abaa11228666364188cd1b23903b43b5b49456050287ba12be8a6bd31a1f063c65b3efe50de478614f8f70f953ae22b238989724be5179df71a2ce820d356904
diff --git a/app-emacs/nxml-gentoo-schemas/files/60nxml-gentoo-schemas-gentoo.el b/app-emacs/nxml-gentoo-schemas/files/60nxml-gentoo-schemas-gentoo.el
index c574746e6576..ac768184362c 100644
--- a/app-emacs/nxml-gentoo-schemas/files/60nxml-gentoo-schemas-gentoo.el
+++ b/app-emacs/nxml-gentoo-schemas/files/60nxml-gentoo-schemas-gentoo.el
@@ -1,5 +1,5 @@
 ;; This must be executed after rng-schema-locating-files
 ;; is set in rng-loc (which is part of nxml-mode).
-(eval-after-load "rng-loc"
-  '(add-to-list 'rng-schema-locating-files
-		"@SITEETC@/schemas.xml"))
+(with-eval-after-load 'rng-loc
+  (add-to-list 'rng-schema-locating-files
+               "@SITEETC@/schemas.xml"))
diff --git a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20241116.ebuild b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20241116.ebuild
new file mode 100644
index 000000000000..6db7d1937e89
--- /dev/null
+++ b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20241116.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Extension for nxml-mode with Gentoo-specific schemas"
+HOMEPAGE="https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="MIT GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+SITEFILE="60${PN}-gentoo.el"
+
+src_compile() { :; }
+
+src_install() {
+	insinto "${SITEETC}/${PN}"
+	doins schemas.xml *.rnc
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
diff --git a/app-emacs/nxml-libvirt-schemas/Manifest b/app-emacs/nxml-libvirt-schemas/Manifest
index 33f97bea765a..2193961d526b 100644
--- a/app-emacs/nxml-libvirt-schemas/Manifest
+++ b/app-emacs/nxml-libvirt-schemas/Manifest
@@ -1,4 +1,4 @@
-AUX 60nxml-libvirt-schemas-gentoo.el 206 BLAKE2B ae9d1fe1da9c86d14796c09597ca34b10dd0e28abb02fdeac4607b8d950bfdf636f5f3c1de49cd5b9cf1fa808513522ab43272f3c26361b871ad0d630a942ed6 SHA512 5592edb5663066fcccaf5b05c3df671b4069d4d259376a8a91ef3f7ae5990687b15dfdf40e6f7aa6cc7d62b7cdaa5090fd851de0ed2718d20ecfe3e3a78530ea
+AUX 60nxml-libvirt-schemas-gentoo.el 222 BLAKE2B 8d4edcb335df7cc4aa193f1587fc048290772d5413f972f88f250e36c4f229788a50a8b6ae6845780db1e9952148a98caeb4c2197a63b47517a0044cbd294e91 SHA512 3b2cbd5d2024e46d0f25bf58b65c29b837b337a5b781628e1064598744d52540a1e261461ee3552fe868a0e7d1a6c2c0d94ac7f5c000ba43c7896577e4a6a790
 AUX schemas.xml 560 BLAKE2B 32f01d2dd047aa7109112b47155a21825686385845fae2af0f6d052dbd36f3e1ca5027ec39d654735e390ef9aa8a31f7ae5c86b15b0cd9c4ef84128326e87ee9 SHA512 82ef6189610fc4e1a0d5546ae15f2f315e7c0d460fa141201c43a93e59d147613c7186302fdc3e6b2f0ec5c343e5566966892d4e9f55dc4957e4ad58793fc3ff
 DIST libvirt-10.0.0.tar.xz 9395076 BLAKE2B bfbea7805a949999481293a31e52a5511bcf86db2c96486cbc3b9cb776719ec973b1208cfcb4a8ae2c9220d1d68053980eaf68893f7919c3ef354efbd1abf642 SHA512 4ab28539ff0e9a78ac231b11b4ec88b91d76ff2607cabd0226f04aaece73b05cab4aa9cfcf05073cd257ea270a377cd5d2cb915971583dbec04dadf2cf7ad252
 DIST libvirt-10.1.0.tar.xz 9444244 BLAKE2B bfdce9d067e3a319b81d867d27f1a6b4e724ab6aaa25d19d7383c9be26ad7dc92b3c0aaa92894b772f09e20c3c2eb0ea0a8707feee4c63be58578fa22854305f SHA512 08e73ae15de5681430b62db85ec9901242dca5e9a4ca9685614f4a67092c6e28f27f9187144b3ceb18ad6b40e6eb1a90b1a4b056b0888724d04a62002ee2bc48
diff --git a/app-emacs/nxml-libvirt-schemas/files/60nxml-libvirt-schemas-gentoo.el b/app-emacs/nxml-libvirt-schemas/files/60nxml-libvirt-schemas-gentoo.el
index c574746e6576..ac768184362c 100644
--- a/app-emacs/nxml-libvirt-schemas/files/60nxml-libvirt-schemas-gentoo.el
+++ b/app-emacs/nxml-libvirt-schemas/files/60nxml-libvirt-schemas-gentoo.el
@@ -1,5 +1,5 @@
 ;; This must be executed after rng-schema-locating-files
 ;; is set in rng-loc (which is part of nxml-mode).
-(eval-after-load "rng-loc"
-  '(add-to-list 'rng-schema-locating-files
-		"@SITEETC@/schemas.xml"))
+(with-eval-after-load 'rng-loc
+  (add-to-list 'rng-schema-locating-files
+               "@SITEETC@/schemas.xml"))
diff --git a/app-emacs/nxml-svg-schemas/Manifest b/app-emacs/nxml-svg-schemas/Manifest
index b18f980436cc..153f922afbba 100644
--- a/app-emacs/nxml-svg-schemas/Manifest
+++ b/app-emacs/nxml-svg-schemas/Manifest
@@ -1,4 +1,4 @@
-AUX 60nxml-svg-schemas-gentoo.el 206 BLAKE2B ae9d1fe1da9c86d14796c09597ca34b10dd0e28abb02fdeac4607b8d950bfdf636f5f3c1de49cd5b9cf1fa808513522ab43272f3c26361b871ad0d630a942ed6 SHA512 5592edb5663066fcccaf5b05c3df671b4069d4d259376a8a91ef3f7ae5990687b15dfdf40e6f7aa6cc7d62b7cdaa5090fd851de0ed2718d20ecfe3e3a78530ea
+AUX 60nxml-svg-schemas-gentoo.el 222 BLAKE2B 8d4edcb335df7cc4aa193f1587fc048290772d5413f972f88f250e36c4f229788a50a8b6ae6845780db1e9952148a98caeb4c2197a63b47517a0044cbd294e91 SHA512 3b2cbd5d2024e46d0f25bf58b65c29b837b337a5b781628e1064598744d52540a1e261461ee3552fe868a0e7d1a6c2c0d94ac7f5c000ba43c7896577e4a6a790
 AUX Makefile-trang 108 BLAKE2B 4f80e5f4e0550bd4732668ae5298d890d2293d34379902cf204c43bbea5db01626847af7ab96854efcbcc34e7fe9b1c32873ad22ef13873a1a06790e9580371d SHA512 3544959cc57ce1b273e4b9de95f51e1e21d23cc35fb48e02f179a055a61ee9092efdc43405f72c3aacb3c74eada7fabf5952eb49e3ff0514fd69a3092268dc4f
 AUX schemas.xml 495 BLAKE2B ecb678b98a23e0631da09f9befa73b2b41c5204f78423f9957eaabd6963c5e8b63114c0f908039618744e4aa4643603b58a9ded5fdbf157e0cc60b1810afce84 SHA512 d6a9f0b9db51e05b4f3d0395c8d43a0577d23fdb6c0e9d0123682f00d4ccac5897dfdbd157560b3bb9f06a8a768298489e8b8a2843d7e7a65ffb4a5e20c1b316
 DIST w3c-svg-rng-1.1.20081123.zip 48420 BLAKE2B a89da9708ea79085ad5aef1f85769683af2a5c8ab84a5a4f53b9c2fdeebf422a96065309d69eb4ac9bd069bcd3685ee849c7cdb4b9b9e7829ff58fb0b7b8b754 SHA512 69e44a7c04a3af77d0fed8f19372cfcad7998e262a44b520145fe2c0ad03bf20daf57e1e97f71ff27f0e06bd3f07d1ec0b0976fdd893d77df2f82709f7c1ce1f
diff --git a/app-emacs/nxml-svg-schemas/files/60nxml-svg-schemas-gentoo.el b/app-emacs/nxml-svg-schemas/files/60nxml-svg-schemas-gentoo.el
index c574746e6576..ac768184362c 100644
--- a/app-emacs/nxml-svg-schemas/files/60nxml-svg-schemas-gentoo.el
+++ b/app-emacs/nxml-svg-schemas/files/60nxml-svg-schemas-gentoo.el
@@ -1,5 +1,5 @@
 ;; This must be executed after rng-schema-locating-files
 ;; is set in rng-loc (which is part of nxml-mode).
-(eval-after-load "rng-loc"
-  '(add-to-list 'rng-schema-locating-files
-		"@SITEETC@/schemas.xml"))
+(with-eval-after-load 'rng-loc
+  (add-to-list 'rng-schema-locating-files
+               "@SITEETC@/schemas.xml"))
diff --git a/app-emacs/ocaml-mode/Manifest b/app-emacs/ocaml-mode/Manifest
index e4dae2d87939..dfcaddaa2b91 100644
--- a/app-emacs/ocaml-mode/Manifest
+++ b/app-emacs/ocaml-mode/Manifest
@@ -1,4 +1,4 @@
-AUX 50ocaml-mode-gentoo-3.12.1.el 499 BLAKE2B 30d49a4e43fbf4fac02f4a2dd8a9fe7c3aeea623836330e3ed0f8921cc96a02d087f35a32a93f6e404392a1f915539799d1a5c8168b06cb1d8ab76ea0ac6b8fa SHA512 0be69a30c07caeff818e4d6fb0147e18855e88a3bb6a6e876b170edddb32382c0bd19ca960836d8442eecd00e78be09cba7de08030420645c2ef1ba5d9198524
+AUX 50ocaml-mode-gentoo-3.12.1.el 502 BLAKE2B b9675cb0d3d81a3477f8b7a96971821f5d7718c43518e3c4145ffdeb324231fad735fe26cee1baed685835c9ce4107055a99bedd7d5b13d171a7bbca00d61060 SHA512 43482d9b7d00d02e2730ccd0c5b5b4e00784ca3cc4fd103534148290a969d01a20faef1882781031bb23a4ad571f38dcf19a053a7924a35cdd82d77c9495b3c0
 DIST ocaml-4.05.0.tar.gz 4431750 BLAKE2B c2ab003a13e0a581ebd0e1c96eeb8a9baea9bfe6bee08823b0e4541819201ec109f1846e13fc1aefa51a001eefbb8f73320ba854d41975fc68cef41bc75b1ecc SHA512 9a060ae4b741e1687277403e5bdb8f6eda2e2ebf6c45f7c0149b66ea1213cb26d13febfbb3f11c12543e244cfdd053b786b09c4145e2348e5d89a7206f7de225
 EBUILD ocaml-mode-4.05.0.ebuild 505 BLAKE2B 209897c677e44f47a5f1ad4b44e331e69b95dc1141c00f80857b33e948323517e7d0f98e429822679e181268f366b93f69d1a2fbc6c0a2da259a025ce69c4a8e SHA512 435f936594a3b6bc02f70c676bcd9684fc4c2c927f36ccfd71674477777d1f6d759aaab9a8a7d1d3bc3fc8ccac157b77c88051d4c45885ddae0fb04b51e5c2ea
 MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
diff --git a/app-emacs/ocaml-mode/files/50ocaml-mode-gentoo-3.12.1.el b/app-emacs/ocaml-mode/files/50ocaml-mode-gentoo-3.12.1.el
index bea123308024..ef41d7f6d4d7 100644
--- a/app-emacs/ocaml-mode/files/50ocaml-mode-gentoo-3.12.1.el
+++ b/app-emacs/ocaml-mode/files/50ocaml-mode-gentoo-3.12.1.el
@@ -6,5 +6,5 @@
   "Run camldebug on program FILE in buffer *camldebug-FILE*." t)
 (autoload 'inferior-caml-set-font-lock "caml-font")
 
-(eval-after-load "caml" '(require 'caml-font))
+(with-eval-after-load 'caml (require 'caml-font))
 (add-hook 'inferior-caml-mode-hooks 'inferior-caml-set-font-lock)
diff --git a/app-emacs/paredit/Manifest b/app-emacs/paredit/Manifest
index a0536d04f16e..75db1a17384b 100644
--- a/app-emacs/paredit/Manifest
+++ b/app-emacs/paredit/Manifest
@@ -1,4 +1,4 @@
-AUX 50paredit-gentoo.el 503 BLAKE2B f08ba9965af5d555de5539b017eb230c9e5eb296f0ea9f98fb2f46a4a7c665e5757cc7b135df7282118f16e6b96a926e8e8952b926917a7cb5e0266d4d751a93 SHA512 4635fa54babe7df170356f4d74d9419bfbe185301a37110d5a12620b1c6ab4654b66c2062814cacf64e480c5079e3da82354ff78db6e600e4dac68e0ba13451c
+AUX 50paredit-gentoo.el 483 BLAKE2B bde0c34615434ce937fbd384ccb0860637936fa6897b9742cd2006cf1f4c4c46571448e73b072ec73928890a8a742d7831f21336e99a2c1275327e830d8143be SHA512 30dfbfbf63c5102699eeb8ce8f7afc626cf8417f72db860f14f257faee118b7257e5fbc384fad1a52f65af31069ddd9b1fdc266dd138813beae362eac7cbc998
 DIST paredit-26.tar.gz 63322 BLAKE2B 6259b17655d0c1ebaa30fad2e46639f1e84e5aaee18980131d9e2cad9711ab469efc75a3ed264213bf3fbe18cddc9c69c0bb3907a3acfcc896aa2070cf00f44a SHA512 1f0a712d6b99740e559208451a3292e52b110a5f40224fdd30e390c4eb63f3b01790d8cc0a3fb0f0681a7739ca26763df6afbb4c2e00b6560dccb29950f70a70
-EBUILD paredit-26.ebuild 790 BLAKE2B ba26cbb9098604c5b5f53411efa3a4c88cebae99e5e52f21e8d5daabbc575ca90582491c550c77da11360322099b6566d31d8b3334999e8bd38cad0ce9cc6211 SHA512 bfc6723749605c4c71596d1cb4093032be8001a3af9088340df8b9bbf9ced809cce2ca028a0326f77cae29b35c343280913bdc744b5f34cf9dd75f0a010882f1
+EBUILD paredit-26-r1.ebuild 790 BLAKE2B ba26cbb9098604c5b5f53411efa3a4c88cebae99e5e52f21e8d5daabbc575ca90582491c550c77da11360322099b6566d31d8b3334999e8bd38cad0ce9cc6211 SHA512 bfc6723749605c4c71596d1cb4093032be8001a3af9088340df8b9bbf9ced809cce2ca028a0326f77cae29b35c343280913bdc744b5f34cf9dd75f0a010882f1
 MISC metadata.xml 383 BLAKE2B ba6b85b4481d8225fbcccd0f852de340e42556209c64d7432e1c3c6c4aa05ff0708caafe79123a21c5203d62b2acca9cb520394b5c6b73d7bcc31236cf04e9a9 SHA512 7ca29cb9b16f27ee506de3e9709e846db0cb8d4ebac5c6df4a15efb83b96b067fb5f2bd3735c3ab7d60856098648d138b23921b2a43e349713cb72e8aab649a9
diff --git a/app-emacs/paredit/files/50paredit-gentoo.el b/app-emacs/paredit/files/50paredit-gentoo.el
index a23e03ae81fa..ca73ebfd48a4 100644
--- a/app-emacs/paredit/files/50paredit-gentoo.el
+++ b/app-emacs/paredit/files/50paredit-gentoo.el
@@ -1,10 +1,10 @@
 (add-to-list 'load-path "@SITELISP@")
 (autoload 'paredit-mode "paredit"
   "Minor mode for pseudo-structurally editing Lisp code." t)
-(let ((turn-on-paredit-mode (lambda () (paredit-mode 1))))
-  ;; some hooks: lisp-mode-hook and scheme-mode-hook are recommended
-  ;; in the paredit source code
-  (add-hook 'lisp-mode-hook turn-on-paredit-mode)
-  (add-hook 'scheme-mode-hook turn-on-paredit-mode)
-  (add-hook 'emacs-lisp-mode-hook turn-on-paredit-mode)
-  (add-hook 'slime-mode-hook turn-on-paredit-mode))
+(autoload 'enable-paredit-mode "paredit" nil t)
+;; some hooks: lisp-mode-hook and scheme-mode-hook are recommended
+;; in the paredit source code
+(add-hook 'lisp-mode-hook #'enable-paredit-mode)
+(add-hook 'scheme-mode-hook #'enable-paredit-mode)
+(add-hook 'emacs-lisp-mode-hook #'enable-paredit-mode)
+(add-hook 'slime-mode-hook #'enable-paredit-mode)
diff --git a/app-emacs/paredit/paredit-26.ebuild b/app-emacs/paredit/paredit-26-r1.ebuild
index 130788d7d6b8..130788d7d6b8 100644
--- a/app-emacs/paredit/paredit-26.ebuild
+++ b/app-emacs/paredit/paredit-26-r1.ebuild
diff --git a/app-emacs/tp/Manifest b/app-emacs/tp/Manifest
index 7eaef63421ee..f0bb7304ce2a 100644
--- a/app-emacs/tp/Manifest
+++ b/app-emacs/tp/Manifest
@@ -1,5 +1,5 @@
 DIST tp-0.4.tar.gz 18150 BLAKE2B 78190c82ddd48d739bafecf15efdeba6ed9e6cebac66a08cf131ebb93b5ea8a8e6f3cbaf52a52092e305b0854e9932b98086204e04d0df17d4d550bda0d588be SHA512 b42a905b7892a2e7a0d18a902894e3f400f47983537a82f6f7336bad631763eed7bcff428f5ad0f52b0c0518e2ad2f817a9e954c93a50a1af203465ad5a509df
 DIST tp-0.6.tar.gz 18633 BLAKE2B dd28dbf1fe826e5be396dd1af9241fa865d9a5bd4f9210129d1145a5e84951ff77065bb0878e64c957b1609ef83a001b3972260e0193ec56c8c678e91d81b8e7 SHA512 69a608f3beafefab661ab844b78d7d37fbacf36b6705ff2b8d6a9f9eaccc5c78c907af112a1246d5f59f0792281949e13e4516e765f145512943297120e3ce8d
-EBUILD tp-0.4.ebuild 752 BLAKE2B 1af0e0358ee6562cd7c3671bc5784a80d63b0d8b55e9283466bacf888b4c075fc17ba27c003efb49c48751df5eaec4f5cc42949884e52a779d5c9dcc07614fdd SHA512 a85fdc97335edaed85b7621e960fb4817a415dc6b77ffa09015791ed9744d96387996ad9a85981627da78fe891de1ededcfd24078abeec9b9a21dc7953dc94cf
-EBUILD tp-0.6.ebuild 752 BLAKE2B 1af0e0358ee6562cd7c3671bc5784a80d63b0d8b55e9283466bacf888b4c075fc17ba27c003efb49c48751df5eaec4f5cc42949884e52a779d5c9dcc07614fdd SHA512 a85fdc97335edaed85b7621e960fb4817a415dc6b77ffa09015791ed9744d96387996ad9a85981627da78fe891de1ededcfd24078abeec9b9a21dc7953dc94cf
+EBUILD tp-0.4.ebuild 718 BLAKE2B 1e5fd54007994c616f97b5cdd80486a7d7bd46e5fed4f5fe95aad96ee0ec2927553b30b2523ea15e4e185614889c17fa0422c9cec7760bc7dfa9238d56cd9f9d SHA512 803e7d9d7d0e33e709054c7053bd190bd4f72203c9885870c5300c8a0f74ba9b6cff2c2f2c640c33a72b32a297e2f99d7e89886f64621341d9a13a069ddfb38b
+EBUILD tp-0.6.ebuild 718 BLAKE2B 1e5fd54007994c616f97b5cdd80486a7d7bd46e5fed4f5fe95aad96ee0ec2927553b30b2523ea15e4e185614889c17fa0422c9cec7760bc7dfa9238d56cd9f9d SHA512 803e7d9d7d0e33e709054c7053bd190bd4f72203c9885870c5300c8a0f74ba9b6cff2c2f2c640c33a72b32a297e2f99d7e89886f64621341d9a13a069ddfb38b
 MISC metadata.xml 494 BLAKE2B 02a73cbe0be2efe8e8c3b6f65ab93d169f9e25ec74d5223e64b0a289528ad6459560534ed249ead058d909803c76d3225a6147361753c9f797276ba29e57bbb1 SHA512 0be2c97bd4c9e427878ab750b37024f1a7f06dda5a3bcbe18da97c5b1bb231c30dfc6381e08b836450aae5da43c2f445cb54dad84ddc451a1448f7f52f1ed7db
diff --git a/app-emacs/tp/tp-0.4.ebuild b/app-emacs/tp/tp-0.4.ebuild
index 1ba163107a3a..d8d0de9b3bf5 100644
--- a/app-emacs/tp/tp-0.4.ebuild
+++ b/app-emacs/tp/tp-0.4.ebuild
@@ -26,11 +26,8 @@ LICENSE="GPL-3+"
 SLOT="0"
 
 RDEPEND="
+	>=app-editors/emacs-${NEED_EMACS}[json(+)]
 	app-emacs/transient
-	|| (
-		>=app-editors/emacs-31.0
-		>=app-editors/emacs-${NEED_EMACS}[json]
-	)
 "
 BDEPEND="
 	${RDEPEND}
diff --git a/app-emacs/tp/tp-0.6.ebuild b/app-emacs/tp/tp-0.6.ebuild
index 1ba163107a3a..d8d0de9b3bf5 100644
--- a/app-emacs/tp/tp-0.6.ebuild
+++ b/app-emacs/tp/tp-0.6.ebuild
@@ -26,11 +26,8 @@ LICENSE="GPL-3+"
 SLOT="0"
 
 RDEPEND="
+	>=app-editors/emacs-${NEED_EMACS}[json(+)]
 	app-emacs/transient
-	|| (
-		>=app-editors/emacs-31.0
-		>=app-editors/emacs-${NEED_EMACS}[json]
-	)
 "
 BDEPEND="
 	${RDEPEND}
diff --git a/app-emacs/yasnippet-snippets/Manifest b/app-emacs/yasnippet-snippets/Manifest
index c0857c4b5172..c995d05f7985 100644
--- a/app-emacs/yasnippet-snippets/Manifest
+++ b/app-emacs/yasnippet-snippets/Manifest
@@ -1,4 +1,4 @@
-AUX 50yasnippet-snippets-gentoo.el 221 BLAKE2B 608ecd2c72d3ff72c7775bfaeb3edbbc4e066a7ed9e1f10720fb93023319e0141e9694c6bbbb697264b62f9f47721f2f0ac186286a38d1859bf3e5529e8ae118 SHA512 a7a89ab8d5e0c66ada64b04b9bc0917df6c20537c80cebea43ee1210635b20e8b34549455c21217fdaa169dc5eafaa9c5c0032605a17716276437e982653428d
+AUX 50yasnippet-snippets-gentoo.el 218 BLAKE2B be5fb52b716ce4b4682c36b901a49d73f632454dc09a79fa2596164db55d871e7a17defa6bd923ab87505ecc941a1e7e9a7d3a3ab54bceb94926bb08216ed629 SHA512 b16e19fd61f22bd39df31eb77117ebbba519a3167db1ece844b4351e29148d7d0e3ac513f9b072dd78dc7b5a03fccf5eba9dde7ced07e8c5c4c02911ddd5811f
 AUX yasnippet-snippets-dir.patch 523 BLAKE2B b9e0712cae1b65b947b04d5349bb25007ee6f7db0cd8dd56ff7db15192932d88f7c9ab1b1fca77fca450152a52ec19f275f568f947879eab68b755731b48a5ad SHA512 f1a2c1c3db8a752a38e32147d2a8ffbae0666de4657b647ee126b96db0e4a499384148e3d316a72dcfdb5083c06c7c9eb0a47f329a24ac68532052acf994f79d
 DIST yasnippet-snippets-1.1.tar.gz 179315 BLAKE2B 23413fa35612a8583d3919ce1597e7519d0f4f28a537d8fc18f09d3bd1213c161f3f5987bcd727b73bddd3a94098059e8ba284b4491b3fec528465c840518565 SHA512 4f2fa91e9749e4035fcf643a3ef319bbadabe9b07630db4615da9ae2df8784b3c1155ebae83764e7ed7b0db957a80c97451de388b129438955d6aacf25753bc2
 EBUILD yasnippet-snippets-1.1.ebuild 1018 BLAKE2B 85753d44651384b7d764c3fc579fa4396a8802c6b00b31c5cc484a65475b5936b16ad4fa6560a19a1ceb7e0cf42de429fd4ce4b8ec9c20fa37d1f733123e5801 SHA512 40836b4432602d813b6c4dbb9652b03b7ed27850b3e2940137bad361a08ea674665c2c26164262572efb1ba883ee6d7b333b5d7b3a86f4fb30b00f53826a7705
diff --git a/app-emacs/yasnippet-snippets/files/50yasnippet-snippets-gentoo.el b/app-emacs/yasnippet-snippets/files/50yasnippet-snippets-gentoo.el
index 4c85ffac5510..ffa03fff66ea 100644
--- a/app-emacs/yasnippet-snippets/files/50yasnippet-snippets-gentoo.el
+++ b/app-emacs/yasnippet-snippets/files/50yasnippet-snippets-gentoo.el
@@ -1,5 +1,4 @@
 (add-to-list 'load-path "@SITELISP@")
 (autoload 'yasnippet-snippets-initialize "yasnippet-snippets"
   "Load the `yasnippet-snippets' snippets directory." t)
-(eval-after-load 'yasnippet
-  '(yasnippet-snippets-initialize))
+(eval-after-load 'yasnippet #'yasnippet-snippets-initialize)