Removed obsolete version and unused patches.

Package-Manager: portage-2.0.51.19

6 files changed, 6 insertions, 233 deletions

diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index 8f3961c30078..94af45eda9e0 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/octave
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.8 2005/06/10 11:48:14 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.9 2005/06/26 01:55:08 ribosome Exp $
+
+  26 Jun 2005; Olivier Fisette <ribosome@gentoo.org> -files/filebuf.diff,
+  -files/kill-dvips.diff, -octave-2.1.64.ebuild:
+  Removed obsolete version and unused patches.
 
   10 Jun 2005; Patrick Kursawe <phosphan@gentoo.org> octave-2.1.57-r1.ebuild,
   octave-2.1.64.ebuild, octave-2.1.69.ebuild:
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 1d6b452de2f9..456e6462fba2 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,10 +1,6 @@
 MD5 3fb33bc03a0980e6307e6bb1d68ea01f octave-2.1.69.ebuild 3348
-MD5 8d50fb87f058de6287adb1edf14d09dc octave-2.1.64.ebuild 3696
 MD5 62c4dfb1220dccc6624875121b80bbeb octave-2.1.57-r1.ebuild 3668
-MD5 bf8d7e08d3eac532ee648fdba1c1d809 ChangeLog 7865
+MD5 815604cebc26faef07ea6fdc8a1c050e ChangeLog 8036
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 32c6cee1f5b42b8b20369c3722fb4db2 files/digest-octave-2.1.57-r1 67
-MD5 74d376b9c7367fe7b333cbc7e8ca37b3 files/kill-dvips.diff 2448
-MD5 045463e5ebb1615d834a8145b27a765d files/filebuf.diff 1275
-MD5 157e958a946705cefe2968c7f46d5263 files/digest-octave-2.1.64 67
 MD5 67d13a7bca35d1d0210394b7735fd073 files/digest-octave-2.1.69 67
