| 1 |
commit: c4cdf85415908e3ec31a967588e4516b102dba38 |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 9 09:02:22 2022 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 9 09:03:53 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4cdf854 |
| 7 |
|
| 8 |
app-emacs/ess: Fix byte-compilation with Emacs 28 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/837347 |
| 11 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
| 12 |
|
| 13 |
app-emacs/ess/ess-18.10.2-r1.ebuild | 7 ++++--- |
| 14 |
app-emacs/ess/files/ess-18.10.2-emacs-28.patch | 11 +++++++++++ |
| 15 |
2 files changed, 15 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-emacs/ess/ess-18.10.2-r1.ebuild b/app-emacs/ess/ess-18.10.2-r1.ebuild |
| 18 |
index 893fb96a64ef..9b0ee42f87c9 100644 |
| 19 |
--- a/app-emacs/ess/ess-18.10.2-r1.ebuild |
| 20 |
+++ b/app-emacs/ess/ess-18.10.2-r1.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2021 Gentoo Authors |
| 23 |
+# Copyright 1999-2022 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
EAPI=7 |
| 27 |
@@ -6,8 +6,8 @@ EAPI=7 |
| 28 |
inherit elisp readme.gentoo-r1 |
| 29 |
|
| 30 |
DESCRIPTION="Emacs Speaks Statistics" |
| 31 |
-HOMEPAGE="http://ess.r-project.org/" |
| 32 |
-SRC_URI="http://ess.r-project.org/downloads/ess/${P}.tgz" |
| 33 |
+HOMEPAGE="https://ess.r-project.org/" |
| 34 |
+SRC_URI="https://ess.r-project.org/downloads/ess/${P}.tgz" |
| 35 |
|
| 36 |
LICENSE="GPL-2+ GPL-3+ Texinfo-manual" |
| 37 |
SLOT="0" |
| 38 |
@@ -17,6 +17,7 @@ RESTRICT="test" |
| 39 |
BDEPEND="app-text/texi2html |
| 40 |
virtual/latex-base" |
| 41 |
|
| 42 |
+PATCHES=( "${FILESDIR}"/${P}-emacs-28.patch ) |
| 43 |
SITEFILE="50${PN}-gentoo.el" |
| 44 |
|
| 45 |
src_compile() { |
| 46 |
|
| 47 |
diff --git a/app-emacs/ess/files/ess-18.10.2-emacs-28.patch b/app-emacs/ess/files/ess-18.10.2-emacs-28.patch |
| 48 |
new file mode 100644 |
| 49 |
index 000000000000..c8f9b922eddc |
| 50 |
--- /dev/null |
| 51 |
+++ b/app-emacs/ess/files/ess-18.10.2-emacs-28.patch |
| 52 |
@@ -0,0 +1,11 @@ |
| 53 |
+--- ess-18.10.2/lisp/ess-r-package.el |
| 54 |
++++ ess-18.10.2/lisp/ess-r-package.el |
| 55 |
+@@ -557,7 +557,7 @@ |
| 56 |
+ (error "As of ESS 16.04, `ess-developer' is deprecated. Use `ess-r-set-evaluation-env' instead")) |
| 57 |
+ |
| 58 |
+ (defalias 'ess-toggle-developer 'ess-developer) |
| 59 |
+-(define-obsolete-function-alias 'ess-r-devtools-check-package-buildwin 'ess-r-devtools-check-with-winbuilder) |
| 60 |
++(define-obsolete-function-alias 'ess-r-devtools-check-package-buildwin 'ess-r-devtools-check-with-winbuilder "") |
| 61 |
+ (define-obsolete-function-alias 'ess-r-devtools-ask 'ess-r-devtools-execute-command "18.04") |
| 62 |
+ |
| 63 |
+ (make-obsolete-variable 'ess-developer "Please use `ess-developer-select-package' and `ess-r-set-evaluation-env' instead." "16.04") |
Archives