9 files changed, 50 insertions, 588 deletions
diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index f69fc10e4798..9098fd363cfe 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/octave
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.86 2010/03/11 15:30:03 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.87 2010/05/04 23:40:04 bicatali Exp $
+
+  05 May 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  -octave-2.1.57-r1.ebuild, -octave-2.1.69.ebuild, -octave-2.1.72.ebuild,
+  -octave-3.2.3-r1.ebuild, -octave-3.2.4.ebuild, octave-3.2.4-r1.ebuild,
+  +files/octave-3.2.4-fltk-magic.patch:
+  Fixed some fltk automagic
 
   11 Mar 2010; Sébastien Fabbro <bicatali@gentoo.org>
   octave-3.2.4-r1.ebuild:
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 0dad58bee21e..bca7d3fff74e 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX octave-2.1.72-gcc4.1-gentoo.patch 4224 RMD160 d179b48f2e47e0e9b2312b3b21cc625ecaeb2e9a SHA1 54da4d74cb5d172310de64fc6cc9e32d56823e82 SHA256 24f0ccb8c2aa4004bd251f0095b8a83417f320326ba99a0bba46f8b178722a66
 AUX octave-2.1.73-f2c-fix.patch 419 RMD160 3f8768b9073bcd2d93a5c6064d518299ad0b86a6 SHA1 3c4ee31b5d85d1d8c5f523f39ea25a4a2e577b0d SHA256 18c29afa2402e562cf11ac5a0c7718ed5c9713846dfd0245b2930aaa1939fa41
 AUX octave-2.1.73-gcc-4.3.patch 8087 RMD160 b2d9bbb8f012b6fe9106594394627fd76f112ef9 SHA1 fb5407e628ed4ecbb1ab5c0bb43a595ca2e7bbb1 SHA256 d4a080e57562163c36ab435ba09a94fa4e748a9c91f700625706967e1c0092f6
@@ -9,25 +12,24 @@ AUX octave-3.0.3-test-fix.patch 2177 RMD160 a0fb9ba636b3225bed404da2214e80d6d76c
 AUX octave-3.2.0-dlmwrite.patch 408 RMD160 b07957be254b27a0b354abdf2bf8ef60eaa57f40 SHA1 939f22b2de2d38147c3a0cae10d13bc80087dc38 SHA256 5a581e927e1c2c3b859e08c950f1695bd4db2d539b650cf9497713e03b1af485
 AUX octave-3.2.0_as_needed.patch 485 RMD160 6476d8af9ada03c4b169e87e65d674a3b4bb810b SHA1 f0af5b1435ae2ca9eee08e37de5f3dda0e662b26 SHA256 cd4e0d0299b487959396313a42fdc94b2f069dd99c3127789496cfa40da71e9e
 AUX octave-3.2.0_parallel_make.patch 374 RMD160 0e597204583c44c6c67aa5c5360a73f0f6bae298 SHA1 85170197541aa797ff41f7c46e1e3594dbf32fe4 SHA256 d2864f9b0dbea021120be04d16f57759d881bff11bf2b90e34c7b68c770adb23
+AUX octave-3.2.4-fltk-magic.patch 627 RMD160 f0b36faf95cf123e9a51d40555f9c4fe0b1f75d6 SHA1 819e3bc87998a3a8a803668bc865cef7e89b3e7a SHA256 0f2e265a5345409e8dce8071a7586e3addc113d1f89a96ed8c8d0d84efbdcbb8
 AUX octave-3.2.4-imread.patch 684 RMD160 d3ccc76eabe52ed90d7b6d3e41d48e9871221f34 SHA1 b7384f4a2c2e5ca4dfacccce9a1ebdae844986aa SHA256 7133d8cab02f310270154aca272bc929b3507e2b20ffd6fc93603444019ce250
 AUX octave-3.2.4-ldflags.patch 365 RMD160 65e753b086871b91e43995ce56491a2e057a020d SHA1 c70ae715234f737d6218b955748ecf65c56cf0be SHA256 55a3bd8cba99c9bc70cd2d7f40544beda9752df18ed681cf7fd44c4e4d937b80
 AUX octave-example-fix.patch 566 RMD160 9761e1a45e0d54795aff5cd50120b963492ac175 SHA1 9f84d6831a1d7773c9504a1d93308de97af85d88 SHA256 e387b14de2e5ef4e4246a84721d6b4a378670b3bffbffdc65db56e7dadcde76a
