Forced metis (bug #309271), and changed flag static to static-libs

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 19 insertions, 16 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 <bicatali@gentoo.org> 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/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
 </longdescription>
 <use>
-  <flag name='metis'>Add partitioning support using metis
-    (<pkg>sci-libs/metis</pkg>, <pkg>sci-libs/parmetis</pkg>)</flag>
   <flag name='cilk'>Enable multithreading using <pkg>dev-lang/cilk</pkg>)</flag>
 </use>
 </pkgmetadata>
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 <<EOF because -o has a trailing space
 	if use cilk; then
 		echo "CILKC=cilkc" >> 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