From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QX3K3-0003ta-KE for garchives@archives.gentoo.org; Thu, 16 Jun 2011 03:32:47 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2DBF11C030; Thu, 16 Jun 2011 03:32:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E19AF1C030 for ; Thu, 16 Jun 2011 03:32:38 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 49AA91BC015 for ; Thu, 16 Jun 2011 03:32:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 0314E80040 for ; Thu, 16 Jun 2011 03:32:37 +0000 (UTC) From: "Guillaume Horel" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Guillaume Horel" Message-ID: <744f34afa2d465b240ed1fd8726d512ebbb352eb.guillaume_horel@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/files/, sci-mathematics/scilab/ X-VCS-Repository: proj/sci X-VCS-Files: sci-mathematics/scilab/ChangeLog sci-mathematics/scilab/files/scilib-5.3.2-scilib-fix.patch sci-mathematics/scilab/scilab-5.3.2.ebuild X-VCS-Directories: sci-mathematics/scilab/files/ sci-mathematics/scilab/ X-VCS-Committer: guillaume_horel X-VCS-Committer-Name: Guillaume Horel X-VCS-Revision: 744f34afa2d465b240ed1fd8726d512ebbb352eb Date: Thu, 16 Jun 2011 03:32:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 0f120c1f33ea814e7077f2162ce043bf commit: 744f34afa2d465b240ed1fd8726d512ebbb352eb Author: Guillaume Horel gmail com> AuthorDate: Thu Jun 16 03:28:50 2011 +0000 Commit: Guillaume Horel gmail com> CommitDate: Thu Jun 16 03:28:50 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D744f34af sci-mathematics/scilab-5.3.2.ebuild: ebuild fixes --- sci-mathematics/scilab/ChangeLog | 4 ++++ .../scilab/files/scilib-5.3.2-scilib-fix.patch | 11 +++++++++++ sci-mathematics/scilab/scilab-5.3.2.ebuild | 16 +++++---------= -- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/Ch= angeLog index e767c01..e742125 100644 --- a/sci-mathematics/scilab/ChangeLog +++ b/sci-mathematics/scilab/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 + 16 Jun 2011; Guillaume Horel scilab-5.3.2.= ebuild, + +files/scilib-5.3.2-scilib-fix.patch: + Fixed jgraphx version dependency and disabled mpi support in hdf + *scilab-5.3.2 (10 Jun 2011) =20 10 Jun 2011; Guillaume Horel diff --git a/sci-mathematics/scilab/files/scilib-5.3.2-scilib-fix.patch b= /sci-mathematics/scilab/files/scilib-5.3.2-scilib-fix.patch new file mode 100644 index 0000000..6d3c2e1 --- /dev/null +++ b/sci-mathematics/scilab/files/scilib-5.3.2-scilib-fix.patch @@ -0,0 +1,11 @@ +--- bin/scilab.orig 2009-12-16 08:24:36.000000000 +0100 ++++ bin/scilab 2010-02-11 01:14:14.718781674 +0100 +@@ -508,7 +508,7 @@ + #fi + #export PVM_ARCH +=20 +-SCILIB=3D$SCI/bin:$SCI/lib/scilab/:$SCI/lib64/scilab/ ++SCILIB=3D$SCI/bin:$SCI/lib/scilab/:$SCI/lib64/scilab/:/usr/lib64/scilab= :/usr/lib/scilab + LD_LIBRARY_PATH=3D$SCILIB${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH} +=20 + case $OS in diff --git a/sci-mathematics/scilab/scilab-5.3.2.ebuild b/sci-mathematics= /scilab/scilab-5.3.2.ebuild index 8548043..db423ef 100644 --- a/sci-mathematics/scilab/scilab-5.3.2.ebuild +++ b/sci-mathematics/scilab/scilab-5.3.2.ebuild @@ -28,7 +28,7 @@ RDEPEND=3D"virtual/lapack >=3Ddev-java/flexdock-0.5.2 >=3Ddev-java/jeuclid-core-3.1 >=3Ddev-java/jlatexmath-0.9.4 - ~dev-java/jgraphx-1.4.1.0 + =3Ddev-java/jgraphx-1.4.1* dev-java/jogl dev-java/jgoodies-looks dev-java/jrosetta @@ -38,7 +38,7 @@ RDEPEND=3D"virtual/lapack hdf5? ( dev-java/hdf-java ) ) fftw? ( sci-libs/fftw:3.0 ) matio? ( sci-libs/matio ) - hdf5? ( >=3Dsci-libs/hdf5-1.8.4 )" + hdf5? ( >=3Dsci-libs/hdf5-1.8.4[-mpi] )" =20 DEPEND=3D"${RDEPEND} dev-util/pkgconfig @@ -57,9 +57,9 @@ pkg_setup() { =20 src_prepare() { # Increases java heap to 512M when available, when building docs - check_reqs_conditional && epatch "${FILESDIR}"/java-heap-${PV}.patch + check_reqs_conditional && epatch "${FILESDIR}/java-heap-${PV}.patch" # fix scilib path - epatch "${FILESDIR}"/scilib-fix.patch + epatch "${FILESDIR}/${P}-scilib-fix.patch" # bug 9268 reported upstream http://bugzilla.scilab.org/show_bug.cgi?id= =3D9268 epatch "${FILESDIR}"/bug_9268.diff =20 @@ -86,13 +86,7 @@ src_configure() { export JAVA_HOME=3D$(java-config -O) export BLAS_LIBS=3D"$(pkg-config --libs blas)" export LAPACK_LIBS=3D"$(pkg-config --libs lapack)" - # mpi is only used for hdf5 i/o - if use hdf5 && has_version sci-libs/hdf5[mpi]; then - export CC=3Dmpicc - export CXX=3Dmpicxx - export FC=3Dmpif90 - export F77=3Dmpif77 - fi + econf \ --disable-rpath \ --without-pvm \