From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RQRBX-0001El-4o for garchives@archives.gentoo.org; Tue, 15 Nov 2011 22:08:55 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 367F521C104; Tue, 15 Nov 2011 22:08:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CF2D421C104 for ; Tue, 15 Nov 2011 22:08:27 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2417A1B401F for ; Tue, 15 Nov 2011 22:08:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 8AC8F80042 for ; Tue, 15 Nov 2011 22:08:26 +0000 (UTC) From: "Guillaume Horel" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Guillaume Horel" Message-ID: <40aa6d1571d5f00d6640f0b27ddf08a22c9cc381.guillaume_horel@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/files/, sci-mathematics/scilab/ X-VCS-Repository: proj/sci X-VCS-Files: sci-mathematics/scilab/ChangeLog sci-mathematics/scilab/files/addchapter.diff sci-mathematics/scilab/files/adddemo.diff sci-mathematics/scilab/files/buildDocPT_BR.diff sci-mathematics/scilab/files/disablebuildhelp.patch sci-mathematics/scilab/files/full_support.diff sci-mathematics/scilab/files/java-heap-5.3.3.patch sci-mathematics/scilab/files/missingaddchapter.diff sci-mathematics/scilab/files/modelicac-not-available.diff sci-mathematics/scilab/files/renesas-sh.diff sci-mathematics/scilab/files/s390javadetection.diff sci-mathematics/scilab/files/scilab-5.3.3-allow-hdf-1.8.7.patch sci-mathematics/scilab/files/scilab-5.3.3-scilib-fix.patch sci-mathematics/scilab/files/sparc64.diff sci-mathematics/scilab/scilab-5.3.3.ebuild X-VCS-Directories: sci-mathematics/scilab/files/ sci-mathematics/scilab/ X-VCS-Committer: guillaume_horel X-VCS-Committer-Name: Guillaume Horel X-VCS-Revision: 40aa6d1571d5f00d6640f0b27ddf08a22c9cc381 Date: Tue, 15 Nov 2011 22:08:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: f98a33fc-a414-40a7-8f99-cf0052f47954 X-Archives-Hash: 0677b62961d7334f4d83c9078a6e8ef2 commit: 40aa6d1571d5f00d6640f0b27ddf08a22c9cc381 Author: Guillaume Horel gmail com> AuthorDate: Tue Nov 15 22:06:50 2011 +0000 Commit: Guillaume Horel gmail com> CommitDate: Tue Nov 15 22:06:50 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D40aa6d15 [sci-mathematics/scilab] 5.3.3 version bump --- sci-mathematics/scilab/ChangeLog | 12 ++ sci-mathematics/scilab/files/addchapter.diff | 16 --- sci-mathematics/scilab/files/adddemo.diff | 23 ---- sci-mathematics/scilab/files/buildDocPT_BR.diff | 14 -- .../scilab/files/disablebuildhelp.patch | 39 ++++++ sci-mathematics/scilab/files/full_support.diff | 24 ---- sci-mathematics/scilab/files/java-heap-5.3.3.patch | 12 ++ .../scilab/files/missingaddchapter.diff | 25 ---- .../scilab/files/modelicac-not-available.diff | 36 ----- sci-mathematics/scilab/files/renesas-sh.diff | 34 ----- .../scilab/files/s390javadetection.diff | 14 -- .../files/scilab-5.3.3-allow-hdf-1.8.7.patch | 13 ++ .../scilab/files/scilab-5.3.3-scilib-fix.patch | 11 ++ sci-mathematics/scilab/files/sparc64.diff | 40 ------ sci-mathematics/scilab/scilab-5.3.3.ebuild | 138 ++++++++++++++= ++++++ 15 files changed, 225 insertions(+), 226 deletions(-) diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/Ch= angeLog index d5cc783..c41856e 100644 --- a/sci-mathematics/scilab/ChangeLog +++ b/sci-mathematics/scilab/ChangeLog @@ -2,6 +2,18 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 +*scilab-5.3.3 (15 Nov 2011) + + 15 Nov 2011; Guillaume Horel + +scilab-5.3.3.ebuild, +files/scilab-5.3.3-allow-hdf-1.8.7.patch, + +files/scilab-5.3.3-scilib-fix.patch, +files/java-heap-5.3.3.patch, + +files/disablebuildhelp.patch, -files/addchapter.diff, -files/adddemo.= diff, + -files/buildDocPT_BR.diff, -files/full_support.diff, + -files/missingaddchapter.diff, -files/modelicac-not-available.diff, + -files/renesas-sh.diff, -files/s390javadetection.diff, -files/sparc64.= diff: + version bump. Thanks to security0ff for most of the changes! + see #390221 + 19 Sep 2011; Guillaume Horel scilab-5.3.2.= ebuild, +files/scilab-5.3.2-allow-hdf-1.8.7.patch, +files/scilab.xml: cleanup and import fixes from the opensuse rpm. diff --git a/sci-mathematics/scilab/files/addchapter.diff b/sci-mathemati= cs/scilab/files/addchapter.diff deleted file mode 100644 index b2d71ac..0000000 --- a/sci-mathematics/scilab/files/addchapter.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff -Nur scilab-5.1.1.orig/modules/helptools/macros/add_module_help_cha= pter.sci scilab-5.1.1/modules/helptools/macros/add_module_help_chapter.sc= i ---- scilab-5.1.1.orig/modules/helptools/macros/add_module_help_chapter.s= ci 2009-04-14 09:30:56.000000000 +0200 -+++ scilab-5.1.1/modules/helptools/macros/add_module_help_chapter.sci 20= 09-04-14 18:07:23.000000000 +0200 -@@ -19,10 +19,8 @@ - path_addchapter =3D SCI+"/modules/"+modulename+"/help/"+getdefaultlan= guage()+"/addchapter.sce"; - end - =09 -- //try -+ if ( fileinfo(path_addchapter) <> [] ) then - exec(path_addchapter); -- //catch -- // warning(gettext("Incorrect module path ")+path_addchapter); -- //end -+ end - =09 - endfunction \ No newline at end of file diff --git a/sci-mathematics/scilab/files/adddemo.diff b/sci-mathematics/= scilab/files/adddemo.diff deleted file mode 100644 index e8e7f1c..0000000 --- a/sci-mathematics/scilab/files/adddemo.diff +++ /dev/null @@ -1,23 +0,0 @@ -diff -Nur scilab-5.1.1.orig/modules/core/macros/add_demo.sci scilab-5.1.= 1/modules/core/macros/add_demo.sci ---- scilab-5.1.1.orig/modules/core/macros/add_demo.sci 2009-04-14 09:30:= 44.000000000 +0200 -+++ scilab-5.1.1/modules/core/macros/add_demo.sci 2009-04-14 17:54:41.00= 0000000 +0200 -@@ -17,9 +17,7 @@ - =20 - path=3Dpathconvert(path,%f,%t); - =20 -- if fileinfo(path)=3D=3D[] then -- error(msprintf(gettext("%s: The file %s does not exist.\n"),"add_de= mo",path)); -- end -+ if fileinfo(path) <> [] then - =20 - if isdir(path) then=20 - error(msprintf(gettext("%s: Wrong input argument #%d: Path to a sci= lab script file expected.\n"),"add_demo",2)); -@@ -33,7 +31,7 @@ - k1=3Dfind(demolist(k,2)=3D=3Dpath) - if k1=3D=3D[] then demolist=3D[demolist;demotitle+" ("+string(size(= k,"*"))+")",path],end - end -- =20 -+ end - clear demolist - =20 - endfunction \ No newline at end of file diff --git a/sci-mathematics/scilab/files/buildDocPT_BR.diff b/sci-mathem= atics/scilab/files/buildDocPT_BR.diff deleted file mode 100644 index 411e9e5..0000000 --- a/sci-mathematics/scilab/files/buildDocPT_BR.diff +++ /dev/null @@ -1,14 +0,0 @@ -Index: scilab-5.2.0/Makefile.am -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- scilab-5.2.0.orig/Makefile.am 2010-02-03 16:08:18.000000000 +0100 -+++ scilab-5.2.0/Makefile.am 2010-02-03 16:09:33.000000000 +0100 -@@ -151,6 +151,9 @@ - echo "-- Building documentation (French) --"; \ - echo "SCI_DISABLE_TK=3D1 SCI_JAVA_ENABLE_HEADLESS=3D1 DOCBOOK_ROOT=3D= $(DOCBOOK_ROOT) $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e = \"xmltojar([],[],'fr_FR');exit;\""; \ - SCI_DISABLE_TK=3D1 SCI_JAVA_ENABLE_HEADLESS=3D1 DOCBOOK_ROOT=3D$(DOCB= OOK_ROOT) $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e "xmlto= jar([],[],'fr_FR');exit;"; \ -+ echo "-- Building documentation (portugues do Brasil) --"; \ -+ echo "SCI_DISABLE_TK=3D1 SCI_JAVA_ENABLE_HEADLESS=3D1 DOCBOOK_ROOT=3D= $(DOCBOOK_ROOT) $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e = \"xmltojar([],[],'pt_BR');exit;\""; \ -+ SCI_DISABLE_TK=3D1 SCI_JAVA_ENABLE_HEADLESS=3D1 DOCBOOK_ROOT=3D$(DOCB= OOK_ROOT) $(top_builddir)/bin/scilab-adv-cli -nb -nouserstartup -e "xmlto= jar([],[],'pt_BR');exit;"; \ - else \ - echo "Cannot find Scilab-adv-cli binary"; \ - fi diff --git a/sci-mathematics/scilab/files/disablebuildhelp.patch b/sci-ma= thematics/scilab/files/disablebuildhelp.patch new file mode 100644 index 0000000..4fbabd9 --- /dev/null +++ b/sci-mathematics/scilab/files/disablebuildhelp.patch @@ -0,0 +1,39 @@ +From f4c20c8fb5d9540e4972ae75dbd2a34aa2a3622b Mon Sep 17 00:00:00 2001 +From: Sylvestre Ledru +Date: Sat, 1 Oct 2011 00:15:59 +0200 +Subject: [PATCH] * bug 9883 fixed - Build with --disable-build-help was = failing. + +Change-Id: I93da6b7312effb261fd95d90613f87e9988b35f9 +--- + scilab/modules/scinotes/Makefile.am | 2 ++ + scilab/modules/scinotes/Makefile.in | 2 +- + 2 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/scilab/modules/scinotes/Makefile.am b/scilab/modules/scinot= es/Makefile.am +index 8ffad2d..ad5dbde 100644 +--- a/scilab/modules/scinotes/Makefile.am ++++ b/scilab/modules/scinotes/Makefile.am +@@ -112,5 +112,7 @@ libsciscinotes_la_sci_gatewaydir =3D $(mydatadir)/sc= i_gateway + libsciscinotes_la_sci_gateway_DATA =3D sci_gateway/scinotes_gateway.xml +=20 + if GUI ++if BUILD_HELP + USEANT=3D1 + endif ++endif +diff --git a/scilab/modules/scinotes/Makefile.in b/scilab/modules/scinot= es/Makefile.in +index 95b6f57..673fa4c 100644 +--- a/scilab/modules/scinotes/Makefile.in ++++ b/scilab/modules/scinotes/Makefile.in +@@ -565,7 +565,7 @@ libsciscinotes_la_LIBADD =3D libsciscinotes-algo.la + #### scinotes : gateway declaration #### + libsciscinotes_la_sci_gatewaydir =3D $(mydatadir)/sci_gateway + libsciscinotes_la_sci_gateway_DATA =3D sci_gateway/scinotes_gateway.xml +-@GUI_TRUE@USEANT =3D 1 ++@BUILD_HELP_TRUE@@GUI_TRUE@USEANT =3D 1 + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am +=20 +--=20 +1.7.2.3 + diff --git a/sci-mathematics/scilab/files/full_support.diff b/sci-mathema= tics/scilab/files/full_support.diff deleted file mode 100644 index 9d7554e..0000000 --- a/sci-mathematics/scilab/files/full_support.diff +++ /dev/null @@ -1,24 +0,0 @@ -commit 409faec413e7491450f51059af02b0469cbb01eb -Author: Sylvestre Ledru -Date: Fri Feb 19 23:42:38 2010 +0100 - - full support of sparc64 - -diff --git a/scilab/bin/scilab b/scilab/bin/scilab -index c4d6548..7ec4bbc 100755 ---- a/scilab/bin/scilab -+++ b/scilab/bin/scilab -@@ -371,9 +371,12 @@ fi - "ppc") - proc=3D"ppc" - ;; -- "alpha") =20 -+ "alpha") - proc=3D"alpha" - ;; -+ "sparc64") -+ proc=3D"sparc" -+ ;; - *) - echo "Could not find the Java configuration for the model <${MODE= L}>. Please contact us." - ;; diff --git a/sci-mathematics/scilab/files/java-heap-5.3.3.patch b/sci-mat= hematics/scilab/files/java-heap-5.3.3.patch new file mode 100644 index 0000000..57d656b --- /dev/null +++ b/sci-mathematics/scilab/files/java-heap-5.3.3.patch @@ -0,0 +1,12 @@ +diff -urN scilab-5.3.2-orig//etc/jvm_options.xml scilab-5.3.2/etc/jvm_op= tions.xml +--- scilab-5.3.2-orig//etc/jvm_options.xml 2011-05-25 23:20:12.145833420= -0400 ++++ scilab-5.3.2/etc/jvm_options.xml 2011-05-25 23:20:58.760833451 -0400 +@@ -22,7 +22,7 @@ + +