Removed old version and dependency on libzvt for 4.x ebuilds (see bug #147550).
authorMarkus Dittrich <markusle@gentoo.org>
Thu, 1 Mar 2007 23:10:55 +0000 (23:10 +0000)
committerMarkus Dittrich <markusle@gentoo.org>
Thu, 1 Mar 2007 23:10:55 +0000 (23:10 +0000)
Package-Manager: portage-2.1.2-r11

sci-mathematics/scilab/ChangeLog
sci-mathematics/scilab/Manifest
sci-mathematics/scilab/files/digest-scilab-3.1.1-r3 [deleted file]
sci-mathematics/scilab/files/gzvt2-add-gtk2-flags.patch [deleted file]
sci-mathematics/scilab/scilab-3.1.1-r3.ebuild [deleted file]
sci-mathematics/scilab/scilab-4.0.ebuild
sci-mathematics/scilab/scilab-4.1.ebuild

index d1c4cd7f7181880e4b5d7fc99d1bf0e7b3f490e5..b2120c5f4070e32cf45733b2d5ac9f5d53d8ca9b 100644 (file)
@@ -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.
index d8da9d8b39635b6a77b4397cbd3768e37e42990a..23d19bff1016e49d3cfbee410480d689e7d932e7 100644 (file)
@@ -1,7 +1,3 @@
-AUX gzvt2-add-gtk2-flags.patch 702 RMD160 b58c51ae98c3ff7d0cb4240aed7b5a11634e26a3 SHA1 30371d235bcc322cfe39031039ec6dbb2d2758d1 SHA256 346dc6b4c462c77a9c4416bb6e7b91ee201787bf7d9ed5adaccb1204d8175b1d
-MD5 c67f39d8d53d4f04bbfd44cf6ab4f840 files/gzvt2-add-gtk2-flags.patch 702
-RMD160 b58c51ae98c3ff7d0cb4240aed7b5a11634e26a3 files/gzvt2-add-gtk2-flags.patch 702
-SHA256 346dc6b4c462c77a9c4416bb6e7b91ee201787bf7d9ed5adaccb1204d8175b1d files/gzvt2-add-gtk2-flags.patch 702
 AUX scilab-4.0-configure-gfortran.patch 14731 RMD160 be5367c2dc91d582fed58ad17733770474690cf3 SHA1 3208c8f48ade5a4934f72cb613400a177abebeb8 SHA256 2e2ef24db30ad6c69fd9fd0c6690841ae9286256e2de71784d48f09d84e0222a
 MD5 3d324154234ef4e63b1701f11cdca3bf files/scilab-4.0-configure-gfortran.patch 14731
 RMD160 be5367c2dc91d582fed58ad17733770474690cf3 files/scilab-4.0-configure-gfortran.patch 14731
@@ -30,32 +26,24 @@ AUX scilab-ppc-gcc4.patch 1045 RMD160 db4219fc04b5555e702d823425735125f3000c00 S
 MD5 d64e32c9d98d776a5bdce28e6044cff4 files/scilab-ppc-gcc4.patch 1045
 RMD160 db4219fc04b5555e702d823425735125f3000c00 files/scilab-ppc-gcc4.patch 1045
 SHA256 0844c4edad45ba23219b8d3405104a8bbb2b45e2b7b742f7aaeb10ce5e92388a files/scilab-ppc-gcc4.patch 1045
-DIST scilab-3.1.1-src.tar.gz 14261772 RMD160 363486c6c9d1e64a28edcd002651e3c9d3b1eb73 SHA1 63cae13441befb795d32cec5f825042b6b4e74b3 SHA256 1d75ec6b9e26216b69c31a4cb648a1e7d6045e3f1305019491cc3e1846ca60e8
 DIST scilab-4.0-src.tar.gz 12523941 RMD160 13e8637b0793650b0dd2ae07ccaa6bbbff62375c SHA1 841dfe0837cd44a0608e70fe2c49023312481fd0 SHA256 e0f0e784909020c34c4512cf34f946373950cb5f8ee5499a16af73880189d41d
 DIST scilab-4.1-src.tar.gz 13164450 RMD160 6ed27ce7dcfb9231b5f3042cb7b830015d102df7 SHA1 7a8381a9a69ce280ae718ee59f4c14001b61f4b7 SHA256 e2b36f6095b824feec3489c30f640bd809b3dc55bd5487319cbd641ac14fac80
-EBUILD scilab-3.1.1-r3.ebuild 4876 RMD160 61a58eae2dff32abab4e07a5f0049d7234bc8e76 SHA1 96b31546fbaf6f91b3db0bb79f80621e7e9cf8f9 SHA256 7fdc8b7a28ea71b962d503ab8125241ed7e3ceb531cab4b1d3329510e911c03e
-MD5 88fe35577e6d544b620686c4cca653e9 scilab-3.1.1-r3.ebuild 4876
-RMD160 61a58eae2dff32abab4e07a5f0049d7234bc8e76 scilab-3.1.1-r3.ebuild 4876
-SHA256 7fdc8b7a28ea71b962d503ab8125241ed7e3ceb531cab4b1d3329510e911c03e scilab-3.1.1-r3.ebuild 4876
-EBUILD scilab-4.0.ebuild 3949 RMD160 7d18001b2f23b9de7598915929f72846ab6cff53 SHA1 01618cdc02d63fcbd2de179e4b467aff02702b47 SHA256 d72cdf698c115e363e05ed73fe0f9d4ace357b8fb48f0531758aa53b831af780
-MD5 0c658156196eeed9bae6a7e3d978f368 scilab-4.0.ebuild 3949
-RMD160 7d18001b2f23b9de7598915929f72846ab6cff53 scilab-4.0.ebuild 3949
-SHA256 d72cdf698c115e363e05ed73fe0f9d4ace357b8fb48f0531758aa53b831af780 scilab-4.0.ebuild 3949
-EBUILD scilab-4.1.ebuild 4363 RMD160 57e00d9eaacc62bf085a93fd4c47e4bfd6588c59 SHA1 782640bdb0fc590ba6886a780a1c3b7c3fce0ec4 SHA256 cde4c4f7072f78935363106b3e24e495085e19de0fbdf285bc4e391dc1d99a16
-MD5 372940d75bce8860ec943396951b74d6 scilab-4.1.ebuild 4363
-RMD160 57e00d9eaacc62bf085a93fd4c47e4bfd6588c59 scilab-4.1.ebuild 4363
-SHA256 cde4c4f7072f78935363106b3e24e495085e19de0fbdf285bc4e391dc1d99a16 scilab-4.1.ebuild 4363
-MISC ChangeLog 8963 RMD160 d233c011471302e2d392ebade7f8af8391bbd226 SHA1 25ba5b3e2339428033b6baafa6449e029e5f12c3 SHA256 f1f01f4698b2f007384afad39daa35b7b00b1ce96b995bd8f19bd077c653e7d1
-MD5 79f3ffcbf36df0b0d4a3e82197b477ea ChangeLog 8963
-RMD160 d233c011471302e2d392ebade7f8af8391bbd226 ChangeLog 8963
-SHA256 f1f01f4698b2f007384afad39daa35b7b00b1ce96b995bd8f19bd077c653e7d1 ChangeLog 8963
+EBUILD scilab-4.0.ebuild 3928 RMD160 befd51d58ed4e83c4335af6a07639c78bf9a1e0f SHA1 d54ca1eb1784426475417e1898d1da85b2ed5b23 SHA256 7366a325352b38ea99483b25702f85840b6b8e25a8e8b583644618c6bfa0bb09
+MD5 9066a9478dc6c30c475dac4ec06a3539 scilab-4.0.ebuild 3928
+RMD160 befd51d58ed4e83c4335af6a07639c78bf9a1e0f scilab-4.0.ebuild 3928
+SHA256 7366a325352b38ea99483b25702f85840b6b8e25a8e8b583644618c6bfa0bb09 scilab-4.0.ebuild 3928
+EBUILD scilab-4.1.ebuild 4341 RMD160 9f9736d31cd1aecde23ba835d279733875ea39f4 SHA1 3ec79e3fbd91488767d0c9082799962b11cf9f9b SHA256 140c74de8d26f98962315a92a629513257ead1e2d5db24b93b1d72129742b45e
+MD5 4bcf05bcc584c87703513c0c2c213692 scilab-4.1.ebuild 4341
+RMD160 9f9736d31cd1aecde23ba835d279733875ea39f4 scilab-4.1.ebuild 4341
+SHA256 140c74de8d26f98962315a92a629513257ead1e2d5db24b93b1d72129742b45e scilab-4.1.ebuild 4341
+MISC ChangeLog 9203 RMD160 b9f279f230939a0fe10d5ab04c9e6f4d05030dbf SHA1 a590867d50a760834eef1ccc619d6f1dbce45a31 SHA256 f4484ac494349f2268ce37cc63ef0c55f7dfd20dfd4dc8f82e52c419616bf526
+MD5 af3c90c61a6f0ac6b1326b18012f2a68 ChangeLog 9203
+RMD160 b9f279f230939a0fe10d5ab04c9e6f4d05030dbf ChangeLog 9203
+SHA256 f4484ac494349f2268ce37cc63ef0c55f7dfd20dfd4dc8f82e52c419616bf526 ChangeLog 9203
 MISC metadata.xml 168 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 SHA1 95c9e4f7368f82053d631bbcd469612c92ca13cb SHA256 c0cc8d6ab9385750af753ddc504299ed90a70b5c4c655f6c77d865917a8829c9
 MD5 30bc69a424d7634aae9c1e4203365d3d metadata.xml 168
 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 metadata.xml 168
 SHA256 c0cc8d6ab9385750af753ddc504299ed90a70b5c4c655f6c77d865917a8829c9 metadata.xml 168
-MD5 a91563a80250e5ce4df87a757e216530 files/digest-scilab-3.1.1-r3 256
-RMD160 7b1c31fd9395fc372fb61364ddf5067c4b0bb550 files/digest-scilab-3.1.1-r3 256
-SHA256 ed24da059537820af8919172ca3fb5f378039f30a02fdc870fa36967cfdd8ca4 files/digest-scilab-3.1.1-r3 256
 MD5 942cb58288349d75fab903ad93a89e78 files/digest-scilab-4.0 250
 RMD160 f4ee6ebd8218d59dd40f0a904b4dcfd5170a54a4 files/digest-scilab-4.0 250
 SHA256 f0a3368ccf9db2d8654c3f0b5ec04a19b9ecabba49457d9f604f18293525b708 files/digest-scilab-4.0 250
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 (file)
index f89cd69..0000000
+++ /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 (file)
index 63abe11..0000000
+++ /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 (file)
index 01ab00c..0000000
+++ /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\""
-}
index 220f9a0d7f6e776d149a87846a30199ae3e755d1..0ceba0bc0a7b7a39297b8536050529259f740300 100644 (file)
@@ -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*
        )
index 29e41127e40b88761ea479c760257e00c9f73cf1..a711be2e882f2791fec55c324cf46a4327a3b1c7 100644 (file)
@@ -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*
        )