1 |
commit: 317e4ee74f991fdda6fcb80c56cf8c9f4b7edb5b |
2 |
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc> |
3 |
AuthorDate: Tue Sep 29 15:55:13 2020 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 29 15:55:13 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=317e4ee7 |
7 |
|
8 |
dev-libs/igraph: version bump to 0.8.2 |
9 |
|
10 |
* new maintainer + taken by science project |
11 |
|
12 |
Closes: https://github.com/gentoo/gentoo/pull/17640 |
13 |
Package-Manager: Portage-3.0.7, Repoman-3.0.1 |
14 |
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc> |
15 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
16 |
|
17 |
dev-libs/igraph/Manifest | 1 + |
18 |
dev-libs/igraph/files/igraph-0.8.2-unbundle.patch | 150 ++++++++++++++++++++++ |
19 |
dev-libs/igraph/igraph-0.8.2.ebuild | 59 +++++++++ |
20 |
dev-libs/igraph/metadata.xml | 19 ++- |
21 |
4 files changed, 223 insertions(+), 6 deletions(-) |
22 |
|
23 |
diff --git a/dev-libs/igraph/Manifest b/dev-libs/igraph/Manifest |
24 |
index 545b292f786..f2dcaf5efb1 100644 |
25 |
--- a/dev-libs/igraph/Manifest |
26 |
+++ b/dev-libs/igraph/Manifest |
27 |
@@ -1 +1,2 @@ |
28 |
DIST igraph-0.7.1.tar.gz 2967134 BLAKE2B 27f0a2f51e561a3ea2e2e6d31853fe10ffd66f9f67603d77f2c0449a4c2bcd4d45c98516b526fb0f23a871ebe3db1fcf0c691551714d044124778faa147bd30f SHA512 ac7d7e3fbc6d27ae69079224881ca03db2c7e0b50d016706f3e167c614e2c9332c675d2fcd3cde12874e13a8fc402d42222308c6195afadee15152cec93f94dd |
29 |
+DIST igraph-0.8.2.tar.gz 3625308 BLAKE2B b3be5a28b6507c98c88a96c4a14e6b9c45645985f5b16aaae0739412a5f26a1ccdbda3180fac5d12525b4da2f5fc3d6caad3928cd1306b151b89104bbbb5f6e8 SHA512 e1035ed22541c7d253c201da5d2f8c5ceb154a6bf4be1b41981a02d6bbe72038647bf011432e2446307e615c27aa8079d4ef2c4447c2eba3764788e26e8f790b |
30 |
|
31 |
diff --git a/dev-libs/igraph/files/igraph-0.8.2-unbundle.patch b/dev-libs/igraph/files/igraph-0.8.2-unbundle.patch |
32 |
new file mode 100644 |
33 |
index 00000000000..859c6387b7f |
34 |
--- /dev/null |
35 |
+++ b/dev-libs/igraph/files/igraph-0.8.2-unbundle.patch |
36 |
@@ -0,0 +1,150 @@ |
37 |
+diff --git a/configure.ac b/configure.ac |
38 |
+index b422caf..dae8647 100644 |
39 |
+--- a/configure.ac |
40 |
++++ b/configure.ac |
41 |
+@@ -333,6 +333,8 @@ else |
42 |
+ internal_glpk=no |
43 |
+ fi |
44 |
+ |
45 |
++PKG_CHECK_MODULES([CS],[cxsparse]) |
46 |
++ |
47 |
+ # Link time optimization feature in newer gcc/g++ |
48 |
+ # based on http://svn.r-project.org/R/trunk/configure.ac |
49 |
+ AC_ARG_ENABLE([lto], |
50 |
+diff --git a/examples/simple/igraph_sparsemat2.c b/examples/simple/igraph_sparsemat2.c |
51 |
+index 24877c2..0f4b45c 100644 |
52 |
+--- a/examples/simple/igraph_sparsemat2.c |
53 |
++++ b/examples/simple/igraph_sparsemat2.c |
54 |
+@@ -21,7 +21,7 @@ |
55 |
+ |
56 |
+ */ |
57 |
+ |
58 |
+-#include <cs/cs.h> |
59 |
++#include <cs.h> |
60 |
+ #include <igraph.h> |
61 |
+ #include "igraph_blas_internal.h" |
62 |
+ #include "igraph_arpack_internal.h" |
63 |
+diff --git a/examples/simple/igraph_sparsemat3.c b/examples/simple/igraph_sparsemat3.c |
64 |
+index 09329f0..31d4f1f 100644 |
65 |
+--- a/examples/simple/igraph_sparsemat3.c |
66 |
++++ b/examples/simple/igraph_sparsemat3.c |
67 |
+@@ -21,7 +21,7 @@ |
68 |
+ |
69 |
+ */ |
70 |
+ |
71 |
+-#include <cs/cs.h> |
72 |
++#include <cs.h> |
73 |
+ #include <igraph.h> |
74 |
+ |
75 |
+ int permute(const igraph_matrix_t *M, |
76 |
+diff --git a/examples/simple/igraph_sparsemat4.c b/examples/simple/igraph_sparsemat4.c |
77 |
+index 3a33979..c0ea489 100644 |
78 |
+--- a/examples/simple/igraph_sparsemat4.c |
79 |
++++ b/examples/simple/igraph_sparsemat4.c |
80 |
+@@ -21,7 +21,7 @@ |
81 |
+ |
82 |
+ */ |
83 |
+ |
84 |
+-#include <cs/cs.h> |
85 |
++#include <cs.h> |
86 |
+ #include <igraph.h> |
87 |
+ |
88 |
+ igraph_bool_t check_solution(const igraph_sparsemat_t *A, |
89 |
+diff --git a/src/Makefile.am b/src/Makefile.am |
90 |
+index f9d02d2..8ab3385 100644 |
91 |
+--- a/src/Makefile.am |
92 |
++++ b/src/Makefile.am |
93 |
+@@ -9,9 +9,6 @@ AM_YFLAGS = -d |
94 |
+ |
95 |
+ lib_LTLIBRARIES = libigraph.la |
96 |
+ |
97 |
+-include lapack/blas.inc |
98 |
+-include lapack/lapack.inc |
99 |
+-include lapack/arpack.inc |
100 |
+ include plfit/plfit.inc |
101 |
+ |
102 |
+ F2C = f2c/abort_.c f2c/dolio.c f2c/r_sin.c\ |
103 |
+@@ -99,8 +96,6 @@ if INTERNAL_ARPACK |
104 |
+ ARPACK_LIB = libarpack.la |
105 |
+ endif |
106 |
+ |
107 |
+-include ../optional/glpk/glpk.inc |
108 |
+- |
109 |
+ if INTERNAL_GLPK |
110 |
+ libglpk_la_SOURCES = $(GLPK) |
111 |
+ libglpk_la_CFLAGS = -I$(top_srcdir)/optional/glpk |
112 |
+@@ -365,7 +360,7 @@ SOURCES = basic_query.c games.c cocitation.c iterators.c \ |
113 |
+ drl_layout_3d.cpp drl_graph_3d.cpp \ |
114 |
+ DensityGrid_3d.cpp \ |
115 |
+ foreign-dl-parser.y foreign-dl-lexer.l \ |
116 |
+- $(CS) sparsemat.c mixing.c bigint.c bignum.c \ |
117 |
++ sparsemat.c mixing.c bigint.c bignum.c \ |
118 |
+ version.c optimal_modularity.c \ |
119 |
+ igraph_fixed_vectorlist.c separators.c \ |
120 |
+ igraph_marked_queue.c igraph_estack.c st-cuts.c \ |
121 |
+@@ -408,7 +403,7 @@ libigraph_la_CXXFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(W |
122 |
+ libigraph_la_LDFLAGS = -no-undefined |
123 |
+ libigraph_la_LIBADD = -lm $(XML2_LIBS) $(F2C_LIB) $(BLAS_LIB) \ |
124 |
+ $(LAPACK_LIB) $(ARPACK_LIB) $(GLPK_LIB) $(PRPACK_LIB) \ |
125 |
+- $(PLFIT_LIB) |
126 |
++ $(PLFIT_LIB) $(CS_LIBS) |
127 |
+ |
128 |
+ if INTERNAL_GLPK |
129 |
+ libigraph_la_CFLAGS += -I$(top_srcdir)/optional/glpk |
130 |
+diff --git a/src/Makefile.in b/src/Makefile.in |
131 |
+index 56703d4..cc30d48 100644 |
132 |
+--- a/src/Makefile.in |
133 |
++++ b/src/Makefile.in |
134 |
+@@ -2411,7 +2411,7 @@ SOURCES = basic_query.c games.c cocitation.c iterators.c \ |
135 |
+ gengraph_powerlaw.cpp gengraph_random.cpp decomposition.c \ |
136 |
+ bipartite.c drl_layout_3d.cpp drl_graph_3d.cpp \ |
137 |
+ DensityGrid_3d.cpp foreign-dl-parser.y foreign-dl-lexer.l \ |
138 |
+- $(CS) sparsemat.c mixing.c bigint.c bignum.c version.c \ |
139 |
++ sparsemat.c mixing.c bigint.c bignum.c version.c \ |
140 |
+ optimal_modularity.c igraph_fixed_vectorlist.c separators.c \ |
141 |
+ igraph_marked_queue.c igraph_estack.c st-cuts.c \ |
142 |
+ cohesive_blocks.c statusbar.c lapack.c complex.c eigen.c \ |
143 |
+diff --git a/src/sparsemat.c b/src/sparsemat.c |
144 |
+index 0ed4678..4fb724d 100644 |
145 |
+--- a/src/sparsemat.c |
146 |
++++ b/src/sparsemat.c |
147 |
+@@ -23,7 +23,7 @@ |
148 |
+ |
149 |
+ #include "config.h" |
150 |
+ |
151 |
+-#include "cs/cs.h" |
152 |
++#include <cs.h> |
153 |
+ |
154 |
+ #include "igraph_sparsemat.h" |
155 |
+ #include "igraph_error.h" |
156 |
+diff --git a/tests/Makefile.am b/tests/Makefile.am |
157 |
+index d350f11..31a1f5a 100644 |
158 |
+--- a/tests/Makefile.am |
159 |
++++ b/tests/Makefile.am |
160 |
+@@ -13,7 +13,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac |
161 |
+ echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \ |
162 |
+ } >$(srcdir)/package.m4 |
163 |
+ |
164 |
+-EXTRA_DIST += package.m4 |
165 |
++#EXTRA_DIST += package.m4 |
166 |
+ |
167 |
+ TESTSUITE_AT = \ |
168 |
+ testsuite.at \ |
169 |
+diff --git a/tests/mt.at b/tests/mt.at |
170 |
+index 050974a..b154ce1 100644 |
171 |
+--- a/tests/mt.at |
172 |
++++ b/tests/mt.at |
173 |
+@@ -23,11 +23,11 @@ AT_BANNER([[Thread-safety tests]]) |
174 |
+ |
175 |
+ AT_SETUP([Simple error handling test :]) |
176 |
+ AT_KEYWORDS([thread-safe]) |
177 |
+-AT_COMPILE_CHECK([simple/tls1.c], [], [], [], [-lpthread]) |
178 |
++AT_COMPILE_CHECK([simple/tls1.c], [], [], [], [-lpthread $(${PKG_CONFIG} --libs arpack)]) |
179 |
+ AT_CLEANUP |
180 |
+ |
181 |
+ AT_SETUP([Thread-safe ARPACK:]) |
182 |
+ AT_KEYWORDS([thread-safe ARPACK]) |
183 |
+ AT_COMPILE_CHECK([simple/tls2.c], [simple/tls2.out], [], [internal], |
184 |
+- [-lpthread]) |
185 |
++ [-lpthread $(${PKG_CONFIG} --libs arpack)]) |
186 |
+ AT_CLEANUP |
187 |
|
188 |
diff --git a/dev-libs/igraph/igraph-0.8.2.ebuild b/dev-libs/igraph/igraph-0.8.2.ebuild |
189 |
new file mode 100644 |
190 |
index 00000000000..fbacf2931be |
191 |
--- /dev/null |
192 |
+++ b/dev-libs/igraph/igraph-0.8.2.ebuild |
193 |
@@ -0,0 +1,59 @@ |
194 |
+# Copyright 1999-2020 Gentoo Authors |
195 |
+# Distributed under the terms of the GNU General Public License v2 |
196 |
+ |
197 |
+EAPI=7 |
198 |
+ |
199 |
+inherit autotools toolchain-funcs |
200 |
+ |
201 |
+DESCRIPTION="Creating and manipulating undirected and directed graphs" |
202 |
+HOMEPAGE="http://www.igraph.org/" |
203 |
+SRC_URI="https://github.com/igraph/igraph/releases/download/${PV}/${P}.tar.gz" |
204 |
+ |
205 |
+LICENSE="GPL-2" |
206 |
+SLOT="0/0" |
207 |
+KEYWORDS="~amd64 ~x86" |
208 |
+IUSE="debug" |
209 |
+ |
210 |
+RDEPEND=" |
211 |
+ dev-libs/gmp:0 |
212 |
+ dev-libs/libxml2 |
213 |
+ sci-libs/arpack |
214 |
+ sci-libs/cxsparse |
215 |
+ sci-mathematics/glpk |
216 |
+ virtual/blas |
217 |
+ virtual/lapack" |
218 |
+DEPEND="${RDEPEND}" |
219 |
+BDEPEND="virtual/pkgconfig" |
220 |
+ |
221 |
+PATCHES=( "${FILESDIR}"/${P}-unbundle.patch ) |
222 |
+ |
223 |
+src_prepare() { |
224 |
+ default |
225 |
+ rm -r src/lapack optional/glpk src/cs || die |
226 |
+ eautoreconf |
227 |
+} |
228 |
+ |
229 |
+src_configure() { |
230 |
+ # even with --with-external-f2c |
231 |
+ # we don't need f2c as none of |
232 |
+ # arpack lapack blas |
233 |
+ # are internal |
234 |
+ tc-export PKG_CONFIG |
235 |
+ econf \ |
236 |
+ $(use_enable debug) \ |
237 |
+ --enable-gmp \ |
238 |
+ --disable-static \ |
239 |
+ --disable-tls \ |
240 |
+ --with-external-arpack \ |
241 |
+ --with-external-blas \ |
242 |
+ --with-external-lapack \ |
243 |
+ --with-external-f2c \ |
244 |
+ --with-external-glpk |
245 |
+} |
246 |
+ |
247 |
+src_install() { |
248 |
+ default |
249 |
+ |
250 |
+ # no static archives |
251 |
+ find "${ED}" -name '*.la' -delete || die |
252 |
+} |
253 |
|
254 |
diff --git a/dev-libs/igraph/metadata.xml b/dev-libs/igraph/metadata.xml |
255 |
index 6ba23eeb564..91a6671aeaf 100644 |
256 |
--- a/dev-libs/igraph/metadata.xml |
257 |
+++ b/dev-libs/igraph/metadata.xml |
258 |
@@ -1,13 +1,20 @@ |
259 |
<?xml version="1.0" encoding="UTF-8"?> |
260 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
261 |
<pkgmetadata> |
262 |
- <!-- maintainer-needed --> |
263 |
<longdescription lang="en"> |
264 |
-igraph is a free software package for creating and manipulating undirected and |
265 |
-directed graphs. It includes implementations for classic graph theory problems |
266 |
-like minimum spanning trees and network flow, and also implements algorithms for |
267 |
-some recent network analysis methods, like community structure search. |
268 |
-</longdescription> |
269 |
+ igraph is a free software package for creating and manipulating undirected and |
270 |
+ directed graphs. It includes implementations for classic graph theory problems |
271 |
+ like minimum spanning trees and network flow, and also implements algorithms for |
272 |
+ some recent network analysis methods, like community structure search. |
273 |
+ </longdescription> |
274 |
+ <maintainer type="person"> |
275 |
+ <email>gentoo@×××××.cc</email> |
276 |
+ <name>Aisha Tammy</name> |
277 |
+ </maintainer> |
278 |
+ <maintainer type="project"> |
279 |
+ <email>sci-biology@g.o</email> |
280 |
+ <name>Gentoo Biology Project</name> |
281 |
+ </maintainer> |
282 |
<upstream> |
283 |
<remote-id type="sourceforge">igraph</remote-id> |
284 |
</upstream> |