From e79a3890d7e120ee4637c933af0d68782c79e2d9 Mon Sep 17 00:00:00 2001
From: Guillaume Horel <guillaume.horel@gmail.com>
Date: Mon, 7 Jan 2013 21:26:37 -0500
Subject: sci-mathematics/scilab-5.4.0 cleanup dependencies

---
 sci-mathematics/scilab/scilab-5.4.0.ebuild | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

(limited to 'sci-mathematics/scilab')

diff --git a/sci-mathematics/scilab/scilab-5.4.0.ebuild b/sci-mathematics/scilab/scilab-5.4.0.ebuild
index 6b7a7fe4b..5d4183f91 100644
--- a/sci-mathematics/scilab/scilab-5.4.0.ebuild
+++ b/sci-mathematics/scilab/scilab-5.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -44,6 +44,7 @@ KEYWORDS="~amd64 ~x86"
 
 CDEPEND="dev-libs/libpcre
 	dev-libs/libxml2:2
+	sci-libs/hdf5
 	sys-devel/gettext
 	sys-libs/ncurses
 	sys-libs/readline
@@ -59,6 +60,7 @@ CDEPEND="dev-libs/libpcre
 		dev-java/javahelp:0
 		dev-java/jeuclid-core:0
 		dev-java/jgoodies-looks:2.0
+		dev-java/jgraphx:1.8
 		dev-java/jlatexmath:1
 		dev-java/jogl:2
 		>=dev-java/jrosetta-1.0.4:0
@@ -67,7 +69,7 @@ CDEPEND="dev-libs/libpcre
 		dev-java/xmlgraphics-commons:1.3
 		virtual/opengl
 		doc? ( dev-java/saxon:6.5 )
-		xcos? ( dev-java/jgraphx:1.8 ) )
+		xcos? ( dev-java/commons-logging:0 ) )
 	matio? ( <sci-libs/matio-1.5 )
 	tk? ( dev-lang/tk )
 	umfpack? ( sci-libs/umfpack )"
@@ -105,14 +107,15 @@ pkg_setup() {
 	FORTRAN_STANDARD="77 90"
 	fortran-2_pkg_setup
 	java-pkg-opt-2_pkg_setup
+
 	ALL_LINGUAS="en_US"
-	ALL_LINGUAS_DOC="en_US"
 	for l in ${LINGUAS}; do
 		use linguas_${l} && ALL_LINGUAS="${ALL_LINGUAS} ${l}"
 	done
 	for l in ${LINGUASLONG}; do
 		use linguas_${l%_*} && ALL_LINGUAS="${ALL_LINGUAS} ${l}"
 	done
+
 	export ALL_LINGUAS ALL_LINGUAS_DOC=$ALL_LINGUAS
 }
 
@@ -151,15 +154,20 @@ src_prepare() {
 	pushd jar
 	java-pkg_jar-from jgraphx-1.8,jlatexmath-1,flexdock,skinlf
 	java-pkg_jar-from jgoodies-looks-2.0,jrosetta,scirenderer-1
-	java-pkg_jar-from avalon-framework-4.2,saxon-6.5,jeuclid-core
-	java-pkg_jar-from xmlgraphics-commons-1.3,commons-io-1,jlatexmath-fop-1
+	java-pkg_jar-from avalon-framework-4.2,jeuclid-core
+	java-pkg_jar-from xmlgraphics-commons-1.3,commons-io-1
 	java-pkg_jar-from jogl-2 jogl.all.jar jogl2.jar
 	java-pkg_jar-from gluegen-2 gluegen-rt.jar gluegen2-rt.jar
 	java-pkg_jar-from batik-1.7 batik-all.jar
-	java-pkg_jar-from xml-commons-external-1.4 xml-apis-ext.jar
-	java-pkg_jar-from commons-logging commons-logging.jar
 	java-pkg_jar-from fop fop.jar
 	java-pkg_jar-from javahelp jhall.jar
+	if use xcos; then
+		java-pkg_jar-from commons-logging
+	fi
+	if use doc; then
+		java-pkg_jar-from jlatexmath-fop-1,saxon-6.5
+		java-pkg_jar-from xml-commons-external-1.4 xml-apis-ext.jar
+	fi
 	if use test; then
 		java-pkg_jar-from junit-4 junit.jar junit4.jar
 	fi
@@ -176,12 +184,12 @@ src_configure() {
 		unset JAVAC
 	fi
 
-	export BLAS_LIBS="$(pkg-config --libs blas)"
-	export LAPACK_LIBS="$(pkg-config --libs lapack)"
+	export BLAS_LIBS="$($(tc-getPKG_CONFIG) --libs blas)"
+	export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
 	export F77_LDFLAGS="${LDFLAGS}"
 	# gentoo bug #302621
 	has_version sci-libs/hdf5[mpi] && \
-		export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
+		export CXX=mpicxx CC=mpicc
 
 	econf \
 		--enable-relocatable \
-- 
cgit v1.2.3-65-gdbad