Version bump

7 files changed, 116 insertions, 19 deletions

diff --git a/sci-mathematics/octave-forge/Manifest b/sci-mathematics/octave-forge/Manifest
index a478e8150145..722bd4d14895 100644
--- a/sci-mathematics/octave-forge/Manifest
+++ b/sci-mathematics/octave-forge/Manifest
@@ -1,20 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 14c59a605c601aa071ec110c7af556d4 octave-forge-2003.06.02.ebuild 1937
-MD5 317ad6a596530bd2765cd3ba82556732 octave-forge-2003.02.22.ebuild 1966
-MD5 1527d53b555cc516e72e35f0f1ae1a93 octave-forge-2004.02.12.ebuild 2194
+MD5 3d0fadebbb4144323a085f3da5f2e53e octave-forge-2003.06.02.ebuild 1937
+MD5 48230075912fa882b2f7db24e851cce4 octave-forge-2004.11.16.ebuild 1936
+MD5 d2f4f3ace915d5831cbcad92627221b0 octave-forge-2003.02.22.ebuild 1966
+MD5 ba159a12642575c1c7762a617c938ba1 octave-forge-2004.02.12.ebuild 2194
 MD5 000dfe08d6171eb9dc09206a1c5b38b6 ChangeLog 2448
 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 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
 MD5 8d2f41d57f555add4c78fbe6dc0ee758 files/octave-2.1.57+.patch 905
 MD5 9429fc7b84a5d36c0599ddeccad6d379 files/octave-forge-2004.02.12-fPIC.patch 526
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFB0ceSI1lqEGTUzyQRAj73AJ9ZhWJoIsTf8XOZT+eRpypKweNkugCgjoev
-6jokPtbtM/nIFEQUSPXebwU=
-=iAr3
------END PGP SIGNATURE-----
diff --git a/sci-mathematics/octave-forge/files/2004.11.16.patch b/sci-mathematics/octave-forge/files/2004.11.16.patch
new file mode 100644
index 000000000000..f712ceba9089
--- /dev/null
+++ b/sci-mathematics/octave-forge/files/2004.11.16.patch
@@ -0,0 +1,41 @@
+diff -ru ../octave-forge-2004.11.16.orig/extra/mex/Makefile ./extra/mex/Makefile
+--- ../octave-forge-2004.11.16.orig/extra/mex/Makefile	2004-11-16 07:56:42.000000000 +0100
++++ ./extra/mex/Makefile	2005-01-17 12:22:39.271524116 +0100
+@@ -43,23 +43,23 @@
+ 	  $(INSTALL_DATA) matrix.h $(LIBPATH)/matrix.h ; \
+ 	fi
+ endif
+-	@if ! test -e $(man1dir) ; then \
+-	  echo creating $(man1dir) ; \
+-	  $(INSTALL) -d $(man1dir) ; \
++	@if ! test -e $(DESTDIR)/$(man1dir) ; then \
++	  echo creating $(DESTDIR)/$(man1dir) ; \
++	  $(INSTALL) -d $(DESTDIR)/$(man1dir) ; \
+ 	fi
+-	@if test -d $(man1dir) ; then \
+-	  echo installing mex/mex.1 in $(man1dir) ; \
+-	  $(RM) $(man1dir)/mex.1; \
+-	  $(INSTALL_DATA) mex.1 $(man1dir)/mex.1 ; \
++	@if test -d $(DESTDIR)/$(man1dir) ; then \
++	  echo installing mex/mex.1 in $(DESTDIR)/$(man1dir) ; \
++	  $(RM) $(DESTDIR)/$(man1dir)/mex.1; \
++	  $(INSTALL_DATA) mex.1 $(DESTDIR)/$(man1dir)/mex.1 ; \
+ 	fi
+-	@if ! test -e $(bindir) ; then \
+-	  echo creating $(bindir) ; \
+-	  $(INSTALL) -d $(bindir) ; \
++	@if ! test -e $(DESTDIR)/$(bindir) ; then \
++	  echo creating $(DESTDIR)/$(bindir) ; \
++	  $(INSTALL) -d $(DESTDIR)/$(bindir) ; \
+ 	fi
+-	@if test -d $(bindir) ; then \
+-	  echo installing mex/mex in $(bindir) ; \
+-	  $(RM) $(bindir)/mex ; \
+-	  $(INSTALL_SCRIPT) mex $(bindir)/mex ; \
++	@if test -d $(DESTDIR)/$(bindir) ; then \
++	  echo installing mex/mex in $(DESTDIR)/$(bindir) ; \
++	  $(RM) $(DESTDIR)/$(bindir)/mex ; \
++	  $(INSTALL_SCRIPT) mex $(DESTDIR)/$(bindir)/mex ; \
+ 	fi
+ 
+ clean: ; $(RM) mex mex_* $(MEXLIB) *.o *.oct core octave-core *~
diff --git a/sci-mathematics/octave-forge/files/digest-octave-forge-2004.11.16 b/sci-mathematics/octave-forge/files/digest-octave-forge-2004.11.16
new file mode 100644
index 000000000000..21c0054a6461
--- /dev/null
+++ b/sci-mathematics/octave-forge/files/digest-octave-forge-2004.11.16
@@ -0,0 +1 @@
+MD5 a8e52c27159a110a26ab57c10d3883b0 octave-forge-2004.11.16.tar.gz 3639093
diff --git a/sci-mathematics/octave-forge/octave-forge-2003.02.22.ebuild b/sci-mathematics/octave-forge/octave-forge-2003.02.22.ebuild
index 36d02157962c..66c6ef45020b 100644
--- a/sci-mathematics/octave-forge/octave-forge-2003.02.22.ebuild
+++ b/sci-mathematics/octave-forge/octave-forge-2003.02.22.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-2003.02.22.ebuild,v 1.1 2004/12/28 14:54:43 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/octave-forge-2003.02.22.ebuild,v 1.2 2005/01/17 11:36:23 phosphan Exp $
 
 DESCRIPTION="A collection of custom scripts, functions and extensions for GNU Octave"
 HOMEPAGE="http://octave.sourceforge.net/"
