1 |
commit: d18d52d52f980fef6f5927a219367b975cf49408 |
2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Mar 27 05:54:50 2018 +0000 |
4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 27 05:54:50 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d18d52d5 |
7 |
|
8 |
app-misc/geneweb: Remove STRIP_MASK. Stable 6.08. Remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
app-misc/geneweb/Manifest | 2 - |
13 |
app-misc/geneweb/files/geneweb-6.07-gentoo.patch | 30 -------- |
14 |
.../files/geneweb-6.07-parallellbuild.patch | 68 ------------------ |
15 |
app-misc/geneweb/geneweb-6.07.ebuild | 84 ---------------------- |
16 |
app-misc/geneweb/geneweb-6.08-r1.ebuild | 6 +- |
17 |
5 files changed, 3 insertions(+), 187 deletions(-) |
18 |
|
19 |
diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest |
20 |
index 5e15f834958..ce02b368b59 100644 |
21 |
--- a/app-misc/geneweb/Manifest |
22 |
+++ b/app-misc/geneweb/Manifest |
23 |
@@ -1,4 +1,2 @@ |
24 |
-DIST geneweb-6.07-reduce-utf8.ml.patch.gz 185409 BLAKE2B 38cebdd34860cb92e9b7320c8b0fba4631c2ab6d6f30d7649f6eabc345cc4604426c37baa94fe614988facd97fed7b2e07360175fec6ce0b86b5ff79d4874750 SHA512 d6b71fc6d3a1488f6e96e65ab0c942c08b9e0307b2d06c9bb97fde0c2e35af2fb4b52011024e67550e608603eacfaf5ee312c99c9228edfedc2dbe82745de227 |
25 |
DIST geneweb-6.08-ocaml-4.patch.gz 22259 BLAKE2B c3471b44bae06db04f51f4fbfacaf5d93388f79673686d0fdd988df482f836bd49f853c5acb3b94c39f890b7d9bd8d118b4042100c466a06a2e57227da9eee3b SHA512 333a9ca899bf454e1c534f6c890b5cbe842821573b39e9d0e432cfbdf30dbe3a495a5ecb5a9b4a00882ee51bbb3ec1ca4b417e34050a7f84e434d0424c126def |
26 |
DIST geneweb-6.08.tar.gz 1791450 BLAKE2B 35fcd0a4087892b992b87dd4fb54b458be0e300042a237458fdeea9a4a9b8649f93261d896d6b7ad19b681b95b343013d99d99027d86b1796f74cab916178d32 SHA512 7f1d552342e8a5b05961be75c1afb768853f22cc7eb4477fa63d6a3af29ea852862ce043ae89cd1589ede20fe561ad7d77ab757cc1ecb26ce1473f0e3621b835 |
27 |
-DIST gw-6.07-src.tgz 1855016 BLAKE2B 9ba23961607b399a1d731e163605744f79136af40a51a61cd80f2af04a3c3d388fdc3444c33c740e0c6b4137df0cbfd6145759c50c7c8a7d04b472a5d4505a17 SHA512 719884af80809b25946175731ae20b280e13f6e18471903d2222928c11838a2a92a43f03dd8152b7b01dfcaf45fbd942035f4b54f049899ea134cd161cfc971d |
28 |
|
29 |
diff --git a/app-misc/geneweb/files/geneweb-6.07-gentoo.patch b/app-misc/geneweb/files/geneweb-6.07-gentoo.patch |
30 |
deleted file mode 100644 |
31 |
index a7cdff7a44c..00000000000 |
32 |
--- a/app-misc/geneweb/files/geneweb-6.07-gentoo.patch |
33 |
+++ /dev/null |
34 |
@@ -1,30 +0,0 @@ |
35 |
---- setup/setup.ml.old 2007-08-07 19:25:13.000000000 +0200 |
36 |
-+++ setup/setup.ml 2007-08-07 19:24:59.000000000 +0200 |
37 |
-@@ -5,8 +5,8 @@ |
38 |
- |
39 |
- value port = ref 2316; |
40 |
- value default_lang = ref "en"; |
41 |
--value setup_dir = ref "."; |
42 |
--value bin_dir = ref ""; |
43 |
-+value setup_dir = ref "/usr/share/geneweb"; |
44 |
-+value bin_dir = ref "/usr/bin"; |
45 |
- value lang_param = ref ""; |
46 |
- value only_file = ref ""; |
47 |
- |
48 |
---- tools/Makefile.inc.unix.old 2008-04-23 15:22:50.000000000 +0200 |
49 |
-+++ tools/Makefile.inc.unix 2008-04-23 15:23:04.000000000 +0200 |
50 |
-@@ -5,11 +5,11 @@ |
51 |
- CAMLP5F=-DUNIX |
52 |
- CAMLP5D=+camlp5 |
53 |
- LIBUNIX=-cclib -lunix |
54 |
--OCAMLC=ocamlc.opt -warn-error A |
55 |
--OCAMLOPT=ocamlopt.opt -warn-error A |
56 |
-+OCAMLC=ocamlc.opt |
57 |
-+OCAMLOPT=ocamlopt.opt |
58 |
- OCAMLI= |
59 |
- OCAMLD= |
60 |
--STRIP=strip |
61 |
-+STRIP=true |
62 |
- RM=/bin/rm -f |
63 |
- EXE= |
64 |
- STATIC=-ccopt -static |
65 |
|
66 |
diff --git a/app-misc/geneweb/files/geneweb-6.07-parallellbuild.patch b/app-misc/geneweb/files/geneweb-6.07-parallellbuild.patch |
67 |
deleted file mode 100644 |
68 |
index cb1a5b0125e..00000000000 |
69 |
--- a/app-misc/geneweb/files/geneweb-6.07-parallellbuild.patch |
70 |
+++ /dev/null |
71 |
@@ -1,68 +0,0 @@ |
72 |
---- wserver/Makefile.old 2011-03-11 13:47:04.000000000 +0100 |
73 |
-+++ wserver/Makefile 2011-03-11 13:47:20.000000000 +0100 |
74 |
-@@ -4,8 +4,10 @@ |
75 |
- |
76 |
- OBJS=wserver.cmo |
77 |
- |
78 |
--all:: pa_macro5.cmo $(OBJS) |
79 |
-+all:: pa_macro5.cmo |
80 |
-+ $(MAKE) $(OBJS) |
81 |
--opt:: pa_macro5.cmo $(OBJS:.cmo=.cmx) |
82 |
-+opt:: pa_macro5.cmo |
83 |
-+ $(MAKE) $(OBJS:.cmo=.cmx) |
84 |
- |
85 |
- pa_macro5.cmo: pa_macro5.ml |
86 |
- camlp5r pa_extend.cmo q_MLast.cmo -o pa_macro5.ppo pa_macro5.ml |
87 |
---- src/Makefile.old 2013-04-18 21:29:52.727049806 +0200 |
88 |
-+++ src/Makefile 2013-04-18 21:30:58.838414496 +0200 |
89 |
-@@ -153,6 +153,8 @@ |
90 |
- ) | \ |
91 |
- sort | uniq | grep -v '^$$' > i18n |
92 |
- |
93 |
-+config.cmi: gwdb.cmi |
94 |
-+ |
95 |
- always: |
96 |
- |
97 |
- depend: |
98 |
---- src/.depend.old 2014-07-17 09:18:26.882149121 +0200 |
99 |
-+++ src/.depend 2014-07-17 09:19:07.981770328 +0200 |
100 |
-@@ -162,7 +162,7 @@ |
101 |
- mutil.cmx notesLinks.cmx progrBar.cmx secure.cmx select.cmx |
102 |
- history.cmo: adef.cmi buff.cmo config.cmi date.cmi def.cmi gutil.cmi \ |
103 |
- gwdb.cmi hutil.cmi mutil.cmi secure.cmi templ.cmi templAst.cmi util.cmi \ |
104 |
-- history_diff.cmi ../wserver/wserver.cmi history.cmi |
105 |
-+ history_diff.cmo ../wserver/wserver.cmi history.cmi |
106 |
- history.cmx: adef.cmx buff.cmx config.cmi date.cmx def.cmi gutil.cmx \ |
107 |
- gwdb.cmx hutil.cmx mutil.cmx secure.cmx templ.cmx templAst.cmi util.cmx \ |
108 |
- history_diff.cmx ../wserver/wserver.cmx history.cmi |
109 |
---- ged2gwb/.depend.old 2014-07-17 09:23:02.119612299 +0200 |
110 |
-+++ ged2gwb/.depend 2014-07-17 09:23:53.987134380 +0200 |
111 |
-@@ -1,7 +1,7 @@ |
112 |
- ged2gwb2.cmo: ../src/adef.cmi ../src/ansel.cmo ../src/argl.cmo \ |
113 |
- ../src/buff.cmo ../src/calendar.cmi ../src/db2link.cmi ../src/def.cmi \ |
114 |
- ../src/futil.cmi ../src/gwcomp.cmi ../src/lock.cmi ../src/mutil.cmi \ |
115 |
-- ../src/name.cmi ../src/secure.cmi ./utf8.cmi |
116 |
-+ ../src/name.cmi ../src/secure.cmi ./utf8.cmo |
117 |
- ged2gwb2.cmx: ../src/adef.cmx ../src/ansel.cmx ../src/argl.cmx \ |
118 |
- ../src/buff.cmx ../src/calendar.cmx ../src/db2link.cmx ../src/def.cmi \ |
119 |
- ../src/futil.cmx ../src/gwcomp.cmx ../src/lock.cmx ../src/mutil.cmx \ |
120 |
-@@ -10,7 +10,7 @@ |
121 |
- ../src/buff.cmo ../src/calendar.cmi ../src/check.cmi \ |
122 |
- ../src/checkItem.cmi ../src/dbdisk.cmi ../src/def.cmi ../src/gwdb.cmi \ |
123 |
- ../src/lock.cmi ../src/mutil.cmi ../src/name.cmi ../src/outbase.cmi \ |
124 |
-- ../src/secure.cmi ./utf8.cmi |
125 |
-+ ../src/secure.cmi ./utf8.cmo |
126 |
- ged2gwb.cmx: ../src/adef.cmx ../src/ansel.cmx ../src/argl.cmx \ |
127 |
- ../src/buff.cmx ../src/calendar.cmx ../src/check.cmx \ |
128 |
- ../src/checkItem.cmx ../src/dbdisk.cmi ../src/def.cmi ../src/gwdb.cmx \ |
129 |
---- Makefile.old 2014-10-30 08:36:50.308668062 +0100 |
130 |
-+++ Makefile 2014-10-30 08:37:13.204451602 +0100 |
131 |
-@@ -65,7 +65,7 @@ |
132 |
- |
133 |
- distrib: new_distrib wrappers |
134 |
- |
135 |
--wrappers: |
136 |
-+wrappers: new_distrib |
137 |
- if test "$(CAMLP5F)" = "-DWIN95"; then \ |
138 |
- echo -ne 'setlocal enableextensions\r\n' > $(DESTDIR)/gwd.bat; \ |
139 |
- echo -ne 'md bases\r\n' >> $(DESTDIR)/gwd.bat; \ |
140 |
|
141 |
diff --git a/app-misc/geneweb/geneweb-6.07.ebuild b/app-misc/geneweb/geneweb-6.07.ebuild |
142 |
deleted file mode 100644 |
143 |
index 77ac63d3ce3..00000000000 |
144 |
--- a/app-misc/geneweb/geneweb-6.07.ebuild |
145 |
+++ /dev/null |
146 |
@@ -1,84 +0,0 @@ |
147 |
-# Copyright 1999-2014 Gentoo Foundation |
148 |
-# Distributed under the terms of the GNU General Public License v2 |
149 |
- |
150 |
-EAPI=4 |
151 |
-inherit eutils user |
152 |
- |
153 |
-MY_PN=gw |
154 |
-MY_PV=${PV/./-} |
155 |
-MY_P=${MY_PN}-${PV} |
156 |
- |
157 |
-DESCRIPTION="Genealogy software program with a Web interface" |
158 |
-HOMEPAGE="http://opensource.geneanet.org/projects/geneweb" |
159 |
-SRC_URI="http://opensource.geneanet.org/attachments/download/240/${MY_P}-src.tgz |
160 |
- mirror://gentoo/${P}-reduce-utf8.ml.patch.gz" |
161 |
- |
162 |
-LICENSE="GPL-2" |
163 |
-SLOT="0" |
164 |
-KEYWORDS="amd64 x86" |
165 |
-IUSE="+ocamlopt" |
166 |
- |
167 |
-RDEPEND="dev-lang/ocaml[ocamlopt?] |
168 |
- dev-ml/camlp5[ocamlopt?]" |
169 |
-DEPEND="${RDEPEND} |
170 |
- !net-p2p/ghostwhitecrab" |
171 |
- |
172 |
-S=${WORKDIR}/gw-${PV}-src |
173 |
- |
174 |
-src_prepare() { |
175 |
- esvn_clean |
176 |
- epatch "${FILESDIR}"/${P}-gentoo.patch \ |
177 |
- "${FILESDIR}"/${P}-parallellbuild.patch \ |
178 |
- ../${P}-reduce-utf8.ml.patch |
179 |
-} |
180 |
- |
181 |
-src_compile() { |
182 |
- if use ocamlopt; then |
183 |
- emake |
184 |
- else |
185 |
- emake OCAMLC=ocamlc OCAMLOPT=ocamlopt out |
186 |
- # If using bytecode we dont want to strip the binary as it would remove |
187 |
- # the bytecode and only leave ocamlrun... |
188 |
- export STRIP_MASK="*/bin/*" |
189 |
- fi |
190 |
-} |
191 |
- |
192 |
-src_install() { |
193 |
- dodoc ICHANGES |
194 |
- emake distrib |
195 |
- # Install doc |
196 |
- cd distribution |
197 |
- dodoc CHANGES.txt |
198 |
- # Install binaries |
199 |
- cd gw |
200 |
- dobin gwc gwc1 gwc2 consang gwd gwu update_nldb ged2gwb ged2gwb2 gwb2ged gwsetup |
201 |
- insinto /usr/lib/${PN} |
202 |
- doins -r gwtp_tmp/* |
203 |
- dodoc a.gwf |
204 |
- insinto /usr/share/${PN} |
205 |
- doins -r etc images lang setup gwd.arg only.txt |
206 |
- |
207 |
- cd ../.. |
208 |
- |
209 |
- # Install binaries |
210 |
- dobin src/check_base |
211 |
- # Install manpages |
212 |
- doman man/* |
213 |
- |
214 |
- # Install doc |
215 |
- insinto /usr/share/doc/${PF}/contrib |
216 |
- doins -r contrib/{gwdiff,misc} |
217 |
- |
218 |
- newinitd "${FILESDIR}/geneweb.initd" geneweb |
219 |
- newconfd "${FILESDIR}/geneweb.confd" geneweb |
220 |
-} |
221 |
- |
222 |
-pkg_postinst() { |
223 |
- enewuser geneweb "" "/bin/bash" /var/lib/geneweb |
224 |
- einfo "A CGI program has been installed in /usr/lib/${PN}. Follow the" |
225 |
- einfo "instructions on the README in that directory to use it" |
226 |
- einfo "For 64 bits architecture you need to rebuild the database" |
227 |
- einfo "\"gwu foo > foo.gw \" will save the database (use the previous" |
228 |
- einfo "version to do that). \"gwc2 foo.gw -o bar \" will restore it " |
229 |
- einfo "(usiing the current package)" |
230 |
-} |
231 |
|
232 |
diff --git a/app-misc/geneweb/geneweb-6.08-r1.ebuild b/app-misc/geneweb/geneweb-6.08-r1.ebuild |
233 |
index fd05d169057..7c3a8855590 100644 |
234 |
--- a/app-misc/geneweb/geneweb-6.08-r1.ebuild |
235 |
+++ b/app-misc/geneweb/geneweb-6.08-r1.ebuild |
236 |
@@ -1,4 +1,4 @@ |
237 |
-# Copyright 1999-2017 Gentoo Foundation |
238 |
+# Copyright 1999-2018 Gentoo Foundation |
239 |
# Distributed under the terms of the GNU General Public License v2 |
240 |
|
241 |
EAPI=6 |
242 |
@@ -11,8 +11,9 @@ SRC_URI="https://github.com/geneweb/geneweb/archive/v6.08.tar.gz -> ${P}.tar.gz |
243 |
|
244 |
LICENSE="GPL-2" |
245 |
SLOT="0" |
246 |
-KEYWORDS="~amd64 ~x86" |
247 |
+KEYWORDS="amd64 x86" |
248 |
IUSE="+ocamlopt" |
249 |
+RESTRICT="strip" |
250 |
|
251 |
RDEPEND="dev-lang/ocaml[ocamlopt?] |
252 |
dev-ml/camlp5[ocamlopt?]" |
253 |
@@ -31,7 +32,6 @@ src_compile() { |
254 |
emake OCAMLC=ocamlc OCAMLOPT=ocamlopt out |
255 |
# If using bytecode we dont want to strip the binary as it would remove |
256 |
# the bytecode and only leave ocamlrun... |
257 |
- export STRIP_MASK="*/bin/*" |
258 |
fi |
259 |
} |