From 366bc771ef5e9d8a59defc554abe742204f022ee Mon Sep 17 00:00:00 2001
From: Olivier Fisette <ribosome@gentoo.org>
Date: Sat, 1 Oct 2005 21:54:30 +0000
Subject: [PATCH] New revisions using ncurses in place of libtermcap-compat
 (see bug #103105). Package-Manager: portage-2.0.51.22-r2

---
 sci-mathematics/octave-forge/ChangeLog        | 10 ++-
 sci-mathematics/octave-forge/Manifest         |  8 ++-
 .../files/digest-octave-forge-2004.11.16-r2   |  1 +
 .../files/digest-octave-forge-2005.06.13-r1   |  1 +
 .../octave-forge-2004.11.16-r1.ebuild         |  4 +-
 .../octave-forge-2004.11.16-r2.ebuild         | 71 ++++++++++++++++++
 .../octave-forge-2005.06.13-r1.ebuild         | 72 +++++++++++++++++++
 7 files changed, 162 insertions(+), 5 deletions(-)
 create mode 100644 sci-mathematics/octave-forge/files/digest-octave-forge-2004.11.16-r2
 create mode 100644 sci-mathematics/octave-forge/files/digest-octave-forge-2005.06.13-r1
 create mode 100644 sci-mathematics/octave-forge/octave-forge-2004.11.16-r2.ebuild
 create mode 100644 sci-mathematics/octave-forge/octave-forge-2005.06.13-r1.ebuild

diff --git a/sci-mathematics/octave-forge/ChangeLog b/sci-mathematics/octave-forge/ChangeLog
index 1d39f1734d16..27a3113e29b5 100644
--- a/sci-mathematics/octave-forge/ChangeLog
+++ b/sci-mathematics/octave-forge/ChangeLog
@@ -1,6 +1,14 @@
 # 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.11 2005/08/21 05:15:33 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/ChangeLog,v 1.12 2005/10/01 21:54:30 ribosome Exp $
+
+*octave-forge-2005.06.13-r1 (01 Oct 2005)
+*octave-forge-2004.11.16-r2 (01 Oct 2005)
+
+  01 Oct 2005; Olivier Fisette <ribosome@gentoo.org>
+  octave-forge-2004.11.16-r1.ebuild, +octave-forge-2004.11.16-r2.ebuild,
+  +octave-forge-2005.06.13-r1.ebuild:
+  New revisions using ncurses in place of libtermcap-compat (see bug #103105).
 
   21 Aug 2005; Olivier Fisette <ribosome@gentoo.org>
   -files/2004.11.16.patch, +files/octave-forge-mex.patch,
diff --git a/sci-mathematics/octave-forge/Manifest b/sci-mathematics/octave-forge/Manifest
index b003d31bd3fa..22e13752a2a5 100644
--- a/sci-mathematics/octave-forge/Manifest
+++ b/sci-mathematics/octave-forge/Manifest
@@ -1,8 +1,12 @@
-MD5 ea7677dfdbf3fb96e543120d8f75d26e octave-forge-2004.11.16-r1.ebuild 2269
+MD5 3334f713282804a5632cbef98de4d46a octave-forge-2004.11.16-r2.ebuild 2259
+MD5 fb924747cbcd79b9a4f4bc7b4e0634bd octave-forge-2005.06.13-r1.ebuild 2319
+MD5 9c1f0cdc188f3c183d9f523635926b47 octave-forge-2004.11.16-r1.ebuild 2271
 MD5 c0b992412fda6a292815ccacec4c3fec octave-forge-2005.06.13.ebuild 2326
-MD5 95df7d1e148433d157c178c826f3cb94 ChangeLog 4338
+MD5 4db3a5ce9aa7fac4d23fc736e3b28263 ChangeLog 4667
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 64ae87b1b1190c6a51f7dfd91be73d05 files/octave-forge-mex.patch 1580
 MD5 cfc1fc06a341728e53b81d09d6376dea files/digest-octave-forge-2005.06.13 76
 MD5 3aacf6f3c335a1f63edef94a9bd7011a files/digest-octave-forge-2004.11.16-r1 76
+MD5 3aacf6f3c335a1f63edef94a9bd7011a files/digest-octave-forge-2004.11.16-r2 76
 MD5 e1393e9f0f19ccc9e6192c227cccc644 files/octave-forge-randmtzig.patch 428
+MD5 cfc1fc06a341728e53b81d09d6376dea files/digest-octave-forge-2005.06.13-r1 76
diff --git a/sci-mathematics/octave-forge/files/digest-octave-forge-2004.11.16-r2 b/sci-mathematics/octave-forge/files/digest-octave-forge-2004.11.16-r2
new file mode 100644
index 000000000000..21c0054a6461
--- /dev/null
+++ b/sci-mathematics/octave-forge/files/digest-octave-forge-2004.11.16-r2
@@ -0,0 +1 @@
+MD5 a8e52c27159a110a26ab57c10d3883b0 octave-forge-2004.11.16.tar.gz 3639093
diff --git a/sci-mathematics/octave-forge/files/digest-octave-forge-2005.06.13-r1 b/sci-mathematics/octave-forge/files/digest-octave-forge-2005.06.13-r1
new file mode 100644
index 000000000000..b04974e6db75
--- /dev/null
+++ b/sci-mathematics/octave-forge/files/digest-octave-forge-2005.06.13-r1
@@ -0,0 +1 @@
+MD5 cf82a74d27636abf07f1732b4851f2e2 octave-forge-2005.06.13.tar.gz 3680082
diff --git a/sci-mathematics/octave-forge/octave-forge-2004.11.16-r1.ebuild b/sci-mathematics/octave-forge/octave-forge-2004.11.16-r1.ebuild
index 918570f84746..923581447bb2 100644
--- a/sci-mathematics/octave-forge/octave-forge-2004.11.16-r1.ebuild
+++ b/sci-mathematics/octave-forge/octave-forge-2004.11.16-r1.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.11.16-r1.ebuild,v 1.3 2005/08/21 18:56:45 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/octave-forge-2004.11.16-r1.ebuild,v 1.4 2005/10/01 21:54:30 ribosome Exp $
 
 inherit eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://octave.sourceforge.net/"
 SRC_URI="mirror://sourceforge/octave/${P}.tar.gz"
 
 LICENSE="as-is"
-KEYWORDS="x86 ~ppc ~sparc amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 SLOT="0"
 IUSE="ginac qhull"
 
diff --git a/sci-mathematics/octave-forge/octave-forge-2004.11.16-r2.ebuild b/sci-mathematics/octave-forge/octave-forge-2004.11.16-r2.ebuild
new file mode 100644
index 000000000000..ca06dec55e28
--- /dev/null
+++ b/sci-mathematics/octave-forge/octave-forge-2004.11.16-r2.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.11.16-r2.ebuild,v 1.1 2005/10/01 21:54:30 ribosome 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/ncurses
+		!amd64? ( ginac? ( sci-mathematics/ginac ) )
+		qhull? ( >=media-libs/qhull-3.1-r1 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-mex.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"
+
+	# 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-2005.06.13-r1.ebuild b/sci-mathematics/octave-forge/octave-forge-2005.06.13-r1.ebuild
new file mode 100644
index 000000000000..b16dc132256e
--- /dev/null
+++ b/sci-mathematics/octave-forge/octave-forge-2005.06.13-r1.ebuild
@@ -0,0 +1,72 @@
+# 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-2005.06.13-r1.ebuild,v 1.1 2005/10/01 21:54:30 ribosome 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.69*
+		>=sys-apps/sed-4
+		sys-libs/ncurses
+		!amd64? ( ginac? ( sci-mathematics/ginac ) )
+		qhull? ( >=media-libs/qhull-3.1-r1 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-mex.patch
+	epatch ${FILESDIR}/${PN}-randmtzig.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 --enable-shared || 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."
+}
+
-- 
2.26.2