Removed old ebuild (2.7-r2), fixed incorrect dependency in 3.0 (#61134).

4 files changed, 8 insertions, 150 deletions

diff --git a/app-sci/scilab/ChangeLog b/app-sci/scilab/ChangeLog
index 2ec9d0429088..b0baee55757e 100644
--- a/app-sci/scilab/ChangeLog
+++ b/app-sci/scilab/ChangeLog
@@ -1,6 +1,11 @@
 # 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.20 2004/08/19 23:06:45 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/scilab/ChangeLog,v 1.21 2004/08/22 14:44:00 ribosome Exp $
+
+  22 Aug 2004; Olivier Fisette <ribosome@gentoo.org>
+  -scilab-2.7-r2.ebuild, scilab-3.0.ebuild:
+  Corrected "libgtkhtml" dependency in version 3.0 (bug #61134).
+  Removed old ebuild (version 2.7-r2).
 
 *scilab-3.0
 
diff --git a/app-sci/scilab/files/digest-scilab-2.7-r2 b/app-sci/scilab/files/digest-scilab-2.7-r2
deleted file mode 100644
index c742d1e38c77..000000000000
--- a/app-sci/scilab/files/digest-scilab-2.7-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 e8aa1ede5efa20eeced284963d08bebb scilab-2.7.src.tar.gz 9510676
-MD5 712df122ba9d3dabf17e6016f33efcc4 patch_browsehelp.tar.gz 622246
diff --git a/app-sci/scilab/scilab-2.7-r2.ebuild b/app-sci/scilab/scilab-2.7-r2.ebuild
deleted file mode 100644
index faee555914b6..000000000000
--- a/app-sci/scilab/scilab-2.7-r2.ebuild
+++ /dev/null
@@ -1,145 +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-r2.ebuild,v 1.9 2004/07/13 20:41:21 agriffis 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
-	http://www-rocq.inria.fr/scilab/bugfix/patch_browsehelp.tar.gz"
-HOMEPAGE="http://www.scilab.org/"
-
-LICENSE="scilab"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="gtk ifc tcltk"
-
-DEPEND="virtual/x11
-	x11-libs/Xaw3d
-	sys-libs/ncurses
-	tcltk? ( dev-lang/tk )
-	gtk? ( =x11-libs/gtk+-1.2*
-			>=gnome-base/gnome-libs-1.4.2
-			>=dev-libs/glib-2.2
-			media-libs/jpeg
-			media-libs/libpng
-			sys-libs/zlib )"
-
-pkg_setup() {
-	local SCLB
-	SCLB=`which scilab`
-	if [ -e "${SCLB}" ]; then
-		ewarn "Previous version of scilab was detected on your system"
-		ewarn "Unfortunately these versions cause problems for newer ones during update"
-		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() {
-	unpack ${A}
-	cd ${S} && unpack ${DISTFILES}/patch_browsehelp.tar.gz
-}
-
-src_compile() {
-	local myopts
-
-	use tcltk || myopts="${myopts} --without-tk"
-	use gtk && myopts="${myopts} --with-gtk" || myopts="${myopts} --without-gtk"
-
-	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
-
-	#now scilab wants to create some wrappers, and we will need to adjust the paths
-	cd ${D}/usr/lib/${P}
-	make || die "wrapper creation failed"
-	cd macros && make && cd .. || die macros creation failed
-	grep -rle "${D}" * | xargs sed -i -e "s:${D}:/:g"
-}
diff --git a/app-sci/scilab/scilab-3.0.ebuild b/app-sci/scilab/scilab-3.0.ebuild
index fb8028373a06..069d422ee39c 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.2 2004/08/20 00:12:15 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/scilab/scilab-3.0.ebuild,v 1.3 2004/08/22 14:44:00 ribosome Exp $
 
 DESCRIPTION="Scientific software package for numerical computations (Matlab lookalike)"
 SRC_URI="ftp://ftp.inria.fr/INRIA/Scilab/distributions/${P}.src.tar.gz"
@@ -22,7 +22,7 @@ RDEPEND="virtual/x11
 		sys-libs/zlib
 		gtk2? ( >=x11-libs/gtk+-2*
 			>=x11-libs/libzvt-2*
-			>=gnome-extra/libgtkhtml-2*
+			=gnome-extra/libgtkhtml-2*
 		)
 		!gtk2? ( =x11-libs/gtk+-1.2* )
 	)