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

3 files changed, 38 insertions, 53 deletions

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}
+}