jlec 14/09/22 07:20:31 Modified: ChangeLog plink-1.90_pre140514.ebuild Log: sci-biology/plink: Rename USE lapack -> blas, fixing build problems, #514106 (Portage version: 2.2.13/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path 1.16 sci-biology/plink/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/plink/ChangeLog?rev=1.16&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/plink/ChangeLog?rev=1.16&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/plink/ChangeLog?r1=1.15&r2=1.16 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-biology/plink/ChangeLog,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- ChangeLog 19 May 2014 14:13:36 -0000 1.15 +++ ChangeLog 22 Sep 2014 07:20:31 -0000 1.16 @@ -1,6 +1,9 @@ # 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.15 2014/05/19 14:13:36 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/plink/ChangeLog,v 1.16 2014/09/22 07:20:31 jlec Exp $ + + 22 Sep 2014; Justin Lecher <[email protected]> plink-1.90_pre140514.ebuild: + Rename USE lapack -> blas, fixing build problems, #514106 *plink-1.90_pre140514 (19 May 2014) 1.2 sci-biology/plink/plink-1.90_pre140514.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/plink/plink-1.90_pre140514.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/plink/plink-1.90_pre140514.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/plink/plink-1.90_pre140514.ebuild?r1=1.1&r2=1.2 Index: plink-1.90_pre140514.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-biology/plink/plink-1.90_pre140514.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- plink-1.90_pre140514.ebuild 19 May 2014 14:13:36 -0000 1.1 +++ plink-1.90_pre140514.ebuild 22 Sep 2014 07:20:31 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 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.1 2014/05/19 14:13:36 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/plink/plink-1.90_pre140514.ebuild,v 1.2 2014/09/22 07:20:31 jlec Exp $ EAPI=5 @@ -12,7 +12,7 @@ LICENSE="GPL-2" SLOT="0" -IUSE="lapack" +IUSE="blas" KEYWORDS="~amd64 ~x86" DEPEND=" @@ -20,7 +20,10 @@ virtual/pkgconfig" RDEPEND=" sys-libs/zlib - lapack? ( virtual/lapack )" + blas? ( + virtual/cblas + virtual/lapack + )" S="${WORKDIR}/" @@ -28,7 +31,7 @@ # Package contains bytecode-only jar gPLINK.jar. Ignored, notified upstream. src_prepare() { - use lapack || sed -i '/NO_LAPACK =/s/$/1/' "${S}/Makefile" || die + use blas || sed -i '/NO_blas =/s/$/1/' "${S}/Makefile" || die sed \ -e 's:zlib-1.2.8/zlib.h:zlib.h:g' \ @@ -48,7 +51,7 @@ CXX=$(tc-getCXX) \ CFLAGS="${CFLAGS}" \ ZLIB="$($(tc-getPKG_CONFIG) --libs zlib)" \ - BLASFLAGS="$(usex lapack "" "$($(tc-getPKG_CONFIG) --libs lapack)")" + BLASFLAGS="$(usex blas "$($(tc-getPKG_CONFIG) --libs lapack cblas)" "")" } src_install() {
