gentoo resync : 15.01.2020

4 files changed, 122 insertions, 12 deletions

diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index 1920646579ed..299bb0d7e502 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -1,8 +1,9 @@
-AUX geneweb-6.08-parallellbuild.patch 1264 BLAKE2B fa7e9a94705ce2bf439888b2e64f889a69e29b6897c46e40f4d86c3d6d56d2fc9ab2790b0514b7e52dce93c0774fe3f006d889f3ed4a02342e8694c4e8b95a7d SHA512 2912f591f0c771b9bc039871416bd74364fe4a0c17200ea191033a3d12c4de4e088ddd24829ef07acb918e0f8be91671112ae7ebe0593b96a66945b6c18ecedf
+AUX geneweb-6.08-parallellbuild.patch 3166 BLAKE2B 3dd6874e194947f98be325ba0125f5d7a91798e9262e7fea2df434277c2300c1e96df70c463d166750c6fad9f6f43b2aa9735b6934f7718328fbd77a1311f9e8 SHA512 baa9790ea22e6c4f29c8fd496228296fee178a78b2539a37cda69750d7a20d0921722893343084efebe3fc3f3f84403e0db8e068fd4e8bdc49f5c81c2f25f907
 AUX geneweb-6.08-r1-gentoo.patch 865 BLAKE2B e2ebc31647148ccb18f173088d6fe7da5725e20f5897db5d8f998ad275ca765fc80d19a5f387225e6b2a003e8c0af6b46dfa44c85491d495f150a9c50e5c0659 SHA512 d4e74036384123884487458a5c3ae1f35ab39b87e31239c92f800fa5e758efdb52dc4cf84686295daec78e93cf06099a1738cc1a13add659547a44352999c3b5
 AUX geneweb.confd 67 BLAKE2B 83af31b2708fc64dfba852fce65d6c76bf71bceff40ef5b7ef32a58ea9ae941771569d664f3fc0d555dd8ac9e78740fc0449d1011dbcfeeb66dd320c7b1f44fd SHA512 5d7e373c042ba1de97261807cf3b223157c0f383106b4fb2f2b04de21214218ad3a6e0f097101d45cb61e74d90d060ead93dc6e79a125ad97a0126690ae732b3
 AUX geneweb.initd 429 BLAKE2B d216c7970cd7e62a3732faeee6ac97062712023a6bbad6d6542aaf930f4e7e34d4f3e3cb844b734ee3e8fbae9950438f1a7d5b7206e9a2d304b77095107e5814 SHA512 8daa663aa7d7f614ddd709616411b2078dad492813de80dd9be9866c61a1ed97c41b28ec94fece79648e2c587b991ab0820e6601891add6d0c6867fe82782eb8
 DIST geneweb-6.08-ocaml-4.patch.gz 22259 BLAKE2B c3471b44bae06db04f51f4fbfacaf5d93388f79673686d0fdd988df482f836bd49f853c5acb3b94c39f890b7d9bd8d118b4042100c466a06a2e57227da9eee3b SHA512 333a9ca899bf454e1c534f6c890b5cbe842821573b39e9d0e432cfbdf30dbe3a495a5ecb5a9b4a00882ee51bbb3ec1ca4b417e34050a7f84e434d0424c126def
 DIST geneweb-6.08.tar.gz 1791450 BLAKE2B 35fcd0a4087892b992b87dd4fb54b458be0e300042a237458fdeea9a4a9b8649f93261d896d6b7ad19b681b95b343013d99d99027d86b1796f74cab916178d32 SHA512 7f1d552342e8a5b05961be75c1afb768853f22cc7eb4477fa63d6a3af29ea852862ce043ae89cd1589ede20fe561ad7d77ab757cc1ecb26ce1473f0e3621b835
