From 129160ec854dca4c3fedb5bcfbcb56930371da0f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 1 Jan 2021 21:06:00 +0000 Subject: gentoo new year resync : 01.01.2021 --- dev-libs/igraph/Manifest | 7 +- dev-libs/igraph/files/igraph-0.7.1-unbundle.patch | 269 ---------------------- dev-libs/igraph/igraph-0.7.1-r2.ebuild | 54 ----- dev-libs/igraph/igraph-0.8.2.ebuild | 59 ----- dev-libs/igraph/igraph-0.8.5.ebuild | 59 +++++ 5 files changed, 61 insertions(+), 387 deletions(-) delete mode 100644 dev-libs/igraph/files/igraph-0.7.1-unbundle.patch delete mode 100644 dev-libs/igraph/igraph-0.7.1-r2.ebuild delete mode 100644 dev-libs/igraph/igraph-0.8.2.ebuild create mode 100644 dev-libs/igraph/igraph-0.8.5.ebuild (limited to 'dev-libs/igraph') diff --git a/dev-libs/igraph/Manifest b/dev-libs/igraph/Manifest index 48e5b3e33bbd..6c418d00df62 100644 --- a/dev-libs/igraph/Manifest +++ b/dev-libs/igraph/Manifest @@ -1,9 +1,6 @@ -AUX igraph-0.7.1-unbundle.patch 8525 BLAKE2B 716137c2d7b4ffc3e29b484539867216574162dc3c55ea747c57cf24689ef3de032776f9e7f1d76cdb1c0e39bd6afd5fc3cc2e74de4209d632bdd568a8b884a4 SHA512 8b796f95044a231b2695532d158721cf48dfd266f5acfc2eec8a7f3706208190ee07eccaf83823ba9323edaef15afbca60ff7013cf0d9d7fda0ab5b0ee5e0eff AUX igraph-0.8.2-unbundle.patch 4755 BLAKE2B da0d8940fdddcffae07332db988a3195e3fb8d8628707191c45d7d1d37828fc4fc7ba3bb86f5fdef3f693e5d50d50e0dc504f2ff6334dd44aacaa32238ee46f8 SHA512 737ca787a729538300058307ee003cbf1b70e93bfc1e4fd5853647d033c61537bb935e6f46c1a689f4f69ad188602c71493693d45216e43f912e5c4c4757ca3c -DIST igraph-0.7.1.tar.gz 2967134 BLAKE2B 27f0a2f51e561a3ea2e2e6d31853fe10ffd66f9f67603d77f2c0449a4c2bcd4d45c98516b526fb0f23a871ebe3db1fcf0c691551714d044124778faa147bd30f SHA512 ac7d7e3fbc6d27ae69079224881ca03db2c7e0b50d016706f3e167c614e2c9332c675d2fcd3cde12874e13a8fc402d42222308c6195afadee15152cec93f94dd -DIST igraph-0.8.2.tar.gz 3625308 BLAKE2B b3be5a28b6507c98c88a96c4a14e6b9c45645985f5b16aaae0739412a5f26a1ccdbda3180fac5d12525b4da2f5fc3d6caad3928cd1306b151b89104bbbb5f6e8 SHA512 e1035ed22541c7d253c201da5d2f8c5ceb154a6bf4be1b41981a02d6bbe72038647bf011432e2446307e615c27aa8079d4ef2c4447c2eba3764788e26e8f790b DIST igraph-0.8.3.tar.gz 3636192 BLAKE2B 1a6636a074182fc859d7c2982546668b221be8a71b9a8a60404764684b7488a41450cedb75f89558f1ffe6f6dbef298057b5294495f2e7992768f5fd4e40fbd9 SHA512 a25126fd5ee7cf823b6728d02d38c8d13c8561e9f6e10372faef15e98f4381c118f3dd9f308d003d7d18ca501e7055b838711a2a62e00afba32ca929c8d765f1 -EBUILD igraph-0.7.1-r2.ebuild 1021 BLAKE2B f57456480c2b191750bda562f88503df46b4c6adaaa0d70bee3dd570d323eb7d26c355328bf40d896238f90c9b485ac35aad3b059141425f57463a7308f7b911 SHA512 6f852704fa6bcd52ae289f78115d4f21df0c1ff720cd7f5673882f17d34d5d174f8657b461a1543f9a8984b6d100cd91584279e3e3b33fde77b05bd527b65688 -EBUILD igraph-0.8.2.ebuild 1169 BLAKE2B e15a502fa48ac7f7174103cb76db131333f3635ca55ef838abf1107835d7c8adb5a91244f2a5b34cd129290252416a385259182b3b5167dcab76336acda5a91d SHA512 efa374895127874150b12119c1a81aed2d03be6e5fc9648cb0be1553f7770ab48d34c73aecc2e4fa1e21a892d1501d6e371023b07aca8b520e483d19df527524 +DIST igraph-0.8.5.tar.gz 3303252 BLAKE2B 9aa920e39a1ef76376eb9a88b6d24e2d051aa22807d4e9bbac49fd1708c59f821d2d4ec55dc96a89de84dfc3ca394e3de9f60704b7f3880a40128863b209d0d6 SHA512 eeb7a21b3a0551e47c178e568811a415e39afb2cc99be39905a15d667fa59564e83979111e1ea5d93636d5b0c7dcbed18728f03aa7ee4d83f96c45af52de8370 EBUILD igraph-0.8.3.ebuild 1179 BLAKE2B dd1108c86b1743c3be9861b3156beea290c41d494ba54cb4f14cee9585931a95e5527c8ab128f3d2f7e4d4f4999a98ae4aa9d8c58983c4a7beffadcfc388d1b7 SHA512 25432bbd0c690c56f3bbbea48e68324bf19e245ac549cf12f9a3bf637f0dd3c9da3d6ce7f9e2bd38ffd2e52e1dc6111f94ea624d0af474b11c1056885f3bb24c +EBUILD igraph-0.8.5.ebuild 1179 BLAKE2B dd1108c86b1743c3be9861b3156beea290c41d494ba54cb4f14cee9585931a95e5527c8ab128f3d2f7e4d4f4999a98ae4aa9d8c58983c4a7beffadcfc388d1b7 SHA512 25432bbd0c690c56f3bbbea48e68324bf19e245ac549cf12f9a3bf637f0dd3c9da3d6ce7f9e2bd38ffd2e52e1dc6111f94ea624d0af474b11c1056885f3bb24c MISC metadata.xml 807 BLAKE2B 9388edde0d01baaedc25d6cdf128e2f4b1df9c9894bb371fe088573bae73da4d572b89aad9dff6e77d080c1e084e31c2d2e7f0cf7c994b2b91e5d00b6ea86850 SHA512 a71270dd5c1a1c99792a623563f5efc70bdc16575f2e83296b6a04f4d2b960a73ffa4c8a696844f38d01b51af4ba0c054d59cb132c6da660dff10cd12e02777a diff --git a/dev-libs/igraph/files/igraph-0.7.1-unbundle.patch b/dev-libs/igraph/files/igraph-0.7.1-unbundle.patch deleted file mode 100644 index 755e749c1868..000000000000 --- a/dev-libs/igraph/files/igraph-0.7.1-unbundle.patch +++ /dev/null @@ -1,269 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index acf76cd..a9db7bd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -167,7 +167,8 @@ if test "x$enable_gmp" != "xno"; then - AC_CHECK_HEADER([gmp.h], [ - AC_DEFINE([HAVE_GMP], [1], [Define to 1 if you have the GMP library]) - gmp_support=yes -- LDFLAGS="${LDFLAGS} -lgmp" -+ GMP_LIBS="-lgmp" -+ AC_SUBST(GMP_LIBS) - PKGCONFIG_LIBS_PRIVATE="${PKGCONFIG_LIBS_PRIVATE} -lgmp" - ]) - ]) -@@ -231,24 +232,16 @@ else - fi - - if test "$internal_blas" = "no"; then -- AC_CHECK_LIB([blas], [daxpy_], [], -- AC_CHECK_LIB([blas], [daxpy], [], -- AC_CHECK_LIB([blas], [DAXPY_], [], -- AC_CHECK_LIB([blas], [DAXPY], [], -- [AC_MSG_RESULT(not found, trying to use -lblas anyway.)])))) -- LDFLAGS="${LDFLAGS} -lblas" -+ PKG_CHECK_MODULES([BLAS],[blas]) -+ CPPFLAGS="${CPPFLAGS} ${BLAS_CFLAGS}" - PKGCONFIG_LIBS_PRIVATE="${PKGCONFIG_LIBS_PRIVATE} -lblas" - else - AC_DEFINE([INTERNAL_BLAS], [1], [Define to 1 if you use the internal BLAS library]) - fi - - if test "$internal_lapack" = "no"; then -- AC_CHECK_LIB([lapack], [dlarnv_], [], -- AC_CHECK_LIB([lapack], [dlarnv], [], -- AC_CHECK_LIB([lapack], [DLARNV_], [], -- AC_CHECK_LIB([lapack], [DLARNV], [], -- [AC_MSG_RESULT(not found, trying to use -llapack anyway.)])))) -- LDFLAGS="${LDFLAGS} -llapack" -+ PKG_CHECK_MODULES([LAPACK],[lapack]) -+ CPPFLAGS="${CPPFLAGS} ${LAPACK_CFLAGS}" - PKGCONFIG_LIBS_PRIVATE="${PKGCONFIG_LIBS_PRIVATE} -llapack" - else - AC_DEFINE([INTERNAL_LAPACK], [1], [Define to 1 if you use the internal LAPACK library]) -@@ -258,17 +251,15 @@ if test "$internal_arpack" = "no"; then - if test "$tls_support" = "yes"; then - AC_MSG_ERROR([Thread-local storage only supported with internal ARPACK library]) - fi -- AC_CHECK_LIB([arpack], [dsaupd_], [], -- AC_CHECK_LIB([arpack], [dsaupd], [], -- AC_CHECK_LIB([arpack], [DSAUPD_], [], -- AC_CHECK_LIB([arpack], [DSAUPD], [], -- [AC_MSG_RESULT(not found, trying to use -larpack anyway.)])))) -- LDFLAGS="${LDFLAGS} -larpack" -+ PKG_CHECK_MODULES([ARPACK],[arpack]) -+ CPPFLAGS="${CPPFLAGS} ${ARPACK_CFLAGS}" - PKGCONFIG_LIBS_PRIVATE="${PKGCONFIG_LIBS_PRIVATE} -larpack" - else - AC_DEFINE([INTERNAL_ARPACK], [1], [Define to 1 if you use the internal ARPACK library]) - fi - -+PKG_CHECK_MODULES([CS],[cxsparse]) -+ - glpk_support=no - AC_ARG_ENABLE(glpk, AC_HELP_STRING([--disable-glpk], [Compile without the GLPK library])) - if test "x$enable_glpk" != "xno"; then -@@ -283,7 +274,8 @@ if test "x$enable_glpk" != "xno"; then - ], [ - AC_DEFINE([HAVE_GLPK], [1], [Define to 1 if you have the GLPK library]) - glpk_support=yes -- LDFLAGS="${LDFLAGS} -lglpk" -+ GLPK_LIBS="-lglpk" -+ AC_SUBST(GLPK_LIBS) - PKGCONFIG_LIBS_PRIVATE="${PKGCONFIG_LIBS_PRIVATE} -lglpk" - ]) - ]) -diff --git a/examples/simple/igraph_arpack_rnsolve.out b/examples/simple/igraph_arpack_rnsolve.out -index ec38497..6603034 100644 ---- a/examples/simple/igraph_arpack_rnsolve.out -+++ b/examples/simple/igraph_arpack_rnsolve.out -@@ -16,7 +16,7 @@ - --- - 22.0483 0 - -21.3281 0 ---3.00735 -19.2957 -+-3.00735 19.2957 - --- - 0.373224 0.226696 0.204213 0.0473383 - -0.289145 -0.296079 -0.0479785 0.156365 -@@ -31,7 +31,7 @@ - --- - -21.3281 0 - -12.4527 0 ---3.00735 -19.2957 -+-3.00735 19.2957 - --- - -0.226696 0.695866 -0.204213 -0.0473383 - 0.296079 0.120213 0.0479785 -0.156365 -@@ -46,7 +46,7 @@ - --- - -3.00735 19.2957 - -3.00735 -19.2957 --12.1099 6.27293 -+12.1099 -6.27293 - --- - 0.0768616 -0.195028 -0.152389 0.21912 - 0.147607 0.0704569 0.346547 0.125122 -diff --git a/examples/simple/igraph_layout_merge2.out b/examples/simple/igraph_layout_merge2.out -index dfe2c22..9fe81bf 100644 ---- a/examples/simple/igraph_layout_merge2.out -+++ b/examples/simple/igraph_layout_merge2.out -@@ -1,13 +1,13 @@ ---2.73912 -2.95429 ---0.479512 -4.00008 --1.96326 -3.51798 --3.65613 -1.69214 --3.95248 0.780051 --2.73912 2.95429 --0.479512 4.00008 ---1.96326 3.51798 ---3.65613 1.69214 ---3.95248 -0.780051 -+-2.55311 -3.13964 -+-0.22007 -4.0407 -+2.19703 -3.39835 -+3.77493 -1.45795 -+3.91094 1.03935 -+2.55311 3.13964 -+0.22007 4.0407 -+-2.19703 3.39835 -+-3.77493 1.45795 -+-3.91094 -1.03935 - -1.6061 6.30088 - -4.92661 5.80435 - -3.69637 8.92826 -diff --git a/examples/simple/igraph_sparsemat2.c b/examples/simple/igraph_sparsemat2.c -index c39d0e5..fdfd264 100644 ---- a/examples/simple/igraph_sparsemat2.c -+++ b/examples/simple/igraph_sparsemat2.c -@@ -21,7 +21,7 @@ - - */ - --#include -+#include - #include - #include - #include -diff --git a/examples/simple/igraph_sparsemat3.c b/examples/simple/igraph_sparsemat3.c -index 630bf1a..b23cbe1 100644 ---- a/examples/simple/igraph_sparsemat3.c -+++ b/examples/simple/igraph_sparsemat3.c -@@ -21,7 +21,7 @@ - - */ - --#include -+#include - #include - #include - -diff --git a/examples/simple/igraph_sparsemat4.c b/examples/simple/igraph_sparsemat4.c -index 4d85bde..7497faf 100644 ---- a/examples/simple/igraph_sparsemat4.c -+++ b/examples/simple/igraph_sparsemat4.c -@@ -21,7 +21,7 @@ - - */ - --#include -+#include - #include - #include - -diff --git a/src/Makefile.am b/src/Makefile.am -index e7085c5..194f4a0 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -9,9 +9,6 @@ AM_YFLAGS = -d - - lib_LTLIBRARIES = libigraph.la - --include lapack/blas.inc --include lapack/lapack.inc --include lapack/arpack.inc - include plfit/plfit.inc - - F2C = f2c/abort_.c f2c/dolio.c f2c/r_sin.c\ -@@ -99,8 +96,6 @@ if INTERNAL_ARPACK - ARPACK_LIB = libarpack.la - endif - --include ../optional/glpk/glpk.inc -- - if INTERNAL_GLPK - libglpk_la_SOURCES = $(GLPK) - libglpk_la_CFLAGS = -I$(top_srcdir)/optional/glpk -@@ -255,7 +250,7 @@ SOURCES = basic_query.c games.c cocitation.c iterators.c \ - drl_layout_3d.cpp drl_graph_3d.cpp \ - DensityGrid_3d.cpp \ - foreign-dl-parser.y foreign-dl-lexer.l \ -- $(CS) sparsemat.c mixing.c bigint.c bignum.c \ -+ sparsemat.c mixing.c bigint.c bignum.c \ - version.c optimal_modularity.c \ - igraph_fixed_vectorlist.c separators.c \ - igraph_marked_queue.c igraph_estack.c st-cuts.c \ -@@ -274,8 +269,8 @@ libigraph_la_SOURCES = $(SOURCES) $(HEADERS_PRIVATE) - libigraph_la_CFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(WARNING_CFLAGS) - libigraph_la_CXXFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(WARNING_CFLAGS) - libigraph_la_LDFLAGS = -no-undefined --libigraph_la_LIBADD = -lm $(XML2_LIBS) $(F2C_LIB) $(BLAS_LIB) \ -- $(LAPACK_LIB) $(ARPACK_LIB) $(GLPK_LIB) $(PRPACK_LIB) \ -+libigraph_la_LIBADD = -lm $(XML2_LIBS) $(F2C_LIB) $(BLAS_LIBS) $(GMP_LIBS) \ -+ $(LAPACK_LIBS) $(ARPACK_LIBS) $(GLPK_LIBS) $(PRPACK_LIB) $(CS_LIBS) \ - $(PLFIT_LIB) - - if INTERNAL_GLPK -diff --git a/src/sparsemat.c b/src/sparsemat.c -index f96d022..6990c91 100644 ---- a/src/sparsemat.c -+++ b/src/sparsemat.c -@@ -23,7 +23,7 @@ - - #include "config.h" - --#include "cs/cs.h" -+#include "cs.h" - - #include "igraph_sparsemat.h" - #include "igraph_error.h" -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 6da83b2..c0b82d6 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -13,7 +13,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac - echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \ - } >$(srcdir)/package.m4 - --EXTRA_DIST += package.m4 -+#EXTRA_DIST += package.m4 - - TESTSUITE_AT = \ - testsuite.at \ -diff --git a/tests/mt.at b/tests/mt.at -index 050974a..9558d6f 100644 ---- a/tests/mt.at -+++ b/tests/mt.at -@@ -29,5 +29,5 @@ AT_CLEANUP - AT_SETUP([Thread-safe ARPACK:]) - AT_KEYWORDS([thread-safe ARPACK]) - AT_COMPILE_CHECK([simple/tls2.c], [simple/tls2.out], [], [internal], -- [-lpthread]) -+ [-lpthread $(${PKG_CONFIG} --libs arpack)]) - AT_CLEANUP -diff --git a/tests/types.at b/tests/types.at -index f80a6a2..29ac739 100644 ---- a/tests/types.at -+++ b/tests/types.at -@@ -133,7 +133,7 @@ AT_CLEANUP - AT_SETUP([Sparse matrix, multiplications (igraph_sparsemat_t): ]) - AT_KEYWORDS([sparse matrix igraph_sparsemat_t]) - AT_COMPILE_CHECK([simple/igraph_sparsemat2.c], [simple/igraph_sparsemat2.out], -- [], [INTERNAL], [-lblas]) -+ [], [INTERNAL], [$(${PKG_CONFIG} --libs blas)]) - AT_CLEANUP - - AT_SETUP([Sparse matrix, indexing (igraph_sparsemat_t): ]) --- -2.0.0 - diff --git a/dev-libs/igraph/igraph-0.7.1-r2.ebuild b/dev-libs/igraph/igraph-0.7.1-r2.ebuild deleted file mode 100644 index b920276602c3..000000000000 --- a/dev-libs/igraph/igraph-0.7.1-r2.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools toolchain-funcs - -DESCRIPTION="Creating and manipulating undirected and directed graphs" -HOMEPAGE="http://www.igraph.org/" -SRC_URI="http://www.igraph.org/nightly/get/c/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0/0" -KEYWORDS="~amd64 ~x86" -IUSE="debug gmp" - -RDEPEND=" - dev-libs/libxml2 - >=sci-libs/arpack-3 - virtual/blas - virtual/lapack - >=sci-libs/cxsparse-3 - sci-mathematics/glpk - gmp? ( dev-libs/gmp:0 )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( "${FILESDIR}"/${P}-unbundle.patch ) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - tc-export PKG_CONFIG - econf \ - $(use_enable gmp) \ - $(use_enable debug) \ - --disable-static \ - --disable-tls \ - --with-external-arpack \ - --with-external-blas \ - --with-external-lapack \ - --with-external-f2c \ - --with-external-glpk -} - -src_install() { - default - - # no static archives - find "${D}" -name '*.la' -delete || die -} diff --git a/dev-libs/igraph/igraph-0.8.2.ebuild b/dev-libs/igraph/igraph-0.8.2.ebuild deleted file mode 100644 index fbacf2931bef..000000000000 --- a/dev-libs/igraph/igraph-0.8.2.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools toolchain-funcs - -DESCRIPTION="Creating and manipulating undirected and directed graphs" -HOMEPAGE="http://www.igraph.org/" -SRC_URI="https://github.com/igraph/igraph/releases/download/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0/0" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -RDEPEND=" - dev-libs/gmp:0 - dev-libs/libxml2 - sci-libs/arpack - sci-libs/cxsparse - sci-mathematics/glpk - virtual/blas - virtual/lapack" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( "${FILESDIR}"/${P}-unbundle.patch ) - -src_prepare() { - default - rm -r src/lapack optional/glpk src/cs || die - eautoreconf -} - -src_configure() { - # even with --with-external-f2c - # we don't need f2c as none of - # arpack lapack blas - # are internal - tc-export PKG_CONFIG - econf \ - $(use_enable debug) \ - --enable-gmp \ - --disable-static \ - --disable-tls \ - --with-external-arpack \ - --with-external-blas \ - --with-external-lapack \ - --with-external-f2c \ - --with-external-glpk -} - -src_install() { - default - - # no static archives - find "${ED}" -name '*.la' -delete || die -} diff --git a/dev-libs/igraph/igraph-0.8.5.ebuild b/dev-libs/igraph/igraph-0.8.5.ebuild new file mode 100644 index 000000000000..186bd9a51133 --- /dev/null +++ b/dev-libs/igraph/igraph-0.8.5.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools toolchain-funcs + +DESCRIPTION="Creating and manipulating undirected and directed graphs" +HOMEPAGE="http://www.igraph.org/" +SRC_URI="https://github.com/igraph/igraph/releases/download/${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0/0" +KEYWORDS="~amd64 ~x86" +IUSE="debug" + +RDEPEND=" + dev-libs/gmp:0= + dev-libs/libxml2 + sci-libs/arpack + sci-libs/cxsparse + sci-mathematics/glpk:= + virtual/blas + virtual/lapack" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/${PN}-0.8.2-unbundle.patch ) + +src_prepare() { + default + rm -r src/lapack optional/glpk src/cs || die + eautoreconf +} + +src_configure() { + # even with --with-external-f2c + # we don't need f2c as none of + # arpack lapack blas + # are internal + tc-export PKG_CONFIG + econf \ + $(use_enable debug) \ + --enable-gmp \ + --disable-static \ + --disable-tls \ + --with-external-arpack \ + --with-external-blas \ + --with-external-lapack \ + --with-external-f2c \ + --with-external-glpk +} + +src_install() { + default + + # no static archives + find "${ED}" -name '*.la' -delete || die +} -- cgit v1.2.3