gentoo auto-resync : 23:07:2022 - 02:48:51

5 files changed, 121 insertions, 0 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 2007735a223e..b4b2e8ac0bcd 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
index e002c5d2de2b..b168204ce07d 100644
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@@ -11,9 +11,13 @@ DIST merlin-4.5-411.tbz 1316537 BLAKE2B 8850ea6b15819a178f763d8b55fecca9104cec50
 DIST merlin-4.5-412.tbz 1765436 BLAKE2B eaed065a2814f4c1bfc5337d026c7c42287b8cbbe50097415a983f7fdd7323f4c88f3b8c8cff4ca88a0813204617f39807709a6703fd618269eca6063b3c47b1 SHA512 f9edc3e1c9f753d7bacbdf1b92c118b54f9e9eff0bf752a2b44f39a2f7ecc76c4cd3bbe9227e910aea8b5ea947e8fe1b8d92ba0245fe47bc8cc2f45404cca973
 DIST merlin-4.5-413.tbz 2290507 BLAKE2B 32aeda63caec645da8043c49ceaa0ea54d095b3e286f687b5f3da1b44d54bbc291d0358768d2180825cb620a91765da83d90b645151a694a4131788ab4438fbf SHA512 b1db98c38a97ca0eef3051ab2b5d1b158e757863de6908a830308e7ea7f960eebd64b1a60bf51b10b7ea2eea3141ee0917a7c3570b63f9faa2e3f69c5d6fe0c2
 DIST merlin-4.5-414.tbz 1964688 BLAKE2B 41cb76fb367545af3b5ac7d62f5b69ae031ed99956aca947dc8b91e2fa906d500bed272f7f46a7ad9e57bf3cb5620893072b52ac7f2246d6ae3be1ae22e99406 SHA512 cc2cf2c208091b3ae435a8124617e56f2002b7091532002ab49a1f817d90a5c4f9cf0bc5741dc7f2526e0352c3ca95b42c3b3a17c6cbfb80ad73d42310a25d22
+DIST merlin-4.6-412.tbz 1767545 BLAKE2B 95b4f4e53accf55f4d2bc381779fa31bb5db39c21fa2cd8dc0b1d5b0e4a4acf484f2eb58327bce1c990cbbb2205bb87215aeba1b923ba6a62c82862d884dd410 SHA512 4362482ecd7c8af1c4e740e3816100cd5408eba3aebc01b867b45bdd1dcc237819cb0640e0f618b6ecf00aa8d55e58e55ecfeb176ed7b358c404ea71302443b0
+DIST merlin-4.6-413.tbz 2292506 BLAKE2B ec61d3b9cbfd9cddbb27fed70ebf7b69816244afb8a6c36347fbb762fc6aee1e6dd2b728db0687cd984603c3847ba3fe858b9663a7b3dcd17aedede662848299 SHA512 fe88a52c4c3c94505da142fbb7d400fce11bfafe6e47ec7cd39437308baa7122399a008bb6d0ef7b8f29636c2a51f4d49e3535136010fec198a1188293914a56
+DIST merlin-4.6-414.tbz 1969647 BLAKE2B fdb55f7ba9a597fb03bb377556238dedc2a5d60bdc772a479a9ad98c0feb243a7fc61dd47a65194ddba9afb8509858d8956a87ca5af9fc68597ba746b0d56d60 SHA512 7373fadf05c692c9f054c7fe6a7d4bdfeefe237b9df432024ef9923782ee72e09021c0c3fba869da8347728105cb2d3ff0aa94b0c5eb09811bb25aa8da9fb520
 EBUILD merlin-3.4.2-r3.ebuild 1268 BLAKE2B 76951d30c4572bb3b2a1560df586fe917c418b2c264023a6bb6fb4d2d2c81e221e37953bd817445ba9cbddf734c2314bce9b1e1cae168ae6daeed553c6d504c2 SHA512 671cb8164f78319a4dd69e609507e0fc3d7399729dcb9b0e7a16ad21496cd9ac54946a152e7a61c3a21ae3071d330dc853ee7aef6408b42ce2812320d9ef763f
 EBUILD merlin-4.2-r2.ebuild 1635 BLAKE2B 2db7c065259db06f7ebacf0cd1445641488bc0d0c1040da933799a9fd59ddc4be3d089f149e0e501d0e03cdb827500584e2c3cb4a677328beebc531eca6faeb9 SHA512 f7fc91a00f293bfb9cdbc2c88e935428f1662bb42ca05b62bd5033073c1e409b0caac464fd23734f06a7e7182b4e6fb0a7ff5c5a3a0286f54948ea235337d766
 EBUILD merlin-4.3.1-r3.ebuild 1656 BLAKE2B bced8c8869f0d778725278c453a6e51000f2dcc7fba7d11efb2dc5d9cd078c476be421e257b04c3d0a9ecfa0412f3365b0d7e5b29ec15b22805d7f55d6930c10 SHA512 b05d0384e63d940213e5789b4bc29cbb7fe09de48d31abbd3e94032750152fca57ecf539b6e38f4a11cb9af6dfd1b2d48112b002dc6b21a0454a9da345ee7db5
 EBUILD merlin-4.4-r3.ebuild 1927 BLAKE2B 1cd4b4b75b017f7dd04f19dc7dbcea349717d52e3c9106342d30a1294d165d629dc3fb8bfe37944b04284a06e9782ddb667347f1dc88e8060e749d4fb9d4133a SHA512 058e859dbff209604b0fd6b9929b4bf3401349eff1cd242a973728f8dc5090c17cc1b119add9db5f073d8c32ebc2b1900cf8f023665a633b8a68092bf7a2bd7c
 EBUILD merlin-4.5-r3.ebuild 2056 BLAKE2B 3d30894663dd4db412c2b3d86866aa432105e167ebb4fa427e8244cf3399b1017310aaa97a7ca432cecd17aabcb9ed5c264cc777d00c025ca1b0c6ea134397f6 SHA512 d38808870394e4575ff3bffe7ddeeb9c5b636eda86072947a5424286973f858b5179a3dc5cec0aeeb3b1cf3f6dba1dc11f45d609f3e173aacb654fd89466cbf3