diff --git a/sci-mathematics/octave-forge/octave-forge-2003.06.02.ebuild b/sci-mathematics/octave-forge/octave-forge-2003.06.02.ebuild
index 7e4dca08c4da..ccb5a6276d81 100644
--- a/sci-mathematics/octave-forge/octave-forge-2003.06.02.ebuild
+++ b/sci-mathematics/octave-forge/octave-forge-2003.06.02.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-2003.06.02.ebuild,v 1.1 2004/12/28 14:54:43 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/octave-forge-2003.06.02.ebuild,v 1.2 2005/01/17 11:36:23 phosphan Exp $
 
 DESCRIPTION="A collection of custom scripts, functions and extensions for GNU Octave"
 HOMEPAGE="http://octave.sourceforge.net/"
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 886c69d851bf..2c461e060fc0 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-2004 Gentoo Foundation
+# 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.1 2004/12/28 14:54:43 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/octave-forge-2004.02.12.ebuild,v 1.2 2005/01/17 11:36:23 phosphan Exp $
 
 inherit eutils
 
diff --git a/sci-mathematics/octave-forge/octave-forge-2004.11.16.ebuild b/sci-mathematics/octave-forge/octave-forge-2004.11.16.ebuild
new file mode 100644
index 000000000000..1bb1e5e29efb
--- /dev/null
+++ b/sci-mathematics/octave-forge/octave-forge-2004.11.16.ebuild
@@ -0,0 +1,62 @@
+# 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.11.16.ebuild,v 1.1 2005/01/17 11:36:23 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.62
+		>=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}
+	epatch ${FILESDIR}/${PV}.patch
+}
+
+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."
+}
+