Added media-gfx/imagemagick to DEPEND, closes bug 111087. Also marked stable on amd64.

Package-Manager: portage-2.1_pre3-r1

4 files changed, 33 insertions, 16 deletions

diff --git a/sci-misc/gri/ChangeLog b/sci-misc/gri/ChangeLog
index e619de7e366f..add4d524ba3e 100644
--- a/sci-misc/gri/ChangeLog
+++ b/sci-misc/gri/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-misc/gri
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/gri/ChangeLog,v 1.3 2005/03/10 21:19:17 phosphan Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/gri/ChangeLog,v 1.4 2006/01/15 13:07:35 cryos Exp $
+
+  15 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org> gri-2.12.7.ebuild,
+  gri-2.12.9.ebuild:
+  Added media-gfx/imagemagick to DEPEND, closes bug 111087. Also marked stable
+  on amd64.
 
 *gri-2.12.9 (10 Mar 2005)
 
diff --git a/sci-misc/gri/Manifest b/sci-misc/gri/Manifest
index 16f3c3c4937d..45773da57fe6 100644
--- a/sci-misc/gri/Manifest
+++ b/sci-misc/gri/Manifest
@@ -1,7 +1,17 @@
-MD5 88f5e903552a0cccfa00cc6d8e67aed5 gri-2.12.9.ebuild 847
-MD5 acaa2db4c771e9175aafb7a907ae5e8a gri-2.12.7.ebuild 845
-MD5 a76bd64c802a9b6a1c021cd96c550c8c ChangeLog 1845
-MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ef5f4683c024900ba6494736b2590dab ChangeLog 2026
 MD5 d0cd5ef601b56e6b711ad0cbb150d22a files/digest-gri-2.12.7 60
 MD5 9c1044a38052d94b89d8e0a1975a3fc3 files/digest-gri-2.12.9 60
 MD5 640cc8c322700bef964a58c84d47dfab files/info-install.patch 395
+MD5 bf68d6fc0467cc18087e5bb94ed26334 gri-2.12.7.ebuild 866
+MD5 671b5ee3436bbceda3b5f86efa6d46d3 gri-2.12.9.ebuild 916
+MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDykknntT9W3vfTuoRAtEbAJ0X+438NaLIk3Y3UMJMZYZk0RnTywCffmwd
+VjiR+WmLqYUe8LL7miGkfHg=
+=beLZ
+-----END PGP SIGNATURE-----
diff --git a/sci-misc/gri/gri-2.12.7.ebuild b/sci-misc/gri/gri-2.12.7.ebuild
index 2e738c5c7f18..d404091a2b95 100644
--- a/sci-misc/gri/gri-2.12.7.ebuild
+++ b/sci-misc/gri/gri-2.12.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/gri/gri-2.12.7.ebuild,v 1.3 2005/03/10 21:19:17 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/gri/gri-2.12.7.ebuild,v 1.4 2006/01/15 13:07:35 cryos Exp $
 
 inherit eutils
 
@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="x86 amd64 ~ppc"
 
 DEPEND=">=sci-libs/netcdf-3.5.0
-		virtual/tetex"
+		virtual/tetex
+		media-gfx/imagemagick"
 
 src_compile() {
 	econf || die
diff --git a/sci-misc/gri/gri-2.12.9.ebuild b/sci-misc/gri/gri-2.12.9.ebuild
index e3437200f4ef..d397c37f041a 100644
--- a/sci-misc/gri/gri-2.12.9.ebuild
+++ b/sci-misc/gri/gri-2.12.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/gri/gri-2.12.9.ebuild,v 1.1 2005/03/10 21:19:17 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/gri/gri-2.12.9.ebuild,v 1.2 2006/01/15 13:07:35 cryos Exp $
 
 inherit eutils
 
@@ -12,21 +12,22 @@ SRC_URI="mirror://sourceforge/gri/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="amd64 ~ppc ~x86"
 
 DEPEND=">=sci-libs/netcdf-3.5.0
-		virtual/tetex"
+	virtual/tetex
+	media-gfx/imagemagick"
 
 src_compile() {
-	econf || die
-	emake || die
+	econf || die "econf failed."
+	emake || die "emake failed."
 }
 
 src_install() {
 	# Replace PREFIX now and correct paths in the startup message.
 	sed -e s,PREFIX/share/doc/gri/,/usr/share/doc/${P}/, -i ${S}/startup.msg
 
-	einstall || die
+	einstall || die "einstall failed."
 
 	dodoc AUTHOR README
 	#move docs to the proper place