commit:     02e9ca1ececf99d8a6afd8513be9907acd22c327
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 13 19:22:08 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Oct 13 19:23:26 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02e9ca1e

app-emacs/gnuserv: Drop obsolete elisp code

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 .../gnuserv/files/gnuserv-3.12.8-no-custom.patch   | 31 ++++++++++++++++++++++
 app-emacs/gnuserv/gnuserv-3.12.8-r7.ebuild         |  2 +-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/app-emacs/gnuserv/files/gnuserv-3.12.8-no-custom.patch 
b/app-emacs/gnuserv/files/gnuserv-3.12.8-no-custom.patch
new file mode 100644
index 000000000000..12cd31c16c0e
--- /dev/null
+++ b/app-emacs/gnuserv/files/gnuserv-3.12.8-no-custom.patch
@@ -0,0 +1,31 @@
+Old-style backquotes don't work with Emacs 27 or later. Remove the
+code altogether, because it is no longer needed since Emacs 20.1.
+
+--- gnuserv-3.12.8/gnuserv-compat.el
++++ gnuserv-3.12.8/gnuserv-compat.el
+@@ -180,25 +180,6 @@
+   (defun frame-totally-visible-p (frame)
+     (eq t (frame-visible-p frame))))
+ 
+-;; Make custom stuff work even without customize
+-;;   Courtesy of Hrvoje Niksic <[email protected]>
+-;;   via Ronan Waide <[email protected]>.
+-(eval-and-compile
+-  (condition-case ()
+-      (require 'custom)
+-    (error nil))
+-  (if (and (featurep 'custom) (fboundp 'custom-declare-variable))
+-      nil ;; We've got what we needed
+-    ;; We have the old custom-library, hack around it!
+-    (defmacro defgroup (&rest args)
+-      nil)
+-    (defmacro defcustom (var value doc &rest args)
+-      (` (defvar (, var) (, value) (, doc))))
+-    (defmacro defface (var value doc &rest args)
+-      (` (make-face (, var))))
+-    (defmacro define-widget (&rest args)
+-      nil)))
+-
+ ;; Now for gnuserv...
+ (require 'gnuserv)
+ 

diff --git a/app-emacs/gnuserv/gnuserv-3.12.8-r7.ebuild 
b/app-emacs/gnuserv/gnuserv-3.12.8-r7.ebuild
index dd5eabd64a13..4cb5f7e12303 100644
--- a/app-emacs/gnuserv/gnuserv-3.12.8-r7.ebuild
+++ b/app-emacs/gnuserv/gnuserv-3.12.8-r7.ebuild
@@ -21,7 +21,7 @@ DEPEND="${RDEPEND}
        gui? ( x11-base/xorg-proto )"
 
 PATCHES=(
-       "${FILESDIR}"/${P}-backquotes.patch
+       "${FILESDIR}"/${P}-no-custom.patch
        "${FILESDIR}"/${P}-process-query.patch
        "${FILESDIR}"/${P}-gnudoit.patch
        "${FILESDIR}"/${P}-emacs-28.patch

Reply via email to