Added xdg-utils instead of hard-coded www browser and editor. Various

dependency fixes when some use flags are not set. Ebuild cleaning, QA
issues. Added longdescription to metadata.xml. Dropped ppc waiting
for bug #212198.
(Portage version: 2.1.5_rc2)

5 files changed, 177 insertions, 2 deletions

diff --git a/sci-visualization/grace/ChangeLog b/sci-visualization/grace/ChangeLog
index 899fa6fb59f4..c13bdfa0a5dd 100644
--- a/sci-visualization/grace/ChangeLog
+++ b/sci-visualization/grace/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-visualization/grace
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/ChangeLog,v 1.27 2007/08/21 02:35:00 je_fro Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/ChangeLog,v 1.28 2008/04/15 16:34:25 bicatali Exp $
+
+*grace-5.1.21-r1 (15 Apr 2008)
+
+  15 Apr 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/grace-5.1.21-fortran.patch, +files/grace-5.1.21-m4-netcdf.patch,
+  metadata.xml, +grace-5.1.21-r1.ebuild:
+  Added xdg-utils instead of hard-coded www browser and editor. Various
+  dependency fixes when some use flags are not set. Ebuild cleaning, QA
+  issues. Added longdescription to metadata.xml. Dropped ppc waiting
+  for bug #212198.
 
   21 Aug 2007; Jeff Gardner <je_fro@gentoo.org> -grace-5.1.19.ebuild:
   Remove old version.
