Version bump (fixes bug #235419).

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-SENTINEL-2 i686

3 files changed, 122 insertions, 12 deletions

diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index d54ff680b0ae..49f8b2a85848 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/octave
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.60 2008/08/06 20:42:01 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.61 2008/08/22 22:05:44 markusle Exp $
+
+*octave-3.0.2 (22 Aug 2008)
+
+  22 Aug 2008; Markus Dittrich <markusle@gentoo.org> +octave-3.0.2.ebuild:
+  Version bump (fixes bug #235419).
 
   06 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 058c15207891..2cf00ac77f50 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
@@ -17,6 +14,7 @@ DIST octave-2.1.69.tar.bz2 5818959 RMD160 88a59f0dfe4c343f011f78b07dbf069b03e29b
 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.1.tar.bz2 9854711 RMD160 3141454b1e9a8efcac0772aed63c27aaad082861 SHA1 e4cebe74a1182df610d91e45974653227dd4b342 SHA256 310bfc622d74fd5c3727c2304ad594888f3016a89f183af7afdfef3fd5c15e6d
+DIST octave-3.0.2.tar.bz2 10127298 RMD160 8b95e0bfb7bed5ee836e4a93f5810bf65d805811 SHA1 fa300afed620b241ff0e25892f70b713a00e5ae8 SHA256 f3b0a1a3d890eefa6e736774c88a3caf696c131584dea292f5175960d183833e
 EBUILD octave-2.1.57-r1.ebuild 3444 RMD160 ac7d57c312e5c849ae0fd88c33333cc7138abb1a SHA1 fbfd690dd1d977c70bee8e1692e4ad2076462776 SHA256 fc1c1399a29309a99b9d880626df3c8850c4cfb81f5f1657855605e9945b7cee
 EBUILD octave-2.1.69.ebuild 3415 RMD160 06019164d467a1cfc3607e8c8002439ee7fbb71f SHA1 3dc821b03b02599e5d27dbb1573118ca0a5b9194 SHA256 202a628e36d5578c981e5832cfaad31cf90687ad1621c8ddee4186a6b0ddf848
 EBUILD octave-2.1.72.ebuild 3893 RMD160 571014ce76eac12e6ae21ff21f087fb7258535da SHA1 f3fd6fa783473c9912105ae0256a12448843f9c5 SHA256 a91ee175a3a4a161171d5525e549f184d8b362e6e8d94923335a1f20d334fe90
@@ -24,12 +22,6 @@ EBUILD octave-2.1.73-r1.ebuild 4441 RMD160 f25103dde6a4a9dacac56ce15e0e59ce8f0c8
 EBUILD octave-2.1.73-r2.ebuild 4603 RMD160 bf3870799101ef51bcd6370b20e26b8fbfd83401 SHA1 e5755d8a8e24af2190a78c489658b64a63a938d9 SHA256 5b0e4c2f2ef2e438177f4c689fd8babdc2e36842f687dc1d61f0a65c148b6a4f
 EBUILD octave-2.1.73.ebuild 4283 RMD160 d3b65b88c6472b892ea2286c2200ccb1e383a08a SHA1 ef7f1ac3c41f433453ae5e492fe9cadd21ce2d27 SHA256 2b4f4660cd30f3acaeff313dbc5cc7e225a8eab87998edcedf85f5c2cacffcf0
 EBUILD octave-3.0.1.ebuild 2821 RMD160 81eea99f7dd6d97379473d422fa8e88f73a62ee5 SHA1 68e2c64c30f420a05193720250e42e2536d1639d SHA256 febdf9ce66117b7c0b7c63e3a9328a5ddce7dc52a76f03b2ae5c0e19001f30ec
-MISC ChangeLog 17310 RMD160 e5e9c60420827488a617e0dfb82c65cce214e786 SHA1 617ab6ab4c2df005738322774e3ea9ccffaf3504 SHA256 e4013f7e405e7daf74827eb1d822c14adb16516e81ba7d22fca862b3f7f88fd2
+EBUILD octave-3.0.2.ebuild 2856 RMD160 4d3c835397eb288895ecb42d88fad45059df60cb SHA1 43669c207421797e9b2a0011bc025e6aefdf6c72 SHA256 248709e1030b16dbefba11bbc3e4b448f72c072a24b19ceda52a81af38740740
+MISC ChangeLog 17456 RMD160 01df2d6b10934f2c0426289e6b3de9a1660021c4 SHA1 cf3faefdb2c803de774d4ae780b620cf8f895bd6 SHA256 7cd1ace2be9e56b101e803cb795e6ca0fb7394380dcae995656cfd3e7b17efda
 MISC metadata.xml 260 RMD160 27a4292b758e1199d0092b731cba79033f1b4167 SHA1 9997a99a4d6115f3b901208ba711d735ce9be36e SHA256 5fda55fd44bfec5755e1c3ac828887c37f0eebed6b3b972454e123ac2472d3ff
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEARECAAYFAkiaDKkACgkQOeoy/oIi7uxRsQCgsBLoCbQN7TuL+XWDNiJRH0Ou
-NLkAn2U/kaoHpUdxwH6jXsDnP1XzS9Zw
-=DH3V
------END PGP SIGNATURE-----
diff --git a/sci-mathematics/octave/octave-3.0.2.ebuild b/sci-mathematics/octave/octave-3.0.2.ebuild
new file mode 100644
index 000000000000..2851cf97fcce
--- /dev/null
+++ b/sci-mathematics/octave/octave-3.0.2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2008 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.1 2008/08/22 22:05:44 markusle 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? ( virtual/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/tetex
+		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."
+}