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/, app-misc/geneweb/files/
Date: Sat, 18 Sep 2021 16:51:43
Message-Id: 1631983835.f35d01c4ad9b4f753eb74570beefbc37ecf7c8fc.tupone@gentoo
1 commit: f35d01c4ad9b4f753eb74570beefbc37ecf7c8fc
2 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 18 16:24:40 2021 +0000
4 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 18 16:50:35 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f35d01c4
7
8 app-misc/geneweb: remove old version
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.3
11 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
12
13 app-misc/geneweb/Manifest | 1 -
14 .../files/geneweb-6.08-parallellbuild.patch | 64 ---------------
15 .../geneweb/files/geneweb-6.08.01-gentoo.patch | 30 -------
16 app-misc/geneweb/geneweb-6.08.01.ebuild | 95 ----------------------
17 4 files changed, 190 deletions(-)
18
19 diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
20 index 83f801df455..0004dbb0e0f 100644
21 --- a/app-misc/geneweb/Manifest
22 +++ b/app-misc/geneweb/Manifest
23 @@ -1,2 +1 @@
24 -DIST geneweb-6.08.01.tar.gz 1796215 BLAKE2B 4b7d05126d244984b62ebadda3419ba8cf97326ac3103c73ca5433a8f9edeab8acd968d05942d299e70127bcf75efe5cb9a9af9f7d97ec08fd9a8a6a5aae100d SHA512 54e1ed05e540f1de167c66dee46976a8324a37ca36a9dfd6ab03105fe925053c570842e1a263499fd8bd7aecfebac8f9596b1573fcec1e104e3892337376f84d
25 DIST geneweb-7.0.0.tar.gz 14767981 BLAKE2B 3a0a777a934d26fa91bd94d20311c6147e749961035b57aed8322c4e96f5cead2edde3a96e362b5de35073fa594d4cb5f3ef0f4d7eeaebea2095bfeef37740b6 SHA512 359b8e2258d572198a7516dd03830e536038392d552482f25fe4b93ded76dccebfe3c420eb2ba1a566500200755c87cbe19a2060eaeea895bd84c505b7b65345
26
27 diff --git a/app-misc/geneweb/files/geneweb-6.08-parallellbuild.patch b/app-misc/geneweb/files/geneweb-6.08-parallellbuild.patch
28 deleted file mode 100644
29 index 552660102ea..00000000000
30 --- a/app-misc/geneweb/files/geneweb-6.08-parallellbuild.patch
31 +++ /dev/null
32 @@ -1,64 +0,0 @@
33 ---- a/wserver/Makefile 2017-01-09 21:15:00.328750224 +0100
34 -+++ b/wserver/Makefile 2017-01-09 21:15:16.825751748 +0100
35 -@@ -11,6 +11,8 @@
36 - camlp5r pa_extend.cmo q_MLast.cmo -o pa_macro5.ppo pa_macro5.ml
37 - ocamlc -c -I "`camlp5 -where`" -impl pa_macro5.ppo
38 -
39 -+wserver.cmi: pa_macro5.cmo
40 -+
41 - depend:
42 - TOP=.. ../tools/camlp5_depend.sh $(OCAMLI) *.ml* > .depend
43 -
44 ---- a/src/.depend 2017-01-09 21:36:25.644868941 +0100
45 -+++ b/src/.depend 2017-01-09 21:37:04.994872576 +0100
46 -@@ -39,7 +39,7 @@
47 - check_base.cmx: check.cmx def.cmi gwdb.cmx secure.cmx
48 - compilation.cmo: def.cmi util.cmi
49 - compilation.cmx: def.cmi util.cmx
50 --config.cmi: def.cmi
51 -+config.cmi: def.cmi gwdb.cmi
52 - consang.cmo: adef.cmi def.cmi gwdb.cmi consang.cmi
53 - consang.cmx: adef.cmx def.cmi gwdb.cmx consang.cmi
54 - consang.cmi: def.cmi gwdb.cmi
55 -@@ -162,7 +162,7 @@
56 - mutil.cmx notesLinks.cmx progrBar.cmx secure.cmx select.cmx
57 - history.cmo: adef.cmi buff.cmo config.cmi date.cmi def.cmi gutil.cmi \
58 - gwdb.cmi hutil.cmi mutil.cmi secure.cmi templ.cmi templAst.cmi util.cmi \
59 -- history_diff.cmi ../wserver/wserver.cmi history.cmi
60 -+ history_diff.cmo ../wserver/wserver.cmi history.cmi
61 - history.cmx: adef.cmx buff.cmx config.cmi date.cmx def.cmi gutil.cmx \
62 - gwdb.cmx hutil.cmx mutil.cmx secure.cmx templ.cmx templAst.cmi util.cmx \
63 - history_diff.cmx ../wserver/wserver.cmx history.cmi
64 -@@ -308,10 +308,10 @@
65 - ../wserver/wserver.cmx
66 - searchName.cmo: adef.cmi buff.cmo checkItem.cmi config.cmi date.cmi def.cmi \
67 - gutil.cmi gwdb.cmi hutil.cmi mutil.cmi name.cmi util.cmi \
68 -- num.cmi perso.cmi ../wserver/wserver.cmi
69 -+ num.cmi perso.cmi ../wserver/wserver.cmi some.cmo
70 - searchName.cmx: adef.cmx buff.cmx checkItem.cmx config.cmi date.cmx def.cmi \
71 - gutil.cmx gwdb.cmx hutil.cmx mutil.cmx name.cmx util.cmx \
72 -- num.cmx perso.cmx ../wserver/wserver.cmx
73 -+ num.cmx perso.cmx ../wserver/wserver.cmx some.cmo
74 - secure.cmo: secure.cmi
75 - secure.cmx: secure.cmi
76 - select.cmo: adef.cmi def.cmi gutil.cmi gwdb.cmi name.cmi
77 ---- a/ged2gwb/.depend 2019-12-26 11:46:53.540446131 +0100
78 -+++ b/ged2gwb/.depend 2019-12-26 11:48:08.833224914 +0100
79 -@@ -1,7 +1,7 @@
80 - ged2gwb2.cmo: ../src/adef.cmi ../src/ansel.cmo ../src/argl.cmo \
81 - ../src/buff.cmo ../src/calendar.cmi ../src/db2link.cmi ../src/def.cmi \
82 - ../src/futil.cmi ../src/gwcomp.cmi ../src/lock.cmi ../src/mutil.cmi \
83 -- ../src/name.cmi ../src/secure.cmi ./utf8.cmi
84 -+ ../src/name.cmi ../src/secure.cmi ./utf8.cmo
85 - ged2gwb2.cmx: ../src/adef.cmx ../src/ansel.cmx ../src/argl.cmx \
86 - ../src/buff.cmx ../src/calendar.cmx ../src/db2link.cmx ../src/def.cmi \
87 - ../src/futil.cmx ../src/gwcomp.cmx ../src/lock.cmx ../src/mutil.cmx \
88 -@@ -10,7 +10,7 @@
89 - ../src/buff.cmo ../src/calendar.cmi ../src/check.cmi \
90 - ../src/checkItem.cmi ../src/dbdisk.cmi ../src/def.cmi ../src/gwdb.cmi \
91 - ../src/lock.cmi ../src/mutil.cmi ../src/name.cmi ../src/outbase.cmi \
92 -- ../src/secure.cmi ./utf8.cmi
93 -+ ../src/secure.cmi ./utf8.cmo
94 - ged2gwb.cmx: ../src/adef.cmx ../src/ansel.cmx ../src/argl.cmx \
95 - ../src/buff.cmx ../src/calendar.cmx ../src/check.cmx \
96 - ../src/checkItem.cmx ../src/dbdisk.cmi ../src/def.cmi ../src/gwdb.cmx \
97
98 diff --git a/app-misc/geneweb/files/geneweb-6.08.01-gentoo.patch b/app-misc/geneweb/files/geneweb-6.08.01-gentoo.patch
99 deleted file mode 100644
100 index 0226a05904a..00000000000
101 --- a/app-misc/geneweb/files/geneweb-6.08.01-gentoo.patch
102 +++ /dev/null
103 @@ -1,30 +0,0 @@
104 ---- a/setup/setup.ml 2007-08-07 19:25:13.000000000 +0200
105 -+++ b/setup/setup.ml 2007-08-07 19:24:59.000000000 +0200
106 -@@ -5,8 +5,8 @@
107 -
108 - value port = ref 2316;
109 - value default_lang = ref "en";
110 --value setup_dir = ref ".";
111 --value bin_dir = ref "";
112 -+value setup_dir = ref "/usr/share/geneweb";
113 -+value bin_dir = ref "/usr/bin";
114 - value lang_param = ref "";
115 - value only_file = ref "";
116 -
117 ---- a/tools/Makefile.inc.unix 2017-03-06 08:15:45.334667626 +0100
118 -+++ b/tools/Makefile.inc.unix 2017-03-06 08:16:10.162223399 +0100
119 -@@ -6,11 +6,11 @@
120 - CAMLP5F=-DUNIX
121 - CAMLP5D=+camlp5
122 - LIBUNIX=-cclib -lunix
123 --OCAMLC=ocamlc.opt -w -3 -warn-error +a-52 -safe-string
124 --OCAMLOPT=ocamlopt.opt -w -3 -warn-error +a-52 -safe-string
125 -+OCAMLC=ocamlc.opt -w -3 -safe-string
126 -+OCAMLOPT=ocamlopt.opt -w -3 -safe-string
127 - OCAMLI=
128 - OCAMLD=
129 --STRIP=strip
130 -+STRIP=true
131 - RM=/bin/rm -f
132 - EXE=
133 - STATIC=-ccopt -static
134
135 diff --git a/app-misc/geneweb/geneweb-6.08.01.ebuild b/app-misc/geneweb/geneweb-6.08.01.ebuild
136 deleted file mode 100644
137 index 42101ffcab7..00000000000
138 --- a/app-misc/geneweb/geneweb-6.08.01.ebuild
139 +++ /dev/null
140 @@ -1,95 +0,0 @@
141 -# Copyright 1999-2020 Gentoo Authors
142 -# Distributed under the terms of the GNU General Public License v2
143 -
144 -EAPI=7
145 -inherit eutils
146 -
147 -GITID=9641e494cd85fb1b7baba32412d120da38234ba2
148 -
149 -DESCRIPTION="Genealogy software program with a Web interface"
150 -HOMEPAGE="https://github.com/geneanet/geneweb"
151 -SRC_URI="https://github.com/geneweb/geneweb/archive/${GITID}.tar.gz -> ${P}.tar.gz"
152 -
153 -LICENSE="GPL-2"
154 -SLOT="0"
155 -KEYWORDS="amd64 x86"
156 -IUSE="+ocamlopt"
157 -RESTRICT="strip"
158 -
159 -RDEPEND="dev-lang/ocaml[ocamlopt?]
160 - dev-ml/camlp5[ocamlopt?]
161 - acct-user/geneweb
162 - acct-group/geneweb"
163 -DEPEND="${RDEPEND}"
164 -
165 -QA_FLAGS_IGNORED=(
166 - /usr/bin/gwb2ged
167 - /usr/bin/update_nldb
168 - /usr/bin/consang
169 - /usr/bin/gwd
170 - /usr/bin/gwsetup
171 - /usr/bin/ged2gwb2
172 - /usr/bin/gwc
173 - /usr/bin/ged2gwb
174 - /usr/bin/check_base
175 - /usr/bin/gwu
176 - /usr/bin/gwc1
177 - /usr/bin/gwc2
178 - /usr/lib/geneweb/gwtp
179 -)
180 -
181 -PATCHES=(
182 - "${FILESDIR}"/${P}-gentoo.patch
183 - "${FILESDIR}"/${PN}-6.08-parallellbuild.patch )
184 -
185 -S="${WORKDIR}"/${PN}-${GITID}
186 -
187 -src_compile() {
188 - if use ocamlopt; then
189 - emake
190 - else
191 - emake OCAMLC=ocamlc OCAMLOPT=ocamlopt out
192 - # If using bytecode we dont want to strip the binary as it would remove
193 - # the bytecode and only leave ocamlrun...
194 - fi
195 -}
196 -
197 -src_install() {
198 - dodoc ICHANGES
199 - emake new_distrib
200 - emake wrappers
201 - # Install doc
202 - cd distribution
203 - dodoc CHANGES.txt
204 - # Install binaries
205 - cd gw
206 - dobin gwc gwc1 gwc2 consang gwd gwu update_nldb ged2gwb ged2gwb2 gwb2ged gwsetup
207 - insinto /usr/lib/${PN}
208 - doins -r gwtp_tmp/*
209 - dodoc a.gwf
210 - insinto /usr/share/${PN}
211 - doins -r etc images lang setup gwd.arg only.txt
212 -
213 - cd ../..
214 -
215 - # Install binaries
216 - dobin src/check_base
217 - # Install manpages
218 - doman man/*
219 -
220 - # Install doc
221 - dodoc -r contrib
222 - docompress -x /usr/share/doc/${PF}/contrib
223 -
224 - newinitd "${FILESDIR}/geneweb.initd" geneweb
225 - newconfd "${FILESDIR}/geneweb.confd" geneweb
226 -}
227 -
228 -pkg_postinst() {
229 - einfo "A CGI program has been installed in /usr/lib/${PN}. Follow the"
230 - einfo "instructions on the README in that directory to use it"
231 - einfo "For 64 bits architecture you need to rebuild the database"
232 - einfo "\"gwu foo > foo.gw \" will save the database (use the previous"
233 - einfo "version to do that). \"gwc2 foo.gw -o bar \" will restore it "
234 - einfo "(using the current package)"
235 -}