gentoo auto-resync : 25:04:2023 - 00:11:21

9 files changed, 74 insertions, 122 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 212db61a3cde..85ef859be7a9 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/gen/Manifest b/dev-ml/gen/Manifest
index b1c2f6e2354a..bc88b6f886c9 100644
--- a/dev-ml/gen/Manifest
+++ b/dev-ml/gen/Manifest
@@ -1,5 +1,7 @@
 DIST gen-0.5.3.tar.gz 30905 BLAKE2B a6b8351ec4a75dd986cc0b4e9ed60dbfa78c3b8e3625c1e294f8bc0253d92be1f5d27cc7162e1cfc4f6397bbe272df22d9b7b0d1dd410d7760f30cf4c36c4745 SHA512 192178de106d2ae5f936caead8b21b4b9ec1b8fe35ba56296825900ea15a4ea702caf8824ac34d4478d107b954e22c3dffd81f12d4c08fbd6d9760f49a0deb14
 DIST gen-1.0.tar.gz 32266 BLAKE2B 1be57d34e794e8dffae19322e8b2504b0ff10a72608cc1dec4bc55867b50b08a765c88d7e6ec7125884dc2b8ea6752d4eb9c5cd2bcb10c2515250ba04fb21bf7 SHA512 fb4ec2ab35a1aba0dcc8439b11f14a0a785d939f661f505aec88a6f2ca6ca87e14ddfda860d9c180b215190b76690de87040c144582f069224f7e58d37ef48a0
+DIST gen-1.1.tar.gz 32152 BLAKE2B f5314ecba43523ebde487740eae1df7e058ea0fa47ef676aa19d76e90f21b08464da6b1dafe8f0d10e7720dd48d72f6b7a40397545adf874698d6cddc47c0a72 SHA512 71a4b5c3666a7c11935398a78feea7383f61d2c549dfb96e324d40783ffa87b5ec492c5ec468803aabfb9b48e7d0ebaa30b24d2b974540afc7cca5feea3121c1
 EBUILD gen-0.5.3-r1.ebuild 521 BLAKE2B a43478ee91922336be346c0d92d5e10df60949dec21c7f855374dae0684a43105d23281a61270947edf427f457c3eaad4bb2aea632a72517cd6cc1da6e473f64 SHA512 16c468c31b00592d7d69acf10c0d257609a79dda916f7111a049da2e4e672a576e261f45e53b275ea41f8e29299db2a4b81503ff9c0a6aa56db6451bb3777a99
 EBUILD gen-1.0-r2.ebuild 658 BLAKE2B e7ace07c706ea94f5fdfae852185a8781d5289589bc53ab28f7aa6fb751cfb14bceb16a4e1e27bb6d36c51851ec6be885658b575cf597e3cdd8b9fb6448175a5 SHA512 65eaca1c34b818785c1d8a3b04520abaa99e676516d15f4f114669ce8ff3a6e81f705d2bd3207aa6c10924c2d44e17d1a8e5b16a20a9ac3ec353d0a8dc887392
+EBUILD gen-1.1.ebuild 640 BLAKE2B 042aa05184576b516a4831ef7026e45c4db63fc6f81b2126c02d3c91189b1b47628a26658faafd9b7cbd5c61d3a73a64714fc3fbc318210591cafec8fef2c164 SHA512 0b22c8db2f8b519d3ed25b16ab5aa098a77628ff07433d22ba62093ce4bd1960ee7a73d4724621c33492f8c3cf002494c0837162d99a20054891ad9186340c89
 MISC metadata.xml 380 BLAKE2B 4cc697b8fa54689d677e4eb06cc90cb3d2b2b7dfef2585ccffa2846064c78bb1bf39d43f932588426e0b0b2a66fd68be4878bd97e0b2c4578fcf98c2ccddb01c SHA512 91e7d05763f7fbbb52a9dff9808a3c06640f66540543b188a2fe44673f50dc18689dc1fd95f83ca61f9bdf50d79e0951276e67311588cf7213735d3f97d20f05
