7 files changed, 75 insertions, 6 deletions
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 5592cd0eef2c..e72290e31df4 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/ddskk/Manifest b/app-emacs/ddskk/Manifest
index b7d9141fd135..421c11ce9e12 100644
--- a/app-emacs/ddskk/Manifest
+++ b/app-emacs/ddskk/Manifest
@@ -1,4 +1,4 @@
 AUX 50ddskk-gentoo.el 112 BLAKE2B 090925d25ada70386b13c259fa0ac6eae72f45c7bcb9272b65f8332eddc384d52d473a33296ef0af27e6b55e85ad5eb6cb5a64d53eb15de8b4cb770461ff1472 SHA512 7d7212bb6da992a3bad619d4def98acbe31c4b7226de59c223825e49dbd202d378eb04e386d6087ba5608e4bf1ede8847e2d73d068a6fe147322da7b5329fe09
 DIST ddskk-17.1.tar.gz 952635 BLAKE2B fae34e37f972250d5e48f316fb90418b4b902684431c6ed18f44f3b5155556ceac1b04c8f8542c5651233e36085f864bac41381069dd70e841fdd9eedf7273ed SHA512 e0b924111a6289acd29ee5a5d94ea70730fe8f4e1dd5ed279520263efab0c69a6940e5b1b6182e45ed30c0b1ddca9e44ff75b7b3fdab5c8a3e1b2b9f82cc20fa
-EBUILD ddskk-17.1-r1.ebuild 1594 BLAKE2B 4ddccbe9f5084d7523703eb07c33b7db061591b39669f79d327120d1d3ea371b64d2a0c05a2c79161b28fd0b837e079a5f57cdda38f8aa4d9b39abfd78fdb700 SHA512 b747c07b94d0eb62afab2a4a15eba06cdd0d8a06cb4c0ed75dbd3be91305c71d941752d0ea46cdc2fac0bfa2a7622007cc60325fa6d46bdc03856e1269be418f
+EBUILD ddskk-17.1-r1.ebuild 1594 BLAKE2B 96b9f1355dfa8debe37f27eb654c5942602c57ea00d84644157d84e9133086832a7742cf6dbdd28da1e4a462ec6ef45928e376db12094d45b0b6aac7effa8cf2 SHA512 b45fea3991909acbc5c35b9728aa5718febe13f33463ab71ed570b80160de94b9519cc774d79c2f588f7c6a3298cabc69d2be486ba602ea7e6d8b7fc30a82e6f
 MISC metadata.xml 451 BLAKE2B 14a7b69794890a92e6e81d00adcea5d65e6f688c5148bf139cee0a72c83c8a2827d45f4291415366ec127671d5c145984c176c35c7926b6e7b49222bea208cc7 SHA512 06cee2183783d6632d2db9b2e28a7b32419f2ba409cc0b03fdb00da93698736d349be1a439b3c4c5ba220c64e4b0d41ed590847c3f15df6ff16fa222607e5d29
diff --git a/app-emacs/ddskk/ddskk-17.1-r1.ebuild b/app-emacs/ddskk/ddskk-17.1-r1.ebuild
index 99ad56fb19b2..830e07832491 100644
--- a/app-emacs/ddskk/ddskk-17.1-r1.ebuild
+++ b/app-emacs/ddskk/ddskk-17.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby30 ruby31"
+USE_RUBY="ruby31 ruby32"
 
 inherit elisp ruby-single vcs-snapshot
 
diff --git a/app-emacs/rnc-mode/Manifest b/app-emacs/rnc-mode/Manifest
index 1b83305921ad..ae0ce977285b 100644
--- a/app-emacs/rnc-mode/Manifest
+++ b/app-emacs/rnc-mode/Manifest
@@ -1,4 +1,6 @@
 AUX 50rnc-mode-gentoo.el 127 BLAKE2B 250c927e7042ce2b1fae586c6b0bb0fee43d2ea6ee8d4a8d2ecd265a750c79a6e92e3017072baf27c234e3b06d4c6d056308dc78a55786b454903956a5619422 SHA512 b64dd174e9fc21accf1d9d1abb8302af72b3c0278f3fa7236ed5079c15668df3f148daed952b9c9a77cf71ff1399e15db6e446046fd4e73f7b76c1b5fdca4893
