sci-biology/plink: Rename USE lapack -> blas, fixing build problems, #514106

Package-Manager: portage-2.2.13/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

3 files changed, 29 insertions, 23 deletions

diff --git a/sci-biology/plink/ChangeLog b/sci-biology/plink/ChangeLog
index 0b36a02ac637..38f0873beb03 100644
--- a/sci-biology/plink/ChangeLog
+++ b/sci-biology/plink/ChangeLog
@@ -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 <jlec@gentoo.org> plink-1.90_pre140514.ebuild:
+  Rename USE lapack -> blas, fixing build problems, #514106
 
 *plink-1.90_pre140514 (19 May 2014)
 
diff --git a/sci-biology/plink/Manifest b/sci-biology/plink/Manifest
index 610d9c15a6d3..86aa115ea6b5 100644
--- a/sci-biology/plink/Manifest
+++ b/sci-biology/plink/Manifest
@@ -6,25 +6,25 @@ AUX plink-1.07-gcc47.patch 1825 SHA256 f3019efb2ea2f979971777b29b449a85dc404ac06
 DIST plink-1.07-src.zip 2257297 SHA256 4af56348443d0c6a1db64950a071b1fcb49cc74154875a7b43cccb4b6a7f482b SHA512 493f9f32ecd9eb20c5d11dc8ac98c47a9e695059cec3d1ad6f17465b71609577032368c0fee0d3d564e9451c3c07761e444717bec0f4628caefc587fceb1f6c3 WHIRLPOOL 01e69f605e1b52c6087dd75b506a7705d3bdb8e7dfdd0158e125f4fc4d962fad70c4ec430a139029b3b4ae91b822eb10123fab062c6552b946ec96ca7caf37da
 DIST plink-1.90_pre140514.zip 822157 SHA256 c6f93153d079b4b7f9ae4a51a3b4dcc7bc5ed60b408d39fce6234b98570b8ea7 SHA512 679f1e136b11f35f1d49636bc44ffd17e72e4e38edc5daa270cd963ca39f7b8a80f31905a94de517059e5b3ea7a6bf518ae34a5c2af8a05c530bd6df771606c4 WHIRLPOOL ebcccc1dc0461afd973aa63313237bfd5d904543785115fa71f3af1925d8bb21da15bd0baf60e38f4da534c8c554202a7af6c642b274ca9a458fc0035c2758d2
 EBUILD plink-1.07-r1.ebuild 1263 SHA256 c9fcf415f3ec686c453a5c88541fad85cbe0a184fcece98dc6481c14ad0d1a3b SHA512 2e6adaa85ad20e1171e6af6e66b087db16bf7c1f42285ffb1aada31759b3f537bd273f8c144ad7bcd481e40432ef0a523037663499c832e3914497b8c6cd950d WHIRLPOOL 5d2a58bfcf2a9116891448fa8c8484c97268254a403f1ed91c7f58185b35662931f3b26a611c77e8312ab27df42f1a48b5624b056f916b33652e1e881053ec24
