new version

5 files changed, 74 insertions, 3 deletions

diff --git a/app-sci/octave-forge/ChangeLog b/app-sci/octave-forge/ChangeLog
index f14c7fd9be6b..7aba07df1604 100644
--- a/app-sci/octave-forge/ChangeLog
+++ b/app-sci/octave-forge/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-sci/octave-forge
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-sci/octave-forge/ChangeLog,v 1.6 2004/03/09 06:44:50 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/octave-forge/ChangeLog,v 1.7 2004/03/10 13:00:08 phosphan Exp $
+
+*octave-forge-2004.02.12 (10 Mar 2004)
+
+  10 Mar 2004; Patrick Kursawe <phosphan@gentoo.org>
+  octave-forge-2003.06.02.ebuild, octave-forge-2004.02.12.ebuild:
+  New version, requires a few more tweaks in ebuild.
 
   09 Mar 2004; Patrick Kursawe <phosphan@gentoo.org>
   octave-forge-2003.02.22.ebuild, octave-forge-2003.06.02.ebuild:
diff --git a/app-sci/octave-forge/Manifest b/app-sci/octave-forge/Manifest
index f6e1d016bbcb..6a68e65af794 100644
--- a/app-sci/octave-forge/Manifest
+++ b/app-sci/octave-forge/Manifest
@@ -1,6 +1,8 @@
 MD5 2528ba748f9ce8fb65d6734ac782523b octave-forge-2003.06.02.ebuild 1923
 MD5 cb209d05c9a7e6abd1df5753650065a0 octave-forge-2003.02.22.ebuild 1951
+MD5 2528ba748f9ce8fb65d6734ac782523b octave-forge-2004.02.12.ebuild 1923
 MD5 0d9f70798352948944e76f8d8753a5fc ChangeLog 1381
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 df51218baee555e6ec187aa95115aa01 files/digest-octave-forge-2003.02.22 76
 MD5 b0d60c59feed689f1454ba67e50df211 files/digest-octave-forge-2003.06.02 76
+MD5 7a2c9437d0cf3b7b65738969d0aac2e1 files/digest-octave-forge-2004.02.12 76
diff --git a/app-sci/octave-forge/files/digest-octave-forge-2004.02.12 b/app-sci/octave-forge/files/digest-octave-forge-2004.02.12
new file mode 100644
index 000000000000..3b4a03489469
--- /dev/null
+++ b/app-sci/octave-forge/files/digest-octave-forge-2004.02.12
@@ -0,0 +1 @@
+MD5 2c8a35bc59844c1fd4068a1213a3bc26 octave-forge-2004.02.12.tar.gz 2740019
diff --git a/app-sci/octave-forge/octave-forge-2003.06.02.ebuild b/app-sci/octave-forge/octave-forge-2003.06.02.ebuild
index 84322b4c3356..d7e7a7cbe989 100644
--- a/app-sci/octave-forge/octave-forge-2003.06.02.ebuild
+++ b/app-sci/octave-forge/octave-forge-2003.06.02.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/octave-forge/octave-forge-2003.06.02.ebuild,v 1.4 2004/03/09 06:44:50 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/octave-forge/octave-forge-2003.06.02.ebuild,v 1.5 2004/03/10 13:00:08 phosphan Exp $
 
 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"
+KEYWORDS="x86 ~ppc ~sparc"
 SLOT="0"
 IUSE="ginac qhull"
 
diff --git a/app-sci/octave-forge/octave-forge-2004.02.12.ebuild b/app-sci/octave-forge/octave-forge-2004.02.12.ebuild
new file mode 100644
index 000000000000..21a977df3c0a
--- /dev/null
+++ b/app-sci/octave-forge/octave-forge-2004.02.12.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-sci/octave-forge/octave-forge-2004.02.12.ebuild,v 1.1 2004/03/10 13:00:08 phosphan Exp $
+
+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"
+SLOT="0"
+IUSE="ginac qhull"
+
+DEPEND=">=app-sci/octave-2.1.40
+		>=sys-apps/sed-4
+		sys-libs/libtermcap-compat
+		ginac? ( app-sci/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"
+}
+
+src_compile() {
+	econf || die "econf failed"
+
+	# The *XPATH 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."
+}
+