diff --git a/sci-mathematics/octave/files/digest-octave-2.1.64 b/sci-mathematics/octave/files/digest-octave-2.1.64
deleted file mode 100644
index bf66a94cf4d9..000000000000
--- a/sci-mathematics/octave/files/digest-octave-2.1.64
+++ /dev/null
@@ -1 +0,0 @@
-MD5 01ec8b13bd850123b190129be93adc1f octave-2.1.64.tar.bz2 4341798
diff --git a/sci-mathematics/octave/files/filebuf.diff b/sci-mathematics/octave/files/filebuf.diff
deleted file mode 100644
index 23a12464b348..000000000000
--- a/sci-mathematics/octave/files/filebuf.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -urN octave-2.1.36/src/c-file-ptr-stream.h octave-2.1.36-modified/src/c-file-ptr-stream.h
---- octave-2.1.36/src/c-file-ptr-stream.h	Thu Nov  1 23:12:00 2001
-+++ octave-2.1.36-modified/src/c-file-ptr-stream.h	Mon Jul 15 11:28:29 2002
-@@ -31,13 +31,23 @@
- #include <fstream>
- #include <cstdio>
- 
-+#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
-+# include <ext/stdio_filebuf.h>
-+#endif
-+
- class
--c_file_ptr_buf : public std::filebuf
-+#if defined __GNUC__ && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
-+  c_file_ptr_buf : public __gnu_cxx::stdio_filebuf<char>
-+#else
-+  c_file_ptr_buf : public std::filebuf
-+#endif
- {
- public:
- 
- #if !defined (CXX_ISO_COMPLIANT_LIBRARY)
-   typedef int int_type;
-+#else
-+  typedef std::filebuf::int_type int_type;
- #endif
- 
-   typedef int (*close_fcn) (FILE *);
-@@ -47,7 +57,11 @@
-   c_file_ptr_buf (FILE *f_arg, close_fcn cf_arg = ::fclose)
-     : 
- #if defined __GNUC__ && __GNUC__ >= 3
--    std::filebuf (f_arg, std::ios::in | std::ios::out),
-+# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
-+  __gnu_cxx::stdio_filebuf<char> (f_arg, std::ios::in | std::ios::out),
-+# else
-+  std::filebuf (f_arg, std::ios::in | std::ios::out),
-+#endif
- #else
-     std::filebuf (f_arg ? fileno (f_arg) : -1),
- #endif
diff --git a/sci-mathematics/octave/files/kill-dvips.diff b/sci-mathematics/octave/files/kill-dvips.diff
deleted file mode 100644
index 9d6ff5dead13..000000000000
--- a/sci-mathematics/octave/files/kill-dvips.diff
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -ru octave-2.1.36/doc/faq/Makefile octave-2.1.36-fixed/doc/faq/Makefile
---- octave-2.1.36/doc/faq/Makefile	2002-09-30 20:37:06.000000000 -0500
-+++ octave-2.1.36-fixed/doc/faq/Makefile	2002-09-30 21:18:21.000000000 -0500
-@@ -46,8 +46,6 @@
- 	  export TEXINPUTS; \
- 	  $(TEXI2DVI) $(srcdir)/Octave-FAQ.texi
- 
--Octave-FAQ.ps: Octave-FAQ.dvi
--	-dvips -o Octave-FAQ.ps Octave-FAQ.dvi
- 
- # These option forms are supported by texi2html 1.65 and probably also
- # more recent versions.
-diff -ru octave-2.1.36/doc/interpreter/Makefile octave-2.1.36-fixed/doc/interpreter/Makefile
---- octave-2.1.36/doc/interpreter/Makefile	2002-09-30 20:37:06.000000000 -0500
-+++ octave-2.1.36-fixed/doc/interpreter/Makefile	2002-09-30 21:18:30.000000000 -0500
-@@ -88,8 +88,6 @@
- 	  export TEXINPUTS; \
- 	  $(TEXI2DVI) $<
- 
--octave.ps: octave.dvi
--	-dvips -o octave.ps octave.dvi
- 
- ../../INSTALL.OCTAVE: install.texi
- 	rm -f INSTALL
-diff -ru octave-2.1.36/doc/liboctave/Makefile octave-2.1.36-fixed/doc/liboctave/Makefile
---- octave-2.1.36/doc/liboctave/Makefile	2002-09-30 20:37:06.000000000 -0500
-+++ octave-2.1.36-fixed/doc/liboctave/Makefile	2002-09-30 21:18:38.000000000 -0500
-@@ -50,8 +50,6 @@
- 	  export TEXINPUTS; \
- 	  $(TEXI2DVI) $(srcdir)/liboctave.texi
- 
--liboctave.ps: liboctave.dvi
--	-dvips -o liboctave.ps liboctave.dvi
- 
- # These option forms are supported by texi2html 1.65 and probably also
- # more recent versions.
-diff -ru octave-2.1.36/doc/refcard/Makefile octave-2.1.36-fixed/doc/refcard/Makefile
---- octave-2.1.36/doc/refcard/Makefile	2002-09-30 20:37:06.000000000 -0500
-+++ octave-2.1.36-fixed/doc/refcard/Makefile	2002-09-30 21:19:08.000000000 -0500
-@@ -38,22 +38,16 @@
- 	-TEXINPUTS="$(srcdir):$(TEXINPUTS):"; export TEXINPUTS; \
- 	  tex $(srcdir)/refcard-a4.tex
- 
--refcard-a4.ps: refcard-a4.dvi
--	-dvips -T 297mm,210mm -o refcard-a4.ps refcard-a4.dvi
- 
- refcard-legal.dvi: refcard-legal.tex refcard.tex
- 	-TEXINPUTS="$(srcdir):$(TEXINPUTS):"; export TEXINPUTS; \
- 	  tex $(srcdir)/refcard-legal.tex
- 
--refcard-legal.ps: refcard-legal.dvi
--	-dvips -T 14in,8.5in -o refcard-legal.ps refcard-legal.dvi
- 
- refcard-letter.dvi: refcard-letter.tex refcard.tex
- 	-TEXINPUTS="$(srcdir):$(TEXINPUTS):"; export TEXINPUTS; \
- 	  tex $(srcdir)/refcard-letter.tex
- 
--refcard-letter.ps: refcard-letter.dvi
--	-dvips -T 11in,8.5in -o refcard-letter.ps refcard-letter.dvi
- 
- check install install-strip uninstall:
- .PHONY: check install install-strip uninstall
diff --git a/sci-mathematics/octave/octave-2.1.64.ebuild b/sci-mathematics/octave/octave-2.1.64.ebuild
deleted file mode 100644
index d0ba85887d4c..000000000000
--- a/sci-mathematics/octave/octave-2.1.64.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.64.ebuild,v 1.7 2005/06/10 11:48:14 phosphan Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="GNU Octave is a high-level language (MatLab compatible) intended for numerical computations"
-HOMEPAGE="http://www.octave.org/"
-SRC_URI="ftp://ftp.octave.org/pub/octave/bleeding-edge/${P}.tar.bz2
-		ftp://ftp.math.uni-hamburg.de/pub/soft/math/octave/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64"
-IUSE="emacs static readline zlib tetex hdf5 mpi ifc blas"
-
-DEPEND="virtual/libc
-	>=sys-libs/ncurses-5.2-r3
-	>=media-gfx/gnuplot-3.7.1-r3
-	>=sci-libs/fftw-2.1.3
-	>=dev-util/gperf-2.7.2
-	zlib? ( sys-libs/zlib )
-	hdf5? ( sci-libs/hdf5 )
-	tetex? ( virtual/tetex )
-	x86? ( ifc? ( dev-lang/ifc ) )
-	blas? ( virtual/blas )
-	!=app-text/texi2html-1.70"
-
-# NOTE: octave supports blas/lapack from intel but this is not open
-# source nor is it free (as in beer OR speech) Check out...
-# http://developer.intel.com/software/products/mkl/mkl52/index.htm for
-# more information
-
-pkg_setup() {
-	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 fortran to your USE flags and reemerge gcc!"
-		die
-	fi
-}
-
-src_compile() {
-	filter-flags -ffast-math
-
-	local myconf
-
-	use static || myconf="--disable-static --enable-shared --enable-dl"
-	use readline || myconf="${myconf} --disable-readline"
-	use hdf5 || myconf="${myconf} --without-hdf5"
-	use mpi  || myconf="${myconf} --without-mpi"
-
-	# Only add -lz to LDFLAGS if we have zlib in USE !
-	# BUG #52604
-	# Danny van Dyk 2004/08/26
-	use zlib && LDFLAGS="${LDFLAGS} -lz"
-
-	# NOTE: This version actually works with gcc-3.x
-	./configure ${myconf} --prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var/state/octave \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--host=${CHOST} \
-		--build=${CHOST} \
-		--target=${CHOST} \
-		--enable-rpath \
-		--enable-lite-kernel \
-		LDFLAGS="${LDFLAGS}" || die "configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die "make install failed"
-	use tetex && octave-install-doc
-	if use emacs; then
-		cd emacs
-		exeinto /usr/bin
-		doexe otags
-		doman otags.1
-		for emacsdir in /usr/share/emacs/site-lisp /usr/lib/xemacs/site-lisp; do
-			insinto ${emacsdir}
-			doins *.el
-		done
-		cd ..
-	fi
-	dodir /etc/env.d
-	echo "LDPATH=/usr/lib/octave-${PV}" > ${D}/etc/env.d/99octave
-}
-
-pkg_postinst() {
-	echo
-	einfo "Some users have reported failures at running simple tests if"
-	einfo "octave was built with agressive optimisations. You can check if"
-	einfo "your setup is affected by this bug by running the following test"
-	einfo "(inside the octave interpreter):"
-	einfo
-	einfo "octave:1> y = [1 3 4 2 1 5 3 5 6 7 4 5 7 10 11 3];"
-	einfo "octave:2> g = [1 1 1 1 1 1 1 1 2 2 2 2 2 3 3 3];"
-	einfo "octave:3> anova(y, g)"
-	einfo
-	einfo "If these commands complete successfully with no error message,"
-	einfo "your installation should be ok. Otherwise, try recompiling"
-	einfo "octave using less agressive \"CFLAGS\" (combining \"-O3\" and"
-	einfo "\"-march=pentium4\" is known to cause problems)."
-	echo
-}
-
-octave-install-doc() {
-	echo "Installing documentation..."
-	insinto /usr/share/doc/${PF}
-	doins doc/faq/Octave-FAQ.dvi
-	doins doc/interpreter/octave.dvi
-	doins doc/liboctave/liboctave.dvi
-	doins doc/refcard/refcard-a4.dvi
-	doins doc/refcard/refcard-legal.dvi
-	doins doc/refcard/refcard-letter.dvi
-}