commit:     bf7f92a01ec0c0304d5ef7fd3d35c25cea4e6fdd
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  4 15:08:35 2022 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Mon Jul  4 15:08:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf7f92a0

dev-ml/utop: enable Emacs support

Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 dev-ml/utop/files/50utop-gentoo.el |  3 ++
 dev-ml/utop/utop-2.8.0-r1.ebuild   | 63 ++++++++++++++++++++++++++++++++++++++
 dev-ml/utop/utop-2.8.0.ebuild      | 27 ----------------
 dev-ml/utop/utop-2.9.0-r1.ebuild   | 63 ++++++++++++++++++++++++++++++++++++++
 dev-ml/utop/utop-2.9.0.ebuild      | 27 ----------------
 dev-ml/utop/utop-2.9.1-r1.ebuild   | 63 ++++++++++++++++++++++++++++++++++++++
 dev-ml/utop/utop-2.9.1.ebuild      | 27 ----------------
 7 files changed, 192 insertions(+), 81 deletions(-)

diff --git a/dev-ml/utop/files/50utop-gentoo.el 
b/dev-ml/utop/files/50utop-gentoo.el
new file mode 100644
index 000000000000..958c8398e602
--- /dev/null
+++ b/dev-ml/utop/files/50utop-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'utop "utop"
+  "A universal toplevel for OCaml." t)

