gentoo auto-resync : 04:06:2024 - 00:07:50

7 files changed, 136 insertions, 6 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index dc159c6f89f3..57728708a4d8 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index 037bca08709b..3a338feb12ba 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -1,9 +1,12 @@
 AUX geneweb-7.0.0_p1-gentoo.patch 1236 BLAKE2B 82e26c3d54245f16067b44ce6cdd87ca47563a6a889c7c44c69fa1a8c89e7ba9819873366c4724b52a70030f94097b9f24f3b975b6da86ddecd8b06de7b055b5 SHA512 811d08dc674f26e8ab2cb514740fcb3e37fc9d72df48fea59d958e407d686a2512b35cb75c048e091d9ec2a4cafe65c9e6f8cbbf49b8a78245e69919192f4453
+AUX geneweb-7.0.1_alpha2-gentoo.patch 1181 BLAKE2B 2c578ec8506dca225f19f3e0d49bfcde3a8af9e5958aa4f5dc393e5917ac05a65e3a30e128299ab0aeff85ba8408bb0bd54ededa57964e934d570d52923f939e SHA512 00c3dbd53b45a9173a159ba922689f6ad6477390190dc017c26dacd651386b4da59362773e610e3b131ecdc2fc30c0f060daeae48ddcf232fac5ff8769b778a7
 AUX geneweb.confd 67 BLAKE2B 83af31b2708fc64dfba852fce65d6c76bf71bceff40ef5b7ef32a58ea9ae941771569d664f3fc0d555dd8ac9e78740fc0449d1011dbcfeeb66dd320c7b1f44fd SHA512 5d7e373c042ba1de97261807cf3b223157c0f383106b4fb2f2b04de21214218ad3a6e0f097101d45cb61e74d90d060ead93dc6e79a125ad97a0126690ae732b3
 AUX geneweb.initd 429 BLAKE2B d216c7970cd7e62a3732faeee6ac97062712023a6bbad6d6542aaf930f4e7e34d4f3e3cb844b734ee3e8fbae9950438f1a7d5b7206e9a2d304b77095107e5814 SHA512 8daa663aa7d7f614ddd709616411b2078dad492813de80dd9be9866c61a1ed97c41b28ec94fece79648e2c587b991ab0820e6601891add6d0c6867fe82782eb8
 AUX geneweb.initd-r1 445 BLAKE2B 43730c2044e6cf4d32b9479319db6379b947e581634e6c63c361bdd20714117277566cb6d1b22275d2f87af83d659e86c32b61df840bdbd762aff0901827558f SHA512 b2003ba7f06873cc802b18d6c1beb49216b6f187b6a10fbee63c41e8aa07c8f59745ca191b5c99df24bf05088ccce2587bd923ccbcaca11c7086d426ff6044ce
 DIST Geneweb-1eaac340.tar.gz 14741729 BLAKE2B 828857f48175dc0e2af8162dde7b38548e1b9131dfe9acae9b7e8f9940866f27868a1efcfc4c08bdec0fda4789d8b8c87310ba2625cd4f3ba9bc557aaf274bf3 SHA512 ee3effc9b444c05547218b79242db0eb5a56f2ca00b67fcc9937c2395aeb7cbd4dd3524e8b774799e7fb87453ee77d53bc64edb930a1902be6896f8f8d6caa24
 DIST geneweb-7.0.0.tar.gz 14767981 BLAKE2B 3a0a777a934d26fa91bd94d20311c6147e749961035b57aed8322c4e96f5cead2edde3a96e362b5de35073fa594d4cb5f3ef0f4d7eeaebea2095bfeef37740b6 SHA512 359b8e2258d572198a7516dd03830e536038392d552482f25fe4b93ded76dccebfe3c420eb2ba1a566500200755c87cbe19a2060eaeea895bd84c505b7b65345
