Version bump (fixes bug #264757).

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 132 insertions, 15 deletions

diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index 1bd6caa3c15c..f0c630507ee7 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,15 @@
 # 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.69 2009/06/21 18:47:58 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.70 2009/07/08 01:44:18 markusle Exp $
+
+*octave-3.2.0 (07 Jul 2009)
+
+  07 Jul 2009; Markus Dittrich <markusle@gentoo.org> +octave-3.2.0.ebuild,
+  +files/octave-3.2.0_parallel_make.patch:
+  Version bump. The octave-3.2 ebuild is currently lacking support
+  for GraphicsMagick (currently missing from the tree) and arpack which
+  needs to be keyworded by all the relevant arches first.
+  This fixes bug #264757.
 
   21 Jun 2009; Hans de Graaff <graaff@gentoo.org> octave-2.1.73-r2.ebuild,
   octave-3.0.2.ebuild, octave-3.0.3.ebuild:
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 915f3b578c02..eec2fe0e74e0 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,6 +1,3 @@
------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
@@ -12,6 +9,7 @@ AUX octave-3.0.1-fix_handle_for_plotyy.patch 2112 RMD160 91679fed7b115c7f0e48824
 AUX octave-3.0.1-no_helvetica.patch 1816 RMD160 7bfe46409699b6bd199ab725e6e324e4eea69003 SHA1 8934236ea328a7ede2016f412909c0d93842d4a1 SHA256 432b490ff6055b12d219e268391859e549e4076073ca8029b454e7644965c8e3
 AUX octave-3.0.1-test-fix.patch 2171 RMD160 a8275924c3161a7f78bcb84426527060d6c12ddd SHA1 0af5a53b2f251f9bf06976ec800b5eb217adf0bf SHA256 229bae7b5163c9d06d5df9d96db2c2ef3e0613576ec8f1b91698f286940247a0
 AUX octave-3.0.3-test-fix.patch 2177 RMD160 a0fb9ba636b3225bed404da2214e80d6d76c626a SHA1 2f1b29a1fe3b660f11fd6e846c84886ead3142b4 SHA256 0519dd6f18ed0ec696852a08123cc3ddb30a9622cb53950acf6a8d3509c439cb
+AUX octave-3.2.0_parallel_make.patch 374 RMD160 0e597204583c44c6c67aa5c5360a73f0f6bae298 SHA1 85170197541aa797ff41f7c46e1e3594dbf32fe4 SHA256 d2864f9b0dbea021120be04d16f57759d881bff11bf2b90e34c7b68c770adb23
 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
@@ -19,20 +17,15 @@ DIST octave-2.1.72.tar.bz2 5808544 RMD160 b9a1056a98a524591b0f497f3c11ccc436a18e
 DIST octave-2.1.73.tar.bz2 5790133 RMD160 d34c6ecd8f84c728ad7687d9568b9d69ade6f5db SHA1 58221aa15fcefd66b03531ac0ae9b1d2356e7555 SHA256 8ccaee227c6cad3b5633a904414f17ce73de8eab2abd4d2e6a3972dd878ffbc3
 DIST octave-3.0.2.tar.bz2 10127298 RMD160 8b95e0bfb7bed5ee836e4a93f5810bf65d805811 SHA1 fa300afed620b241ff0e25892f70b713a00e5ae8 SHA256 f3b0a1a3d890eefa6e736774c88a3caf696c131584dea292f5175960d183833e
 DIST octave-3.0.3.tar.bz2 10159024 RMD160 1a162862a457675e2d94de306c1ec8f1643c9e07 SHA1 5c619254521a5fe14b3ec8a6eecbf104f9fa41dc SHA256 f90108bf6a2f9930907aa740d1c4d39551985cf3b5c5eb5dfdb436e0d3b5d79d
+DIST octave-3.2.0.tar.bz2 12011861 RMD160 88935c2f560a7bc400d0ca182be0189b7c7df90c SHA1 3408483adcb55e991ac46349ec7aa626a4f63615 SHA256 10096d60aa4b85ea8478acdf20d65fed6bc38aecb5369181a50b00a9ebfee4d6
 EBUILD octave-2.1.57-r1.ebuild 3464 RMD160 81bfaf7a717b40fa7b02d575c681653963382b1b SHA1 a1841a2e107ef48098a3965789bf52efe2cb6713 SHA256 c40553c1cf38d2b76cfd6d23efbbdaf6381a2b0fd2bff1b9b25ede047bd7bfb2
-EBUILD octave-2.1.69.ebuild 3435 RMD160 768d08cbb1abcd51363b0ba38f09e524ad8fde5d SHA1 669c835a9bed0f414a6bd3ca9b94906c23984ceb SHA256 0559b708b68fa862dc0153bf34fcab2beaa46e242af0cd812469884a029b4766
+EBUILD octave-2.1.69.ebuild 3435 RMD160 4d750a442681dc7712b8885fd6b9cc9a598b6b8d SHA1 6027d7b54ee25bb92cd9826b53625f11cff5011d SHA256 01cc2d22b5316a47a97053b7da941fc6e9fbcae08bc81bdfc5bf8f43e63509f7
 EBUILD octave-2.1.72.ebuild 3913 RMD160 cc05494ceaef2953307ffa8223a0a7f3c158d745 SHA1 6f4564db8285c5d533ab4e46761409feac134087 SHA256 70ec1fc6ddd562ed8842cf0635e4727ca90d9bf53e7c45c19d4a97b9600693bb
 EBUILD octave-2.1.73-r1.ebuild 4428 RMD160 a170d06be9ff3c8f22a04dc0225a93abe8213850 SHA1 528d68dc0ab5f75a6d868e129d87567874a0225e SHA256 cb4b94abd3353f503c3d39110dbf418e74abec4f094c3b7f04d46adb04b2749b
 EBUILD octave-2.1.73-r2.ebuild 4606 RMD160 60d0faf0d2acab2c13ff8356876ec38b5559ec54 SHA1 7c1acaed0ff60963332f472b326bed690e3e775a SHA256 85d7d34547eab43e47ba90aee330999e9954cc152d0da55da78e9c2466f9f2c3
 EBUILD octave-2.1.73.ebuild 4269 RMD160 c379a9ffed629d2c3e5f3ec03aaf98963821a50a SHA1 9ac495978a4ce3a5a8101e864f1d7866ea9e8fb9 SHA256 7774794b4c30f44340ee602682d95bfa2eea103ebdabe5144557a674f01e1f73
 EBUILD octave-3.0.2.ebuild 2841 RMD160 a90fc077a1a0693fa0ac1bf75f6c431c9d53d3b6 SHA1 fcecca2f772685d8c6edb0082e53388fb9398e5f SHA256 47a5a48a0ea6b9c141c36f9599de089590f6a733c0b0c1e1b4ddf34a08871419
 EBUILD octave-3.0.3.ebuild 2685 RMD160 92a1c4d966437aefbb524f0102c2775662d3ace0 SHA1 9e6623e8eda91ee319b22f62688fe4fb7a2e98ab SHA256 de08e4e33d473a5c8d86f793953d3109a067ac14a205cbaf9cf541a8df5e96d5
-MISC ChangeLog 18781 RMD160 90ed045892835bf049b14337a95de3f770835be8 SHA1 0f59ec2876dcf9d6f4a993f737632c3a4de49a22 SHA256 5f2e9e327049c60e77e35d2ab25b4cf8bcb3040a01be7ee036df72961953bf1f
+EBUILD octave-3.2.0.ebuild 2527 RMD160 cfd2f33e1d4caa35808003d170988ec7459b063e SHA1 ca3af2024997f76991fd0aae99e0219ec5dd625c SHA256 6dbfb640af76d329b4591c4f8be8a33e0194ca72493c419c64411b29ba4da9bb
+MISC ChangeLog 19154 RMD160 b438e11f47572f6588a3374f3165e277a5df66f0 SHA1 0c946f4bc74e66fcbdb22ba00df0ff98e18b4c3d SHA256 b4fade25715e58fb18c31a8784a3e5b437c8ea9d46fca2a7b195e8fd4ee07b8e
 MISC metadata.xml 260 RMD160 27a4292b758e1199d0092b731cba79033f1b4167 SHA1 9997a99a4d6115f3b901208ba711d735ce9be36e SHA256 5fda55fd44bfec5755e1c3ac828887c37f0eebed6b3b972454e123ac2472d3ff
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAko+gGQACgkQVYU2Ai8K93dFVQCggtpjxUYVm0b3+GZt1HYxshXC
-YjwAoJNbmCX6UD2CgiQGfA+8KGSawqLM
-=u6zB
------END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..bcc2f7d29a2a
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-3.2.0_parallel_make.patch
@@ -0,0 +1,12 @@
+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/octave-2.1.69.ebuild b/sci-mathematics/octave/octave-2.1.69.ebuild
index a8d67ed999eb..23b922f0c129 100644
--- a/sci-mathematics/octave/octave-2.1.69.ebuild
+++ b/sci-mathematics/octave/octave-2.1.69.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.13 2009/03/04 21:31:52 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-2.1.69.ebuild,v 1.14 2009/07/08 01:44:18 markusle Exp $
 
 inherit flag-o-matic fortran
 
diff --git a/sci-mathematics/octave/octave-3.2.0.ebuild b/sci-mathematics/octave/octave-3.2.0.ebuild
new file mode 100644
index 000000000000..3681736e3a77
--- /dev/null
+++ b/sci-mathematics/octave/octave-3.2.0.ebuild
@@ -0,0 +1,103 @@
+# 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 $
+
+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
+	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/gperf
+	dev-util/pkgconfig"
+
+FORTRAN="gfortran ifc g77 f2c"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}_parallel_make.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)
+
+	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."
+}