diff --git a/dev-ml/gen/gen-1.1.ebuild b/dev-ml/gen/gen-1.1.ebuild
new file mode 100644
index 000000000000..d84bb7e889a7
--- /dev/null
+++ b/dev-ml/gen/gen-1.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Iterators for OCaml, both restartable and consumable"
+HOMEPAGE="https://github.com/c-cube/gen/"
+SRC_URI="https://github.com/c-cube/gen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+RESTRICT="test"  # tests fail  > unused-open
+
+RDEPEND="
+	>=dev-lang/ocaml-4.07:=[ocamlopt?]
+	dev-ml/dune-configurator:=
+"
+DEPEND="${RDEPEND}"
+# BDEPEND="test? ( dev-ml/qtest )"
+
+src_prepare() {
+	default
+
+	sed -i -e "s|(libraries seq)||" src/dune || die
+}
diff --git a/dev-ml/sedlex/Manifest b/dev-ml/sedlex/Manifest
index a0b7016f262b..00279ce872d4 100644
--- a/dev-ml/sedlex/Manifest
+++ b/dev-ml/sedlex/Manifest
@@ -1,10 +1,7 @@
-DIST sedlex-2.3-DerivedCoreProperties.txt 993782 BLAKE2B 185f76580a496781524e19124cc4d6d2f0eec6964d4dcf17c05e4a1f4a6031a821740a34e373c3be82c5f25acdb93a77f9591eafe37d026d40e027054e717c0f SHA512 e6b54579369edf361ee961171d9b4896449e16327d77749201e07a7022a4d9bd9e50ba25cc7397fb4e40c852347b1ef8599ed45bd5bb96a1b8dc5cd04ada5fda
-DIST sedlex-2.3-DerivedGeneralCategory.txt 255731 BLAKE2B 4cc70d21872e6c8d4a26dddaf204531533b79bd58b7238395ca25db7346bc916bd85aa0343abc194b4aab499d481f40a6fe1d8ea287e873ff1199a1bdd195be7 SHA512 b45324cb2791be1d1cf10862ca1ca4008fed2f482aa20042cac7190d4a8d46f840cc65b7367379343d209c06fdf37cd677f887a99bfbf3aa7022fcb3d4212c2d
-DIST sedlex-2.3-PropList.txt 123554 BLAKE2B 3b0a0e12315acfa67e51e48133652b12b45473a22a90f7d2cad91e149cf861f59daf02f8a15aa1138a879be4645d0d6bd48d6a2b39e61584d45f4e763b635ee0 SHA512 1979d14eaa43512ad681f8ebffd93b6bf5b0edacb72d01d7814aa293083e4834840223848c492d96f75a3cc8b219a6671e85158ccde4d283b37be3f9e2f071e4
-DIST sedlex-2.3.tar.gz 114507 BLAKE2B ba777d90ceba41136ac552a2aea860b2932dc2c27d02a5875e8533d6740bcababe444d27427fbae59739a42901b3fb85f7b2ed8fd318f984734e7283ecd7e69e SHA512 f91bbda9e79417e0a7c723a8efd9644404ffc91c60898b8fa07a514c38bc8472eae34419405354ae80966feb8d3203943f78776ad395a16132c7c890e3dbd7d8
 DIST sedlex-2.5.tar.gz 134289 BLAKE2B 47aa67ed34ee0226b92d538e61bbf7252dcead236dd51d4a291c7b81f7d0747d1024e9eb0a274d7648b25cfa078108e3e62d54ea2702450171b9ff4ab60f7706 SHA512 5c511a89e43999b34e50cc820a4ac71ecd0315ef144da2af1653077d7497b2ce3658898b723a7c558693766e6bc57369349cdf78c4a4b962a23d4528161b78ef
 DIST sedlex-3.0.tar.gz 133248 BLAKE2B f1adb73087b132d4e99b4785af3a99d3d82ee860d16691c48fbec6bd2776d8de23f736f5d6f21b734c846ef793caa8e7c925ce58dfc472d205268eab39973c6a SHA512 564780b7af8b3ddd32c9164caa42fd24b2ff59e0bf9977bcee4c3ddea2be3f0c870bd95949b639c5f1942e0fa2604902f5cd3eb9041d59b6ee2367895df556df
-EBUILD sedlex-2.3-r1.ebuild 1032 BLAKE2B 8f270fd378c861c23ed396408e3b2bcbec55f463a51680bf617b673afb06db9a4d570b14987f90fc7b6e4b37eef016d99c101301ec10f4022548cffdefaacdfc SHA512 a865b7adc9af6b6302570555808864df07ebc1a6738b2946c7c83a56217e993dc291650f99c79559b8c1591eb2adcd35d5de754011005b32ec70041e68946ecf
+DIST sedlex-3.1.tar.gz 139786 BLAKE2B 6bacf781f25a5a21ea4cf710ffef04949fbeea90033eb429a5f9d7733e64108526de7f94b56c2da5c8a3af4fab6eff94421b705de9ffe8137a4e8282aa9900cd SHA512 27c7954c03a9d78f252167708afe7d91648ad3d3aa529e00c73da75bac49c2cf552cc9d27d29f1d9a04b1e2b47b7c6de9e9850c53124ad9f311d0a8f54bb9cae
 EBUILD sedlex-2.5-r1.ebuild 745 BLAKE2B 4a87a88ca404eb8052396e4f80daeba228503911b0c06cd9195a79c911a63e754bc078084455d7f47dfecbe2231954c2c642f7381398194ad02cad8f76a54e40 SHA512 93aa3dd4ca9b431ea3af2ed001c05034e44ed8be996d21cfbd12ff9aa50b0bfd397ff048b150e7435dbdae5a6cd486bbe9f7cfb97b7604d450911f29b50e8b39
 EBUILD sedlex-3.0.ebuild 746 BLAKE2B 8436628ce2258d953df824bab71311efadf4a45c462a2d25609d78bbab93dbc6086d7d1658387c0b1247c06f43b56978e4e62fd8afd0c87a57f0d18433d5a12a SHA512 36e893b3421ad0201dd048ce1e11324aea179fb60bba08e887ed370faf753967e683ca0dab7ceea77e088b72e0c0c27402ed71c01c36f5541afc57dcd183b4d9
