dev-libs/igraph: Version Bump; unbundle correctly and use pkg-config to detect sys libs, #445114; fix tests, #421773; drop old

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

6 files changed, 357 insertions, 58 deletions

diff --git a/dev-libs/igraph/ChangeLog b/dev-libs/igraph/ChangeLog
index c20cd3adcebc..67fe0841ae2b 100644
--- a/dev-libs/igraph/ChangeLog
+++ b/dev-libs/igraph/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/igraph
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/igraph/ChangeLog,v 1.2 2012/02/20 04:26:43 floppym Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/igraph/ChangeLog,v 1.3 2013/02/21 20:18:15 jlec Exp $
+
+*igraph-0.6.4 (21 Feb 2013)
+
+  21 Feb 2013; Justin Lecher <jlec@gentoo.org> -igraph-0.5.4.ebuild,
+  +igraph-0.6.4.ebuild, +files/igraph-0.6.4-unbundle.patch, metadata.xml:
+  Version Bump; unbundle correctly and use pkg-config to detect sys libs,
+  #445114; fix tests, #421773; drop old
 
   20 Feb 2012; Mike Gilbert <floppym@gentoo.org> metadata.xml:
   Drop no-herd.
diff --git a/dev-libs/igraph/Manifest b/dev-libs/igraph/Manifest
index f85e64e2c3b9..dc4101c6ea1f 100644
--- a/dev-libs/igraph/Manifest
+++ b/dev-libs/igraph/Manifest
@@ -1,4 +1,15 @@
-DIST igraph-0.5.4.tar.gz 1741540 SHA256 0c7256849d4f63b12b240aedd4fc5be34a2888cce7dd7b4d91c02315585a063f SHA512 0bd25352a71b85f72a1dd018a3400bd271b614fe09f2680b49ac48305b010083b17bcc690ab53e845f7412f3dfc3c1b8d564be4c7a9244e3f9dd3a3ad6e976dc WHIRLPOOL e04060715436586ef1ce2486b00e15c30ce41361c354003f5c33b7d28ccad913221cb5a74eed2bbb08ea61df36984d8eee77713f33c660dc422a402de8a0d38f
-EBUILD igraph-0.5.4.ebuild 978 SHA256 0477d7eb8a2e975f488f4367e69f12ea753732cb0e0365ec36b35d3e7c336191 SHA512 63be3e3adcd41b94d9b159741a0748e60710fbf757fa54ed3c9bffad979a42a0ed5942f755643b0b294e74e4c15cc864d7484689dda23fabe696a0208881c97d WHIRLPOOL 821973338e848dd171c0dc27855fc991d049bbeab0752ed690c7c276db925588378ba58abb197826ce33f304a7ebff93173918bad1c99e5d639a1be417adbbae
-MISC ChangeLog 428 SHA256 d8675f966c461bfa11ef2ff2301e9a91b1548db01bd08300bfe37115d1afda25 SHA512 2a7fb33dc1ebd74c64b222e9926b26e2080d87cafc43368f1712a29d158fdf224428422dc77936feeba0c7c97e5595d97e950530af280009b3ad7dbe988d4c42 WHIRLPOOL d66d64d43721b07e3f9192c950d2802097dbbac40680528e9b0ed0dadf339ea8d057a6d665ffbb582b4fccd663600c49fb27b472395328e13157a407ec129182
-MISC metadata.xml 904 SHA256 724127c01695e85bddfc930e1be98ad82297da301e6008c46dff12d7154ff1c4 SHA512 a0c6728bdd378ba027513f063488ecf67f3a339d6b56b8e65e94486d6330d4820411e5c88e95b918ab4e5e9d623a3067601070bf45568350a84fca8653a769d9 WHIRLPOOL c81c054d9c4fced01c7f3d72c750f34f4e3f8bfd22726f473b14b726b846c8f03b887104fa0546d498ac4ddfda87bbf1f48a70c9edda8c41774118eaa4b6fcd8
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX igraph-0.6.4-unbundle.patch 8810 SHA256 d395d641f961ff4438e34fcf601582e8a1c5d4ab02fe62aea60d5c8f4f132834 SHA512 da7748da0f01b31b027249241479f178482ca1819279f5bf19b53d7345a6cfd74835c0d233843590048ee244a81eb730af9146df2f82849ed7ec1d9a65d61de0 WHIRLPOOL ee6d117a0a47b77e62bed5a29deafe2e055a294dfc14c770baff44acee48e8c07ef89c1d02bc2e16b1dbec12018985d8e9114c98fc82f9af77dc42e6447cccac
+DIST igraph-0.6.4.tar.gz 3021465 SHA256 1da6359240fe7c6fdc46cc0d6a5a083daba9baf130e0933b939977696e059e43 SHA512 1faeea0202381f5e2b2aafb180b6670121b3c24622f60729f2ff461bcfd06da61be28743327470c8700d67e9c08d01a6a1fd19ad27ec5e06e60069f27e04af10 WHIRLPOOL 3637ed0d2a67705f1409a451330035e8892cd1fa7136de67525c9a5b668549941f6f500a542257fcd0e2832c59b024e5272e1abeefcebb0045aeda469e2a31c9
+EBUILD igraph-0.6.4.ebuild 1147 SHA256 c6d8e972240533571cf7ab5ab45b868534076ff2b96bac961eb01e0e3261479a SHA512 a7a15c495cebd13c8b5ca5bb2e11dc40c269e4a46e5e449063c9faa497117af65292144350dc2e2008e52fc93789e584fd9b668b78e08fd14b50aacffb055a00 WHIRLPOOL d575939f3f1de439d703b5dbb25eb1a003eb3fd659e22ee5c065e50b5586f853d958f769f0dd55f2996089f99493832d88abbf651c4697652b5bfb03311690ad
+MISC ChangeLog 712 SHA256 a49df34a66e07fad175479af62f824ed82eed3731290749cf767cac7df35eb40 SHA512 262b5d5cd67901f1f84cc99bbd2f5df1ce7868f112b7deb149091dc73fcd8236cde9f35064ae3b074c0390769fb11643c7018b67e538066f8f9479ec029d2e21 WHIRLPOOL 704a5b01c6f5dacc994b2e38acfda59f7f13c3efa605817baaa786d9104c63d2393d1170addc27f78542a9380caa83c456b0d6f822a6aa906f9c6e18eb96de25
+MISC metadata.xml 601 SHA256 5aa4a75888a05a5593104a496e9b60501658710900d9281c518195d14ade6fce SHA512 a6088077627256885b4446cc8ffa0eb91004077c5d6c14a13050a883ff3f4643a7980e8adeb49dd102d86016bbfa7a10f0a8a21bbbddfb45a29d108f156d768e WHIRLPOOL 65cfa84fd3b53bb1a5950603e6b13efd6a99d529633f27fad4d1f5ea7f0528b3dbd5833248880c3a2a42fe0ef430d9e6840e5a8216f74c6f3004a69068e20a0e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlEmgQgACgkQgAnW8HDreRbPHgCgsSOAA21GTcpOAopsd5Nn4lZC
+xGwAni5mmNWBcqA8W89eQoKqk9QK4D+c
+=jU7F
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/igraph/files/igraph-0.6.4-unbundle.patch b/dev-libs/igraph/files/igraph-0.6.4-unbundle.patch
new file mode 100644
index 000000000000..61bbb8720b81
--- /dev/null
+++ b/dev-libs/igraph/files/igraph-0.6.4-unbundle.patch
@@ -0,0 +1,274 @@
+ configure.in                              | 32 ++++++++++++-------------------
+ examples/simple/igraph_arpack_rnsolve.out |  3 +++
+ examples/simple/igraph_layout_merge2.out  | 20 +++++++++----------
+ examples/simple/igraph_sparsemat2.c       |  2 +-
+ examples/simple/igraph_sparsemat3.c       |  2 +-
+ examples/simple/igraph_sparsemat4.c       |  2 +-
+ src/Makefile.am                           | 11 +++--------
+ src/sparsemat.c                           |  2 +-
+ tests/Makefile.am                         |  2 +-
+ tests/mt.at                               |  2 +-
+ tests/types.at                            |  2 +-
+ 11 files changed, 35 insertions(+), 45 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index c617aec..6d5d162 100644
+--- a/configure.in
++++ b/configure.in
+@@ -165,7 +165,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)     
+     ])
+   ])
+ fi
+@@ -223,23 +224,15 @@ 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}"
+ 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}"
+ else
+   AC_DEFINE([INTERNAL_LAPACK], [1], [Define to 1 if you use the internal LAPACK library])
+ fi
+@@ -248,16 +241,14 @@ 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}"
+ 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
+ if test "$internal_glpk" = "no"; then
+   AC_CHECK_LIB([glpk], [glp_read_mps], [
+@@ -270,7 +261,8 @@ if test "$internal_glpk" = "no"; 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)
+       ])
+     ])
+   ])
+diff --git a/examples/simple/igraph_arpack_rnsolve.out b/examples/simple/igraph_arpack_rnsolve.out
+index ec38497..47b1a6b 100644
+--- a/examples/simple/igraph_arpack_rnsolve.out
++++ b/examples/simple/igraph_arpack_rnsolve.out
+@@ -17,6 +17,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
+@@ -32,6 +33,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
+@@ -47,6 +49,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 296e52e..3abd0e3 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_sparsemat.h>
+ #include <igraph_blas_internal.h>
+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 <cs/cs.h>
++#include <cs.h>
+ #include <igraph.h>
+ #include <igraph_sparsemat.h>
+ 
+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 <cs/cs.h>
++#include <cs.h>
+ #include <igraph.h>
+ #include <igraph_sparsemat.h>
+ 
+diff --git a/src/Makefile.am b/src/Makefile.am
+index af7cae7..5db09eb 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
+@@ -247,7 +242,7 @@ libigraph_la_SOURCES       = $(HEADERS_PRIVATE) \
+ 			     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 \
+@@ -263,8 +258,8 @@ libigraph_la_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) $(PLFIT_LIB)
++libigraph_la_LIBADD        = -lm $(XML2_LIBS) $(F2C_LIB) $(BLAS_LIBS) $(GMP_LIBS) \
++				 $(LAPACK_LIBS) $(ARPACK_LIBS) $(GLPK_LIBS) $(PLFIT_LIB) $(CS_LIBS)
+ 
+ if INTERNAL_GLPK
+   libigraph_la_CFLAGS   += -I$(top_srcdir)/optional/glpk
+diff --git a/src/sparsemat.c b/src/sparsemat.c
+index 2cbdab1..b78b88d 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 6d0ba59..af9bca9 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -13,7 +13,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.in
+ 	  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..e1496ac 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..45087e8 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): ])
diff --git a/dev-libs/igraph/igraph-0.5.4.ebuild b/dev-libs/igraph/igraph-0.5.4.ebuild
deleted file mode 100644
index bad2645a3790..000000000000
--- a/dev-libs/igraph/igraph-0.5.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/igraph/igraph-0.5.4.ebuild,v 1.1 2011/11/13 20:48:46 vadimk Exp $
-
-EAPI=4
-
-DESCRIPTION="igraph is a free software package for creating and manipulating
-undirected and directed graphs."
-HOMEPAGE="http://igraph.sourceforge.net/index.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+arpack +blas debug gmp gprof +lapack static-libs"
-
-DEPEND="
-	gmp? ( dev-libs/gmp )
-	dev-libs/libxml2
-	arpack? ( sci-libs/arpack )
-	blas? ( virtual/blas )
-	lapack? ( virtual/lapack )
-	"
-RDEPEND="${DEPEND}"
-src_configure() {
-	econf \
-		$(use_enable gmp) \
-		$(use_enable gprof profiling) \
-		$(use_enable debug) \
-		--with-external-arpack \
-		--with-external-blas \
-		--with-external-lapack \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete
-}
diff --git a/dev-libs/igraph/igraph-0.6.4.ebuild b/dev-libs/igraph/igraph-0.6.4.ebuild
new file mode 100644
index 000000000000..6545d8483baa
--- /dev/null
+++ b/dev-libs/igraph/igraph-0.6.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/igraph/igraph-0.6.4.ebuild,v 1.1 2013/02/21 20:18:15 jlec Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils
+
+DESCRIPTION="Creating and manipulating undirected and directed graphs"
+HOMEPAGE="http://igraph.sourceforge.net/index.html"
+SRC_URI="mirror://sourceforge/project/${PN}/C%20library/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug gmp static-libs"
+
+DEPEND="
+	dev-libs/libxml2
+	sci-libs/arpack
+	virtual/blas
+	virtual/lapack
+	sci-libs/cxsparse
+	sci-mathematics/glpk
+	gmp? ( dev-libs/gmp )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-unbundle.patch )
+
+src_prepare() {
+#	rm -rf src/{cs,f2c,lapack,f2c.h} optional/glpk || die
+#	rm -rf src/cs optional/glpk || die
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable gmp)
+		$(use_enable debug)
+		--disable-tls
+		--with-external-arpack
+		--with-external-blas
+		--with-external-lapack
+		--with-external-f2c
+		--with-external-glpk
+	)
+	autotools-utils_src_configure
+}
diff --git a/dev-libs/igraph/metadata.xml b/dev-libs/igraph/metadata.xml
index 9b447037e590..3f014c25e464 100644
--- a/dev-libs/igraph/metadata.xml
+++ b/dev-libs/igraph/metadata.xml
@@ -1,19 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>vadimk@gentoo.org</email>
-<name>Vadim Kuznetsov</name>
-</maintainer>
-<longdescription lang="en">
-igraph is a free software package for creating and manipulating undirected and directed graphs. It includes implementations for classic graph theory problems like minimum spanning trees and network flow, and also implements algorithms for some recent network analysis methods, like community structure search.
+  <maintainer>
+    <email>vadimk@gentoo.org</email>
+    <name>Vadim Kuznetsov</name>
+  </maintainer>
+  <longdescription lang="en">
+igraph is a free software package for creating and manipulating undirected and 
+directed graphs. It includes implementations for classic graph theory problems 
+like minimum spanning trees and network flow, and also implements algorithms for
+some recent network analysis methods, like community structure search.
 </longdescription>
-<use>
-  <flag name='arpack'>Use external sci-libs/arpack</flag>
-  <flag name='blas'>Use external virtual/blas numerical library</flag>
-  <flag name='lapack'>Use external lapack numerical library</flag>
-  <flag name='gmp'>Enables dev-libs/gmp support</flag>
-  <flag name='gprof'>Enables profiling support</flag>
-</use>
 </pkgmetadata>
-