diff --git a/sci-visualization/grace/files/grace-5.1.21-fortran.patch b/sci-visualization/grace/files/grace-5.1.21-fortran.patch
new file mode 100644
index 000000000000..921d965f3893
--- /dev/null
+++ b/sci-visualization/grace/files/grace-5.1.21-fortran.patch
@@ -0,0 +1,26 @@
+--- grace_np/gracef_np.c.orig	2008-03-03 11:45:12.000000000 +0000
++++ grace_np/gracef_np.c	2008-03-03 12:05:37.000000000 +0000
+@@ -1,5 +1,11 @@
+ #include <config.h>
+ 
++#ifdef NEED_F77_UNDERSCORE
++#  define F77_FNAME(fname) fname ## _
++#else
++#  define F77_FNAME(fname) fname
++#endif
++
+ #if defined(WITH_F77_WRAPPER)
+ 
+ #include <stdio.h>
+@@ -8,11 +14,6 @@
+ 
+ #include "grace_np.h"
+ 
+-#ifdef NEED_F77_UNDERSCORE
+-#  define F77_FNAME(fname) fname ## _
+-#else
+-#  define F77_FNAME(fname) fname
+-#endif
+ 
+ typedef void (*GraceFortranFunctionType) (const char *str, int len);
+ static GraceFortranFunctionType fortran_error = (GraceFortranFunctionType) 0;
diff --git a/sci-visualization/grace/files/grace-5.1.21-m4-netcdf.patch b/sci-visualization/grace/files/grace-5.1.21-m4-netcdf.patch
new file mode 100644
index 000000000000..94df301daf90
--- /dev/null
+++ b/sci-visualization/grace/files/grace-5.1.21-m4-netcdf.patch
@@ -0,0 +1,11 @@
+--- ac-tools/aclocal.m4.orig	2008-03-03 11:17:50.000000000 +0000
++++ ac-tools/aclocal.m4	2008-03-03 11:20:45.000000000 +0000
+@@ -662,7 +662,7 @@
+       int main(void) {
+         char *vlib;
+         vlib = nc_inq_libvers();
+-        if (strcmp(vlib, "[$1]") < 0) {
++        if ((vlib[0] == '"') && (strcmp(vlib, "[$1]") < 0) || ((vlib[0] != '"') && (strcmp(vlib,"[$1]") < 0))){
+           exit(1);
+         }
+         exit(0);
diff --git a/sci-visualization/grace/grace-5.1.21-r1.ebuild b/sci-visualization/grace/grace-5.1.21-r1.ebuild
new file mode 100644
index 000000000000..332650688528
--- /dev/null
+++ b/sci-visualization/grace/grace-5.1.21-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/grace-5.1.21-r1.ebuild,v 1.1 2008/04/15 16:34:25 bicatali Exp $
+
+EAPI="1"
+
+inherit eutils fortran autotools
+
+DEB_PR=2
+
+DESCRIPTION="Motif based XY-plotting tool"
+HOMEPAGE="http://plasma-gate.weizmann.ac.il/Grace/"
+SRC_URI="ftp://plasma-gate.weizmann.ac.il/pub/${PN}/src/stable/${P}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${DEB_PR}.diff.gz"
+
+SLOT="0"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+IUSE="fortran fftw jpeg netcdf pdf png"
+
+DEPEND="virtual/motif
+	sys-libs/zlib
+	media-libs/t1lib
+	media-libs/tiff
+	x11-libs/xbae
+	fftw? ( sci-libs/fftw:2.1 )
+	netcdf? ( sci-libs/netcdf )
+	png? ( media-libs/libpng )
+	jpeg? ( media-libs/jpeg )
+	pdf? ( media-libs/pdflib )"
+
+RDEPEND="${DEPEND}
+	x11-misc/xdg-utils"
+
+pkg_setup() {
+	if use fortran; then
+		FORTRAN="gfortran g77 ifc"
+		fortran_pkg_setup
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	epatch ${PN}_${PV}-${DEB_PR}.diff
+	cd "${S}"
+
+	epatch debian/patches/tmpnam_to_mkstemp.diff
+
+	# fix for netcdf versioning in aclocal.m4
+	epatch "${FILESDIR}"/${P}-m4-netcdf.patch
+	# fix for missing defines when fortran is disabled
+	epatch "${FILESDIR}"/${P}-fortran.patch
+	# don't strip if not asked for
+	sed -i \
+		-e 's:$(INSTALL_PROGRAM) -s:$(INSTALL_PROGRAM):g' \
+		{auxiliary,grconvert,src}/Makefile
+
+	sed -i \
+		-e 's:$(GRACE_HOME)/bin:$(PREFIX)/bin:g' \
+		-e "s:\$(GRACE_HOME)/lib:\$(PREFIX)/$(get_libdir):g" \
+		-e 's:$(GRACE_HOME)/include:$(PREFIX)/include:g' \
+		-e 's:$(PREFIX)/man:$(PREFIX)/share/man:g' \
+		Makefile */Makefile || die "sed failed"
+
+	sed -i \
+		-e 's:bin/grconvert:grconvert:' \
+		-e 's:auxiliary/fdf2fit:fdf2fit:' \
+		gracerc || die
+
+	# the configure script just produces a basic Make.conf
+	# and a config.h
+
+	cp ac-tools/configure.in .
+	eautoconf
+	eaclocal
+}
+
+src_compile() {
+	local myconf
+	if use fortran; then
+		myconf="--with-f77=${FORTRANC}"
+	else
+		myconf="--without-f77"
+	fi
+	econf \
+		--disable-xmhtml \
+		--without-bundled-xbae \
+		--without-bundled-t1lib \
+		--enable-grace-home=/usr/share/${PN} \
+		--with-helpviewer="xdg-open %s" \
+		--with-editor="xdg-open %s" \
+		--with-printcmd="lpr" \
+		$(use_with fftw) \
+		$(use_enable fortran f77-wrapper) \
+		$(use_enable netcdf) \
+		$(use_enable jpeg jpegdrv) \
+		$(use_enable png pngdrv) \
+		$(use_enable pdf pdfdrv) \
+		${myconf} \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc CHANGES ChangeLog DEVELOPERS README COPYRIGHT \
+		|| die "dodoc failed"
+
+	dosym ../../${PN}/examples /usr/share/doc/${PF}/examples
+	dosym ../../${PN}/doc /usr/share/doc/${PF}/html
+
+	doman debian/fdf2fit.1 || die "doman failed"
+	doman "${D}"/usr/share/doc/${PF}/html/*.1
+	rm -f "${D}"/usr/share/doc/${PF}/html/*.1
+	doicon "${FILESDIR}"/${PN}.png || die "failed installing icon"
+	make_desktop_entry xmgrace Grace grace
+}
diff --git a/sci-visualization/grace/metadata.xml b/sci-visualization/grace/metadata.xml
index b7eaaa7d9578..29a491897296 100644
--- a/sci-visualization/grace/metadata.xml
+++ b/sci-visualization/grace/metadata.xml
@@ -3,4 +3,14 @@
 <pkgmetadata>
 <herd>sci</herd>
 <herd>graphics</herd>
+<longdescription lang="en">
+  Grace is a point-and-click tool that allows the user to draw X-Y
+  plots. This is the program formerly known as Xmgr.
+
+  A few of its features are: user defined scaling, tick marks, labels,
+  symbols, line styles, colors. Polynomial regression, splines, running
+  averages, DFT/FFT, cross/auto-correlation. Batch mode for unattended
+  plotting. Hardcopy support for PostScript, FrameMaker and several
+  image formats.
+</longdescription>
 </pkgmetadata>