Removed <scilab-2.7-r2. Added ifc/g77 check to scilab-2.7-r2.

6 files changed, 16 insertions, 388 deletions

diff --git a/app-sci/scilab/ChangeLog b/app-sci/scilab/ChangeLog
index 7bcb68c20a12..85e4ad3ab7fe 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.18 2004/06/28 04:17:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/scilab/ChangeLog,v 1.19 2004/06/30 19:26:37 kugelfang Exp $
+
+  30 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> -scilab-2.6.ebuild,
+  -scilab-2.7-r1.ebuild, scilab-2.7-r2.ebuild, -scilab-2.7.ebuild:
+  Added ifc/g77 check to scilab-2.7-r2 as well. Removed <scilab-2.7-r1.
 
   27 Jun 2004; Aron Griffis <agriffis@gentoo.org> scilab-2.7-r3.ebuild,
   scilab-2.7.ebuild:
diff --git a/app-sci/scilab/Manifest b/app-sci/scilab/Manifest
index c895d89e3468..a2a9a89dee74 100644
--- a/app-sci/scilab/Manifest
+++ b/app-sci/scilab/Manifest
@@ -1,13 +1,7 @@
-MD5 37264cc0b4a8d35d59421c5a57a78d9a scilab-2.7-r3.ebuild 4012
-MD5 d07cd3c22a04d3285db45c79794bbb6a scilab-2.6.ebuild 2831
-MD5 e1466236fc1802aa9a82f6bd93ff2986 scilab-2.7-r2.ebuild 3621
-MD5 5040ff8d9d20ee8298d47f01736702dc ChangeLog 3081
+MD5 dad257d0112e24b525a63c1e8e07eb88 ChangeLog 3294
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 09d739638c8a3ce2a7d2e52d2a2e1e3e scilab-2.7-r1.ebuild 3498
-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
-MD5 f8e77491ef5140fe63fbe21ca1964377 files/digest-scilab-2.7-r1 135
+MD5 4271322bce7fc08c8d9b59ae87963274 scilab-2.7-r2.ebuild 3840
+MD5 37264cc0b4a8d35d59421c5a57a78d9a scilab-2.7-r3.ebuild 4012
 MD5 f8e77491ef5140fe63fbe21ca1964377 files/digest-scilab-2.7-r2 135
 MD5 f8e77491ef5140fe63fbe21ca1964377 files/digest-scilab-2.7-r3 135
