Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/app-emacs/ess
diff options
context:
space:
mode:
Diffstat (limited to 'app-emacs/ess')
-rw-r--r--app-emacs/ess/Manifest3
-rw-r--r--app-emacs/ess/ess-17.11.ebuild44
-rw-r--r--app-emacs/ess/ess-18.10.2-r3.ebuild (renamed from app-emacs/ess/ess-18.10.2-r1.ebuild)23
-rw-r--r--app-emacs/ess/ess-24.01.0.ebuild75
-rw-r--r--app-emacs/ess/ess-24.01.1.ebuild75
-rw-r--r--app-emacs/ess/files/ess-18.10.2-emacs-28.patch11
-rw-r--r--app-emacs/ess/metadata.xml17
7 files changed, 189 insertions, 59 deletions
diff --git a/app-emacs/ess/Manifest b/app-emacs/ess/Manifest
index 947f8fc529a8..5027f8be5daa 100644
--- a/app-emacs/ess/Manifest
+++ b/app-emacs/ess/Manifest
@@ -1,2 +1,3 @@
-DIST ess-17.11.tgz 3275703 BLAKE2B 50ec08040135fb05be35494829b347f1ce1c8fdb8bbc5c11f9327800cbfafbb4e7dd5dc46c2b6ce8d506e4e9ade90e369d14c0498e06f990eccbbacbb7d16cec SHA512 b2bb09d079922ed8bded04387e6aecd38d760d7a3b9a521044fb7e2537fdc0cbb59c707e5aa550fc76aa92a6c47eab0fa40f554060707cfc7656b19adbdea222
DIST ess-18.10.2.tgz 2939425 BLAKE2B f9a6181dfaffc820a55214418d14aef1443945d6b15cb156ecfb70a8f5878df545662f37114a44ea8aa20338a5eaea6a6ce0884b02f108bd3372653db13e1eff SHA512 9bc04c5ec87ed639e56de9fd7817c3adb1a823f091254a91b906e22e8537fb097b21b80020bf245acbd61420d09949d66fc079f3c552d79bf32b95dc7fa1dca9
+DIST ess-24.01.0.tar.gz 681861 BLAKE2B 81d1ee9409bece9b9d8e898ed5393e3299c58dd188dc3f3dffb125c70b3920406abaeb3636139e4c8f83cfa9ff980089468ef2f61a2f50abbafcd13e6009c6de SHA512 899787c10bff2fc9ab63350c8875174e81ff9303be3f89aa8b9dd410baf7f93e91a25e88ae5e5de90b7541f37274bc3a3b6a9ae8bc04659427f503fbca0289c8
+DIST ess-24.01.1.tar.gz 681901 BLAKE2B 892e60f33252f0dca979eb52cdc2eca7a79bad247037f599b6e640b02930019523ad276f764af281bc232040c34fb05ac884f1915940b09c3e89d2394f6887f8 SHA512 3ff7084f1182bad30771e264e491c7ab1b2501d4d6558ed6c4acb98aec6abed3c45c2049cf565164406611b1e8a5b92485b15da1c1696694454c5f65a8617191
diff --git a/app-emacs/ess/ess-17.11.ebuild b/app-emacs/ess/ess-17.11.ebuild
deleted file mode 100644
index d4a2ae5fbefd..000000000000
--- a/app-emacs/ess/ess-17.11.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp readme.gentoo-r1
-
-DESCRIPTION="Emacs Speaks Statistics"
-HOMEPAGE="http://ess.r-project.org/"
-SRC_URI="http://ess.r-project.org/downloads/ess/${P}.tgz"
-
-LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
-RESTRICT="test"
-
-DEPEND="app-text/texi2html
- virtual/latex-base"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
- default
-}
-
-src_install() {
- emake PREFIX="${ED}/usr" \
- INFODIR="${ED}/usr/share/info" \
- LISPDIR="${ED}${SITELISP}/ess" \
- DOCDIR="${ED}/usr/share/doc/${PF}" \
- install
-
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-
- # Most documentation is installed by the package's build system.
- rm -f "${ED}${SITELISP}/${PN}/ChangeLog"
- dodoc ChangeLog *NEWS doc/{TODO,ess-intro.pdf}
- newdoc doc/ChangeLog ChangeLog-doc
- newdoc lisp/ChangeLog ChangeLog-lisp
-
- DOC_CONTENTS="Please see /usr/share/doc/${PF} for the complete
- documentation. Usage hints are in ${SITELISP}/${PN}/ess-site.el ."
- readme.gentoo_create_doc
-}
diff --git a/app-emacs/ess/ess-18.10.2-r1.ebuild b/app-emacs/ess/ess-18.10.2-r3.ebuild
index dffe580968c9..87e6962259c1 100644
--- a/app-emacs/ess/ess-18.10.2-r1.ebuild
+++ b/app-emacs/ess/ess-18.10.2-r3.ebuild
@@ -1,24 +1,31 @@
-# 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 readme.gentoo-r1
DESCRIPTION="Emacs Speaks Statistics"
-HOMEPAGE="http://ess.r-project.org/"
-SRC_URI="http://ess.r-project.org/downloads/ess/${P}.tgz"
+HOMEPAGE="https://ess.r-project.org/"
+SRC_URI="https://ess.r-project.org/downloads/ess/${P}.tgz"
LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
RESTRICT="test"
BDEPEND="app-text/texi2html
virtual/latex-base"
+PATCHES=( "${FILESDIR}"/${P}-emacs-28.patch )
SITEFILE="50${PN}-gentoo.el"
+src_prepare() {
+ default
+ sed -i -e 's/font-lock-reference-face/font-lock-constant-face/g' \
+ lisp/*.el || die
+}
+
src_compile() {
default
}
@@ -32,13 +39,13 @@ src_install() {
# Version 18* doesn't install *.el files any more #685978
elisp-install ${PN} lisp/*.{el,elc} lisp/obsolete/*.{el,elc}
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ elisp-make-site-file "${SITEFILE}" ${PN} "(load \"ess-autoloads\" nil t)"
# Most documentation is installed by the package's build system.
dodoc ChangeLog *NEWS doc/TODO
newdoc doc/ChangeLog ChangeLog-doc
- DOC_CONTENTS="Please see /usr/share/doc/${PF} for the complete
- documentation. Usage hints are in ${SITELISP}/${PN}/ess-site.el ."
+ local DOC_CONTENTS="\
+ Please see /usr/share/doc/${PF} for the complete documentation."
readme.gentoo_create_doc
}
diff --git a/app-emacs/ess/ess-24.01.0.ebuild b/app-emacs/ess/ess-24.01.0.ebuild
new file mode 100644
index 000000000000..f2435174b015
--- /dev/null
+++ b/app-emacs/ess/ess-24.01.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Emacs Speaks Statistics"
+HOMEPAGE="https://ess.r-project.org/
+ https://github.com/emacs-ess/ESS/"
+
+if [[ "${PV}" == *9999* ]] ; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://github.com/emacs-ess/${PN^^}.git"
+else
+ SRC_URI="https://github.com/emacs-ess/${PN^^}/archive/refs/tags/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+ S="${WORKDIR}/${PN^^}-${PV}"
+
+ KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
+SLOT="0"
+
+BDEPEND="
+ app-text/texi2html
+ dev-texlive/texlive-fontsextra
+ dev-texlive/texlive-latex
+ dev-texlive/texlive-latexextra
+ dev-texlive/texlive-mathscience
+ dev-texlive/texlive-plaingeneric
+ virtual/latex-base
+"
+
+DOCS=( ChangeLog NEWS ONEWS README
+ doc/html/{ess,news,readme}.html doc/{ess,readme}.pdf )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+ elisp_src_prepare
+
+ sed -e "s|font-lock-reference-face|font-lock-constant-face|g" \
+ -i lisp/*.el || die
+}
+
+src_compile() {
+ local -x BYTECOMPFLAGS="-L lisp -L lisp/obsolete"
+
+ elisp-compile lisp/*.el lisp/obsolete/*.el
+ emake autoloads
+ emake -C doc all html pdf
+}
+
+src_test() {
+ elisp-test-ert . -L lisp -L test -l test/ess-test.el
+}
+
+src_install() {
+ # Version >=18 doesn't install *.el files any more #685978
+ elisp-install "${PN}" lisp/*.{el,elc} lisp/obsolete/*.{el,elc}
+ elisp-make-site-file "${SITEFILE}" "${PN}" "(load \"ess-autoloads\" nil t)"
+
+ insinto "${SITEETC}/${PN}"
+ doins -r etc/*
+
+ doinfo ./doc/info/ess.info
+
+ local DOC_CONTENTS="\
+ Please see /usr/share/doc/${PF} for the complete documentation."
+ readme.gentoo_create_doc
+
+ einstalldocs
+}
diff --git a/app-emacs/ess/ess-24.01.1.ebuild b/app-emacs/ess/ess-24.01.1.ebuild
new file mode 100644
index 000000000000..f2435174b015
--- /dev/null
+++ b/app-emacs/ess/ess-24.01.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Emacs Speaks Statistics"
+HOMEPAGE="https://ess.r-project.org/
+ https://github.com/emacs-ess/ESS/"
+
+if [[ "${PV}" == *9999* ]] ; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://github.com/emacs-ess/${PN^^}.git"
+else
+ SRC_URI="https://github.com/emacs-ess/${PN^^}/archive/refs/tags/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+ S="${WORKDIR}/${PN^^}-${PV}"
+
+ KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
+SLOT="0"
+
+BDEPEND="
+ app-text/texi2html
+ dev-texlive/texlive-fontsextra
+ dev-texlive/texlive-latex
+ dev-texlive/texlive-latexextra
+ dev-texlive/texlive-mathscience
+ dev-texlive/texlive-plaingeneric
+ virtual/latex-base
+"
+
+DOCS=( ChangeLog NEWS ONEWS README
+ doc/html/{ess,news,readme}.html doc/{ess,readme}.pdf )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+ elisp_src_prepare
+
+ sed -e "s|font-lock-reference-face|font-lock-constant-face|g" \
+ -i lisp/*.el || die
+}
+
+src_compile() {
+ local -x BYTECOMPFLAGS="-L lisp -L lisp/obsolete"
+
+ elisp-compile lisp/*.el lisp/obsolete/*.el
+ emake autoloads
+ emake -C doc all html pdf
+}
+
+src_test() {
+ elisp-test-ert . -L lisp -L test -l test/ess-test.el
+}
+
+src_install() {
+ # Version >=18 doesn't install *.el files any more #685978
+ elisp-install "${PN}" lisp/*.{el,elc} lisp/obsolete/*.{el,elc}
+ elisp-make-site-file "${SITEFILE}" "${PN}" "(load \"ess-autoloads\" nil t)"
+
+ insinto "${SITEETC}/${PN}"
+ doins -r etc/*
+
+ doinfo ./doc/info/ess.info
+
+ local DOC_CONTENTS="\
+ Please see /usr/share/doc/${PF} for the complete documentation."
+ readme.gentoo_create_doc
+
+ einstalldocs
+}
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
new file mode 100644
index 000000000000..c8f9b922eddc
--- /dev/null
+++ b/app-emacs/ess/files/ess-18.10.2-emacs-28.patch
@@ -0,0 +1,11 @@
+--- ess-18.10.2/lisp/ess-r-package.el
++++ ess-18.10.2/lisp/ess-r-package.el
+@@ -557,7 +557,7 @@
+ (error "As of ESS 16.04, `ess-developer' is deprecated. Use `ess-r-set-evaluation-env' instead"))
+
+ (defalias 'ess-toggle-developer 'ess-developer)
+-(define-obsolete-function-alias 'ess-r-devtools-check-package-buildwin 'ess-r-devtools-check-with-winbuilder)
++(define-obsolete-function-alias 'ess-r-devtools-check-package-buildwin 'ess-r-devtools-check-with-winbuilder "")
+ (define-obsolete-function-alias 'ess-r-devtools-ask 'ess-r-devtools-execute-command "18.04")
+
+ (make-obsolete-variable 'ess-developer "Please use `ess-developer-select-package' and `ess-r-set-evaluation-env' instead." "16.04")
diff --git a/app-emacs/ess/metadata.xml b/app-emacs/ess/metadata.xml
index c918cdef9591..1b61a0e3f7b0 100644
--- a/app-emacs/ess/metadata.xml
+++ b/app-emacs/ess/metadata.xml
@@ -1,9 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
<pkgmetadata>
-<maintainer type="project">
- <email>gnu-emacs@gentoo.org</email>
- <name>Gentoo GNU Emacs project</name>
-</maintainer>
-<stabilize-allarches/>
+ <maintainer type="project">
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+ </maintainer>
+ <stabilize-allarches/>
+ <upstream>
+ <bugs-to>https://github.com/emacs-ess/ESS/issues/</bugs-to>
+ <remote-id type="github">emacs-ess/ESS</remote-id>
+ </upstream>
</pkgmetadata>