-EBUILD geneweb-6.08-r1.ebuild 1991 BLAKE2B ad17604b4d304e1a63def7cebf64929a7d2a0a66016bceba6cfbc525f7fd22b8722a3c84ea3343f1beab41fdd096727be400a2e4efb09e2d8d18559921ac3333 SHA512 be0dd494ea93438056e55a0b92e37cbeb99b5fda6cc4d3cb60eafe0aff140f6f1122f8f9ea61f76a3aa4a43fadbea17975929ea1cac77daf6f1cc3dae2721200
+EBUILD geneweb-6.08-r1.ebuild 1958 BLAKE2B 70ac814ce345ac8e26461c82551323f56d8331644977454f704a774f9b84ad76560ec2f6943c16271cf81cef4925f616d8125f26557714436b77a815c51e2c38 SHA512 2b992d10ea2307d2b2bb68b28133844874bfe8481427b549d8e404f84f5ea4b2ed8dc35d158af656b113ca8787babf1f0c2d126c95216c1662deb7f71b4de951
+EBUILD geneweb-6.08-r2.ebuild 1944 BLAKE2B 709302e66b2cc8a5efbdac4acde6181ccdc9525b1f6287f44044763d3eb3ca4f3885c66971ddddeb7ebba7371690ef64ee38ca03149403998b77567a59bb107f SHA512 89ce86e780688601e1e82d44cf58a83f99ff4f43956f19489d3e404bdb98b3d6089997e926b6fa1d7dc2a5011a9d7c5958c012a4f0634893892ce2fbda7bc417
 MISC metadata.xml 652 BLAKE2B 0a523f6b4dd3d65cf1668c16c07d1a9a4547bbcb9a800c4f9f706973d159ce434c2567d5b23609bd33f8c5f3ca4a25d8e7c485e15a640a941d21fd29fd52589d SHA512 7c94f8655959224e21113156e943d28dc9653f767fcd0cb6a9e7ec149abf3deabe850b404ba3b92384fd5bc919cce973c73b622746efc2a2862c86a62136d973
diff --git a/app-misc/geneweb/files/geneweb-6.08-parallellbuild.patch b/app-misc/geneweb/files/geneweb-6.08-parallellbuild.patch
index 71cfab667fc1..552660102eaf 100644
--- a/app-misc/geneweb/files/geneweb-6.08-parallellbuild.patch
+++ b/app-misc/geneweb/files/geneweb-6.08-parallellbuild.patch
@@ -1,5 +1,5 @@
---- 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
+--- a/wserver/Makefile	2017-01-09 21:15:00.328750224 +0100
++++ b/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
@@ -9,8 +9,8 @@
  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
+--- a/src/.depend	2017-01-09 21:36:25.644868941 +0100
++++ b/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
@@ -20,8 +20,21 @@
  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
+@@ -162,7 +162,7 @@
+     mutil.cmx notesLinks.cmx progrBar.cmx secure.cmx select.cmx
+ history.cmo: adef.cmi buff.cmo config.cmi date.cmi def.cmi gutil.cmi \
+     gwdb.cmi hutil.cmi mutil.cmi secure.cmi templ.cmi templAst.cmi util.cmi \
+-    history_diff.cmi ../wserver/wserver.cmi history.cmi
++    history_diff.cmo ../wserver/wserver.cmi history.cmi
+ history.cmx: adef.cmx buff.cmx config.cmi date.cmx def.cmi gutil.cmx \
+     gwdb.cmx hutil.cmx mutil.cmx secure.cmx templ.cmx templAst.cmi util.cmx \
+     history_diff.cmx ../wserver/wserver.cmx history.cmi
+@@ -308,10 +308,10 @@
+     ../wserver/wserver.cmx
+ searchName.cmo: adef.cmi buff.cmo checkItem.cmi config.cmi date.cmi def.cmi \
+     gutil.cmi gwdb.cmi hutil.cmi mutil.cmi name.cmi util.cmi \
+-    num.cmi perso.cmi ../wserver/wserver.cmi
++    num.cmi perso.cmi ../wserver/wserver.cmi some.cmo
  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
@@ -29,3 +42,23 @@
  secure.cmo: secure.cmi
  secure.cmx: secure.cmi
  select.cmo: adef.cmi def.cmi gutil.cmi gwdb.cmi name.cmi
