gentoo auto-resync : 27:10:2022 - 03:56:50

8 files changed, 26 insertions, 13 deletions

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 6076e0a11d97..96ff559c867a 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/gen/Manifest b/dev-ml/gen/Manifest
index e56c13ee9fa0..caeb71aeea71 100644
--- a/dev-ml/gen/Manifest
+++ b/dev-ml/gen/Manifest
@@ -1,5 +1,5 @@
 DIST gen-0.5.3.tar.gz 30905 BLAKE2B a6b8351ec4a75dd986cc0b4e9ed60dbfa78c3b8e3625c1e294f8bc0253d92be1f5d27cc7162e1cfc4f6397bbe272df22d9b7b0d1dd410d7760f30cf4c36c4745 SHA512 192178de106d2ae5f936caead8b21b4b9ec1b8fe35ba56296825900ea15a4ea702caf8824ac34d4478d107b954e22c3dffd81f12d4c08fbd6d9760f49a0deb14
 DIST gen-1.0.tar.gz 32266 BLAKE2B 1be57d34e794e8dffae19322e8b2504b0ff10a72608cc1dec4bc55867b50b08a765c88d7e6ec7125884dc2b8ea6752d4eb9c5cd2bcb10c2515250ba04fb21bf7 SHA512 fb4ec2ab35a1aba0dcc8439b11f14a0a785d939f661f505aec88a6f2ca6ca87e14ddfda860d9c180b215190b76690de87040c144582f069224f7e58d37ef48a0
 EBUILD gen-0.5.3-r1.ebuild 521 BLAKE2B a43478ee91922336be346c0d92d5e10df60949dec21c7f855374dae0684a43105d23281a61270947edf427f457c3eaad4bb2aea632a72517cd6cc1da6e473f64 SHA512 16c468c31b00592d7d69acf10c0d257609a79dda916f7111a049da2e4e672a576e261f45e53b275ea41f8e29299db2a4b81503ff9c0a6aa56db6451bb3777a99
-EBUILD gen-1.0-r1.ebuild 548 BLAKE2B f61888b61312a195695d9dd3f29def780888bfb393b1a52f6eac123be42c4314866d4c2987fd2168d2c8a474a008ceec6a83e2f595c9a1f55611d057b9de4f22 SHA512 0a379466c4f4bddde7bf8d0a7585875b7526a9030551cd59ed412996945d8bc7746a2d07ef18ebf14f274d56b574cd876d45d3a34c545fb987a9dfde3227c5bb
+EBUILD gen-1.0-r2.ebuild 562 BLAKE2B cdc2a7cd0ae74f85c4bf6f7bd0cd65b2d49037efd7aeee3053dc63d7779a03fa7ddfd353da38517443c4b8ed15248dca37721ed7759d4ee29980adb882d131ac SHA512 6fd74f23455e74a5ee1f836777b684b00f241627bccf39431f577e57edb78a4b12a4248e8723cd40bcc6295e9a01861412bb5b6883e27bc81738e73fd3e88cd9
 MISC metadata.xml 380 BLAKE2B 4cc697b8fa54689d677e4eb06cc90cb3d2b2b7dfef2585ccffa2846064c78bb1bf39d43f932588426e0b0b2a66fd68be4878bd97e0b2c4578fcf98c2ccddb01c SHA512 91e7d05763f7fbbb52a9dff9808a3c06640f66540543b188a2fe44673f50dc18689dc1fd95f83ca61f9bdf50d79e0951276e67311588cf7213735d3f97d20f05
diff --git a/dev-ml/gen/gen-1.0-r1.ebuild b/dev-ml/gen/gen-1.0-r2.ebuild
index d836571a87d6..cc7656ab88d4 100644
--- a/dev-ml/gen/gen-1.0-r1.ebuild
+++ b/dev-ml/gen/gen-1.0-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+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/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/c-cube/gen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/${PV}"
@@ -15,8 +15,9 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+ocamlopt"
 RESTRICT="test"  # tests fail  > unused-open
 
-DEPEND="
+RDEPEND="
+	>=dev-lang/ocaml-4.07:=[ocamlopt?]
 	dev-ml/dune-configurator:=
-	dev-ml/seq:="
-RDEPEND="${DEPEND}"
+"
+DEPEND="${RDEPEND}"
 # BDEPEND="test? ( dev-ml/qtest )"
