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

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 29 insertions, 13 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/Manifest b/sci-visualization/gri/Manifest
index ac59f21d1926..017d8a8d1839 100644
--- a/sci-visualization/gri/Manifest
+++ b/sci-visualization/gri/Manifest
@@ -7,14 +7,13 @@ AUX gri-2.12.23-perl-5.16.patch 554 SHA256 3ac28a5846e69bf74e1844460f1c58fabeb7a
 DIST gri-2.12.19.tar.gz 1658449 SHA256 9c1b315f309268a64c538c691644ac83665c88a65c408d427afe8ed22592b6e6
 DIST gri-2.12.23.tar.gz 1668587 SHA256 a24e703f30250ed705c0a242aa59a24748259ea7355fca52152f367f45bfd2e7 SHA512 0b028c56e9603fd00480ad7a92461c1e60f7879d89bffb5b83a2ee52c8870546e584c75478777dbb2d4934095fe9a9d4efd2aa2ff756c1860459a1e0cc0b4216 WHIRLPOOL f272827cfa5fa65604dc2a116660a78b7b0ac1df6d5ddacd943fae5ab258d05546285bffb89779aabe710c79a04d3f665b25484af3bbf5ffa1762ca3cee0c245
 EBUILD gri-2.12.19.ebuild 2008 SHA256 de51045ec596948db848f1300a90fec05c34478f713528e95a00a97b5db1f444 SHA512 ac881b0952e6ef9dc8a473355bde04182f9993f9bc0a0d44ccacfdf4bc0f6e6f28044bd309bbbf07bcef962626a282a864d809aa9f3aca8328536abee88d8c39 WHIRLPOOL 66701292c592d397ba5e5264dceb9812d1582a7da4c92a711c2652de7567fb2303cf944cac4ccac789c8c8758e840115d797f85cc5872d7ea08c66f293a52148
-EBUILD gri-2.12.23.ebuild 2075 SHA256 9e07d537aa70bf558e8237cd5b73b0711b4cb28a190242485a9cb8f9157e056b SHA512 4f24b3912c4b9c5f5d36aeaa6f8b13f5d57d5a9148e896fd9b7ac840e93d823f461cba3c043631288535828f91e538b698b243986adf3a3a454af04f86f68d98 WHIRLPOOL 1e8abda850e63a3a55d27e5830e628e687416e2a5445213e7a167373757fdb4ffa82f419a493535fab9ffa49be470abf27a53ae1971a646870f23b948b1d7ebf
-MISC ChangeLog 7349 SHA256 0c3f3c617d4893011e7d8b873628aaa18be783381fa860bcd2b5d2683ab94202 SHA512 b8fc2376a6a1379de4e813ad7d7c366bd53f66b26abac52f44cfa9219d09e0ed35928d8dd000225cd94a5027c43b71a518674343a09c7c264e51c12d547f8492 WHIRLPOOL e007acced212465e1ee82896912411c29d7202d2e76bf084d111f2a9a3979e52d04455484c689556cabb3039dd5989a0a863fbe9db86cefc57bc3ccbb3c82396
-MISC metadata.xml 157 SHA256 750cb9e46ac2b77e1adf73de43c186a8c2d2234a9c6a89d9358d0969dc5cf8ac SHA512 511d9e615c29eefcdd18c299ec142f8d535aeeaa54da8df92d2c723e30c27a5ac532f369f51b008005ceef5c0c6616e2754587691fa1f1e42fa718d33ae8c756 WHIRLPOOL 8cf276bea6d6211d791b31f8f9f056976f11d6e6b05ed43e097d25692a30b4967d4ed490658ae14d3384c8e6ace0f648f0285a535155888e0e029d939d5f7aa2
+EBUILD gri-2.12.23.ebuild 2215 SHA256 b9951f6577634615b8f72b42ce92dbf6af1b9f051e8d05d6b314225000db7be4 SHA512 13fb6bcf65c488f574b94423fc521ea5326dc82a60ef9d710a11ad1ebc70e38fa7a84421fe569a5a2f983582c5ed52c6bea3bb77253c72060953106e6a01c584 WHIRLPOOL b1af22d70a6b29157ff986a56511298c48db2cf4747a3b4999918790cb63f06c88f96f5703b66901f1c3d5137bc5b72f23c7918499ca19c92df5e5cc619828a5
+MISC ChangeLog 7571 SHA256 4afe09ea7c1b21d3f56c9e63c7af44387cbd18ac7a8cd40c65304c6c0a448c5b SHA512 af140cc504daf8e6818074f37409211bf38ecdf5ab377d1347db3374922f741ad09559dd54c107c135bdf80464db09e65b3f3383720ea96dca346b2433cf4a50 WHIRLPOOL debf1d66c3f2652d5e330b51b9272f89ba643f18b20f1d36b4a80f457dee05bf6e4f00722e28bd6d2e2b9e9c784f87ddad44c0fc0135a44302b864d984156b9a
+MISC metadata.xml 701 SHA256 82a7f5f0292893d17587dbad7f8e74ab2d3ab18b572410e2a78ca30a46ac0f89 SHA512 733f243b0590748f3850561241eb1dcd0d0d8d3b38165b2adacddf3f61493918f3a027ed3a64c117dba698766dba507797b97892cb91efdbef3d1b445de8ff66 WHIRLPOOL 56344e2328a068870456025f328bbf1d575d71c1e783e7e5a3471c09ce393fa634c6b8aa06d30e900c2b27e98150e2c979f89c664c302735f17d8bd8e16ffeac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
 
-iEYEAREIAAYFAlAFj6UACgkQgAnW8HDreRbneACgvgq7evVUU/xzCNMXeL/+AXLS
-sYAAnRAsDwyfQjYjZtwG/eEmZfdJpaSp
-=eaYD
+iEYEAREIAAYFAlAZvioACgkQ1ycZbhPLE2CLpgCfVLavizb+5t+JLFS1g2AzX+8O
+hiQAoIyzLZHcB55KmEN0BVY6+GRIN1T6
+=ZdE7
 -----END PGP SIGNATURE-----
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>