summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Dittrich <markusle@gentoo.org>2007-05-30 12:52:45 +0000
committerMarkus Dittrich <markusle@gentoo.org>2007-05-30 12:52:45 +0000
commitacdcab00482dfd7660e90d18422ca3142e140759 (patch)
treed180a795329fae67846338a2e9b1c7054e21c5e6 /sci-mathematics/scilab
parentalpha/ia64 stable wrt #171107 (diff)
downloadgentoo-2-acdcab00482dfd7660e90d18422ca3142e140759.tar.gz
gentoo-2-acdcab00482dfd7660e90d18422ca3142e140759.tar.bz2
gentoo-2-acdcab00482dfd7660e90d18422ca3142e140759.zip
configure with tcl/tk by default to avoid strange crashes using the gtk interface (see bug #167698).
(Portage version: 2.1.2.7)
Diffstat (limited to 'sci-mathematics/scilab')
-rw-r--r--sci-mathematics/scilab/ChangeLog6
-rw-r--r--sci-mathematics/scilab/scilab-4.1.1.ebuild28
2 files changed, 13 insertions, 21 deletions
diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index fa4723207d42..ae08761ea90e 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-mathematics/scilab
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/ChangeLog,v 1.37 2007/05/23 01:37:54 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/ChangeLog,v 1.38 2007/05/30 12:52:45 markusle Exp $
+
+ 30 May 2007; Markus Dittrich <markusle@gentoo.org> scilab-4.1.1.ebuild:
+ configure with tcl/tk by default to avoid strange crashes using
+ the gtk interface (see bug #167698).
23 May 2007; Markus Dittrich <markusle@gentoo.org> scilab-4.1.1.ebuild:
Fixed improper SCR_URI.
diff --git a/sci-mathematics/scilab/scilab-4.1.1.ebuild b/sci-mathematics/scilab/scilab-4.1.1.ebuild
index 9992ad4e8585..0f0e678f1a15 100644
--- a/sci-mathematics/scilab/scilab-4.1.1.ebuild
+++ b/sci-mathematics/scilab/scilab-4.1.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-4.1.1.ebuild,v 1.2 2007/05/23 01:37:54 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-4.1.1.ebuild,v 1.3 2007/05/30 12:52:45 markusle Exp $
inherit eutils fortran toolchain-funcs multilib autotools java-pkg-opt-2
@@ -10,7 +10,7 @@ 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
@@ -24,8 +24,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 )"
@@ -34,20 +34,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
}
@@ -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 ) \