Added patch to allow compilation against imagemagick-6.3.9* (see bug #213980). Also removed old versions.

(Portage version: 2.1.4.4)

7 files changed, 39 insertions, 153 deletions

diff --git a/sci-mathematics/octave-forge/ChangeLog b/sci-mathematics/octave-forge/ChangeLog
index 1445b35c0132..a9fefaaf53fb 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/ChangeLog,v 1.25 2007/12/25 14:32:10 phreak Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/ChangeLog,v 1.26 2008/03/20 17:32:36 markusle Exp $
+
+  20 Mar 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/octave-forge-2006.03.17-imagemagick.patch,
+  -octave-forge-2004.11.16-r2.ebuild, -octave-forge-2005.06.13-r1.ebuild,
+  octave-forge-2006.03.17.ebuild, octave-forge-2006.03.17-r1.ebuild:
+  Added patch to allow compilation against imagemagick-6.3.9* (see bug
+  #213980). Thanks much to Ed Catmur <ed@catmur.co.uk> for his patch.
+  Also removed old versions.
 
   25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing metalgod from metadata.xml as per #99350.
diff --git a/sci-mathematics/octave-forge/files/octave-forge-2006.03.17-imagemagick.patch b/sci-mathematics/octave-forge/files/octave-forge-2006.03.17-imagemagick.patch
new file mode 100644
index 000000000000..47e9014dbdb3
--- /dev/null
+++ b/sci-mathematics/octave-forge/files/octave-forge-2006.03.17-imagemagick.patch
@@ -0,0 +1,12 @@
+diff -Naur octave-forge-2006.03.17.old/main/image/Makefile octave-forge-2006.03.17/main/image/Makefile
+--- octave-forge-2006.03.17.old/main/image/Makefile	2006-02-04 10:16:50.000000000 -0500
++++ octave-forge-2006.03.17/main/image/Makefile	2008-03-20 10:24:54.000000000 -0400
+@@ -29,7 +29,7 @@
+ 	$(MKOCTFILE) $< -lpng
+ 	
+ __imagemagick__.oct: __imagemagick__.cc
+-	$(MKOCTFILE) $< -lMagick++ -lMagick
++	$(MKOCTFILE) $< `Magick++-config --cppflags --libs`
+ 	
+ __magick_read__$(OCTLINK): __imagemagick__.oct
+ 	$(MKOCTLINK) __imagemagick__.oct $@
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
deleted file mode 100644
index 45415058e829..000000000000
--- a/sci-mathematics/octave-forge/octave-forge-2004.11.16-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2007 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.4 2007/07/13 15:35:23 markusle 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
deleted file mode 100644
index 246f9064e8f9..000000000000
--- a/sci-mathematics/octave-forge/octave-forge-2005.06.13-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2007 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.4 2007/07/13 15:35:23 markusle 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."
-}
diff --git a/sci-mathematics/octave-forge/octave-forge-2006.01.28.ebuild b/sci-mathematics/octave-forge/octave-forge-2006.01.28.ebuild
index 64bbf0c0c44d..9bbaab5d694d 100644
--- a/sci-mathematics/octave-forge/octave-forge-2006.01.28.ebuild
+++ b/sci-mathematics/octave-forge/octave-forge-2006.01.28.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/octave-forge-2006.01.28.ebuild,v 1.7 2007/07/22 07:00:50 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/octave-forge-2006.01.28.ebuild,v 1.8 2008/03/20 17:32:36 markusle Exp $
 
 inherit eutils
 
@@ -33,10 +33,10 @@ src_compile() {
 
 	# patch Makefiles to avoid sandbox violations
 	sed -e "s|\$(MPATH)|${D}/\$(MPATH)|" \
-		-i ${S}/main/comm/Makefile \
-		-i ${S}/main/comm/doc/Makefile \
-		-i ${S}/main/fixed/Makefile \
-		-i ${S}/main/fixed/doc/Makefile \
+		-i "${S}"/main/comm/Makefile \
+		-i "${S}"/main/comm/doc/Makefile \
+		-i "${S}"/main/fixed/Makefile \
+		-i "${S}"/main/fixed/doc/Makefile \
 		|| die "failed to patch Makefiles"
 
 	emake || die "emake failed"
diff --git a/sci-mathematics/octave-forge/octave-forge-2006.03.17-r1.ebuild b/sci-mathematics/octave-forge/octave-forge-2006.03.17-r1.ebuild
index a74465aec3ec..38d4ca1c7b18 100644
--- a/sci-mathematics/octave-forge/octave-forge-2006.03.17-r1.ebuild
+++ b/sci-mathematics/octave-forge/octave-forge-2006.03.17-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/octave-forge-2006.03.17-r1.ebuild,v 1.4 2007/07/22 07:00:50 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/octave-forge-2006.03.17-r1.ebuild,v 1.5 2008/03/20 17:32:36 markusle Exp $
 
 inherit eutils
 
@@ -33,6 +33,7 @@ src_unpack() {
 	cd "${S}"
 	unpack ${A}
 	epatch "${FILESDIR}"/${PN}-config-fix.patch
+	epatch "${FILESDIR}"/${P}-imagemagick.patch
 }
 
 src_compile() {
diff --git a/sci-mathematics/octave-forge/octave-forge-2006.03.17.ebuild b/sci-mathematics/octave-forge/octave-forge-2006.03.17.ebuild
index 7255364d1d08..d8bd6880331c 100644
--- a/sci-mathematics/octave-forge/octave-forge-2006.03.17.ebuild
+++ b/sci-mathematics/octave-forge/octave-forge-2006.03.17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/octave-forge-2006.03.17.ebuild,v 1.9 2007/07/22 07:00:50 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/octave-forge-2006.03.17.ebuild,v 1.10 2008/03/20 17:32:36 markusle Exp $
 
 inherit eutils
 
@@ -28,6 +28,12 @@ DEPEND=">=sci-mathematics/octave-2.1.72
 		!amd64? ( ginac? ( sci-mathematics/ginac ) )
 		qhull? ( >=media-libs/qhull-3.1-r1 )"
 
+src_unpack() {
+	cd "${S}"
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-imagemagick.patch
+}
+
 src_compile() {
 	econf $(use_with X) || die "econf failed"
 	emake || die "emake failed"