Fixing bug #84366

(Portage version: 2.0.51.19)

5 files changed, 89 insertions, 4 deletions

diff --git a/sci-mathematics/octave-forge/ChangeLog b/sci-mathematics/octave-forge/ChangeLog
index 43ab0c881111..0874fdcf3e4e 100644
--- a/sci-mathematics/octave-forge/ChangeLog
+++ b/sci-mathematics/octave-forge/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/octave-forge
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/ChangeLog,v 1.7 2005/03/09 08:32:44 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/ChangeLog,v 1.8 2005/03/10 20:14:57 phosphan Exp $
+
+*octave-forge-2004.02.12-r1 (10 Mar 2005)
+
+  10 Mar 2005; Patrick Kursawe <phosphan@gentoo.org>
+  +octave-forge-2004.02.12-r1.ebuild, octave-forge-2004.02.12.ebuild:
+  Fixing bug #84366 (wrong path to graceplot) for old version
 
 *octave-forge-2004.11.16-r1 (08 Mar 2005)
 
diff --git a/sci-mathematics/octave-forge/Manifest b/sci-mathematics/octave-forge/Manifest
index 8e5e9c8c75a6..9c3ec15fd89e 100644
--- a/sci-mathematics/octave-forge/Manifest
+++ b/sci-mathematics/octave-forge/Manifest
@@ -1,8 +1,11 @@
+MD5 5277484e101fb86ff6d0d6b6b3e4c50d patch 1034
+MD5 775372c7b8a5daf5c53d9a3476b1eaef octave-forge-2004.02.12-r1.ebuild 2346
 MD5 ec424b9207a426d5c380b67f8cd1dae8 octave-forge-2004.11.16.ebuild 2146
-MD5 20ee4328bf374413c8e70aca60c1e04d octave-forge-2004.02.12.ebuild 2227
+MD5 b7bff6de1fe240bff6db30c9451bdc1f octave-forge-2004.02.12.ebuild 2344
 MD5 52fad3222ae721d596a1cab1f2d81a53 octave-forge-2004.11.16-r1.ebuild 2267
 MD5 c2dd8e0fa897097cc60bd26558c62bfb ChangeLog 3187
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
+MD5 7a2c9437d0cf3b7b65738969d0aac2e1 files/digest-octave-forge-2004.02.12-r1 76
 MD5 64ae87b1b1190c6a51f7dfd91be73d05 files/2004.11.16.patch 1580
 MD5 7a2c9437d0cf3b7b65738969d0aac2e1 files/digest-octave-forge-2004.02.12 76
 MD5 3aacf6f3c335a1f63edef94a9bd7011a files/digest-octave-forge-2004.11.16 76
diff --git a/sci-mathematics/octave-forge/files/digest-octave-forge-2004.02.12-r1 b/sci-mathematics/octave-forge/files/digest-octave-forge-2004.02.12-r1
new file mode 100644
index 000000000000..3b4a03489469
--- /dev/null
+++ b/sci-mathematics/octave-forge/files/digest-octave-forge-2004.02.12-r1
@@ -0,0 +1 @@
+MD5 2c8a35bc59844c1fd4068a1213a3bc26 octave-forge-2004.02.12.tar.gz 2740019
diff --git a/sci-mathematics/octave-forge/octave-forge-2004.02.12-r1.ebuild b/sci-mathematics/octave-forge/octave-forge-2004.02.12-r1.ebuild
new file mode 100644
index 000000000000..5a150651b774
--- /dev/null
+++ b/sci-mathematics/octave-forge/octave-forge-2004.02.12-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/octave-forge-2004.02.12-r1.ebuild,v 1.1 2005/03/10 20:14:57 phosphan Exp $
+
+inherit eutils
+
+DESCRIPTION="A collection of custom scripts, functions and extensions for GNU Octave"
+HOMEPAGE="http://octave.sourceforge.net/"
+SRC_URI="mirror://sourceforge/octave/${P}.tar.gz"
+
+LICENSE="as-is"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+SLOT="0"
+IUSE="ginac qhull"
+
+DEPEND=">=sci-mathematics/octave-2.1.40
+		<sci-mathematics/octave-2.1.64
+		>=sys-apps/sed-4
+		sys-libs/libtermcap-compat
+		!amd64? ( ginac? ( sci-mathematics/ginac ) )
+		qhull? ( >=media-libs/qhull-3.1-r1 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -e 's:a"key":a["key"]:' -i configure || die "sed failed on configure"
+	sed -e 's:\(^man1dir = \):\1$(DESTDIR)/:; s:$(bindir):$(DESTDIR)/$(bindir):' -i extra/mex/Makefile \
+		|| die "sed failed on mex/Makefile"
+	epatch ${FILESDIR}/octave-2.1.57+.patch
+	epatch ${FILESDIR}/${P}-fPIC.patch
+}
+
+src_compile() {
+	econf || die "econf failed"
+
+	# this must be done before the *PATH variables are changed
+	cd extra/graceplot && make grace_octave_path.m
+	cd ${S}
+
+	# The *PATH variables need to be changed, or they will
+	# cause Portage access violations. They cannot be easily set just using
+	# arguments passed to ./configure (at least, they can not easily be set
+	# correctly)
+	echo -en "Modifying paths..."
+	for path in M O X ALTM ALTO; do
+		sed -i "s|^\(${path}PATH = \)|\1${D}|" Makeconf || \
+			die "failed to modify ${path}PATH"
+	done
+	echo -e "done.\n"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "install failed"
+
+	# strip the fudged install paths
+	sed -i "s|${D}||g" ${D}/usr/bin/mex || die "sed failed"
+
+	dodoc AUTHORS COPYING* ChangeLog INDEX RELEASE-NOTES TODO
+}
+
+pkg_postinst() {
+	einfo "If you do not have GiNaC and Qhull installed, octave-forge did not"
+	einfo "compile itself with support for the geometry and symbolic math"
+	einfo "extensions. If you would like these features, please emerge ginac"
+	einfo "and/or qhull and then re-emerge octave-forge. Alternately, you can"
+	einfo "specify USE='ginac qhull' and re-emerge octave-forge; in that case"
+	einfo "the ebuild will automatically install the additional packages."
+}
+
diff --git a/sci-mathematics/octave-forge/octave-forge-2004.02.12.ebuild b/sci-mathematics/octave-forge/octave-forge-2004.02.12.ebuild
index 29ebb1117cd1..dcd82a629367 100644
--- a/sci-mathematics/octave-forge/octave-forge-2004.02.12.ebuild
+++ b/sci-mathematics/octave-forge/octave-forge-2004.02.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/octave-forge-2004.02.12.ebuild,v 1.4 2005/01/18 19:53:30 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/octave-forge-2004.02.12.ebuild,v 1.5 2005/03/10 20:14:57 phosphan Exp $
 
 inherit eutils
 
@@ -33,7 +33,11 @@ src_unpack() {
 src_compile() {
 	econf || die "econf failed"
 
-	# The *XPATH variables need to be changed, or they will
+	# this must be done before the *PATH variables are changed
+	cd extra/graceplot && make grace_octave_path.m
+	cd ${S}
+
+	# The *PATH variables need to be changed, or they will
 	# cause Portage access violations. They cannot be easily set just using
 	# arguments passed to ./configure (at least, they can not easily be set
 	# correctly)