+EBUILD merlin-4.6.ebuild 2180 BLAKE2B 1322e6b4f2f0566309405967ccc8a0a52fefb350e4984602af209c37e5d8509e28150c56a8aebcde7f64ed54570a83619e3951a7018cff568a99df4040e28ab2 SHA512 d0ef2760d43cc9820e5c9b0518fb76e9ea6add93322048e059b87f930b3e7bc0555a28c1facc23395574947faa125c88ef6c46bb805bd034a2a2f29e32cf6272
 MISC metadata.xml 310 BLAKE2B f1255dfdcb6984112e896735ea40f1171a8d52149fa7e8ed279efc1fe08de9b071554f5168bc3f8c0e432bd8344c69f5c5716c5c689ff4ff4edbc27569546246 SHA512 06710c33027574e4c13259e30ca5e862b7bbda0442013676020d00dd1114e92ebee92fa19d2993fc3881c10f9db7b51dd2710fcfbcf9ca7564f8f96e5065705e
diff --git a/dev-ml/merlin/merlin-4.6.ebuild b/dev-ml/merlin/merlin-4.6.ebuild
new file mode 100644
index 000000000000..54eef9ec4a64
--- /dev/null
+++ b/dev-ml/merlin/merlin-4.6.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO: vim-plugin, although it's not clear how to make it work here
+inherit elisp-common dune
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin/"
+SRC_URI="
+	https://github.com/ocaml/merlin/releases/download/v${PV}-412/${P}-412.tbz
+	https://github.com/ocaml/merlin/releases/download/v${PV}-413/${P}-413.tbz
+	https://github.com/ocaml/merlin/releases/download/v${PV}-414/${P}-414.tbz
+"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="emacs +ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.12:=[ocamlopt?]
+	dev-ml/csexp:=
+	>=dev-ml/yojson-2.0.0:=
+	dev-ml/menhir:=
+	>=dev-ml/dune-2.9:=
+	|| (
+		dev-lang/ocaml:0/4.12
+		dev-lang/ocaml:0/4.13
+		dev-lang/ocaml:0/4.14
+	)
+	emacs? (
+		>=app-editors/emacs-23.1:*
+		app-emacs/auto-complete
+		app-emacs/company-mode
+	)
+"
+DEPEND="${RDEPEND}"
+# NOTICE: Block dev-ml/seq (which is a back-port of code to ocaml <4.07)
+# because it breaks merlin builds.
+# https://github.com/ocaml/merlin/issues/1500
+BDEPEND="
+	!<dev-ml/seq-0.3
+	test? ( app-misc/jq )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_unpack() {
+	default
+
+	if has_version "dev-lang/ocaml:0/4.12" ; then
+		mv ${P}-412 "${S}" || die
+	elif has_version "dev-lang/ocaml:0/4.13" ; then
+		mv ${P}-413 "${S}" || die
+	elif has_version "dev-lang/ocaml:0/4.14" ; then
+		mv ${P}-414 "${S}" || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Handle installation via the eclass
+	rm emacs/dune || die
+
+	# This test runs only inside a git repo
+	rm -r tests/test-dirs/occurrences/issue1404.t || die
+	rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die
+}
+
+src_compile() {
+	dune build @install || die
+
+	if use emacs ; then
+		# iedit isn't packaged yet
+		rm emacs/merlin-iedit.el || die
+
+		BYTECOMPFLAGS="-L emacs" elisp-compile emacs/*.el
+	fi
+}
+
+src_install() {
+	dune_src_install
+
+	if use emacs ; then
+		elisp-install ${PN} emacs/*.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/seq/Manifest b/dev-ml/seq/Manifest
index 263665d1ea02..c3d0e8a8efa8 100644
--- a/dev-ml/seq/Manifest
+++ b/dev-ml/seq/Manifest
@@ -1,5 +1,7 @@
 DIST seq-0.2.2.tar.gz 12240 BLAKE2B 0f7c64e26593b012b60cfdcba02dc2748558c46a72789c77eaff70bcb24ab601895c429aa16dc066151323a48c312a372af5e19cebe0886e9203d55436c09cb1 SHA512 cab0eb4cb6d9788b7cbd7acbefefc15689d706c97ff7f75dd97faf3c21e466af4d0ff110541a24729db587e7172b1a30a3c2967e17ec2e49cbd923360052c07c
 DIST seq-0.2.tar.gz 12012 BLAKE2B 2321caabaefd98d4237d6ede034007ae5a4295765df4df21d4f0d475f097461992e4619f817ea7ebb20a3023e9d175237d636ed99bb8b1ca7b097c805daffbe8 SHA512 b2571225a18e624b79dad5e1aab91b22e2fda17702f2e23c438b75d2a71e24c55ee8672005f5cc4b17ae79e3b277b1918b71b5d0d674b8b12ea19b3fb2d747cb
+DIST seq-0.3.tar.gz 12562 BLAKE2B 2ef68aac50cee1a6faa97cd408d231541f3b0a941896bfadd4503c7b26a554b95314bedfba6cf34c2253858f5e86660876a1635e87a861a7a54d8a805106f9be SHA512 3cbca9e771bc05350b5c6ffd41237fa12c6909a077f1090e28c4d0403711c137c96fccd670f074b1ea1a47bdcfd7a7618247bdad6ee71e52e9af75894e8cd974
 EBUILD seq-0.2.2.ebuild 411 BLAKE2B 95e47a75a66913b0f6f5b41179a9f26ce68f9dd6e7ee4c85c2222c723064e2586a79678d42d5ef2535d4b67a37ad65efd7c8bffea0f38e7f6618a5f21f499e64 SHA512 a59c08a76390ca909da275f1b13c633ad98029a66128ddf2ec50e7908e82f923e1ce664a986534f36fe09e112fa027a8663e5968e6a9f5f87c8f8bba9223385a
 EBUILD seq-0.2.ebuild 404 BLAKE2B 19af5fc56a282c807ba4ce03d45be9647642288f952316722629a7c06eef35db1c359719d2ace92ea139f0234fb5e99094e09f5aeaa042a5762aae72b55bf6a0 SHA512 c22d91c186dee6e9026f026e4de2b5587579d947786ee7722ff0c571c34b122eec3b9aace5b49b345e2eb3d70302f1080bad38cad2406469a9cd24f0e82436b8
+EBUILD seq-0.3.ebuild 417 BLAKE2B cd007c5d702aa654e0cd5e906a320a749a9571a7e6e6c5c71e433a5572f913b584cfffa05b17613205081ccbe2863566fc0eedadf4385ad0d1bbb2b851650b33 SHA512 b855bd826be578378c0f32dbd10765196600637c71ecadf0a7c979403e7b18b5aedc0f12dd38c297b59f1b6cff61efec4d913aaa7a509bca22feb04f664fca41
 MISC metadata.xml 338 BLAKE2B f947fa0825c1a3fd959515164da36ffc9694c570ed6eb6eef8686fc24b4582ee88ecb7304507c79cf2733fb77ae3570468ec8da886367d79721c81f148931833 SHA512 9d052ada92f441fa4908f4ec9a2561f7276872281ffa65f0ad92c8d0f7c15aeea11d6c887d4af7535d7d72bce3dec8f12622aee5eb9a79e510e8baaa208a54cd
diff --git a/dev-ml/seq/seq-0.3.ebuild b/dev-ml/seq/seq-0.3.ebuild
new file mode 100644
index 000000000000..7f7482efb9b0
--- /dev/null
+++ b/dev-ml/seq/seq-0.3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Compatibility package for the standard OCaml iterator type"
+HOMEPAGE="https://github.com/c-cube/seq"
+SRC_URI="https://github.com/c-cube/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt"