From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 12 May 2022 16:42:50 +0300
Subject: gentoo resync : 12.05.2022

---
 dev-ml/dune/Manifest               |  3 +-
 dev-ml/dune/dune-2.9.3-r2.ebuild   | 58 ++++++++++++++++++++++++++++++++++++++
 dev-ml/dune/dune-2.9.3.ebuild      | 47 ------------------------------
 dev-ml/dune/files/50dune-gentoo.el |  4 +++
 4 files changed, 64 insertions(+), 48 deletions(-)
 create mode 100644 dev-ml/dune/dune-2.9.3-r2.ebuild
 delete mode 100644 dev-ml/dune/dune-2.9.3.ebuild
 create mode 100644 dev-ml/dune/files/50dune-gentoo.el

(limited to 'dev-ml/dune')

diff --git a/dev-ml/dune/Manifest b/dev-ml/dune/Manifest
index fbfbea9e80c4..1f708612fa78 100644
--- a/dev-ml/dune/Manifest
+++ b/dev-ml/dune/Manifest
@@ -1,3 +1,4 @@
+AUX 50dune-gentoo.el 203 BLAKE2B 0b99f29b2a5abe1ce28fb10db5a282b4fbc355dba94ed8692df6a4b8c0e0c4c21a1df71ed56fe676b9a6f2cfd9eedd11b1579aa440d39d74d753a922a9427c40 SHA512 2065beb91777c9bd4f637d1cdbbe3ea8c1f0a910faa3b1ebd35e8a351c3d489462c9887eeff38a3b9d1d424801f193a868f0a535aaaefc7bb0bfaa895e1fa4d6
 DIST dune-1.11.4.tar.gz 849090 BLAKE2B 4dace2d998dd00dd8fd51fef6bf0048fd7d0c7941794b4c775f8a1a6c8f694af52ebae2bee17fb531b3f4332fe49167422508a91efcbda61f5420ffee7e89750 SHA512 0afd7ba4d66ba742b6485546d6b7e07096f38f516c12c4fc506a151b6fc97805859d736fee3a0a5dcf8008af0e2a678f1fe7286f6d0a941c999f7d3d5b9a9ccb
 DIST dune-2.1.0.tar.gz 1170295 BLAKE2B 16ee2c34e0183bd255d23410f70001ca008b8e82815f93ad727079da00b8592d219e7664c93bed7b97b3a1e997306d60672b7d6c45fe6dae7371b4025df06722 SHA512 24afb44e458f819dfde3775b76c3ccf43f3fa5d8ce9a14ee9bf6658c1c116f95659c21a9ea208e5711c844fabc661cc434070bce6c9307154d506b6599ffb57f
 DIST dune-2.7.1.tar.gz 1290915 BLAKE2B 85a2dee92d1ead03b43b80742c291f4470dd9e1d843fdb257754c567e2329c101d11b42573da19de537f0d8591ebdacfcaab1099e0f46bdeebcd8421eb1bbcb2 SHA512 b77d0e207263107365e5a6e94423e8ab4ddbab1f920872d915e4014b7cc69915274b53fe946bb4b29dfe3de2bf5573ab3b2bffb4db8eb50b472e7dfb6cab88b7
@@ -13,5 +14,5 @@ EBUILD dune-2.8.2.ebuild 919 BLAKE2B 6202e7bccf61f8213fc8c6c3c289065e963f7cf0584
 EBUILD dune-2.8.4.ebuild 919 BLAKE2B 6202e7bccf61f8213fc8c6c3c289065e963f7cf05842c877a613a2321bc1bcc133737c1e9c98d1cfd4223c9d5edf4429bb7c1ae316bc1d13b0908d3d64ddfecd SHA512 33a010fe148fcdd9bb3e992a8d9a5a3f74ea94c0138fc0acdbca80a16932fa10a5f11f503edaaf8deb0f0a1af50e136b57819cfb81f2e29eafc9651f99f9ad37
 EBUILD dune-2.9.0.ebuild 902 BLAKE2B 56cfab513a0767ba85a2e8808e8f3a7cc687869a8c60366a42d278ee52774078690b8c4110bdbeac07fc3699cc1fb1dd4f1efd6087c3e086c9ae2da862a691ac SHA512 5c954d7e379db8aaf2eca54cdd084c2146e627bd61b0ce556fabc1d2c4de31738f98df0f07518a15257887f80db92e2cd5c7a587c8d72b9266fabe35093c6cc9
 EBUILD dune-2.9.1.ebuild 899 BLAKE2B b2c0ccba4c16e614eb4f4381955c5b615b5cbe2943e7e2c04863f00e85b580d91e56e1526af65c72e8388b3b2b6253883e9bbc1857785ed8ed4b103e8845f815 SHA512 69976a1641eca9a00b35efe8663f8a2e8073bef7b290a553730bbf180d43248e16fad5a92e3483ec9b0f19a5ce7a86659e80ac3b4e05ed76169ea4e8b4d480ca
