From 8d62deb92a94de486cde84c3380c2b84b8b39cc1 Mon Sep 17 00:00:00 2001 From: Sebastien Fabbro Date: Mon, 15 Mar 2010 06:01:29 +0000 Subject: [PATCH] Forced metis (bug #309271), and changed flag static to static-libs Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- sci-libs/taucs/ChangeLog | 7 +++++-- sci-libs/taucs/Manifest | 12 ++++++------ sci-libs/taucs/metadata.xml | 2 -- sci-libs/taucs/taucs-2.2.ebuild | 26 ++++++++++++++------------ 4 files changed, 25 insertions(+), 22 deletions(-) diff --git a/sci-libs/taucs/ChangeLog b/sci-libs/taucs/ChangeLog index 1aceba8d2b91..9c144ae2fd1d 100644 --- a/sci-libs/taucs/ChangeLog +++ b/sci-libs/taucs/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-libs/taucs -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/taucs/ChangeLog,v 1.1 2008/10/27 14:59:18 bicatali Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/taucs/ChangeLog,v 1.2 2010/03/15 06:01:29 bicatali Exp $ + + 15 Mar 2010; Sébastien Fabbro taucs-2.2.ebuild: + Forced metis (bug #309271), and changed flag static to static-libs *taucs-2.2 (27 Oct 2008) diff --git a/sci-libs/taucs/Manifest b/sci-libs/taucs/Manifest index 5c74ce22286b..7caa9327ff02 100644 --- a/sci-libs/taucs/Manifest +++ b/sci-libs/taucs/Manifest @@ -2,13 +2,13 @@ Hash: SHA1 DIST taucs-2.2.tgz 1573863 RMD160 e7621bc65af42432e708318e93bce8958bf3a482 SHA1 9f86bd091d42cad308b5137914fb7aa564bd0aae SHA256 fc13dae767db5e9035b1ce63036a16d3a260aad784f461e073f1150a078a77e4 -EBUILD taucs-2.2.ebuild 2362 RMD160 fda179ed1a4a831a5f24f19daf4f6d4c8b1e9482 SHA1 0c2c9cac674b98cb8e0f28c5e440fb0f2b91b3ab SHA256 50ce683a59540fba75e35f7a5bf341cbb789e05f8b954e9da9d02a8d5f96d319 -MISC ChangeLog 338 RMD160 7d178708f8057b313e7468acd314898c03edefa7 SHA1 04c883ff3a65b9fb12a094ef6f0e22bc2dc37dc4 SHA256 c15cb150550d3f908a36c6d1c47fea0fbf792d9f1411d800c2c1a6407bfac0fb -MISC metadata.xml 1192 RMD160 30c054004b045ff18f9955645dc6487b45b0e4f5 SHA1 6503c20dbd7ace0bf2bbf140dccf810bb6949b61 SHA256 8e5927718deb16a4f18d0fe2cd2f81555e6019847216ad353dc207db99d8f1f5 +EBUILD taucs-2.2.ebuild 2366 RMD160 ac039d1e7604dd6fd63dc2b089e45a5e2ece6301 SHA1 c7fe39cf284ef0ecb3845149733005f8a37e0a98 SHA256 4c9c7f58d09bbe81f7307be041605455b5f392551a973fcf51ec3405b42b429c +MISC ChangeLog 481 RMD160 66757f48419543176ed3e141a0d6c804bd51ee03 SHA1 6a2008a6ebf501f38303ae39d9871ce638976b44 SHA256 408a25a4b90f15f6da47f68a60717067c04f2903aa26fa47cd4e9ae70f0adbc4 +MISC metadata.xml 1065 RMD160 df021b3a1df05e1bb1f7c1002696a005a2855a93 SHA1 1de6a89a28ea61724b43b8e966a0ebb82d2d85e2 SHA256 8157aa8666aa721fcdb86dabbaad5fb598fb0de1b4962b6e30247188197d613d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkuZdEMACgkQdz7hIScOUREgDwCbBFXF875sdGH9yOiCaJVqWH8J -iGAAoJtFW7TKlKwzcHo4+Z3xQX2/RZxg -=zDN9 +iEYEARECAAYFAkudzXYACgkQ1ycZbhPLE2BHAgCgraRFDR4VkzVvsOnuCwYHV7lR +PQkAoK3eXM8/iD+lpWfl95DypehOKUdD +=tuOM -----END PGP SIGNATURE----- diff --git a/sci-libs/taucs/metadata.xml b/sci-libs/taucs/metadata.xml index 2788198d1df7..113faf54acf9 100644 --- a/sci-libs/taucs/metadata.xml +++ b/sci-libs/taucs/metadata.xml @@ -24,8 +24,6 @@ * Utility Routines - Add partitioning support using metis - (sci-libs/metis, sci-libs/parmetis) Enable multithreading using dev-lang/cilk) diff --git a/sci-libs/taucs/taucs-2.2.ebuild b/sci-libs/taucs/taucs-2.2.ebuild index 082c8fcf697b..020fd939cb0a 100644 --- a/sci-libs/taucs/taucs-2.2.ebuild +++ b/sci-libs/taucs/taucs-2.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/taucs/taucs-2.2.ebuild,v 1.1 2008/10/27 14:59:18 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/taucs/taucs-2.2.ebuild,v 1.2 2010/03/15 06:01:29 bicatali Exp $ EAPI=2 -inherit eutils fortran toolchain-funcs flag-o-matic +inherit eutils toolchain-funcs flag-o-matic DESCRIPTION="C library of sparse linear solvers" HOMEPAGE="http://www.tau.ac.il/~stoledo/taucs/" @@ -12,31 +12,29 @@ SRC_URI="http://www.tau.ac.il/~stoledo/${PN}/${PV}/${PN}.tgz -> ${P}.tgz" KEYWORDS="~amd64 ~x86" LICENSE="LGPL-2.1" -IUSE="cilk doc +metis" +IUSE="cilk doc static-libs" SLOT="0" RDEPEND="virtual/blas virtual/lapack - metis? ( || ( sci-libs/metis sci-libs/parmetis ) ) + || ( sci-libs/metis sci-libs/parmetis ) cilk? ( dev-lang/cilk )" DEPEND="${RDEPEND} dev-util/pkgconfig" S="${WORKDIR}" -FORTRAN="gfortran ifc g77" src_configure() { cat > config/linux_shared.mk <<-EOF CFLAGS=${CFLAGS} -fPIC - FC=${FORTRANC} + FC=$(tc-getFC) FFLAGS=${FFLAGS} -fPIC LDFLAGS=${LDFLAGS} -fPIC LIBBLAS=$(pkg-config --libs blas) LIBLAPACK=$(pkg-config --libs lapack) LIBF77= EOF - use metis && echo "LIBMETIS=$(pkg-config --libs metis)" \ - >> config/linux_shared.mk + echo "LIBMETIS=$(pkg-config --libs metis)" >> config/linux_shared.mk # no cat <> config/linux_shared.mk @@ -50,8 +48,10 @@ src_configure() { src_compile() { # not autotools configure - ./configure variant=_static || die - emake || die + if use static-libs; then + ./configure variant=_static || die + emake || die + fi ./configure variant=_shared || die emake || die @@ -74,7 +74,9 @@ src_test() { } src_install() { - dolib.a lib/linux_static/libtaucs.a || die "static lib install failed" + if use static-libs; then + dolib.a lib/linux_static/libtaucs.a || die "static lib install failed" + fi dolib.so lib/linux_shared/libtaucs.so.1.0.0 || die "shared lib install failed" dosym libtaucs.so.1.0.0 /usr/$(get_libdir)/libtaucs.so.1 dosym libtaucs.so.1 /usr/$(get_libdir)/libtaucs.so -- 2.26.2