diff --git a/dev-ml/utop/utop-2.8.0-r1.ebuild b/dev-ml/utop/utop-2.8.0-r1.ebuild
new file mode 100644
index 000000000000..cd05e5fc7a0c
--- /dev/null
+++ b/dev-ml/utop/utop-2.8.0-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune elisp-common
+
+DESCRIPTION="Universal toplevel for OCaml"
+HOMEPAGE="https://github.com/ocaml-community/utop";
+SRC_URI="https://github.com/ocaml-community/utop/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs +ocamlopt"
+
+ELISP_DEPEND="
+       emacs? (
+               >=app-editors/emacs-24:*
+               >=app-emacs/tuareg-mode-2.2.0
+       )
+"
+DEPEND="
+       dev-ml/camomile:=
+       dev-ml/lambda-term:=
+       dev-ml/lwt:=
+       dev-ml/react:=
+"
+RDEPEND="
+       ${DEPEND}
+       ${ELISP_DEPEND}
+"
+BDEPEND="
+       dev-ml/cppo
+       dev-ml/findlib
+       ${ELISP_DEPEND}
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+       dune_src_compile
+
+       use emacs &&
+               BYTECOMPFLAGS="-L src/top" elisp-compile src/top/*.el
+}
+
+src_install() {
+       dune_src_install
+
+       if use emacs ; then
+               elisp-install ${PN} src/top/*.el{,c}
+               elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+       fi
+}
+
+pkg_postinst() {
+       use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+       use emacs && elisp-site-regen
+}

diff --git a/dev-ml/utop/utop-2.8.0.ebuild b/dev-ml/utop/utop-2.8.0.ebuild
deleted file mode 100644
index d5b493a8c2cf..000000000000
--- a/dev-ml/utop/utop-2.8.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="Universal toplevel for OCaml"
-HOMEPAGE="https://github.com/ocaml-community/utop";
-SRC_URI="https://github.com/ocaml-community/utop/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ocamlopt"
-
-RDEPEND="
-       dev-ml/camomile:=
-       dev-ml/lambda-term:=
-       dev-ml/lwt:=
-       dev-ml/react:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-       dev-ml/cppo
-       dev-ml/findlib
-"

diff --git a/dev-ml/utop/utop-2.9.0-r1.ebuild b/dev-ml/utop/utop-2.9.0-r1.ebuild
new file mode 100644
index 000000000000..cd05e5fc7a0c
--- /dev/null
+++ b/dev-ml/utop/utop-2.9.0-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune elisp-common
+
+DESCRIPTION="Universal toplevel for OCaml"
+HOMEPAGE="https://github.com/ocaml-community/utop";
+SRC_URI="https://github.com/ocaml-community/utop/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs +ocamlopt"
+
+ELISP_DEPEND="
+       emacs? (
+               >=app-editors/emacs-24:*
+               >=app-emacs/tuareg-mode-2.2.0
+       )
+"
+DEPEND="
+       dev-ml/camomile:=
+       dev-ml/lambda-term:=
+       dev-ml/lwt:=
+       dev-ml/react:=
+"
+RDEPEND="
+       ${DEPEND}
+       ${ELISP_DEPEND}
+"
+BDEPEND="
+       dev-ml/cppo
+       dev-ml/findlib
+       ${ELISP_DEPEND}
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+       dune_src_compile
+
+       use emacs &&
+               BYTECOMPFLAGS="-L src/top" elisp-compile src/top/*.el
+}
+
+src_install() {
+       dune_src_install
+
+       if use emacs ; then
+               elisp-install ${PN} src/top/*.el{,c}
+               elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+       fi
+}
+
+pkg_postinst() {
+       use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+       use emacs && elisp-site-regen
+}

diff --git a/dev-ml/utop/utop-2.9.0.ebuild b/dev-ml/utop/utop-2.9.0.ebuild
deleted file mode 100644
index d5b493a8c2cf..000000000000
--- a/dev-ml/utop/utop-2.9.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="Universal toplevel for OCaml"
-HOMEPAGE="https://github.com/ocaml-community/utop";
-SRC_URI="https://github.com/ocaml-community/utop/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ocamlopt"
-
-RDEPEND="
-       dev-ml/camomile:=
-       dev-ml/lambda-term:=
-       dev-ml/lwt:=
-       dev-ml/react:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-       dev-ml/cppo
-       dev-ml/findlib
-"

diff --git a/dev-ml/utop/utop-2.9.1-r1.ebuild b/dev-ml/utop/utop-2.9.1-r1.ebuild
new file mode 100644
index 000000000000..cd05e5fc7a0c
--- /dev/null
+++ b/dev-ml/utop/utop-2.9.1-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune elisp-common
+
+DESCRIPTION="Universal toplevel for OCaml"
+HOMEPAGE="https://github.com/ocaml-community/utop";
+SRC_URI="https://github.com/ocaml-community/utop/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs +ocamlopt"
+
+ELISP_DEPEND="
+       emacs? (
+               >=app-editors/emacs-24:*
+               >=app-emacs/tuareg-mode-2.2.0
+       )
+"
+DEPEND="
+       dev-ml/camomile:=
+       dev-ml/lambda-term:=
+       dev-ml/lwt:=
+       dev-ml/react:=
+"
+RDEPEND="
+       ${DEPEND}
+       ${ELISP_DEPEND}
+"
+BDEPEND="
+       dev-ml/cppo
+       dev-ml/findlib
+       ${ELISP_DEPEND}
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+       dune_src_compile
+
+       use emacs &&
+               BYTECOMPFLAGS="-L src/top" elisp-compile src/top/*.el
+}
+
+src_install() {
+       dune_src_install
+
+       if use emacs ; then
+               elisp-install ${PN} src/top/*.el{,c}
+               elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+       fi
+}
+
+pkg_postinst() {
+       use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+       use emacs && elisp-site-regen
+}

diff --git a/dev-ml/utop/utop-2.9.1.ebuild b/dev-ml/utop/utop-2.9.1.ebuild
deleted file mode 100644
index 55ec4f6fd152..000000000000
--- a/dev-ml/utop/utop-2.9.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit dune
-
-DESCRIPTION="Universal toplevel for OCaml"
-HOMEPAGE="https://github.com/ocaml-community/utop";
-SRC_URI="https://github.com/ocaml-community/utop/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ocamlopt"
-
-RDEPEND="
-       dev-ml/camomile:=
-       dev-ml/lambda-term:=
-       dev-ml/lwt:=
-       dev-ml/react:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-       dev-ml/cppo
-       dev-ml/findlib
-"

Reply via email to