+--- a/ged2gwb/.depend	2019-12-26 11:46:53.540446131 +0100
++++ b/ged2gwb/.depend	2019-12-26 11:48:08.833224914 +0100
+@@ -1,7 +1,7 @@
+ ged2gwb2.cmo: ../src/adef.cmi ../src/ansel.cmo ../src/argl.cmo \
+     ../src/buff.cmo ../src/calendar.cmi ../src/db2link.cmi ../src/def.cmi \
+     ../src/futil.cmi ../src/gwcomp.cmi ../src/lock.cmi ../src/mutil.cmi \
+-    ../src/name.cmi ../src/secure.cmi ./utf8.cmi
++    ../src/name.cmi ../src/secure.cmi ./utf8.cmo
+ ged2gwb2.cmx: ../src/adef.cmx ../src/ansel.cmx ../src/argl.cmx \
+     ../src/buff.cmx ../src/calendar.cmx ../src/db2link.cmx ../src/def.cmi \
+     ../src/futil.cmx ../src/gwcomp.cmx ../src/lock.cmx ../src/mutil.cmx \
+@@ -10,7 +10,7 @@
+     ../src/buff.cmo ../src/calendar.cmi ../src/check.cmi \
+     ../src/checkItem.cmi ../src/dbdisk.cmi ../src/def.cmi ../src/gwdb.cmi \
+     ../src/lock.cmi ../src/mutil.cmi ../src/name.cmi ../src/outbase.cmi \
+-    ../src/secure.cmi ./utf8.cmi
++    ../src/secure.cmi ./utf8.cmo
+ ged2gwb.cmx: ../src/adef.cmx ../src/ansel.cmx ../src/argl.cmx \
+     ../src/buff.cmx ../src/calendar.cmx ../src/check.cmx \
+     ../src/checkItem.cmx ../src/dbdisk.cmi ../src/def.cmi ../src/gwdb.cmx \
diff --git a/app-misc/geneweb/geneweb-6.08-r1.ebuild b/app-misc/geneweb/geneweb-6.08-r1.ebuild
index 692c89bf09ed..55528f558666 100644
--- a/app-misc/geneweb/geneweb-6.08-r1.ebuild
+++ b/app-misc/geneweb/geneweb-6.08-r1.ebuild
@@ -17,8 +17,7 @@ RESTRICT="strip"
 
 RDEPEND="dev-lang/ocaml[ocamlopt?]
 	dev-ml/camlp5[ocamlopt?]"
-DEPEND="${RDEPEND}
-	!net-p2p/ghostwhitecrab"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${WORKDIR}"/${P}-ocaml-4.patch
@@ -59,8 +58,8 @@ src_install() {
 	doman man/*
 
 	# Install doc
-	insinto /usr/share/doc/${PF}/contrib
-	doins -r contrib/{gwdiff,misc}
+	dodoc -r contrib
+	docompress -x /usr/share/doc/${PF}/contrib
 
 	newinitd "${FILESDIR}/geneweb.initd" geneweb
 	newconfd "${FILESDIR}/geneweb.confd" geneweb
diff --git a/app-misc/geneweb/geneweb-6.08-r2.ebuild b/app-misc/geneweb/geneweb-6.08-r2.ebuild
new file mode 100644
index 000000000000..cab25ce06688
--- /dev/null
+++ b/app-misc/geneweb/geneweb-6.08-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils
+
+DESCRIPTION="Genealogy software program with a Web interface"
+HOMEPAGE="https://github.com/geneanet/geneweb"
+SRC_URI="https://github.com/geneweb/geneweb/archive/v6.08.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~tupone/${P}-ocaml-4.patch.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+RESTRICT="strip"
+
+RDEPEND="dev-lang/ocaml[ocamlopt?]
+	dev-ml/camlp5[ocamlopt?]
+	acct-user/geneweb
+	acct-group/geneweb"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${WORKDIR}"/${P}-ocaml-4.patch
+	"${FILESDIR}"/${PF}-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...
+	fi
+}
+
+src_install() {
+	dodoc ICHANGES
+	emake new_distrib
+	emake wrappers
+	# 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
+	dodoc -r contrib
+	docompress -x /usr/share/doc/${PF}/contrib
+
+	newinitd "${FILESDIR}/geneweb.initd" geneweb
+	newconfd "${FILESDIR}/geneweb.confd" geneweb
+}
+
+pkg_postinst() {
+	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)"
+}