Added patch to fix TEXTREL in libjavasci.so and removed deprecated tcltk USE flag

(Portage version: 2.1.2_rc2-r1)

3 files changed, 34 insertions, 7 deletions

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 33ac227c0d57..a145a84e1dcd 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/scilab
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/ChangeLog,v 1.26 2006/11/06 03:57:08 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/ChangeLog,v 1.27 2006/11/22 03:23:20 markusle Exp $
+
+  22 Nov 2006; Markus Dittrich <markusle@gentoo.org>
+  +files/scilab-4.0-java-pic.patch, scilab-4.0.ebuild:
+  Added patch to fix TEXTREL in libjavasci.so and removed deprecated
+  tcltk USE flag.
 
   06 Nov 2006; Markus Dittrich <markusle@gentoo.org> scilab-4.0.ebuild:
   Added missing java dependency and inherited java-pkg-opt-2 eclass 
diff --git a/sci-mathematics/scilab/files/scilab-4.0-java-pic.patch b/sci-mathematics/scilab/files/scilab-4.0-java-pic.patch
new file mode 100644
index 000000000000..390ce9d0b3ec
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-4.0-java-pic.patch
@@ -0,0 +1,21 @@
+diff -Naur scilab-4.0/routines/Javasci/Makefile.in scilab-4.0-new/routines/Javasci/Makefile.in
+--- scilab-4.0/routines/Javasci/Makefile.in	2006-01-28 10:27:50.000000000 -0500
++++ scilab-4.0-new/routines/Javasci/Makefile.in	2006-11-21 21:27:59.000000000 -0500
+@@ -13,7 +13,7 @@
+ OBJSC=  javasci_SciStringArray.o javasci_globals.o javasci_Scilab.o javasci_SciDoubleArray.o @GCCFIX@
+ OBJSF =
+ OBJS = $(OBJSC)
+-CFLAGS = $(CC_OPTIONS) $(JAVAINC)
++CFLAGS = $(CC_OPTIONS) -fPIC $(JAVAINC)
+ FLIBS=@FLIBS@
+ 
+ include ../../Makefile.incl
+diff -Naur scilab-4.0/routines/Javasci/Makefile.linux scilab-4.0-new/routines/Javasci/Makefile.linux
+--- scilab-4.0/routines/Javasci/Makefile.linux	2005-05-23 07:22:17.000000000 -0400
++++ scilab-4.0-new/routines/Javasci/Makefile.linux	2006-11-21 21:27:14.000000000 -0500
+@@ -4,4 +4,4 @@
+ 	@echo Creation of $(LIBRARY)
+ 	@$(RM) $@;
+ 	@echo "linking";
+-	@$(FC) -Wl,-shared -g -o $@ $(OBJS) $(DEFAULTS) $(LIBR) $(TCLTK_LIBS) $(XLIBS) $(TERMCAPLIB);
++	@$(CC) -shared -o $@ $(OBJS) $(TCLTK_LIBS) $(XLIBS) $(TERMCAPLIB);
diff --git a/sci-mathematics/scilab/scilab-4.0.ebuild b/sci-mathematics/scilab/scilab-4.0.ebuild
index 0398122b745f..0813f67f3270 100644
--- a/sci-mathematics/scilab/scilab-4.0.ebuild
+++ b/sci-mathematics/scilab/scilab-4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-4.0.ebuild,v 1.7 2006/11/06 03:57:08 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-4.0.ebuild,v 1.8 2006/11/22 03:23:20 markusle Exp $
 
 inherit eutils fortran toolchain-funcs multilib autotools java-pkg-opt-2
 
@@ -10,7 +10,7 @@ SRC_URI="http://scilabsoft.inria.fr/download/stable/${P}-src.tar.gz"
 HOMEPAGE="http://www.scilab.org/"
 
 SLOT="0"
-IUSE="ocaml tcltk gtk Xaw3d java"
+IUSE="ocaml tk gtk Xaw3d java"
 KEYWORDS="~x86 ~ppc"
 
 RDEPEND="virtual/blas
@@ -25,7 +25,7 @@ RDEPEND="virtual/blas
 		x11-libs/vte
 		=gnome-extra/gtkhtml-2*
 	)
-	tcltk? ( >=dev-lang/tk-8.4
+	tk? ( >=dev-lang/tk-8.4
 		>=dev-lang/tcl-8.4 )
 	Xaw3d? ( x11-libs/Xaw3d )
 	ocaml? ( dev-lang/ocaml )
@@ -35,9 +35,9 @@ DEPEND="${RDEPEND}
 	app-text/sablotron"
 
 pkg_setup() {
-	if ! use gtk && ! use tcltk; then
+	if ! use gtk && ! use tk; then
 		echo
-		eerror 'scilab must be built with either USE="gtk" or USE="tcltk"'
+		eerror 'scilab must be built with either USE="gtk" or USE="tk"'
 		die
 	fi
 	java-pkg-opt-2_pkg_setup
@@ -51,6 +51,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-makefile.patch
 	epatch "${FILESDIR}"/${P}-gtk-fix.patch
 	epatch "${FILESDIR}"/${P}-configure-gfortran.patch
+	epatch "${FILESDIR}"/${P}-java-pic.patch
 
 	# fix gfortran problems on ppc
 	if [[ "${ARCH}" == "ppc" ]];then
@@ -80,7 +81,7 @@ src_compile() {
 		myopts="${myopts} --with-gfortran"
 	fi
 
-	econf $(use_with tcltk tk) \
+	econf $(use_with tk) \
 		$(use_with Xaw3d xaw3d) \
 		$(use_with gtk gtk2 ) \
 		$(use_with ocaml) \