+MD5 814dd511c89a14982a5d6c60b09c1709 files/scilab-2.7-configure.patch 1702
diff --git a/app-sci/scilab/scilab-2.6.ebuild b/app-sci/scilab/scilab-2.6.ebuild
deleted file mode 100644
index da57f87d289f..000000000000
--- a/app-sci/scilab/scilab-2.6.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# 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.6.ebuild,v 1.12 2004/06/24 22:16:56 agriffis Exp $
-
-DESCRIPTION="scientific software package for numerical computations"
-SRC_URI="ftp://ftp.inria.fr/INRIA/Projects/Meta2/Scilab/distributions/${P}.src.tar.gz"
-HOMEPAGE="http://www-rocq.inria.fr/scilab/"
-
-LICENSE="scilab"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="tcltk"
-
-DEPEND="virtual/x11
-	tcltk? ( dev-lang/tk )"
-
-src_compile() {
-	local myopts
-
-	use tcltk && myopts="--with-tk"
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		${myopts} || die "./configure failed"
-	env HOME=${S} make all || die
-}
-
-src_install() {
-	BINDISTFILES="\
-		${P}/.binary \
-		${P}/.pvmd.conf \
-		${P}/ACKNOWLEDGEMENTS \
-		${P}/CHANGES \
-		${P}/Makefile \
-		${P}/Makefile.OBJ \
-		${P}/Makefile.incl \
-		${P}/Makemex \
-		${P}/Path.incl \
-		${P}/README \
-		${P}/Version.incl \
-		${P}/configure \
-		${P}/libtool \
-		${P}/license.txt \
-		${P}/licence.txt \
-		${P}/scilab.quit \
-		${P}/scilab.star \
-		${P}/X11_defaults \
-		${P}/bin \
-		${P}/config \
-		${P}/contrib \
-		${P}/demos \
-		${P}/examples \
-		${P}/imp/NperiPos.ps \
-		${P}/imp/giffonts \
-		${P}/macros \
-		${P}/man \
-		${P}/maple \
-		${P}/pvm3/lib/pvm \
-		${P}/pvm3/lib/pvmd \
-		${P}/pvm3/lib/pvmtmparch \
-		${P}/pvm3/lib/pvmgetarch \
-		${P}/pvm3/lib/LINUX/pvmd3 \
-		${P}/pvm3/lib/LINUX/pvmgs \
-		${P}/routines/*.h \
-		${P}/routines/Make.lib \
-		${P}/routines/default/FCreate \
-		${P}/routines/default/Flist \
-		${P}/routines/default/README \
-		${P}/routines/default/fundef \
-		${P}/routines/default/*.c \
-		${P}/routines/default/*.f \
-		${P}/routines/graphics/Math.h \
-		${P}/routines/graphics/Graphics.h \
-		${P}/routines/interf/*.h \
-		${P}/routines/intersci/sparse.h \
-		${P}/routines/menusX/*.h \
-		${P}/routines/scicos/scicos.h \
-		${P}/routines/sun/*.h \
-		${P}/routines/xsci/*.h \
-		${P}/scripts \
-		${P}/tcl \
-		${P}/tests \
-		${P}/util"
-
-	touch .binary
-	strip bin/scilex
-	cd tests && make distclean && cd ..
-	cd examples && make distclean && cd ..
-	dodir /usr/lib
-	(cd ..; tar cf - ${BINDISTFILES} | (cd ${D}/usr/lib; tar xf -))
-	rm .binary
-
-	dodir /usr/bin
-	dosym /usr/lib/${P}/bin/scilab /usr/bin/scilab
-	dosym /usr/lib/${P}/bin/intersci /usr/bin/intersci
-	dosym /usr/lib/${P}/bin/intersci-n /usr/bin/intersci-n
-}
-
-# the following is needed in order to create the startup scripts with
-# the right paths
-pkg_postinst() {
-	(cd /usr/lib/${P}; make)
-}
-
-# but of course then, unmerge won't remove everything without the following
-pkg_postrm() {
-	rm /usr/lib/${P}/Path.incl
-	rm -r /usr/lib/${P}/bin
-	rm -r /usr/lib/${P}/util
-	rm -r /usr/lib/${P}/examples
-	rmdir /usr/lib/${P}
-}
diff --git a/app-sci/scilab/scilab-2.7-r1.ebuild b/app-sci/scilab/scilab-2.7-r1.ebuild
deleted file mode 100644
index b177c17dce32..000000000000
--- a/app-sci/scilab/scilab-2.7-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# 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-r1.ebuild,v 1.4 2004/06/24 22:16:56 agriffis Exp $
-
-DESCRIPTION="scientific software package for numerical computations"
-SRC_URI="ftp://ftp.inria.fr/INRIA/Projects/Meta2/Scilab/distributions/${P}.src.tar.gz
-	http://www-rocq.inria.fr/scilab/bugfix/patch_browsehelp.tar.gz"
-HOMEPAGE="http://www-rocq.inria.fr/scilab/"
-
-LICENSE="scilab"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="tcltk Xaw3d"
-
-DEPEND="virtual/x11
-	Xaw3d? ( x11-libs/Xaw3d )
-	tcltk? ( dev-lang/tk )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	#this "patch" is really weirdly packed, just few files that oerwrite what is already there
-	unpack ${DISTFILES}/patch_browsehelp.tar.gz || die "help patch failed"
-}
-
-src_compile() {
-	local myopts
-
-	use Xaw3d || myopts="${myopts} --without-xaw3d"
-	use tcltk || myopts="${myopts} --without-tk"
-
-	econf ${myopts} || die "./configure failed"
-	env HOME=${S} make all || die
-}
-
-src_install () {
-	PVMBINDISTFILES="\
-		${P}/pvm3/Readme \
-		${P}/pvm3/lib/pvm \
-		${P}/pvm3/lib/pvmd \
-		${P}/pvm3/lib/pvmtmparch \
-		${P}/pvm3/lib/pvmgetarch \
-		${P}/pvm3/lib/LINUX/pvmd3 \
-		${P}/pvm3/lib/LINUX/pvmgs \
-		${P}/pvm3/lib/LINUX/pvm \
-		${P}/pvm3/bin/LINUX/*"
-
-	BINDISTFILES="\
-		${P}/.binary \
-		${P}/.pvmd.conf \
-		${P}/ACKNOWLEDGEMENTS \
-		${P}/CHANGES \
-		${P}/Makefile \
-		${P}/Makefile.OBJ \
-		${P}/Makefile.incl \
-		${P}/Makemex \
-		${P}/Path.incl \
-		${P}/README_Unix \
-		${P}/Version.incl \
-		${P}/configure \
-		${P}/libtool \
-		${P}/license.txt \
-		${P}/licence.txt \
-		${P}/scilab.quit \
-		${P}/scilab.star \
-		${P}/X11_defaults \
-		${P}/bin \
-		${P}/config \
-		${P}/contrib \
-		${P}/demos \
-		${P}/examples \
-		${P}/imp/NperiPos.ps \
-		${P}/imp/giffonts \
-		${P}/macros \
-		${P}/man/eng/*.htm \
-		${P}/man/eng/*/*.htm \
-		${P}/man/fr/*/*.htm \
-		${P}/man/fr/*.htm \
-		${P}/man/*.dtd \
-		${P}/man/*/*.xsl \
-		${P}/maple \
-		${P}/routines/*.h \
-		${P}/routines/Make.lib \
-		${P}/routines/default/FCreate \
-		${P}/routines/default/Flist \
-		${P}/routines/default/README \
-		${P}/routines/default/fundef \
-		${P}/routines/default/*.c \
-		${P}/routines/default/*.f \
-		${P}/routines/default/*.h \
-		${P}/routines/graphics/Math.h \
-		${P}/routines/graphics/Graphics.h \
-		${P}/routines/graphics/Entities.h \
-		${P}/routines/interf/*.h \
-		${P}/routines/intersci/sparse.h \
-		${P}/routines/menusX/*.h \
-		${P}/routines/scicos/scicos.h \
-		${P}/routines/sun/*.h \
-		${P}/routines/xsci/*.h \
-		${P}/scripts \
-		${P}/tcl \
-		${P}/tests \
-		${P}/util"
-
-	touch .binary
-	strip bin/scilex
-	cd ${S}/tests && make distclean
-	cd ${S}/examples && make distclean
-	dodir /usr/lib
-	(cd ${S}/..; tar cf - ${BINDISTFILES} ${PVMBINDISTFILES} | (cd ${D}/usr/lib; tar xf -))
-	rm .binary
-
-	dodir /usr/bin
-	dosym /usr/lib/${P}/bin/scilab /usr/bin/scilab
-	dosym /usr/lib/${P}/bin/intersci /usr/bin/intersci
-	dosym /usr/lib/${P}/bin/intersci-n /usr/bin/intersci-n
-}
-
-# the following is needed in order to create the startup scripts with
-# the right paths
-pkg_postinst () {
-	(cd /usr/lib/${P}; touch Path.incl; make)
-}
-
-# but of course then, unmerge won't remove everything without the following
-pkg_postrm () {
-	rm /usr/lib/${P}/Path.incl
-	for i in Blatexpr Blatexpr2 Blatexprs Blpr BEpsf scilab ; do
-		rm /usr/lib/${P}/bin/$i
-	done
-	rmdir /usr/lib/${P}/bin
-	for i in Blatdoc Blatdocs ; do
-		rm /usr/lib/${P}/util/$i
-	done
-	rmdir /usr/lib/${P}/util
-	rmdir /usr/lib/${P}
-}
diff --git a/app-sci/scilab/scilab-2.7-r2.ebuild b/app-sci/scilab/scilab-2.7-r2.ebuild
index ca1fdb806efc..662b9c062d4a 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-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-r2.ebuild,v 1.7 2004/06/24 22:16:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/scilab/scilab-2.7-r2.ebuild,v 1.8 2004/06/30 19:26:37 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
@@ -32,6 +32,12 @@ pkg_setup() {
 		ewarn 'Please uninstall it with "emerge unmerge scilab" before continuig'
 		die
 	fi
+	use ifc || if [ -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!"
+		die
+	fi
 }
 
 src_unpack() {
diff --git a/app-sci/scilab/scilab-2.7.ebuild b/app-sci/scilab/scilab-2.7.ebuild
deleted file mode 100644
index 255e38ae40b7..000000000000
--- a/app-sci/scilab/scilab-2.7.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# 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.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"
-HOMEPAGE="http://www-rocq.inria.fr/scilab/"
-
-LICENSE="scilab"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="tcltk"
-
-DEPEND="virtual/x11
-	x11-libs/Xaw3d
-	tcltk? ( dev-lang/tk )
-	>=sys-apps/sed-4"
-
-src_compile() {
-	local myopts
-
-	if ! use tcltk; then
-		myopts="--without-tk"
-		sed -i -e 's,all:: browsehelpexe,all::,' ${S}/tcl/Makefile || die
-	fi
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		${myopts} || die "./configure failed"
-	env HOME=${S} make all || die
-}
-
-src_install() {
-	BINDISTFILES="\
-		${P}/.binary \
-		${P}/.pvmd.conf \
-		${P}/ACKNOWLEDGEMENTS \
-		${P}/CHANGES \
-		${P}/Makefile \
-		${P}/Makefile.OBJ \
-		${P}/Makefile.incl \
-		${P}/Makemex \
-		${P}/Path.incl \
-		${P}/README \
-		${P}/Version.incl \
-		${P}/configure \
-		${P}/libtool \
-		${P}/license.txt \
-		${P}/licence.txt \
-		${P}/scilab.quit \
-		${P}/scilab.star \
-		${P}/X11_defaults \
-		${P}/bin \
-		${P}/config \
-		${P}/contrib \
-		${P}/demos \
-		${P}/examples \
-		${P}/imp/NperiPos.ps \
-		${P}/imp/giffonts \
-		${P}/macros \
-		${P}/man \
-		${P}/maple \
-		${P}/pvm3/lib/pvm \
-		${P}/pvm3/lib/pvmd \
-		${P}/pvm3/lib/pvmtmparch \
-		${P}/pvm3/lib/pvmgetarch \
-		${P}/pvm3/lib/LINUX/pvmd3 \
-		${P}/pvm3/lib/LINUX/pvmgs \
-		${P}/routines/*.h \
-		${P}/routines/Make.lib \
-		${P}/routines/default/FCreate \
-		${P}/routines/default/Flist \
-		${P}/routines/default/README \
-		${P}/routines/default/fundef \
-		${P}/routines/default/*.c \
-		${P}/routines/default/*.f \
-		${P}/routines/graphics/Math.h \
-		${P}/routines/graphics/Graphics.h \
-		${P}/routines/interf/*.h \
-		${P}/routines/intersci/sparse.h \
-		${P}/routines/menusX/*.h \
-		${P}/routines/scicos/scicos.h \
-		${P}/routines/sun/*.h \
-		${P}/routines/xsci/*.h \
-		${P}/scripts \
-		${P}/tcl \
-		${P}/tests \
-		${P}/util"
-
-	touch .binary
-	strip bin/scilex
-	cd ${S}/tests && make distclean
-	cd ${S}/examples && make distclean
-	dodir /usr/lib
-	(cd ${S}/..; tar cf - ${BINDISTFILES} ${PVMBINDISTFILES} | (cd ${D}/usr/lib; tar xf -))
-	rm .binary
-
-	dodir /usr/bin
-	dosym /usr/lib/${P}/bin/scilab /usr/bin/scilab
-	dosym /usr/lib/${P}/bin/intersci /usr/bin/intersci
-	dosym /usr/lib/${P}/bin/intersci-n /usr/bin/intersci-n
-}
-
-# the following is needed in order to create the startup scripts with
-# the right paths
-pkg_postinst() {
-	(cd /usr/lib/${P}; make)
-}
-
-# but of course then, unmerge won't remove everything without the following
-pkg_postrm() {
-	rm /usr/lib/${P}/Path.incl
-	rm -r /usr/lib/${P}/bin
-	rm -r /usr/lib/${P}/util
-	rm -r /usr/lib/${P}/examples
-	rmdir /usr/lib/${P}
-}