diff --git a/dev-ml/ptmap/Manifest b/dev-ml/ptmap/Manifest
index 391495a3e209..af86eec62cf7 100644
--- a/dev-ml/ptmap/Manifest
+++ b/dev-ml/ptmap/Manifest
@@ -1,3 +1,3 @@
 DIST ptmap-2.0.5.tar.gz 15121 BLAKE2B a81d205df6d0d276b4919577eb0fcfe9c33ad9a188c462df74b72722f43153bda84fd23880945d16e0f332041f67869ab708f5a925a689cf1ddb22dc0b9a6d28 SHA512 6815ee977cb9a4c5088af8dfb7d8055c8d35870ceb4e95f658fbdc50405495bea75a8755442dc6f7345d2e9021c3b96d14883603759baf267feced9cd5ba5202
-EBUILD ptmap-2.0.5-r1.ebuild 466 BLAKE2B aa8a0034c492cf33ef0e3872df004e38accf7802180c291a95c1c155ca0b924406d3f1991c81c4172f063d12c3349cc4ac0acb29ff76c860680337fc8fe3eb2d SHA512 80cf6e0064a931cb5cb8288b0384d1eecca57431029f80e9cd6272d81bcdc275ce839afe4b2b5e4aa51e7e6d1233468c3dae7bb2c8ef7636808ab3c6b50dc900
+EBUILD ptmap-2.0.5-r2.ebuild 489 BLAKE2B 0996559c2bc5a08895fa9e8f7c9e8f8ee262e4bc00309686a95a08bff020428669a2e9d45c5cb169ba14271428e1b75ededd94aa1a356ce9c696c9a93f073f5f SHA512 7140454bdc0fa102ab8a41fd571c6bf42c82337ad00dba09a66f9dfa8cf94bdf41d1305ad3eb76a05f17c5b153fa18d0fdca4a2eaa2aa25ccc6f9126ebca0b00
 MISC metadata.xml 396 BLAKE2B e02dd0cdbbbde71ee78d299a9fd709dc85f7c82f9d841ca7321d8bd24087568e1f1c337f67d08de5c42afa687683e25e58fcc67872c5e6a5dbeb176bed22a3e4 SHA512 ff4e86ae430fa12086067b849d9bfcec70ca49807dee15cc38936ceb8f9759b2c232c943719bff5424cd2f9284b60cde9c66fa7bcb59204c763a3326a798f935
diff --git a/dev-ml/ptmap/ptmap-2.0.5-r1.ebuild b/dev-ml/ptmap/ptmap-2.0.5-r2.ebuild
index 161912516ff7..2213fb278c04 100644
--- a/dev-ml/ptmap/ptmap-2.0.5-r1.ebuild
+++ b/dev-ml/ptmap/ptmap-2.0.5-r2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit dune
 
 DESCRIPTION="Maps of integers implemented as Patricia trees"
-HOMEPAGE="https://github.com/backtracking/ptmap"
+HOMEPAGE="https://github.com/backtracking/ptmap/"
 SRC_URI="https://github.com/backtracking/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
-	dev-ml/seq:=
+	>=dev-lang/ocaml-4.07:=[ocamlopt?]
 	dev-ml/stdlib-shims:=
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ml/yojson/Manifest b/dev-ml/yojson/Manifest
index 3afbd22ceaf7..c9f696eaf2da 100644
--- a/dev-ml/yojson/Manifest
+++ b/dev-ml/yojson/Manifest
@@ -1,7 +1,8 @@
+AUX yojson-2.0.2-dune-seq.patch 176 BLAKE2B 83eec30981c810286535e51e8f056de44f112ece17047dca36d32c47fd745eb3b0295337f366d4209129f9305723f3e902c6ef1634c52f51a2db2cdbb25aa46b SHA512 c90c4e2c97333b6a5a4a194310d74881fc04e5341c12939ff69f95ade80704591fcf62f85153a57d0c0127f2823fc6db9ddb12a854785492376cb70365379baf
 DIST yojson-1.7.0.tar.gz 29704 BLAKE2B edbd7f66d69a85880fc8ee9bb25a993744a310887024f7af63665ba8f5067f1b9383ec4d6dd5f4ca3376d698665a8f605c078f7597ddd4e71857c1a20143c2e5 SHA512 25eedb64e4bf7c7e8d5a5a115812cd502540afbdeb7c947da3a14e5968aa0a7db8ab402425662571d8935b9cd6a19796ce81dd80a65dc614f156626c60e7036e
 DIST yojson-2.0.0.tar.gz 44446 BLAKE2B 3b221a016ba418cc6a413921f0d7f2bc239b9a84953bbe9bec2601b159442f3e8bebdf48447367660fec3b3929ea0c08453778e491ce17f9044f505e49d587a6 SHA512 9196e117bb712b970351d12a8d7eae345eef2c92e70e627b58bb95ee49cd58e8a51e6eb5746e2468c15133d53a448ccd229a0568227de0cc8d2eed8b1985609b
 DIST yojson-2.0.2.tar.gz 46731 BLAKE2B adca246c055efe04b63e694b7735fc81a714ae3b3ab164152797cc1eff1e483976b80ff31d0ac90f9d4ac234304ec805abb118bb231d0479bc738ddeb56a236c SHA512 61e8084d66d62d05a7802ee82a414807a76959ce6e0b14fd01f1c9c71ea69976d8a2cf3d5718e4059da4161786136a08624cd8470693ef2893b862efa7d6ffd2
 EBUILD yojson-1.7.0.ebuild 768 BLAKE2B 2cc607961f2f28807c7f21b4321302cc6815c9a7a1a30074544d7c86bca5a8fc42fdd27df3b0485a382c7ae546e8c4cc14f263c3f884f1c78abb57e280b50e6e SHA512 1fcc4b8b8e577162626d0665a0be6dfc7ec622d7e4d9cb7ee80f468728941da6313575b346aab2f0e37257c5cf9b4733ab438250bc053bf52ed856689cd60f5b
 EBUILD yojson-2.0.0.ebuild 823 BLAKE2B b97fc62e1695f573c13ba4a3e40f3dd4e6a18d2a2e2de95727e1e0190b5c58a08b2e629e378bc8243fa08aa7cbc1607b8e3450fb0fda2a1f9c1ae8144a400771 SHA512 d9187abc288ee0a96dfa286240c845686d5886b25c4b7e62444b4e32622c843342077c84fa4ceb275f4692504af7f6bf1fc8e45c2d962621f17291d0b7fb762d
