Version bump (see bug #206607).

(Portage version: 2.1.4)

5 files changed, 145 insertions, 27 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/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 ) \