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

Package-Manager: portage-2.1.2_rc2-r1

4 files changed, 46 insertions, 15 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/Manifest b/sci-mathematics/scilab/Manifest
index b9c342e6aa9d..bf2c93edcc37 100644
--- a/sci-mathematics/scilab/Manifest
+++ b/sci-mathematics/scilab/Manifest
@@ -14,6 +14,10 @@ AUX scilab-4.0-gtk-fix.patch 929 RMD160 d0b3c0c754431bdd33d41b632eee1af1ab3c18e3
 MD5 1dd4d3fc3ec5b288b97af902e80ca108 files/scilab-4.0-gtk-fix.patch 929
 RMD160 d0b3c0c754431bdd33d41b632eee1af1ab3c18e3 files/scilab-4.0-gtk-fix.patch 929
 SHA256 25ef3f5dacfb91adb3d239855d7f32655a554b21608a4b485bf2bf3937ae6b85 files/scilab-4.0-gtk-fix.patch 929
+AUX scilab-4.0-java-pic.patch 1043 RMD160 f2ed47ba39d1b14de6989be031538a3fc1714738 SHA1 3ccef391768812d3a0676684aeeabb45ba9d75f6 SHA256 258c7db3f8350251c1973f950c26a790496fb13c44d9a6b70e13a066c5b6465a
+MD5 2d9c30df2fabaf601cce029ce0b32931 files/scilab-4.0-java-pic.patch 1043
+RMD160 f2ed47ba39d1b14de6989be031538a3fc1714738 files/scilab-4.0-java-pic.patch 1043
+SHA256 258c7db3f8350251c1973f950c26a790496fb13c44d9a6b70e13a066c5b6465a files/scilab-4.0-java-pic.patch 1043
 AUX scilab-4.0-makefile.patch 1190 RMD160 62627b2736ccf8ad7e56f11331bdb8540c5c0ced SHA1 bbff9699c62ee624848e6cd6e1f74d66c7a9d4d8 SHA256 6f552482a5933103133b1e9245166a6d23478fffe57cccac2166f2889cff140f
 MD5 49fb9cb0862b4d8eceb2b45fb1abde18 files/scilab-4.0-makefile.patch 1190
 RMD160 62627b2736ccf8ad7e56f11331bdb8540c5c0ced files/scilab-4.0-makefile.patch 1190
@@ -34,14 +38,14 @@ EBUILD scilab-3.1.1-r3.ebuild 4876 RMD160 61a58eae2dff32abab4e07a5f0049d7234bc8e
 MD5 88fe35577e6d544b620686c4cca653e9 scilab-3.1.1-r3.ebuild 4876
 RMD160 61a58eae2dff32abab4e07a5f0049d7234bc8e76 scilab-3.1.1-r3.ebuild 4876
 SHA256 7fdc8b7a28ea71b962d503ab8125241ed7e3ceb531cab4b1d3329510e911c03e scilab-3.1.1-r3.ebuild 4876
-EBUILD scilab-4.0.ebuild 3919 RMD160 24f0ac4f9e2b7bf1112a4358308c9c761089cdd5 SHA1 7c6ff63743b343003317ec6770e0f75fdafea649 SHA256 6f25940a612cc068d4c3f9d891a27bf61486ec1fabb5cacd0524acb20ca4cc5a
-MD5 5e204dcb2cd68226ffbc9e0539cf32a5 scilab-4.0.ebuild 3919
-RMD160 24f0ac4f9e2b7bf1112a4358308c9c761089cdd5 scilab-4.0.ebuild 3919
-SHA256 6f25940a612cc068d4c3f9d891a27bf61486ec1fabb5cacd0524acb20ca4cc5a scilab-4.0.ebuild 3919
-MISC ChangeLog 8036 RMD160 846519f4f1d7a8301be42f40ac22b6fc8568f40b SHA1 23a606a662f4f544d34970fbec22d0d5cb4851c1 SHA256 463fd3ef98c523c6f6d1b9b547b5bd8095396638c137de826c4053d60f25776e
-MD5 37865fc7b0cddb37d8df838f0c48d220 ChangeLog 8036
-RMD160 846519f4f1d7a8301be42f40ac22b6fc8568f40b ChangeLog 8036
-SHA256 463fd3ef98c523c6f6d1b9b547b5bd8095396638c137de826c4053d60f25776e ChangeLog 8036
+EBUILD scilab-4.0.ebuild 3943 RMD160 5665ab3953e68d86f19bab33cb18cda0a7c32716 SHA1 7adcb9fa6627db2eb4d5e9606217a29b435fad75 SHA256 b105c1f926b001ac7cc3bcde290551cadf67b5f2d460684b7259fee84e5659c4
+MD5 2a18cf913c5320ead04c7b96c8f45b20 scilab-4.0.ebuild 3943
+RMD160 5665ab3953e68d86f19bab33cb18cda0a7c32716 scilab-4.0.ebuild 3943
+SHA256 b105c1f926b001ac7cc3bcde290551cadf67b5f2d460684b7259fee84e5659c4 scilab-4.0.ebuild 3943
+MISC ChangeLog 8232 RMD160 066dfc75d38c4afcff5d2a41fe841b1c50e7a864 SHA1 7cb542e7d94ad183d646ec3843a79c3dc9cb1d77 SHA256 973c362666ea9fb70f8779e46f4232ad200a06ad8000df8eb847af11bacfca4c
+MD5 f8c679fae442a2db04de8c0f9009041e ChangeLog 8232
+RMD160 066dfc75d38c4afcff5d2a41fe841b1c50e7a864 ChangeLog 8232
+SHA256 973c362666ea9fb70f8779e46f4232ad200a06ad8000df8eb847af11bacfca4c ChangeLog 8232
 MISC metadata.xml 168 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 SHA1 95c9e4f7368f82053d631bbcd469612c92ca13cb SHA256 c0cc8d6ab9385750af753ddc504299ed90a70b5c4c655f6c77d865917a8829c9
 MD5 30bc69a424d7634aae9c1e4203365d3d metadata.xml 168
 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 metadata.xml 168
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) \