From 13a7c50acfbf0aa1809719df5f304be1a73dc457 Mon Sep 17 00:00:00 2001 From: "Andreas K. Huettel (dilfridge)" Date: Wed, 15 Sep 2010 23:18:30 +0200 Subject: [sci-libs/clapack] Removed version bumped to tree by bicataly, continued cblas attempts (Portage version: 2.1.8.3/git/Linux x86_64) (Signed Manifest commit) --- sci-libs/clapack/Manifest | 29 +++++++++--------- sci-libs/clapack/clapack-3.2.1-r3.ebuild | 35 ---------------------- .../clapack/files/clapack-3.2.1-noblasf2c-r4.patch | 16 +++++----- 3 files changed, 22 insertions(+), 58 deletions(-) delete mode 100644 sci-libs/clapack/clapack-3.2.1-r3.ebuild (limited to 'sci-libs') diff --git a/sci-libs/clapack/Manifest b/sci-libs/clapack/Manifest index f925b71..82f781f 100644 --- a/sci-libs/clapack/Manifest +++ b/sci-libs/clapack/Manifest @@ -1,27 +1,26 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX clapack-3.2.1-noblasf2c-r4.patch 5840 RMD160 1bf6ddcc3113241b72cd95969c38f4518c12721b SHA1 a389dc3ee992fa02b711eab1841cb42fb9298660 SHA256 43fa59366268decf07fb7356d4a42a6b6a134fe9e3c9272849a762ed920fb670 +AUX clapack-3.2.1-noblasf2c-r4.patch 5852 RMD160 7dea18e7fd5bf378ba9f6495e457c931b8ee7bd6 SHA1 1bbc3178c09832d4654d8d854a4156bf61c81112 SHA256 39c6ed8e878b0fe74c1eba9745d60ea35611596b4ab68191e42fe3dc0f7a14a3 AUX clapack-3.2.1-noblasf2c.patch 5839 RMD160 d30ff26a4ac811442d37af80bc6335f942b80505 SHA1 b16b68b076927299c32ec85d74790259d8ffb81f SHA256 cd1807a0d61a1dc51f0ef7d1e46c50c84a60f846ec6dfab380dc568e247ecc07 DIST clapack-3.2.1-CMAKE.tgz 6017667 RMD160 42af2b40a78b0cc4020a961a2fe0faf73c20560c SHA1 5ea1bcc4314e392bca8b9e5f61d44355cf9f4cc1 SHA256 0b3f782bc24845d85f36bafbff0f2f1384dc72df730fda4e7924ec1a70baca5a -EBUILD clapack-3.2.1-r3.ebuild 690 RMD160 756cfab349d718f78dc452c78ccf3f7794657907 SHA1 b12d03f852ed2048580fad7c273c5a28ae436170 SHA256 6e8d2fbdda131dbbaf89bda7f084c4b0992be035c1d81ba947bd3e70796bc94f EBUILD clapack-3.2.1-r4.ebuild 754 RMD160 a3eef57e0c137cb23cff7aec7fac10a636c49c93 SHA1 3d88c0c2ca3f8f804b7e2624f14f37d7898ea286 SHA256 ff8683e64d8b19905e8e7414cd533dae67c48beb0b46730a4637e42b9e75bdfd MISC ChangeLog 2275 RMD160 d4b9bd9c306a3a8389d2b3831881a0ac384c4890 SHA1 0f5c4ded1e769ee366230535599c9b51b93a748a SHA256 ac5fc6bced6ba282ec8f2d19b92b6a5ede221f01c145994daa1330901b08bf68 MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iQIcBAEBAgAGBQJMeuB/AAoJENwGBM22xffeQx0QAJexb0QFRkz8s9vEomZzwtoX -gE/Uqs+k0dP020JRmCoKpaNA+zCIa8lAAioDXWzBbCfduHu/VxUdPVsTzTe4BhcG -eAJ6iPtxkPNE6xozaZ340dI+91mH0xO0JJVtdpCGBQ4sdON7qhbRz+vtVhYdACFx -5mmzo129zjbY1LJ+K5Uyuvw+dTbnqk6YJW09LFhoBWiGeISnKvAMRcZSeH9FQSVo -ikM7RHKRQB5tL/LEalgiWvYCJIOfYUDv9A0xq8laepc4mYbfwtEd/lEhlaLc5jC7 -8XI394ig3n6BR/LNHUzIcbXmRER4P4a8kWiiHv3Nbt72JnLpE7F7ehCBxV0ekPII -nXC+wSfX760zNm/1DkWHOZulC4V1i+lc/byddwLGTOkXk6Y/B68CxJAHYha/fw3O -b6gYsMjqQTW7NPZf3Nlle5VS7A+LgCCbHN0KTKGFlMf8sxFoBlUnB087PZH6YgOq -7sVBiq3Jfyf44fH7vj5xdcuAU7FPp7+W0UVugJvjSA+hGF3Us1zRIX4XnaSo9r34 -XUVvLicT9jjdOIqaWoUhI2vZS+vRBJmDkxVBW8fHO0BndwWamubRt3PFLi85LACw -90lt9w0B8FvZWceQowZRG0BuWZhzADfoj49PIYr8uc9099ZkPiF1wg9tYakirm2T -NzsOSPNIqbWVKZhJAl2J -=SiFK +iQIcBAEBAgAGBQJMkTgmAAoJENwGBM22xffecrQP/iY1KOeadisVu9X4nxi5sLAZ +Ir2LFI8yQlal51aTu4ENdYtyp/3zfWS099fytJtOZfPhOWZKjhBUgGJA7NooKQ+w +WZgpEBZRJXzAchFSJt1MmtiQw59wdRI5zjkzTWTQU5AOnRX1pLdCiVoz40I96rSC +r6BqSkCywTADP5koiLCzJyXMX/EoLtCLKZu0uLtQNDDzN9Raw5NGVnRFsPamfkqO +kD2Fh0YSJsID2Bn9eoh1eojjd0cMgYW9Ly4+VwMQB/5eZKzcjWOhnZmfBKEcuRAH +GYxFSWS2c1uoeVsjIgV1OXeWolm/hg/6NBZWI6lxyHTt4WBo25JgPV1dhky+3dHE +xzziQfKrHfLSgKkwVxR8ZoAYRgEeL3pgyllZcQ/A5NmEey7/N/2qF0amYLVAvu+I +uOUrU57r3HnK8l+quuLODdm3+gQzZx3yLVRcLLK+yfPV1N8xHNbEUzNv9LG62tTv +m1om8vZo28kMUMQLin//u2zpXYC9ALNS4jG/OqM5mEY7BFQKKFSlxmHeqVHKbYBA +JbrD5VLhI8PuG7O5ubb8fqFsGRGFWuQHSipuOfA2yVGxWHxwy1szINhDLXxSezJe +wcvBWnq9YmWPhGLPmHW2bpLNiMcT796RRFOsT2TSa9+NAu6ZXf4OAQefEkBatysg +P/tDZcvWI5oEetQyQEL0 +=4xoD -----END PGP SIGNATURE----- diff --git a/sci-libs/clapack/clapack-3.2.1-r3.ebuild b/sci-libs/clapack/clapack-3.2.1-r3.ebuild deleted file mode 100644 index 8690921..0000000 --- a/sci-libs/clapack/clapack-3.2.1-r3.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="3" - -inherit eutils 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 ~x86" -IUSE="" - -RDEPEND=">=dev-libs/libf2c-20081126[static-libs] - virtual/blas" -DEPEND="${RDEPEND}" - -S="${WORKDIR}"/clapack-${PV}-CMAKE - -src_prepare() { - epatch "${FILESDIR}"/${P}-noblasf2c.patch - - sed \ - -e 's:"f2c.h"::g' \ - -i SRC/*.c || die -} - -src_configure() { - mycmakeargs=( $(cmake-utils_use_enable test TESTS) ) - cmake-utils_src_configure -} diff --git a/sci-libs/clapack/files/clapack-3.2.1-noblasf2c-r4.patch b/sci-libs/clapack/files/clapack-3.2.1-noblasf2c-r4.patch index 01129a4..e4477bc 100644 --- a/sci-libs/clapack/files/clapack-3.2.1-noblasf2c-r4.patch +++ b/sci-libs/clapack/files/clapack-3.2.1-noblasf2c-r4.patch @@ -1,6 +1,6 @@ diff -r -u -N clapack-3.2.1-CMAKE.orig/CMakeLists.txt clapack-3.2.1-CMAKE/CMakeLists.txt --- clapack-3.2.1-CMAKE.orig/CMakeLists.txt 2009-08-10 20:46:33.000000000 +0200 -+++ clapack-3.2.1-CMAKE/CMakeLists.txt 2010-08-30 00:28:38.000000000 +0200 ++++ clapack-3.2.1-CMAKE/CMakeLists.txt 2010-08-30 23:45:17.000000000 +0200 @@ -1,7 +1,10 @@ cmake_minimum_required(VERSION 2.6) project(CLAPACK C) @@ -57,7 +57,7 @@ diff -r -u -N clapack-3.2.1-CMAKE.orig/CMakeLists.txt clapack-3.2.1-CMAKE/CMakeL + diff -r -u -N clapack-3.2.1-CMAKE.orig/SRC/CMakeLists.txt clapack-3.2.1-CMAKE/SRC/CMakeLists.txt --- clapack-3.2.1-CMAKE.orig/SRC/CMakeLists.txt 2009-08-10 19:47:54.000000000 +0200 -+++ clapack-3.2.1-CMAKE/SRC/CMakeLists.txt 2010-08-30 00:29:19.000000000 +0200 ++++ clapack-3.2.1-CMAKE/SRC/CMakeLists.txt 2010-08-30 23:46:42.000000000 +0200 @@ -375,6 +375,20 @@ if(BUILD_COMPLEX16) set(ALLOBJ ${ZLASRC} ${ALLAUX} ${DZLAUX}) @@ -79,11 +79,11 @@ diff -r -u -N clapack-3.2.1-CMAKE.orig/SRC/CMakeLists.txt clapack-3.2.1-CMAKE/SR +) + +install( -+ EXPORT clapack DESTINATION "share/cmake/Modules" FILE clapack-config.cmake ++ EXPORT clapack DESTINATION "${CMAKE_INSTALL_LIBDIR}/clapack" FILE clapack-config.cmake +) diff -r -u -N clapack-3.2.1-CMAKE.orig/TESTING/EIG/CMakeLists.txt clapack-3.2.1-CMAKE/TESTING/EIG/CMakeLists.txt --- clapack-3.2.1-CMAKE.orig/TESTING/EIG/CMakeLists.txt 2009-08-10 19:47:54.000000000 +0200 -+++ clapack-3.2.1-CMAKE/TESTING/EIG/CMakeLists.txt 2010-08-30 00:28:38.000000000 +0200 ++++ clapack-3.2.1-CMAKE/TESTING/EIG/CMakeLists.txt 2010-08-30 23:45:17.000000000 +0200 @@ -119,7 +119,7 @@ macro(add_eig_executable name ) @@ -95,7 +95,7 @@ diff -r -u -N clapack-3.2.1-CMAKE.orig/TESTING/EIG/CMakeLists.txt clapack-3.2.1- add_eig_executable(xeigtsts ${SEIGTST} ${SCIGTST} ${AEIGTST} diff -r -u -N clapack-3.2.1-CMAKE.orig/TESTING/LIN/CMakeLists.txt clapack-3.2.1-CMAKE/TESTING/LIN/CMakeLists.txt --- clapack-3.2.1-CMAKE.orig/TESTING/LIN/CMakeLists.txt 2009-08-10 20:06:06.000000000 +0200 -+++ clapack-3.2.1-CMAKE/TESTING/LIN/CMakeLists.txt 2010-08-30 00:28:38.000000000 +0200 ++++ clapack-3.2.1-CMAKE/TESTING/LIN/CMakeLists.txt 2010-08-30 23:45:17.000000000 +0200 @@ -189,7 +189,7 @@ macro(add_lin_executable name ) @@ -107,7 +107,7 @@ diff -r -u -N clapack-3.2.1-CMAKE.orig/TESTING/LIN/CMakeLists.txt clapack-3.2.1- add_lin_executable(xlintsts ${ALINTST} ${SCLNTST} ${SLINTST} diff -r -u -N clapack-3.2.1-CMAKE.orig/TESTING/MATGEN/CMakeLists.txt clapack-3.2.1-CMAKE/TESTING/MATGEN/CMakeLists.txt --- clapack-3.2.1-CMAKE.orig/TESTING/MATGEN/CMakeLists.txt 2009-08-10 19:47:54.000000000 +0200 -+++ clapack-3.2.1-CMAKE/TESTING/MATGEN/CMakeLists.txt 2010-08-30 00:28:38.000000000 +0200 ++++ clapack-3.2.1-CMAKE/TESTING/MATGEN/CMakeLists.txt 2010-08-30 23:45:17.000000000 +0200 @@ -65,5 +65,6 @@ if(BUILD_COMPLEX16) set(ALLOBJ $(ZMATGEN) $(DZATGEN)) @@ -118,7 +118,7 @@ diff -r -u -N clapack-3.2.1-CMAKE.orig/TESTING/MATGEN/CMakeLists.txt clapack-3.2 diff -r -u -N clapack-3.2.1-CMAKE.orig/TESTING/MATGEN/i_ceiling.c clapack-3.2.1-CMAKE/TESTING/MATGEN/i_ceiling.c --- clapack-3.2.1-CMAKE.orig/TESTING/MATGEN/i_ceiling.c 1970-01-01 01:00:00.000000000 +0100 -+++ clapack-3.2.1-CMAKE/TESTING/MATGEN/i_ceiling.c 2010-08-30 00:28:38.000000000 +0200 ++++ clapack-3.2.1-CMAKE/TESTING/MATGEN/i_ceiling.c 2010-08-30 23:45:17.000000000 +0200 @@ -0,0 +1,38 @@ +/* file has been copied from the included f2c library - dilfridge */ + @@ -160,7 +160,7 @@ diff -r -u -N clapack-3.2.1-CMAKE.orig/TESTING/MATGEN/i_ceiling.c clapack-3.2.1- +#endif diff -r -u -N clapack-3.2.1-CMAKE.orig/TESTING/MATGEN/i_len_trim.c clapack-3.2.1-CMAKE/TESTING/MATGEN/i_len_trim.c --- clapack-3.2.1-CMAKE.orig/TESTING/MATGEN/i_len_trim.c 1970-01-01 01:00:00.000000000 +0100 -+++ clapack-3.2.1-CMAKE/TESTING/MATGEN/i_len_trim.c 2010-08-30 00:28:38.000000000 +0200 ++++ clapack-3.2.1-CMAKE/TESTING/MATGEN/i_len_trim.c 2010-08-30 23:45:18.000000000 +0200 @@ -0,0 +1,25 @@ +/* file has been copied from the included f2c library - dilfridge */ + -- cgit v1.2.3-65-gdbad