1 |
commit: f812704e44f3d927dd47f3901c59ee7716adefd0 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Nov 1 18:36:11 2020 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 1 18:36:11 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f812704e |
7 |
|
8 |
sci-biology/newick-utils: Port to EAPI 7 |
9 |
|
10 |
* Don't build static libraries by default |
11 |
* Fix GCC 10 / -fno-common |
12 |
* Disable automagic guile and lua |
13 |
|
14 |
Closes: https://bugs.gentoo.org/708534 |
15 |
Closes: https://bugs.gentoo.org/712312 |
16 |
Closes: https://bugs.gentoo.org/727986 |
17 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
18 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
19 |
|
20 |
.../files/newick-utils-1.6-deduplicate-libnw.patch | 153 +++++++++++++++++++++ |
21 |
.../files/newick-utils-1.6-fno-common.patch | 41 ++++++ |
22 |
sci-biology/newick-utils/metadata.xml | 11 +- |
23 |
.../newick-utils/newick-utils-1.6-r1.ebuild | 44 ++++++ |
24 |
sci-biology/newick-utils/newick-utils-1.6.ebuild | 20 --- |
25 |
5 files changed, 245 insertions(+), 24 deletions(-) |
26 |
|
27 |
diff --git a/sci-biology/newick-utils/files/newick-utils-1.6-deduplicate-libnw.patch b/sci-biology/newick-utils/files/newick-utils-1.6-deduplicate-libnw.patch |
28 |
new file mode 100644 |
29 |
index 00000000000..ca997830ace |
30 |
--- /dev/null |
31 |
+++ b/sci-biology/newick-utils/files/newick-utils-1.6-deduplicate-libnw.patch |
32 |
@@ -0,0 +1,153 @@ |
33 |
+Don't rebuild all of libnw.la pointlessly |
34 |
+ |
35 |
+--- a/tests/Makefile.am |
36 |
++++ b/tests/Makefile.am |
37 |
+@@ -8,6 +8,8 @@ |
38 |
+ showsrc: |
39 |
+ @echo $(srcdir) |
40 |
+ |
41 |
++LDADD = $(top_builddir)/src/libnw.la |
42 |
++ |
43 |
+ TESTS = test_newick_scanner test_newick_parser test_rnode test_list \ |
44 |
+ test_link test_masprintf test_svg_graph_radial \ |
45 |
+ test_canvas test_concat test_hash test_lca test_enode \ |
46 |
+@@ -37,100 +39,57 @@ |
47 |
+ |
48 |
+ SRC = $(top_builddir)/src |
49 |
+ |
50 |
+-test_newick_scanner_SOURCES = test_newick_scanner.c $(SRC)/newick_scanner.c \ |
51 |
+- $(SRC)/newick_parser.c $(SRC)/rnode.c $(SRC)/rnode_iterator.c \ |
52 |
+- $(SRC)/list.c $(SRC)/hash.c $(SRC)/masprintf.c $(SRC)/link.c |
53 |
+- |
54 |
+-test_newick_parser_SOURCES = test_newick_parser.c $(SRC)/parser.c \ |
55 |
+- $(SRC)/newick_scanner.c $(SRC)/newick_parser.c $(SRC)/list.c \ |
56 |
+- $(SRC)/rnode.c $(SRC)/link.c $(SRC)/hash.c $(SRC)/rnode_iterator.c \ |
57 |
+- $(SRC)/masprintf.c $(SRC)/to_newick.c $(SRC)/concat.c |
58 |
+- |
59 |
+-test_rnode_SOURCES = test_rnode.c $(SRC)/rnode.c $(SRC)/list.c \ |
60 |
+- $(SRC)/rnode_iterator.c $(SRC)/hash.c $(SRC)/masprintf.c \ |
61 |
+- tree_stubs.c $(SRC)/nodemap.c $(SRC)/link.c |
62 |
+- |
63 |
+-test_list_SOURCES = test_list.c $(SRC)/list.c |
64 |
+- |
65 |
+-test_link_SOURCES = test_link.c $(SRC)/link.c $(SRC)/nodemap.c \ |
66 |
+- $(SRC)/list.c $(SRC)/to_newick.c $(SRC)/rnode.c \ |
67 |
+- $(SRC)/concat.c $(SRC)/hash.c tree_stubs.c \ |
68 |
+- $(SRC)/rnode_iterator.c $(SRC)/masprintf.c |
69 |
++test_newick_scanner_SOURCES = test_newick_scanner.c |
70 |
++ |
71 |
++test_newick_parser_SOURCES = test_newick_parser.c |
72 |
++ |
73 |
++test_rnode_SOURCES = test_rnode.c tree_stubs.c |
74 |
++ |
75 |
++test_list_SOURCES = test_list.c |
76 |
++ |
77 |
++test_link_SOURCES = test_link.c tree_stubs.c |
78 |
+ |
79 |
+ test_canvas_SOURCES = test_canvas.c $(SRC)/canvas.c |
80 |
+ |
81 |
+-test_concat_SOURCES = test_concat.c $(SRC)/concat.c |
82 |
++test_concat_SOURCES = test_concat.c |
83 |
++ |
84 |
++test_hash_SOURCES = test_hash.c |
85 |
++ |
86 |
++test_lca_SOURCES = test_lca.c tree_stubs.c |
87 |
++ |
88 |
++test_nodemap_SOURCES = test_nodemap.c tree_stubs.c |
89 |
+ |
90 |
+-test_hash_SOURCES = test_hash.c $(SRC)/hash.c $(SRC)/list.c $(SRC)/masprintf.c |
91 |
++test_to_newick_SOURCES = test_to_newick.c tree_stubs.c |
92 |
+ |
93 |
+-test_lca_SOURCES = test_lca.c $(SRC)/lca.c $(SRC)/list.c $(SRC)/nodemap.c \ |
94 |
+- $(SRC)/link.c $(SRC)/rnode.c $(SRC)/hash.c \ |
95 |
+- $(SRC)/rnode_iterator.c tree_stubs.c $(SRC)/masprintf.c \ |
96 |
+- $(SRC)/error.c |
97 |
+- |
98 |
+-test_nodemap_SOURCES = test_nodemap.c $(SRC)/nodemap.c \ |
99 |
+- $(SRC)/rnode.c $(SRC)/list.c $(SRC)/hash.c $(SRC)/link.c \ |
100 |
+- $(SRC)/rnode_iterator.c $(SRC)/masprintf.c tree_stubs.c |
101 |
+- |
102 |
+-test_to_newick_SOURCES = test_to_newick.c $(SRC)/to_newick.c \ |
103 |
+- $(SRC)/rnode.c $(SRC)/link.c $(SRC)/concat.c \ |
104 |
+- $(SRC)/list.c $(SRC)/rnode_iterator.c $(SRC)/hash.c \ |
105 |
+- $(SRC)/masprintf.c $(SRC)/parser.c $(SRC)/newick_scanner.c \ |
106 |
+- $(SRC)/newick_parser.c tree_stubs.c |
107 |
+- |
108 |
+-test_tree_SOURCES = test_tree.c $(SRC)/tree.c $(SRC)/rnode.c $(SRC)/list.c \ |
109 |
+- $(SRC)/to_newick.c $(SRC)/nodemap.c $(SRC)/link.c $(SRC)/concat.c \ |
110 |
+- $(SRC)/hash.c tree_stubs.c $(SRC)/rnode_iterator.c \ |
111 |
+- $(SRC)/masprintf.c |
112 |
+- |
113 |
+-test_node_set_SOURCES = test_node_set.c tree_stubs.c $(SRC)/node_set.c \ |
114 |
+- $(SRC)/hash.c $(SRC)/rnode.c $(SRC)/list.c $(SRC)/link.c \ |
115 |
+- $(SRC)/rnode_iterator.c $(SRC)/masprintf.c |
116 |
+- |
117 |
+-test_enode_SOURCES = test_enode.c $(SRC)/enode.c $(SRC)/rnode.c \ |
118 |
+- $(SRC)/link.c $(SRC)/list.c $(SRC)/rnode_iterator.c \ |
119 |
+- $(SRC)/hash.c $(SRC)/masprintf.c |
120 |
+- |
121 |
+-test_rnode_iterator_SOURCES = test_rnode_iterator.c $(SRC)/rnode_iterator.c \ |
122 |
+- $(SRC)/list.c $(SRC)/link.c $(SRC)/rnode.c $(SRC)/to_newick.c \ |
123 |
+- $(SRC)/hash.c $(SRC)/nodemap.c tree_stubs.c $(SRC)/masprintf.c \ |
124 |
+- $(SRC)/parser.c $(SRC)/newick_scanner.c $(SRC)/newick_parser.c \ |
125 |
+- $(SRC)/concat.c |
126 |
++test_tree_SOURCES = test_tree.c tree_stubs.c |
127 |
++ |
128 |
++test_node_set_SOURCES = test_node_set.c tree_stubs.c $(SRC)/node_set.c |
129 |
++ |
130 |
++test_enode_SOURCES = test_enode.c $(SRC)/enode.c |
131 |
++ |
132 |
++test_rnode_iterator_SOURCES = test_rnode_iterator.c tree_stubs.c |
133 |
+ |
134 |
+ test_readline_SOURCES = test_readline.c $(SRC)/readline.c |
135 |
+ |
136 |
+-test_tree_models_SOURCES = test_tree_models.c $(SRC)/tree_models.c \ |
137 |
+- $(SRC)/rnode.c $(SRC)/list.c $(SRC)/to_newick.c $(SRC)/link.c \ |
138 |
+- $(SRC)/concat.c $(SRC)/rnode_iterator.c \ |
139 |
+- $(SRC)/hash.c $(SRC)/masprintf.c |
140 |
+- |
141 |
+-test_xml_utils_SOURCES = test_xml_utils.c $(SRC)/xml_utils.c \ |
142 |
+- $(SRC)/masprintf.c |
143 |
+- |
144 |
+-test_masprintf_SOURCES = test_masprintf.c $(SRC)/masprintf.c |
145 |
+- |
146 |
+-test_error_SOURCES = test_error.c $(SRC)/error.c |
147 |
+- |
148 |
+-test_order_tree_SOURCES = test_order_tree.c $(SRC)/order_tree.c tree_stubs.c \ |
149 |
+- $(SRC)/link.c $(SRC)/to_newick.c $(SRC)/rnode.c $(SRC)/list.c \ |
150 |
+- $(SRC)/masprintf.c $(SRC)/concat.c $(SRC)/hash.c $(SRC)/nodemap.c \ |
151 |
+- $(SRC)/rnode_iterator.c |
152 |
+- |
153 |
+-test_graph_common_SOURCES = test_graph_common.c $(SRC)/graph_common.c \ |
154 |
+- tree_stubs.c $(SRC)/link.c $(SRC)/list.c $(SRC)/tree.c \ |
155 |
+- $(SRC)/rnode_iterator.c $(SRC)/hash.c $(SRC)/masprintf.c \ |
156 |
+- $(SRC)/rnode.c $(SRC)/nodemap.c |
157 |
++test_tree_models_SOURCES = test_tree_models.c $(SRC)/tree_models.c |
158 |
++ |
159 |
++test_xml_utils_SOURCES = test_xml_utils.c $(SRC)/xml_utils.c |
160 |
++ |
161 |
++test_masprintf_SOURCES = test_masprintf.c |
162 |
++ |
163 |
++test_error_SOURCES = test_error.c |
164 |
++ |
165 |
++test_order_tree_SOURCES = test_order_tree.c tree_stubs.c $(SRC)/order_tree.c |
166 |
++ |
167 |
++test_graph_common_SOURCES = test_graph_common.c tree_stubs.c $(SRC)/graph_common.c |
168 |
+ |
169 |
+ test_svg_graph_radial_SOURCES = test_svg_graph_radial.c \ |
170 |
+- $(SRC)/svg_graph_radial.c $(SRC)/tree.c $(SRC)/svg_graph.c \ |
171 |
+- $(SRC)/rnode.c $(SRC)/hash.c $(SRC)/list.c $(SRC)/masprintf.c \ |
172 |
+- $(SRC)/rnode_iterator.c $(SRC)/svg_graph_ortho.c $(SRC)/error.c \ |
173 |
++ $(SRC)/svg_graph_radial.c $(SRC)/svg_graph.c \ |
174 |
++ $(SRC)/svg_graph_ortho.c \ |
175 |
+ $(SRC)/readline.c $(SRC)/xml_utils.c $(SRC)/graph_common.c \ |
176 |
+- $(SRC)/node_pos_alloc.c $(SRC)/nodemap.c $(SRC)/lca.c $(SRC)/link.c |
177 |
++ $(SRC)/node_pos_alloc.c |
178 |
+ |
179 |
+-test_subtree_SOURCES = test_subtree.c $(SRC)/subtree.c $(SRC)/rnode.c \ |
180 |
+- $(SRC)/list.c $(SRC)/hash.c $(SRC)/link.c $(SRC)/rnode_iterator.c \ |
181 |
+- $(SRC)/masprintf.c $(SRC)/nodemap.c |
182 |
++test_subtree_SOURCES = test_subtree.c $(SRC)/subtree.c |
183 |
+ |
184 |
+ clean-local: |
185 |
+ $(RM) *.out |
186 |
|
187 |
diff --git a/sci-biology/newick-utils/files/newick-utils-1.6-fno-common.patch b/sci-biology/newick-utils/files/newick-utils-1.6-fno-common.patch |
188 |
new file mode 100644 |
189 |
index 00000000000..15847a52c48 |
190 |
--- /dev/null |
191 |
+++ b/sci-biology/newick-utils/files/newick-utils-1.6-fno-common.patch |
192 |
@@ -0,0 +1,41 @@ |
193 |
+--- a/src/address_parser.c |
194 |
++++ b/src/address_parser.c |
195 |
+@@ -83,6 +83,8 @@ |
196 |
+ #include "enode.h" |
197 |
+ #include "address_parser_status.h" |
198 |
+ |
199 |
++enum address_parser_status_type address_parser_status; |
200 |
++ |
201 |
+ extern int adslex (void); |
202 |
+ |
203 |
+ /* The root of the expression (when represented as a parse tree) */ |
204 |
+--- a/src/address_parser_status.h |
205 |
++++ b/src/address_parser_status.h |
206 |
+@@ -13,4 +13,4 @@ |
207 |
+ * returns either \c NULL or the top-level enode of the address, so we need to |
208 |
+ * use an extern variable to convey its status. */ |
209 |
+ |
210 |
+-enum address_parser_status_type address_parser_status; |
211 |
++extern enum address_parser_status_type address_parser_status; |
212 |
+--- a/tests/test_newick_parser.c |
213 |
++++ b/tests/test_newick_parser.c |
214 |
+@@ -11,7 +11,7 @@ |
215 |
+ int nwslex (void); |
216 |
+ struct rnode *root; |
217 |
+ struct llist *nodes_in_order; |
218 |
+-enum parser_status_type newick_parser_status; |
219 |
++extern enum parser_status_type newick_parser_status; |
220 |
+ void newick_scanner_set_string_input(char *); |
221 |
+ |
222 |
+ /* NOTE: we can use to_newick() to check the parser's output because this |
223 |
+--- a/tests/test_newick_scanner.c |
224 |
++++ b/tests/test_newick_scanner.c |
225 |
+@@ -20,7 +20,7 @@ |
226 |
+ int nwslex (void); |
227 |
+ struct rnode *root; |
228 |
+ struct llist *nodes_in_order; |
229 |
+-enum parser_status_type newick_parser_status; |
230 |
++extern enum parser_status_type newick_parser_status; |
231 |
+ void newick_scanner_set_string_input(char *); |
232 |
+ void newick_scanner_set_file_input(FILE *); |
233 |
+ |
234 |
|
235 |
diff --git a/sci-biology/newick-utils/metadata.xml b/sci-biology/newick-utils/metadata.xml |
236 |
index 959160fe46b..d9bc9150987 100644 |
237 |
--- a/sci-biology/newick-utils/metadata.xml |
238 |
+++ b/sci-biology/newick-utils/metadata.xml |
239 |
@@ -1,8 +1,11 @@ |
240 |
<?xml version="1.0" encoding="UTF-8"?> |
241 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
242 |
<pkgmetadata> |
243 |
- <maintainer type="project"> |
244 |
- <email>sci-biology@g.o</email> |
245 |
- <name>Gentoo Biology Project</name> |
246 |
- </maintainer> |
247 |
+ <maintainer type="project"> |
248 |
+ <email>sci-biology@g.o</email> |
249 |
+ <name>Gentoo Biology Project</name> |
250 |
+ </maintainer> |
251 |
+ <use> |
252 |
+ <flag name="xml">Uses <pkg>dev-libs/libxml2</pkg> to handle ornaments</flag> |
253 |
+ </use> |
254 |
</pkgmetadata> |
255 |
|
256 |
diff --git a/sci-biology/newick-utils/newick-utils-1.6-r1.ebuild b/sci-biology/newick-utils/newick-utils-1.6-r1.ebuild |
257 |
new file mode 100644 |
258 |
index 00000000000..3dcb438832a |
259 |
--- /dev/null |
260 |
+++ b/sci-biology/newick-utils/newick-utils-1.6-r1.ebuild |
261 |
@@ -0,0 +1,44 @@ |
262 |
+# Copyright 1999-2020 Gentoo Authors |
263 |
+# Distributed under the terms of the GNU General Public License v2 |
264 |
+ |
265 |
+EAPI=7 |
266 |
+ |
267 |
+inherit autotools |
268 |
+ |
269 |
+DESCRIPTION="Tools for processing phylogenetic trees" |
270 |
+HOMEPAGE="http://cegg.unige.ch/newick_utils" |
271 |
+SRC_URI="http://cegg.unige.ch/pub/${P}.tar.gz" |
272 |
+ |
273 |
+LICENSE="BSD" |
274 |
+SLOT="0" |
275 |
+KEYWORDS="~amd64 ~x86" |
276 |
+IUSE="xml" |
277 |
+ |
278 |
+DEPEND=" |
279 |
+ xml? ( dev-libs/libxml2 )" |
280 |
+RDEPEND=" |
281 |
+ ${DEPEND} |
282 |
+ !dev-games/libnw" |
283 |
+ |
284 |
+PATCHES=( |
285 |
+ "${FILESDIR}"/${P}-deduplicate-libnw.patch |
286 |
+ "${FILESDIR}"/${P}-fno-common.patch |
287 |
+) |
288 |
+ |
289 |
+src_prepare() { |
290 |
+ default |
291 |
+ eautoreconf |
292 |
+} |
293 |
+ |
294 |
+src_configure() { |
295 |
+ econf \ |
296 |
+ --disable-static \ |
297 |
+ --without-guile \ |
298 |
+ --without-lua \ |
299 |
+ $(use_with xml libxml) |
300 |
+} |
301 |
+ |
302 |
+src_install() { |
303 |
+ default |
304 |
+ find "${ED}" -name '*.la' -delete || die |
305 |
+} |
306 |
|
307 |
diff --git a/sci-biology/newick-utils/newick-utils-1.6.ebuild b/sci-biology/newick-utils/newick-utils-1.6.ebuild |
308 |
deleted file mode 100644 |
309 |
index 845bc011620..00000000000 |
310 |
--- a/sci-biology/newick-utils/newick-utils-1.6.ebuild |
311 |
+++ /dev/null |
312 |
@@ -1,20 +0,0 @@ |
313 |
-# Copyright 1999-2016 Gentoo Foundation |
314 |
-# Distributed under the terms of the GNU General Public License v2 |
315 |
- |
316 |
-EAPI=6 |
317 |
- |
318 |
-DESCRIPTION="Tools for processing phylogenetic trees" |
319 |
-HOMEPAGE="http://cegg.unige.ch/newick_utils" |
320 |
-SRC_URI="http://cegg.unige.ch/pub/${P}.tar.gz" |
321 |
- |
322 |
-LICENSE="BSD" |
323 |
-SLOT="0" |
324 |
-IUSE="" |
325 |
-KEYWORDS="~amd64 ~x86" |
326 |
- |
327 |
-DEPEND="" |
328 |
-RDEPEND="!dev-games/libnw" |
329 |
- |
330 |
-src_test() { |
331 |
- emake -C tests check-TESTS |
332 |
-} |