-DIST octave-2.1.57.tar.bz2 4202080 RMD160 53118458a03e7c10da3f1cc5eb65952c07744719 SHA1 126f79fd169a31883d7f7193caa459be19924acd SHA256 fbc3e2c8f603d87181d5ccd88e42dd7f3226a18151b5e068308561969e2edbd6
-DIST octave-2.1.69.tar.bz2 5818959 RMD160 88a59f0dfe4c343f011f78b07dbf069b03e29b5c SHA1 f9a43c612ac1d9a8bf25757801c46674dfe38f97 SHA256 ea27262f5ab00020f1017ccf4839cae5e6775f71d60903e5b515d472278944a9
-DIST octave-2.1.72.tar.bz2 5808544 RMD160 b9a1056a98a524591b0f497f3c11ccc436a18eec SHA1 a696c65667a4a99d55279103065d1d0af5a5fb09 SHA256 d8b2dec9eb979c35be435896105c1c31dd61aa2c0f27be8b8b2645fa5d60bb90
 DIST octave-2.1.73.tar.bz2 5790133 RMD160 d34c6ecd8f84c728ad7687d9568b9d69ade6f5db SHA1 58221aa15fcefd66b03531ac0ae9b1d2356e7555 SHA256 8ccaee227c6cad3b5633a904414f17ce73de8eab2abd4d2e6a3972dd878ffbc3
 DIST octave-3.0.3.tar.bz2 10159024 RMD160 1a162862a457675e2d94de306c1ec8f1643c9e07 SHA1 5c619254521a5fe14b3ec8a6eecbf104f9fa41dc SHA256 f90108bf6a2f9930907aa740d1c4d39551985cf3b5c5eb5dfdb436e0d3b5d79d
-DIST octave-3.2.3.tar.bz2 12085781 RMD160 30c1892544ba67054f1888758ebc2b1ede8848c0 SHA1 7a188ffd55ac1efb2f480fa2aed94e66d3596f34 SHA256 309b486825f0b576b7581344a4946bbd8c4cde75c32a2515ae0cfc09a7975fda
 DIST octave-3.2.4.tar.bz2 12080959 RMD160 6dcdea7ef2431b8427da5e6b9d2113e0e5736f43 SHA1 7de078564027108f3436f3ba7bf5993a6b411a67 SHA256 48471d05c7ed9c0a5a4d5fa4ae8a857447ac3da1197f86cfe79b9d8f4fdfd147
-EBUILD octave-2.1.57-r1.ebuild 3449 RMD160 629851ad2e5420b4071cf9aad6d6053f003a4740 SHA1 10aa80c87c893249b76189d4082f934a9e9df578 SHA256 219a9674d55e5cea4a3e91e9d81264509e28b65c3de88e1e7bda08c7da5cdef2
-EBUILD octave-2.1.69.ebuild 3420 RMD160 b6634585a939a0288a63050fa91e68eff3711f4a SHA1 0e4aeb41856301a16b275615b1397e58c3a68fc1 SHA256 5eda06d44181914cfc901a186d3f4df7281021ea45ab5f4c897966cdaf6c9bc6
-EBUILD octave-2.1.72.ebuild 3898 RMD160 fafafcc48747afb3da2fcdcdc81a2486b575f870 SHA1 5075942e83fd399cfe41c30f76ba2991d058be61 SHA256 e4cf3de05869ee88468f5b4435f6f25cff801eb18e95bfb0583144aeb02d7a63
 EBUILD octave-2.1.73-r1.ebuild 4414 RMD160 214ba0c7d64fdfda139c8f3b90cf635d22386ff4 SHA1 c611676fcad0a19430911606214c1f907d319c56 SHA256 46a7078a89b10449cb3d47f7eafef3010b8ef84a0515430136147ea206b48587
 EBUILD octave-2.1.73-r2.ebuild 4593 RMD160 57768e35057cf967aad85d0be56f9381f6c35b9b SHA1 350720616d3ddbae4a337269f429a82704c1cd8c SHA256 88059be54c26282937ffdbab146661ca6d089520ec66457fc127793fe236b610
 EBUILD octave-2.1.73.ebuild 4254 RMD160 fedeb9bb23ddcc88b60ac4110975834b3e254d13 SHA1 b19e77a0ef495ae0e09e6b750f2307357e154db2 SHA256 121a531d99733d9b8e53f26574caf52dd1c3d34ab15ab2b981061ef9bf8b245c
 EBUILD octave-3.0.3.ebuild 2681 RMD160 b2b31461e4b4fa71b5d4a9cd3c7616f005165958 SHA1 3ccfbfca3c9c8c5d0c9ae81b9bf0f26118c696d1 SHA256 190ff7f058e1bfc39c267511a16f91cda59e718b4e457fdf90c1eb3dc63b729a
