gentoo resync : 14.07.2018

4 files changed, 86 insertions, 0 deletions

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
index 000000000000..71cfab667fc1
--- /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/files/geneweb-6.08-r1-gentoo.patch b/app-misc/geneweb/files/geneweb-6.08-r1-gentoo.patch
new file mode 100644
index 000000000000..e5a43be720ee
--- /dev/null
+++ b/app-misc/geneweb/files/geneweb-6.08-r1-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	2017-03-06 08:15:45.334667626 +0100
++++ geneweb-6.08/tools/Makefile.inc.unix	2017-03-06 08:16:10.162223399 +0100
+@@ -6,11 +6,11 @@
+ CAMLP5F=-DUNIX
+ CAMLP5D=+camlp5
+ LIBUNIX=-cclib -lunix
+-OCAMLC=ocamlc.opt -w -3 -warn-error +a-52
+-OCAMLOPT=ocamlopt.opt -w -3 -warn-error +a-52
++OCAMLC=ocamlc.opt -w -3
++OCAMLOPT=ocamlopt.opt -w -3
+ OCAMLI=
+ OCAMLD=
+-STRIP=strip
++STRIP=true
+ RM=/bin/rm -f
+ EXE=
+ STATIC=-ccopt -static
diff --git a/app-misc/geneweb/files/geneweb.confd b/app-misc/geneweb/files/geneweb.confd
new file mode 100644
index 000000000000..3a93f09d8f19
--- /dev/null
+++ b/app-misc/geneweb/files/geneweb.confd
@@ -0,0 +1,6 @@
+#
+# GeneWeb Configuration Data
+#
+
+# The default language
+LANG="it"
diff --git a/app-misc/geneweb/files/geneweb.initd b/app-misc/geneweb/files/geneweb.initd
new file mode 100644
index 000000000000..bd0649193bdb
--- /dev/null
+++ b/app-misc/geneweb/files/geneweb.initd
@@ -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/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/gwd
+	eend $?
+}