Fix modular X deps. Also fix gtk compilation.

Package-Manager: portage-2.1_pre3-r1

4 files changed, 27 insertions, 6 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/Manifest b/sci-mathematics/scilab/Manifest
index dec492b7d251..7c56ec41cbdd 100644
--- a/sci-mathematics/scilab/Manifest
+++ b/sci-mathematics/scilab/Manifest
@@ -1,13 +1,14 @@
-MD5 0234c36c00186aa4bd39a7d7bcca4496 ChangeLog 6127
+MD5 7215ffd87ead186d11c9c49e09dd342c ChangeLog 6293
 MD5 f8e77491ef5140fe63fbe21ca1964377 files/digest-scilab-2.7-r3 135
 MD5 bbe608fb3f1804163b4b8af882c8dcbb files/digest-scilab-3.1.1 70
 MD5 bbe608fb3f1804163b4b8af882c8dcbb files/digest-scilab-3.1.1-r1 70
 MD5 bbe608fb3f1804163b4b8af882c8dcbb files/digest-scilab-3.1.1-r2 70
 MD5 bbe608fb3f1804163b4b8af882c8dcbb files/digest-scilab-3.1.1-r3 70
+MD5 c67f39d8d53d4f04bbfd44cf6ab4f840 files/gzvt2-add-gtk2-flags.patch 702
 MD5 814dd511c89a14982a5d6c60b09c1709 files/scilab-2.7-configure.patch 1702
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 693bb0bca5adf98abe428a3ca435d095 scilab-2.7-r3.ebuild 4028
 MD5 69d2d602cb23effe22c6b34d5d4cb1a5 scilab-3.1.1-r1.ebuild 5940
 MD5 0ac2ce7945c0c3330c64e94c8ed6c9d4 scilab-3.1.1-r2.ebuild 5805
-MD5 b075b154ffc7176b92628b9f2fd35660 scilab-3.1.1-r3.ebuild 4793
+MD5 88fe35577e6d544b620686c4cca653e9 scilab-3.1.1-r3.ebuild 4876
 MD5 a8524872ac3dd6988d8221389244089a scilab-3.1.1.ebuild 5786
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() {