Fix build problems related to missing blas, bug #530670; bug #550142

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

4 files changed, 36 insertions, 37 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/Manifest b/sci-biology/plink/Manifest
index 840a59ce578f..401a1952458e 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 1358 SHA256 d8ba21c598fedb5409c0c1842ee0bc784642b8aefa3369eaf7901f0be5ecb239 SHA512 2f2bb9e55916c94ab4e1d44e3ae947a6ac259a08e698e493931022c4bdc064977bb3d1b2e009155aa98d80c407ec450d3fb1e072870adf3778b021a104143cac WHIRLPOOL a669a1e3148f8fb6a25e5e16125b7c4d446c281aa0a1832f797ab2edee5714dd09e0d01fa18e6ef914b5531e4940a874ebff4504e8b455b02c2949c7bf88a5f4
-MISC ChangeLog 1587 SHA256 2bc41740a6c0ba65df6e9cc056166f0de857d6d43307e13943a6a3618ba7cfe4 SHA512 69c3e5335964923256dfafa3644450aea0ec6ce8826d8ff296c7e3bcb9d4a2acfee4cd4798b8a0d2c0534d5f86a71df15d3748846cfa1567180ec151b875b9e8 WHIRLPOOL b62cef22366586441326857b82afba2677402bf1fb268a60d4ddb4a1845c84e3e1cd9becc305c825c34a982770ca8e409221ea41557283efd4467f8293cb336f
-MISC metadata.xml 348 SHA256 8a1f2924de09c075cd7469994451860153fa5947db32eef46f83aac2552f4374 SHA512 4c483e275b788e5aefded48d9d404ce390a8c71c7f6a1aaff531d743e6d7e5a71685411c8588548eddc83ff82eb3861c3fc23c69ed769defbed59ce56df3dd02 WHIRLPOOL 2d56efcff46261269c7ec0bff888b0ea4d2b31142f26114727478f234148377de48d95b8f53f024be3cf017a170a36664868f1c5d70357809fbef78cb06a2644
+EBUILD plink-1.90_pre140514.ebuild 1247 SHA256 41e28f9a2e91bae491a56750f96140f637ac691e978a77ed019324b852bc2bc1 SHA512 9939abe6d479123d2a4ac8bf09330af83fc7f2d5bc5a785033341219397040480e83567bfe1dadf7e6c2561fd09cf54d5d0fd4be1a09d05fd3ae1882927aeece WHIRLPOOL d1b13ad7e49d6f309bbfebdf77c3d40bad19ebbfdcd7b34635d9a9b09156063be27b91c60caf77c67c28f9d7f0f35874ad3390f5965b68c2230d20bc08f54b69
+MISC ChangeLog 1750 SHA256 b79a87d58ae9d9a8eeaa8bd9c5c6493fc00077f0529defefa109013a5acf1c12 SHA512 382a66511906608ee6ff0890aa8a485613046440f98e78e10646818ad3ace687e83d71687c3e626667c422a9416718657e41278ea1c5bee84d6fa0d46d11e33c WHIRLPOOL 13c54f79b657f444ac22d06b61ae269f8bba84e8f3305c85b0805bc40cef2fdeb4ddda9e0d69832a20bdff068b2109ec766d576fad06b4b23f8df37f550e804b
+MISC metadata.xml 341 SHA256 eae3ea02851e49b0c85818e1c305e8978681057b74523ae07391dd5fd8889853 SHA512 78c0bd9b1e820b5c3e067284b55433a0e9b1646c9a4e5f23064e75f18991f804eac3ab025b6ac671ce4fe7dd6960230bc31fa09b6a80a543abcba918018199b3 WHIRLPOOL 956b405fea0a2aed839143d05169a56eef6320ca9b173b961be5a0b95232b0370daddb0ca0acb93a029b832dabacd67f7946cedf9a7354e1fdd4abb2e73c6374
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVI+rlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FViryi0QAIDXDam98MrCoellt4NXh7yq
-89dVMc2uVd8CZVP5SqgjuM0pDgcL3H58Vj4QbiaHq6222PwhfIO9rYBRNdj56PoF
-Jg7xieO3OmMeYv/cMdGbxcBJK9fyoIx67PyXWXjocz8xN/RU4APbMT3NSnLUpGYh
-zEEEOQeH/1zZuuYLpyWnaRm9fke7vsEQivlBARiR72YJyGSze/7nuUdENe5fYipE
-tiwlZXkF0kD0NoVVuigmhnR6apH9ll3Fy1VwgR3x/BSWsIKny8t/pZ/9iJspaIYv
-UBUN6ZXpCMPmr990fTsW6pgJGI47TSnSheysXXZ9odMT8jrXXExR99Jkvwn1Egzl
-dG+tRvha/SQDSE2N7eEqhGMbEjNuv5TI0cg0fTr1mqbkhHHX0w+jy4fWuRGZdmXc
-rv3ilzGwP5w+97lv0PmGRdU/K/MPKV987GV3a2yrzkqTO0Tg+F4L1RVa+3qiCkJL
-//USZ3wrkXGjt0M0RjSQKJZkldN3FX+4VMO6jjNhDVl3Zc5QnBLuRiA4quxnS1L0
-Kh5qw/kMA+ipteIKEP/nzBNL4BZkRvcYuE1A4QsTr6IW6zsM2pAL25YzpDg/5SFK
-u6bLXs6IVMZg9xaj/dZKUufdzcbGTypp2DQvX4Wn0l5JziNhm9lwHVfPivxBZ83v
-9DuxWk0abwYKWvBThDLe
-=iVOw
+iQJ8BAEBCgBmBQJVduw2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiN+0P/ib10lKG7nsOi/Ouov+eRL/+
+zdxJCiqfjUw2hXzH97OEKV6q5c03yM7GE120Bb7uetwkQlCtfhumZ11PvztaIEEI
+/NDf9oxcT6cElY5VAoSVKjv59d32Wd3bzwhK/UoKUgBxPVDxqJmhf8kdBZZxkGyI
+b+JVvQSeNXlcyT0HTj/bJG5vPL90+RthCuPwojgCI7Ie75Eg2GT4i3T1odTidSJY
+KAwA+FSTwqty/dnf1j3n9sNTSy0s+KtOUEpD2fmgtoM/83f/ksneFnxcPsD1MFJE
+rjkY8idK8G9m3lsG25+5R1ClCxfIKh5w5/CuCffP5KovU4TRXyWq1L2dFbNLJSRX
+9rmJRPcnFXKJEp+Do2afuTBMBSf/m9aMsicjItZADGDo+LEZPPQdBuWJBDRLxLqj
+h5W0d/Q5SelmPwyccylGwvvISM8OOC0QSxGWe1+Jx6AP8iN9OnPO2bntJcYjszJh
+QqXQfOuWJe4UNdUqxGBG5s1jsfsAjQ2RfVIxY19AS5MlzH1SOjU9XTHmyuZOYjIM
+gxm7HplyViyapVMLAHL4HMcdXExQve0K1GwCjF4O5pLlkLiCCI+CyvhfGkd6Dukx
+ia+94b617iivh/uHG5XdvK5Z3kClJBlT8KArNPm5OJJSkPIIwpxJQ+mL0erEEfEN
+CWaTO9HuOlZOGepUeHEQ
+=p5oc
 -----END PGP SIGNATURE-----
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() {