scilab version bump

6 files changed, 251 insertions, 3 deletions

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index dc2d445d2..9022ab033 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*scilab-5.2.1 (25 Feb 2010)
+
+  25 Feb 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  -scilab-5.2.0-r3.ebuild, +scilab-5.2.1.ebuild,
+  -files/ImplicitPointerConversions.diff, +files/full_support.diff,
+  +files/renesas-sh.diff, +files/sparc64.diff:
+  Version bump
+
 *scilab-5.2.0-r3 (12 Feb 2010)
 
   12 Feb 2010; Sébastien Fabbro <bicatali@gentoo.org>
diff --git a/sci-mathematics/scilab/Manifest b/sci-mathematics/scilab/Manifest
index eb276e980..4760a458b 100644
--- a/sci-mathematics/scilab/Manifest
+++ b/sci-mathematics/scilab/Manifest
@@ -1,9 +1,10 @@
-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
 AUX buildDocPT_BR.diff 1121 RMD160 e5a3cdfdead0efbf7aba801cd03e6a3e19c224de SHA1 7484496a36ae1f42b1fa9e51b9275d14eec5bd33 SHA256 3d155b28597da8b8f7f2c816eedeb732b45f56e903fb7df9edb1830a3ab7d59e
+AUX full_support.diff 589 RMD160 a8e3813775353c6c568b35f1e9d65dfe0acede6b SHA1 b842a8cad67d387dc3ac5e7ee5224face95358cf SHA256 b7ad9ad2dc2b78f6891ea8555b3571eb18200a8ce3de8a0d48323974c55baf14
 AUX missingaddchapter.diff 998 RMD160 0a674cc2e0f1b7fc2a6baf39234cf37cee911f22 SHA1 5cc43c4b78dd75f33828ba741655c33d45988681 SHA256 d2890d274d1124b6336ae6bf4fb039a14e22fb71c1e8422574bf140537bcbe67
 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
@@ -11,7 +12,9 @@ AUX scilab-5.2.0-java-heap.patch 438 RMD160 7f63afd4b8bc56f6f5ca496524d0047a0145
 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
-DIST scilab-5.2.0-src.tar.gz 54656677 RMD160 8a14582779d5b413c3c20cc13824e0773f7f4327 SHA1 ba919f9af86ac97b22e8be915302e1de104fbc01 SHA256 3412d4343cd3ca6ba0b03b28fec66a00f643d4d73f13dc28c0f6596ccb9f386a
-EBUILD scilab-5.2.0-r3.ebuild 3731 RMD160 6f5c82fc5143836ff337c824f441c34a63bd63ce SHA1 373d30ee68ee9a53357c33db6725242afb61cf4f SHA256 1c23acadb3e5064a4563b4e92f9df5e39b79c0ee0c9e0b0d4accf8c00445a730
+AUX sparc64.diff 1011 RMD160 86849042292bcd7a195e6745bb06d84fbe4af3e5 SHA1 602a3e3a9c8551e043f66d1cf81dcdd3292b7f0e SHA256 1c309296a003edfbb917df3e2948df117bc02b79c421232e971d14a966a25af6
+DIST scilab-5.2.1-src.tar.gz 54855137 RMD160 312ccc62f44bc3dbf8f25260a7090f62dc70818e SHA1 6fad986beb03a42cee6e8ef9bfa0b8976236b3f6 SHA256 f85aa3b7fde0e523f7f0159613da7cca7bd2d125860b50fa2ed00394c97075e0
+EBUILD scilab-5.2.1.ebuild 3589 RMD160 7a8152e77ec1e0be1746d46a776b9648b23454e2 SHA1 5b0485f75899b16dfc103b6586a7aa3d498f5de9 SHA256 520cfbb8820383ae85596f765a9324d01f8da63cd2b919fedba9fa6978d13f89
 MISC ChangeLog 1863 RMD160 fab72379e4066331f87d12205d4847e5251e6703 SHA1 c889f029066e67a34207eaae3086e874bb98e420 SHA256 04b4c9b7edfa7197a1f5776d01a11ec0f19528b09c6b8f6997b00bee9cc423db
 MISC metadata.xml 872 RMD160 aef8847644f734faba3b42b9028690664612c8e6 SHA1 4686ca608887e1d9fea6ee4e11f4aa54c8eff150 SHA256 43da74dcf0ae13eb0987c33f397a9b9d7abe187196107d50814a3104466b90ee