+EBUILD sedlex-3.1.ebuild 795 BLAKE2B 287102b7762c9f07d0ee15e825da932c7ae2a93859cb9a51dd5802132c7f0e6771afb5e55ae3da3a55c2d04f25c3fb498c0918bfaa7a177ef5197c86dfe8da3a SHA512 eaa91afbd5672352a2f9d57494cc1acb3ffe831ee1755798cf4bc48c2f7229fa4dd4571626f0828ecbf6bad2e22d489474f0957bdcdbd8f4ec852c30fd0fe4f3
 MISC metadata.xml 704 BLAKE2B f2c21c5c672a96091107097a5c4b27e7b373b56982cd4c196c56917997f52da334768f2b51b14bb2ab553478edd60530bba06e328b92437c470f22be10c1086e SHA512 c3ca46b0fafb0f393d5c79b415f3ce46dee477aae4ec8bb8089204415e9bed5d4a3826e02e82a50c7e5d6d5ae88737018cb064cb335b38b9ed12f2312ad96b6e
diff --git a/dev-ml/sedlex/sedlex-2.3-r1.ebuild b/dev-ml/sedlex/sedlex-2.3-r1.ebuild
deleted file mode 100644
index ea65dfca6321..000000000000
--- a/dev-ml/sedlex/sedlex-2.3-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune
-
-DESCRIPTION="An OCaml lexer generator for Unicode"
-HOMEPAGE="https://github.com/ocaml-community/sedlex"
-SRC_URI="https://github.com/ocaml-community/${PN}/archive/v${PV}.tar.gz
-			-> ${P}.tar.gz"
-
-FILES=( DerivedCoreProperties extracted/DerivedGeneralCategory PropList )
-for file in ${FILES[@]} ; do
-	SRC_URI+=" https://www.unicode.org/Public/12.1.0/ucd/${file}.txt
-				-> ${P}-${file##*/}.txt"
-done
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ocamlopt"
-
-DEPEND="
-	dev-ml/gen:=
-	dev-ml/ppxlib:=
-	dev-ml/uchar:=
-"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-
-	local file
-	for file in ${FILES[@]} ; do
-		ebegin "Copying ${file}"
-		cp "${DISTDIR}/${P}-${file##*/}.txt"  \
-		   "${S}/src/generator/data/${file##*/}.txt"
-		eend $? || die
-	done
-}
-
-src_prepare() {
-	default
-
-	# Remove dune file with rules to download additional txt files
-	rm "${S}/src/generator/data/dune" || die
-}
diff --git a/dev-ml/sedlex/sedlex-3.1.ebuild b/dev-ml/sedlex/sedlex-3.1.ebuild
new file mode 100644
index 000000000000..4c5d9b412edd
--- /dev/null
+++ b/dev-ml/sedlex/sedlex-3.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Using "--for-release-of-packages" skips the regeneration of "unicode.ml" file
+# (using curl), see "src_compile" and "src_test" and "dune-release".
+DUNE_PKG_NAME=${PN}
+
+inherit dune
+
+DESCRIPTION="An OCaml lexer generator for Unicode"
+HOMEPAGE="https://github.com/ocaml-community/sedlex/"
+SRC_URI="https://github.com/ocaml-community/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-ml/gen:=
+	>=dev-ml/ppxlib-0.26:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( dev-ml/ppx_expect )"
+
+src_compile() {
+	dune-compile ${DUNE_PKG_NAME}
+}
+
+src_test() {
+	dune-test ${DUNE_PKG_NAME}
+}
diff --git a/dev-ml/utop/Manifest b/dev-ml/utop/Manifest
index afa5fc75ca04..cda33a11e231 100644
--- a/dev-ml/utop/Manifest
+++ b/dev-ml/utop/Manifest
@@ -1,10 +1,8 @@
 AUX 50utop-gentoo.el 100 BLAKE2B eb2061a156c26f41f06076905e66212743aca67b3692c14f5347006aeda59f05d973f766fd65c97dfd14ab0dca22cac831076c7809e12d509253483cd0ab8bb4 SHA512 80ef89749dc68e7d339bc6fc63984b56913b3d94c22fa38ab82a6d4e4867ea30e94ce116d25212785d00ce721909fbda3cb3ff9e710e617e241b42f8152b18d2
 DIST utop-2.11.0.tar.gz 416351 BLAKE2B 14d407bd79f83b9b0307ec34ec9330e625e0e5fbc4b4091f98a45d90ff6225c292b6d764746273a5b7e7abda74c83852056f470d8f2f3b16fffc16569ecc6f98 SHA512 ebc27219b0345ab1478499221756806874c430f81aa9f40e7d482d0fd948750919d631b6159faec19fef0d23d14e6a115e6b21a5aa724ce1534e000e5d35bdae
