aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorS├ębastien Fabbro <bicatali@gentoo.org>2010-02-25 17:09:13 +0000
committerS├ębastien Fabbro <bicatali@gentoo.org>2010-02-25 17:36:45 +0000
commit327d2e776019f89fa0c4e7081cacc54e01539a40 (patch)
tree117b772a0e28ccaf21f671134a28ff35338ca015
parent[sci-mathematics/scilab] regenerate manifest (diff)
downloadsci-327d2e776019f89fa0c4e7081cacc54e01539a40.tar.gz
sci-327d2e776019f89fa0c4e7081cacc54e01539a40.tar.bz2
sci-327d2e776019f89fa0c4e7081cacc54e01539a40.zip
More fixes introduced by Guillaume Horel. Disabling blind Debian patches until further recommandation
-rw-r--r--sci-mathematics/scilab/Manifest23
-rw-r--r--sci-mathematics/scilab/files/scilab-5.2.0-disable-build-help-failed.patch134
-rw-r--r--sci-mathematics/scilab/files/scilab-5.2.0-jgraphx.patch347
-rw-r--r--sci-mathematics/scilab/files/scilab-5.2.0-no-redef-exp10.patch13
-rw-r--r--sci-mathematics/scilab/files/scilab-5.2.1-hdf-java-2.6.patch (renamed from sci-mathematics/scilab/files/scilab-5.2.0-hdf-java-2.6.patch)0
-rw-r--r--sci-mathematics/scilab/files/scilab-5.2.1-java-heap.patch (renamed from sci-mathematics/scilab/files/scilab-5.2.0-java-heap.patch)0
-rw-r--r--sci-mathematics/scilab/files/scilab-5.2.1-no-redef-exp10.patch65
-rw-r--r--sci-mathematics/scilab/files/scilab-5.2.1-nojavacheckversion.patch12
-rw-r--r--sci-mathematics/scilab/files/scilab-5.2.1-scilib-fix.patch (renamed from sci-mathematics/scilab/files/scilab-5.2.0-scilib-fix.patch)2
-rw-r--r--sci-mathematics/scilab/scilab-5.2.1.ebuild19
10 files changed, 94 insertions, 521 deletions
diff --git a/sci-mathematics/scilab/Manifest b/sci-mathematics/scilab/Manifest
index 1c7634971..0d84c1097 100644
--- a/sci-mathematics/scilab/Manifest
+++ b/sci-mathematics/scilab/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX ImplicitPointerConversions.diff 1367 RMD160 8ea43893705e25201f86fe65791b746f39762635 SHA1 0879b958c4e57987e1e1f8e75b26d75da9c802ad SHA256 a22a51c36290564b4e84de3714b3a936be2ff5876422bfebb2e1be9988ef6ae9
AUX addchapter.diff 676 RMD160 17234a74b9bec9fb0b89daf34b58bf3abf6e1d62 SHA1 2bed29feaa94e788aaa6b229a0015775b9905754 SHA256 19f6e7321735310360013c6d460a0b667c7c2493ccb8298ef9016dbc383c996a
AUX adddemo.diff 834 RMD160 a794e4f1a4c9b6f3e5753b7daba27983096395c6 SHA1 ae5e429ca7bae14ea6d33e377d6e644abcaa334b SHA256 e3060d8b7afc282f2e0443fcb04c66554a4db3ec9450ab0363b74e8dc76459e5
@@ -10,23 +7,15 @@ AUX missingaddchapter.diff 998 RMD160 0a674cc2e0f1b7fc2a6baf39234cf37cee911f22 S
AUX modelicac-not-available.diff 2549 RMD160 1c673906153659bf6f10f9e9f09961e36cca5fad SHA1 a8251c61134c5d35b25eb17ccf9caae8d18e4d7e SHA256 865aa1b95f560bb559ae06c9b48cf4d2b01e9c6843c8592cb18a5f5a8955a9d9
AUX renesas-sh.diff 900 RMD160 31d3cc0387da4f8d23cfc8ba633814d1658842b7 SHA1 20c553abfb0d84b45c5740bd21148ba2cf2f67fc SHA256 035cad00cf876288855ea09430776ad8bf3bf697b3470fe86f0b90271ca32159
AUX s390javadetection.diff 361 RMD160 40a2a20fb109dd01b80d14871244b5bd4630f074 SHA1 92a51cdc2890a6b65b598db81144ad459f31810f SHA256 16a2fbcb74b40d9f5d7dc3c99d2a72a5c5b4ec9b89d055bf2c60aded244d1a7b
-AUX scilab-5.2.0-disable-build-help-failed.patch 5401 RMD160 20dd261179532fab35fea9f5a13e6b694d1cc5ea SHA1 d6aa6df9d8b204428115acef7ff87aedd69c2f93 SHA256 7dc014f65fd410060798155ae9405f468607eef1a2192c8d9f3d8099b7e7885f
-AUX scilab-5.2.0-hdf-java-2.6.patch 849 RMD160 d6477e4b8af0e1cedfbb853a02bcbee3e466799c SHA1 09b2bdc72baf36d50d0799ff94614ea618beaa67 SHA256 65edb856d3d62636c4762796ed1c4962362078efc943cbf281a85cb35b923bdd
-AUX scilab-5.2.0-java-heap.patch 438 RMD160 7f63afd4b8bc56f6f5ca496524d0047a01453ff7 SHA1 d985be0c8fde5b7747e88b8f7a29db47cb137b6a SHA256 70d38d36fe3a37eb3259ec2abb0e0ab5ba731f0e625df44cf861d405ebaddc36
-AUX scilab-5.2.0-jgraphx.patch 17792 RMD160 634831778c8b5ceeafb3541a3465afe13532d31c SHA1 4719f4119ad442daee3ef0b9840eba930fb71ee5 SHA256 a3cad2c517574ddcd9cef93a73e7a075d5a6c7df66bd69888e682abdb953ff76
-AUX scilab-5.2.0-no-redef-exp10.patch 480 RMD160 b3a6dff50b5be722f177d8d61aa41dcf721ede66 SHA1 fcfd8ea8e7b665bf6aa36ee3eb5c5e735a0b5b4a SHA256 7eb72fe6eb088d27392a0751e33791fdc2dce7937b27f296a6e54b0c3f245968
-AUX scilab-5.2.0-scilib-fix.patch 352 RMD160 e3ec7c7d2c4892abe5ebdd85d297f2d661849699 SHA1 fda9c4bb043d5ec7830099d63e7b159153ea3d4b SHA256 d7b8390cafb6e57818112257d60c4a334e1fcc9085950c5fe32df5f03b0edaa4
+AUX scilab-5.2.1-hdf-java-2.6.patch 849 RMD160 d6477e4b8af0e1cedfbb853a02bcbee3e466799c SHA1 09b2bdc72baf36d50d0799ff94614ea618beaa67 SHA256 65edb856d3d62636c4762796ed1c4962362078efc943cbf281a85cb35b923bdd
+AUX scilab-5.2.1-java-heap.patch 438 RMD160 7f63afd4b8bc56f6f5ca496524d0047a01453ff7 SHA1 d985be0c8fde5b7747e88b8f7a29db47cb137b6a SHA256 70d38d36fe3a37eb3259ec2abb0e0ab5ba731f0e625df44cf861d405ebaddc36
+AUX scilab-5.2.1-no-redef-exp10.patch 2126 RMD160 cd50b646441ebe9426cd3e8dc5c388f70b66c894 SHA1 62c7934045db41d3c8ce4318d859ebf3f7785ee9 SHA256 47e892b65050d719ed356cd0219a37f372c3ac5cb379a37fc3b5560f86a340b5
+AUX scilab-5.2.1-nojavacheckversion.patch 633 RMD160 a8ebc801a17083f18343bdb2250016f3ea7b8291 SHA1 24a2bde08da02dcc7f77ce6ef5349e0b6971a6a6 SHA256 e7ae10f8b7f979b87ba971903bfbab2e1a9cdea617b3ce06e5770dad25cf9ef8
+AUX scilab-5.2.1-scilib-fix.patch 368 RMD160 d2106819b9ed8e221aff4cddb11c1102c3a77e07 SHA1 869e143f064c3325d260a5f5f602da859e5fe8dc SHA256 ace8712acdc15ddffc1811f29ac8b3d53a760f23b8270f60857750fc6a548911
AUX sparc64.diff 1011 RMD160 86849042292bcd7a195e6745bb06d84fbe4af3e5 SHA1 602a3e3a9c8551e043f66d1cf81dcdd3292b7f0e SHA256 1c309296a003edfbb917df3e2948df117bc02b79c421232e971d14a966a25af6
DIST scilab-5.2.0-src.tar.gz 54656677 RMD160 8a14582779d5b413c3c20cc13824e0773f7f4327 SHA1 ba919f9af86ac97b22e8be915302e1de104fbc01 SHA256 3412d4343cd3ca6ba0b03b28fec66a00f643d4d73f13dc28c0f6596ccb9f386a
DIST scilab-5.2.1-src.tar.gz 54855137 RMD160 312ccc62f44bc3dbf8f25260a7090f62dc70818e SHA1 6fad986beb03a42cee6e8ef9bfa0b8976236b3f6 SHA256 f85aa3b7fde0e523f7f0159613da7cca7bd2d125860b50fa2ed00394c97075e0
EBUILD scilab-5.2.0-r3.ebuild 3731 RMD160 6f5c82fc5143836ff337c824f441c34a63bd63ce SHA1 373d30ee68ee9a53357c33db6725242afb61cf4f SHA256 1c23acadb3e5064a4563b4e92f9df5e39b79c0ee0c9e0b0d4accf8c00445a730
-EBUILD scilab-5.2.1.ebuild 3589 RMD160 7a8152e77ec1e0be1746d46a776b9648b23454e2 SHA1 5b0485f75899b16dfc103b6586a7aa3d498f5de9 SHA256 520cfbb8820383ae85596f765a9324d01f8da63cd2b919fedba9fa6978d13f89
+EBUILD scilab-5.2.1.ebuild 3626 RMD160 425cc158c8cce598e63b8fd3baeb3086e3672f96 SHA1 c9085fcd5f99fa7ea18483f4adcb8a60cb806863 SHA256 befb38c6998a6b44d2443d0dcbc6ab1d13da7d129f4676700bb789fe168ab896
MISC ChangeLog 2127 RMD160 7c9858912fd0eb6dfd32211688d726b254c20592 SHA1 3be1c2294b10a1bf09468647a701623e6691546c SHA256 d71f5f999d54c96f62ca88c487503dc6452d8b4531e4c8e74b5492e71241f66c
MISC metadata.xml 872 RMD160 aef8847644f734faba3b42b9028690664612c8e6 SHA1 4686ca608887e1d9fea6ee4e11f4aa54c8eff150 SHA256 43da74dcf0ae13eb0987c33f397a9b9d7abe187196107d50814a3104466b90ee
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuGRUYACgkQ5BmOA85PVLiWxQCeIVubYdFb4h0mwuB4RPcsyGhD
-o9YAn0HUzQcdz2VTBK0Ltro8B6BAwJTL
-=7u59
------END PGP SIGNATURE-----
diff --git a/sci-mathematics/scilab/files/scilab-5.2.0-disable-build-help-failed.patch b/sci-mathematics/scilab/files/scilab-5.2.0-disable-build-help-failed.patch
deleted file mode 100644
index 01487944a..000000000
--- a/sci-mathematics/scilab/files/scilab-5.2.0-disable-build-help-failed.patch
+++ /dev/null
@@ -1,134 +0,0 @@
---- configure.ac.orig 2010-02-11 20:54:10.611709937 +0100
-+++ configure.ac 2010-02-11 21:03:58.184516409 +0100
-@@ -747,6 +747,48 @@
- JROSETTA_ENGINE=$PACKAGE_JAR_FILE
- AC_SUBST(JROSETTA_ENGINE)
-
-+ # MathML rendering solution
-+ # Used in both graphic & help
-+ AC_JAVA_CHECK_PACKAGE([jeuclid-core],[net.sourceforge.jeuclid.LayoutContext],[MathML rendering solution (at least version 3.1.X)])
-+ JEUCLID_CORE=$PACKAGE_JAR_FILE
-+ AC_SUBST(JEUCLID_CORE)
-+
-+ # xml.apache.org SVG Library (under mandriva for example)
-+ AC_JAVA_CHECK_PACKAGE([batik-all],[org.apache.batik.parser.Parser],[Apache SVG Library])
-+ BATIK=$PACKAGE_JAR_FILE
-+
-+ if test -z "$BATIK"; then
-+ # Other other distribs
-+ AC_JAVA_CHECK_PACKAGE([batik],[org.apache.batik.parser.Parser],[Apache SVG Library],"yes")
-+ BATIK=$PACKAGE_JAR_FILE
-+ fi
-+ AC_SUBST(BATIK)
-+
-+ # XML to PDF/other Translator
-+ AC_JAVA_CHECK_PACKAGE([fop],[org.apache.fop.pdf.PDFInfo],[XML to PDF Translator (fop)])
-+ FOP=$PACKAGE_JAR_FILE
-+ AC_SUBST(FOP)
-+
-+ # Commons I/O library
-+ AC_JAVA_CHECK_PACKAGE([commons-io],[org.apache.commons.io.output.CountingOutputStream],[Commons I/O library])
-+ COMMONS_IO=$PACKAGE_JAR_FILE
-+ AC_SUBST(COMMONS_IO)
-+
-+ # XML graphics common
-+ AC_JAVA_CHECK_PACKAGE([xmlgraphics-commons],[org.apache.xmlgraphics.util.Service],[Commons graphics library])
-+ XMLGRAPHICS_COMMONS=$PACKAGE_JAR_FILE
-+ AC_SUBST(XMLGRAPHICS_COMMONS)
-+
-+ # XML API EXT (conversion of a SVG => PNG)
-+ AC_JAVA_CHECK_PACKAGE([xml-apis-ext],[org.w3c.dom.svg.SVGDocument],[XML Commons external code])
-+ XML_APIS_EXT=$PACKAGE_JAR_FILE
-+ AC_SUBST(XML_APIS_EXT)
-+
-+ # Avalon Framework (PDF)
-+ AC_JAVA_CHECK_PACKAGE([avalon-framework],[org.apache.avalon.framework.configuration.ConfigurationException],[Common framework for Java server application])
-+ AVALON_FRAMEWORK=$PACKAGE_JAR_FILE
-+ AC_SUBST(AVALON_FRAMEWORK)
-+
- if test $HDF5_ENABLE = yes; then
- # HDF5 java lib
- AC_JAVA_CHECK_PACKAGE([jhdf5],[ncsa.hdf.hdf5lib.HDF5Constants],[HDF5 Java library])
-@@ -1763,13 +1805,7 @@
- if test $HELP_ENABLE = yes; then
- echo "Documentation building configuration:"
- echo " Docbook XSL path ....... = $DOCBOOK_ROOT"
-- echo " Batik (SVG) ............ = $BATIK"
- echo " Saxon XSLT ............. = $SAXON"
-- echo " FOP (XML => PDF) ....... = $FOP"
-- echo " Jeuclid (MathML) ....... = $JEUCLID_CORE"
-- echo " Commons I/O ............ = $COMMONS_IO"
-- echo " XML graphics commons ... = $XMLGRAPHICS_COMMONS"
-- echo " XML commons external ... = $XML_APIS_EXT"
- else
- echo "No documentation generated"
- fi
-@@ -1801,6 +1837,12 @@
- echo " JOGL LIBS (JNI) ..... = $JOGL_LIBS"
- echo " Gluegen ............. = $GLUEGEN_RT"
- echo " Gluegen LIBS (JNI) .. = $GLUEGEN_RT_LIBS"
-+echo " Batik (SVG) ......... = $BATIK"
-+echo " FOP (XML => PDF) .... = $FOP"
-+echo " Jeuclid (MathML) .... = $JEUCLID_CORE"
-+echo " Commons I/O ......... = $COMMONS_IO"
-+echo " XML graphics commons. = $XMLGRAPHICS_COMMONS"
-+echo " XML commons external. = $XML_APIS_EXT"
- echo " Jhall .............. = $JHALL"
- echo " Jrosetta (API) ...... = $JROSETTA_API"
- echo " Jrosetta (Engine) ... = $JROSETTA_ENGINE"
---- m4/docbook.m4.orig 2010-02-11 20:39:12.014267405 +0100
-+++ m4/docbook.m4 2010-02-11 20:53:47.786517217 +0100
-@@ -32,53 +32,11 @@
- if test -z "$DOCBOOK_ROOT"; then
- AC_MSG_ERROR([Could not find the Docbook root directory. If you have installed it on your system and we haven't been able to find it. Please report a bug])
- fi
-- # xml.apache.org SVG Library (under mandriva for example)
-- AC_JAVA_CHECK_PACKAGE([batik-all],[org.apache.batik.parser.Parser],[Apache SVG Library])
-- BATIK=$PACKAGE_JAR_FILE
--
-- if test -z "$BATIK"; then
-- # Other other distribs
-- AC_JAVA_CHECK_PACKAGE([batik],[org.apache.batik.parser.Parser],[Apache SVG Library],"yes")
-- BATIK=$PACKAGE_JAR_FILE
-- fi
-- AC_SUBST(BATIK)
--
-
- # Saxon XSLT Processor
- AC_JAVA_CHECK_PACKAGE([saxon],[com.icl.saxon.Loader],[Saxon XSLT Processor])
- SAXON=$PACKAGE_JAR_FILE
- AC_SUBST(SAXON)
--
-- # XML to PDF/other Translator
-- AC_JAVA_CHECK_PACKAGE([fop],[org.apache.fop.pdf.PDFInfo],[XML to PDF Translator (fop)])
-- FOP=$PACKAGE_JAR_FILE
-- AC_SUBST(FOP)
--
-- # MathML rendering solution
-- AC_JAVA_CHECK_PACKAGE([jeuclid-core],[net.sourceforge.jeuclid.LayoutContext],[MathML rendering solution (at least version 3.1.X)])
-- JEUCLID_CORE=$PACKAGE_JAR_FILE
-- AC_SUBST(JEUCLID_CORE)
--
-- # Commons I/O library
-- AC_JAVA_CHECK_PACKAGE([commons-io],[org.apache.commons.io.output.CountingOutputStream],[Commons I/O library])
-- COMMONS_IO=$PACKAGE_JAR_FILE
-- AC_SUBST(COMMONS_IO)
--
-- # XML graphics common
-- AC_JAVA_CHECK_PACKAGE([xmlgraphics-commons],[org.apache.xmlgraphics.util.Service],[Commons graphics library])
-- XMLGRAPHICS_COMMONS=$PACKAGE_JAR_FILE
-- AC_SUBST(XMLGRAPHICS_COMMONS)
--
-- # XML API EXT (conversion of a SVG => PNG)
-- AC_JAVA_CHECK_PACKAGE([xml-apis-ext],[org.w3c.dom.svg.SVGDocument],[XML Commons external code])
-- XML_APIS_EXT=$PACKAGE_JAR_FILE
-- AC_SUBST(XML_APIS_EXT)
--
--
-- # Avalon Framework (PDF)
-- AC_JAVA_CHECK_PACKAGE([avalon-framework],[org.apache.avalon.framework.configuration.ConfigurationException],[Common framework for Java server application])
-- AVALON_FRAMEWORK=$PACKAGE_JAR_FILE
-- AC_SUBST(AVALON_FRAMEWORK)
-
-
- AC_SUBST(DOCBOOK_ROOT)
diff --git a/sci-mathematics/scilab/files/scilab-5.2.0-jgraphx.patch b/sci-mathematics/scilab/files/scilab-5.2.0-jgraphx.patch
deleted file mode 100644
index 311a2dc35..000000000
--- a/sci-mathematics/scilab/files/scilab-5.2.0-jgraphx.patch
+++ /dev/null
@@ -1,347 +0,0 @@
-Index: scilab-5.2.0/modules/xcos/src/java/org/scilab/modules/graph/ScilabGraph.java
-===================================================================
---- scilab-5.2.0.orig/modules/xcos/src/java/org/scilab/modules/graph/ScilabGraph.java 2010-01-22 16:43:29.000000000 +0100
-+++ scilab-5.2.0/modules/xcos/src/java/org/scilab/modules/graph/ScilabGraph.java 2010-01-22 16:44:22.000000000 +0100
-@@ -75,7 +75,7 @@
- public void invoke(Object source, mxEventObject evt) {
-
- if (!redoInAction) {
-- undoManager.undoableEditHappened((mxUndoableEdit) evt.getArgAt(0));
-+ undoManager.undoableEditHappened((mxUndoableEdit) evt.getProperty("edit"));
- incrementUndoCounter();
- }
- }
-@@ -86,7 +86,7 @@
- */
- mxIEventListener selectionHandler = new mxIEventListener() {
- public void invoke(Object source, mxEventObject evt) {
-- List<mxUndoableChange> changes = ((mxUndoableEdit) evt.getArgAt(0)).getChanges();
-+ List<mxUndoableChange> changes = ((mxUndoableEdit) evt.getProperty("edit")).getChanges();
- setSelectionCells(getSelectionCellsForChanges(changes));
- }
- };
-@@ -209,10 +209,12 @@
- * com.mxgraph.util.mxUndoManager
- */
- public void redo() {
-+ if (!redoInAction) {
- incrementUndoCounter();
- redoInAction = true;
- undoManager.redo();
- redoInAction = false;
-+ }
- }
-
- /**
-Index: scilab-5.2.0/modules/xcos/src/java/org/scilab/modules/xcos/actions/ShowHideShadowAction.java
-===================================================================
---- scilab-5.2.0.orig/modules/xcos/src/java/org/scilab/modules/xcos/actions/ShowHideShadowAction.java 2010-01-22 16:55:10.000000000 +0100
-+++ scilab-5.2.0/modules/xcos/src/java/org/scilab/modules/xcos/actions/ShowHideShadowAction.java 2010-01-22 16:55:42.000000000 +0100
-@@ -63,11 +63,15 @@
- if (allCells[i] instanceof BasicBlock) {
- //((BasicBlock) allCells[i])
- mxCellState state = getGraph(null).getView().getState(allCells[i]);
-- Hashtable<String, Object> style = (state != null) ? state.getStyle() : getGraph(null).getCellStyle(allCells[i]);
--
-+ Map<String, Object> style;
-+ if (state != null) {
-+ style = state.getStyle();
-+ } else {
-+ style = getGraph(null).getCellStyle(allCells[i]);
-+ }
- if (style != null)
- {
-- String value = (mxUtils.isTrue(style, mxConstants.STYLE_SHADOW, false)) ? "0" : "1";
-+ String value = Boolean.toString(mxUtils.isTrue(style, mxConstants.STYLE_SHADOW, false));
- getGraph(null).setCellStyles(mxConstants.STYLE_SHADOW, value, new Object[] { allCells[i] });
- }
- }
-Index: scilab-5.2.0/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosCanvas.java
-===================================================================
---- scilab-5.2.0.orig/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosCanvas.java 2010-01-22 16:55:52.000000000 +0100
-+++ scilab-5.2.0/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosCanvas.java 2010-01-22 16:57:58.000000000 +0100
-@@ -17,7 +17,7 @@
- public class XcosCanvas extends mxInteractiveCanvas{
-
- public Object drawVertex(int x, int y, int w, int h,
-- Hashtable<String, Object> style) {
-+ Map<String, Object> style) {
-
- if (g != null)
- {
-@@ -90,7 +90,7 @@
- start = (int) Math.round(start * scale);
-
- // Removes some styles to draw the content area
-- Hashtable<String, Object> cloned = new Hashtable<String, Object>(
-+ Map<String, Object> cloned = new Hashtable<String, Object>(
- style);
- cloned.remove(mxConstants.STYLE_FILLCOLOR);
- cloned.remove(mxConstants.STYLE_ROUNDED);
-diff -ur scilab-5.2.0.orig/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java scilab-5.2.0/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java
---- scilab-5.2.0.orig/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java 2009-12-16 08:25:20.000000000 +0100
-+++ scilab-5.2.0/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java 2010-01-22 16:45:37.000000000 +0100
-@@ -562,7 +562,7 @@
- */
- if (getParentDiagram() instanceof SuperBlockDiagram) {
- SuperBlock parentBlock = ((SuperBlockDiagram) getParentDiagram()).getContainer();
-- parentBlock.getParentDiagram().fireEvent(XcosEvent.SUPER_BLOCK_UPDATED,new mxEventObject(new Object[] { parentBlock }));
-+ parentBlock.getParentDiagram().fireEvent(new mxEventObject(XcosEvent.SUPER_BLOCK_UPDATED, "block", parentBlock));
- }
-
- }
-@@ -606,7 +606,7 @@
- // Now read new Block
- BasicBlock modifiedBlock = BlockReader.readBlockFromFile(tempInput.getAbsolutePath());
- updateBlockSettings(modifiedBlock);
-- getParentDiagram().fireEvent(XcosEvent.ADD_PORTS, new mxEventObject(new Object[] {currentBlock}));
-+ getParentDiagram().fireEvent(new mxEventObject(XcosEvent.ADD_PORTS, "block", currentBlock));
- setLocked(false);
- }
- };
-Seulement dans scilab-5.2.0/modules/xcos/src/java/org/scilab/modules/xcos/block/: BasicBlock.java.orig
-Seulement dans scilab-5.2.0/modules/xcos/src/java/org/scilab/modules/xcos/block/: BasicBlock.java.rej
-diff -ur scilab-5.2.0.orig/modules/xcos/src/java/org/scilab/modules/xcos/block/EventInBlock.java scilab-5.2.0/modules/xcos/src/java/org/scilab/modules/xcos/block/EventInBlock.java
---- scilab-5.2.0.orig/modules/xcos/src/java/org/scilab/modules/xcos/block/EventInBlock.java 2009-12-16 08:25:20.000000000 +0100
-+++ scilab-5.2.0/modules/xcos/src/java/org/scilab/modules/xcos/block/EventInBlock.java 2010-01-22 16:47:03.000000000 +0100
-@@ -51,7 +51,7 @@
- double newValue = ((ScilabDouble)getIntegerParameters()).getRealPart()[0][0];
-
- if(oldValue != newValue){
-- getParentDiagram().fireEvent(XcosEvent.IN_EVENT_VALUE_UPDATED, new mxEventObject(new Object[]{oldValue,newValue}));
-+ getParentDiagram().fireEvent(new mxEventObject(XcosEvent.IN_EVENT_VALUE_UPDATED, "old", oldValue, "new", newValue));
- }
- }
-
-diff -ur scilab-5.2.0.orig/modules/xcos/src/java/org/scilab/modules/xcos/block/EventOutBlock.java scilab-5.2.0/modules/xcos/src/java/org/scilab/modules/xcos/block/EventOutBlock.java
---- scilab-5.2.0.orig/modules/xcos/src/java/org/scilab/modules/xcos/block/EventOutBlock.java 2009-12-16 08:25:20.000000000 +0100
-+++ scilab-5.2.0/modules/xcos/src/java/org/scilab/modules/xcos/block/EventOutBlock.java 2010-01-22 16:47:19.000000000 +0100
-@@ -51,7 +51,7 @@
- double newValue = ((ScilabDouble)getIntegerParameters()).getRealPart()[0][0];
-
- if(oldValue != newValue){
-- getParentDiagram().fireEvent(XcosEvent.OUT_EVENT_VALUE_UPDATED, new mxEventObject(new Object[]{oldValue,newValue}));
-+ getParentDiagram().fireEvent(new mxEventObject(XcosEvent.OUT_EVENT_VALUE_UPDATED, "old", oldValue, "new", newValue));
- }
- }
-
-diff -ur scilab-5.2.0.orig/modules/xcos/src/java/org/scilab/modules/xcos/block/ExplicitInBlock.java scilab-5.2.0/modules/xcos/src/java/org/scilab/modules/xcos/block/ExplicitInBlock.java
---- scilab-5.2.0.orig/modules/xcos/src/java/org/scilab/modules/xcos/block/ExplicitInBlock.java 2009-12-16 08:25:20.000000000 +0100
-+++ scilab-5.2.0/modules/xcos/src/java/org/scilab/modules/xcos/block/ExplicitInBlock.java 2010-01-22 16:48:57.000000000 +0100
-@@ -50,7 +50,7 @@
- double newValue = ((ScilabDouble)getIntegerParameters()).getRealPart()[0][0];
-
- if(oldValue != newValue){
-- getParentDiagram().fireEvent(XcosEvent.IN_EXPLICIT_VALUE_UPDATED, new mxEventObject(new Object[]{oldValue,newValue}));
-+ getParentDiagram().fireEvent(new mxEventObject(XcosEvent.IN_EXPLICIT_VALUE_UPDATED, "old", oldValue, "new", newValue));
- }
- }
-
-diff -ur scilab-5.2.0.orig/modules/xcos/src/java/org/scilab/modules/xcos/block/ExplicitOutBlock.java scilab-5.2.0/modules/xcos/src/java/org/scilab/modules/xcos/block/ExplicitOutBlock.java
---- scilab-5.2.0.orig/modules/xcos/src/java/org/scilab/modules/xcos/block/ExplicitOutBlock.java 2009-12-16 08:25:20.000000000 +0100
-+++ scilab-5.2.0/modules/xcos/src/java/org/scilab/modules/xcos/block/ExplicitOutBlock.java 2010-01-22 16:49:18.000000000 +0100
-@@ -51,7 +51,7 @@
- double newValue = ((ScilabDouble)getIntegerParameters()).getRealPart()[0][0];
-
- if(oldValue != newValue){
-- getParentDiagram().fireEvent(XcosEvent.OUT_EXPLICIT_VALUE_UPDATED, new mxEventObject(new Object[]{oldValue,newValue}));
-+ getParentDiagram().fireEvent(new mxEventObject(XcosEvent.OUT_EXPLICIT_VALUE_UPDATED, "old", oldValue, "new", newValue));
- }
- }
-
-diff -ur scilab-5.2.0.orig/modules/xcos/src/java/org/scilab/modules/xcos/block/ImplicitInBlock.java scilab-5.2.0/modules/xcos/src/java/org/scilab/modules/xcos/block/ImplicitInBlock.java
---- scilab-5.2.0.orig/modules/xcos/src/java/org/scilab/modules/xcos/block/ImplicitInBlock.java 2009-12-16 08:25:20.000000000 +0100
-+++ scilab-5.2.0/modules/xcos/src/java/org/scilab/modules/xcos/block/ImplicitInBlock.java 2010-01-22 16:49:36.000000000 +0100
-@@ -51,7 +51,7 @@
- double newValue = ((ScilabDouble)getIntegerParameters()).getRealPart()[0][0];
-
- if(oldValue != newValue){
-- getParentDiagram().fireEvent(XcosEvent.IN_IMPLICIT_VALUE_UPDATED, new mxEventObject(new Object[]{oldValue,newValue}));
-+ getParentDiagram().fireEvent(new mxEventObject(XcosEvent.IN_IMPLICIT_VALUE_UPDATED, "old", oldValue, "new", newValue));
- }
- }
-
-diff -ur scilab-5.2.0.orig/modules/xcos/src/java/org/scilab/modules/xcos/block/ImplicitOutBlock.java scilab-5.2.0/modules/xcos/src/java/org/scilab/modules/xcos/block/ImplicitOutBlock.java
---- scilab-5.2.0.orig/modules/xcos/src/java/org/scilab/modules/xcos/block/ImplicitOutBlock.java 2009-12-16 08:25:20.000000000 +0100
-+++ scilab-5.2.0/modules/xcos/src/java/org/scilab/modules/xcos/block/ImplicitOutBlock.java 2010-01-22 16:49:52.000000000 +0100
-@@ -51,7 +51,7 @@
- double newValue = ((ScilabDouble)getIntegerParameters()).getRealPart()[0][0];
-
- if(oldValue != newValue){
-- getParentDiagram().fireEvent(XcosEvent.OUT_IMPLICIT_VALUE_UPDATED, new mxEventObject(new Object[]{oldValue,newValue}));
-+ getParentDiagram().fireEvent(new mxEventObject(XcosEvent.OUT_IMPLICIT_VALUE_UPDATED, "old", oldValue, "new", newValue));
- }
- }
-
-Seulement dans scilab-5.2.0/modules/xcos/src/java/org/scilab/modules/xcos/block/: io
-diff -ur scilab-5.2.0.orig/modules/xcos/src/java/org/scilab/modules/xcos/block/SuperBlock.java scilab-5.2.0/modules/xcos/src/java/org/scilab/modules/xcos/block/SuperBlock.java
---- scilab-5.2.0.orig/modules/xcos/src/java/org/scilab/modules/xcos/block/SuperBlock.java 2009-12-16 08:25:20.000000000 +0100
-+++ scilab-5.2.0/modules/xcos/src/java/org/scilab/modules/xcos/block/SuperBlock.java 2010-01-22 16:46:14.000000000 +0100
-@@ -386,7 +386,7 @@
- updateExportedExplicitOutputPort();
- updateExportedImplicitOutputPort();
- updateExportedEventOutputPort();
-- getParentDiagram().fireEvent(XcosEvent.SUPER_BLOCK_UPDATED, new mxEventObject(new Object[] {this}));
-+ getParentDiagram().fireEvent(new mxEventObject(XcosEvent.SUPER_BLOCK_UPDATED, "block", this));
- }
-
-
-Seulement dans scilab-5.2.0/modules/xcos/src/java/org/scilab/modules/xcos/block/: SuperBlock.java.orig
-Seulement dans scilab-5.2.0/modules/xcos/src/java/org/scilab/modules/xcos/block/: SuperBlock.java.rej
---- scilab-5.2.0.obsolete.0.714259042478265/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosCanvas.java 2010-01-23 22:49:59.000000000 +0100
-+++ scilab-5.2.0/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosCanvas.java 2010-01-23 23:32:57.000000000 +0100
-@@ -7,6 +7,7 @@
- import java.awt.Stroke;
- import java.awt.geom.AffineTransform;
- import java.util.Hashtable;
-+import java.util.Map;
-
- import com.mxgraph.swing.view.mxInteractiveCanvas;
- import com.mxgraph.util.mxConstants;
---- scilab-5.2.0.obsolete.0.714259042478265/modules/xcos/src/java/org/scilab/modules/xcos/palette/XcosPalette.java 2009-12-16 08:25:20.000000000 +0100
-+++ scilab-5.2.0/modules/xcos/src/java/org/scilab/modules/xcos/palette/XcosPalette.java 2010-01-24 00:01:43.000000000 +0100
-@@ -187,8 +187,9 @@
- selectedEntry.setOpaque(true);
- }
-
-- eventSource.fireEvent(mxEvent.SELECT, new mxEventObject(new Object[] {
-- selectedEntry, t, last }));
-+
-+ eventSource.fireEvent(new mxEventObject(mxEvent.SELECT, "entry",
-+ selectedEntry, "transferable", t, "previous", last));
- }
-
-
---- scilab-5.2.0.obsolete.0.714259042478265/modules/xcos/src/java/org/scilab/modules/xcos/actions/ShowHideShadowAction.java 2010-01-23 22:49:59.000000000 +0100
-+++ scilab-5.2.0/modules/xcos/src/java/org/scilab/modules/xcos/actions/ShowHideShadowAction.java 2010-01-23 23:59:58.000000000 +0100
-@@ -13,6 +13,7 @@
- package org.scilab.modules.xcos.actions;
-
- import java.util.Hashtable;
-+import java.util.Map;
-
- import org.scilab.modules.graph.ScilabGraph;
- import org.scilab.modules.graph.actions.DefaultAction;
---- scilab-5.2.0.obsolete.0.714259042478265/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java 2009-12-16 08:25:20.000000000 +0100
-+++ scilab-5.2.0/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java 2010-01-23 23:57:56.000000000 +0100
-@@ -625,7 +625,7 @@
- public void invoke(Object source, mxEventObject evt) {
- getModel().beginUpdate();
- refresh();
-- BasicBlock updatedBlock = (BasicBlock) evt.getArgAt(0);
-+ BasicBlock updatedBlock = (BasicBlock) evt.getProperty("block");
- BlockPositioning.updateBlockView(updatedBlock);
- getModel().endUpdate();
- }
-@@ -639,7 +639,7 @@
- */
- private class ModelTracker implements mxIEventListener {
- public void invoke(Object source, mxEventObject evt) {
-- List<mxUndoableChange> changes = (List<mxUndoableChange>) evt.getArgAt(0);
-+ List<mxUndoableChange> changes = (List<mxUndoableChange>) evt.getProperty("changes");
- List<Object> objects = new ArrayList<Object>();
- getModel().beginUpdate();
- for (int i = 0; i < changes.size(); ++i) {
-@@ -660,7 +660,8 @@
- firedCells[j] = objects.get(j);
- }
- //fireEvent(XcosEvent.FORCE_CELL_RESHAPE, new mxEventObject(new Object[] {firedCells}));
-- fireEvent(XcosEvent.FORCE_CELL_VALUE_UPDATE, new mxEventObject(new Object[] {firedCells}));
-+ fireEvent(new mxEventObject(XcosEvent.FORCE_CELL_VALUE_UPDATE, "cells", firedCells));
-+
- }
- getModel().endUpdate();
- }
-@@ -671,7 +672,7 @@
- */
- private class ForceCellValueUpdate implements mxIEventListener {
- public void invoke(Object source, mxEventObject evt) {
-- Object[] cells = (Object[]) evt.getArgs()[0];
-+ Object[] cells = (Object[]) evt.getProperty("cells");
-
- getModel().beginUpdate();
-
-@@ -704,7 +705,7 @@
- */
- private class ForceCellReshapeTracker implements mxIEventListener {
- public void invoke(Object source, mxEventObject evt) {
-- Object[] cells = (Object[]) evt.getArgs()[0];
-+ Object[] cells = (Object[]) evt.getProperty("cells");
- getModel().beginUpdate();
- for (int i = 0; i < cells.length; ++i) {
- Object cell = cells[i];
-@@ -723,16 +724,15 @@
- */
- private class SuperBlockUpdateTracker implements mxIEventListener {
- public void invoke(Object source, mxEventObject evt) {
-- assert evt.getArgs()[0] instanceof SuperBlock;
-- SuperBlock updatedBlock = (SuperBlock) evt.getArgs()[0];
-+ assert evt.getProperty("block") instanceof SuperBlock;
-+ SuperBlock updatedBlock = (SuperBlock) evt.getProperty("block");
- updatedBlock.setRealParameters(BlockWriter
- .convertDiagramToMList(updatedBlock.getChild()));
- if (updatedBlock.getParentDiagram() instanceof SuperBlockDiagram) {
- SuperBlock parentBlock = ((SuperBlockDiagram) updatedBlock
- .getParentDiagram()).getContainer();
-- parentBlock.getParentDiagram().fireEvent(
-- XcosEvent.SUPER_BLOCK_UPDATED,
-- new mxEventObject(new Object[] { parentBlock }));
-+ parentBlock.getParentDiagram().fireEvent(new mxEventObject(XcosEvent.SUPER_BLOCK_UPDATED,"block", parentBlock));
-+
- }
- BlockPositioning.updateBlockView(updatedBlock);
- refresh();
-@@ -751,7 +751,7 @@
- }
-
- public void invoke(Object source, mxEventObject evt) {
-- Object[] cells = (Object[]) evt.getArgs()[0];
-+ Object[] cells = (Object[]) evt.getProperty("cells");
-
- diagram.getModel().beginUpdate();
- for (int i = 0; i < cells.length; ++i) {
-@@ -782,7 +782,7 @@
- }
-
- public void invoke(Object source, mxEventObject evt) {
-- Object[] cells = (Object[]) evt.getArgs()[0];
-+ Object[] cells = (Object[]) evt.getProperty("cells");
- for (int i = 0; i < cells.length; i++) {
- if (cells[i] instanceof BasicLink) {
- BasicLink link = (BasicLink) cells[i];
-@@ -900,7 +900,7 @@
- */
- private class CellResizedTracker implements mxIEventListener {
- public void invoke(Object source, mxEventObject evt) {
-- Object[] cells = (Object[]) evt.getArgs()[0];
-+ Object[] cells = (Object[]) evt.getProperty("cells");
- getModel().beginUpdate();
- for (int i = 0; i < cells.length; ++i) {
- if (cells[i] instanceof BasicBlock) {
-@@ -916,7 +916,7 @@
- */
- private class UndoUpdateTracker implements mxIEventListener {
- public void invoke(Object source, mxEventObject evt) {
-- List<mxUndoableChange> changes = ((mxUndoableEdit) evt.getArgAt(0)).getChanges();
-+ List<mxUndoableChange> changes = ((mxUndoableEdit) evt.getProperty("edit")).getChanges();
- Object[] changedCells = getSelectionCellsForChanges(changes);
- getModel().beginUpdate();
- for (Object object : changedCells) {
-@@ -1712,7 +1712,7 @@
- //getParentTab().setName((String) properties.get("title"));
-
- // Clear all undo events in Undo Manager
-- undoManager.reset();
-+ undoManager.clear();
- setModified(false);
- }
-
-@@ -2051,7 +2051,7 @@
- * This function will reset the UndoManager in a stable state.
- */
- public void resetUndoManager() {
-- undoManager.reset();
-+ undoManager.clear();
-
- resetUndoCounter();
-
diff --git a/sci-mathematics/scilab/files/scilab-5.2.0-no-redef-exp10.patch b/sci-mathematics/scilab/files/scilab-5.2.0-no-redef-exp10.patch
deleted file mode 100644
index 4eabb4e09..000000000
--- a/sci-mathematics/scilab/files/scilab-5.2.0-no-redef-exp10.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.ac.orig 2010-02-04 20:07:14.000000000 +0000
-+++ configure.ac 2010-02-04 20:07:53.000000000 +0000
-@@ -894,10 +894,6 @@
-
- AC_CHECK_FUNCS([pow] [sqrt] [finite] [floor])
-
--AC_CHECK_FUNC([exp10],,[
-- AC_DEFINE([log_10_],[2.3025850929940456840179914546844],[Provide a macro to do exp10])
-- AC_DEFINE([exp10(x)],[exp( (log_10_) * (x) )],[Provide a macro to do exp10])
-- ])
-
- ### If isinf exists or not (used to not be the case under Solaris)
- ### See bug #4164
diff --git a/sci-mathematics/scilab/files/scilab-5.2.0-hdf-java-2.6.patch b/sci-mathematics/scilab/files/scilab-5.2.1-hdf-java-2.6.patch
index 034e98c93..034e98c93 100644
--- a/sci-mathematics/scilab/files/scilab-5.2.0-hdf-java-2.6.patch
+++ b/sci-mathematics/scilab/files/scilab-5.2.1-hdf-java-2.6.patch
diff --git a/sci-mathematics/scilab/files/scilab-5.2.0-java-heap.patch b/sci-mathematics/scilab/files/scilab-5.2.1-java-heap.patch
index c72139d6c..c72139d6c 100644
--- a/sci-mathematics/scilab/files/scilab-5.2.0-java-heap.patch
+++ b/sci-mathematics/scilab/files/scilab-5.2.1-java-heap.patch
diff --git a/sci-mathematics/scilab/files/scilab-5.2.1-no-redef-exp10.patch b/sci-mathematics/scilab/files/scilab-5.2.1-no-redef-exp10.patch
new file mode 100644
index 000000000..c85d1839e
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.2.1-no-redef-exp10.patch
@@ -0,0 +1,65 @@
+diff -urN scilab-5.2.1-orig//configure.ac scilab-5.2.1//configure.ac
+--- scilab-5.2.1-orig//configure.ac 2010-02-17 03:06:08.000000000 -0500
++++ scilab-5.2.1//configure.ac 2010-02-20 16:49:52.000000000 -0500
+@@ -953,12 +953,7 @@
+ # Provided by math.h
+
+ LDFLAGS="$LDFLAGS $LIBM"
+-AC_CHECK_FUNCS([pow] [sqrt] [finite] [floor])
+-
+-AC_CHECK_FUNC([exp10],,[
+- AC_DEFINE([log_10_],[2.3025850929940456840179914546844],[Provide a macro to do exp10])
+- AC_DEFINE([exp10(x)],[exp( (log_10_) * (x) )],[Provide a macro to do exp10])
+- ])
++AC_CHECK_FUNCS([pow] [sqrt] [finite] [floor] [exp10])
+
+ ### If isinf exists or not (used to not be the case under Solaris)
+ ### See bug #4164
+diff -urN scilab-5.2.1-orig//modules/core/includes/core_math.h scilab-5.2.1//modules/core/includes/core_math.h
+--- scilab-5.2.1-orig//modules/core/includes/core_math.h 2010-02-17 03:06:08.000000000 -0500
++++ scilab-5.2.1//modules/core/includes/core_math.h 2010-02-20 16:49:52.000000000 -0500
+@@ -90,6 +90,11 @@
+ #define M_PI 3.14159265358979323846
+ #endif
+
++#ifndef HAVE_EXP10
++#define log_10_ 2.3025850929940456840179914546844
++/* Provide a macro to do exp10 */
++#define exp10(x) exp( (log_10_) * (x) )
++#endif
+
+ #endif /* __BASE_MATH_H__ */
+
+diff -urN scilab-5.2.1-orig//modules/core/includes/machine.h.in scilab-5.2.1//modules/core/includes/machine.h.in
+--- scilab-5.2.1-orig//modules/core/includes/machine.h.in 2010-02-17 03:06:08.000000000 -0500
++++ scilab-5.2.1//modules/core/includes/machine.h.in 2010-02-20 16:49:52.000000000 -0500
+@@ -77,6 +77,9 @@
+ /* Define to 1 if you have the `endpwent' function. */
+ #undef HAVE_ENDPWENT
+
++/* Define to 1 if you have the `exp10' function. */
++#undef HAVE_EXP10
++
+ /* Define to 1 if you have the <fcntl.h> header file. */
+ #undef HAVE_FCNTL_H
+
+@@ -515,9 +518,6 @@
+ /* Define to empty if `const' does not conform to ANSI C. */
+ #undef const
+
+-/* Provide a macro to do exp10 */
+-#undef exp10
+-
+ /* Don't use getwd but getcwd */
+ #undef getwd
+
+@@ -530,9 +530,6 @@
+ /* Provide a macro to do isinf */
+ #undef isinf
+
+-/* Provide a macro to do exp10 */
+-#undef log_10_
+-
+
+
+ #ifdef DIR_SEPARATOR
diff --git a/sci-mathematics/scilab/files/scilab-5.2.1-nojavacheckversion.patch b/sci-mathematics/scilab/files/scilab-5.2.1-nojavacheckversion.patch
new file mode 100644
index 000000000..26c47e0cb
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-5.2.1-nojavacheckversion.patch
@@ -0,0 +1,12 @@
+diff -urN scilab-5.2.1-orig//configure.ac scilab-5.2.1/configure.ac
+--- scilab-5.2.1-orig//configure.ac 2010-02-18 23:19:43.000000000 -0500
++++ scilab-5.2.1/configure.ac 2010-02-19 00:16:05.000000000 -0500
+@@ -664,7 +664,7 @@
+ JGRAPHX=$PACKAGE_JAR_FILE
+ AC_SUBST(JGRAPHX)
+
+- AC_JAVA_CHECK_VERSION_PACKAGE([jgraphx],[import com.mxgraph.view.mxGraph;],$JGRAPHX,[1.2.0.7],[mxGraph.VERSION])
++ #AC_JAVA_CHECK_VERSION_PACKAGE([jgraphx],[import com.mxgraph.view.mxGraph;],$JGRAPHX,[1.2.0.7],[mxGraph.VERSION])
+
+ # Docking system
+ AC_JAVA_CHECK_PACKAGE([flexdock],[org.flexdock.docking.DockingManager],[Scilab Gui])
diff --git a/sci-mathematics/scilab/files/scilab-5.2.0-scilib-fix.patch b/sci-mathematics/scilab/files/scilab-5.2.1-scilib-fix.patch
index ea1852ab1..6d3c2e1cb 100644
--- a/sci-mathematics/scilab/files/scilab-5.2.0-scilib-fix.patch
+++ b/sci-mathematics/scilab/files/scilab-5.2.1-scilib-fix.patch
@@ -5,7 +5,7 @@
#export PVM_ARCH
-SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/lib64/scilab/
-+SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/lib64/scilab/:/usr/lib64/scilab
++SCILIB=$SCI/bin:$SCI/lib/scilab/:$SCI/lib64/scilab/:/usr/lib64/scilab:/usr/lib/scilab
LD_LIBRARY_PATH=$SCILIB${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
case $OS in
diff --git a/sci-mathematics/scilab/scilab-5.2.1.ebuild b/sci-mathematics/scilab/scilab-5.2.1.ebuild
index 35738ced2..c120969aa 100644
--- a/sci-mathematics/scilab/scilab-5.2.1.ebuild
+++ b/sci-mathematics/scilab/scilab-5.2.1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="virtual/lapack
dev-java/gluegen
dev-java/jeuclid-core
dev-java/jlatexmath
- dev-java/jgraphx
+ >=dev-java/jgraphx-1.2.0.7
dev-java/jogl
dev-java/jgoodies-looks
dev-java/skinlf
@@ -50,18 +50,19 @@ pkg_setup() {
src_prepare() {
# avoid redefinition of exp10
- epatch "${FILESDIR}"/${PN}-5.2.0-no-redef-exp10.patch
+ epatch "${FILESDIR}"/${P}-no-redef-exp10.patch
# Increases java heap to 512M when available, when building docs
- check_reqs_conditional && epatch "${FILESDIR}"/${PN}-5.2.0-java-heap.patch
+ check_reqs_conditional && epatch "${FILESDIR}"/${P}-java-heap.patch
# fix for hdf-java-2.6
- epatch "${FILESDIR}"/${PN}-5.2.0-hdf-java-2.6.patch
- # fix SCILIB path
- epatch "${FILESDIR}"/${PN}-5.2.0-scilib-fix.patch
+ epatch "${FILESDIR}"/${P}-hdf-java-2.6.patch
+ # fix for jgraphx
+ epatch "${FILESDIR}"/${P}-scilib-fix.patch
+ epatch "${FILESDIR}"/${P}-nojavacheckversion.patch
# apply blindly some debian patches
- for i in "${FILESDIR}"/*.diff; do
- epatch ${i}
- done
+ #for i in "${FILESDIR}"/*.diff; do
+ # epatch ${i}
+ #done
# add the correct java directories to the config file
sed \