jlec 15/06/09 13:37:57 Modified: metadata.xml plink-1.90_pre140514.ebuild ChangeLog Log: 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!)
Revision Changes Path 1.6 sci-biology/plink/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/plink/metadata.xml?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/plink/metadata.xml?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/plink/metadata.xml?r1=1.5&r2=1.6 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-biology/plink/metadata.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- metadata.xml 11 Mar 2013 16:47:09 -0000 1.5 +++ metadata.xml 9 Jun 2015 13:37:57 -0000 1.6 @@ -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> 1.3 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.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/plink/plink-1.90_pre140514.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/plink/plink-1.90_pre140514.ebuild?r1=1.2&r2=1.3 Index: plink-1.90_pre140514.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-biology/plink/plink-1.90_pre140514.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- plink-1.90_pre140514.ebuild 22 Sep 2014 07:20:31 -0000 1.2 +++ plink-1.90_pre140514.ebuild 9 Jun 2015 13:37:57 -0000 1.3 @@ -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 @@ 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 @@ # 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_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() { 1.18 sci-biology/plink/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/plink/ChangeLog?rev=1.18&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/plink/ChangeLog?rev=1.18&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/plink/ChangeLog?r1=1.17&r2=1.18 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-biology/plink/ChangeLog,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ChangeLog 7 Apr 2015 14:34:12 -0000 1.17 +++ ChangeLog 9 Jun 2015 13:37:57 -0000 1.18 @@ -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 <[email protected]> metadata.xml, + plink-1.90_pre140514.ebuild: + Fix build problems related to missing blas, bug #530670; bug #550142 22 Sep 2014; Justin Lecher <[email protected]> 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 -
