app-misc/geneweb: Bump version to 6.08

Package-Manager: portage-2.3.0

diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index 325a6215ab2fe650ddf52c5f251b562d96a2f3c9..5061eee10cb5873c8f3be1ddd34da840d223bb3a 100644 (file)
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -1,2 +1,3 @@
 DIST geneweb-6.07-reduce-utf8.ml.patch.gz 185409 SHA256 cc5b7d30333e8c7b187b83106189b5e63a7d423c2e500b77b5d087cd8cd239fa SHA512 d6b71fc6d3a1488f6e96e65ab0c942c08b9e0307b2d06c9bb97fde0c2e35af2fb4b52011024e67550e608603eacfaf5ee312c99c9228edfedc2dbe82745de227 WHIRLPOOL 75e30b8ef19803dcc6f391fc798c2bb4d4e4fa685d0d5d060dcb1a9ad676a45f5016fef2e6306019876d0d30d662ee3f67f361267a2829b2ce679836c573104c
+DIST geneweb-6.08.tar.gz 1791450 SHA256 ba5724f8b6a4c823760642d31eaed713ac04c1000ef6f8e4a19ff748baa058bf SHA512 7f1d552342e8a5b05961be75c1afb768853f22cc7eb4477fa63d6a3af29ea852862ce043ae89cd1589ede20fe561ad7d77ab757cc1ecb26ce1473f0e3621b835 WHIRLPOOL 81e125e5f0431f25d42ae4068708fae22341b802c68efde1d4e5494090d4644a249f41989e3a29f6ebb4a0d3c91cd35bdde996194cb4c34502bc22d75a2c8f90
 DIST gw-6.07-src.tgz 1855016 SHA256 c1ecc337f8bce4d8509ca49081d098b5a44ddb6407208496e55e9a38d6bfb1f6 SHA512 719884af80809b25946175731ae20b280e13f6e18471903d2222928c11838a2a92a43f03dd8152b7b01dfcaf45fbd942035f4b54f049899ea134cd161cfc971d WHIRLPOOL 70305616cafcb9476814e3fe8355571611fef4eabe022afd2f3b92c3a9c9c6bc2be69a37532e4b04cc16e9ce8979abda1b103f4606a8784bf64caa0c1b9ff5e5

diff --git a/app-misc/geneweb/files/geneweb-6.08-gentoo.patch b/app-misc/geneweb/files/geneweb-6.08-gentoo.patch
new file mode 100644 (file)
index 0000000..6e33da8
--- /dev/null
+++ b/app-misc/geneweb/files/geneweb-6.08-gentoo.patch
@@ -0,0 +1,30 @@
+--- geneweb-6.08/setup/setup.ml.old    2007-08-07 19:25:13.000000000 +0200
++++ geneweb-6.08/setup/setup.ml        2007-08-07 19:24:59.000000000 +0200
+@@ -5,8 +5,8 @@
+ 
+ value port = ref 2316;
+ value default_lang = ref "en";
+-value setup_dir = ref ".";
+-value bin_dir = ref "";
++value setup_dir = ref "/usr/share/geneweb";
++value bin_dir = ref "/usr/bin";
+ value lang_param = ref "";
+ value only_file = ref "";
+ 
+--- geneweb-6.08/tools/Makefile.inc.unix.old   2008-04-23 15:22:50.000000000 +0200
++++ geneweb-6.08/tools/Makefile.inc.unix       2008-04-23 15:23:04.000000000 +0200
+@@ -5,11 +5,11 @@
+ CAMLP5F=-DUNIX
+ CAMLP5D=+camlp5
+ LIBUNIX=-cclib -lunix
+-OCAMLC=ocamlc.opt -warn-error A
+-OCAMLOPT=ocamlopt.opt -warn-error A
++OCAMLC=ocamlc.opt
++OCAMLOPT=ocamlopt.opt
+ OCAMLI=
+ OCAMLD=
+-STRIP=strip
++STRIP=true
+ RM=/bin/rm -f
+ EXE=
+ STATIC=-ccopt -static