-DIST utop-2.9.0.tar.gz 414953 BLAKE2B 96fbf38d4a638137b73264bc523b8a81e47ddd609a7987073313f4b1d628e4e84c31f98195105911dd0930b8d27007cf5cc1633771bc6d2e975bd169e1e3ba9c SHA512 dd3f52fb915493cb32b5ee722361e884a481d04ef175d5bdf58f4032b70826c38b2f5279b7c64b78961170a86bc80fbd59f03026fac99bb5da2b46a8f341aa45
-DIST utop-2.9.1.tar.gz 421430 BLAKE2B c90a7fe54c5fbf15ce209e9bf850031e0368104c1f8f61a2d982b2b43d87b4bb95c91e3af6da16ae27ebfab71f2b9907e7dec68d34f619597fe8db45ff363bf4 SHA512 10942a4c7d2e13081f2e02c29b767863176fe90ca5baf48d3be47bb0871a12840d873e5d3eb7d7dd9b0362e849f70afb913ff50c07e66c6b7f221c8bb98fa469
+DIST utop-2.12.1.tar.gz 416596 BLAKE2B a8a31c91fd4f989e3d89bc736caa7b611ba0ccc2de905adcd1cf59fff87770d5a00c2d7a43462940269ae8be2f5980fa5b8d2ec7ba547b937cc1e6a579621f2f SHA512 cc52bdb2a58141e6f7b678c93f69b0aa5ca4c628cb6841e02e6a783191a917bd838c06682d55f4f455a01a7004e43b5193d8574968b8400050b0f7b5a102ca3a
 DIST utop-2.9.2.tar.gz 421512 BLAKE2B 235b4739e644877e4b9eef432a00ba053f42f2b4d4fdd9b0bd925af736d9a351c8f9373031bc4fc23835872034d48a27b8eac99d286f57cb975d2b1368f420c8 SHA512 14dd690b459cfea90c565b397b5d914add7e92b152b476ab58576dc827fa204b3d721955bfc3508bcb953778a8d6fb3b299b0293f8ddf64b3f0155fc9a0e7fda
 EBUILD utop-2.11.0-r1.ebuild 1068 BLAKE2B e4f9aa5170aa046f5f07737cbca7e5dac2ab916ad41b7483fc3971cfd3430f28f6d304de4f1b496169093b2a279ba189bb07888710c1f6e60c7cdacc5f514a3e SHA512 d63f4757e29f790d84274f890ba7dcfc90e95c322fc1f94ee853c0a6de7a396ce9ab99780f891207bbf8812c45e665263b6aa4884451f5952fd44b96da0bcecf
-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.12.1.ebuild 1068 BLAKE2B e4f9aa5170aa046f5f07737cbca7e5dac2ab916ad41b7483fc3971cfd3430f28f6d304de4f1b496169093b2a279ba189bb07888710c1f6e60c7cdacc5f514a3e SHA512 d63f4757e29f790d84274f890ba7dcfc90e95c322fc1f94ee853c0a6de7a396ce9ab99780f891207bbf8812c45e665263b6aa4884451f5952fd44b96da0bcecf
 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/utop-2.9.0-r1.ebuild b/dev-ml/utop/utop-2.12.1.ebuild
index cd05e5fc7a0c..0acedbdf1fad 100644
--- a/dev-ml/utop/utop-2.9.0-r1.ebuild
+++ b/dev-ml/utop/utop-2.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,10 +21,11 @@ ELISP_DEPEND="
 	)
 "
 DEPEND="
-	dev-ml/camomile:=
 	dev-ml/lambda-term:=
+	dev-ml/logs:=
 	dev-ml/lwt:=
 	dev-ml/react:=
+	dev-ml/zed:=
 "
 RDEPEND="
 	${DEPEND}
diff --git a/dev-ml/utop/utop-2.9.1-r1.ebuild b/dev-ml/utop/utop-2.9.1-r1.ebuild
deleted file mode 100644
index cd05e5fc7a0c..000000000000
--- a/dev-ml/utop/utop-2.9.1-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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
-}