From a2571b9402cd6aa345b6eb3b6e8237bc651e0ba2 Mon Sep 17 00:00:00 2001 From: Patrick Kursawe Date: Wed, 1 Dec 2004 07:31:07 +0000 Subject: [PATCH] Correcting gtk/gtk2 handling (bug #70053) --- app-sci/scilab/ChangeLog | 5 ++++- app-sci/scilab/Manifest | 10 +++++----- app-sci/scilab/scilab-3.0.ebuild | 8 +++++--- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/app-sci/scilab/ChangeLog b/app-sci/scilab/ChangeLog index ae7797d7ac7b..32748d1c69e1 100644 --- a/app-sci/scilab/ChangeLog +++ b/app-sci/scilab/ChangeLog @@ -1,6 +1,9 @@ # 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.23 2004/11/26 14:18:03 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-sci/scilab/ChangeLog,v 1.24 2004/12/01 07:31:07 phosphan Exp $ + + 01 Dec 2004; Patrick Kursawe scilab-3.0.ebuild: + Correcting gtk/gtk2 handling (bug #70053) 27 Nov 2004; Joseph Jezak scilab-2.7-r3.ebuild: Marked ~ppc for bug #71458. diff --git a/app-sci/scilab/Manifest b/app-sci/scilab/Manifest index ad34b7846ee5..52ff29f6c76d 100644 --- a/app-sci/scilab/Manifest +++ b/app-sci/scilab/Manifest @@ -1,7 +1,7 @@ -MD5 8223f506f601271586c625eda89e6437 ChangeLog 3867 -MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156 +MD5 0eabe414a1914d996803eba847694a63 scilab-3.0.ebuild 5065 MD5 2b8bc410fc32427b27bcaefab3d62220 scilab-2.7-r3.ebuild 4014 -MD5 357853f15d2e22def6e3e86b8dd869f5 scilab-3.0.ebuild 5052 -MD5 f8e77491ef5140fe63fbe21ca1964377 files/digest-scilab-2.7-r3 135 -MD5 a485d7f0600472c5f79d8c78a09deb6a files/digest-scilab-3.0 68 +MD5 be9f9bf4a7f3ef22a63ee2d21b038c01 ChangeLog 3986 +MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156 MD5 814dd511c89a14982a5d6c60b09c1709 files/scilab-2.7-configure.patch 1702 +MD5 a485d7f0600472c5f79d8c78a09deb6a files/digest-scilab-3.0 68 +MD5 f8e77491ef5140fe63fbe21ca1964377 files/digest-scilab-2.7-r3 135 diff --git a/app-sci/scilab/scilab-3.0.ebuild b/app-sci/scilab/scilab-3.0.ebuild index f809c81211ad..5492a7501f75 100644 --- a/app-sci/scilab/scilab-3.0.ebuild +++ b/app-sci/scilab/scilab-3.0.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-3.0.ebuild,v 1.4 2004/09/14 15:51:45 ribosome Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-sci/scilab/scilab-3.0.ebuild,v 1.5 2004/12/01 07:31:07 phosphan Exp $ DESCRIPTION="Scientific software package for numerical computations (Matlab lookalike)" SRC_URI="ftp://ftp.inria.fr/INRIA/Scilab/distributions/${P}.src.tar.gz" @@ -63,8 +63,10 @@ src_compile() { use tcltk || myopts="${myopts} --without-tk" use Xaw3d || myopts="${myopts} --without-xaw3d" use atlas && myopts="${myopts} --with-atlas-library=/usr/lib" - use gtk2 && myopts="${myopts} --with-gtk2" || \ - use gtk && myopts="${myopts} --with-gtk" + if use gtk; then + use gtk2 && myopts="${myopts} --with-gtk2" || \ + myopts="${myopts} --with-gtk" + fi econf ${myopts} || die env HOME=${S} make all || die -- 2.26.2