summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2023-10-13 21:22:08 +0200
committerUlrich Müller <ulm@gentoo.org>2023-10-13 21:23:26 +0200
commit02e9ca1ececf99d8a6afd8513be9907acd22c327 (patch)
tree16653c79a065eaf07b0533df0091cc5dcfa5cb18
parentapp-emacs/eselect-mode: drop 1.4.25 (diff)
downloadgentoo-02e9ca1ececf99d8a6afd8513be9907acd22c327.tar.gz
gentoo-02e9ca1ececf99d8a6afd8513be9907acd22c327.tar.bz2
gentoo-02e9ca1ececf99d8a6afd8513be9907acd22c327.zip
app-emacs/gnuserv: Drop obsolete elisp code
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
-rw-r--r--app-emacs/gnuserv/files/gnuserv-3.12.8-no-custom.patch31
-rw-r--r--app-emacs/gnuserv/gnuserv-3.12.8-r7.ebuild2
2 files changed, 32 insertions, 1 deletions
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 <hniksic@srce.hr>
+-;; via Ronan Waide <waider@scope.ie>.
+-(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