Removed old version and dependency on libzvt for 4.x ebuilds (see bug #147550).

(Portage version: 2.1.2-r11)

6 files changed, 10 insertions, 211 deletions

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index d1c4cd7f7181..b2120c5f4070 100644
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/scilab
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/ChangeLog,v 1.33 2007/02/13 03:42:56 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/ChangeLog,v 1.34 2007/03/01 23:10:55 markusle Exp $
+
+  01 Mar 2007; Markus Dittrich <markusle@gentoo.org>
+  -files/gzvt2-add-gtk2-flags.patch, -scilab-3.1.1-r3.ebuild,
+  scilab-4.0.ebuild, scilab-4.1.ebuild:
+  Removed old version and dependency on libzvt for 4.x ebuilds (see
+  bug #147550).
 
   13 Feb 2007; Markus Dittrich <markusle@gentoo.org> scilab-4.1.ebuild:
   Removed superfluous stripping of scilex binary.
diff --git a/sci-mathematics/scilab/files/digest-scilab-3.1.1-r3 b/sci-mathematics/scilab/files/digest-scilab-3.1.1-r3
deleted file mode 100644
index f89cd699ebee..000000000000
--- a/sci-mathematics/scilab/files/digest-scilab-3.1.1-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8bd6e750681fc6b2f524b46876dc0887 scilab-3.1.1-src.tar.gz 14261772
-RMD160 363486c6c9d1e64a28edcd002651e3c9d3b1eb73 scilab-3.1.1-src.tar.gz 14261772
-SHA256 1d75ec6b9e26216b69c31a4cb648a1e7d6045e3f1305019491cc3e1846ca60e8 scilab-3.1.1-src.tar.gz 14261772
diff --git a/sci-mathematics/scilab/files/gzvt2-add-gtk2-flags.patch b/sci-mathematics/scilab/files/gzvt2-add-gtk2-flags.patch
deleted file mode 100644
index 63abe112f670..000000000000
--- a/sci-mathematics/scilab/files/gzvt2-add-gtk2-flags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN scilab-3.1.1.orig/routines/gzvt2/Makefile.in scilab-3.1.1/routines/gzvt2/Makefile.in
---- scilab-3.1.1.orig/routines/gzvt2/Makefile.in	2004-10-05 13:45:17.000000000 -0700
-+++ scilab-3.1.1/routines/gzvt2/Makefile.in	2006-01-18 17:24:20.000000000 -0800
-@@ -5,8 +5,8 @@
- 
- ZTERM_LDFLAGS= `pkg-config libzvt-2.0 --cflags --libs` -DHAS_I18N
- ZTERM_CFLAGS= `pkg-config libzvt-2.0 --cflags ` -DHAS_I18N
--VTE_LDFLAGS= `pkg-config vte --cflags --libs` 
--VTE_CFLAGS=  `pkg-config vte --cflags` 
-+VTE_LDFLAGS= `pkg-config vte --cflags --libs` `pkg-config gtk+-2.0 --cflags --libs`
-+VTE_CFLAGS=  `pkg-config vte --cflags` `pkg-config gtk+-2.0 --cflags`
- 
- TERM_NAME=@TERM_NAME@
- LDFLAGS=$(@TERM_LDFLAGS@)
diff --git a/sci-mathematics/scilab/scilab-3.1.1-r3.ebuild b/sci-mathematics/scilab/scilab-3.1.1-r3.ebuild
deleted file mode 100644
index 01ab00c94d6b..000000000000
--- a/sci-mathematics/scilab/scilab-3.1.1-r3.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-3.1.1-r3.ebuild,v 1.3 2006/01/19 20:23:51 spyderous Exp $
-
-inherit eutils fortran
-
-DESCRIPTION="Scientific software package for numerical computations (Matlab lookalike)"
-LICENSE="scilab"
-SRC_URI="http://scilabsoft.inria.fr/download/stable/${P}-src.tar.gz"
-HOMEPAGE="http://www.scilab.org/"
-
-SLOT="0"
-IUSE="ifc ocaml tcltk gtk Xaw3d"
-KEYWORDS="~x86 ~ppc"
-
-RDEPEND="virtual/blas
-	virtual/lapack
-	sys-libs/ncurses
-	gtk? (
-		media-libs/jpeg
-		media-libs/libpng
-		sys-libs/zlib
-		>=x11-libs/gtk+-2
-		>=x11-libs/libzvt-2
-		=gnome-extra/gtkhtml-2*
-	)
-	tcltk? ( >=dev-lang/tk-8.4
-		>=dev-lang/tcl-8.4 )
-	Xaw3d? ( x11-libs/Xaw3d )
-	ocaml? ( dev-lang/ocaml )"
-
-DEPEND="${RDEPEND}
-	ifc? ( dev-lang/ifc )
-	app-text/sablotron"
-
-pkg_setup() {
-	need_fortran g77
-	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}"
-
-	sed -i \
-		-e '/^ATLAS_LAPACKBLAS\>/s,=.*,= $(ATLASDIR)/liblapack.so $(ATLASDIR)/libblas.so $(ATLASDIR)/libcblas.so,' \
-		-e 's,$(SCIDIR)/libs/lapack.a,,' \
-		Makefile.OBJ.in
-
-	# fix scilab script causing problems (#67905)
-	# epatch ${FILESDIR}/${P}-initialization.patch
-
-	# Doesn't include the directories etc for gtk
-	epatch ${FILESDIR}/gzvt2-add-gtk2-flags.patch
-}
-
-src_compile() {
-	local myopts
-	use tcltk || myopts="${myopts} --without-tk"
-	use Xaw3d || myopts="${myopts} --without-xaw3d"
-	myopts="${myopts} --with-atlas-library=/usr/lib"
-	if use gtk; then
-		myopts="${myopts} --with-gtk2"
-	fi
-	if ! use ocaml; then
-		myopts="${myopts} --without-ocaml"
-	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 many files. This is corrected here.
-	BAD_REF="${WORKDIR}/${P}"
-	FIXED_REF="/usr/lib/${P}"
-	BIN_TO_FIX="Blpr BEpsf Blatexpr2 Blatexprs Blatexpr scilab"
-	for i in ${BIN_TO_FIX}; do
-		sed -e "s%${BAD_REF}%${FIXED_REF}%" -i "${D}"/usr/lib/${P}/bin/${i} \
-			|| die
-	done
-	MAN_TO_FIX="eng fr"
-	for i in ${MAN_TO_FIX}; do
-		for j in "${D}"/usr/lib/${P}/man/${i}/*.h*; do
-			sed -e "s%${BAD_REF}%${FIXED_REF}%" -i ${j} || die
-		done
-	done
-	MISC_TO_FIX="util/Blatdoc util/Blatdocs"
-	for i in ${MISC_TO_FIX}; do
-		sed -e "s%${BAD_REF}%${FIXED_REF}%" -i "${D}"/usr/lib/${P}/${i} || die
-	done
-}
-
-pkg_postinst() {
-	einfo "To tell Scilab about your printers, set the environment"
-	einfo "variable PRINTERS in the form:"
-	einfo
-	einfo "PRINTERS=\"firstPrinter:secondPrinter:anotherPrinter\""
-}
diff --git a/sci-mathematics/scilab/scilab-4.0.ebuild b/sci-mathematics/scilab/scilab-4.0.ebuild
index 220f9a0d7f6e..0ceba0bc0a7b 100644
--- a/sci-mathematics/scilab/scilab-4.0.ebuild
+++ b/sci-mathematics/scilab/scilab-4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-4.0.ebuild,v 1.10 2006/12/02 21:12:51 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-4.0.ebuild,v 1.11 2007/03/01 23:10:55 markusle Exp $
 
 inherit eutils fortran toolchain-funcs multilib autotools java-pkg-opt-2
 
@@ -21,7 +21,6 @@ RDEPEND="virtual/blas
 		media-libs/libpng
 		sys-libs/zlib
 		>=x11-libs/gtk+-2
-		>=x11-libs/libzvt-2
 		x11-libs/vte
 		=gnome-extra/gtkhtml-2*
 	)
diff --git a/sci-mathematics/scilab/scilab-4.1.ebuild b/sci-mathematics/scilab/scilab-4.1.ebuild
index 29e41127e40b..a711be2e882f 100644
--- a/sci-mathematics/scilab/scilab-4.1.ebuild
+++ b/sci-mathematics/scilab/scilab-4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-4.1.ebuild,v 1.2 2007/02/13 03:42:56 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-4.1.ebuild,v 1.3 2007/03/01 23:10:55 markusle Exp $
 
 inherit eutils fortran toolchain-funcs multilib autotools java-pkg-opt-2
 
@@ -21,7 +21,6 @@ RDEPEND="virtual/blas
 		media-libs/libpng
 		sys-libs/zlib
 		>=x11-libs/gtk+-2
-		>=x11-libs/libzvt-2
 		x11-libs/vte
 		=gnome-extra/gtkhtml-2*
 	)