sci-mathematics/scilab live ebuild update

4 files changed, 14 insertions, 20 deletions

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index a47ca9861..9dedb9416 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Jul 2012; Guillaume Horel <guillaume.horel@gmail.com>
+  scilab-5.3.999.ebuild, -files/scilab-5.3.999-blas-libs.patch,
+  files/scilab-5.3.999-java-heap.patch:
+  live ebuild update
+
 *scilab-5.3.999 (11 Jul 2012)
 
   11 Jul 2012; Guillaume Horel <guillaume.horel@gmail.com>
diff --git a/sci-mathematics/scilab/files/scilab-5.3.999-blas-libs.patch b/sci-mathematics/scilab/files/scilab-5.3.999-blas-libs.patch
deleted file mode 100644
index b2921f708..000000000
--- a/sci-mathematics/scilab/files/scilab-5.3.999-blas-libs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
- upstream http://bugzilla.scilab.org/show_bug.cgi?id=9824
-
---- scilab-5.3.2-orig/m4/libsmath.m4	2011-09-19 14:08:11.167292730 -0400
-+++ scilab-5.3.2/m4/libsmath.m4	2011-09-19 14:08:26.477292283 -0400
-@@ -37,7 +37,6 @@
- AC_PREREQ(2.50)
- AC_REQUIRE([AC_F77_LIBRARY_LDFLAGS])
- acx_blas_ok=no
--BLAS_LIBS=
- acx_blas_save_LIBS="$LIBS"
- 
- AC_ARG_WITH(blas-library,
diff --git a/sci-mathematics/scilab/files/scilab-5.3.999-java-heap.patch b/sci-mathematics/scilab/files/scilab-5.3.999-java-heap.patch
index e493a3bd1..5e4baae7e 100644
--- a/sci-mathematics/scilab/files/scilab-5.3.999-java-heap.patch
+++ b/sci-mathematics/scilab/files/scilab-5.3.999-java-heap.patch
@@ -1,5 +1,5 @@
---- scilab-5.3.3.orig//etc/jvm_options.xml	2011-05-25 23:20:12.145833420 -0400
-+++ scilab-5.3.3/etc/jvm_options.xml	2011-05-25 23:20:58.760833451 -0400
+--- scilab-orig/etc/jvm_options.xml	2011-05-25 23:20:12.145833420 -0400
++++ scilab/etc/jvm_options.xml	2011-05-25 23:20:58.760833451 -0400
 @@ -22,7 +22,7 @@
    <!-- ENABLE Just In Time java compiler -->
    <option value="-Djava.compiler=JIT"/>
diff --git a/sci-mathematics/scilab/scilab-5.3.999.ebuild b/sci-mathematics/scilab/scilab-5.3.999.ebuild
index 83f751844..6e74de41d 100644
--- a/sci-mathematics/scilab/scilab-5.3.999.ebuild
+++ b/sci-mathematics/scilab/scilab-5.3.999.ebuild
@@ -7,7 +7,7 @@ EAPI=4
 JAVA_PKG_OPT_USE="gui"
 VIRTUALX_REQUIRED="manual"
 
-inherit eutils autotools check-reqs eutils fdo-mime flag-o-matic \
+inherit eutils autotools check-reqs eutils fdo-mime flag-o-matic git-2\
 	java-pkg-opt-2 fortran-2 flag-o-matic toolchain-funcs virtualx
 
 # Comments:
@@ -26,7 +26,8 @@ inherit eutils autotools check-reqs eutils fdo-mime flag-o-matic \
 DESCRIPTION="Scientific software package for numerical computations"
 LICENSE="CeCILL-2"
 HOMEPAGE="http://www.scilab.org/"
-SRC_URI="http://guillaume.horel.free.fr/${P}.tar.gz"
+#SRC_URI="http://guillaume.horel.free.fr/${P}.tar.gz"
+EGIT_REPO_URI="git://git.scilab.org/scilab"
 
 SLOT="0"
 IUSE="bash-completion debug doc fftw +gui +matio nls openmp
@@ -68,7 +69,7 @@ CDEPEND="dev-libs/libpcre
 		>=dev-java/jrosetta-1.0.4:0
 		dev-java/scirenderer:0
 		dev-java/skinlf:0
-		dev-java/xmlgraphics-commons:1.3
+		dev-java/xmlgraphics-commons:1.5
 		virtual/opengl
 		doc? ( dev-java/saxon:6.5 )
 		xcos? ( dev-java/jgraphx:1.8 ) )
@@ -93,7 +94,8 @@ DEPEND="${CDEPEND}
 		dev-java/junit
 		gui? ( ${VIRTUALX_DEPEND} ) )"
 
-S="${WORKDIR}/${PN}"
+EGIT_SOURCEDIR="${WORKDIR}/${PN}"
+S="${WORKDIR}/${PN}/${PN}"
 DOCS=( "ACKNOWLEDGEMENTS" "README_Unix" "Readme_Visual.txt" )
 
 pkg_pretend() {
@@ -124,7 +126,6 @@ pkg_setup() {
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-fortran-link.patch \
-		"${FILESDIR}"/${P}-blas-libs.patch \
 		"${FILESDIR}"/${P}-followlinks.patch \
 		"${FILESDIR}"/${P}-gluegen.patch
 
@@ -157,7 +158,7 @@ src_prepare() {
 	java-pkg_jar-from jgraphx-1.8,jlatexmath,hdf-java,flexdock,skinlf
 	java-pkg_jar-from jgoodies-looks-2.0,jrosetta,scirenderer
 	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
+	java-pkg_jar-from xmlgraphics-commons-1.5,commons-io-1,jlatexmath-fop
 	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