~amd64

7 files changed, 79 insertions, 12 deletions

diff --git a/app-sci/scilab/ChangeLog b/app-sci/scilab/ChangeLog
index b1911ac3be23..c160d8d0899d 100644
--- a/app-sci/scilab/ChangeLog
+++ b/app-sci/scilab/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-sci/scilab
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/scilab/ChangeLog,v 1.11 2004/03/22 13:25:16 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/scilab/ChangeLog,v 1.12 2004/04/21 18:07:11 kugelfang Exp $
+
+  21 Apr 2004; Danny van Dyk <kugelfang@gentoo.org>
+  +files/scilab-2.7-configure.patch, scilab-2.7-r3.ebuild:
+  Minor changes for amd64 only and marked ~amd64
 
 *scilab-2.7-r3 (22 Mar 2004)
 
diff --git a/app-sci/scilab/files/scilab-2.7-configure.patch b/app-sci/scilab/files/scilab-2.7-configure.patch
new file mode 100644
index 000000000000..8499fd669258
--- /dev/null
+++ b/app-sci/scilab/files/scilab-2.7-configure.patch
@@ -0,0 +1,58 @@
+--- scilab-2.7/configure.in	2003-02-06 02:42:05.000000000 -0500
++++ scilab-save/configure.in	2004-04-21 10:06:54.000000000 -0400
+@@ -376,6 +376,55 @@ case "$host" in
+     fi
+     MAKEFILE_TARGET=Makefile.linux
+    ;;
++# Linux x86_64 (added by Scott Robert Ladd)
++  x86_64-*-linux-gnu)
++    LIEEELIB=
++    AC_CHECK_LIB(ieee,main,
++      [LIEEELIB=-lieee])
++    MALLOC=malloc.o
++    GCC=yes
++    CC=gcc
++    CC_OPTIONS='-O -Dlinux -fwritable-strings'
++    CC_LDFLAGS=$LIEEELIB
++    # find Fortran compiler
++    # g77 already asked and found: good
++    if test "$WITH_G77" = yes; then
++      FC=g77
++    # option with-f2c
++    elif test "$with_f2c" = yes; then
++      AC_CHECK_PROG(F2C,f2c,yes,no)
++      if test "$F2C" = no; then
++        AC_MSG_ERROR([Unable to configure: f2c compiler not found])
++      fi
++      # script shell f77 have bugs, get ours
++      FC='${SCIDIR}/bin/f77-linux'
++    else
++      # first find g77
++      AC_CHECK_PROG(WITH_G77,g77,yes,no)
++      if test "$WITH_G77" = yes; then
++        FC=g77
++      else
++      # otherwise find f2c
++        AC_CHECK_PROG(F2C,f2c,yes,no)
++        if test "$F2C" = yes; then
++          # script shell f77 have bugs, get ours
++          FC='${SCIDIR}/bin/f77-linux'
++        else
++          AC_MSG_ERROR([Unable to configure: no Fortran compiler found])
++        fi
++      fi
++    fi
++    FC_OPTIONS=-O
++    FC_OPTIONS_O0=
++    FC_LDFLAGS="$LIEEELIB -ldl -rdynamic"
++    LD=ld
++    LD_LDFLAGS=$LIEEELIB
++    if test "$enable_debug" = yes; then
++      CC_OPTIONS='-g -Dlinux -fwritable-strings'
++      FC_OPTIONS=-g
++    fi
++    MAKEFILE_TARGET=Makefile.linux
++   ;;
+ # SUN OS (NO LONGER SUPPORTED)
+   sparc-*-sunos*)
+     # standard compilers
diff --git a/app-sci/scilab/scilab-2.6.ebuild b/app-sci/scilab/scilab-2.6.ebuild
index 14a49ee4610c..4353a05b7c2c 100644
--- a/app-sci/scilab/scilab-2.6.ebuild
+++ b/app-sci/scilab/scilab-2.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/scilab/scilab-2.6.ebuild,v 1.10 2003/09/06 22:23:06 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/scilab/scilab-2.6.ebuild,v 1.11 2004/04/21 18:07:11 kugelfang Exp $
 
 DESCRIPTION="scientific software package for numerical computations"
 SRC_URI="ftp://ftp.inria.fr/INRIA/Projects/Meta2/Scilab/distributions/${P}.src.tar.gz"
diff --git a/app-sci/scilab/scilab-2.7-r1.ebuild b/app-sci/scilab/scilab-2.7-r1.ebuild
index 947cf9a13430..deb50ea8c2f6 100644
--- a/app-sci/scilab/scilab-2.7-r1.ebuild
+++ b/app-sci/scilab/scilab-2.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/scilab/scilab-2.7-r1.ebuild,v 1.1 2003/09/16 21:27:01 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/scilab/scilab-2.7-r1.ebuild,v 1.2 2004/04/21 18:07:11 kugelfang Exp $
 
 DESCRIPTION="scientific software package for numerical computations"
 SRC_URI="ftp://ftp.inria.fr/INRIA/Projects/Meta2/Scilab/distributions/${P}.src.tar.gz
diff --git a/app-sci/scilab/scilab-2.7-r2.ebuild b/app-sci/scilab/scilab-2.7-r2.ebuild
index 91a90670a900..37894078b5ca 100644
--- a/app-sci/scilab/scilab-2.7-r2.ebuild
+++ b/app-sci/scilab/scilab-2.7-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/scilab/scilab-2.7-r2.ebuild,v 1.5 2003/10/12 17:53:36 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/scilab/scilab-2.7-r2.ebuild,v 1.6 2004/04/21 18:07:11 kugelfang Exp $
 
 DESCRIPTION="Scientific software package for numerical computations, Matlab lookalike"
 SRC_URI="ftp://ftp.inria.fr/INRIA/Projects/Meta2/Scilab/distributions/${P}.src.tar.gz
diff --git a/app-sci/scilab/scilab-2.7-r3.ebuild b/app-sci/scilab/scilab-2.7-r3.ebuild
index 2d38bf123bde..80b2984295a9 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 Technologies, Inc.
 # 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.1 2004/03/22 13:25:16 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/scilab/scilab-2.7-r3.ebuild,v 1.2 2004/04/21 18:07:11 kugelfang Exp $
 
 inherit virtualx
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.scilab.org/"
 
 LICENSE="scilab"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE="tcltk gtk"
 
 DEPEND="virtual/x11
@@ -39,6 +39,11 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd ${S} && unpack ${DISTFILES}/patch_browsehelp.tar.gz
+	if [ ${ARCH} = "amd64" ]; then
+		epatch ${FILESDIR}/${P}-configure.patch
+		cd ${S}
+		autoconf
+	fi
 }
 
 src_compile() {
@@ -49,7 +54,7 @@ src_compile() {
 
 	econf ${myopts} || die "./configure failed"
 	export HOME=${S}
-	Xmake all || die
+	make all || die
 }
 
 src_install() {
diff --git a/app-sci/scilab/scilab-2.7.ebuild b/app-sci/scilab/scilab-2.7.ebuild
index 8105d164f089..cf0118bfd878 100644
--- a/app-sci/scilab/scilab-2.7.ebuild
+++ b/app-sci/scilab/scilab-2.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.3 2003/09/11 01:02:54 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/scilab/scilab-2.7.ebuild,v 1.4 2004/04/21 18:07:11 kugelfang Exp $
 
 DESCRIPTION="scientific software package for numerical computations"
 SRC_URI="ftp://ftp.inria.fr/INRIA/Projects/Meta2/Scilab/distributions/${P}.src.tar.gz"