diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2013-02-27 16:39:18 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2013-02-27 16:39:18 +0000 |
| commit | 796f0612a87fdd3541328e096fb6f27f83fbb869 (patch) | |
| tree | 7819f484986944833815a031f864251284643661 /sci-biology/vcftools | |
| parent | sci-biology/plink: Use detected pkg-config instead of generic (diff) | |
| download | gentoo-2-796f0612a87fdd3541328e096fb6f27f83fbb869.tar.gz gentoo-2-796f0612a87fdd3541328e096fb6f27f83fbb869.tar.bz2 gentoo-2-796f0612a87fdd3541328e096fb6f27f83fbb869.zip | |
sci-biology/vcftools: Use PKG_CONFIG instead of generic pkg-config
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)
Diffstat (limited to 'sci-biology/vcftools')
| -rw-r--r-- | sci-biology/vcftools/ChangeLog | 8 | ||||
| -rw-r--r-- | sci-biology/vcftools/files/vcftools-0.1.8-buildsystem.patch | 4 | ||||
| -rw-r--r-- | sci-biology/vcftools/metadata.xml | 10 | ||||
| -rw-r--r-- | sci-biology/vcftools/vcftools-0.1.8.ebuild | 8 |
4 files changed, 17 insertions, 13 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/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() { |