Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/igraph/, dev-libs/igraph/files/
Date: Sun, 27 Dec 2020 03:56:22
Message-Id: 1609041336.c9ca59f6a13a8015ba32d89019de5e8414fcbc78.sam@gentoo
1 commit: c9ca59f6a13a8015ba32d89019de5e8414fcbc78
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 27 03:55:36 2020 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 27 03:55:36 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9ca59f6
7
8 dev-libs/igraph: cleanup old
9
10 Package-Manager: Portage-3.0.9, Repoman-3.0.2
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 dev-libs/igraph/Manifest | 2 -
14 dev-libs/igraph/files/igraph-0.7.1-unbundle.patch | 269 ----------------------
15 dev-libs/igraph/igraph-0.7.1-r2.ebuild | 54 -----
16 dev-libs/igraph/igraph-0.8.2.ebuild | 59 -----
17 4 files changed, 384 deletions(-)
18
19 diff --git a/dev-libs/igraph/Manifest b/dev-libs/igraph/Manifest
20 index bf73f764024..862a2b7315f 100644
21 --- a/dev-libs/igraph/Manifest
22 +++ b/dev-libs/igraph/Manifest
23 @@ -1,4 +1,2 @@
24 -DIST igraph-0.7.1.tar.gz 2967134 BLAKE2B 27f0a2f51e561a3ea2e2e6d31853fe10ffd66f9f67603d77f2c0449a4c2bcd4d45c98516b526fb0f23a871ebe3db1fcf0c691551714d044124778faa147bd30f SHA512 ac7d7e3fbc6d27ae69079224881ca03db2c7e0b50d016706f3e167c614e2c9332c675d2fcd3cde12874e13a8fc402d42222308c6195afadee15152cec93f94dd
25 -DIST igraph-0.8.2.tar.gz 3625308 BLAKE2B b3be5a28b6507c98c88a96c4a14e6b9c45645985f5b16aaae0739412a5f26a1ccdbda3180fac5d12525b4da2f5fc3d6caad3928cd1306b151b89104bbbb5f6e8 SHA512 e1035ed22541c7d253c201da5d2f8c5ceb154a6bf4be1b41981a02d6bbe72038647bf011432e2446307e615c27aa8079d4ef2c4447c2eba3764788e26e8f790b
26 DIST igraph-0.8.3.tar.gz 3636192 BLAKE2B 1a6636a074182fc859d7c2982546668b221be8a71b9a8a60404764684b7488a41450cedb75f89558f1ffe6f6dbef298057b5294495f2e7992768f5fd4e40fbd9 SHA512 a25126fd5ee7cf823b6728d02d38c8d13c8561e9f6e10372faef15e98f4381c118f3dd9f308d003d7d18ca501e7055b838711a2a62e00afba32ca929c8d765f1
27 DIST igraph-0.8.5.tar.gz 3303252 BLAKE2B 9aa920e39a1ef76376eb9a88b6d24e2d051aa22807d4e9bbac49fd1708c59f821d2d4ec55dc96a89de84dfc3ca394e3de9f60704b7f3880a40128863b209d0d6 SHA512 eeb7a21b3a0551e47c178e568811a415e39afb2cc99be39905a15d667fa59564e83979111e1ea5d93636d5b0c7dcbed18728f03aa7ee4d83f96c45af52de8370
28
29 diff --git a/dev-libs/igraph/files/igraph-0.7.1-unbundle.patch b/dev-libs/igraph/files/igraph-0.7.1-unbundle.patch
30 deleted file mode 100644
31 index 755e749c186..00000000000
32 --- a/dev-libs/igraph/files/igraph-0.7.1-unbundle.patch
33 +++ /dev/null
34 @@ -1,269 +0,0 @@
35 -diff --git a/configure.ac b/configure.ac
36 -index acf76cd..a9db7bd 100644
37 ---- a/configure.ac
38 -+++ b/configure.ac
39 -@@ -167,7 +167,8 @@ if test "x$enable_gmp" != "xno"; then
40 - AC_CHECK_HEADER([gmp.h], [
41 - AC_DEFINE([HAVE_GMP], [1], [Define to 1 if you have the GMP library])
42 - gmp_support=yes
43 -- LDFLAGS="${LDFLAGS} -lgmp"
44 -+ GMP_LIBS="-lgmp"
45 -+ AC_SUBST(GMP_LIBS)
46 - PKGCONFIG_LIBS_PRIVATE="${PKGCONFIG_LIBS_PRIVATE} -lgmp"
47 - ])
48 - ])
49 -@@ -231,24 +232,16 @@ else
50 - fi
51 -
52 - if test "$internal_blas" = "no"; then
53 -- AC_CHECK_LIB([blas], [daxpy_], [],
54 -- AC_CHECK_LIB([blas], [daxpy], [],
55 -- AC_CHECK_LIB([blas], [DAXPY_], [],
56 -- AC_CHECK_LIB([blas], [DAXPY], [],
57 -- [AC_MSG_RESULT(not found, trying to use -lblas anyway.)]))))
58 -- LDFLAGS="${LDFLAGS} -lblas"
59 -+ PKG_CHECK_MODULES([BLAS],[blas])
60 -+ CPPFLAGS="${CPPFLAGS} ${BLAS_CFLAGS}"
61 - PKGCONFIG_LIBS_PRIVATE="${PKGCONFIG_LIBS_PRIVATE} -lblas"
62 - else
63 - AC_DEFINE([INTERNAL_BLAS], [1], [Define to 1 if you use the internal BLAS library])
64 - fi
65 -
66 - if test "$internal_lapack" = "no"; then
67 -- AC_CHECK_LIB([lapack], [dlarnv_], [],
68 -- AC_CHECK_LIB([lapack], [dlarnv], [],
69 -- AC_CHECK_LIB([lapack], [DLARNV_], [],
70 -- AC_CHECK_LIB([lapack], [DLARNV], [],
71 -- [AC_MSG_RESULT(not found, trying to use -llapack anyway.)]))))
72 -- LDFLAGS="${LDFLAGS} -llapack"
73 -+ PKG_CHECK_MODULES([LAPACK],[lapack])
74 -+ CPPFLAGS="${CPPFLAGS} ${LAPACK_CFLAGS}"
75 - PKGCONFIG_LIBS_PRIVATE="${PKGCONFIG_LIBS_PRIVATE} -llapack"
76 - else
77 - AC_DEFINE([INTERNAL_LAPACK], [1], [Define to 1 if you use the internal LAPACK library])
78 -@@ -258,17 +251,15 @@ if test "$internal_arpack" = "no"; then
79 - if test "$tls_support" = "yes"; then
80 - AC_MSG_ERROR([Thread-local storage only supported with internal ARPACK library])
81 - fi
82 -- AC_CHECK_LIB([arpack], [dsaupd_], [],
83 -- AC_CHECK_LIB([arpack], [dsaupd], [],
84 -- AC_CHECK_LIB([arpack], [DSAUPD_], [],
85 -- AC_CHECK_LIB([arpack], [DSAUPD], [],
86 -- [AC_MSG_RESULT(not found, trying to use -larpack anyway.)]))))
87 -- LDFLAGS="${LDFLAGS} -larpack"
88 -+ PKG_CHECK_MODULES([ARPACK],[arpack])
89 -+ CPPFLAGS="${CPPFLAGS} ${ARPACK_CFLAGS}"
90 - PKGCONFIG_LIBS_PRIVATE="${PKGCONFIG_LIBS_PRIVATE} -larpack"
91 - else
92 - AC_DEFINE([INTERNAL_ARPACK], [1], [Define to 1 if you use the internal ARPACK library])
93 - fi
94 -
95 -+PKG_CHECK_MODULES([CS],[cxsparse])
96 -+
97 - glpk_support=no
98 - AC_ARG_ENABLE(glpk, AC_HELP_STRING([--disable-glpk], [Compile without the GLPK library]))
99 - if test "x$enable_glpk" != "xno"; then
100 -@@ -283,7 +274,8 @@ if test "x$enable_glpk" != "xno"; then
101 - ], [
102 - AC_DEFINE([HAVE_GLPK], [1], [Define to 1 if you have the GLPK library])
103 - glpk_support=yes
104 -- LDFLAGS="${LDFLAGS} -lglpk"
105 -+ GLPK_LIBS="-lglpk"
106 -+ AC_SUBST(GLPK_LIBS)
107 - PKGCONFIG_LIBS_PRIVATE="${PKGCONFIG_LIBS_PRIVATE} -lglpk"
108 - ])
109 - ])
110 -diff --git a/examples/simple/igraph_arpack_rnsolve.out b/examples/simple/igraph_arpack_rnsolve.out
111 -index ec38497..6603034 100644
112 ---- a/examples/simple/igraph_arpack_rnsolve.out
113 -+++ b/examples/simple/igraph_arpack_rnsolve.out
114 -@@ -16,7 +16,7 @@
115 - ---
116 - 22.0483 0
117 - -21.3281 0
118 ---3.00735 -19.2957
119 -+-3.00735 19.2957
120 - ---
121 - 0.373224 0.226696 0.204213 0.0473383
122 - -0.289145 -0.296079 -0.0479785 0.156365
123 -@@ -31,7 +31,7 @@
124 - ---
125 - -21.3281 0
126 - -12.4527 0
127 ---3.00735 -19.2957
128 -+-3.00735 19.2957
129 - ---
130 - -0.226696 0.695866 -0.204213 -0.0473383
131 - 0.296079 0.120213 0.0479785 -0.156365
132 -@@ -46,7 +46,7 @@
133 - ---
134 - -3.00735 19.2957
135 - -3.00735 -19.2957
136 --12.1099 6.27293
137 -+12.1099 -6.27293
138 - ---
139 - 0.0768616 -0.195028 -0.152389 0.21912
140 - 0.147607 0.0704569 0.346547 0.125122
141 -diff --git a/examples/simple/igraph_layout_merge2.out b/examples/simple/igraph_layout_merge2.out
142 -index dfe2c22..9fe81bf 100644
143 ---- a/examples/simple/igraph_layout_merge2.out
144 -+++ b/examples/simple/igraph_layout_merge2.out
145 -@@ -1,13 +1,13 @@
146 ---2.73912 -2.95429
147 ---0.479512 -4.00008
148 --1.96326 -3.51798
149 --3.65613 -1.69214
150 --3.95248 0.780051
151 --2.73912 2.95429
152 --0.479512 4.00008
153 ---1.96326 3.51798
154 ---3.65613 1.69214
155 ---3.95248 -0.780051
156 -+-2.55311 -3.13964
157 -+-0.22007 -4.0407
158 -+2.19703 -3.39835
159 -+3.77493 -1.45795
160 -+3.91094 1.03935
161 -+2.55311 3.13964
162 -+0.22007 4.0407
163 -+-2.19703 3.39835
164 -+-3.77493 1.45795
165 -+-3.91094 -1.03935
166 - -1.6061 6.30088
167 - -4.92661 5.80435
168 - -3.69637 8.92826
169 -diff --git a/examples/simple/igraph_sparsemat2.c b/examples/simple/igraph_sparsemat2.c
170 -index c39d0e5..fdfd264 100644
171 ---- a/examples/simple/igraph_sparsemat2.c
172 -+++ b/examples/simple/igraph_sparsemat2.c
173 -@@ -21,7 +21,7 @@
174 -
175 - */
176 -
177 --#include <cs/cs.h>
178 -+#include <cs.h>
179 - #include <igraph.h>
180 - #include <igraph_sparsemat.h>
181 - #include <igraph_blas_internal.h>
182 -diff --git a/examples/simple/igraph_sparsemat3.c b/examples/simple/igraph_sparsemat3.c
183 -index 630bf1a..b23cbe1 100644
184 ---- a/examples/simple/igraph_sparsemat3.c
185 -+++ b/examples/simple/igraph_sparsemat3.c
186 -@@ -21,7 +21,7 @@
187 -
188 - */
189 -
190 --#include <cs/cs.h>
191 -+#include <cs.h>
192 - #include <igraph.h>
193 - #include <igraph_sparsemat.h>
194 -
195 -diff --git a/examples/simple/igraph_sparsemat4.c b/examples/simple/igraph_sparsemat4.c
196 -index 4d85bde..7497faf 100644
197 ---- a/examples/simple/igraph_sparsemat4.c
198 -+++ b/examples/simple/igraph_sparsemat4.c
199 -@@ -21,7 +21,7 @@
200 -
201 - */
202 -
203 --#include <cs/cs.h>
204 -+#include <cs.h>
205 - #include <igraph.h>
206 - #include <igraph_sparsemat.h>
207 -
208 -diff --git a/src/Makefile.am b/src/Makefile.am
209 -index e7085c5..194f4a0 100644
210 ---- a/src/Makefile.am
211 -+++ b/src/Makefile.am
212 -@@ -9,9 +9,6 @@ AM_YFLAGS = -d
213 -
214 - lib_LTLIBRARIES = libigraph.la
215 -
216 --include lapack/blas.inc
217 --include lapack/lapack.inc
218 --include lapack/arpack.inc
219 - include plfit/plfit.inc
220 -
221 - F2C = f2c/abort_.c f2c/dolio.c f2c/r_sin.c\
222 -@@ -99,8 +96,6 @@ if INTERNAL_ARPACK
223 - ARPACK_LIB = libarpack.la
224 - endif
225 -
226 --include ../optional/glpk/glpk.inc
227 --
228 - if INTERNAL_GLPK
229 - libglpk_la_SOURCES = $(GLPK)
230 - libglpk_la_CFLAGS = -I$(top_srcdir)/optional/glpk
231 -@@ -255,7 +250,7 @@ SOURCES = basic_query.c games.c cocitation.c iterators.c \
232 - drl_layout_3d.cpp drl_graph_3d.cpp \
233 - DensityGrid_3d.cpp \
234 - foreign-dl-parser.y foreign-dl-lexer.l \
235 -- $(CS) sparsemat.c mixing.c bigint.c bignum.c \
236 -+ sparsemat.c mixing.c bigint.c bignum.c \
237 - version.c optimal_modularity.c \
238 - igraph_fixed_vectorlist.c separators.c \
239 - igraph_marked_queue.c igraph_estack.c st-cuts.c \
240 -@@ -274,8 +269,8 @@ libigraph_la_SOURCES = $(SOURCES) $(HEADERS_PRIVATE)
241 - libigraph_la_CFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(WARNING_CFLAGS)
242 - libigraph_la_CXXFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(WARNING_CFLAGS)
243 - libigraph_la_LDFLAGS = -no-undefined
244 --libigraph_la_LIBADD = -lm $(XML2_LIBS) $(F2C_LIB) $(BLAS_LIB) \
245 -- $(LAPACK_LIB) $(ARPACK_LIB) $(GLPK_LIB) $(PRPACK_LIB) \
246 -+libigraph_la_LIBADD = -lm $(XML2_LIBS) $(F2C_LIB) $(BLAS_LIBS) $(GMP_LIBS) \
247 -+ $(LAPACK_LIBS) $(ARPACK_LIBS) $(GLPK_LIBS) $(PRPACK_LIB) $(CS_LIBS) \
248 - $(PLFIT_LIB)
249 -
250 - if INTERNAL_GLPK
251 -diff --git a/src/sparsemat.c b/src/sparsemat.c
252 -index f96d022..6990c91 100644
253 ---- a/src/sparsemat.c
254 -+++ b/src/sparsemat.c
255 -@@ -23,7 +23,7 @@
256 -
257 - #include "config.h"
258 -
259 --#include "cs/cs.h"
260 -+#include "cs.h"
261 -
262 - #include "igraph_sparsemat.h"
263 - #include "igraph_error.h"
264 -diff --git a/tests/Makefile.am b/tests/Makefile.am
265 -index 6da83b2..c0b82d6 100644
266 ---- a/tests/Makefile.am
267 -+++ b/tests/Makefile.am
268 -@@ -13,7 +13,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
269 - echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
270 - } >$(srcdir)/package.m4
271 -
272 --EXTRA_DIST += package.m4
273 -+#EXTRA_DIST += package.m4
274 -
275 - TESTSUITE_AT = \
276 - testsuite.at \
277 -diff --git a/tests/mt.at b/tests/mt.at
278 -index 050974a..9558d6f 100644
279 ---- a/tests/mt.at
280 -+++ b/tests/mt.at
281 -@@ -29,5 +29,5 @@ AT_CLEANUP
282 - AT_SETUP([Thread-safe ARPACK:])
283 - AT_KEYWORDS([thread-safe ARPACK])
284 - AT_COMPILE_CHECK([simple/tls2.c], [simple/tls2.out], [], [internal],
285 -- [-lpthread])
286 -+ [-lpthread $(${PKG_CONFIG} --libs arpack)])
287 - AT_CLEANUP
288 -diff --git a/tests/types.at b/tests/types.at
289 -index f80a6a2..29ac739 100644
290 ---- a/tests/types.at
291 -+++ b/tests/types.at
292 -@@ -133,7 +133,7 @@ AT_CLEANUP
293 - AT_SETUP([Sparse matrix, multiplications (igraph_sparsemat_t): ])
294 - AT_KEYWORDS([sparse matrix igraph_sparsemat_t])
295 - AT_COMPILE_CHECK([simple/igraph_sparsemat2.c], [simple/igraph_sparsemat2.out],
296 -- [], [INTERNAL], [-lblas])
297 -+ [], [INTERNAL], [$(${PKG_CONFIG} --libs blas)])
298 - AT_CLEANUP
299 -
300 - AT_SETUP([Sparse matrix, indexing (igraph_sparsemat_t): ])
301 ---
302 -2.0.0
303 -
304
305 diff --git a/dev-libs/igraph/igraph-0.7.1-r2.ebuild b/dev-libs/igraph/igraph-0.7.1-r2.ebuild
306 deleted file mode 100644
307 index b920276602c..00000000000
308 --- a/dev-libs/igraph/igraph-0.7.1-r2.ebuild
309 +++ /dev/null
310 @@ -1,54 +0,0 @@
311 -# Copyright 1999-2020 Gentoo Authors
312 -# Distributed under the terms of the GNU General Public License v2
313 -
314 -EAPI=7
315 -
316 -inherit autotools toolchain-funcs
317 -
318 -DESCRIPTION="Creating and manipulating undirected and directed graphs"
319 -HOMEPAGE="http://www.igraph.org/"
320 -SRC_URI="http://www.igraph.org/nightly/get/c/${P}.tar.gz"
321 -
322 -LICENSE="GPL-2"
323 -SLOT="0/0"
324 -KEYWORDS="~amd64 ~x86"
325 -IUSE="debug gmp"
326 -
327 -RDEPEND="
328 - dev-libs/libxml2
329 - >=sci-libs/arpack-3
330 - virtual/blas
331 - virtual/lapack
332 - >=sci-libs/cxsparse-3
333 - sci-mathematics/glpk
334 - gmp? ( dev-libs/gmp:0 )"
335 -DEPEND="${RDEPEND}"
336 -BDEPEND="virtual/pkgconfig"
337 -
338 -PATCHES=( "${FILESDIR}"/${P}-unbundle.patch )
339 -
340 -src_prepare() {
341 - default
342 - eautoreconf
343 -}
344 -
345 -src_configure() {
346 - tc-export PKG_CONFIG
347 - econf \
348 - $(use_enable gmp) \
349 - $(use_enable debug) \
350 - --disable-static \
351 - --disable-tls \
352 - --with-external-arpack \
353 - --with-external-blas \
354 - --with-external-lapack \
355 - --with-external-f2c \
356 - --with-external-glpk
357 -}
358 -
359 -src_install() {
360 - default
361 -
362 - # no static archives
363 - find "${D}" -name '*.la' -delete || die
364 -}
365
366 diff --git a/dev-libs/igraph/igraph-0.8.2.ebuild b/dev-libs/igraph/igraph-0.8.2.ebuild
367 deleted file mode 100644
368 index fbacf2931be..00000000000
369 --- a/dev-libs/igraph/igraph-0.8.2.ebuild
370 +++ /dev/null
371 @@ -1,59 +0,0 @@
372 -# Copyright 1999-2020 Gentoo Authors
373 -# Distributed under the terms of the GNU General Public License v2
374 -
375 -EAPI=7
376 -
377 -inherit autotools toolchain-funcs
378 -
379 -DESCRIPTION="Creating and manipulating undirected and directed graphs"
380 -HOMEPAGE="http://www.igraph.org/"
381 -SRC_URI="https://github.com/igraph/igraph/releases/download/${PV}/${P}.tar.gz"
382 -
383 -LICENSE="GPL-2"
384 -SLOT="0/0"
385 -KEYWORDS="~amd64 ~x86"
386 -IUSE="debug"
387 -
388 -RDEPEND="
389 - dev-libs/gmp:0
390 - dev-libs/libxml2
391 - sci-libs/arpack
392 - sci-libs/cxsparse
393 - sci-mathematics/glpk
394 - virtual/blas
395 - virtual/lapack"
396 -DEPEND="${RDEPEND}"
397 -BDEPEND="virtual/pkgconfig"
398 -
399 -PATCHES=( "${FILESDIR}"/${P}-unbundle.patch )
400 -
401 -src_prepare() {
402 - default
403 - rm -r src/lapack optional/glpk src/cs || die
404 - eautoreconf
405 -}
406 -
407 -src_configure() {
408 - # even with --with-external-f2c
409 - # we don't need f2c as none of
410 - # arpack lapack blas
411 - # are internal
412 - tc-export PKG_CONFIG
413 - econf \
414 - $(use_enable debug) \
415 - --enable-gmp \
416 - --disable-static \
417 - --disable-tls \
418 - --with-external-arpack \
419 - --with-external-blas \
420 - --with-external-lapack \
421 - --with-external-f2c \
422 - --with-external-glpk
423 -}
424 -
425 -src_install() {
426 - default
427 -
428 - # no static archives
429 - find "${ED}" -name '*.la' -delete || die
430 -}