Removed old ebuild and patches and beautified 3.2.0 ebuild a bit.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

6 files changed, 8 insertions, 213 deletions

diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index f0c630507ee7..47c043435396 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/octave
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.70 2009/07/08 01:44:18 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.71 2009/07/08 23:45:08 markusle Exp $
+
+  08 Jul 2009; Markus Dittrich <markusle@gentoo.org>
+  -files/octave-3.0.1-add_syspath.patch, -files/octave-3.0.1-chi2rnd.patch,
+  -files/octave-3.0.1-test-fix.patch, -octave-3.0.2.ebuild,
+  octave-3.2.0.ebuild:
+  Removed old ebuild and patches and beautified 3.2.0 ebuild a bit.
 
 *octave-3.2.0 (07 Jul 2009)
 
diff --git a/sci-mathematics/octave/files/octave-3.0.1-add_syspath.patch b/sci-mathematics/octave/files/octave-3.0.1-add_syspath.patch
deleted file mode 100644
index 7abd25bfe64d..000000000000
--- a/sci-mathematics/octave/files/octave-3.0.1-add_syspath.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# patch from debian svn
-## 50_add_syspath.dpatch by Thomas Weber <thomas.weber.mail@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Put library path in loadpath (bug fix for #477556)
-## DP: http://www.cae.wisc.edu/pipermail/octave-maintainers/2008-May/007330.html
-diff -urNad octave3.0-3.0.1~/src/load-path.cc octave3.0-3.0.1/src/load-path.cc
---- octave3.0-3.0.1~/src/load-path.cc	2008-04-21 18:00:20.000000000 +0200
-+++ octave3.0-3.0.1/src/load-path.cc	2008-05-21 10:20:38.000000000 +0200
-@@ -382,7 +382,7 @@
-     xpath += dir_path::path_sep_str + tpath;
- 
-   if (! sys_path.empty ())
--    xpath += sys_path;
-+    xpath += dir_path::path_sep_str + sys_path;
- 
-   do_set (xpath, false);
- }
-diff -urNad octave3.0-3.0.1~/src/load-path.cc.orig octave3.0-3.0.1/src/load-path.cc.orig
diff --git a/sci-mathematics/octave/files/octave-3.0.1-chi2rnd.patch b/sci-mathematics/octave/files/octave-3.0.1-chi2rnd.patch
deleted file mode 100644
index 5a9f6abf5932..000000000000
--- a/sci-mathematics/octave/files/octave-3.0.1-chi2rnd.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur octave-3.0.1/scripts/statistics/distributions/chi2rnd.m octave-3.0.1.new/scripts/statistics/distributions/chi2rnd.m
---- octave-3.0.1/scripts/statistics/distributions/chi2rnd.m	2008-04-21 11:58:40.000000000 -0400
-+++ octave-3.0.1.new/scripts/statistics/distributions/chi2rnd.m	2008-06-02 06:42:34.000000000 -0400
-@@ -68,7 +68,7 @@
-      if (find (!(n > 0) | !(n < Inf)))
-        rnd = NaN * ones (sz);
-      else
--       rnd = 2 * randg(n/2, sz)
-+       rnd = 2 * randg(n/2, sz);
-      endif
-   else
-     [retval, n, dummy] = common_size (n, ones (sz));
-@@ -84,7 +84,7 @@
- 
-     k = find ((n > 0) & (n < Inf));
-     if (any (k))
--      rnd(k) = 2 * randg(n(k)/2, size(k))
-+      rnd(k) = 2 * randg(n(k)/2, size(k));
-     endif
-   endif
- 
diff --git a/sci-mathematics/octave/files/octave-3.0.1-test-fix.patch b/sci-mathematics/octave/files/octave-3.0.1-test-fix.patch
deleted file mode 100644
index af4d15c40144..000000000000
--- a/sci-mathematics/octave/files/octave-3.0.1-test-fix.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -Naur octave-3.0.1/scripts/general/interpft.m octave-3.0.1.new/scripts/general/interpft.m
---- octave-3.0.1/scripts/general/interpft.m	2008-04-21 11:58:40.000000000 -0400
-+++ octave-3.0.1.new/scripts/general/interpft.m	2008-05-28 11:54:37.000000000 -0400
-@@ -105,10 +105,6 @@
- %! legend ('sin(4t+0.3)cos(3t-0.1','spline','interpft','data');
- 
- %!shared n,y
--%! x = [0:10]'; y = sin(x); n = length (x);
--%!assert (interpft(y, n), y, eps);
--%!assert (interpft(y', n), y', eps);
--%!assert (interpft([y,y],n), [y,y], eps);
- 
- %!error (interpft(y,n,0))
- %!error (interpft(y,[n,n]))
-diff -Naur octave-3.0.1/test/build_sparse_tests.sh octave-3.0.1.new/test/build_sparse_tests.sh
---- octave-3.0.1/test/build_sparse_tests.sh	2008-04-21 12:00:21.000000000 -0400
-+++ octave-3.0.1.new/test/build_sparse_tests.sh	2008-05-28 12:15:14.000000000 -0400
-@@ -872,20 +872,6 @@
- %! load(savefile,"as_save");
- %! unlink(savefile);
- %! assert(as_save,sparse(af));
--%!test # save binary
--%! savefile= tmpnam();
--%! as_save=as; save("-binary",savefile,"bf","as_save","af");
--%! clear as_save;
--%! load(savefile,"as_save");
--%! unlink(savefile);
--%! assert(as_save,sparse(af));
--%!test # save hdf5
--%! savefile= tmpnam();
--%! as_save=as; save("-hdf5",savefile,"bf","as_save","af");
--%! clear as_save;
--%! load(savefile,"as_save");
--%! unlink(savefile);
--%! assert(as_save,sparse(af));
- %!test # save matlab
- %! savefile= tmpnam();
- %! as_save=as; save("-mat",savefile,"bf","as_save","af");
-diff -Naur octave-3.0.1/test/test_system.m octave-3.0.1.new/test/test_system.m
---- octave-3.0.1/test/test_system.m	2008-04-21 12:00:22.000000000 -0400
-+++ octave-3.0.1.new/test/test_system.m	2008-05-28 11:53:26.000000000 -0400
-@@ -377,11 +377,6 @@
- %!error <Invalid call to file_in_path.*> file_in_path ("foo", "bar", "baz", "ooka");
- 
- %% test/octave.test/system/tilde_expand-1.m
--%!testif HAVE_GETPWUID
--%! x = getpwuid (getuid ());
--%! assert((strcmp (x.dir, tilde_expand ("~"))
--%! && strcmp (x.dir, tilde_expand (sprintf ("~%s", x.name)))
--%! && strcmp ("foobar", tilde_expand ("foobar"))));
- 
- %% test/octave.test/system/tilde_expand-2.m
- %!error <Invalid call to tilde_expand.*> tilde_expand ();
diff --git a/sci-mathematics/octave/octave-3.0.2.ebuild b/sci-mathematics/octave/octave-3.0.2.ebuild
deleted file mode 100644
index 4d506020caab..000000000000
--- a/sci-mathematics/octave/octave-3.0.2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.0.2.ebuild,v 1.3 2009/06/21 18:47:58 graaff Exp $
-
-inherit flag-o-matic fortran xemacs-elisp-common
-
-DESCRIPTION="High-level interactive language for numerical computations"
-LICENSE="GPL-3"
-HOMEPAGE="http://www.octave.org/"
-SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-IUSE="emacs readline zlib doc hdf5 curl fftw xemacs sparse"
-KEYWORDS="~amd64 ~x86 ~alpha ~hppa ~ppc ~ppc64 ~sparc"
-
-RDEPEND="virtual/lapack
-	dev-libs/libpcre
-	sys-libs/ncurses
-	sci-visualization/gnuplot
-	>=sci-mathematics/glpk-4.15
-	media-libs/qhull
-	fftw? ( >=sci-libs/fftw-3.1.2 )
-	zlib? ( sys-libs/zlib )
-	hdf5? ( sci-libs/hdf5 )
-	curl? ( net-misc/curl )
-	xemacs? ( app-editors/xemacs )
-	sparse? ( sci-libs/umfpack
-		sci-libs/colamd
-		sci-libs/camd
-		sci-libs/ccolamd
-		sci-libs/cholmod
-		sci-libs/cxsparse )
-	!sci-mathematics/octave-forge"
-
-DEPEND="${RDEPEND}
-	virtual/latex-base
-	sys-apps/texinfo
-	|| ( dev-texlive/texlive-genericrecommended
-		app-text/ptex )
-	dev-util/dejagnu
-	dev-util/gperf
-	dev-util/pkgconfig"
-
-FORTRAN="gfortran ifc g77 f2c"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-3.0.0-pkg.patch
-	epatch "${FILESDIR}"/${PN}-3.0.1-test-fix.patch
-	epatch "${FILESDIR}"/${PN}-3.0.1-add_syspath.patch
-	epatch "${FILESDIR}"/${PN}-3.0.1-fix_handle_for_plotyy.patch
-	epatch "${FILESDIR}"/${PN}-3.0.1-no_helvetica.patch
-	epatch "${FILESDIR}"/${PN}-3.0.1-chi2rnd.patch
-}
-
-src_compile() {
-
-	econf \
-		--localstatedir=/var/state/octave \
-		--enable-shared \
-		--with-blas="$(pkg-config --libs blas)" \
-		--with-lapack="$(pkg-config --libs lapack)" \
-		$(use_with hdf5) \
-		$(use_with curl) \
-		$(use_with zlib) \
-		$(use_with fftw) \
-		$(use_with sparse umfpack) \
-		$(use_with sparse colamd) \
-		$(use_with sparse ccolamd) \
-		$(use_with sparse cholmod) \
-		$(use_with sparse cxsparse) \
-		$(use_enable readline) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-
-	if use xemacs; then
-		cd "${S}/emacs"
-		xemacs-elisp-comp *.el
-	fi
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-
-	if use doc; then
-		einfo "Installing documentation..."
-		insinto /usr/share/doc/${PF}
-		doins $(find doc -name \*.pdf)
-	fi
-
-	if use emacs || use xemacs; then
-		cd emacs
-		exeinto /usr/bin
-		doexe octave-tags || die "Failed to install octave-tags"
-		doman octave-tags.1 || die "Failed to install octave-tags.1"
-		if use xemacs; then
-			xemacs-elisp-install ${PN} *.el *.elc
-		fi
-		cd ..
-	fi
-
-	echo "LDPATH=/usr/$(get_libdir)/octave-${PV}" > 99octave
-	doenvd 99octave || die
-
-	# Fixes ls-R files to remove /var/tmp/portage references.
-	sed -i \
-		-e "s:${D}::g" \
-		"${D}"/usr/*/${PN}/ls-R \
-		|| die "Failed to fix ls-R files."
-}
diff --git a/sci-mathematics/octave/octave-3.2.0.ebuild b/sci-mathematics/octave/octave-3.2.0.ebuild
index 3681736e3a77..b23ec6687c38 100644
--- a/sci-mathematics/octave/octave-3.2.0.ebuild
+++ b/sci-mathematics/octave/octave-3.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.2.0.ebuild,v 1.1 2009/07/08 01:44:18 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.2.0.ebuild,v 1.2 2009/07/08 23:45:08 markusle Exp $
 
 EAPI="2"
 inherit flag-o-matic fortran xemacs-elisp-common
@@ -94,10 +94,4 @@ src_install() {
 
 	echo "LDPATH=/usr/$(get_libdir)/octave-${PV}" > 99octave
 	doenvd 99octave || die
-
-	# Fixes ls-R files to remove /var/tmp/portage references.
-	#sed -i \
-	#	-e "s:${D}::g" \
-	#	"${D}"/usr/*/${PN}/ls-R \
-	#	|| die "Failed to fix ls-R files."
 }