+DIST geneweb-7.0.1_alpha2.tar.gz 14960087 BLAKE2B 46950389b3e0591daa4dd3672d7b133166df805ab091ac344fba32dd46c1c13c48d523dcd3fab0fcbf7d5f113eed9b4998fe52a20b3b85a5f67be0ff0bc676dc SHA512 454552bf6fec9ac5ba20caeae85d0df821c651c56521ebbdaace3c199a764436d3538cc7fd0e0abc71519d78e00cbef8696f5d5c5f7c6bdf61014b7a85800d74
 EBUILD geneweb-7.0.0-r3.ebuild 1919 BLAKE2B 5125e0347e075a937b9b44f655a145f8556de19b42944774fe9bf59162ffe8fba281d9eddcbf0c21f2bf7657f424fc061c72664c4f981f97a055877e105fc399 SHA512 95579962a4c2153cbef927fb28a03ea647b98e451f112aab9d194a5c0be97bc6339ec13eb951c7ccf397695f75e8ad4a95cd94baec30cf4c46a042a7da47ebdc
 EBUILD geneweb-7.0.0_p1-r1.ebuild 1836 BLAKE2B 732aba301fbda955a1c974919a059f520aa42314a114b7931bc33ab9d4f01900f2c68f20e618f585304f59dd16cad61d9576ad38a02b3f91e9a170e31d3e8830 SHA512 8e979eae59f7e96413010cbf77c1a187737933e83c55c4f67b0e3bcdc8d3e99b5be2008472386f9512446bc342fb277abee8ae8273dcd91e34c3802ec02083b3
+EBUILD geneweb-7.0.1_alpha2.ebuild 1946 BLAKE2B 763a27ae08b00395543b9ca2d4a6c680752d1b54a7864595ee716bebb4fab1089c74bde1d7e1c677fbea966867db1bae28db2f7345c629e4584e58b0483fe560 SHA512 fd3af4ef0a1fbfe48a7643aaef09fde4b6bd15d8a901fadf674aa7a506b893036728783dcaad8e1755ed34e7398f378891f319e80eed7ac34258ce6f576841e6
 MISC metadata.xml 653 BLAKE2B eb1a56a2d9653f3dfaa2d22e6e3515f371d0d2f0d8a7fcf645ece5cb9d3c475703dc5c78379522264a3164606246368e1be056b915123aa7fbb9d111807d319f SHA512 923b0b1debec0cc57ce0b5616b187b54f20ad1dd151eda62bce5f12c2f1767f40f236118224e1ff92bd8894e09d5628313ce391220d60ac903240bdf15cda3ef