-EBUILD octave-3.2.3-r1.ebuild 2532 RMD160 36f18ceeb2d84752907529c4c43a485c7b332558 SHA1 76982cb317cd0987c767c551055c096e1bc6ae17 SHA256 b994db4c6bd8fa3c70237623c37181be400c0f7047d367351e687108d2ad1442
-EBUILD octave-3.2.4-r1.ebuild 2859 RMD160 8e67d308d1d70c42cc34e5443d3b8318a52e5dac SHA1 58199b8475c4d3be3f2a9d6b6e89cc57487d1c39 SHA256 4dfe148ccbfe4fe73826535288186a8e9fc033368889aa995e9cb8f8cb520c15
-EBUILD octave-3.2.4.ebuild 2926 RMD160 e588650bbaf6badd1df44648292b71acff6ac110 SHA1 ec27e2a96d60726c6d0c5b3b3680ba1e7da61901 SHA256 ed377cb7242c4f5fb1ebcca557f202be560414ea061240fe6ecf7c55d43dd6ad
-MISC ChangeLog 22319 RMD160 69a42870c8c973d8db7718c59083e4daddfe3568 SHA1 acbecacf7d534f7608a885853597eb6361b9d5ad SHA256 21ffa4c7dafb59c1c493310898d8960dc599b56a96f3acdb31382f54faa61629
+EBUILD octave-3.2.4-r1.ebuild 2922 RMD160 13392b048f9f2133e15e7d9a3d6afae246672fdd SHA1 f53340f7435be67448034eee3a5879d0c626ae9b SHA256 65482513b8e5e0ae0024f124d089720741ed3afe1b418ae2adb8138f28acfe9a
+MISC ChangeLog 22590 RMD160 3072e50b820ad452e1db62a19f3180a5925e5e9c SHA1 e48eb700c70e5d8a5c2641eed1c482ef694515e6 SHA256 efd8bbadffc4b34663d7edc8a4310c19443eec2cb581265747e83285fde9ee86
 MISC metadata.xml 260 RMD160 27a4292b758e1199d0092b731cba79033f1b4167 SHA1 9997a99a4d6115f3b901208ba711d735ce9be36e SHA256 5fda55fd44bfec5755e1c3ac828887c37f0eebed6b3b972454e123ac2472d3ff
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkvgupkACgkQ1ycZbhPLE2DV4QCeNlzCmjMoBXM2NtqDNNiQFwIW
+TkYAnRUBGR7PCHuddXg6zE2c5b+y9Hmr
+=z2Hk
+-----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..fe1f7acb2c4f
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-3.2.4-fltk-magic.patch
@@ -0,0 +1,24 @@
+--- 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/octave-2.1.57-r1.ebuild b/sci-mathematics/octave/octave-2.1.57-r1.ebuild
deleted file mode 100644
index 05e8dfc1ee95..000000000000
--- a/sci-mathematics/octave/octave-2.1.57-r1.ebuild
+++ /dev/null
@@ -1,113 +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-2.1.57-r1.ebuild,v 1.13 2009/09/23 20:11:50 patrick Exp $
-
-inherit flag-o-matic fortran
-
-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 latex hdf5 mpi blas"
-
-DEPEND=">=sys-libs/ncurses-5.2-r3
-	>=sci-visualization/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 )
-	latex? ( virtual/latex-base )
-	blas? ( virtual/blas )"
-RDEPEND="${DEPEND}"
-
-# 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
-FORTRAN="gfortran g77 ifc"
-
-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 latex && 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
-}
diff --git a/sci-mathematics/octave/octave-2.1.69.ebuild b/sci-mathematics/octave/octave-2.1.69.ebuild
deleted file mode 100644
index 6e3e7e3aa2ce..000000000000
--- a/sci-mathematics/octave/octave-2.1.69.ebuild
+++ /dev/null
@@ -1,110 +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-2.1.69.ebuild,v 1.15 2009/09/23 20:11:50 patrick Exp $
-
-inherit flag-o-matic fortran
-
-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="alpha amd64 ppc ~sparc x86"
-IUSE="emacs static readline zlib latex hdf5 mpi blas"
-
-DEPEND=">=sys-libs/ncurses-5.2-r3
-	>=sci-visualization/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 )
-	latex? ( virtual/latex-base )
-	blas? ( virtual/blas )
-	mpi? ( sys-cluster/lam-mpi )
-	!=app-text/texi2html-1.70"
-RDEPEND="${DEPEND}"
-
-# 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
-FORTRAN="gfortran g77 ifc"
-
-src_compile() {
-	filter-flags -ffast-math
-
-	local myconf="--localstatedir=/var/state/octave --enable-rpath"
-	myconf="${myconf} --enable-lite-kernel"
-	use static || myconf="${myconf} --disable-static --enable-shared --enable-dl"
-	# Only add -lz to LDFLAGS if we have zlib in USE !
-	# BUG #52604
-	# Danny van Dyk 2004/08/26
-	use zlib && LDFLAGS="${LDFLAGS} -lz"
-
-	if use mpi; then
-		myconf="${myconf} --with-mpi=lammpi++"
-	else
-		myconf="${myconf} --without-mpi"
-	fi
-
-	econf \
-		$(use_with hdf5) \
-		$(use_enable readline) \
-		${myconf} \
-		LDFLAGS="${LDFLAGS}" || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "make install failed"
-	use latex && 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
-
-	# Fixes ls-R files to remove /var/tmp/portage references.
-	sed -i -e "s:${D}::g" "${D}"/usr/libexec/${PN}/ls-R || die
-	sed -i -e "s:${D}::g" "${D}"/usr/share/${PN}/ls-R || die
-}
-
-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
-}
diff --git a/sci-mathematics/octave/octave-2.1.72.ebuild b/sci-mathematics/octave/octave-2.1.72.ebuild
deleted file mode 100644
index 0ba8d909914f..000000000000
--- a/sci-mathematics/octave/octave-2.1.72.ebuild
+++ /dev/null
@@ -1,130 +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-2.1.72.ebuild,v 1.14 2009/09/23 20:11:50 patrick Exp $
-
-inherit flag-o-matic fortran
-
-DESCRIPTION="GNU Octave is a high-level language (MatLab compatible) intended for numerical computations"
-LICENSE="GPL-2"
-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"
-
-SLOT="0"
-IUSE="emacs static readline zlib doc hdf5 mpi blas"
-KEYWORDS="~alpha ~amd64 ppc ppc64 sparc x86"
-
-DEPEND=">=sys-libs/ncurses-5.2-r3
-	>=sci-visualization/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 )
-	doc? ( virtual/latex-base )
-	blas? ( virtual/blas )
-	mpi? ( virtual/mpi )
-	!=app-text/texi2html-1.70"
-RDEPEND="${DEPEND}"
-
-# 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
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/octave-2.1.72-gcc4.1-gentoo.patch
-}
-
-src_compile() {
-	filter-flags -ffast-math
-
-	local myconf="--localstatedir=/var/state/octave --enable-rpath"
-	myconf="${myconf} --enable-lite-kernel"
-	use static || myconf="${myconf} --disable-static --enable-shared --enable-dl"
-	# Only add -lz to LDFLAGS if we have zlib in USE !
-	# BUG #52604
-	# Danny van Dyk 2004/08/26
-	use zlib && append-ldflags -lz
-
-	# MPI requires the use of gcc/g++ wrappers
-	# mpicc/mpic++
-	# octave links agains -lmpi by default
-	# mpich needs -lmpich instead
-	if use mpi; then
-		CC="mpicc" && CXX="mpiCC"
-		if has_version 'sys-cluster/mpich'; then
-			myconf="${myconf} --with-mpi=mpich"
-		else
-			myconf="${myconf} --with-mpi=mpi"
-		fi
-	else
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		myconf="${myconf} --without-mpi"
-	fi
-
-	CC="${CC}" CXX="${CXX}" \
-	econf \
-		$(use_with hdf5) \
-		$(use_enable readline) \
-		${myconf} \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "make install failed"
-	if use doc; then
-		octave-install-doc || die "Octave doc install failed"
-	fi
-	if use emacs; then
-		cd emacs
-		exeinto /usr/bin
-		doexe otags || die
-		doman otags.1 || die
-		for emacsdir in /usr/share/emacs/site-lisp /usr/lib/xemacs/site-lisp; do
-			insinto ${emacsdir}
-			doins *.el || die
-		done
-		cd ..
-	fi
-	dodir /etc/env.d || die
-	echo "LDPATH=/usr/lib/octave-${PV}" > "${D}"/etc/env.d/99octave || die
-
-	# Fixes ls-R files to remove /var/tmp/portage references.
-	sed -i -e "s:${D}::g" "${D}"/usr/libexec/${PN}/ls-R || die
-	sed -i -e "s:${D}::g" "${D}"/usr/share/${PN}/ls-R || die
-}
-
-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 || die
-	doins doc/interpreter/octave.dvi || die
-	doins doc/liboctave/liboctave.dvi || die
-	doins doc/refcard/refcard-a4.dvi || die
-	doins doc/refcard/refcard-legal.dvi || die
-	doins doc/refcard/refcard-letter.dvi || die
-}
diff --git a/sci-mathematics/octave/octave-3.2.3-r1.ebuild b/sci-mathematics/octave/octave-3.2.3-r1.ebuild
deleted file mode 100644
index 226c793bd786..000000000000
--- a/sci-mathematics/octave/octave-3.2.3-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.2.3-r1.ebuild,v 1.2 2010/02/03 10:14:06 fauli Exp $
-
-EAPI="2"
-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="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="virtual/lapack
-	dev-libs/libpcre
-	sys-libs/ncurses
-	sci-visualization/gnuplot
-	>=sci-mathematics/glpk-4.15
-	media-libs/qhull
-	sci-libs/qrupdate
-	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/arpack
-		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/gperf
-	dev-util/pkgconfig"
-
-FORTRAN="gfortran ifc g77 f2c"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.2.0_parallel_make.patch
-	epatch "${FILESDIR}"/${PN}-3.2.0_as_needed.patch
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var/state/octave \
-		--enable-shared \
-		--with-blas="$(pkg-config --libs blas)" \
-		--with-lapack="$(pkg-config --libs lapack)" \
-		--with-qrupdate \
-		$(use_with hdf5) \
-		$(use_with curl) \
-		$(use_with zlib) \
-		$(use_with fftw) \
-		$(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_enable readline)
-}
-
-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
-
-	echo "LDPATH=/usr/$(get_libdir)/octave-${PV}" > 99octave
-	doenvd 99octave || die
-}
diff --git a/sci-mathematics/octave/octave-3.2.4-r1.ebuild b/sci-mathematics/octave/octave-3.2.4-r1.ebuild
index b29320407fe5..fa10cf72905f 100644
--- a/sci-mathematics/octave/octave-3.2.4-r1.ebuild
+++ b/sci-mathematics/octave/octave-3.2.4-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 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.3 2010/03/11 18:07:45 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.2.4-r1.ebuild,v 1.4 2010/05/04 23:40:04 bicatali Exp $
 
 EAPI="2"
