[sci-mathematics/scilab] version bump

8 files changed, 31 insertions, 19 deletions

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index ad03349a8..241fe4e9b 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@gmail.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@gmail.com>
   scilab-5.3.999.ebuild:
   update dependencies
diff --git a/sci-mathematics/scilab/Manifest b/sci-mathematics/scilab/Manifest
index ee6bad85e..55b73e608 100644
--- a/sci-mathematics/scilab/Manifest
+++ b/sci-mathematics/scilab/Manifest
@@ -1 +1,2 @@
 DIST scilab-5.3.3-src.tar.gz 47253497 SHA256 e6edd7d241f2a09bd2dadaaafff5c152509db240220933b87305875302401335 SHA512 334ff05239efa2c9c378a86521a979aa5578f5a79324dc4f16805a995c673d5bd9656567de127939bf30409e2ba6f5904b75508046adfcfa4a5d6390f53d8ffa WHIRLPOOL 635666dbc52280fd797f01402c42429acd3e55c1bcdd9a2af584e349838e1bb935cef97f0f9f061d7b1c44f6078a0d84fb44f2c4cb17fcf9d3ba59e79c45493e
+DIST scilab-5.4.0-src.tar.gz 47991386 SHA256 d123fb0f091554b6e0621d59fca53ea0fd68c58a339cc40f0b1b4d08531fbb1f SHA512 93af4929535beac61924bf2fe0cab139356d58a8499a29cb499294445406b5273592668f5eda0f7e2d3a1bf45d184bd8eb9615be2deb7afdebd3972e77284536 WHIRLPOOL 0e17ed494c45887a48e179ce1c17925eddb860e6ba1a13243c51c51236029b1c45569afc642a39cd7d7a532fefe85d4a5fef9f86a49bd2e586bae4a58fa93081
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
index 92ac45339..92ac45339 100644
--- 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
diff --git a/sci-mathematics/scilab/files/scilab-5.3.999-followlinks.patch b/sci-mathematics/scilab/files/scilab-5.4.0-followlinks.patch
index 118df3b1a..118df3b1a 100644
--- a/sci-mathematics/scilab/files/scilab-5.3.999-followlinks.patch
+++ b/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
index 53277783c..53277783c 100644
--- a/sci-mathematics/scilab/files/scilab-5.3.999-fortran-link.patch
+++ b/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
index 64717a75a..64717a75a 100644
--- a/sci-mathematics/scilab/files/scilab-5.3.999-gluegen.patch
+++ b/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
index 3523dae95..66aadc0a7 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
index 7a04b54de..1fcbd3da5 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