gentoo resync : 09.07.2022

8 files changed, 197 insertions, 85 deletions

diff --git a/dev-ml/utop/Manifest b/dev-ml/utop/Manifest
index cd0211dc73da..46a621fbcf7e 100644
--- a/dev-ml/utop/Manifest
+++ b/dev-ml/utop/Manifest
@@ -1,7 +1,8 @@
-DIST utop-2.8.0.tar.gz 414059 BLAKE2B f94cc9a2e87d5341b1d7231574b1e0d8b179e600640281529ecfd2ce8827b9145d73030ea1ec59b20430d34155087f6d910c698c75d7566145c9db3a3ecbf872 SHA512 cf323249aa9a747081b3e39e8e8b99b69557082beb244dd0a28d64c6d11e3c03427c22da4fd364e9ae7f5d83d12ca3d2d48b9f4b6697ec704d486f3c23163dba
+AUX 50utop-gentoo.el 100 BLAKE2B eb2061a156c26f41f06076905e66212743aca67b3692c14f5347006aeda59f05d973f766fd65c97dfd14ab0dca22cac831076c7809e12d509253483cd0ab8bb4 SHA512 80ef89749dc68e7d339bc6fc63984b56913b3d94c22fa38ab82a6d4e4867ea30e94ce116d25212785d00ce721909fbda3cb3ff9e710e617e241b42f8152b18d2
 DIST utop-2.9.0.tar.gz 414953 BLAKE2B 96fbf38d4a638137b73264bc523b8a81e47ddd609a7987073313f4b1d628e4e84c31f98195105911dd0930b8d27007cf5cc1633771bc6d2e975bd169e1e3ba9c SHA512 dd3f52fb915493cb32b5ee722361e884a481d04ef175d5bdf58f4032b70826c38b2f5279b7c64b78961170a86bc80fbd59f03026fac99bb5da2b46a8f341aa45
 DIST utop-2.9.1.tar.gz 421430 BLAKE2B c90a7fe54c5fbf15ce209e9bf850031e0368104c1f8f61a2d982b2b43d87b4bb95c91e3af6da16ae27ebfab71f2b9907e7dec68d34f619597fe8db45ff363bf4 SHA512 10942a4c7d2e13081f2e02c29b767863176fe90ca5baf48d3be47bb0871a12840d873e5d3eb7d7dd9b0362e849f70afb913ff50c07e66c6b7f221c8bb98fa469
-EBUILD utop-2.8.0.ebuild 522 BLAKE2B 60492098157329523c0925fb648af6966a1f73495cd65baff95cec5e7fb13698ab3f81160a89a5be0971a0ead75fdc22e91ba72b1214eafe3032bcd891f12d98 SHA512 ae402dd577415dd451477efa25c8098ed83f502055e8e380cf19e3383b14bc503173f4f49e5c9580d4fc13b8e234b6d98bc02c080c0c8e310e2b3ac1070eaf98
-EBUILD utop-2.9.0.ebuild 522 BLAKE2B 60492098157329523c0925fb648af6966a1f73495cd65baff95cec5e7fb13698ab3f81160a89a5be0971a0ead75fdc22e91ba72b1214eafe3032bcd891f12d98 SHA512 ae402dd577415dd451477efa25c8098ed83f502055e8e380cf19e3383b14bc503173f4f49e5c9580d4fc13b8e234b6d98bc02c080c0c8e310e2b3ac1070eaf98
-EBUILD utop-2.9.1.ebuild 522 BLAKE2B d8f09de5c419e941e671955148c61393d46356b17e3d35f4ee726113a7a10c046cf79a40bad66e4664150b9f4df612f1eaa6c0feee864866fe3786abccfbe2e6 SHA512 0009f7dd2115e40cdb5e8116ecc48f39ec0428af9fb07faa8c3008fb7c9d796e4e963cdb0309039f2915acef0976ae2dece5d72843144a640469410ddec44910
+DIST utop-2.9.2.tar.gz 421512 BLAKE2B 235b4739e644877e4b9eef432a00ba053f42f2b4d4fdd9b0bd925af736d9a351c8f9373031bc4fc23835872034d48a27b8eac99d286f57cb975d2b1368f420c8 SHA512 14dd690b459cfea90c565b397b5d914add7e92b152b476ab58576dc827fa204b3d721955bfc3508bcb953778a8d6fb3b299b0293f8ddf64b3f0155fc9a0e7fda
+EBUILD utop-2.9.0-r1.ebuild 1058 BLAKE2B 716d360a10ee6d376db47ce3d10290b9017c3d12fd32afacfbf744787fe9af29e580dbff16cca21405f9c77949658f05d50634d155e95d79ef59d8f3bbadfefe SHA512 935559adfd42b76320f1f61561e5b3d4bae76ebfd27c8b5ff37c6d3e0ae7b15d73a47a31b6540c6d98aa0fadcfb5123a6d34e84fa83e75aa662326da0b50ff41
+EBUILD utop-2.9.1-r1.ebuild 1058 BLAKE2B 716d360a10ee6d376db47ce3d10290b9017c3d12fd32afacfbf744787fe9af29e580dbff16cca21405f9c77949658f05d50634d155e95d79ef59d8f3bbadfefe SHA512 935559adfd42b76320f1f61561e5b3d4bae76ebfd27c8b5ff37c6d3e0ae7b15d73a47a31b6540c6d98aa0fadcfb5123a6d34e84fa83e75aa662326da0b50ff41
+EBUILD utop-2.9.2.ebuild 1058 BLAKE2B 716d360a10ee6d376db47ce3d10290b9017c3d12fd32afacfbf744787fe9af29e580dbff16cca21405f9c77949658f05d50634d155e95d79ef59d8f3bbadfefe SHA512 935559adfd42b76320f1f61561e5b3d4bae76ebfd27c8b5ff37c6d3e0ae7b15d73a47a31b6540c6d98aa0fadcfb5123a6d34e84fa83e75aa662326da0b50ff41
 MISC metadata.xml 714 BLAKE2B cdcb086ec113872a316e1f98b53802f6faef22a718543527c5cd5d4038ac68a601bb0898532428378ce016e4d018074c043e8dafb4109ac7fcd233cabe1f3c54 SHA512 40468222a996f4b5bebf03ab5d2d7fc639ab00acba23ea98da3a4a7993864946d2327c296806e0106e5d150c90d5286629d9608bc0e04acbd94fc5fd1ba50bf4
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.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
-"
diff --git a/dev-ml/utop/utop-2.9.2.ebuild b/dev-ml/utop/utop-2.9.2.ebuild
new file mode 100644
index 000000000000..cd05e5fc7a0c
--- /dev/null
+++ b/dev-ml/utop/utop-2.9.2.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
+}