-EBUILD dune-2.9.3.ebuild 925 BLAKE2B 727d8466d8ff830a7eb9514643f7d269efcea98c637ec162da45fdf04ad3b42ea57441fb48bf71899916106b9bd438fc76e3cf369f76d63d715f1991921ace14 SHA512 28263db723ba7dc5c46f9671fcf97af75884c18ba90641c253bbccbcc400b2214cd5b25e638fca6d8d3991c0dad6bf4206bd1b4bb5864c2f4b72f234eddedd69
+EBUILD dune-2.9.3-r2.ebuild 1262 BLAKE2B 8a84c4e99fe54755304cf6acf16db6e3cd0c668f314d65ee5cfeff5a47a45bbc8f5615901c2052ba771dd77d317f43f83262d9907fa3190eb98756fb7b5cc3a8 SHA512 9cd8726bc5ce93a8ed93d48aea9f7e59c65ec9c60bab9f575b70c9557b55de1284d42baa8d898178ee51fdc98eef4977a95062e3c1cf35e4e87f94ab2606832c
 MISC metadata.xml 413 BLAKE2B 68bcbe6d091780d3ea48707a42b402cfcc075b1ca0c58a8e145bc8ae6e89806361325f772e9e8b05484fc258f09e33c18fa329a494881e3275f534c65b283c15 SHA512 6520ccff6f2071125a07d0e6bc365c8a919ff32791af97fc633ef68b351de8295454884126334e182da7233744d489acfeb2519c3935990ad21eb20da3f5a1f9
diff --git a/dev-ml/dune/dune-2.9.3-r2.ebuild b/dev-ml/dune/dune-2.9.3-r2.ebuild
new file mode 100644
index 000000000000..486d58edd639
--- /dev/null
+++ b/dev-ml/dune/dune-2.9.3-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multiprocessing elisp-common
+
+DESCRIPTION="A composable build system for OCaml"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="emacs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.08:=
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+DEPEND="
+	${RDEPEND}
+	dev-ml/findlib
+	test? (
+		dev-ml/core_bench
+		dev-ml/ppx_bench
+		dev-ml/ppx_expect
+	)
+"
+
+QA_FLAGS_IGNORED="usr/bin/dune"
+
+BYTECOMPFLAGS="-L ${S}/editor-integration/emacs"
+SITEFILE="50${PN}-gentoo.el"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	ocaml bootstrap.ml -j $(makeopts_jobs) || die
+	./dune.exe build -p "${PN}" --profile dune-bootstrap -j $(makeopts_jobs) \
+		--display short || die
+
+	use emacs && elisp-compile editor-integration/emacs/*.el
+}
+
+src_install() {
+	default
+	mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die
+	mv "${ED}"/usr/man "${ED}"/usr/share/man || die
+
+	if use emacs ; then
+		elisp-install ${PN} editor-integration/emacs/*.el{,c}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
diff --git a/dev-ml/dune/dune-2.9.3.ebuild b/dev-ml/dune/dune-2.9.3.ebuild
deleted file mode 100644
index 383157a0063c..000000000000
--- a/dev-ml/dune/dune-2.9.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multiprocessing
-
-DESCRIPTION="A composable build system for OCaml"
-HOMEPAGE="https://github.com/ocaml/dune"
-SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.08:=
-"
-DEPEND="
-	${RDEPEND}
-	dev-ml/findlib
-	test? (
-		dev-ml/core_bench
-		dev-ml/ppx_bench
-		dev-ml/ppx_expect
-	)
-"
-
-QA_FLAGS_IGNORED="usr/bin/dune"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	ocaml bootstrap.ml -j $(makeopts_jobs) || die
-	./dune.exe build -p "${PN}" --profile dune-bootstrap -j $(makeopts_jobs) \
-		--display short || die
-}
-
-src_install() {
-	default
-	mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die
-	mv "${ED}"/usr/man "${ED}"/usr/share/man || die
-}
diff --git a/dev-ml/dune/files/50dune-gentoo.el b/dev-ml/dune/files/50dune-gentoo.el
new file mode 100644
index 000000000000..87fd7c6b28a9
--- /dev/null
+++ b/dev-ml/dune/files/50dune-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'dune-mode "dune"
+  "Major mode to edit dune files." t)
+(add-to-list 'auto-mode-alist '("\\(?:\\`\\|/\\)dune\\(?:\\.inc\\|\\-project\\)?\\'" . dune-mode))
-- 
cgit v1.2.3