+AUX rnc-mode-1.0.6-flymake.patch 1246 BLAKE2B 19bc83b8c7090fa1d18ed8be3665ac5e63065dd26024e69fa102246333d6555037b7e4c6581a54598864aec8bdde15a2da3cb878ad4782140326f89918c4a86d SHA512 2c98b5e28f841ace4334f33a4c1877bcd20bbd65d5677f9cd12e9b93156949c276546644ad03f2ec8f584320a88d02fc0b3386eeb167e17026e868505edb6d9b
+AUX rnc-mode-1.0.6-font-lock.patch 1393 BLAKE2B 9d59a30ca938b980ea6c4395af0a358978c3cbbc0ddf4eef9f5858c480232bc42b2a0c57e01022e9aba25999c387a89ee820278c14768f33909aa7c89d860834 SHA512 306fe47e5876b93702f320864f1a930edb850544c1b22ab2f7b9a1b117389d66223688def1a97c69a86d372a3526faf9335472704ad9843b96b7835c36b8be20
 DIST rnc-mode-1.0.6.tar.gz 5438 BLAKE2B 7c14f7e7c0db9f85a2bfab5d6fe064529416333d421658ded4284ab4513e037b930e89cc0ad74a00371374b4a7a0ceec3a81a121ac5688a18af17ed611b367aa SHA512 18dcf594bb12f8152578be85a36047d55bf407fb8ed086c03d7a7a69028f6616f651a5485e69aa1df30df6fda6fb742de05c8b54bd1b3c5c4e65021a83d63e30
-EBUILD rnc-mode-1.0.6.ebuild 472 BLAKE2B f36dc7bb0ca593ad0974757092e6a5784c33293beaa32a6f346319e5fb07913b910d4a2d700f49263804fd0e188fc939cf9cdc59a6859902b0d98c7b67f7c9ab SHA512 d343f7be47b34f8afe7572736f8b1e7dac75d8786953468295a9338d62fc135f004e82cb1dcaf2a8abdaf5b367f4ead93d51ab7c9dd3fd4ec55ebfab01ea3eef
+EBUILD rnc-mode-1.0.6-r1.ebuild 554 BLAKE2B e8694ff6e866f1a5c8ba3a95dfc04f234f9d93104a00bb9410ca3f3ec32176a1204cfd93afbcf5869e126b9ff4cc8ac90839319d5069d1241796d4181e06e387 SHA512 d898f30406ce8d276413a56e7b5008f0f77ef151b25cb7479f971b700451c256a06c87b652d6f2d6766dfdd12cf2509757fd3954dd6a4eec96b7a33129240ea8
 MISC metadata.xml 362 BLAKE2B d8584a92e600058e6e54a3a928c756afcd08cd95338b76bc131cb2f764f25d32d6f4b779140aa0fb19970d6f56cdedcaade5b94f7967bcff835c2aaa08a71db2 SHA512 aff2146e8adda4a06b2423742c00659482221d9a59a97fecd187b9e3eb1765a1d3eb31d26018b6b3786b4074ecf211b03091045a16fb555382994b95cba70138