-inherit flag-o-matic xemacs-elisp-common
+inherit flag-o-matic xemacs-elisp-common autotools
 
 DESCRIPTION="High-level interactive language for numerical computations"
 LICENSE="GPL-3"
@@ -51,11 +51,12 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.2.0_as_needed.patch
 	epatch "${FILESDIR}"/${PN}-3.2.4-imread.patch
 	epatch "${FILESDIR}"/${PN}-3.2.4-ldflags.patch
+	epatch "${FILESDIR}"/${PN}-3.2.4-fltk-magic.patch
+	eautoreconf
 }
 
 src_configure() {
-	use fltk || export FLTK_CONFIG="no"
-	# hdf5 disabled because not really useful (bug #)
+	# hdf5 disabled because not really useful (bug #299876)
 	econf \
 		--localstatedir=/var/state/octave \
 		--enable-shared \
@@ -66,6 +67,7 @@ src_configure() {
 		$(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) \
diff --git a/sci-mathematics/octave/octave-3.2.4.ebuild b/sci-mathematics/octave/octave-3.2.4.ebuild
deleted file mode 100644
index e8e27bbdc5ec..000000000000
--- a/sci-mathematics/octave/octave-3.2.4.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2010 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.ebuild,v 1.3 2010/02/17 04:38:38 bicatali Exp $
-
-EAPI="2"
-inherit flag-o-matic 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="curl doc emacs fltk fftw hdf5 opengl readline sparse xemacs zlib"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-# add 	media-gfx/graphicsmagick[cxx] when keyworded in arches
-RDEPEND="dev-libs/libpcre
-	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.1[opengl?] )
-	fftw? ( sci-libs/fftw:3.0 )
-	hdf5? ( sci-libs/hdf5 )
-	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
-		 app-text/ptex )
-	dev-util/gperf
-	dev-util/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.2.0_parallel_make.patch
-	epatch "${FILESDIR}"/${PN}-3.2.0_as_needed.patch
-
-	# without this we get MPI linker errors if hdf5
-	# was compiled against mpi (see #302621)
-	if has_version sci-libs/hdf5[mpi]; then
-		export CC=mpicc
-		export FC=mpif90
-		export CXX=mpicxx
-	fi
-}
-
-src_configure() {
-	use fltk || export FLTK_CONFIG="no"
-	econf \
-		--localstatedir=/var/state/octave \
-		--enable-shared \
-		--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 hdf5) \
-		$(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
-
-	echo "LDPATH=/usr/$(get_libdir)/octave-${PV}" > 99octave
-	doenvd 99octave || die
-}