Version bump (see bug #206607).

Package-Manager: portage-2.1.4

6 files changed, 161 insertions, 39 deletions

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 7c486a420c5d..3464c2c5036e 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/scilab
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/ChangeLog,v 1.40 2008/01/09 03:04:10 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/ChangeLog,v 1.41 2008/01/19 13:00:52 markusle Exp $
+
+*scilab-4.1.2 (19 Jan 2008)
+
+  19 Jan 2008; Markus Dittrich <markusle@gentoo.org> -scilab-4.1.ebuild,
+  +scilab-4.1.2.ebuild, +files/scilab-4.1.2-header-fix.patch:
+  Version bump (see bug #206607).
 
   09 Jan 2008; Markus Dittrich <markusle@gentoo.org>
   files/scilab-4.1-header-fix.patch:
diff --git a/sci-mathematics/scilab/Manifest b/sci-mathematics/scilab/Manifest
index 4b8d8bb172ec..a0962fb70e1a 100644
--- a/sci-mathematics/scilab/Manifest
+++ b/sci-mathematics/scilab/Manifest
@@ -26,13 +26,17 @@ AUX scilab-4.1-java-pic.patch 1604 RMD160 cae9bd8923f69af53ef11de0301323d8964e13
 MD5 835a377fad618813b876945be09f433b files/scilab-4.1-java-pic.patch 1604
 RMD160 cae9bd8923f69af53ef11de0301323d8964e135a files/scilab-4.1-java-pic.patch 1604
 SHA256 eab86feade8002a9edf2701b820847420b1ade7bcf96bb909e2a09b39850dd91 files/scilab-4.1-java-pic.patch 1604
+AUX scilab-4.1.2-header-fix.patch 4240 RMD160 33941b2da653b0b4579fc6e3e01a55f2b87248a4 SHA1 24a7946359679785634257ae9bfd8fe03b5c5eea SHA256 1f103b1e08068cd9c813dd5f0f067ab0430ff6a4e608603fd2bf1f07adc5556b
+MD5 07cba7a603be239f4cbdde6312d15c17 files/scilab-4.1.2-header-fix.patch 4240
+RMD160 33941b2da653b0b4579fc6e3e01a55f2b87248a4 files/scilab-4.1.2-header-fix.patch 4240
+SHA256 1f103b1e08068cd9c813dd5f0f067ab0430ff6a4e608603fd2bf1f07adc5556b files/scilab-4.1.2-header-fix.patch 4240
 AUX scilab-ppc-gcc4.patch 1045 RMD160 db4219fc04b5555e702d823425735125f3000c00 SHA1 ba001966a62202f66188ba4be1abe483f56f8fbe SHA256 0844c4edad45ba23219b8d3405104a8bbb2b45e2b7b742f7aaeb10ce5e92388a
 MD5 d64e32c9d98d776a5bdce28e6044cff4 files/scilab-ppc-gcc4.patch 1045
 RMD160 db4219fc04b5555e702d823425735125f3000c00 files/scilab-ppc-gcc4.patch 1045
 SHA256 0844c4edad45ba23219b8d3405104a8bbb2b45e2b7b742f7aaeb10ce5e92388a files/scilab-ppc-gcc4.patch 1045
 DIST scilab-4.0-src.tar.gz 12523941 RMD160 13e8637b0793650b0dd2ae07ccaa6bbbff62375c SHA1 841dfe0837cd44a0608e70fe2c49023312481fd0 SHA256 e0f0e784909020c34c4512cf34f946373950cb5f8ee5499a16af73880189d41d
-DIST scilab-4.1-src.tar.gz 13164450 RMD160 6ed27ce7dcfb9231b5f3042cb7b830015d102df7 SHA1 7a8381a9a69ce280ae718ee59f4c14001b61f4b7 SHA256 e2b36f6095b824feec3489c30f640bd809b3dc55bd5487319cbd641ac14fac80
 DIST scilab-4.1.1-src.tar.gz 13169479 RMD160 88183ee594c46ba305c402d4c9208a5003e2fea2 SHA1 c256b5c8fd4a7f282d39b2aaa46dc6cbe3357192 SHA256 846aad84544bcacfcc10bd1a5065afd430be74dac98f1d73c54e2bc54d070af4
+DIST scilab-4.1.2-src.tar.gz 15892277 RMD160 f708b966143ccbf989f7a0dbed95e4dab324e66f SHA1 d3f3190bd11fe23eebec03fe9feaced0406ddfe3 SHA256 4c0318a316c62a1206e53b936bbb1262d940e390c1d14da77c231e49b134b3a9
 EBUILD scilab-4.0.ebuild 3941 RMD160 9f705662d5d3bf92e2447a94cffb906030312653 SHA1 0f9f7d8ecb51cce7013645746c7600da72cd31a6 SHA256 2074dd1e6259a4a0d1b3f8e232cd43ae6dd5d03b8284a3ec3098ed82d51c8005
 MD5 9a27eb33f9a7c9d025bb7f6fef7e0728 scilab-4.0.ebuild 3941
 RMD160 9f705662d5d3bf92e2447a94cffb906030312653 scilab-4.0.ebuild 3941
@@ -41,14 +45,14 @@ EBUILD scilab-4.1.1.ebuild 4067 RMD160 722af7d046c034007ae76258f2136bf584a2bd8d
 MD5 8a418cee759dd3ad985912d2bb664ca6 scilab-4.1.1.ebuild 4067
 RMD160 722af7d046c034007ae76258f2136bf584a2bd8d scilab-4.1.1.ebuild 4067
 SHA256 ec8145c13275816a050fab900430b9d51312f8fac108ce794171c565ac3f4f26 scilab-4.1.1.ebuild 4067
-EBUILD scilab-4.1.ebuild 4338 RMD160 cfc6af6bc3eace0292e68c1d5089d1dd781effcf SHA1 8a0eae72c844d7209cd13534b7a32510f72185e9 SHA256 0521f9038b08d81ae71df9880a22f3b592d0011c9a78e5391515e18b5cb27081
-MD5 d4259d6aee16f11d5d9e03dc10c5bd04 scilab-4.1.ebuild 4338
-RMD160 cfc6af6bc3eace0292e68c1d5089d1dd781effcf scilab-4.1.ebuild 4338
-SHA256 0521f9038b08d81ae71df9880a22f3b592d0011c9a78e5391515e18b5cb27081 scilab-4.1.ebuild 4338
-MISC ChangeLog 10156 RMD160 618223a1013e8ea470f867987d591d2d39aaa8c9 SHA1 c8eb7e979b34e8131180c32cc54a40cffa888be6 SHA256 a2c008e29c5cf4a650b39775e9418a2f3e3c8efc3424b92305416afeb6e06326
-MD5 8f6bcdb837f8ab614e068f66158bddbe ChangeLog 10156
-RMD160 618223a1013e8ea470f867987d591d2d39aaa8c9 ChangeLog 10156
-SHA256 a2c008e29c5cf4a650b39775e9418a2f3e3c8efc3424b92305416afeb6e06326 ChangeLog 10156
+EBUILD scilab-4.1.2.ebuild 4062 RMD160 a139ea6fe65bb99fac5b3c40bf81c1093a6fc863 SHA1 07ecdc12526a3cb332a3cd6302006eab2d77bbab SHA256 e801e89404443c3497eabd0ac33c3defd77e3486b00ab3b3719ff5f60ec2df8f
+MD5 4f3f3b0479ef3195bc7545d467a61b29 scilab-4.1.2.ebuild 4062
+RMD160 a139ea6fe65bb99fac5b3c40bf81c1093a6fc863 scilab-4.1.2.ebuild 4062
+SHA256 e801e89404443c3497eabd0ac33c3defd77e3486b00ab3b3719ff5f60ec2df8f scilab-4.1.2.ebuild 4062
+MISC ChangeLog 10355 RMD160 2c4a986a4a2fe83d9f76d8961d11dec4059f0755 SHA1 756c3db2ea35dab64ef4ddf4551eda0ab6381bf9 SHA256 e49e0c892671460b89a4a4bf69165647e1c1504668c131c660f3a63ea25c5ff8
+MD5 ad857f08184ab422379f45d574c2d0bb ChangeLog 10355
+RMD160 2c4a986a4a2fe83d9f76d8961d11dec4059f0755 ChangeLog 10355
+SHA256 e49e0c892671460b89a4a4bf69165647e1c1504668c131c660f3a63ea25c5ff8 ChangeLog 10355
 MISC metadata.xml 168 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 SHA1 95c9e4f7368f82053d631bbcd469612c92ca13cb SHA256 c0cc8d6ab9385750af753ddc504299ed90a70b5c4c655f6c77d865917a8829c9
 MD5 30bc69a424d7634aae9c1e4203365d3d metadata.xml 168
 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 metadata.xml 168
@@ -56,9 +60,9 @@ SHA256 c0cc8d6ab9385750af753ddc504299ed90a70b5c4c655f6c77d865917a8829c9 metadata
 MD5 942cb58288349d75fab903ad93a89e78 files/digest-scilab-4.0 250
 RMD160 f4ee6ebd8218d59dd40f0a904b4dcfd5170a54a4 files/digest-scilab-4.0 250
 SHA256 f0a3368ccf9db2d8654c3f0b5ec04a19b9ecabba49457d9f604f18293525b708 files/digest-scilab-4.0 250
-MD5 896b9796fcade4723a92c36dc4342ce7 files/digest-scilab-4.1 250
-RMD160 fb7e90d63fc7dd02199f9a5bc37fd63b4bc968c4 files/digest-scilab-4.1 250
-SHA256 3a373162c4fe7864565f76765e7b337b576455febe70d6d5c418601eedb3fd9a files/digest-scilab-4.1 250
 MD5 c481361c86f7ec45b73d8bc29e2054d1 files/digest-scilab-4.1.1 256
 RMD160 a3aa74961386659cc3ead6fd0a8bfe3a64fd5af9 files/digest-scilab-4.1.1 256
 SHA256 712c982c603987893c610b10c52d9bd42f3d6ee5130aa33f961a65569a6816a0 files/digest-scilab-4.1.1 256
+MD5 b40a4e5e6ac53a7180a042a03e192b77 files/digest-scilab-4.1.2 256
+RMD160 51e3647ebef744dc6f44cfd3f233e4d17f576c90 files/digest-scilab-4.1.2 256
+SHA256 aab421c43d24f633f7a4add29d23de9058996aafe8557b89ce8b6d98fa0fb74e files/digest-scilab-4.1.2 256
diff --git a/sci-mathematics/scilab/files/digest-scilab-4.1 b/sci-mathematics/scilab/files/digest-scilab-4.1
deleted file mode 100644
index fdf7c7d568df..000000000000
--- a/sci-mathematics/scilab/files/digest-scilab-4.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3003fe63088558b931a11127fb8d8ccc scilab-4.1-src.tar.gz 13164450
-RMD160 6ed27ce7dcfb9231b5f3042cb7b830015d102df7 scilab-4.1-src.tar.gz 13164450
-SHA256 e2b36f6095b824feec3489c30f640bd809b3dc55bd5487319cbd641ac14fac80 scilab-4.1-src.tar.gz 13164450
diff --git a/sci-mathematics/scilab/files/digest-scilab-4.1.2 b/sci-mathematics/scilab/files/digest-scilab-4.1.2
new file mode 100644
index 000000000000..f1c0bca0c77e
--- /dev/null
+++ b/sci-mathematics/scilab/files/digest-scilab-4.1.2
@@ -0,0 +1,3 @@
+MD5 17a7a6aa52918f33d96777a0dc423658 scilab-4.1.2-src.tar.gz 15892277
+RMD160 f708b966143ccbf989f7a0dbed95e4dab324e66f scilab-4.1.2-src.tar.gz 15892277
+SHA256 4c0318a316c62a1206e53b936bbb1262d940e390c1d14da77c231e49b134b3a9 scilab-4.1.2-src.tar.gz 15892277
diff --git a/sci-mathematics/scilab/files/scilab-4.1.2-header-fix.patch b/sci-mathematics/scilab/files/scilab-4.1.2-header-fix.patch
new file mode 100644
index 000000000000..9b68e0268ea7
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-4.1.2-header-fix.patch
@@ -0,0 +1,124 @@
+diff -Naur scilab-4.1.2/pvm3/pvmgs/pvmgsu_aux.c scilab-4.1.2.new/pvm3/pvmgs/pvmgsu_aux.c
+--- scilab-4.1.2/pvm3/pvmgs/pvmgsu_aux.c	2002-10-14 10:28:41.000000000 -0400
++++ scilab-4.1.2.new/pvm3/pvmgs/pvmgsu_aux.c	2008-01-19 07:19:28.000000000 -0500
+@@ -53,6 +53,8 @@
+ #include "pvmgsd.h"
+ #include "pvmproto.h"
+ 
++#include <strings.h>
++
+ extern int pvm_errno;
+ extern int pvmmytid;
+ extern int pvmtoplvl;
+diff -Naur scilab-4.1.2/pvm3/src/hoster.c scilab-4.1.2.new/pvm3/src/hoster.c
+--- scilab-4.1.2/pvm3/src/hoster.c	2005-11-23 05:12:27.000000000 -0500
++++ scilab-4.1.2.new/pvm3/src/hoster.c	2008-01-19 07:19:28.000000000 -0500
+@@ -263,6 +263,7 @@
+ #include "bfunc.h"
+ #include <pvmtev.h>
+ #include "global.h"
++#include <unistd.h>
+ 
+ #ifdef IMA_BEOSCYLD
+ #include <string.h>
+diff -Naur scilab-4.1.2/pvm3/src/lpvm.c scilab-4.1.2.new/pvm3/src/lpvm.c
+--- scilab-4.1.2/pvm3/src/lpvm.c	2002-10-15 03:40:21.000000000 -0400
++++ scilab-4.1.2.new/pvm3/src/lpvm.c	2008-01-19 07:19:28.000000000 -0500
+@@ -607,6 +607,7 @@
+ #include "waitc.h"
+ #include "global.h"
+ #include "lmsg.h"
++#include "unistd.h"
+ 
+ #ifdef IMA_MPP
+ #include "pvmmimd.h"
+diff -Naur scilab-4.1.2/pvm3/tracer/cmd.c scilab-4.1.2.new/pvm3/tracer/cmd.c
+--- scilab-4.1.2/pvm3/tracer/cmd.c	2002-10-14 11:00:41.000000000 -0400
++++ scilab-4.1.2.new/pvm3/tracer/cmd.c	2008-01-19 07:19:28.000000000 -0500
+@@ -31,6 +31,8 @@
+ 
+ #include "trcglob.h"
+ 
++#include <stdlib.h>
++
+ #ifdef  SYSVSTR
+ #include <string.h>
+ #else
+diff -Naur scilab-4.1.2/pvm3/tracer/tracer.c scilab-4.1.2.new/pvm3/tracer/tracer.c
+--- scilab-4.1.2/pvm3/tracer/tracer.c	2002-10-14 11:00:41.000000000 -0400
++++ scilab-4.1.2.new/pvm3/tracer/tracer.c	2008-01-19 07:19:28.000000000 -0500
+@@ -31,6 +31,8 @@
+ 
+ #include "trcglob.h"
+ 
++#include <stdlib.h>
++
+ #ifdef NEEDSSELECTH 
+ #include <sys/select.h>
+ #endif
+diff -Naur scilab-4.1.2/pvm3/tracer/trccompat.c scilab-4.1.2.new/pvm3/tracer/trccompat.c
+--- scilab-4.1.2/pvm3/tracer/trccompat.c	2002-10-14 11:00:41.000000000 -0400
++++ scilab-4.1.2.new/pvm3/tracer/trccompat.c	2008-01-19 07:19:28.000000000 -0500
+@@ -28,6 +28,7 @@
+ /* Tracer Headers */
+ 
+ #include "trclib.h"
++#include <stdlib.h>
+ 
+ #include "trccompat.h"
+ 
+diff -Naur scilab-4.1.2/pvm3/tracer/trcsort.c scilab-4.1.2.new/pvm3/tracer/trcsort.c
+--- scilab-4.1.2/pvm3/tracer/trcsort.c	2002-10-15 08:09:48.000000000 -0400
++++ scilab-4.1.2.new/pvm3/tracer/trcsort.c	2008-01-19 07:19:28.000000000 -0500
+@@ -28,6 +28,7 @@
+ /* Tracer Headers */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
+diff -Naur scilab-4.1.2/pvm3/tracer/trcutil.c scilab-4.1.2.new/pvm3/tracer/trcutil.c
+--- scilab-4.1.2/pvm3/tracer/trcutil.c	2002-10-14 11:00:41.000000000 -0400
++++ scilab-4.1.2.new/pvm3/tracer/trcutil.c	2008-01-19 07:19:28.000000000 -0500
+@@ -26,6 +26,7 @@
+ 
+ 
+ #include "trclib.h"
++#include <stdlib.h>
+ 
+ #ifdef WIN32
+ #include <winsock.h>
+diff -Naur scilab-4.1.2/routines/graphics/Events.c scilab-4.1.2.new/routines/graphics/Events.c
+--- scilab-4.1.2/routines/graphics/Events.c	2007-09-10 03:52:29.000000000 -0400
++++ scilab-4.1.2.new/routines/graphics/Events.c	2008-01-19 07:19:28.000000000 -0500
+@@ -3,6 +3,7 @@
+  *    jpc@cermics.enpc.fr 
+  --------------------------------------------------------------------------*/
+ #include <stdio.h>
++#include <string.h>
+ #include "bcg.h"
+ 
+ typedef struct but
+diff -Naur scilab-4.1.2/routines/gzvt2/vte.c scilab-4.1.2.new/routines/gzvt2/vte.c
+--- scilab-4.1.2/routines/gzvt2/vte.c	2004-10-05 17:07:34.000000000 -0400
++++ scilab-4.1.2.new/routines/gzvt2/vte.c	2008-01-19 07:19:28.000000000 -0500
+@@ -23,6 +23,7 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <string.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ #include <gtk/gtk.h>
+ #include <gdk/gdkx.h>
+diff -Naur scilab-4.1.2/routines/scicos/scoWindowScope.c scilab-4.1.2.new/routines/scicos/scoWindowScope.c
+--- scilab-4.1.2/routines/scicos/scoWindowScope.c	2007-10-15 04:45:30.000000000 -0400
++++ scilab-4.1.2.new/routines/scicos/scoWindowScope.c	2008-01-19 07:20:15.000000000 -0500
+@@ -13,6 +13,7 @@
+ #include "scoGetProperty.h"
+ #include "scoSetProperty.h"
+ #include <stdio.h>
++#include <string.h>
+ 
+ void scoSetWindowIDInUserData(ScopeMemory * pScopeMemory,int block_number)
+ {
diff --git a/sci-mathematics/scilab/scilab-4.1.ebuild b/sci-mathematics/scilab/scilab-4.1.2.ebuild
index 78b5bee61a6f..15b394c2f402 100644
--- a/sci-mathematics/scilab/scilab-4.1.ebuild
+++ b/sci-mathematics/scilab/scilab-4.1.2.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-4.1.ebuild,v 1.7 2008/01/09 03:04:10 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-4.1.2.ebuild,v 1.1 2008/01/19 13:00:52 markusle Exp $
 
 inherit eutils fortran toolchain-funcs multilib autotools java-pkg-opt-2
 
 DESCRIPTION="Scientific software package for numerical computations (Matlab lookalike)"
 LICENSE="scilab"
-SRC_URI="http://scilabsoft.inria.fr/download/stable/${P}-src.tar.gz"
+SRC_URI="http://www.scilab.org/download/${PV}/${P}-src.tar.gz"
 HOMEPAGE="http://www.scilab.org/"
 
 SLOT="0"
-IUSE="ocaml tk gtk Xaw3d java"
+IUSE="ocaml gtk Xaw3d java"
 KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="virtual/blas
@@ -25,8 +25,8 @@ RDEPEND="virtual/blas
 		x11-libs/vte
 		=gnome-extra/gtkhtml-2*
 	)
-	tk? ( >=dev-lang/tk-8.4
-		>=dev-lang/tcl-8.4 )
+	>=dev-lang/tk-8.4
+	>=dev-lang/tcl-8.4
 	Xaw3d? ( x11-libs/Xaw3d )
 	ocaml? ( dev-lang/ocaml )
 	java? ( >=virtual/jdk-1.4 )"
@@ -35,20 +35,6 @@ DEPEND="${RDEPEND}
 	app-text/sablotron"
 
 pkg_setup() {
-	if ! use gtk && ! use tk; then
-		echo
-		eerror 'scilab must be built with either USE="gtk" or USE="tk"'
-		die
-	fi
-
-	if use gtk && use tk; then
-		echo
-		ewarn "You have selected both gtk and tk support which"
-		ewarn "are mutually exclusive. In this case, the gtk "
-		ewarn "interface will be built."
-		epause 5
-	fi
-
 	java-pkg-opt-2_pkg_setup
 	need_fortran gfortran g77
 }
@@ -58,9 +44,9 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${PN}-4.0-makefile.patch
-	epatch "${FILESDIR}"/${P}-java-pic.patch
+	epatch "${FILESDIR}"/${PN}-4.1-java-pic.patch
 	epatch "${FILESDIR}"/${P}-header-fix.patch
-	epatch "${FILESDIR}"/${P}-examples.patch
+	epatch "${FILESDIR}"/${PN}-4.1-examples.patch
 
 	sed -e '/^ATLAS_LAPACKBLAS\>/s,=.*,= $(ATLASDIR)/liblapack.so $(ATLASDIR)/libblas.so $(ATLASDIR)/libcblas.so,' \
 		-e 's,$(SCIDIR)/libs/lapack.a,,' \
@@ -94,12 +80,14 @@ src_compile() {
 	local myopts
 	myopts="${myopts} --with-atlas-library=/usr/$(get_libdir)"
 
+	# the tk interface is the default
+	myopts="${myopts} --with-tk"
+
 	if [[ ${FORTRANC} == gfortran ]]; then
 		myopts="${myopts} --with-gfortran"
 	fi
 
-	econf $(use_with tk) \
-		$(use_with Xaw3d xaw3d) \
+	econf $(use_with Xaw3d xaw3d) \
 		$(use_with gtk gtk2 ) \
 		$(use_with ocaml) \
 		$(use_with java ) \