[gentoo-commits] repo/gentoo:master commit in: app-misc/geneweb/, app-misc/geneweb/files/

[Alfredo Tupone]

commit:     f504245827d373795cb6707aa003d67613df5e4c
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  6 08:07:30 2017 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Mar  6 17:58:09 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5042458

app-misc/geneweb: patched for dev-lang/ocaml-4

Package-Manager: portage-2.3.3

 app-misc/geneweb/Manifest                          |  1 +
 .../geneweb/files/geneweb-6.08-r1-gentoo.patch     | 30 +++++++++
 app-misc/geneweb/geneweb-6.08-r1.ebuild            | 76 ++++++++++++++++++++++
 3 files changed, 107 insertions(+)

diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index 5061eee10cb..176d630d121 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -1,3 +1,4 @@
 DIST geneweb-6.07-reduce-utf8.ml.patch.gz 185409 SHA256 cc5b7d30333e8c7b187b83106189b5e63a7d423c2e500b77b5d087cd8cd239fa SHA512 d6b71fc6d3a1488f6e96e65ab0c942c08b9e0307b2d06c9bb97fde0c2e35af2fb4b52011024e67550e608603eacfaf5ee312c99c9228edfedc2dbe82745de227 WHIRLPOOL 75e30b8ef19803dcc6f391fc798c2bb4d4e4fa685d0d5d060dcb1a9ad676a45f5016fef2e6306019876d0d30d662ee3f67f361267a2829b2ce679836c573104c
+DIST geneweb-6.08-ocaml-4.patch.gz 22259 SHA256 11d5f5ceb30b734d4475d26f3e5aafd49337185d81bee354f13691f82d627073 SHA512 333a9ca899bf454e1c534f6c890b5cbe842821573b39e9d0e432cfbdf30dbe3a495a5ecb5a9b4a00882ee51bbb3ec1ca4b417e34050a7f84e434d0424c126def WHIRLPOOL b5f25b93487a08339bea1c1709b214497ef23388fb5dc2e1d5fcacf7defbe92ca8e5d865142eacb62895240539193ed301fe329e84690fe63d4b630bded01534
 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-r1-gentoo.patch b/app-misc/geneweb/files/geneweb-6.08-r1-gentoo.patch
new file mode 100644
index 00000000000..e5a43be720e
--- /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/geneweb-6.08-r1.ebuild b/app-misc/geneweb/geneweb-6.08-r1.ebuild
new file mode 100644
index 00000000000..63e73b5dc7c
--- /dev/null
+++ b/app-misc/geneweb/geneweb-6.08-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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
+	http://dev.gentoo.org/~tupone/${P}-ocaml-4.patch.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=(
+	"${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...
+		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)"
+}