gentoo auto-resync : 14:03:2023 - 00:16:42

4 files changed, 144 insertions, 0 deletions

diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index dcd390fcfc74..1fa6d35fee58 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -1,5 +1,9 @@
+AUX geneweb-7.0.0_p1-gentoo.patch 1236 BLAKE2B 82e26c3d54245f16067b44ce6cdd87ca47563a6a889c7c44c69fa1a8c89e7ba9819873366c4724b52a70030f94097b9f24f3b975b6da86ddecd8b06de7b055b5 SHA512 811d08dc674f26e8ab2cb514740fcb3e37fc9d72df48fea59d958e407d686a2512b35cb75c048e091d9ec2a4cafe65c9e6f8cbbf49b8a78245e69919192f4453
 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
 EBUILD geneweb-7.0.0-r2.ebuild 1903 BLAKE2B e5e6a59a5441dd7c7355d6feb8c6271557512ca0731aeb7514f2a10fddedbcaf3b9aaa119d1c82af1961ddd8b0739f102cdf7ca738e2b42f47d31b51f1f43c8e SHA512 ac7e3d7fb876aa7c01a6bffd6b68727d5b54383862b0fcee68db8a5ed020bec9702d1f94969b07a19ccedac281268f609d51296519a47e387c6ef254ad1c1e5b
+EBUILD geneweb-7.0.0_p1.ebuild 1822 BLAKE2B 940d3ed8ac5f0c8275716c98657df9954d65b215be9112334dbdafa83488dd0b8f3907ae3700ee4d7e54c068575f4825f66aa1346b49bf9a89600eb9dffdff75 SHA512 bf6ffe1d73ef76cf07b7cf5b19b1070567da661ffe7ab4e845e2ffb5c926bc455c1d698772dcf38569fce2f16fad0535c3e93e500de1559d014ed33cc71fc242
 MISC metadata.xml 653 BLAKE2B eb1a56a2d9653f3dfaa2d22e6e3515f371d0d2f0d8a7fcf645ece5cb9d3c475703dc5c78379522264a3164606246368e1be056b915123aa7fbb9d111807d319f SHA512 923b0b1debec0cc57ce0b5616b187b54f20ad1dd151eda62bce5f12c2f1767f40f236118224e1ff92bd8894e09d5628313ce391220d60ac903240bdf15cda3ef
diff --git a/app-misc/geneweb/files/geneweb-7.0.0_p1-gentoo.patch b/app-misc/geneweb/files/geneweb-7.0.0_p1-gentoo.patch
new file mode 100644
index 000000000000..58d306f6282d
--- /dev/null
+++ b/app-misc/geneweb/files/geneweb-7.0.0_p1-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
+@@ -42,7 +42,7 @@ let partition_map p l =
+   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 ) =
+@@ -157,7 +157,7 @@ let () =
+       List.iter aux [ "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")) ;
+     end ;
+     Printf.fprintf out {||];;|}
+   end ;
+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/files/geneweb.initd-r1 b/app-misc/geneweb/files/geneweb.initd-r1
new file mode 100644
index 000000000000..d01c1cc27911
--- /dev/null
+++ b/app-misc/geneweb/files/geneweb.initd-r1
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting geneweb server"
+	start-stop-daemon -S -u geneweb -x /usr/bin/geneweb.gwd -- -bd /var/lib/geneweb -lang $LANG -log /var/log/geneweb.log -daemon
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping geneweb server"
+	start-stop-daemon -K -u geneweb -x /usr/bin/geneweb.gwd
+	eend $?
+}
diff --git a/app-misc/geneweb/geneweb-7.0.0_p1.ebuild b/app-misc/geneweb/geneweb-7.0.0_p1.ebuild
new file mode 100644
index 000000000000..a57bf577da4b
--- /dev/null
+++ b/app-misc/geneweb/geneweb-7.0.0_p1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+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/${TagId}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="strip
+	!test? ( test )"
+
+DEPEND="
+	dev-ml/re:=
+	dev-ml/uutf:=
+	dev-ml/uunf:=
+	dev-ml/uucp:=
+	dev-ml/unidecode:=
+	dev-ml/calendars:=
+	dev-ml/zarith:=
+	dev-ml/markup:=
+	dev-ml/jingoo:=
+	>=dev-ml/camlp5-8:=[ocamlopt?]
+	dev-ml/ppx_import:=
+	dev-ml/ppx_blob:=
+	acct-user/geneweb
+	acct-group/geneweb
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-ml/cppo
+	test? ( dev-ml/ounit2 )"
+
+QA_FLAGS_IGNORED='.*'
+
+S="${WORKDIR}"/${PN}-${TagId}
+
+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)"
+}