sci-libs/clapack: Use system f2c.h instead of bundled one, #531442

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

3 files changed, 67 insertions, 16 deletions

diff --git a/sci-libs/clapack/ChangeLog b/sci-libs/clapack/ChangeLog
index 990cdf4b784c..a78531a5932b 100644
--- a/sci-libs/clapack/ChangeLog
+++ b/sci-libs/clapack/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/clapack
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/clapack/ChangeLog,v 1.24 2014/01/06 14:41:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/clapack/ChangeLog,v 1.25 2014/12/03 08:14:34 jlec Exp $
+
+*clapack-3.2.1-r8 (03 Dec 2014)
+
+  03 Dec 2014; Justin Lecher <jlec@gentoo.org> +clapack-3.2.1-r8.ebuild:
+  Use system f2c.h instead of bundled one, #531442
 
   06 Jan 2014; Justin Lecher <jlec@gentoo.org> clapack-3.2.1-r6.ebuild,
   clapack-3.2.1-r7.ebuild:
diff --git a/sci-libs/clapack/Manifest b/sci-libs/clapack/Manifest
index 7cf14e83c12a..8271725961e4 100644
--- a/sci-libs/clapack/Manifest
+++ b/sci-libs/clapack/Manifest
@@ -10,22 +10,25 @@ AUX clapack-3.2.1-noblasf2c.patch 5841 SHA256 37525a9099aba9130346abd2b765d05b71
 DIST clapack-3.2.1-CMAKE.tgz 6017667 SHA256 0b3f782bc24845d85f36bafbff0f2f1384dc72df730fda4e7924ec1a70baca5a SHA512 cf19c710291ddff3f6ead7d86bdfdeaebca21291d9df094bf0a8ef599546b007757fb2dbb19b56511bb53ef7456eac0c73973b9627bf4d02982c856124428b49 WHIRLPOOL 9b2e5ba8a2503542c480565e4c34510b9fd501677c30e34b19ede18092ae40b282e4261f1939b5681c82f82d448d4afa24123ce8fb15120c7446e91ea51a698e
 EBUILD clapack-3.2.1-r6.ebuild 938 SHA256 2da1218241d3de6714c40969f736014534eff7957a0351033b655cd995cdbbbb SHA512 a6cb4a42ca29f5b19d901c37b6a808bd23e257c24124e0cec11c7c5ab0c5bcda69bf4e67c19112220c211b495d7a9e849c42e9e206975373c50dbccd56ac7b3b WHIRLPOOL da90ba36485fd401acb615ecf93cafc49b6a5576b0cd2a59040ba8f34fb0d5a47ca65efd8b0919634e91f64253ca158b5ff9e0b20783ee692b18e2dabcfd5dd4
 EBUILD clapack-3.2.1-r7.ebuild 940 SHA256 4cc9ecf8dd196abb17e87dc14f113c44cfad7b9a3b5eb60778ec23432bf4dcb9 SHA512 9ded6b33f55b0186b50921ddf65ccd825a95735f2f63c09f4452256bccc4eb3b82b334d043640ea74015c254640b92e84970e428083a4ba86f83f96b88ad17b8 WHIRLPOOL c3545a838b2160326e0c96f960419fc14209185236b3160499051d8d39f7785554c202e3c6cfca11d057cdd26a4b7c7cd1f74e8386d7425be87e67963389a2a4