-EBUILD plink-1.90_pre140514.ebuild 1342 SHA256 5aac661c4b7034b541731b2958c93afc2ea970931acd083fc042289589722354 SHA512 69464371a612ff7824b8c3570e5be2ba0bb9b64457a9cb44cbe54789f685afbc03f95b988cc8859e86ae744e70edff5088ecbb2dbcbe12421be7a168b3381e69 WHIRLPOOL 9d63607ac612553f420ab0bad714a1960429592d70a45fe3b0061a1552aa9203c1aaf474c3745524e4b6dfd25353d2d9b262e5ad4acf121e232b74fc1f13f12e
-MISC ChangeLog 1450 SHA256 790ac7aeabbdfff32dfc87431067530f476c5b755ff7cb9d8c23a631f468c898 SHA512 4d1582cbec9f5277baa54b467dff1db165708d666c51ddaeb4a1b342b84ac91ce7c6f68fdee7d883d470ef5a827d8dca1f2e93afd344753606afc3e30092e384 WHIRLPOOL ce476447c9792183b60f4e98b4b91245671057635513896338ac4c939a56110c629b802fd6b5a05dc3ba7f1a38fc3f1e18cc95b110296c13915db1027776d92c
+EBUILD plink-1.90_pre140514.ebuild 1358 SHA256 d8ba21c598fedb5409c0c1842ee0bc784642b8aefa3369eaf7901f0be5ecb239 SHA512 2f2bb9e55916c94ab4e1d44e3ae947a6ac259a08e698e493931022c4bdc064977bb3d1b2e009155aa98d80c407ec450d3fb1e072870adf3778b021a104143cac WHIRLPOOL a669a1e3148f8fb6a25e5e16125b7c4d446c281aa0a1832f797ab2edee5714dd09e0d01fa18e6ef914b5531e4940a874ebff4504e8b455b02c2949c7bf88a5f4
+MISC ChangeLog 1587 SHA256 d5e26702ea1b4dc9f1d8bfc27992b215e8763690d7430cbffdfc4846769c0f1c SHA512 9b57e4762103bd353f5692da3836eddabf6a9c05dde0846b3994947ef90da5c11a0507a0a6fd6c28a19498192266d02817ea394aa3eda5ebf96669afa113842a WHIRLPOOL a55a19bf6c60e26747740d944c4b2a02d1af0257cd69ec325104380be2f4ee0d1ffaa8b71789e5cbd103553bc33b3ec6fc6cb712fe69036f30b06fbff746e768
 MISC metadata.xml 348 SHA256 8a1f2924de09c075cd7469994451860153fa5947db32eef46f83aac2552f4374 SHA512 4c483e275b788e5aefded48d9d404ce390a8c71c7f6a1aaff531d743e6d7e5a71685411c8588548eddc83ff82eb3861c3fc23c69ed769defbed59ce56df3dd02 WHIRLPOOL 2d56efcff46261269c7ec0bff888b0ea4d2b31142f26114727478f234148377de48d95b8f53f024be3cf017a170a36664868f1c5d70357809fbef78cb06a2644
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJTehGRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJUH83AXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir9F4P/2/qgzDJMRAY/+Us1aAqF08n
-ERLJk/bKoGgW0J7qMQmQ05kvO1EaHDjE33UOswAP4fN8ZDl888T43AesmVE0kh1a
-3yTiuNzVEfSC0WIYP0kSKLN0OdGZoMUB4mkEOCarKtHFQk31AydSsWVMcNpe2VH4
-cT1d9H0nzAelhGwwsk9II1PmIe4Z2gg0MFa5pSGWhroVeptyCYQ1nBkpbB4K1qB0
-2LaF5MpzC7punh61XdxVmdn9U8ZKfrcDleHG+bqnSftYKe59aTYxwmPyoL1dJX3P
-frtcMmyDgFxRoBAmIiEXJ1YL568rBU07F1n6jiuGGhp95BgikZbcxlkYD8twiXIa
-Yy2iq4GGHdI0NEkCNHlCG6XF5AwJEPZM9BU6iSuJUSDjYQkgDfc0EyKdhbwromLd
-U3p9/gKPLi3PrEn5O0oMgfK3V2DCe+pu4zQT12sXRbUGMHjk2eFDFfJKTkFNrAKG
-SPLziPVj9pGEjpFja+163M0JJlvpNCJlHHB6eHLFNfLaP0IXKfsmF1+vdtt/5w9k
-liNH+7OMZG8t47v2Lwrvj3exw8ZR0FFmIAXnPuL6u3kyYHe2lVNRM5pLAWMKA3Wb
-7n2lDUPV/DQNte3wc2E5bWnv0re2tP+7IgSU8Ukj3fh9momxTcCTvumZIxBhYyLE
-B+2vW0yB5PImWv0gRHsl
-=p28W
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirIAcP/iOqyUHnHszEmhvdU81AWwM7
+soJNMVgm0H7QylHT97FoxZ6BJxQX05p5V5DVhNs6FhPmZCdHqd+FOzmvv+oe7vrR
+jdubZNUODGQODGRPUzVnudarkUyma/7z1vFY8RoVhu/0zHc05fwa1CH62N9S0AQO
+5p+0Xhr2VCnyYrB6vJIpUkf5JImv0gVE8olGpDMa+zdh+xZUcZaYeEJGOS4BkM+j
+UmzPYWDtAc/6N+x86kpZlAu97fMY9msqGVP70SFrUH1yOO/DID/PBeGrExcP6lhA
+Qu5kdEWs/l+L+UnGW52j59fz/SgQgNBl1fM8AlyBlg881ENqFySXDvL3v1F8ne7l
+z5XFYBP+T1Jlv2KmAb2OZ7JIrgGPCa2ZUS7MyghA5Qd6mu0BxOMz9AhdU+0JoSl6
+x96hM6Xu6QZv+zTZwJoKZBBnHWzsArRm9zkU+eHjQjg3xKG+xhhCQx70wS0ig4Rv
+xezfQCrdDzo8z03d/KKeQrHQSUMatr4Qfsc93nej7M3gj4npoWh59AoN+huycOJw
+BRU7e/8f0h2zkYMUlek+wPxJUa5k7Z5MmhonmUCTQbCbX0Zr7We/Zuij4qkrCSGr
+cAr8xtIKTJ9EZkAHXozSnkIZJeAQasJQxZbKiE7OHm0fqBwBwzyknnrv8vW47rNE
+yO15XWlze7adC/hSiZuI
+=X6CJ
 -----END PGP SIGNATURE-----
diff --git a/sci-biology/plink/plink-1.90_pre140514.ebuild b/sci-biology/plink/plink-1.90_pre140514.ebuild
index 8c959627996c..67b3bd31aa18 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
 # 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 @@ SRC_URI="http://pngu.mgh.harvard.edu/~purcell/static/bin/plink140514/plink_src.z
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="lapack"
+IUSE="blas"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="
@@ -20,7 +20,10 @@ DEPEND="
 	virtual/pkgconfig"
 RDEPEND="
 	sys-libs/zlib
-	lapack? ( virtual/lapack )"
+	blas? (
+		virtual/cblas
+		virtual/lapack
+		)"
 
 S="${WORKDIR}/"
 
@@ -28,7 +31,7 @@ S="${WORKDIR}/"
 # 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 @@ src_compile() {
 		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() {