diff --git a/app-misc/geneweb/files/geneweb-7.0.1_alpha2-gentoo.patch b/app-misc/geneweb/files/geneweb-7.0.1_alpha2-gentoo.patch
new file mode 100644
index 000000000000..2d1d663895df
--- /dev/null
+++ b/app-misc/geneweb/files/geneweb-7.0.1_alpha2-gentoo.patch
@@ -0,0 +1,35 @@
+diff --git a/bin/gwrepl/mk_data.ml b/bin/gwrepl/mk_data.ml
+index b2a808b65..e497a238c 100644
+--- a/bin/gwrepl/mk_data.ml
++++ b/bin/gwrepl/mk_data.ml
+@@ -46,7 +46,7 @@
+   Printf.fprintf out "\n#endif\n"
+ 
+ let () =
+-  let opam_swich_prefix = Sys.getenv "OPAM_SWITCH_PREFIX" in
++  let opam_swich_prefix = "/usr" in
+   let opam_swich_prefix_lib = opam_swich_prefix // "lib" in
+ 
+   let dune_root, root, (directories0, files0) =
+@@ -185,7 +185,7 @@
+         "ocaml" // "stublibs" // "dllcamlstr.so";
+         "ocaml" // "stublibs" // "dllunix.so";
+       ];
+-    if_sosa_zarith out (fun () -> aux ("stublibs" // "dllzarith.so")));
++    if_sosa_zarith out (fun () -> aux ("ocaml" // "stublibs" // "dllzarith.so")));
+   Printf.fprintf out {||];;|};
+   let b = Buffer.create 1024 in
+   let aux =
+diff --git a/test/dune.in b/test/dune.in
+index ef891bbce..ac2a2b9e1 100644
+--- a/test/dune.in
++++ b/test/dune.in
+@@ -7,7 +7,7 @@
+ 
+ (executable
+   (name test)
+-  (libraries %%%SOSA_PKG%%% dummy_gwdb geneweb geneweb_def_show oUnit stdlib-shims)
++  (libraries %%%SOSA_PKG%%% dummy_gwdb geneweb geneweb_def_show ounit2 stdlib-shims)
+   (preprocess (pps ppx_deriving.show))
+   (modules
+     test
diff --git a/app-misc/geneweb/geneweb-7.0.1_alpha2.ebuild b/app-misc/geneweb/geneweb-7.0.1_alpha2.ebuild
new file mode 100644
index 000000000000..da9946d6eb59
--- /dev/null
+++ b/app-misc/geneweb/geneweb-7.0.1_alpha2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+MYPV=${PV/_/-}
+
+TagId=Geneweb-1eaac340
+DESCRIPTION="Genealogy software program with a Web interface"
+HOMEPAGE="https://github.com/geneweb/geneweb"
+SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${MYPV}.tar.gz
+	-> ${P}.tar.gz"
+
+S="${WORKDIR}"/${PN}-${MYPV}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="strip
+	!test? ( test )"
+
+DEPEND="
+	acct-group/geneweb
+	acct-user/geneweb
+	dev-ml/calendars:=
+	>=dev-ml/camlp5-8:=[ocamlopt?]
+	dev-ml/camlp-streams:=
+	dev-ml/jingoo:=
+	dev-ml/markup:=
+	dev-ml/num:=
+	dev-ml/ppx_blob:=
+	dev-ml/ppx_deriving:=
+	dev-ml/ppx_import:=
+	dev-ml/re:=
+	dev-ml/stdlib-shims
+	dev-ml/unidecode:=
+	dev-ml/uucp:=
+	dev-ml/uunf:=
+	dev-ml/uutf:=
+	dev-ml/zarith:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-ml/cppo
+	>=dev-ml/dune-2.9
+	dev-ml/findlib
+	test? ( dev-ml/ounit2 )"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+	default
+	sed -i \
+		-e "/opam_swich_prefix_lib/s|\"lib|\"$(get_libdir)|" \
+		bin/gwrepl/mk_data.ml \
+		|| die
+}
+
+src_configure() {
+	ocaml ./configure.ml --sosa-zarith || die
+}
+
+src_compile() {
+	emake distrib
+}
+
+src_install() {
+	dune_src_install
+	rm "${D}"/usr/share/doc/${PF}/geneweb/LICENSE || die
+	mv "${D}"/usr/share/doc/${PF}/geneweb/* "${D}"/usr/share/doc/${PF}/ || die
+
+	dodoc ICHANGES etc/README.txt etc/a.gwf
+
+	# Install manpages
+	doman man/*
+
+	cd distribution/gw
+	insinto /usr/share/${PN}
+	doins -r etc images lang setup gwd.arg
+
+	newinitd "${FILESDIR}/geneweb.initd-r1" geneweb
+	newconfd "${FILESDIR}/geneweb.confd" geneweb
+}
+
+pkg_postinst() {
+	einfo "If you come from an old version you need to rebuild the database"
+	einfo "\"geneweb.gwu foo -o foo.gw \" will save the database (use the previous"
+	einfo "version to do that). \"geneweb.gwc foo.gw -o bar \" will restore it "
+	einfo "(using the current package)"
+}
diff --git a/app-misc/terminal-colors/Manifest b/app-misc/terminal-colors/Manifest
index b7b25039979b..1d181e3408c6 100644
--- a/app-misc/terminal-colors/Manifest
+++ b/app-misc/terminal-colors/Manifest
@@ -1,4 +1,4 @@
 DIST terminal-colors-3.0.2.tar.gz 152226 BLAKE2B 95179e27f4e1af1008dd0da01917aad1c7e4d192f9cfe30a18c1f24b7a038b4cd88349f8c7f2f84bfd8bc1ef53f558579275e9c31a6d76414d241a3f3186bafd SHA512 517506b7508251eeb151032b8071e4225efb19207b4b50aee2ad5b9a58063ce78c39f7193135ca66669d88bc1d6cc54b614d1584d877d1891f35541c7b3bb4a1
-EBUILD terminal-colors-3.0.2.ebuild 794 BLAKE2B a121269f9af94266780cb96de5196c5e576123f8acfd2fd5cfab1774b3179727cd8a05da302879ae3965f345354f11cd2317dc05f00f6fc10da7dc154de2dc91 SHA512 ab1ef1370495b76c4dd0449b3869c7bf7c1ea3c226bfd5b8e6a1e210cc516a41b5a37ced149eda9984972975d9318b11b963df2e10976808f0707fe24bc3deee
-EBUILD terminal-colors-9999.ebuild 796 BLAKE2B 6a146451f7923801e2d3d9c9f5b04863aff89808ad62856ff05a96acd0f147c49a099f670692733a93c632650485280f3902b4936d74b50343b3e2a8f551bce6 SHA512 89f6de24f24ec957276ad4a24f2dc0801ae93dc381dfcaff5cedcddd53366bf1e59ebdb4241b620f71bb95be92d4ed5d788fcdcfeb4d0eba7394772d7bfdea69
+EBUILD terminal-colors-3.0.2.ebuild 794 BLAKE2B cac7e52ce24c31da2cd9d4faabcabc3d06fc450f5107595c3ea4ea4b6f1c1685febf7f7ee46eb65980251339a40b5d309f384175f8a210ad573ea3f4ab6b89a4 SHA512 f9a0972ae88207411947106de843c237f503aed32eb31285ae1c3fea2a2c4556bb09c8de41b945c077cc9d0d675b3a789a45da7445f7212933b979832cd9976a
+EBUILD terminal-colors-9999.ebuild 796 BLAKE2B 7ef827d04b841432a8203a9996fd584b84ff6a813be0fe900b337e59564818e9d145792196a590dcde1a6fa1bc809044e40d946c8361752ca9ef721b23335a85 SHA512 d1c12a1f32b4db1c20f6a053b7a7e32cce6acd6e54eff53b6aa0a369f1c186b7b30385861c76303f3050abbf8eca9fcef006718f722da817efa8ad6d8f3b0bc0
 MISC metadata.xml 260 BLAKE2B bee9f8e408c1b1ca071956aaed2501bd32215b313a2dfae99ad9ac3f2b73a5ce6620ade8d58ead51ed5a72d8d32a7e0464d2e1161359e816a4d300baa19146de SHA512 d31a618cb69741eb01c87dc2f46ea2e558ec49df9a40b9fbe180a1ccc9259c741720c6f119eb27a99bd63e18007773ed763d3cf15f97ff33b90e3a9a90952e22
diff --git a/app-misc/terminal-colors/terminal-colors-3.0.2.ebuild b/app-misc/terminal-colors/terminal-colors-3.0.2.ebuild
index f127d91a60d5..44a2ad35aacd 100644
--- a/app-misc/terminal-colors/terminal-colors-3.0.2.ebuild
+++ b/app-misc/terminal-colors/terminal-colors-3.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 PYTHON_REQ_USE="ncurses"
 
 inherit python-r1
diff --git a/app-misc/terminal-colors/terminal-colors-9999.ebuild b/app-misc/terminal-colors/terminal-colors-9999.ebuild
index 2c12ca92f090..0173925b3142 100644
--- a/app-misc/terminal-colors/terminal-colors-9999.ebuild
+++ b/app-misc/terminal-colors/terminal-colors-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 PYTHON_REQ_USE="ncurses"
 
 inherit python-r1