Fixed #84366 for 2004.11.16

Package-Manager: portage-2.0.51.19

7 files changed, 37 insertions, 85 deletions

diff --git a/sci-mathematics/octave-forge/ChangeLog b/sci-mathematics/octave-forge/ChangeLog
index b202d3fc0dad..43ab0c881111 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.6 2005/02/13 03:42:53 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/ChangeLog,v 1.7 2005/03/09 08:32:44 phosphan Exp $
+
+*octave-forge-2004.11.16-r1 (08 Mar 2005)
+
+  08 Mar 2005; Patrick Kursawe <phosphan@gentoo.org>
+  +octave-forge-2004.11.16-r1.ebuild:
+  Fixing bug #84366 (wrong path to graceplot)
 
   12 Feb 2005; Robin H. Johnson <robbat2@gentoo.org>
   octave-forge-2004.11.16.ebuild:
diff --git a/sci-mathematics/octave-forge/Manifest b/sci-mathematics/octave-forge/Manifest
index 48ac621d0952..8e5e9c8c75a6 100644
--- a/sci-mathematics/octave-forge/Manifest
+++ b/sci-mathematics/octave-forge/Manifest
@@ -1,24 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3d0fadebbb4144323a085f3da5f2e53e octave-forge-2003.06.02.ebuild 1937
 MD5 ec424b9207a426d5c380b67f8cd1dae8 octave-forge-2004.11.16.ebuild 2146
-MD5 d2f4f3ace915d5831cbcad92627221b0 octave-forge-2003.02.22.ebuild 1966
 MD5 20ee4328bf374413c8e70aca60c1e04d octave-forge-2004.02.12.ebuild 2227
-MD5 f0549f1be8bd924517d21a587a2e4581 ChangeLog 3005
+MD5 52fad3222ae721d596a1cab1f2d81a53 octave-forge-2004.11.16-r1.ebuild 2267
+MD5 c2dd8e0fa897097cc60bd26558c62bfb ChangeLog 3187
 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.2.6 (GNU/Linux)
-Comment: Robbat2 @ Orbis-Terrarum Networks
-
-iD8DBQFCDszJPpIsIjIzwiwRAp97AKD0VI/jzUwcE5GMA6BaVsrS1KoeEACgwmk0
-3ngjSJvr1vx9WzYUxjQxrs8=
-=9lBr
------END PGP SIGNATURE-----
+MD5 3aacf6f3c335a1f63edef94a9bd7011a files/digest-octave-forge-2004.11.16-r1 76
diff --git a/sci-mathematics/octave-forge/files/digest-octave-forge-2003.02.22 b/sci-mathematics/octave-forge/files/digest-octave-forge-2003.02.22
deleted file mode 100644
index 98d2c50a4f27..000000000000
--- a/sci-mathematics/octave-forge/files/digest-octave-forge-2003.02.22
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cb82a3da24197369cc4bf4be66b42600 octave-forge-2003.02.22.tar.gz 2306124
diff --git a/sci-mathematics/octave-forge/files/digest-octave-forge-2003.06.02 b/sci-mathematics/octave-forge/files/digest-octave-forge-2003.06.02
deleted file mode 100644
index 7e90489c6124..000000000000
--- a/sci-mathematics/octave-forge/files/digest-octave-forge-2003.06.02
+++ /dev/null
@@ -1 +0,0 @@
-MD5 73e24fc661bc94d83535e4387d24cea3 octave-forge-2003.06.02.tar.gz 2471460
diff --git a/sci-mathematics/octave-forge/files/digest-octave-forge-2004.11.16-r1 b/sci-mathematics/octave-forge/files/digest-octave-forge-2004.11.16-r1
new file mode 100644
index 000000000000..21c0054a6461
--- /dev/null
+++ b/sci-mathematics/octave-forge/files/digest-octave-forge-2004.11.16-r1
@@ -0,0 +1 @@
+MD5 a8e52c27159a110a26ab57c10d3883b0 octave-forge-2004.11.16.tar.gz 3639093
diff --git a/sci-mathematics/octave-forge/octave-forge-2003.06.02.ebuild b/sci-mathematics/octave-forge/octave-forge-2003.06.02.ebuild
deleted file mode 100644
index ccb5a6276d81..000000000000
--- a/sci-mathematics/octave-forge/octave-forge-2003.06.02.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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.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/"
-SRC_URI="mirror://sourceforge/octave/${P}.tar.gz"
-
-LICENSE="as-is"
-KEYWORDS="x86 ~ppc ~sparc"
-SLOT="0"
-IUSE="ginac qhull"
-
-DEPEND=">=sci-mathematics/octave-2.1.40
-		>=sys-apps/sed-4
-		sys-libs/libtermcap-compat
-		virtual/tetex
-		ginac? ( sci-mathematics/ginac )
-		qhull? ( >=media-libs/qhull-3.1-r1 )"
-
-
-src_compile() {
-	econf || die "econf failed"
-
-	# The MPATH, OPATH, and 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..."
-	sed -i "s|^\(MPATH = \)|\1${D}|" Makeconf || die "failed to modify MPATH"
-	sed -i "s|^\(OPATH = \)|\1${D}|" Makeconf || die "failed to modify OPATH"
-	sed -i "s|^\(XPATH = \)|\1${D}|" Makeconf || die "failed to modify XPATH"
-	echo -e "done.\n"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	einstall || die "einstall 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-2003.02.22.ebuild b/sci-mathematics/octave-forge/octave-forge-2004.11.16-r1.ebuild
index 66c6ef45020b..53a569602afc 100644
--- a/sci-mathematics/octave-forge/octave-forge-2003.02.22.ebuild
+++ b/sci-mathematics/octave-forge/octave-forge-2004.11.16-r1.ebuild
@@ -1,43 +1,58 @@
 # 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.2 2005/01/17 11:36:23 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/octave-forge-2004.11.16-r1.ebuild,v 1.1 2005/03/09 08:32:44 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"
-# I have only tested this library on x86
-KEYWORDS="x86"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 SLOT="0"
 IUSE="ginac qhull"
 
-DEPEND=">=sci-mathematics/octave-2.1.44
+DEPEND=">=sci-mathematics/octave-2.1.62
 		>=sys-apps/sed-4
 		sys-libs/libtermcap-compat
-		ginac? ( sci-mathematics/ginac )
-		virtual/tetex
+		!amd64? ( ginac? ( sci-mathematics/ginac ) )
 		qhull? ( >=media-libs/qhull-3.1-r1 )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}.patch
+
+	# make it compile when X isn't installed. The source file there really
+	# doesn't need X at all.
+	# 02 Feb 2005, Robin H. Johnson <robbat2@gentoo.org>
+	sed -e '/#include <X11/d' -i ${S}/main/audio/aurecord.cc
+}
 
 src_compile() {
 	econf || die "econf failed"
 
-	# The MPATH, OPATH, and 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)
 	echo -en "Modifying paths..."
-	sed -i "s|^\(MPATH = \)|\1${D}|" Makeconf || die "failed to modify MPATH"
-	sed -i "s|^\(OPATH = \)|\1${D}|" Makeconf || die "failed to modify OPATH"
-	sed -i "s|^\(XPATH = \)|\1${D}|" Makeconf || die "failed to modify XPATH"
+	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() {
-	einstall || die "einstall failed"
+	make DESTDIR="${D}" install || die "install failed"
 
 	# strip the fudged install paths
 	sed -i "s|${D}||g" ${D}/usr/bin/mex || die "sed failed"