[gentoo-commits] proj/sci:master commit in: profiles/, sci-mathematics/scilab/files/, sci-mathematics/scilab/

[Guillaume Horel]

commit:     71fbd30042f51d839ad81d7803995525c060bf65
Author:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Tue Oct  2 05:31:34 2012 +0000
Commit:     Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Tue Oct  2 05:31:34 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=71fbd300

[sci-mathematics/scilab] version bump

---
 profiles/package.mask                              |    5 +---
 sci-mathematics/scilab/ChangeLog                   |   14 +++++++++++
 ... scilab-5.4.0-fix-random-runtime-failure.patch} |    0
 ...wlinks.patch => scilab-5.4.0-followlinks.patch} |    0
 ...-link.patch => scilab-5.4.0-fortran-link.patch} |    0
 ...99-gluegen.patch => scilab-5.4.0-gluegen.patch} |    0
 ...ava-heap.patch => scilab-5.4.0-java-heap.patch} |   10 ++++----
 .../{scilab-5.3.999.ebuild => scilab-5.4.0.ebuild} |   25 ++++++++-----------
 8 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 1de7826..4bb34d8 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,7 @@
 
 # Guillaume Horel <guillaume.horel@×××××.com> (11 July 2012)
 # masked for upcoming scilab-5.4.0
+=sci-mathematics/scilab-5.4.0
 =dev-java/jrosetta-1.0.4
 =dev-java/flexdock-1.2.0
 >=dev-java/jgraphx-1.8
@@ -57,10 +58,6 @@
 # live ebuild
 =dev-lang/ispc-9999
 
-# Sebastien Fabbro <bicatali@g.o> (14 May 2012)
-# alpha version for testing
->=sci-mathematics/scilab-5.3.99
-
 # Justin Lecher <jlec@g.o> (28 Apr 2012)
 # Doesn't install pkg-config files, which many packages rely on
 =sci-libs/mmdb-1.24.20111208

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index ad03349..241fe4e 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,20 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*scilab-5.4.0 (02 Oct 2012)
+
+  02 Oct 2012; Guillaume Horel <guillaume.horel@×××××.com>
+  -scilab-5.3.999.ebuild,
+  -files/scilab-5.3.999-fix-random-runtime-failure.patch,
+  -files/scilab-5.3.999-followlinks.patch,
+  -files/scilab-5.3.999-fortran-link.patch,
+  -files/scilab-5.3.999-gluegen.patch, -files/scilab-5.3.999-java-heap.patch,
+  +scilab-5.4.0.ebuild, +files/scilab-5.4.0-fix-random-runtime-failure.patch,
+  +files/scilab-5.4.0-followlinks.patch,
+  +files/scilab-5.4.0-fortran-link.patch, +files/scilab-5.4.0-gluegen.patch,
+  +files/scilab-5.4.0-java-heap.patch:
+  version bump and delete live ebuild
+
   25 Sep 2012; Guillaume Horel <guillaume.horel@×××××.com>
   scilab-5.3.999.ebuild:
   update dependencies

diff --git a/sci-mathematics/scilab/files/scilab-5.3.999-fix-random-runtime-failure.patch b/sci-mathematics/scilab/files/scilab-5.4.0-fix-random-runtime-failure.patch
similarity index 100%
rename from sci-mathematics/scilab/files/scilab-5.3.999-fix-random-runtime-failure.patch
rename to sci-mathematics/scilab/files/scilab-5.4.0-fix-random-runtime-failure.patch

diff --git a/sci-mathematics/scilab/files/scilab-5.3.999-followlinks.patch b/sci-mathematics/scilab/files/scilab-5.4.0-followlinks.patch
similarity index 100%
rename from sci-mathematics/scilab/files/scilab-5.3.999-followlinks.patch
rename to sci-mathematics/scilab/files/scilab-5.4.0-followlinks.patch

diff --git a/sci-mathematics/scilab/files/scilab-5.3.999-fortran-link.patch b/sci-mathematics/scilab/files/scilab-5.4.0-fortran-link.patch
similarity index 100%
rename from sci-mathematics/scilab/files/scilab-5.3.999-fortran-link.patch
rename to sci-mathematics/scilab/files/scilab-5.4.0-fortran-link.patch

diff --git a/sci-mathematics/scilab/files/scilab-5.3.999-gluegen.patch b/sci-mathematics/scilab/files/scilab-5.4.0-gluegen.patch
similarity index 100%
rename from sci-mathematics/scilab/files/scilab-5.3.999-gluegen.patch
rename to sci-mathematics/scilab/files/scilab-5.4.0-gluegen.patch

diff --git a/sci-mathematics/scilab/files/scilab-5.3.999-java-heap.patch b/sci-mathematics/scilab/files/scilab-5.4.0-java-heap.patch
similarity index 50%
rename from sci-mathematics/scilab/files/scilab-5.3.999-java-heap.patch
rename to sci-mathematics/scilab/files/scilab-5.4.0-java-heap.patch
index 3523dae..66aadc0 100644
--- a/sci-mathematics/scilab/files/scilab-5.3.999-java-heap.patch
+++ b/sci-mathematics/scilab/files/scilab-5.4.0-java-heap.patch
@@ -1,12 +1,12 @@
 diff -urN scilab-orig/etc/jvm_options.xml scilab/etc/jvm_options.xml