-EBUILD yojson-2.0.2-r2.ebuild 810 BLAKE2B 5bd7cf62c76e5c54e0aa22ab769c0c5f29ffb257a5b9d6cd22cb98d5fa4d3ab75e5b44452e2847d58e42ee7462cad059f68725b603a3a3e93f65309cc09c3443 SHA512 2a430ff72159808c56861c195f957b7ab46c47e471e2285bdffd3d51e14d1dd024a95c8b6896c78400ea249e58f2231f5f15b3dd4251ff462665611f008e820d
+EBUILD yojson-2.0.2-r3.ebuild 857 BLAKE2B 41cdf27f50841eb0427d7f1dbfb3c3b5dbe5cbb6092191d3d211d8ab977ea6c81f934c8ec1ff11fffde51c387c5634b7a614cb896e64e4100d4483b1d836a333 SHA512 db4fa2dd08eec9b1c3103816c71a8964f71f68d65a912b2dfeb2bd30d84d46d09011ff94caa73e572cbce79bff88f7283cc4d5e9601d02dead2fc4ab94255366
 MISC metadata.xml 529 BLAKE2B 4cfc5392ca4b4402f01251818c776c63d607c2e1b8d216930db594ffe2e1146ac52f9492823e5ef97ba7b6f89b2ee8eaf367e785120ca5fcabdb36549ffb6ebd SHA512 7c415ac7330d8d3397911ddd213da9a6cd5dfe76fa2530ab22cbd70cd8f411fbfdb9d40aa8ca66dc202227799fe0b8ff81c81e57815f5e206c7f424b6218baf1
diff --git a/dev-ml/yojson/files/yojson-2.0.2-dune-seq.patch b/dev-ml/yojson/files/yojson-2.0.2-dune-seq.patch
new file mode 100644
index 000000000000..e4783220b822
--- /dev/null
+++ b/dev-ml/yojson/files/yojson-2.0.2-dune-seq.patch
@@ -0,0 +1,8 @@
+--- a/lib/dune
++++ b/lib/dune_
+@@ -34,5 +34,4 @@
+  (public_name yojson)
+  (modules yojson)
+  (synopsis "JSON parsing and printing")
+- (libraries seq)
+  (flags (-safe-string)))
diff --git a/dev-ml/yojson/yojson-2.0.2-r2.ebuild b/dev-ml/yojson/yojson-2.0.2-r3.ebuild
index b2c26c811dab..0b46df9f89c7 100644
--- a/dev-ml/yojson/yojson-2.0.2-r2.ebuild
+++ b/dev-ml/yojson/yojson-2.0.2-r3.ebuild
@@ -7,7 +7,8 @@ inherit dune
 
 DESCRIPTION="JSON parsing and pretty-printing library for OCaml"
 HOMEPAGE="https://github.com/ocaml-community/yojson"
-SRC_URI="https://github.com/ocaml-community/yojson/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/ocaml-community/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
@@ -25,6 +26,8 @@ BDEPEND="
 	test? ( dev-ml/alcotest )
 "
 
+PATCHES=( "${FILESDIR}"/${P}-dune-seq.patch )
+
 src_prepare() {
 	default
 	# let's not build this