gentoo auto-resync : 14:03:2025 - 00:28:41

4 files changed, 29 insertions, 3 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 9a80120861de..38191db51356 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index defcdb1a3150..e5c0d0fbff66 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -1,4 +1,5 @@
 AUX geneweb-7.0.0_p1-gentoo.patch 1236 BLAKE2B 82e26c3d54245f16067b44ce6cdd87ca47563a6a889c7c44c69fa1a8c89e7ba9819873366c4724b52a70030f94097b9f24f3b975b6da86ddecd8b06de7b055b5 SHA512 811d08dc674f26e8ab2cb514740fcb3e37fc9d72df48fea59d958e407d686a2512b35cb75c048e091d9ec2a4cafe65c9e6f8cbbf49b8a78245e69919192f4453
+AUX geneweb-7.0.1_alpha2-camlp5.patch 784 BLAKE2B 1cea1a86f56be85e46778439e2df4d8b0ab5042609d35b774ee05799079a9c4aa97cbb07bc79fa569c242a6318a3d961f26a00e285d245b81ad99a98693982c5 SHA512 8532db1241da15611a3fe9dff4016b76e64ac02483d2b7351ebf6f918e092b96a7290bf6c899a4e7882ceb55442ea10fd7dd42a89d500071d93fcb01e91b53bd
 AUX geneweb-7.0.1_alpha2-gentoo.patch 1181 BLAKE2B 2c578ec8506dca225f19f3e0d49bfcde3a8af9e5958aa4f5dc393e5917ac05a65e3a30e128299ab0aeff85ba8408bb0bd54ededa57964e934d570d52923f939e SHA512 00c3dbd53b45a9173a159ba922689f6ad6477390190dc017c26dacd651386b4da59362773e610e3b131ecdc2fc30c0f060daeae48ddcf232fac5ff8769b778a7
 AUX geneweb-7.0.1_alpha2-nogwrepl.patch 279 BLAKE2B bd98c4d890ed09ffff07600248830fadaf819e2b7b4e434148cc2ce370b0d93133fae811ae2bfeed6b97c5ae0e4ecf07eeec1c484332a43ffe4a1f905defbd0c SHA512 17bbeab3456699658cb5ff03aedd92f74a3a6a9cce077a9e4b9c90b96899b28ec8c397cd8a1968deba0a8c20062f1c5c63cdc624d8a3870ec699c067166ca22a
 AUX geneweb.confd 67 BLAKE2B 83af31b2708fc64dfba852fce65d6c76bf71bceff40ef5b7ef32a58ea9ae941771569d664f3fc0d555dd8ac9e78740fc0449d1011dbcfeeb66dd320c7b1f44fd SHA512 5d7e373c042ba1de97261807cf3b223157c0f383106b4fb2f2b04de21214218ad3a6e0f097101d45cb61e74d90d060ead93dc6e79a125ad97a0126690ae732b3
@@ -7,5 +8,5 @@ AUX geneweb.initd-r1 445 BLAKE2B 43730c2044e6cf4d32b9479319db6379b947e581634e6c6
 DIST Geneweb-1eaac340.tar.gz 14741729 BLAKE2B 828857f48175dc0e2af8162dde7b38548e1b9131dfe9acae9b7e8f9940866f27868a1efcfc4c08bdec0fda4789d8b8c87310ba2625cd4f3ba9bc557aaf274bf3 SHA512 ee3effc9b444c05547218b79242db0eb5a56f2ca00b67fcc9937c2395aeb7cbd4dd3524e8b774799e7fb87453ee77d53bc64edb930a1902be6896f8f8d6caa24
 DIST geneweb-7.0.1_alpha2.tar.gz 14960087 BLAKE2B 46950389b3e0591daa4dd3672d7b133166df805ab091ac344fba32dd46c1c13c48d523dcd3fab0fcbf7d5f113eed9b4998fe52a20b3b85a5f67be0ff0bc676dc SHA512 454552bf6fec9ac5ba20caeae85d0df821c651c56521ebbdaace3c199a764436d3538cc7fd0e0abc71519d78e00cbef8696f5d5c5f7c6bdf61014b7a85800d74
 EBUILD geneweb-7.0.0_p1-r2.ebuild 1857 BLAKE2B ad1b40b462ff357be90f5d4e74b2c4e6c496d34cc20717b5e485dc04444fc483634508a10d048ec1b9850a9e7dc4e140d978233b4990d2f40d8e3f2acf31528b SHA512 942acf870ff5ba3f2eb292e3ee85bdaca077583263898cc6a010d52503b06f12ed7d3653866e6a0d1cc9fcd1e39a3ad9b742a3871feb93a11d56fdc106a821ef
