diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2015-06-09 13:37:57 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2015-06-09 13:37:57 +0000 |
| commit | a05e30c81e0582c877fc31c9c93262bbb603f055 (patch) | |
| tree | 44d756c2bf6b8daa3f8c1135956d9ec5a653c714 /sci-biology | |
| parent | Updating remote-id in metadata.xml (diff) | |
| download | gentoo-2-a05e30c81e0582c877fc31c9c93262bbb603f055.tar.gz gentoo-2-a05e30c81e0582c877fc31c9c93262bbb603f055.tar.bz2 gentoo-2-a05e30c81e0582c877fc31c9c93262bbb603f055.zip | |
Fix build problems related to missing blas, bug #530670; bug #550142
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)
Diffstat (limited to 'sci-biology')
| -rw-r--r-- | sci-biology/plink/ChangeLog | 9 | ||||
| -rw-r--r-- | sci-biology/plink/metadata.xml | 10 | ||||
| -rw-r--r-- | sci-biology/plink/plink-1.90_pre140514.ebuild | 18 |
3 files changed, 18 insertions, 19 deletions
diff --git a/sci-biology/plink/ChangeLog b/sci-biology/plink/ChangeLog index 92575ce552f8..4837ece0862c 100644 --- a/sci-biology/plink/ChangeLog +++ b/sci-biology/plink/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-biology/plink -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/plink/ChangeLog,v 1.17 2015/04/07 14:34:12 jlec Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-biology/plink/ChangeLog,v 1.18 2015/06/09 13:37:57 jlec Exp $ + + 09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml, + plink-1.90_pre140514.ebuild: + Fix build problems related to missing blas, bug #530670; bug #550142 22 Sep 2014; Justin Lecher <jlec@gentoo.org> plink-1.90_pre140514.ebuild: Rename USE lapack -> blas, fixing build problems, #514106 @@ -38,4 +42,3 @@ -plink-1.06.ebuild, +plink-1.07-r1.ebuild, metadata.xml: Fixes for #335975, respecting LDFLAGS/CXXFLAGS, supporting lapack, making R support optional - diff --git a/sci-biology/plink/metadata.xml b/sci-biology/plink/metadata.xml index c922e43befdd..80af0e1d0365 100644 --- a/sci-biology/plink/metadata.xml +++ b/sci-biology/plink/metadata.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>sci-biology</herd> - <use> - <flag name="webcheck"> + <herd>sci-biology</herd> + <use> + <flag name="webcheck"> add support for online update checking every time the program starts </flag> - <flag name="R"> + <flag name="R"> add support R language </flag> - </use> + </use> </pkgmetadata> diff --git a/sci-biology/plink/plink-1.90_pre140514.ebuild b/sci-biology/plink/plink-1.90_pre140514.ebuild index 67b3bd31aa18..9070c01e6128 100644 --- a/sci-biology/plink/plink-1.90_pre140514.ebuild +++ b/sci-biology/plink/plink-1.90_pre140514.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/plink/plink-1.90_pre140514.ebuild,v 1.2 2014/09/22 07:20:31 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/plink/plink-1.90_pre140514.ebuild,v 1.3 2015/06/09 13:37:57 jlec Exp $ EAPI=5 @@ -12,18 +12,17 @@ SRC_URI="http://pngu.mgh.harvard.edu/~purcell/static/bin/plink140514/plink_src.z LICENSE="GPL-2" SLOT="0" -IUSE="blas" KEYWORDS="~amd64 ~x86" +IUSE="" DEPEND=" app-arch/unzip virtual/pkgconfig" RDEPEND=" sys-libs/zlib - blas? ( - virtual/cblas - virtual/lapack - )" + virtual/cblas + virtual/lapack + " S="${WORKDIR}/" @@ -31,8 +30,6 @@ S="${WORKDIR}/" # Package contains bytecode-only jar gPLINK.jar. Ignored, notified upstream. src_prepare() { - use blas || sed -i '/NO_blas =/s/$/1/' "${S}/Makefile" || die - sed \ -e 's:zlib-1.2.8/zlib.h:zlib.h:g' \ -i *.{c,h} || die @@ -46,12 +43,11 @@ src_prepare() { } src_compile() { - local blas emake \ CXX=$(tc-getCXX) \ CFLAGS="${CFLAGS}" \ ZLIB="$($(tc-getPKG_CONFIG) --libs zlib)" \ - BLASFLAGS="$(usex blas "$($(tc-getPKG_CONFIG) --libs lapack cblas)" "")" + BLASFLAGS="$($(tc-getPKG_CONFIG) --libs lapack cblas)" } src_install() { |