summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2013-02-27 16:39:19 +0000
committerJustin Lecher <jlec@gentoo.org>2013-02-27 16:39:19 +0000
commitfc26539c59a5ca1112cb2c4fddc6bc21b71c8396 (patch)
treef78ef0de29b760ae0ad0f02744ce8071e89a3339 /sci-biology/vcftools
parentsci-biology/plink: Use detected pkg-config instead of generic (diff)
downloadhistorical-fc26539c59a5ca1112cb2c4fddc6bc21b71c8396.tar.gz
historical-fc26539c59a5ca1112cb2c4fddc6bc21b71c8396.tar.bz2
historical-fc26539c59a5ca1112cb2c4fddc6bc21b71c8396.zip
sci-biology/vcftools: Use PKG_CONFIG instead of generic pkg-config
Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64 Manifest-Sign-Key: 0x70EB7916
Diffstat (limited to 'sci-biology/vcftools')
-rw-r--r--sci-biology/vcftools/ChangeLog8
-rw-r--r--sci-biology/vcftools/Manifest15
-rw-r--r--sci-biology/vcftools/files/vcftools-0.1.8-buildsystem.patch4
-rw-r--r--sci-biology/vcftools/metadata.xml10
-rw-r--r--sci-biology/vcftools/vcftools-0.1.8.ebuild8
5 files changed, 24 insertions, 21 deletions
diff --git a/sci-biology/vcftools/ChangeLog b/sci-biology/vcftools/ChangeLog
index 27ec7612ae59..2850f8211f3a 100644
--- a/sci-biology/vcftools/ChangeLog
+++ b/sci-biology/vcftools/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-biology/vcftools
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/vcftools/ChangeLog,v 1.4 2012/07/19 11:31:13 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/vcftools/ChangeLog,v 1.5 2013/02/27 16:39:18 jlec Exp $
+
+ 27 Feb 2013; Justin Lecher <jlec@gentoo.org> vcftools-0.1.8.ebuild,
+ files/vcftools-0.1.8-buildsystem.patch, metadata.xml:
+ Use PKG_CONFIG instead of generic pkg-config
*vcftools-0.1.8 (19 Jul 2012)
diff --git a/sci-biology/vcftools/Manifest b/sci-biology/vcftools/Manifest
index 4ffa860871a9..d577add8b0a4 100644
--- a/sci-biology/vcftools/Manifest
+++ b/sci-biology/vcftools/Manifest
@@ -1,18 +1,17 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX vcftools-0.1.8-buildsystem.patch 1161 SHA256 d414e300b18857cb4440d1a4587a9335ba1238d9a6ab1b232098586160ad145d SHA512 faaa57e20b29bf7ef5818f104d2be25a54b9b1cfd9f20df0325cf500f73fd693728f6f59fd2f6b6bec30f9c7c0b4301fe4fad364f833776feea47df018b27a4a WHIRLPOOL 45649955d5fbc3b761e7b2c3a83a4c27588b42a54fe23662eacb6f9c7e419ee25c50a05c2a5cb9d4cb0e1f82dffbe5d2aacf70cd8f53de6401cd10da9519b0d7
+AUX vcftools-0.1.8-buildsystem.patch 1164 SHA256 00bbbea2d9797f4014dc4ce7709ef602d2dc76d2801d273384ebe45d3c223743 SHA512 84a53c4d24686aadc49aad3b0ce4c499ea70e4641d2c3ae7508caf577b08d1a34dd2b7978a8f589eef6240609a32a3e8d1df3954aab54c0c14ab2463c26b0da0 WHIRLPOOL ce0eaaba56a189c9687cbb3d565c003c759e1040da0d2ccf5bc7758744dfc7d06c0f1b48bf7af6fbe7cd79b51755cb5f24882e44c9be9d64511abe384f295d85
DIST vcftools_0.1.7.tar.gz 489145 SHA256 e40685f082aef92511a80af723cb813b87773537eb4fed630716682e8c80a4c0 SHA512 130304d7c4c0058d4547d04f4e52e75c5562ef7c636b7c788654a00f300da15d12eb5d66e94c2e764049275d242b7ce05bfa7f3beb99c857c5d84d26009ea329 WHIRLPOOL 9bf171456b6d2902b4ed5dfc47cb84b2c6615a647c7c04e215a1592bcaa29edb87bbc5fede57df4a68549bc03284eb8800e821c6336e56e11f4d61e98f98827c
DIST vcftools_0.1.8.tar.gz 568268 SHA256 bf360b315181b2f06c85a19c1ce1c539ecce81f187f4da9ae7f8616300573a61 SHA512 5dc35d8adaea16716e5383427c9458fcf965cee1feb980f8ade166ae67403c7f1ae4d74d1218f23c4032187588834f801ea602d86fe94033dc922fe3f58f0c04 WHIRLPOOL ca9a9448bafee8a0c27752e7a6c18c8050b55f9402c072ee313bcb9bd85c2369e2f76f339429c317b37e5a889472667a4e3fc7b3ba9fb221932022e7c997da37
EBUILD vcftools-0.1.7.ebuild 904 SHA256 8387dc4756bce66f6a59888e7d340340dd4b48a5af02f9a2bbbf0778892f7d52 SHA512 24e5e8ec18b3341f5a6181dd0e72e2767f8397ad7937458773ccc39b12c3574df32d84173ce0e64fdc5eeb372cbaf5553054d40ada7e25dbe9333c5db71621a4 WHIRLPOOL 8a0e5ee710ed6a0373776208d154d8eb1c842e49b8a33d7d0df80dcbb5070a32197f0456d1bd36e886dd0333c29ab9bc0c47c01b8579bbbf78defda77f4040af
-EBUILD vcftools-0.1.8.ebuild 1062 SHA256 9ab8408310dbf0520ecc3c6e35dc327df58203a321e767451e2cb1658af16562 SHA512 1b6a3ee68273715b3f2b54ad6a469430868c08cd951b1c19bbf428f05e051c037aa437cc8b27a9895e03027e8576e1e6e71d904cbe2afed764d8c9f618c8d701 WHIRLPOOL f9f46dc379e0404629af0eb2242f5ca5a6f0322a381d014093be6c4ba90888fabb848183da294cde6e1098f0b15e33706a2bd21920c77d56971e986cebf075db
-MISC ChangeLog 815 SHA256 cd8ff2968161a3f723cff00e8a4f77c7c874391379a394bf4b9eb3f09f7b8ddd SHA512 89b36622d1164ddbd7f8bc1a054a6f550fb5d00bb4e95be92c237fc05636b22054fc6d9739f39eb0340cc36493faf9aff9ee805bbe5ce27f1ce85ace52049f6e WHIRLPOOL 3f8912ad2c9700b37ac8e88e8a7a123b2ac57c8202b65d81d76ea4450de9e6e97b6ab18ec094c336ab3e75199858e9f125f4cf68c8f6d4aaf2b7cc2bc96d8a40
-MISC metadata.xml 259 SHA256 541c3fbcf299d9a8ccf4132ee61f9e53a5d737cefdaa6fdc77764d8d4c7f3110 SHA512 c3aea4d69d75075af0108a03b7e109cfed6a1fe324f8ccbda3d4e5ca8a5070f1b24ddeb46b64787e10fd22252d867abcee1f31316d602f7e32fe3c990ae60d74 WHIRLPOOL e50da2f26fd4c908446d22da3edb595d60e61d72def374be46440358802a211fc34045b7ad970c4f94b57f7b17ff24cfe64dc94254fea20e047f1fbbbcae0c64
+EBUILD vcftools-0.1.8.ebuild 1085 SHA256 b3e90b7d6d3663d9d34b32b7dae9f933f6755c143ff35a2ef8204bc81bd94262 SHA512 d66f0ee991088e31ff99e806239104ca98f3c15de46a44c239b52e8e58e0bc8fcedd2a4eae9a1a2ee1f257a0d48ae1b9215948b6b7c6ceec3e789e32acdfdc88 WHIRLPOOL a7dc9031d26d7533a252e9ddd65d03de673061bf34beaee6234b988a749e041a78722279935292326892a1989a7938294f6460a22cea19891018d2e5a6650274
+MISC ChangeLog 989 SHA256 d3e122ece3b453f5eac7e3878b5105125929709d336afb533c7f698596a56e6f SHA512 e664b075ef54632b434b7b0ea62cd0919a2fdce291dad6b9c2afa48eb03bb6b6022c1cb940828a8923c3c11c882496338e9f44947a92223bec3e50883d0b3b77 WHIRLPOOL 920d83f8bc8942576b873f0808f8f1fd6769f45710bda27b1a359ec320ef06295f841ef162d692a8a9fd5f4e38cdd6aea9cef07a22d53b37da145e09133abd35
+MISC metadata.xml 266 SHA256 98c7d1da8a728a1f1d796a79d51f25e4164e24048ec1aacbbf0ae2ffb171ff35 SHA512 879cdcca092d4c82b8c63672c91e08e7b01e81419d2c7c7b766de96ba2a32dd1e21c18968ed7172eec8604f52c92b19a31773f428bce9461d9b8190384680194 WHIRLPOOL 0f46288ab7090ad3da5b31816792427e4ad1a950e39a503bb406ebe8789cffedd9c85b46bfbf040fffb8aad443f512c28716a0a6436d0c06309155277060cdcd
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
-iEYEAREIAAYFAlAH8AYACgkQgAnW8HDreRYT7gCgn9k/pQK4cmyD5omZFM2Qj2qg
-vWcAniWvYhVGOVaYW94ha1s6C3eNX24X
-=Pluy
+iEYEAREIAAYFAlEuNrcACgkQgAnW8HDreRaqpACfXDSjQg1JIhw0KKyK9pFNloLP
+Ji4An0i+SqdpeHBguqFZK769Xl8pdG65
+=U0ST
-----END PGP SIGNATURE-----
diff --git a/sci-biology/vcftools/files/vcftools-0.1.8-buildsystem.patch b/sci-biology/vcftools/files/vcftools-0.1.8-buildsystem.patch
index 37caee9c28dd..d8b18e57d806 100644
--- a/sci-biology/vcftools/files/vcftools-0.1.8-buildsystem.patch
+++ b/sci-biology/vcftools/files/vcftools-0.1.8-buildsystem.patch
@@ -6,7 +6,7 @@ index 42d03e4..2f4d4f6 100644
--- a/cpp/Makefile
+++ b/cpp/Makefile
@@ -3,7 +3,7 @@
- # ($Revision: 1.1 $)
+ # ($Revision: 1.2 $)
# Compiler
-CPP = g++
@@ -28,7 +28,7 @@ index 42d03e4..2f4d4f6 100644
CPPFLAGS += -DVCFTOOLS_PCA
# Add LAPACK library
- LIB += -llapack
-+ LIB += `pkg-config --libs lapack`
++ LIB += `$(PKG_CONFIG) --libs lapack`
# Add PCA source code
SOURCES += dgeev.cpp
endif
diff --git a/sci-biology/vcftools/metadata.xml b/sci-biology/vcftools/metadata.xml
index 3302123e5718..fc7c76942a10 100644
--- a/sci-biology/vcftools/metadata.xml
+++ b/sci-biology/vcftools/metadata.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>weaver@gentoo.org</email>
- <name>Andrey Kislyuk</name>
- </maintainer>
- <herd>sci-biology</herd>
+ <maintainer>
+ <email>weaver@gentoo.org</email>
+ <name>Andrey Kislyuk</name>
+ </maintainer>
+ <herd>sci-biology</herd>
</pkgmetadata>
diff --git a/sci-biology/vcftools/vcftools-0.1.8.ebuild b/sci-biology/vcftools/vcftools-0.1.8.ebuild
index b378d7823283..c722ef41ec3b 100644
--- a/sci-biology/vcftools/vcftools-0.1.8.ebuild
+++ b/sci-biology/vcftools/vcftools-0.1.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/vcftools/vcftools-0.1.8.ebuild,v 1.1 2012/07/19 11:31:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/vcftools/vcftools-0.1.8.ebuild,v 1.2 2013/02/27 16:39:18 jlec Exp $
EAPI=4
@@ -17,7 +17,7 @@ SLOT="0"
KEYWORDS="~x86 ~amd64"
IUSE="lapack"
-RDEPEND="virtual/lapack"
+RDEPEND="lapack? ( virtual/lapack )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
@@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_P}"
src_prepare() {
epatch "${FILESDIR}"/${P}-buildsystem.patch
- tc-export CXX
+ tc-export CXX PKG_CONFIG
}
src_compile() {