-MISC ChangeLog 4175 SHA256 8a51643a1a3ca9236b4739044ef53605bc0e3fc645af4b95f647e2f50085a45c SHA512 3b3a82dc1627c0e01decc8cec82f7f1b1b8c99ad882c8a551a21e4124ef052717534533669233dd84ed9e5fe0f84d5443aebd79206d383fb96231499bf9b8e2a WHIRLPOOL 0e30910a48b4d9914f601b013eb6306b779f8ed01e339d7ca719993689823456fad920f478c5c25475af0d7a0c1379dd1a20ad8894c7836bb65a3b1b47554848
+EBUILD clapack-3.2.1-r8.ebuild 1030 SHA256 5f6184b8a594767789c6fc4ec8195d85f2031bbee8e8a81daad035a03af6edaa SHA512 e2dcce325bc59270652e49c138cbd06c0e032f1bfc8132e187e5519cd0646d57d6a1f9e87c9b9246b6e9df75def8d43ac334ca27066fd1db3f8bd100560bbb67 WHIRLPOOL 26a6677c6f365be9ea23956aee521e27d3e1bd22be92b00022453a0f8c64ea618fca891474f98015ad050301953980064deed6ccb35b647cca80f95b00fcb983
+MISC ChangeLog 4333 SHA256 262a6ac6978faff15abd8dc5546488487cb1136acc655bebb5f26e6c92310470 SHA512 4a12a81ba1010730819efa3b8352dc5c28799933ece0a770bd1f3fcf664d0df5708cb8f439c14ccc6e6c63297c570bb0eeb353759b6fbacdca3cf400670ac25d WHIRLPOOL 5d6697fe02e892766aed70df7b0cb4d7010afabd9d4c6cd56021325df6e08211bb0340731ea74bbec503b4ee7761bb383d40d76199e5dac0114afab561f07fcb
 MISC metadata.xml 624 SHA256 3f8fef6f53e703d882725e244c34d1b470496599d695905e681ffaa6f7be5a23 SHA512 744edd2a2b61f6f61a5816d6f02b28cc3fa190d4e172d83e0125dea676f430fe6f192beba2e0af73532a8e8baa9144293c0a3113d44d54bd2de0af64abfb18bb WHIRLPOOL be5bb97c8128c4e549033f28be0d27433f7991e203497c7fd0897694b3ce0ef9fab518b64551f4d75810b30a02377d3d4b4083743382e16dd6b1702c738f1c79
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCgAGBQJSysCPAAoJELnU8jG9FVirB/UP/j7W08LXdynQnrfDWN7NDl49
-5lifi26X36x1Tc4EHxMWlOvhoVht9Ac3w94P7ljjtqFNp2w6VUe5SBC+dhDfc8ga
-8oO3QSOb+K3hWqV2GjeUfV8QOEBOJ2XjKGPF5PPh5IISgLSvSdB0sG0rNR0Lhp8Z
-I+jHOrd7iDZtJLnEQClt9LaS7S1OBJiOmuw2a4G1yo0DsXHlll30ZLAbrYqH/wUb
-tomKEE8Xsa1r0GZrnhkLDOgaxhMRdrU/bRpSz7VC75OSX3/CyHmG7nWJYHN6tmVL
-i/ecZknIIzkbqH9JVegtD1qtiTfRX8dBFxOmpgt2LIbz2gYCnredI+Fkr+b1rfFE
-3YocJ7ehbyGzS2IcNh+BvZVuNzcDgE3aUfDY2y/61BUPMoQ6wGY10FY3vdlgrtHk
-VFdYq0PoMtnsbIhgOftMDfa0KbbjAHqHHxyWIpfASBhSUELBfdSJlOPfBl/+2CyQ
-LnpYEyxAFJ+h7mmMTAWiSRz0IeELR0AAeXk0tC7kXvXrtghxHdIcqCBFU4+6xlaH
-N24otogedOsYvgKbxwneledplwmBv5TaeD0xfC7bdB7PEdI5iJCq5owk0/y32Bvx
-eP2Si0JLdp06bYO7ROGHMGl7fN10p1cqYHehohkivA88r1YFtc8LX9MbLZvWQ5cG
-0h4bXemDvPZxLUwjoJ5a
-=HWpL
+iQJ8BAEBCgBmBQJUfsZrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirUv0P/36FqV8EmG+MLnoC0yWWXgBR
+N0W4duwBFFcgK08unMDE8w+88fcJsHAVmyYi/BE8lOR3i6P1Bj/lZ9ffINteIfNR
+v7bO6pgjCv9j4Rdrfr4j1GFXTZ5dQgAi0COoCB2KPevuKMtw+RsqNuF8zw4Jv6or
+WUX6oWbUi8lzLf5JrpUTCPPvAg8yFsNiptS4vDLuudNXIxBr5KjhQTR/6Odd5mHJ
+mUhTmcxxmePmhH+DkMkxLvbh4vJFOB3RtNb3nBUGETeKlVQpuKhnq9JEFW0JNjfg
+G+hvnG3ZS7RzIGlRN2dVpAADlPJxOpb9qsoVHYUmb3zSj3rFFPIsubfYZ68cAjh1
+ouqUwPQo9trBLB3TRyEvK0+1WB1iW2ZHBTVxp5LpX3vgz5pe8v4I96JzITmJcL0t
+Q3aTpchebFHnbrO3WLoMs/fSw8B2KXQlckuklc85prIG3bCnw0ZfY2Zq3Kxrk8kf
+soiyMu2Qrvt+Sd7/SR/4IFwF9YTRTnXr90aSBthcBKuF0dbeGAY1Badv63Ep0rJ5
+fj8mqPf6X5A+iQXjTVhh0t64p83Kn1Qpn3Q+qpy39vrDZy++cEm5D9lyXPxiEBdA
+HfVp/qb/efud/umYzQOlv3ZZIog/sPAkj8j6/5ecSScQzA5B0AKioKXrGqpDz/P+
+/QDSPBOQUzJryiQKkxwu
+=q2Fs
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/clapack/clapack-3.2.1-r8.ebuild b/sci-libs/clapack/clapack-3.2.1-r8.ebuild
new file mode 100644
index 000000000000..41947ba69021
--- /dev/null
+++ b/sci-libs/clapack/clapack-3.2.1-r8.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/clapack/clapack-3.2.1-r8.ebuild,v 1.1 2014/12/03 08:14:34 jlec Exp $
+
+EAPI=5
+
+inherit flag-o-matic cmake-utils
+
+DESCRIPTION="f2c'ed version of LAPACK"
+HOMEPAGE="http://www.netlib.org/clapack/"
+SRC_URI="http://www.netlib.org/${PN}/${P}-CMAKE.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-libs/libf2c-20090407-r1
+	virtual/blas"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P}-CMAKE
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix_include_file.patch"
+	"${FILESDIR}/${P}-noblasf2c.patch"
+	"${FILESDIR}/${P}-hang.patch"
+	"${FILESDIR}/${P}-findblas-r7.patch"
+)
+
+src_prepare() {
+	rm INCLUDE/f2c.h F2CLIBS/libf2c/f2c.h || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	filter-flags -ftree-vectorize
+	# causes an internal compiler error with gcc-4.6.2
+
+	local mycmakeargs=( $(cmake-utils_use_enable test TESTS) )
+	cmake-utils_src_configure
+}