Gentoo Archives: gentoo-commits

From: Alfredo Tupone <tupone@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/geneweb/files/, app-misc/geneweb/
Date: Wed, 12 Feb 2020 18:15:33
Message-Id: 1581531310.16ede39343aeead19a64b86967da3401faf66018.tupone@gentoo
1 commit: 16ede39343aeead19a64b86967da3401faf66018
2 Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 12 18:15:10 2020 +0000
4 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 12 18:15:10 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16ede393
7
8 app-misc/geneweb: fix build with ocaml-4.09
9
10 Bugs: https://bugs.gentoo.org/707312
11 Package-Manager: Portage-2.3.79, Repoman-2.3.16
12 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
13
14 app-misc/geneweb/Manifest | 1 +
15 .../geneweb/files/geneweb-6.08.01-gentoo.patch | 30 ++++++++
16 app-misc/geneweb/geneweb-6.08.01.ebuild | 79 ++++++++++++++++++++++
17 3 files changed, 110 insertions(+)
18
19 diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
20 index ce02b368b59..70d8a86db7c 100644
21 --- a/app-misc/geneweb/Manifest
22 +++ b/app-misc/geneweb/Manifest
23 @@ -1,2 +1,3 @@
24 DIST geneweb-6.08-ocaml-4.patch.gz 22259 BLAKE2B c3471b44bae06db04f51f4fbfacaf5d93388f79673686d0fdd988df482f836bd49f853c5acb3b94c39f890b7d9bd8d118b4042100c466a06a2e57227da9eee3b SHA512 333a9ca899bf454e1c534f6c890b5cbe842821573b39e9d0e432cfbdf30dbe3a495a5ecb5a9b4a00882ee51bbb3ec1ca4b417e34050a7f84e434d0424c126def
25 +DIST geneweb-6.08.01.tar.gz 1796215 BLAKE2B 4b7d05126d244984b62ebadda3419ba8cf97326ac3103c73ca5433a8f9edeab8acd968d05942d299e70127bcf75efe5cb9a9af9f7d97ec08fd9a8a6a5aae100d SHA512 54e1ed05e540f1de167c66dee46976a8324a37ca36a9dfd6ab03105fe925053c570842e1a263499fd8bd7aecfebac8f9596b1573fcec1e104e3892337376f84d
26 DIST geneweb-6.08.tar.gz 1791450 BLAKE2B 35fcd0a4087892b992b87dd4fb54b458be0e300042a237458fdeea9a4a9b8649f93261d896d6b7ad19b681b95b343013d99d99027d86b1796f74cab916178d32 SHA512 7f1d552342e8a5b05961be75c1afb768853f22cc7eb4477fa63d6a3af29ea852862ce043ae89cd1589ede20fe561ad7d77ab757cc1ecb26ce1473f0e3621b835
27
28 diff --git a/app-misc/geneweb/files/geneweb-6.08.01-gentoo.patch b/app-misc/geneweb/files/geneweb-6.08.01-gentoo.patch
29 new file mode 100644
30 index 00000000000..0226a05904a
31 --- /dev/null
32 +++ b/app-misc/geneweb/files/geneweb-6.08.01-gentoo.patch
33 @@ -0,0 +1,30 @@
34 +--- a/setup/setup.ml 2007-08-07 19:25:13.000000000 +0200
35 ++++ b/setup/setup.ml 2007-08-07 19:24:59.000000000 +0200
36 +@@ -5,8 +5,8 @@
37 +
38 + value port = ref 2316;
39 + value default_lang = ref "en";
40 +-value setup_dir = ref ".";
41 +-value bin_dir = ref "";
42 ++value setup_dir = ref "/usr/share/geneweb";
43 ++value bin_dir = ref "/usr/bin";
44 + value lang_param = ref "";
45 + value only_file = ref "";
46 +
47 +--- a/tools/Makefile.inc.unix 2017-03-06 08:15:45.334667626 +0100
48 ++++ b/tools/Makefile.inc.unix 2017-03-06 08:16:10.162223399 +0100
49 +@@ -6,11 +6,11 @@
50 + CAMLP5F=-DUNIX
51 + CAMLP5D=+camlp5
52 + LIBUNIX=-cclib -lunix
53 +-OCAMLC=ocamlc.opt -w -3 -warn-error +a-52 -safe-string
54 +-OCAMLOPT=ocamlopt.opt -w -3 -warn-error +a-52 -safe-string
55 ++OCAMLC=ocamlc.opt -w -3 -safe-string
56 ++OCAMLOPT=ocamlopt.opt -w -3 -safe-string
57 + OCAMLI=
58 + OCAMLD=
59 +-STRIP=strip
60 ++STRIP=true
61 + RM=/bin/rm -f
62 + EXE=
63 + STATIC=-ccopt -static
64
65 diff --git a/app-misc/geneweb/geneweb-6.08.01.ebuild b/app-misc/geneweb/geneweb-6.08.01.ebuild
66 new file mode 100644
67 index 00000000000..70389b658f0
68 --- /dev/null
69 +++ b/app-misc/geneweb/geneweb-6.08.01.ebuild
70 @@ -0,0 +1,79 @@
71 +# Copyright 1999-2020 Gentoo Authors
72 +# Distributed under the terms of the GNU General Public License v2
73 +
74 +EAPI=7
75 +inherit eutils
76 +
77 +GITID=9641e494cd85fb1b7baba32412d120da38234ba2
78 +
79 +DESCRIPTION="Genealogy software program with a Web interface"
80 +HOMEPAGE="https://github.com/geneanet/geneweb"
81 +SRC_URI="https://github.com/geneweb/geneweb/archive/${GITID}.tar.gz -> ${P}.tar.gz"
82 +
83 +LICENSE="GPL-2"
84 +SLOT="0"
85 +KEYWORDS="~amd64 ~x86"
86 +IUSE="+ocamlopt"
87 +RESTRICT="strip"
88 +
89 +RDEPEND="dev-lang/ocaml[ocamlopt?]
90 + dev-ml/camlp5[ocamlopt?]
91 + acct-user/geneweb
92 + acct-group/geneweb"
93 +DEPEND="${RDEPEND}"
94 +
95 +PATCHES=(
96 + "${FILESDIR}"/${P}-gentoo.patch
97 + "${FILESDIR}"/${PN}-6.08-parallellbuild.patch )
98 +
99 +S="${WORKDIR}"/${PN}-${GITID}
100 +
101 +src_compile() {
102 + if use ocamlopt; then
103 + emake
104 + else
105 + emake OCAMLC=ocamlc OCAMLOPT=ocamlopt out
106 + # If using bytecode we dont want to strip the binary as it would remove
107 + # the bytecode and only leave ocamlrun...
108 + fi
109 +}
110 +
111 +src_install() {
112 + dodoc ICHANGES
113 + emake new_distrib
114 + emake wrappers
115 + # Install doc
116 + cd distribution
117 + dodoc CHANGES.txt
118 + # Install binaries
119 + cd gw
120 + dobin gwc gwc1 gwc2 consang gwd gwu update_nldb ged2gwb ged2gwb2 gwb2ged gwsetup
121 + insinto /usr/lib/${PN}
122 + doins -r gwtp_tmp/*
123 + dodoc a.gwf
124 + insinto /usr/share/${PN}
125 + doins -r etc images lang setup gwd.arg only.txt
126 +
127 + cd ../..
128 +
129 + # Install binaries
130 + dobin src/check_base
131 + # Install manpages
132 + doman man/*
133 +
134 + # Install doc
135 + dodoc -r contrib
136 + docompress -x /usr/share/doc/${PF}/contrib
137 +
138 + newinitd "${FILESDIR}/geneweb.initd" geneweb
139 + newconfd "${FILESDIR}/geneweb.confd" geneweb
140 +}
141 +
142 +pkg_postinst() {
143 + einfo "A CGI program has been installed in /usr/lib/${PN}. Follow the"
144 + einfo "instructions on the README in that directory to use it"
145 + einfo "For 64 bits architecture you need to rebuild the database"
146 + einfo "\"gwu foo > foo.gw \" will save the database (use the previous"
147 + einfo "version to do that). \"gwc2 foo.gw -o bar \" will restore it "
148 + einfo "(using the current package)"
149 +}