diff options
author | Martin Mokrejš <mmokrejs@fold.natur.cuni.cz> | 2016-08-02 00:49:13 +0200 |
---|---|---|
committer | Martin Mokrejš <mmokrejs@fold.natur.cuni.cz> | 2016-08-02 00:49:13 +0200 |
commit | f24839e7208c79e59b719ca80d9c4fee81c4868f (patch) | |
tree | 581e605c2737cbb175ebcd2a3c34b9d329856bce | |
parent | sci-biology/plink: actually add newer homepage (non-maintainer) (diff) | |
download | sci-f24839e7.tar.gz sci-f24839e7.tar.bz2 sci-f24839e7.zip |
sci-biology/plink: non-maintainer commit
Re-add USE=lapack logic adjusted to current sources which got lost in
plink-1.90_pre140514 , could work around bug #589068
Package-Manager: portage-2.3.0
-rw-r--r-- | sci-biology/plink/metadata.xml | 8 | ||||
-rw-r--r-- | sci-biology/plink/plink-1.90_pre160731.ebuild | 20 |
2 files changed, 15 insertions, 13 deletions
diff --git a/sci-biology/plink/metadata.xml b/sci-biology/plink/metadata.xml index c281934d9..8417d1580 100644 --- a/sci-biology/plink/metadata.xml +++ b/sci-biology/plink/metadata.xml @@ -5,12 +5,4 @@ <email>sci-biology@gentoo.org</email> <name>Gentoo Biology Project</name> </maintainer> - <use> - <flag name="webcheck"> - add support for online update checking every time the program starts - </flag> - <flag name="R"> - add support R language - </flag> - </use> </pkgmetadata> diff --git a/sci-biology/plink/plink-1.90_pre160731.ebuild b/sci-biology/plink/plink-1.90_pre160731.ebuild index d75584a15..b57d6b19d 100644 --- a/sci-biology/plink/plink-1.90_pre160731.ebuild +++ b/sci-biology/plink/plink-1.90_pre160731.ebuild @@ -14,16 +14,15 @@ SRC_URI="https://www.cog-genomics.org/static/bin/plink160731/plink_src.zip -> ${ LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" +IUSE="lapack" DEPEND=" app-arch/unzip virtual/pkgconfig" RDEPEND=" sys-libs/zlib - virtual/cblas - virtual/lapack - " + lapack? ( virtual/lapack + virtual/cblas )" S="${WORKDIR}/" @@ -31,6 +30,7 @@ S="${WORKDIR}/" # Package contains bytecode-only jar gPLINK.jar. Ignored, notified upstream. src_prepare() { + rm -rf zlib-1.2.8 || die sed \ -e 's:zlib-1.2.8/zlib.h:zlib.h:g' \ -i *.{c,h} || die @@ -40,17 +40,27 @@ src_prepare() { -e 's:gcc:$(CC):g' \ -e 's:gfortran:$(FC):g' \ -i Makefile || die + if ! use lapack; then + sed -e 's/^NO_LAPACK =/NO_LAPACK = 1/' -i Makefile || die + sed -e 's@^// #define NOLAPACK@#define NOLAPACK@' -i plink_common.h || die + fi tc-export PKG_CONFIG } src_compile() { + local blasflags + use lapack && blasflags="$($(tc-getPKG_CONFIG) --libs lapack cblas)" emake \ CXX=$(tc-getCXX) \ CFLAGS="${CFLAGS}" \ ZLIB="$($(tc-getPKG_CONFIG) --libs zlib)" \ - BLASFLAGS="$($(tc-getPKG_CONFIG) --libs lapack cblas)" + BLASFLAGS="$blasflags" } src_install() { newbin plink p-link } + +pkg_postinst(){ + einfo "plink binary is now renamed to p-link to avoid file collision" +} |