Fixed for mpi when hdf5[mpi] is built (bug #387491). Added necessary dependence on graphicsmagick[imagemagick] for convert

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

3 files changed, 23 insertions, 6 deletions

diff --git a/sci-visualization/gri/ChangeLog b/sci-visualization/gri/ChangeLog
index c7d1bde8bdf4..2ec9f0eaea5d 100644
--- a/sci-visualization/gri/ChangeLog
+++ b/sci-visualization/gri/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-visualization/gri
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gri/ChangeLog,v 1.10 2012/07/17 16:15:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gri/ChangeLog,v 1.11 2012/08/01 23:39:06 bicatali Exp $
+
+  01 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> gri-2.12.23.ebuild,
+  metadata.xml:
+  Fixed for mpi when hdf5[mpi] is built (bug #387491). Added necessary
+  dependence on graphicsmagick[imagemagick] for convert
 
   17 Jul 2012; Justin Lecher <jlec@gentoo.org> gri-2.12.23.ebuild,
   +files/gri-2.12.23-perl-5.16.patch, metadata.xml:
@@ -204,4 +209,3 @@
   initial release (#10695)
   Gri is a language for scientific graphics programming.
   ebuild submitted by Jose Fonseca <j_r_fonseca@yahoo.co.uk>
-
diff --git a/sci-visualization/gri/gri-2.12.23.ebuild b/sci-visualization/gri/gri-2.12.23.ebuild
index 22988bc5c7c7..6657405b1880 100644
--- a/sci-visualization/gri/gri-2.12.23.ebuild
+++ b/sci-visualization/gri/gri-2.12.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gri/gri-2.12.23.ebuild,v 1.5 2012/07/17 16:15:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gri/gri-2.12.23.ebuild,v 1.6 2012/08/01 23:39:06 bicatali Exp $
 
 EAPI=4
 
@@ -12,13 +12,13 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc emacs examples"
 
 DEPEND="
 	>=sci-libs/netcdf-4
 	virtual/latex-base
-	|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] )
+	|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png,imagemagick] )
 	app-text/ghostscript-gpl
 	emacs? ( virtual/emacs )"
 RDEPEND="${DEPEND}"
@@ -35,6 +35,9 @@ src_prepare() {
 }
 
 src_compile() {
+	# gentoo bug #302621
+	use hdf5 && has_version sci-libs/hdf5[mpi] && \
+		export CXX=mpicxx CC=mpicc
 	VARTEXFONTS="${T}/fonts" emake
 	use emacs && elisp-compile src/*.el
 }
diff --git a/sci-visualization/gri/metadata.xml b/sci-visualization/gri/metadata.xml
index d369d068ffb8..c8c298e99e5c 100644
--- a/sci-visualization/gri/metadata.xml
+++ b/sci-visualization/gri/metadata.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+<herd>sci</herd>
+<longdescription lang='en'>
+  Gri is a language for scientific graphics programming. The word
+  "language" is important: Gri is command-driven, not
+  point/click. Some users liken Gri to LaTeX, since both provide
+  extensive power in exchange for patience in learning syntax. Gri can
+  make x-y graphs, contour graphs, and image graphs, in PostScript and
+  (someday) SVG formats. Control is provided over all aspects of
+  drawing, e.g. line widths, colors, and fonts. A TeX-like syntax
+  provides common mathematical symbols.
+</longdescription>
 </pkgmetadata>