diff --git a/app-misc/geneweb/files/geneweb-6.08-parallellbuild.patch b/app-misc/geneweb/files/geneweb-6.08-parallellbuild.patch
new file mode 100644 (file)
index 0000000..71cfab6
--- /dev/null
+++ b/app-misc/geneweb/files/geneweb-6.08-parallellbuild.patch
@@ -0,0 +1,31 @@
+--- geneweb-6.08/wserver/Makefile.old  2017-01-09 21:15:00.328750224 +0100
++++ geneweb-6.08/wserver/Makefile      2017-01-09 21:15:16.825751748 +0100
+@@ -11,6 +11,8 @@
+       camlp5r pa_extend.cmo q_MLast.cmo -o pa_macro5.ppo pa_macro5.ml
+       ocamlc -c -I "`camlp5 -where`" -impl pa_macro5.ppo
+ 
++wserver.cmi: pa_macro5.cmo
++
+ depend:
+       TOP=.. ../tools/camlp5_depend.sh $(OCAMLI) *.ml* > .depend
+ 
+--- geneweb-6.08/src/.depend.old       2017-01-09 21:36:25.644868941 +0100
++++ geneweb-6.08/src/.depend   2017-01-09 21:37:04.994872576 +0100
+@@ -39,7 +39,7 @@
+ check_base.cmx: check.cmx def.cmi gwdb.cmx secure.cmx
+ compilation.cmo: def.cmi util.cmi
+ compilation.cmx: def.cmi util.cmx
+-config.cmi: def.cmi
++config.cmi: def.cmi gwdb.cmi
+ consang.cmo: adef.cmi def.cmi gwdb.cmi consang.cmi
+ consang.cmx: adef.cmx def.cmi gwdb.cmx consang.cmi
+ consang.cmi: def.cmi gwdb.cmi
+@@ -311,7 +311,7 @@
+     num.cmi perso.cmi ../wserver/wserver.cmi
+ searchName.cmx: adef.cmx buff.cmx checkItem.cmx config.cmi date.cmx def.cmi \
+     gutil.cmx gwdb.cmx hutil.cmx mutil.cmx name.cmx util.cmx \
+-    num.cmx perso.cmx ../wserver/wserver.cmx
++    num.cmx perso.cmx ../wserver/wserver.cmx some.cmo
+ secure.cmo: secure.cmi
+ secure.cmx: secure.cmi
+ select.cmo: adef.cmi def.cmi gutil.cmi gwdb.cmi name.cmi

diff --git a/app-misc/geneweb/geneweb-6.08.ebuild b/app-misc/geneweb/geneweb-6.08.ebuild
new file mode 100644 (file)
index 0000000..7f84cfe
--- /dev/null
+++ b/app-misc/geneweb/geneweb-6.08.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils user
+
+DESCRIPTION="Genealogy software program with a Web interface"
+HOMEPAGE="http://opensource.geneanet.org/projects/geneweb"
+SRC_URI="https://github.com/geneweb/geneweb/archive/v6.08.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="dev-lang/ocaml[ocamlopt?]
+       dev-ml/camlp5[ocamlopt?]"
+DEPEND="${RDEPEND}
+       !net-p2p/ghostwhitecrab"
+
+PATCHES=(
+       "${FILESDIR}"/${P}-gentoo.patch
+       "${FILESDIR}"/${P}-parallellbuild.patch )
+
+src_compile() {
+       if use ocamlopt; then
+               emake
+       else
+               emake OCAMLC=ocamlc OCAMLOPT=ocamlopt out
+               # If using bytecode we dont want to strip the binary as it would remove
+               # the bytecode and only leave ocamlrun...
+               export STRIP_MASK="*/bin/*"
+       fi
+}
+
+src_install() {
+       dodoc ICHANGES
+       emake distrib
+       # Install doc
+       cd distribution
+       dodoc CHANGES.txt
+       # Install binaries
+       cd gw
+       dobin gwc gwc1 gwc2 consang gwd gwu update_nldb ged2gwb ged2gwb2 gwb2ged gwsetup
+       insinto /usr/lib/${PN}
+       doins -r gwtp_tmp/*
+       dodoc a.gwf
+       insinto /usr/share/${PN}
+       doins -r etc images lang setup gwd.arg only.txt
+
+       cd ../..
+
+       # Install binaries
+       dobin src/check_base
+       # Install manpages
+       doman man/*
+
+       # Install doc
+       insinto /usr/share/doc/${PF}/contrib
+       doins -r contrib/{gwdiff,misc}
+
+       newinitd "${FILESDIR}/geneweb.initd" geneweb
+       newconfd "${FILESDIR}/geneweb.confd" geneweb
+}
+
+pkg_postinst() {
+       enewuser geneweb "" "/bin/bash" /var/lib/geneweb
+       einfo "A CGI program has been installed in /usr/lib/${PN}. Follow the"
+       einfo "instructions on the README in that directory to use it"
+       einfo "For 64 bits architecture you need to rebuild the database"
+       einfo "\"gwu foo > foo.gw \" will save the database (use the previous"
+       einfo "version to do that). \"gwc2 foo.gw -o bar \" will restore it "
+       einfo "(using the current package)"
+}