---- scilab-orig/etc/jvm_options.xml	2012-08-06 20:47:17.116007011 -0400
-+++ scilab/etc/jvm_options.xml	2012-08-06 20:59:02.889052072 -0400
+--- scilab-orig/etc/jvm_options.xml	2012-09-26 23:04:51.301102957 -0400
++++ scilab/etc/jvm_options.xml	2012-09-26 23:07:24.822118228 -0400
 @@ -22,7 +22,7 @@
      <!-- ENABLE Just In Time java compiler -->
      <option value="-Djava.compiler=JIT"/>
      <!-- Set Java Heap space to 256mb -->
 -    <option value="-Xmx256m"/>
 +    <option value="-Xmx512m"/>
-     <option value="-Dawt.useSystemAAFontSettings=on" os="linux"/>
-     <option value="-Dapple.laf.useScreenMenuBar=true" os="macosx"/>
-     
+ 
+     <!-- Set Java space for direct buffer allocation -->
+ <!--

diff --git a/sci-mathematics/scilab/scilab-5.3.999.ebuild b/sci-mathematics/scilab/scilab-5.4.0.ebuild
similarity index 91%
rename from sci-mathematics/scilab/scilab-5.3.999.ebuild
rename to sci-mathematics/scilab/scilab-5.4.0.ebuild
index 7a04b54..1fcbd3d 100644
--- a/sci-mathematics/scilab/scilab-5.3.999.ebuild
+++ b/sci-mathematics/scilab/scilab-5.4.0.ebuild
@@ -8,7 +8,7 @@ JAVA_PKG_OPT_USE="gui"
 VIRTUALX_REQUIRED="manual"
 
 inherit eutils autotools bash-completion-r1 check-reqs fdo-mime flag-o-matic \
-	fortran-2 git-2 java-pkg-opt-2 toolchain-funcs virtualx
+	fortran-2 java-pkg-opt-2 toolchain-funcs virtualx
 
 # Comments:
 # - we don't rely on the configure script to find the right version of java
@@ -23,11 +23,10 @@ inherit eutils autotools bash-completion-r1 check-reqs 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"
-EGIT_REPO_URI="git://git.scilab.org/scilab"
+SRC_URI="http://www.scilab.org/download/${PV}/${P}-src.tar.gz"
 
 SLOT="0"
-IUSE="bash-completion debug doc fftw +gui +matio nls openmp
+IUSE="bash-completion debug +doc fftw +gui +matio nls openmp
 	static-libs test tk +umfpack xcos"
 REQUIRED_USE="xcos? ( gui ) doc? ( gui )"
 
@@ -60,10 +59,10 @@ CDEPEND="dev-libs/libpcre
 		dev-java/javahelp:0
 		dev-java/jeuclid-core:0
 		dev-java/jgoodies-looks:2.0
-		dev-java/jlatexmath:1
+		>=dev-java/jlatexmath-1.0.0:0
 		dev-java/jogl:2
 		>=dev-java/jrosetta-1.0.4:0
-		dev-java/scirenderer:1
+		dev-java/scirenderer:0
 		dev-java/skinlf:0
 		dev-java/xmlgraphics-commons:1.3
 		virtual/opengl
@@ -83,15 +82,13 @@ DEPEND="${CDEPEND}
 	gui? (
 		>=virtual/jdk-1.5
 		doc? ( app-text/docbook-xsl-stylesheets
-			   dev-java/jlatexmath-fop:1
-			   dev-java/xml-commons-external:1.4 )
+			   >=dev-java/jlatexmath-fop-1.0.0:1
+			   dev-java/xml-commons-external )
 		xcos? ( dev-lang/ocaml ) )
 	test? (
-		dev-java/junit:4
+		dev-java/junit
 		gui? ( ${VIRTUALX_DEPEND} ) )"
 
-EGIT_SOURCEDIR="${WORKDIR}/${PN}"
-S="${WORKDIR}/${PN}/${PN}"
 DOCS=( "ACKNOWLEDGEMENTS" "README_Unix" "Readme_Visual.txt" )
 
 pkg_pretend() {
@@ -126,10 +123,10 @@ src_prepare() {
 		"${FILESDIR}/${P}-gluegen.patch" \
 		"${FILESDIR}/${P}-fix-random-runtime-failure.patch"
 
-	append-ldflags $(no-as-needed)
+	#append-ldflags $(no-as-needed)
 
 	# increases java heap to 512M when building docs (sync with cheqreqs above)
-	use doc && epatch "${FILESDIR}"/${P}-java-heap.patch
+	use doc && epatch "${FILESDIR}/${P}-java-heap.patch"
 
 	# make sure library path are preloaded in binaries
 	sed -i \
@@ -153,7 +150,7 @@ src_prepare() {
 	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 jogl-2 jogl-all.jar jogl2.jar
+	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