6 files changed, 5 insertions, 267 deletions
diff --git a/dev-libs/igraph/Manifest b/dev-libs/igraph/Manifest
index 1672bf9b34dc..97806100be21 100644
--- a/dev-libs/igraph/Manifest
+++ b/dev-libs/igraph/Manifest
@@ -1,9 +1,4 @@
-AUX igraph-0.8.2-unbundle.patch 4755 BLAKE2B da0d8940fdddcffae07332db988a3195e3fb8d8628707191c45d7d1d37828fc4fc7ba3bb86f5fdef3f693e5d50d50e0dc504f2ff6334dd44aacaa32238ee46f8 SHA512 737ca787a729538300058307ee003cbf1b70e93bfc1e4fd5853647d033c61537bb935e6f46c1a689f4f69ad188602c71493693d45216e43f912e5c4c4757ca3c
 AUX igraph-0.9.2-disable-broken-tests.patch 378 BLAKE2B 7f3748ec5d9ed8f9f97f638ebfa353a8373e3d672fbd4f0e697aaef92c1ac926386ee4fc38d94e2f2bfc1bafe0b44922f7c1536016ca6d7334bd419006b66f2a SHA512 93f4509b498eacb384c8af9d52c6c74efbc50c15e178d365774140421eff7005f7428e7f7da2d58cfd74adfda44e833e1b2fb54d220b6a64bdb144bf8fda0e7f
-DIST igraph-0.8.5.tar.gz 3303252 BLAKE2B 9aa920e39a1ef76376eb9a88b6d24e2d051aa22807d4e9bbac49fd1708c59f821d2d4ec55dc96a89de84dfc3ca394e3de9f60704b7f3880a40128863b209d0d6 SHA512 eeb7a21b3a0551e47c178e568811a415e39afb2cc99be39905a15d667fa59564e83979111e1ea5d93636d5b0c7dcbed18728f03aa7ee4d83f96c45af52de8370
-DIST igraph-0.9.2.tar.gz 3805091 BLAKE2B aa0e140a9dc8e1005f7f9265aef5880c071fab63c5914c8d93fc7adcbda84d7088678cdb6c277d40bc5998140c70d4a3b359517a4e3583153d1d7233ae8ba42d SHA512 8feb0c23c28e62f1e538fc41917e941f45421060b6240653ee03153b13551c454be019343a314b7913edb9c908518a131034c8e2098d9dd8e5c923fb84d195b3
 DIST igraph-0.9.4.tar.gz 3823988 BLAKE2B c62f15fd227a83da8a78c2bf569874e290c0f8ffd8c69353de1ff2fbd5dff290eceff2462495efc86f44303f3d9d0d397eba720a743da6c118dacb9eeff1b2b8 SHA512 1188d69b95f581d7dac5874dcdb2d1b1a322e39b275c6f092c199ed6214def814062bd46d573bdaa4bc8f4514d6840c6e93dedbe0f6c99a15de33cbc39356573
