summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-mathematics')
-rw-r--r--sci-mathematics/scilab/ChangeLog6
-rw-r--r--sci-mathematics/scilab/files/gzvt2-add-gtk2-flags.patch14
-rw-r--r--sci-mathematics/scilab/scilab-3.1.1-r3.ebuild8
3 files changed, 24 insertions, 4 deletions
diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 9023c6b0f5fc..54a6142f6c2c 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -1,6 +1,10 @@
# 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.15 2006/01/12 23:21:04 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/ChangeLog,v 1.16 2006/01/19 20:23:51 spyderous Exp $
+
+ 19 Jan 2006; Donnie Berkholz <spyderous@gentoo.org>;
+ +files/gzvt2-add-gtk2-flags.patch, scilab-3.1.1-r3.ebuild:
+ Fix modular X deps. Also fix gtk compilation.
12 Jan 2006; Saleem Abdulrasool <compnerd@gentoo.org> scilab-3.1.1.ebuild,
scilab-3.1.1-r1.ebuild, scilab-3.1.1-r2.ebuild, scilab-3.1.1-r3.ebuild:
diff --git a/sci-mathematics/scilab/files/gzvt2-add-gtk2-flags.patch b/sci-mathematics/scilab/files/gzvt2-add-gtk2-flags.patch
new file mode 100644
index 000000000000..63abe112f670
--- /dev/null
+++ b/sci-mathematics/scilab/files/gzvt2-add-gtk2-flags.patch
@@ -0,0 +1,14 @@
+diff -urN scilab-3.1.1.orig/routines/gzvt2/Makefile.in scilab-3.1.1/routines/gzvt2/Makefile.in
+--- scilab-3.1.1.orig/routines/gzvt2/Makefile.in 2004-10-05 13:45:17.000000000 -0700
++++ scilab-3.1.1/routines/gzvt2/Makefile.in 2006-01-18 17:24:20.000000000 -0800
+@@ -5,8 +5,8 @@
+
+ ZTERM_LDFLAGS= `pkg-config libzvt-2.0 --cflags --libs` -DHAS_I18N
+ ZTERM_CFLAGS= `pkg-config libzvt-2.0 --cflags ` -DHAS_I18N
+-VTE_LDFLAGS= `pkg-config vte --cflags --libs`
+-VTE_CFLAGS= `pkg-config vte --cflags`
++VTE_LDFLAGS= `pkg-config vte --cflags --libs` `pkg-config gtk+-2.0 --cflags --libs`
++VTE_CFLAGS= `pkg-config vte --cflags` `pkg-config gtk+-2.0 --cflags`
+
+ TERM_NAME=@TERM_NAME@
+ LDFLAGS=$(@TERM_LDFLAGS@)
diff --git a/sci-mathematics/scilab/scilab-3.1.1-r3.ebuild b/sci-mathematics/scilab/scilab-3.1.1-r3.ebuild
index 2a5a24ca9574..01ab00c94d6b 100644
--- a/sci-mathematics/scilab/scilab-3.1.1-r3.ebuild
+++ b/sci-mathematics/scilab/scilab-3.1.1-r3.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-3.1.1-r3.ebuild,v 1.2 2006/01/12 23:21:04 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-3.1.1-r3.ebuild,v 1.3 2006/01/19 20:23:51 spyderous Exp $
inherit eutils fortran
@@ -13,8 +13,7 @@ SLOT="0"
IUSE="ifc ocaml tcltk gtk Xaw3d"
KEYWORDS="~x86 ~ppc"
-RDEPEND="virtual/x11
- virtual/blas
+RDEPEND="virtual/blas
virtual/lapack
sys-libs/ncurses
gtk? (
@@ -54,6 +53,9 @@ src_unpack() {
# fix scilab script causing problems (#67905)
# epatch ${FILESDIR}/${P}-initialization.patch
+
+ # Doesn't include the directories etc for gtk
+ epatch ${FILESDIR}/gzvt2-add-gtk2-flags.patch
}
src_compile() {