diff --git a/app-emacs/rnc-mode/files/rnc-mode-1.0.6-flymake.patch b/app-emacs/rnc-mode/files/rnc-mode-1.0.6-flymake.patch
new file mode 100644
index 000000000000..6904a063c682
--- /dev/null
+++ b/app-emacs/rnc-mode/files/rnc-mode-1.0.6-flymake.patch
@@ -0,0 +1,30 @@
+Update function and variable names that are obsolete since Emacs 26
+
+--- rnc-mode-1.0.6/rnc-mode.el
++++ rnc-mode-1.0.6/rnc-mode.el
+@@ -113,8 +113,8 @@
+ 
+ (defun rnc-flymake-init ()
+   "Flymake init function for running Jing on the schema."
+-  (let* ((temp-file (flymake-init-create-temp-buffer-copy
+-                     'flymake-create-temp-inplace))
++  (let* ((temp-file (flymake-proc-init-create-temp-buffer-copy
++                     'flymake-proc-create-temp-inplace))
+          (local-file (file-relative-name
+                       temp-file
+                       (file-name-directory buffer-file-name))))
+@@ -123,11 +123,11 @@
+ (defun rnc-configure-flymake ()
+   (if (and (stringp rnc-jing-jar-file)
+            (file-exists-p rnc-jing-jar-file))
+-      (add-to-list 'flymake-allowed-file-name-masks
++      (add-to-list 'flymake-proc-allowed-file-name-masks
+                    '(".+\\.rnc$"
+                      rnc-flymake-init
+-                     flymake-simple-cleanup
+-                     flymake-get-real-file-name))
++                     flymake-proc-simple-cleanup
++                     flymake-proc-get-real-file-name))
+     (message "RNC flymake not enabled because the Jing jar could not be found")))
+ 
+ ;;; Imenu support
diff --git a/app-emacs/rnc-mode/files/rnc-mode-1.0.6-font-lock.patch b/app-emacs/rnc-mode/files/rnc-mode-1.0.6-font-lock.patch
new file mode 100644
index 000000000000..5f615468ed11
--- /dev/null
+++ b/app-emacs/rnc-mode/files/rnc-mode-1.0.6-font-lock.patch
@@ -0,0 +1,33 @@
+Remove indirection for face names
+
+--- rnc-mode-1.0.6/rnc-mode.el
++++ rnc-mode-1.0.6/rnc-mode.el
+@@ -156,24 +156,17 @@
+              (concat (substring result 0 -2) "\\)"))
+       (setq result (concat result op "\\|")))))
+ 
+-;; Font lock treats face names differently in GNU Emacs and XEmacs
+-;; The following defvars is a workaround
+-
+-(defvar italic 'italic)
+-(defvar default 'default)
+-(defvar font-lock-preprocessor-face 'font-lock-preprocessor-face)
+-
+ (defvar rnc-font-lock-keywords
+   (list
+    '("\\b\\(attribute\\|element\\)\\b\\([^{]+\\){" 2 
+      font-lock-variable-name-face)
+-   '("[a-zA-Z][-a-zA-Z0-9._]*:[a-zA-Z][-a-zA-Z0-9._]*" . italic)
++   '("[a-zA-Z][-a-zA-Z0-9._]*:[a-zA-Z][-a-zA-Z0-9._]*" . 'italic)
+    '("\\b\\(default\\(\\s +namespace\\)?\\|namespace\\|datatypes\\)\\(\\s +[a-zA-Z][-a-zA-Z0-9._]*\\)?\\s *=" 1 font-lock-preprocessor-face)
+    '("\\([a-zA-Z][-a-zA-Z0-9._]*\\)\\(\\s \\|\n\\)*[|&]?=" 1 
+      font-lock-function-name-face)
+-   '("[a-zA-Z][a-zA-Z0-9._]*\\(-[a-zA-Z][a-zA-Z0-9._]*\\)+" . default)
+-   (cons (rnc-make-regexp-choice rnc-atoms) 'italic)
+-   (cons (rnc-make-regexp-choice rnc-keywords) font-lock-keyword-face)
++   '("[a-zA-Z][a-zA-Z0-9._]*\\(-[a-zA-Z][a-zA-Z0-9._]*\\)+" . 'default)
++   (cons (rnc-make-regexp-choice rnc-atoms) ''italic)
++   (cons (rnc-make-regexp-choice rnc-keywords) 'font-lock-keyword-face)
+    )
+   "RNC Highlighting")
+ 
diff --git a/app-emacs/rnc-mode/rnc-mode-1.0.6.ebuild b/app-emacs/rnc-mode/rnc-mode-1.0.6-r1.ebuild
index 6dd83e053d79..820aaf70cc00 100644
--- a/app-emacs/rnc-mode/rnc-mode-1.0.6.ebuild
+++ b/app-emacs/rnc-mode/rnc-mode-1.0.6-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit elisp
 
@@ -14,5 +14,9 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
+PATCHES=(
+	"${FILESDIR}/${P}-flymake.patch"
+	"${FILESDIR}/${P}-font-lock.patch"
+)
 SITEFILE="50${PN}-gentoo.el"
 DOCS="README.md"