-EBUILD geneweb-7.0.1_alpha2-r2.ebuild 1992 BLAKE2B 8ad97c118f58a3f9c29feaa8075b98ed829935a4f0b878ec93c23621b69dbd8a76482303d6c8ed09dc25cf38d789a3f086567fc3fb9b6a4f487d69782232d5e0 SHA512 641684ec1d15c273ec65719616f8376a2bd1119189b5df10268e86eee3234c37bd8c6bbb61cde340436c60cb67bb855e7f79c0ca944dcd5a5646e9548cb70357
+EBUILD geneweb-7.0.1_alpha2-r3.ebuild 2104 BLAKE2B 4bcce70acb2b77870156e5bab8896ac65028fcfa852976e281a6905c41a3f9979389a572432c61fcdcf8f74cf4324c56b52e18458d57888ec208b60c7895bf75 SHA512 24b0c66f9c932f9e0a3e624317124d3bd0d126f645204f189777710f556c48e9abee1defcf1eefc763152480e858e4783ecfa52872d1a70c556550517f48b302
 MISC metadata.xml 653 BLAKE2B eb1a56a2d9653f3dfaa2d22e6e3515f371d0d2f0d8a7fcf645ece5cb9d3c475703dc5c78379522264a3164606246368e1be056b915123aa7fbb9d111807d319f SHA512 923b0b1debec0cc57ce0b5616b187b54f20ad1dd151eda62bce5f12c2f1767f40f236118224e1ff92bd8894e09d5628313ce391220d60ac903240bdf15cda3ef
diff --git a/app-misc/geneweb/files/geneweb-7.0.1_alpha2-camlp5.patch b/app-misc/geneweb/files/geneweb-7.0.1_alpha2-camlp5.patch
new file mode 100644
index 000000000000..6ba4b4238760
--- /dev/null
+++ b/app-misc/geneweb/files/geneweb-7.0.1_alpha2-camlp5.patch
@@ -0,0 +1,20 @@
+--- a/bin/ged2gwb/dune.in	2025-03-12 08:45:52.250610591 +0100
++++ b/bin/ged2gwb/dune.in	2025-03-12 08:46:33.553114512 +0100
+@@ -2,6 +2,6 @@
+   (name ged2gwb)
+   (public_name geneweb.ged2gwb)
+   (modules ged2gwb)
+-  (preprocess (action (run camlp5o pr_o.cmo pa_extend.cmo q_MLast.cmo %{input-file})))
++  (preprocess (action (run camlp5o o_keywords.cmo pr_o.cmo pa_extend.cmo q_MLast.cmo %{input-file})))
+   (libraries camlp5 unix str %%%GWDB_PKG%%% %%%SOSA_PKG%%% geneweb)
+ )
+--- a/bin/ged2gwb/ged2gwb.ml	2025-03-13 13:44:01.734882122 +0100
++++ b/bin/ged2gwb/ged2gwb.ml	2025-03-13 13:46:15.738227429 +0100
+@@ -466,6 +466,7 @@
+   ; Token.tok_match = tparse
+   ; Token.tok_text = (fun _ -> "<tok>")
+   ; Token.tok_comm = None
++  ; Token.kwds = Hashtbl.create 301
+   }
+ 
+ type 'a range =
diff --git a/app-misc/geneweb/geneweb-7.0.1_alpha2-r2.ebuild b/app-misc/geneweb/geneweb-7.0.1_alpha2-r3.ebuild
index 269b117f05f2..a9bd0cb92200 100644
--- a/app-misc/geneweb/geneweb-7.0.1_alpha2-r2.ebuild
+++ b/app-misc/geneweb/geneweb-7.0.1_alpha2-r3.ebuild
@@ -25,8 +25,7 @@ DEPEND="
 	acct-group/geneweb
 	acct-user/geneweb
 	dev-ml/calendars:=
-	>=dev-ml/camlp5-8:=[ocamlopt?]
-	<dev-ml/camlp5-8.03
+	>=dev-ml/camlp5-8.03.00:=[ocamlopt?]
 	dev-ml/camlp-streams:=
 	dev-ml/jingoo:=
 	dev-ml/markup:=
@@ -51,6 +50,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-nogwrepl.patch
+	"${FILESDIR}"/${P}-camlp5.patch
 )
 
 src_prepare() {
@@ -59,6 +59,11 @@ src_prepare() {
 		-e "/opam_swich_prefix_lib/s|\"lib|\"$(get_libdir)|" \
 		bin/gwrepl/mk_data.ml \
 		|| die
+	sed -i \
+		-e "s:Printexc.catch ::" \
+		bin/gwb2ged/gwb2ged.ml \
+		bin/gwu/gwu.ml \
+		|| die
 }
 
 src_configure() {