Version bump

(Portage version: 2.1.10.63/cvs/Linux x86_64)

9 files changed, 18 insertions, 218 deletions

diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index 9df27c9b5fe3..dc41b7b73e60 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-mathematics/octave
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.125 2012/05/04 07:46:51 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.126 2012/06/06 21:31:28 bicatali Exp $
+
+*octave-3.6.2 (06 Jun 2012)
+
+  06 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/octave-3.2.0_as_needed.patch, -files/octave-3.2.0_parallel_make.patch,
+  -octave-3.2.4-r1.ebuild, -files/octave-3.2.4-curl-headers.patch,
+  -files/octave-3.2.4-fltk-magic.patch, -files/octave-3.2.4-imread.patch,
+  -files/octave-3.2.4-ldflags.patch, -octave-3.6.0.ebuild,
+  +octave-3.6.2.ebuild:
+  Version bump
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> octave-3.2.4-r1.ebuild,
   octave-3.4.3-r1.ebuild, octave-3.6.0.ebuild, octave-3.6.1.ebuild:
diff --git a/sci-mathematics/octave/files/octave-3.2.0_as_needed.patch b/sci-mathematics/octave/files/octave-3.2.0_as_needed.patch
deleted file mode 100644
index bce3e01a394e..000000000000
--- a/sci-mathematics/octave/files/octave-3.2.0_as_needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur octave-3.2.0/liboctave/Makefile.in octave-3.2.0.new/liboctave/Makefile.in
---- octave-3.2.0/liboctave/Makefile.in	2009-05-25 02:04:59.000000000 -0400
-+++ octave-3.2.0.new/liboctave/Makefile.in	2009-07-10 10:32:09.000000000 -0400
-@@ -35,6 +35,7 @@
- DLL_CXXDEFS = @OCTAVE_DLL_DEFS@
- 
- LINK_DEPS = \
-+  -lpthread \
-   -L../libcruft -L. $(RLD_FLAG) \
-   $(LIBCRUFT) $(CHOLMOD_LIBS) $(UMFPACK_LIBS)  $(AMD_LIBS) \
-   $(CAMD_LIBS) $(COLAMD_LIBS) $(CCOLAMD_LIBS) $(CXSPARSE_LIBS) \
diff --git a/sci-mathematics/octave/files/octave-3.2.0_parallel_make.patch b/sci-mathematics/octave/files/octave-3.2.0_parallel_make.patch
deleted file mode 100644
index bcc2f7d29a2a..000000000000
--- a/sci-mathematics/octave/files/octave-3.2.0_parallel_make.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur octave-3.2.0/doc/Makefile.in octave-3.2.0.new/doc/Makefile.in
---- octave-3.2.0/doc/Makefile.in	2009-06-03 07:55:40.000000000 -0400
-+++ octave-3.2.0.new/doc/Makefile.in	2009-07-07 18:20:14.000000000 -0400
-@@ -30,6 +30,8 @@
- all: conf.texi $(SUBDIRS)
- .PHONY: all
- 
-+$(SUBDIRS): conf.texi
-+
- conf.texi: conf.texi.in $(TOPDIR)/Makeconf
- 	@$(do-subst-texinfo-vals)
- 
diff --git a/sci-mathematics/octave/files/octave-3.2.4-curl-headers.patch b/sci-mathematics/octave/files/octave-3.2.4-curl-headers.patch
deleted file mode 100644
index aa4ca54537ca..000000000000
--- a/sci-mathematics/octave/files/octave-3.2.4-curl-headers.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/DLD-FUNCTIONS/urlwrite.cc b/src/DLD-FUNCTIONS/urlwrite.cc
-index 4f9aeac..d8a63da 100644
---- a/src/DLD-FUNCTIONS/urlwrite.cc
-+++ b/src/DLD-FUNCTIONS/urlwrite.cc
-@@ -46,7 +46,6 @@ along with Octave; see the file COPYING.  If not, see
- #if defined (HAVE_CURL)
- 
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- 
- // Write callback function for curl.
diff --git a/sci-mathematics/octave/files/octave-3.2.4-fltk-magic.patch b/sci-mathematics/octave/files/octave-3.2.4-fltk-magic.patch
deleted file mode 100644
index fe1f7acb2c4f..000000000000
--- a/sci-mathematics/octave/files/octave-3.2.4-fltk-magic.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- configure.in	2010-01-19 11:13:14.000000000 +0000
-+++ configure.in.new	2010-05-05 00:56:31.000000000 +0100
-@@ -749,6 +749,11 @@
- GRAPHICS_CFLAGS=
- 
- ## fltk (www.fltk.org)
-+AC_ARG_WITH(fltk,
-+  [AS_HELP_STRING([--without-fltk], [don't use FLTK for native grphics])],
-+  with_fltk=$withval, with_fltk=yes)
-+
-+if test "$with_fltk" = yes; then
- AC_ARG_WITH(fltk-prefix,
-         [  --with-fltk-prefix=PFX   Prefix where FLTK is installed (optional)],
-         fltk_prefix="$withval",
-@@ -773,6 +778,9 @@
- fi
- 
- AC_PATH_PROG(FLTK_CONFIG, fltk-config, no)
-+else
-+   FLTK_CONFIG=no
-+fi
- 
- warn_fltk_config=""
- warn_fltk_opengl=""
diff --git a/sci-mathematics/octave/files/octave-3.2.4-imread.patch b/sci-mathematics/octave/files/octave-3.2.4-imread.patch
deleted file mode 100644
index 4a7b73ea0ed8..000000000000
--- a/sci-mathematics/octave/files/octave-3.2.4-imread.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/DLD-FUNCTIONS/__magick_read__.cc.orig	2010-03-06 08:05:25.000000000 +0000
-+++ src/DLD-FUNCTIONS/__magick_read__.cc	2009-08-25 09:26:01.000000000 +0100
-@@ -30,6 +30,7 @@
- #include "defun-dld.h"
- #include "error.h"
- #include "ov-struct.h"
-+#include "oct-env.h"
- 
- #ifdef HAVE_MAGICK
- 
-@@ -359,6 +358,18 @@
- 
- #ifdef HAVE_MAGICK
- 
-+  static bool initialized = false;
-+
-+  if (! initialized)
-+    {
-+      std::string program_name = octave_env::get_program_invocation_name ();
-+
-+      Magick::InitializeMagick (program_name.c_str ());
-+
-+      initialized = true;
-+    }
-+
-+
-   if (args.length () > 2 || args.length () < 1 || ! args(0).is_string ()
-       || nargout > 3)
-     {
diff --git a/sci-mathematics/octave/files/octave-3.2.4-ldflags.patch b/sci-mathematics/octave/files/octave-3.2.4-ldflags.patch
deleted file mode 100644
index 291914c6124e..000000000000
--- a/sci-mathematics/octave/files/octave-3.2.4-ldflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makeconf.in.orig	2010-03-06 09:02:46.000000000 +0000
-+++ Makeconf.in	2010-03-06 09:23:06.000000000 +0000
-@@ -209,10 +209,10 @@
- BUILD_LDFLAGS = @BUILD_LDFLAGS@
- 
- SH_LD = @SH_LD@
--SH_LDFLAGS = @SH_LDFLAGS@
-+SH_LDFLAGS = @SH_LDFLAGS@ @LDFLAGS@
- 
- DL_LD = @DL_LD@
--DL_LDFLAGS = @DL_LDFLAGS@
-+DL_LDFLAGS = @DL_LDFLAGS@ @LDFLAGS@
- 
- SONAME_FLAGS = @SONAME_FLAGS@
- 
diff --git a/sci-mathematics/octave/octave-3.2.4-r1.ebuild b/sci-mathematics/octave/octave-3.2.4-r1.ebuild
deleted file mode 100644
index 2bd07e093ac6..000000000000
--- a/sci-mathematics/octave/octave-3.2.4-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.2.4-r1.ebuild,v 1.15 2012/05/04 07:46:51 jdhore Exp $
-
-EAPI="2"
-inherit flag-o-matic xemacs-elisp-common autotools
-
-DESCRIPTION="High-level interactive language for numerical computations"
-LICENSE="GPL-3"
-HOMEPAGE="http://www.octave.org/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-IUSE="curl doc emacs fltk fftw opengl readline sparse test xemacs zlib"
-KEYWORDS="amd64 hppa ppc ppc64 x86"
-
-RDEPEND="dev-libs/libpcre
-	media-gfx/graphicsmagick[cxx]
-	media-libs/qhull
-	sci-libs/qrupdate
-	sci-mathematics/glpk
-	sci-visualization/gnuplot
-	sys-libs/ncurses
-	virtual/lapack
-	x11-libs/libX11
-	curl? ( net-misc/curl )
-	fltk? ( x11-libs/fltk:1[opengl?] )
-	fftw? ( sci-libs/fftw:3.0 )
-	opengl? ( virtual/opengl media-libs/ftgl )
-	sparse? ( sci-libs/arpack
-		sci-libs/camd
-		sci-libs/ccolamd
-		sci-libs/cholmod
-		sci-libs/colamd
-		sci-libs/cxsparse
-		sci-libs/umfpack )
-	xemacs? ( app-editors/xemacs )
-	zlib? ( sys-libs/zlib )
-	!sci-mathematics/octave-forge"
-
-DEPEND="${RDEPEND}
-	virtual/latex-base
-	sys-apps/texinfo
-	dev-texlive/texlive-genericrecommended
-	dev-util/gperf
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.2.0_parallel_make.patch \
-		"${FILESDIR}"/${PN}-3.2.0_as_needed.patch \
-		"${FILESDIR}"/${PN}-3.2.4-imread.patch \
-		"${FILESDIR}"/${PN}-3.2.4-ldflags.patch \
-		"${FILESDIR}"/${PN}-3.2.4-fltk-magic.patch \
-		"${FILESDIR}"/${P}-curl-headers.patch
-	eautoreconf
-}
-
-src_configure() {
-	# hdf5 disabled because not really useful (bug #299876)
-	econf \
-		--localstatedir=/var/state/octave \
-		--enable-shared \
-		--without-hdf5 \
-		--with-qrupdate \
-		--with-blas="$(pkg-config --libs blas)" \
-		--with-lapack="$(pkg-config --libs lapack)" \
-		$(use_enable readline) \
-		$(use_with curl) \
-		$(use_with fftw) \
-		$(use_with fltk) \
-		$(use_with opengl framework-opengl) \
-		$(use_with sparse arpack) \
-		$(use_with sparse umfpack) \
-		$(use_with sparse colamd) \
-		$(use_with sparse ccolamd) \
-		$(use_with sparse cholmod) \
-		$(use_with sparse cxsparse) \
-		$(use_with zlib)
-}
-
-src_compile() {
-	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
-	use test && dodoc test/fntests.log
-	echo "LDPATH=/usr/$(get_libdir)/octave-${PV}" > 99octave
-	doenvd 99octave || die
-}
diff --git a/sci-mathematics/octave/octave-3.6.0.ebuild b/sci-mathematics/octave/octave-3.6.2.ebuild
index 8f1e1fa2c2f2..b7e3aa0ac8ef 100644
--- a/sci-mathematics/octave/octave-3.6.0.ebuild
+++ b/sci-mathematics/octave/octave-3.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.6.0.ebuild,v 1.7 2012/05/04 07:46:51 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.6.2.ebuild,v 1.1 2012/06/06 21:31:28 bicatali Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.octave.org/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 SLOT="0"
-IUSE="curl doc fftw +glpk +imagemagick opengl +qhull +qrupdate
+IUSE="curl doc fftw +glpk gnuplot +imagemagick opengl +qhull +qrupdate
 	readline +sparse static-libs X zlib"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
@@ -24,6 +24,7 @@ RDEPEND="dev-libs/libpcre
 	curl? ( net-misc/curl )
 	fftw? ( sci-libs/fftw:3.0 )
 	glpk? ( sci-mathematics/glpk )
+	gnuplot? ( sci-visualization/gnuplot )
 	imagemagick? ( || (
 			media-gfx/graphicsmagick[cxx]
 			media-gfx/imagemagick[cxx] ) )
@@ -56,6 +57,9 @@ DEPEND="${RDEPEND}
 PATCHES=( "${FILESDIR}"/${PN}-3.4.3-{pkgbuilddir,help,texi}.patch )
 
 src_configure() {
+	# occasional fail on install, force regeneration  see bug #401189
+	rm -f doc/interpreter/contributors.texi || die
+
 	# hdf5 disabled because not really useful (bug #299876)
 	local myconf="--without-magick"
 	if use imagemagick; then
@@ -66,7 +70,7 @@ src_configure() {
 		fi
 	fi
 
-	myeconfargs+=(
+	local myeconfargs+=(
 		--localstatedir="${EPREFIX}/var/state/octave"
 		--without-hdf5
 		--with-blas="$(pkg-config --libs blas)"