Dependency cleanup. Added patch to fix #67905.

Package-Manager: portage-2.0.51-r15

5 files changed, 215 insertions, 7 deletions

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 78bcb5dea7ee..07373fd704f4 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/scilab
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/ChangeLog,v 1.2 2004/12/28 20:58:33 swegener Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/ChangeLog,v 1.3 2005/03/02 17:23:52 greg_g Exp $
+
+*scilab-3.0-r1 (02 Mar 2005)
+
+  02 Mar 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/scilab-3.0-initialization.patch, +scilab-3.0-r1.ebuild:
+  Dependency cleanup. Added patch to fix #67905.
 
 *scilab-2.7-r3 (28 Dec 2004)
 
diff --git a/sci-mathematics/scilab/Manifest b/sci-mathematics/scilab/Manifest
index 397d86ab3946..101b3c17ea41 100644
--- a/sci-mathematics/scilab/Manifest
+++ b/sci-mathematics/scilab/Manifest
@@ -1,7 +1,10 @@
-MD5 bda5e7ec796071ddc39c89c37b1d25ab scilab-3.0.ebuild 5073
-MD5 aadc6ce48449f8eb0870b90d33d4e0b6 scilab-2.7-r3.ebuild 4024
-MD5 59047669719e2d9646e1bf4d938aba39 ChangeLog 4237
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 814dd511c89a14982a5d6c60b09c1709 files/scilab-2.7-configure.patch 1702
-MD5 a485d7f0600472c5f79d8c78a09deb6a files/digest-scilab-3.0 68
+MD5 f5fac3ab0fa2d880a3a53cf76c3f165c ChangeLog 4430
+MD5 aadc6ce48449f8eb0870b90d33d4e0b6 scilab-2.7-r3.ebuild 4024
+MD5 bda5e7ec796071ddc39c89c37b1d25ab scilab-3.0.ebuild 5073
+MD5 d852c7184a32aa1fad66ec40e0831180 scilab-3.0-r1.ebuild 5291
 MD5 f8e77491ef5140fe63fbe21ca1964377 files/digest-scilab-2.7-r3 135