+MISC scilab_5.2.1-3.diff.gz 34656 RMD160 5200c87d993eae92ff05fba3794adab7df0f2cde SHA1 83a00e4397c23fe4102487d79d9a72a50c45ef30 SHA256 f93cbc77d79a4b9448636bf1baf08ef6d8efa8a5861b0b4250d86a7d58b9e029
diff --git a/sci-mathematics/scilab/files/full_support.diff b/sci-mathematics/scilab/files/full_support.diff
new file mode 100644
index 000000000..9d7554e8c
--- /dev/null
+++ b/sci-mathematics/scilab/files/full_support.diff
@@ -0,0 +1,24 @@
+commit 409faec413e7491450f51059af02b0469cbb01eb
+Author: Sylvestre Ledru <sylvestre.ledru@scilab.org>
+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="ppc"
+ 						;;
+-					"alpha")  
++					"alpha")
+ 						proc="alpha"
+ 						;;
++					"sparc64")
++						proc="sparc"
++						;;
+ 					*)
+ 						echo "Could not find the Java configuration for the model <${MODEL}>. Please contact us."
+ 						;;
diff --git a/sci-mathematics/scilab/files/renesas-sh.diff b/sci-mathematics/scilab/files/renesas-sh.diff
new file mode 100644
index 000000000..7aa655fe6
--- /dev/null
+++ b/sci-mathematics/scilab/files/renesas-sh.diff
@@ -0,0 +1,34 @@
+commit 9586bf474819f11734927d5138056c0c837b9bdb
+Author: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+Date:   Fri Feb 19 23:44:51 2010 +0100
+
+    Support of Renesas SH(sh4)
+
+diff --git a/scilab/bin/scilab b/scilab/bin/scilab
+index 7ec4bbc..f453f9a 100755
+--- a/scilab/bin/scilab
++++ b/scilab/bin/scilab
+@@ -377,6 +377,9 @@ fi
+ 					"sparc64")
+ 						proc="sparc"
+ 						;;
++					sh*)
++						proc="sh"
++						;;
+ 					*)
+ 						echo "Could not find the Java configuration for the model <${MODEL}>. Please contact us."
+ 						;;
+diff --git a/scilab/m4/java.m4 b/scilab/m4/java.m4
+index 469019b..918fbf7 100644
+--- a/scilab/m4/java.m4
++++ b/scilab/m4/java.m4
+@@ -446,6 +446,9 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
+ 		  s390x) # s390 arch can also returns s390x
+ 		  machine=s390
+ 		  ;;
++	    sh*)
++	  	  machine=sh
++		  ;;
+     esac
+ 
+ 	AC_MSG_LOG([Looking for JNI libs with $machine as machine hardware name])
diff --git a/sci-mathematics/scilab/files/sparc64.diff b/sci-mathematics/scilab/files/sparc64.diff
new file mode 100644
index 000000000..ab852d2ab
--- /dev/null
+++ b/sci-mathematics/scilab/files/sparc64.diff
@@ -0,0 +1,40 @@
+commit 82bc3daabc423d8fa472308ace64979587c80f92
+Author: Sylvestre Ledru <sylvestre.ledru@scilab.org>
+Date:   Fri Feb 19 12:08:35 2010 +0100
+
+    Support of Linux sparc64 (debian)
+
+diff --git a/scilab/m4/java.m4 b/scilab/m4/java.m4
+index 9b75699..469019b 100644
+--- a/scilab/m4/java.m4
++++ b/scilab/m4/java.m4
+@@ -433,7 +433,7 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
+ 		# Solaris 10 x86
+           machine=i386
+           ;;
+-		sun*)
++		sun*|sparc64)
+        # Sun
+           machine=sparc
+           ;;
+--- a/scilab/bin/scilab	2010-02-19 23:59:34.000000000 +0100
++++ b/scilab/bin/scilab	2010-02-20 00:00:23.000000000 +0100
+@@ -374,6 +374,9 @@
+ 					"alpha")  
+ 						proc="alpha"
+ 						;;
++					"sparc64")
++						proc="sparc"
++						;;
+ 					*)
+ 						echo "Could not find the Java configuration for the model <${MODEL}>. Please contact us."
+ 						;;
+@@ -392,7 +395,7 @@
+ 						proc="i386"
+ 						;;
+ 				# check for the 64 bits syntax
+-					"sparc")
++					"sparc"|"sparc64")
+ 						proc="sparc"
+ 						;;
+ 					*)
diff --git a/sci-mathematics/scilab/scilab-5.2.1.ebuild b/sci-mathematics/scilab/scilab-5.2.1.ebuild
new file mode 100644
index 000000000..35738ced2
--- /dev/null
+++ b/sci-mathematics/scilab/scilab-5.2.1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+inherit eutils autotools java-pkg-2 check-reqs
+
+DESCRIPTION="Scientific software package for numerical computations"
+LICENSE="CeCILL-2"
+SRC_URI="http://www.scilab.org/download/${PV}/${P}-src.tar.gz"
+HOMEPAGE="http://www.scilab.org/"
+
+SLOT="0"
+IUSE="doc fftw +gui hdf5 +matio nls tk +umfpack xcos"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="virtual/lapack
+	tk? ( dev-lang/tk )
+	xcos? ( dev-lang/ocaml )
+	umfpack? ( sci-libs/umfpack )
+	gui? ( >=virtual/jre-1.5
+		dev-java/commons-logging
+		dev-java/flexdock
+		dev-java/gluegen
+		dev-java/jeuclid-core
+		dev-java/jlatexmath
+		dev-java/jgraphx
+		dev-java/jogl
+		dev-java/jgoodies-looks
+		dev-java/skinlf
+		dev-java/jrosetta
+		dev-java/javahelp
+		hdf5? ( dev-java/hdf-java ) )
+	fftw? ( sci-libs/fftw:3.0 )
+	matio? ( sci-libs/matio )
+	hdf5? ( sci-libs/hdf5 )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? (
+		~dev-java/saxon-6.5.5
+		dev-java/fop
+		dev-java/batik
+		app-text/docbook-xsl-stylesheets )"
+
+pkg_setup() {
+	CHECKREQS_MEMORY="512"
+	java-pkg-2_pkg_setup
+}
+
+src_prepare() {
+	# avoid redefinition of exp10
+	epatch "${FILESDIR}"/${PN}-5.2.0-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
+	# 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
+
+	# apply blindly some debian patches
+	for i in "${FILESDIR}"/*.diff; do
+		epatch ${i}
+	done
+
+	# add the correct java directories to the config file
+	sed \
+		-i "/^.DEFAULT_JAR_DIR/{s|=.*|=\"$(echo $(ls -d /usr/share/*/lib))\"|}" \
+		m4/java.m4 || die
+
+	sed -i "s|-L\$SCI_SRCDIR/bin/|-L\$SCI_SRCDIR/bin/ \
+		-L$(java-config -i gluegen) \
+		-L$(java-config -i hdf-java) \
+		-L$(java-config -i jogl)|" \
+		configure.ac || die
+	sed -i \
+		-e "/<\/librarypaths>/i\<path value=\"$(java-config -i gluegen)\"\/>" \
+		-e "/<\/librarypaths>/i\<path value=\"$(java-config -i jogl)\"\/>" \
+		-e "/<\/librarypaths>/i\<path value=\"$(java-config -i hdf-java)\"\/>" \
+		etc/librarypath.xml || die
+	eautoreconf
+	java-pkg-2_src_prepare
+}
+
+src_configure() {
+	local myopts
+	use doc && myopts="--with-docbook=/usr/share/sgml/docbook/xsl-stylesheets"
+	export JAVA_HOME=$(java-config -O)
+	export BLAS_LIBS="$(pkg-config --libs blas)"
+	export LAPACK_LIBS="$(pkg-config --libs lapack)"
+	# mpi is only used for hdf5 i/o
+	if use hdf5 && has_version sci-libs/hdf5[mpi]; then
+		export CC=mpicc
+		export CXX=mpicxx
+		export FC=mpif90
+		export F77=mpif77
+	fi
+	econf \
+		--disable-rpath \
+		--without-pvm \
+		$(use_enable doc build-help) \
+		$(use_enable nls) \
+		$(use_enable nls build-localization) \
+		$(use_with fftw) \
+		$(use_with gui)\
+		$(use_with gui javasci)\
+		$(use_with hdf5) \
+		$(use_with matio) \
+		$(use_with umfpack) \
+		$(use_with tk) \
+		$(use_with xcos scicos) \
+		${myopts}
+}
+
+src_compile() {
+	emake || die "emake failed"
+	if use doc; then
+		emake doc || die "emake failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# install docs
+	dodoc ACKNOWLEDGEMENTS CHANGES README_Unix RELEASE_NOTES \
+		Readme_Visual.txt || die "failed to install docs"
+
+	#install icon
+	newicon icons/scilab.xpm scilab.xpm
+	make_desktop_entry ${PN} "Scilab" ${PN}
+}
+
+pkg_postinst() {
+	einfo "To tell Scilab about your printers, set the environment"
+	einfo "variable PRINTERS in the form:"
+	einfo
+	einfo "PRINTERS=\"firstPrinter:secondPrinter:anotherPrinter\""
+}