From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 801FD1382C5 for ; Sat, 27 Jan 2018 20:25:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8B0B5E0ADB; Sat, 27 Jan 2018 20:25:46 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 58558E0ADB for ; Sat, 27 Jan 2018 20:25:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 10D7C335C2F for ; Sat, 27 Jan 2018 20:25:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1452D1BB for ; Sat, 27 Jan 2018 20:25:43 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1517084736.5acf363c71b1e17cc90caf09abb5a2697c406682.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/, sci-mathematics/scilab/files/ X-VCS-Repository: proj/sci X-VCS-Files: sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch sci-mathematics/scilab/files/scilab-5.5.2-batik-1.8.patch sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch sci-mathematics/scilab/files/scilab-5.5.2-followlinks.patch sci-mathematics/scilab/files/scilab-5.5.2-fop-2.0.patch sci-mathematics/scilab/files/scilab-5.5.2-freehep.patch sci-mathematics/scilab/files/scilab-5.5.2-gluegen.patch sci-mathematics/scilab/files/scilab-5.5.2-java-heap.patch sci-mathematics/scilab/files/scilab-5.5.2-missinglib.patch sci-mathematics/scilab/files/scilab-5.5.2-nogui.patch sci-mathematics/scilab/files/scilab-5.5.2-xmlgraphics-common-2.0.patch sci-mathematics/scilab/scilab-5.5.2-r1.ebuild X-VCS-Directories: sci-mathematics/scilab/files/ sci-mathematics/scilab/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 5acf363c71b1e17cc90caf09abb5a2697c406682 X-VCS-Branch: master Date: Sat, 27 Jan 2018 20:25:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d7438828-9a27-46cf-a601-91227c749f5a X-Archives-Hash: 0b169993fe6b55455ec3dd1e0f6b6df9 commit: 5acf363c71b1e17cc90caf09abb5a2697c406682 Author: Justin Lecher gentoo org> AuthorDate: Sat Jan 27 20:25:36 2018 +0000 Commit: Justin Lecher gentoo org> CommitDate: Sat Jan 27 20:25:36 2018 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=5acf363c sci-mathematics/scilab: Update to new localization handling Bump to EAPI=6 Signed-off-by: Justin Lecher gentoo.org> Package-Manager: Portage-2.3.20, Repoman-2.3.6 .../files/scilab-5.5.2-accessviolation.patch | 4 +- .../scilab/files/scilab-5.5.2-batik-1.8.patch | 13 ++-- .../scilab-5.5.2-fix-random-runtime-failure.patch | 4 +- .../scilab/files/scilab-5.5.2-followlinks.patch | 4 +- .../scilab/files/scilab-5.5.2-fop-2.0.patch | 8 +-- .../scilab/files/scilab-5.5.2-freehep.patch | 4 +- .../scilab/files/scilab-5.5.2-gluegen.patch | 4 +- .../scilab/files/scilab-5.5.2-java-heap.patch | 4 +- .../scilab/files/scilab-5.5.2-missinglib.patch | 4 +- .../scilab/files/scilab-5.5.2-nogui.patch | 4 +- .../scilab-5.5.2-xmlgraphics-common-2.0.patch | 4 +- sci-mathematics/scilab/scilab-5.5.2-r1.ebuild | 80 +++++++++++++--------- 12 files changed, 78 insertions(+), 59 deletions(-) diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch b/sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch index a84de9a2b..a7e5c6d5f 100644 --- a/sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch +++ b/sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch @@ -1,6 +1,6 @@ diff -urN scilab-5.5.0-orig/bin/scilab scilab-5.5.0/bin/scilab ---- scilab-5.5.0-orig/bin/scilab 2014-07-12 15:24:17.105686656 -0400 -+++ scilab-5.5.0/bin/scilab 2014-07-12 15:25:29.307725409 -0400 +--- a/bin/scilab 2014-07-12 15:24:17.105686656 -0400 ++++ b/bin/scilab 2014-07-12 15:25:29.307725409 -0400 @@ -647,17 +647,6 @@ GTK_MODULES=$(echo $GTK_MODULES | sed s/gnomebreakpad//g) export GTK_MODULES diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-batik-1.8.patch b/sci-mathematics/scilab/files/scilab-5.5.2-batik-1.8.patch index aaf4da884..007d530ad 100644 --- a/sci-mathematics/scilab/files/scilab-5.5.2-batik-1.8.patch +++ b/sci-mathematics/scilab/files/scilab-5.5.2-batik-1.8.patch @@ -7,8 +7,8 @@ with SAXSVGDocumentFactory being moved. This is not tested beyond "yes Scilab still links to Batik to export SVGs," as I'm not sure of a good test case, and it's awaiting upstream review. ---- a/scilab/configure -+++ b/scilab/configure +--- a/configure ++++ b/configure @@ -16600,8 +16600,8 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar batik used fi @@ -74,8 +74,8 @@ it's awaiting upstream review. fi fi ---- a/scilab/configure.ac -+++ b/scilab/configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -1038,7 +1038,7 @@ interface for JOGL2 - or libGL (OpenGL library) are installed and if the version BATIK=$PACKAGE_JAR_FILE fi @@ -85,8 +85,8 @@ it's awaiting upstream review. # Commons I/O library AC_JAVA_CHECK_PACKAGE([commons-io],[org.apache.commons.io.output.CountingOutputStream],[Commons I/O library]) ---- a/scilab/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java -+++ b/scilab/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java +--- a/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java ++++ b/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java @@ -28,7 +28,7 @@ import org.apache.batik.bridge.DocumentLoader; import org.apache.batik.bridge.GVTBuilder; import org.apache.batik.bridge.UserAgent; @@ -96,3 +96,4 @@ it's awaiting upstream review. import org.apache.batik.gvt.GraphicsNode; import org.apache.batik.util.XMLResourceDescriptor; import org.scilab.forge.jlatexmath.ParseException; + diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch b/sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch index 92ac45339..da7b6e485 100644 --- a/sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch +++ b/sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch @@ -1,6 +1,6 @@ diff -urN scilab-orig/modules/api_scilab/src/cpp/api_double.cpp scilab/modules/api_scilab/src/cpp/api_double.cpp ---- scilab-orig/modules/api_scilab/src/cpp/api_double.cpp 2012-08-06 23:26:31.342617365 -0400 -+++ scilab/modules/api_scilab/src/cpp/api_double.cpp 2012-08-06 23:27:34.838621420 -0400 +--- a/modules/api_scilab/src/cpp/api_double.cpp 2012-08-06 23:26:31.342617365 -0400 ++++ b/modules/api_scilab/src/cpp/api_double.cpp 2012-08-06 23:27:34.838621420 -0400 @@ -497,7 +497,7 @@ /*--------------------------------------------------------------------------*/ int createScalarDouble(void* _pvCtx, int _iVar, double _dblReal) diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-followlinks.patch b/sci-mathematics/scilab/files/scilab-5.5.2-followlinks.patch index fd6aa7bae..a3f60bee7 100644 --- a/sci-mathematics/scilab/files/scilab-5.5.2-followlinks.patch +++ b/sci-mathematics/scilab/files/scilab-5.5.2-followlinks.patch @@ -1,5 +1,5 @@ ---- m4/java.m4.orig 2014-02-11 23:43:03.030430258 -0500 -+++ m4/java.m4 2014-02-11 23:43:54.008428766 -0500 +--- a/m4/java.m4 2014-02-11 23:43:03.030430258 -0500 ++++ b/m4/java.m4 2014-02-11 23:43:54.008428766 -0500 @@ -839,7 +839,7 @@ for jar in "$jardir/$1.jar" "$jardir/lib$1.jar" "$jardir/lib$1-java.jar" "$jardir/$1*.jar"; do diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-fop-2.0.patch b/sci-mathematics/scilab/files/scilab-5.5.2-fop-2.0.patch index 83c6f6ca4..18bdaac1d 100644 --- a/sci-mathematics/scilab/files/scilab-5.5.2-fop-2.0.patch +++ b/sci-mathematics/scilab/files/scilab-5.5.2-fop-2.0.patch @@ -5,8 +5,8 @@ Gentoo-Bug-URL: https://github.com/gentoo-science/sci/pull/456 Updates Scilab to build against FOP >=2.0. This is not tested, as I'm not sure of a test case, and it's awaiting upstream review. ---- a/scilab/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java -+++ b/scilab/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java +--- a/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java ++++ b/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java @@ -43,10 +43,10 @@ public class FopConverter extends ContainerConverter { String fileName = outputDirectory + "/" + baseName + "." + format.name().toLowerCase(); @@ -20,8 +20,8 @@ of a test case, and it's awaiting upstream review. // Step 3: Construct fop with desired output format OutputStream out = new BufferedOutputStream(new FileOutputStream(fileName)); ---- a/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java -+++ b/scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java +--- a/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java ++++ b/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java @@ -114,11 +114,11 @@ public class CodeExporter extends FOCodeConverter { * @param format the page format */ diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-freehep.patch b/sci-mathematics/scilab/files/scilab-5.5.2-freehep.patch index 3595902e7..46825cb29 100644 --- a/sci-mathematics/scilab/files/scilab-5.5.2-freehep.patch +++ b/sci-mathematics/scilab/files/scilab-5.5.2-freehep.patch @@ -1,6 +1,6 @@ diff -uNr scilab-5.5.2-orig/configure.ac scilab-5.5.2/configure.ac ---- scilab-5.5.2-orig/configure.ac 2016-06-05 12:30:06.582735449 -0400 -+++ scilab-5.5.2/configure.ac 2016-06-05 12:31:29.706708157 -0400 +--- a/configure.ac 2016-06-05 12:30:06.582735449 -0400 ++++ b/configure.ac 2016-06-05 12:31:29.706708157 -0400 @@ -1024,7 +1024,7 @@ AC_SUBST(FREEHEP_IO) diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-gluegen.patch b/sci-mathematics/scilab/files/scilab-5.5.2-gluegen.patch index 151443926..d75c31e9a 100644 --- a/sci-mathematics/scilab/files/scilab-5.5.2-gluegen.patch +++ b/sci-mathematics/scilab/files/scilab-5.5.2-gluegen.patch @@ -1,5 +1,5 @@ ---- scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java.orig 2014-03-24 22:38:00.928934500 -0400 -+++ scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java 2014-03-24 22:37:33.947567043 -0400 +--- a/modules/gui/src/java/org/scilab/modules/gui/SwingView.java 2014-03-24 22:38:00.928934500 -0400 ++++ b/modules/gui/src/java/org/scilab/modules/gui/SwingView.java 2014-03-24 22:37:33.947567043 -0400 @@ -157,7 +157,7 @@ static { diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-java-heap.patch b/sci-mathematics/scilab/files/scilab-5.5.2-java-heap.patch index 31060d75a..ca17e52a6 100644 --- a/sci-mathematics/scilab/files/scilab-5.5.2-java-heap.patch +++ b/sci-mathematics/scilab/files/scilab-5.5.2-java-heap.patch @@ -1,5 +1,5 @@ ---- etc/jvm_options.xml.orig 2014-02-12 00:05:34.323390688 -0500 -+++ etc/jvm_options.xml 2014-02-12 00:05:53.977390112 -0500 +--- a/etc/jvm_options.xml 2014-02-12 00:05:34.323390688 -0500 ++++ b/etc/jvm_options.xml 2014-02-12 00:05:53.977390112 -0500 @@ -22,7 +22,7 @@