+MD5 a485d7f0600472c5f79d8c78a09deb6a files/digest-scilab-3.0-r1 68
+MD5 a485d7f0600472c5f79d8c78a09deb6a files/digest-scilab-3.0 68
+MD5 814dd511c89a14982a5d6c60b09c1709 files/scilab-2.7-configure.patch 1702
+MD5 5cf78e1831ce7d7539c2c26b9efb79b8 files/scilab-3.0-initialization.patch 430
diff --git a/sci-mathematics/scilab/files/digest-scilab-3.0-r1 b/sci-mathematics/scilab/files/digest-scilab-3.0-r1
new file mode 100644
index 000000000000..df2aa975ecc0
--- /dev/null
+++ b/sci-mathematics/scilab/files/digest-scilab-3.0-r1
@@ -0,0 +1 @@
+MD5 d6fc5fe12519f99ccdd492c4ba96935a scilab-3.0.src.tar.gz 10988126
diff --git a/sci-mathematics/scilab/files/scilab-3.0-initialization.patch b/sci-mathematics/scilab/files/scilab-3.0-initialization.patch
new file mode 100644
index 000000000000..3bd75c177646
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-3.0-initialization.patch
@@ -0,0 +1,12 @@
+diff -ur scilab-3.0.orig/scilab.star scilab-3.0/scilab.star
+--- scilab-3.0.orig/scilab.star	2004-11-04 18:19:36.000000000 +0100
++++ scilab-3.0/scilab.star	2004-11-04 18:21:01.000000000 +0100
+@@ -118,7 +118,7 @@
+ 
+ // Set the preferred browser  ==========================================
+ global %browsehelp
+-if with_tk()& ~with_gtk()
++if with_tk()
+   %browsehelp="Scilab Browser";
+ elseif with_gtk()
+   %browsehelp="help widget";
diff --git a/sci-mathematics/scilab/scilab-3.0-r1.ebuild b/sci-mathematics/scilab/scilab-3.0-r1.ebuild
new file mode 100644
index 000000000000..dc529a669b8d
--- /dev/null
+++ b/sci-mathematics/scilab/scilab-3.0-r1.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-3.0-r1.ebuild,v 1.1 2005/03/02 17:23:52 greg_g Exp $
+
+inherit eutils
+
+DESCRIPTION="Scientific software package for numerical computations (Matlab lookalike)"
+SRC_URI="ftp://ftp.inria.fr/INRIA/Scilab/distributions/${P}.src.tar.gz"
+HOMEPAGE="http://www.scilab.org/"
+
+LICENSE="scilab"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="ifc tcltk atlas gtk gtk2 Xaw3d"
+
+RDEPEND="virtual/x11
+	sys-libs/ncurses
+	atlas? ( sci-libs/atlas )
+	gtk? (
+		media-libs/jpeg
+		media-libs/libpng
+		sys-libs/zlib
+		gtk2? ( >=x11-libs/gtk+-2
+			>=x11-libs/libzvt-2
+			=gnome-extra/libgtkhtml-2*
+		)
+		!gtk2? ( =x11-libs/gtk+-1.2*
+			>=gnome-base/gnome-libs-1.4.2 )
+	)
+	tcltk? ( >=dev-lang/tk-8.4
+		>=dev-lang/tcl-8.4 )
+	Xaw3d? ( x11-libs/Xaw3d )"
+
+DEPEND="${RDEPEND}
+	ifc? ( dev-lang/ifc )
+	app-text/sablotron"
+
+pkg_setup() {
+	if ! which ${F77:-g77} &> /dev/null; then
+		echo
+		eerror "The Fortran compiler \"${F77:-g77}\" could not be found on your system."
+		if [ -z ${F77} ] || [ ${F77} = g77 ]; then
+			eerror 'Please reinstall "sys-devel/gcc" with the "fortran" "USE" flag enabled.'
+		elif [ ${F77} = ifc ] && ! use ifc &> /dev/null; then
+			eerror 'Please set the "ifc" "USE" flag if you want to use the Intel Fortran'
+			eerror 'Compiler to build this package. This will ensure the "dev-lang/ifc"'
+			eerror 'package gets installed on your system.'
+		elif [ ${F77} = ifc ] && use ifc &> /dev/null; then
+			eerror 'Please ensure "ifc" is in a directory referenced in "PATH".'
+		else
+			eerror 'Please make sure the variable ${F77} is set to the name of a valid'
+			eerror 'Fortran compiler installed on your system. Make sure this executable'
+			eerror 'is in a directory referenced by "PATH", and that the corresponding'
+			eerror '"USE" flag is set if applicable (for example "ifc" if you use the'
+			eerror 'Intel Fortran Compiler).'
+		fi
+		die "Fortran compiler not found."
+	fi
+
+	if ! use gtk && ! use tcltk; then
+		echo
+		eerror 'scilab must be built with either USE="gtk" or USE="tcltk"'
+		die
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# fix scilab script causing problems (#67905)
+	epatch ${FILESDIR}/${P}-initialization.patch
+}
+
+src_compile() {
+	local myopts
+	use tcltk || myopts="${myopts} --without-tk"
+	use Xaw3d || myopts="${myopts} --without-xaw3d"
+	use atlas && myopts="${myopts} --with-atlas-library=/usr/lib"
+	if use gtk; then
+		use gtk2 && myopts="${myopts} --with-gtk2" || \
+			myopts="${myopts} --with-gtk"
+	fi
+
+	econf ${myopts} || die
+	env HOME=${S} make all || die
+}
+
+src_install() {
+	# These instructions come from the file ${P}/Makefile, mostly section
+	# install. Make sure files have not been removed or added to these list
+	# when you use this ebuild as a template for future versions.
+	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/ \
+		${P}/man/fr/ \
+		${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/scicos/scicos_block.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
+	cd ${S}/man && make man
+
+	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 compile and install process causes the work folder to be registered
+	# as the runtime folder in the launch script. This is corrected here.
+	BAD_LINE=SCI\=\"${WORKDIR}/${P}\"
+	FIXED_LINE=SCI\=\"/usr/lib/${P}\"
+	sed -i -e "s#${BAD_LINE}#${FIXED_LINE}#" ${D}/usr/lib/${P}/bin/scilab
+}
+
+pkg_postinst() {
+	einfo "To tell Scilab about your printers, set the environment"
+	einfo "variable PRINTERS in the form:"
+	einfo
+	einfo "PRINTERS=\"firstPrinter:secondPrinter:anotherPrinter\""
+}