summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2013-02-27 17:01:14 +0000
committerJustin Lecher <jlec@gentoo.org>2013-02-27 17:01:14 +0000
commit42754c3b0d6e28d42946fc621e554a6566e45a72 (patch)
treeb69f72d0ba7f0721a310f3bd5a3ed030803641cd /dev-libs/igraph
parentsci-chemistry/ccp4-apps: Use PKG_CONFIG instead of generic pkg-config (diff)
downloadhistorical-42754c3b0d6e28d42946fc621e554a6566e45a72.tar.gz
historical-42754c3b0d6e28d42946fc621e554a6566e45a72.tar.bz2
historical-42754c3b0d6e28d42946fc621e554a6566e45a72.zip
dev-libs/igraph: Use detected pkg-config instead of generic
Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64 Manifest-Sign-Key: 0x70EB7916
Diffstat (limited to 'dev-libs/igraph')
-rw-r--r--dev-libs/igraph/ChangeLog6
-rw-r--r--dev-libs/igraph/Manifest14
-rw-r--r--dev-libs/igraph/files/igraph-0.6.4-unbundle.patch4
-rw-r--r--dev-libs/igraph/igraph-0.6.4.ebuild5
4 files changed, 17 insertions, 12 deletions
diff --git a/dev-libs/igraph/ChangeLog b/dev-libs/igraph/ChangeLog
index 9977e62ebcca..8745194c0dc7 100644
--- a/dev-libs/igraph/ChangeLog
+++ b/dev-libs/igraph/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/igraph
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/igraph/ChangeLog,v 1.4 2013/02/23 12:45:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/igraph/ChangeLog,v 1.5 2013/02/27 17:01:12 jlec Exp $
+
+ 27 Feb 2013; Justin Lecher <jlec@gentoo.org> igraph-0.6.4.ebuild,
+ files/igraph-0.6.4-unbundle.patch:
+ Use detected pkg-config instead of generic
23 Feb 2013; Justin Lecher <jlec@gentoo.org> igraph-0.6.4.ebuild:
Add missing dep on virtual/pkgconfig
diff --git a/dev-libs/igraph/Manifest b/dev-libs/igraph/Manifest
index f85056f78e4e..8257e7d0c242 100644
--- a/dev-libs/igraph/Manifest
+++ b/dev-libs/igraph/Manifest
@@ -1,15 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
-AUX igraph-0.6.4-unbundle.patch 8810 SHA256 d395d641f961ff4438e34fcf601582e8a1c5d4ab02fe62aea60d5c8f4f132834 SHA512 da7748da0f01b31b027249241479f178482ca1819279f5bf19b53d7345a6cfd74835c0d233843590048ee244a81eb730af9146df2f82849ed7ec1d9a65d61de0 WHIRLPOOL ee6d117a0a47b77e62bed5a29deafe2e055a294dfc14c770baff44acee48e8c07ef89c1d02bc2e16b1dbec12018985d8e9114c98fc82f9af77dc42e6447cccac
+AUX igraph-0.6.4-unbundle.patch 8816 SHA256 b7e154e6581c89626d1f2632e005114a82600d62e7399408d564147cc1992101 SHA512 787fdc8c934e36c2607b651f38bd49469393c9dad8519580b10fffcdfdb0a1565e0fff571fba819427972fc4e072fa06677e4d53b8e250bf9d49d8c7e87ad352 WHIRLPOOL 2e806d46ace140c18cc786e734814e43a61e3f9413e26bf11c3470aa6822f37c0c46038ee44bdc82a5bae7a28d5bc218ef3b8f6f0177be44768ed7eb711d2bce
DIST igraph-0.6.4.tar.gz 3021465 SHA256 1da6359240fe7c6fdc46cc0d6a5a083daba9baf130e0933b939977696e059e43 SHA512 1faeea0202381f5e2b2aafb180b6670121b3c24622f60729f2ff461bcfd06da61be28743327470c8700d67e9c08d01a6a1fd19ad27ec5e06e60069f27e04af10 WHIRLPOOL 3637ed0d2a67705f1409a451330035e8892cd1fa7136de67525c9a5b668549941f6f500a542257fcd0e2832c59b024e5272e1abeefcebb0045aeda469e2a31c9
-EBUILD igraph-0.6.4.ebuild 1166 SHA256 7e99642da9f8a463a499035d6280719683322f4440285a1d5513f87e115cecc6 SHA512 ff8d7fb0368952f0e46a6cb527fd445dfae8255453301478313b9d322ac3ae49f1e2982c4ce447da2069c4324dc27ece0a428c8f8d620e8b251ffd4fb9694ecd WHIRLPOOL 9f82a36fce89da8201289e4cca8681496ed84f9a79944c69ec110bd2d486ba803680bdd491a48e8c9d5dcef0437e66c6c4e0c7c2b2ba84c517962284ce9b8674
-MISC ChangeLog 820 SHA256 1dba885e74650c7711379f55e26f5f12e96402ffe8083a4ba90f3c1f0ed4590f SHA512 13c4ba04765da86708a3585d282f6bb04c1c564f01cdba19912b074da55822b8b39738c2d0877cca2b65f8cbd545def19bb4448e3437ddb7d0efe6fb3d446447 WHIRLPOOL dbda3c80abae88052574e0fa61d78505b57cf1f93bcbd162c2562e45881f92fe8e93f59d73a76f79957dc37e14f1957dc78005fa2ec456ab9b7ce3b9284a0de5
+EBUILD igraph-0.6.4.ebuild 1204 SHA256 2655e01c2433e42a7665de7d014255a1de23a0ce1cf5ce4e0f88253b0880c3a5 SHA512 039f9ece1ad95e6250468469ff865ef14fb77f33b36be06d3516737ef9006b78e9ea9bb1f0763cd1c6793931fe4f52ed1457d963633a977a00e4d4d6c43481f2 WHIRLPOOL bdd1eaa83dacd4e4b4a0a78aa74a4bca9002315257716779edb2a080176803b6308830b475c25290df832a03910a8c4a7d16babf755fed3cff3a9b924fe90ff4
+MISC ChangeLog 971 SHA256 90a05199125825970263139521b1e68f9c8eee121b942db1fa7faa0a324beabd SHA512 59fe622170f4d68c9b0e791d5c874d5b43cbaee72b0c2f4a2f738913591e4c2833f861ca16aefcd217a3bdc7705c626510a05b018dc4059a133acb7fb7e7187e WHIRLPOOL b4c66d44085935120cffe46ec4011c6956ccb530a203d3ac83ab39b40f2a9ffea947cdead89cc3042f78b3ca356edde4808859d21244d7b3ff96654bac8bf48d
MISC metadata.xml 601 SHA256 5aa4a75888a05a5593104a496e9b60501658710900d9281c518195d14ade6fce SHA512 a6088077627256885b4446cc8ffa0eb91004077c5d6c14a13050a883ff3f4643a7980e8adeb49dd102d86016bbfa7a10f0a8a21bbbddfb45a29d108f156d768e WHIRLPOOL 65cfa84fd3b53bb1a5950603e6b13efd6a99d529633f27fad4d1f5ea7f0528b3dbd5833248880c3a2a42fe0ef430d9e6840e5a8216f74c6f3004a69068e20a0e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREKAAYFAlEougIACgkQgAnW8HDreRbv4gCcCnar2GJjsOdeTdLdsWmnfy4F
-X7YAn2bzIgWrc90W+tLAuyv1bZZxeSKO
-=odCw
+iEYEAREIAAYFAlEuO9oACgkQgAnW8HDreRYsawCgktvkUJXasK0N1EqEZY6i1HTy
+K40Anis3YMetKgUGQDmnW5jnco2NhtB+
+=gvYO
-----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
index 61bbb8720b81..f40a03067a6b 100644
--- a/dev-libs/igraph/files/igraph-0.6.4-unbundle.patch
+++ b/dev-libs/igraph/files/igraph-0.6.4-unbundle.patch
@@ -257,7 +257,7 @@ index 050974a..e1496ac 100644
AT_KEYWORDS([thread-safe ARPACK])
AT_COMPILE_CHECK([simple/tls2.c], [simple/tls2.out], [], [internal],
- [-lpthread])
-+ [-lpthread $(pkg-config --libs arpack)])
++ [-lpthread $(${PKG_CONFIG} --libs arpack)])
AT_CLEANUP
diff --git a/tests/types.at b/tests/types.at
index f80a6a2..45087e8 100644
@@ -268,7 +268,7 @@ index f80a6a2..45087e8 100644
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)])
++ [], [INTERNAL], [$(${PKG_CONFIG} --libs blas)])
AT_CLEANUP
AT_SETUP([Sparse matrix, indexing (igraph_sparsemat_t): ])
diff --git a/dev-libs/igraph/igraph-0.6.4.ebuild b/dev-libs/igraph/igraph-0.6.4.ebuild
index 02088411e3e0..0a3d4e1925c6 100644
--- a/dev-libs/igraph/igraph-0.6.4.ebuild
+++ b/dev-libs/igraph/igraph-0.6.4.ebuild
@@ -1,12 +1,12 @@
# 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.2 2013/02/23 12:45:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/igraph/igraph-0.6.4.ebuild,v 1.3 2013/02/27 17:01:12 jlec Exp $
EAPI=5
AUTOTOOLS_AUTORECONF=true
-inherit autotools-utils
+inherit autotools-utils toolchain-funcs
DESCRIPTION="Creating and manipulating undirected and directed graphs"
HOMEPAGE="http://igraph.sourceforge.net/index.html"
@@ -37,6 +37,7 @@ src_prepare() {
}
src_configure() {
+ tc-export PKG_CONFIG
local myeconfargs=(
$(use_enable gmp)
$(use_enable debug)