QA - fix use invocation

4 files changed, 16 insertions, 12 deletions

diff --git a/app-sci/scilab/ChangeLog b/app-sci/scilab/ChangeLog
index ad56916b6452..7bcb68c20a12 100644
--- a/app-sci/scilab/ChangeLog
+++ b/app-sci/scilab/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-sci/scilab
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/scilab/ChangeLog,v 1.17 2004/06/24 22:16:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/scilab/ChangeLog,v 1.18 2004/06/28 04:17:04 agriffis Exp $
+
+  27 Jun 2004; Aron Griffis <agriffis@gentoo.org> scilab-2.7-r3.ebuild,
+  scilab-2.7.ebuild:
+  QA - fix use invocation
 
   14 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> scilab-2.7-r1.ebuild,
   scilab-2.7-r3.ebuild:
diff --git a/app-sci/scilab/Manifest b/app-sci/scilab/Manifest
index 1395c5b5d41e..c895d89e3468 100644
--- a/app-sci/scilab/Manifest
+++ b/app-sci/scilab/Manifest
@@ -1,10 +1,10 @@
-MD5 7f77ec011d9e0f00fb34850e659c439a scilab-2.7-r3.ebuild 4010
+MD5 37264cc0b4a8d35d59421c5a57a78d9a scilab-2.7-r3.ebuild 4012
 MD5 d07cd3c22a04d3285db45c79794bbb6a scilab-2.6.ebuild 2831
 MD5 e1466236fc1802aa9a82f6bd93ff2986 scilab-2.7-r2.ebuild 3621
-MD5 0a208b6aaca1c09c52346c4787313de8 ChangeLog 2961
+MD5 5040ff8d9d20ee8298d47f01736702dc ChangeLog 3081
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 09d739638c8a3ce2a7d2e52d2a2e1e3e scilab-2.7-r1.ebuild 3498
-MD5 243b666f8507f18cd04a173f42692345 scilab-2.7.ebuild 3029
+MD5 e96f7af98dcc5c51bbb4097b92cc79aa scilab-2.7.ebuild 2966
 MD5 814dd511c89a14982a5d6c60b09c1709 files/scilab-2.7-configure.patch 1702
 MD5 1d6cf95b60df9aed59392d68189bb25d files/digest-scilab-2.6 67
 MD5 08e3affe50b12d19408b7e389b08a964 files/digest-scilab-2.7 67
diff --git a/app-sci/scilab/scilab-2.7-r3.ebuild b/app-sci/scilab/scilab-2.7-r3.ebuild
index 6ca6d6d59992..57462e8bc03a 100644
--- a/app-sci/scilab/scilab-2.7-r3.ebuild
+++ b/app-sci/scilab/scilab-2.7-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/scilab/scilab-2.7-r3.ebuild,v 1.6 2004/06/24 22:16:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/scilab/scilab-2.7-r3.ebuild,v 1.7 2004/06/28 04:17:04 agriffis Exp $
 
 inherit virtualx eutils
 
@@ -35,7 +35,7 @@ pkg_setup() {
 		ewarn 'Please uninstall it with "emerge unmerge scilab" before continuig'
 		die
 	fi
-	use ifc || if [ -z `which g77` ]; then
+	if ! use ifc && [ -z `which g77` ]; then
 		#if ifc is defined then the dep was already checked
 		eerror "No fortran compiler found on the system!"
 		eerror "Please add f77 to your USE flags and reemerge gcc!"
diff --git a/app-sci/scilab/scilab-2.7.ebuild b/app-sci/scilab/scilab-2.7.ebuild
index be0f467e3762..255e38ae40b7 100644
--- a/app-sci/scilab/scilab-2.7.ebuild
+++ b/app-sci/scilab/scilab-2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/scilab/scilab-2.7.ebuild,v 1.5 2004/06/24 22:16:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/scilab/scilab-2.7.ebuild,v 1.6 2004/06/28 04:17:04 agriffis Exp $
 
 DESCRIPTION="scientific software package for numerical computations"
 SRC_URI="ftp://ftp.inria.fr/INRIA/Projects/Meta2/Scilab/distributions/${P}.src.tar.gz"
@@ -13,15 +13,15 @@ IUSE="tcltk"
 
 DEPEND="virtual/x11
 	x11-libs/Xaw3d
-	tcltk? ( dev-lang/tk )"
+	tcltk? ( dev-lang/tk )
+	>=sys-apps/sed-4"
 
 src_compile() {
 	local myopts
 
-	use tcltk || myopts="--without-tk"
-	if [ !"`use tcltk`" ] ; then
-		mv ${S}/tcl/Makefile ${S}/tcl/Makefile.orig
-		sed -e 's,all:: browsehelpexe,all::,' ${S}/tcl/Makefile.orig > ${S}/tcl/Makefile
+	if ! use tcltk; then
+		myopts="--without-tk"
+		sed -i -e 's,all:: browsehelpexe,all::,' ${S}/tcl/Makefile || die
 	fi
 
 	./configure \