-EBUILD igraph-0.8.5.ebuild 1177 BLAKE2B 0aebcbb3875bb2ee611d6e35fae031a41cc0eec694649e573adaa3cf987099b2114417332b930102a3b817344ef30f5c383f4f72a70ac9dfe7d3a0caa8397207 SHA512 b8c588bd5a802b2c879d02e81d6c5cde176ff698739423eeb4de5df89cf03d14e70030218b957974f4b65278922116ae0035bf9ad3da9cf9ba275ada0311fdf3
-EBUILD igraph-0.9.2.ebuild 1090 BLAKE2B d883cb49549f5d829bfb66f771b2aa2e212fc86502f68b08031b4fa70abefdf771b3e82d427407fc892493df7d818213d81eb4adf393356a4ff245a182836294 SHA512 0fccd719667534d855dffe24648ef1e17793e5d5ba0c602b3d0b75232e832b5dd8651bde81a258358a9b748d38f0ecdb47c8cc180a990ec9d0e84220d8cd8043
-EBUILD igraph-0.9.4.ebuild 1090 BLAKE2B d883cb49549f5d829bfb66f771b2aa2e212fc86502f68b08031b4fa70abefdf771b3e82d427407fc892493df7d818213d81eb4adf393356a4ff245a182836294 SHA512 0fccd719667534d855dffe24648ef1e17793e5d5ba0c602b3d0b75232e832b5dd8651bde81a258358a9b748d38f0ecdb47c8cc180a990ec9d0e84220d8cd8043
-MISC metadata.xml 705 BLAKE2B e527093147dc23e8b9c962711ee34ca5a81d24c87b2b4a8e17fd990a95af2c2132f6e37bdb1528a6a60bebd1fe9c9f74f76ffc14a5dbead2f780015f5777db25 SHA512 d4c906cfde33242430f50368ec0111e050fe89af5aa541c6ab41108ef4b73e240b08b43d75f92776eff73f501b73dd01ad4960f1e7d329cf22334f66ec8f3988
+EBUILD igraph-0.9.4.ebuild 1088 BLAKE2B 52fc7e3b6bb8e5749e49a4a5764137098568fdf22cddd54111bd70ba5c92910e4d18497e267addbed4a6ecdb0e7f49bbd1bb1579671566b74ef06e0f956b8c52 SHA512 505fa922750a195d2c9070c3a2f095e571b77421952864a109e9f7386c75bcb884c5ff1407425fab6838e2afbaa991d8ca11734f78cb82c07e8f2cf2c2d8f04a
+MISC metadata.xml 758 BLAKE2B 90df5f127db20d8d486a195a6c10d1e2159d2ca8ba1706adfec85c5317ef9b831ddf3595ab0f157cb30627db863fdeb72ce05d14bcd07291ec4735fd73a5e6b0 SHA512 3a5a7afe9387658aa41d587588af41b3cfae0c269e7da4badae23180b18c9854964942c292849321bc2c76feadcd4098223642f56736ca7a21a009d673446801
diff --git a/dev-libs/igraph/files/igraph-0.8.2-unbundle.patch b/dev-libs/igraph/files/igraph-0.8.2-unbundle.patch
deleted file mode 100644
index 859c6387b7f5..000000000000
--- a/dev-libs/igraph/files/igraph-0.8.2-unbundle.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index b422caf..dae8647 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -333,6 +333,8 @@ else
-   internal_glpk=no
- fi
- 
-+PKG_CHECK_MODULES([CS],[cxsparse])
-+
- # Link time optimization feature in newer gcc/g++
- # based on http://svn.r-project.org/R/trunk/configure.ac
- AC_ARG_ENABLE([lto],
-diff --git a/examples/simple/igraph_sparsemat2.c b/examples/simple/igraph_sparsemat2.c
-index 24877c2..0f4b45c 100644
---- a/examples/simple/igraph_sparsemat2.c
-+++ b/examples/simple/igraph_sparsemat2.c
-@@ -21,7 +21,7 @@
- 
- */
- 
--#include <cs/cs.h>
-+#include <cs.h>
- #include <igraph.h>
- #include "igraph_blas_internal.h"
- #include "igraph_arpack_internal.h"
-diff --git a/examples/simple/igraph_sparsemat3.c b/examples/simple/igraph_sparsemat3.c
-index 09329f0..31d4f1f 100644
---- a/examples/simple/igraph_sparsemat3.c
-+++ b/examples/simple/igraph_sparsemat3.c
-@@ -21,7 +21,7 @@
- 
- */
- 
--#include <cs/cs.h>
-+#include <cs.h>
- #include <igraph.h>
- 
- int permute(const igraph_matrix_t *M,
-diff --git a/examples/simple/igraph_sparsemat4.c b/examples/simple/igraph_sparsemat4.c
-index 3a33979..c0ea489 100644
---- a/examples/simple/igraph_sparsemat4.c
-+++ b/examples/simple/igraph_sparsemat4.c
-@@ -21,7 +21,7 @@
- 
- */
- 
--#include <cs/cs.h>
-+#include <cs.h>
- #include <igraph.h>
- 
- igraph_bool_t check_solution(const igraph_sparsemat_t *A,
-diff --git a/src/Makefile.am b/src/Makefile.am
-index f9d02d2..8ab3385 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
-@@ -365,7 +360,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 \
-@@ -408,7 +403,7 @@ libigraph_la_CXXFLAGS	   = -I$(top_srcdir)/include -I$(top_builddir)/include $(W
- libigraph_la_LDFLAGS       = -no-undefined
- libigraph_la_LIBADD        = -lm $(XML2_LIBS) $(F2C_LIB) $(BLAS_LIB) \
- 				 $(LAPACK_LIB) $(ARPACK_LIB) $(GLPK_LIB) $(PRPACK_LIB) \
--				 $(PLFIT_LIB)
-+				 $(PLFIT_LIB) $(CS_LIBS)
- 
- if INTERNAL_GLPK
-   libigraph_la_CFLAGS   += -I$(top_srcdir)/optional/glpk
-diff --git a/src/Makefile.in b/src/Makefile.in
-index 56703d4..cc30d48 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -2411,7 +2411,7 @@ SOURCES = basic_query.c games.c cocitation.c iterators.c \
- 	gengraph_powerlaw.cpp gengraph_random.cpp decomposition.c \
- 	bipartite.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 version.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 \
- 	cohesive_blocks.c statusbar.c lapack.c complex.c eigen.c \
-diff --git a/src/sparsemat.c b/src/sparsemat.c
-index 0ed4678..4fb724d 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 d350f11..31a1f5a 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..b154ce1 100644
---- a/tests/mt.at
-+++ b/tests/mt.at
-@@ -23,11 +23,11 @@ AT_BANNER([[Thread-safety tests]])
- 
- AT_SETUP([Simple error handling test :])
- AT_KEYWORDS([thread-safe])
--AT_COMPILE_CHECK([simple/tls1.c], [], [], [], [-lpthread])
-+AT_COMPILE_CHECK([simple/tls1.c], [], [], [], [-lpthread $(${PKG_CONFIG} --libs arpack)])
- 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/dev-libs/igraph/igraph-0.8.5.ebuild b/dev-libs/igraph/igraph-0.8.5.ebuild
deleted file mode 100644
index 1bce379e3060..000000000000
--- a/dev-libs/igraph/igraph-0.8.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 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
-}
diff --git a/dev-libs/igraph/igraph-0.9.2.ebuild b/dev-libs/igraph/igraph-0.9.2.ebuild
deleted file mode 100644
index 7d9cab598422..000000000000
--- a/dev-libs/igraph/igraph-0.9.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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 test threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/gmp:0=
-	dev-libs/libxml2
-	sci-libs/arpack
-	sci-libs/cxsparse
-	sci-mathematics/glpk:=
-	virtual/blas
-	virtual/lapack"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.9.2-disable-broken-tests.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_CCACHE=OFF
-		-DIGRAPH_GLPK_SUPPORT=ON
-		-DIGRAPH_GRAPHML_SUPPORT=ON
-		-DIGRAPH_USE_INTERNAL_ARPACK=OFF
-		-DIGRAPH_USE_INTERNAL_BLAS=OFF
-		-DIGRAPH_USE_INTERNAL_CXSPARSE=OFF
-		-DIGRAPH_USE_INTERNAL_GLPK=OFF
-		-DIGRAPH_USE_INTERNAL_GMP=OFF
-		-DIGRAPH_USE_INTERNAL_LAPACK=OFF
-		-DIGRAPH_ENABLE_TLS=$(usex threads)
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build check
-}
diff --git a/dev-libs/igraph/igraph-0.9.4.ebuild b/dev-libs/igraph/igraph-0.9.4.ebuild
index 7d9cab598422..3e145244190d 100644
--- a/dev-libs/igraph/igraph-0.9.4.ebuild
+++ b/dev-libs/igraph/igraph-0.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/igraph/igraph/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug test threads"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/igraph/metadata.xml b/dev-libs/igraph/metadata.xml
index a6e6a6af683c..ba6444db0beb 100644
--- a/dev-libs/igraph/metadata.xml
+++ b/dev-libs/igraph/metadata.xml
@@ -13,5 +13,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">igraph</remote-id>
+		<remote-id type="github">igraph/igraph</remote-id>
 	</upstream>
 </pkgmetadata>