Version bump with a few patches. Removed stdc99 patch, thanks for markusle for tracking that down, closing bug #231607

(Portage version: 2.1.4.4)

7 files changed, 210 insertions, 129 deletions

diff --git a/sci-visualization/grace/ChangeLog b/sci-visualization/grace/ChangeLog
index 0a07e6a16645..60b06f22b171 100644
--- a/sci-visualization/grace/ChangeLog
+++ b/sci-visualization/grace/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-visualization/grace
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/ChangeLog,v 1.33 2008/06/27 10:43:17 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/ChangeLog,v 1.34 2008/07/16 11:47:31 bicatali Exp $
+
+*grace-5.1.22 (16 Jul 2008)
+
+  16 Jul 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/grace-5.1.22-dlmodule.patch, +files/grace-5.1.22-mkstemp.patch,
+  +files/grace-5.1.22-pdfdrv.patch, -grace-5.1.21.ebuild,
+  grace-5.1.21-r1.ebuild, +grace-5.1.22.ebuild:
+  Version bump with a few patches. Removed stdc99 patch, thanks for markusle
+  for tracking that down, closing bug #231607
 
   27 Jun 2008; Ulrich Mueller <ulm@gentoo.org> grace-5.1.20.ebuild,
   grace-5.1.21.ebuild, grace-5.1.21-r1.ebuild:
diff --git a/sci-visualization/grace/files/grace-5.1.22-dlmodule.patch b/sci-visualization/grace/files/grace-5.1.22-dlmodule.patch
new file mode 100644
index 000000000000..9e36b34e06f4
--- /dev/null
+++ b/sci-visualization/grace/files/grace-5.1.22-dlmodule.patch
@@ -0,0 +1,12 @@
+--- src/dlmodule.c.orig	2005-11-13 07:45:16.000000000 +0900
++++ src/dlmodule.c	2008-06-16 15:28:33.000000000 +0900
+@@ -89,6 +89,9 @@
+         return RETURN_FAILURE;
+     }
+     
++    /* clear error indicator */
++    dlerror();
++
+     newkey.data = dlsym(handle, dl_function);
+     if (!newkey.data && (error = dlerror()) != NULL) {
+         errmsg(error);
diff --git a/sci-visualization/grace/files/grace-5.1.22-mkstemp.patch b/sci-visualization/grace/files/grace-5.1.22-mkstemp.patch
new file mode 100644
index 000000000000..5cb0f35ef9eb
--- /dev/null
+++ b/sci-visualization/grace/files/grace-5.1.22-mkstemp.patch
@@ -0,0 +1,55 @@
+--- src/plotone.c.orig	2008-07-16 11:36:43.000000000 +0100
++++ src/plotone.c	2008-07-16 12:14:22.000000000 +0100
+@@ -119,21 +119,29 @@
+         if (print_file[0] == '\0') {
+             Device_entry dev = get_device_props(hdevice);
+             sprintf(print_file, "%s.%s", get_docbname(), dev.fext);
++	    prstream = grace_openw(fname);
+         }
+         strcpy(fname, print_file);
+     } else {
++        int hdfd;
+         s = get_print_cmd();
+         if (s == NULL || s[0] == '\0') {
+             errmsg("No print command defined, output aborted");
+             return;
+         }
+-        tmpnam(fname);
+-        /* VMS doesn't like extensionless files */
+-        strcat(fname, ".prn");
++	strcpy(fname, "grace-hardcopy-XXXXXX");
++	hdfd=mkstemp(fname);
++	if (hdfd == -1) {
++	  errmsg("Could not create a temporary file, output aborted.");
++	  return;
++	}
++	prstream = fdopen(hdfd, "wb");
++	if (prstream == NULL) {
++	  errmsg("Could not create a temporary file, output aborted.");
++	  return;
++	}
+     }
+     
+-    prstream = grace_openw(fname);
+-    
+     if (prstream == NULL) {
+         return;
+     }
+--- src/editpwin.c.orig	2008-07-16 11:37:01.000000000 +0100
++++ src/editpwin.c	2008-07-16 11:39:37.000000000 +0100
+@@ -776,12 +776,12 @@
+  */
+ void do_ext_editor(int gno, int setno)
+ {
+-    char *fname, ebuf[256];
++    char fname[64], ebuf[256];
+     FILE *cp;
+     int save_autos;
+ 
+-    fname = tmpnam(NULL);
+-    cp = grace_openw(fname);
++    strcpy(fname, "grace-XXXXXX");
++    cp = fdopen(mkstemp(fname), "wb");
+     if (cp == NULL) {
+         return;
+     }
diff --git a/sci-visualization/grace/files/grace-5.1.22-pdfdrv.patch b/sci-visualization/grace/files/grace-5.1.22-pdfdrv.patch
new file mode 100644
index 000000000000..6d6200713bfe
--- /dev/null
+++ b/sci-visualization/grace/files/grace-5.1.22-pdfdrv.patch
@@ -0,0 +1,11 @@
+--- src/pdfdrv.c.orig	2004-08-05 04:37:47.000000000 +0900
++++ src/pdfdrv.c	2008-06-16 15:29:00.000000000 +0900
+@@ -57,6 +57,8 @@
+ #  include "motifinc.h"
+ #endif
+ 
++#define PDF_set_fillrule(handle, rule) PDF_set_parameter(handle, "fillrule", rule)
++
+ static void pdf_error_handler(PDF *p, int type, const char* msg);
+ 
+ static unsigned long page_scale;
diff --git a/sci-visualization/grace/grace-5.1.21-r1.ebuild b/sci-visualization/grace/grace-5.1.21-r1.ebuild
index a0e0861cc989..9f281aa3a76d 100644
--- a/sci-visualization/grace/grace-5.1.21-r1.ebuild
+++ b/sci-visualization/grace/grace-5.1.21-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.6 2008/06/27 10:43:17 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/grace-5.1.21-r1.ebuild,v 1.7 2008/07/16 11:47:31 bicatali Exp $
 
 EAPI="1"
 inherit eutils fortran
@@ -49,8 +49,10 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-netcdf.patch
 	# fix for missing defines when fortran is disabled
 	epatch "${FILESDIR}"/${P}-fortran.patch
-	# fix for glibc-2.7 (bug #)
-	epatch "${FILESDIR}"/${P}-stdc99.patch
+
+	# fix for glibc-2.7 (bug #217971)
+	# removed (bug #231607)
+	# epatch "${FILESDIR}"/${P}-stdc99.patch
 
 	# don't strip if not asked for
 	sed -i \
diff --git a/sci-visualization/grace/grace-5.1.21.ebuild b/sci-visualization/grace/grace-5.1.21.ebuild
deleted file mode 100644
index dcd7d2db83eb..000000000000
--- a/sci-visualization/grace/grace-5.1.21.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# 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.ebuild,v 1.3 2008/06/27 10:43:17 ulm Exp $
-
-inherit eutils
-
-DESCRIPTION="WYSIWYG 2D plotting tool for the X Window System"
-HOMEPAGE="http://plasma-gate.weizmann.ac.il/Grace/"
-SRC_URI="ftp://plasma-gate.weizmann.ac.il/pub/grace/src/stable/${P}.tar.gz"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="debug fftw jpeg netcdf pdf png"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="x11-libs/openmotif
-	>=sys-libs/zlib-1.0.3
-	>=media-libs/t1lib-1.3.1
-	>=media-libs/tiff-3.5
-	fftw?	( =sci-libs/fftw-2* )
-	netcdf?	( >=sci-libs/netcdf-3.0 )
-	png?	( >=media-libs/libpng-0.9.6 )
-	jpeg?	( media-libs/jpeg )
-	pdf?	( >=media-libs/pdflib-4.0.3 )"
-
-DEPEND="${RDEPEND}
-		>=sys-apps/sed-4"
-
-src_compile() {
-
-	local gracehelpviewer
-	local graceeditor
-
-	if has_version 'www-client/dillo' ; then
-		gracehelpviewer="dillo"
-	elif has_version 'www-client/opera' ; then
-		gracehelpviewer="opera"
-	elif has_version 'www-client/mozilla-firefox' \
-		|| has_version 'www-client/mozilla-firefox-bin' \
-		|| has_version 'www-client/mozilla-firefox-cvs' ; then
-		gracehelpviewer="firefox"
-	elif has_version 'www-client/mozilla' ; then
-		gracehelpviewer="mozilla"
-	elif has_version 'kde-base/kdebase' \
-		|| has_version 'kde-base/konqueror' ; then
-		gracehelpviewer="konqueror"
-	elif has_version 'www-client/galeon' ; then
-		gracehelpviewer="galeon"
-	elif has_version 'www-client/epiphany' ; then
-		gracehelpviewer="epiphany"
-	else
-		gracehelpviewer="netscape"
-	fi
-
-	graceeditor="xterm -e ${EDITOR}"
-
-	sed -i -e "s%doc/%/usr/share/doc/${PF}/html/%g" src/*
-	sed -i -e "s%examples/%/usr/share/doc/${PF}/examples/%g" src/xmgrace.c
-
-	econf \
-		--enable-grace-home=/usr/share/grace \
-		--with-helpviewer="${gracehelpviewer} %s" \
-		--with-editor="${graceeditor}" \
-		`use_with fftw` \
-		`use_enable netcdf` \
-		`use_enable debug` \
-		`use_enable jpeg jpegdrv` \
-		`use_enable png pngdrv` \
-		`use_enable pdf pdfdrv` || die
-
-	cp doc/Makefile doc/Makefile.orig
-	sed -e 's:$(GRACE_HOME)/doc:$(PREFIX)/share/doc/$(PF)/html:g' \
-		doc/Makefile.orig >doc/Makefile || die
-
-	cp auxiliary/Makefile auxiliary/Makefile.orig
-	sed -e 's:$(GRACE_HOME)/bin:$(PREFIX)/bin:g' \
-		auxiliary/Makefile.orig >auxiliary/Makefile || die
-
-	cp grconvert/Makefile grconvert/Makefile.orig
-	sed -e 's:$(GRACE_HOME)/bin:$(PREFIX)/bin:g' \
-		grconvert/Makefile.orig >grconvert/Makefile || die
-
-	cp src/Makefile src/Makefile.orig
-	sed -e 's:$(GRACE_HOME)/bin:$(PREFIX)/bin:g' \
-		src/Makefile.orig >src/Makefile || die
-
-	cp grace_np/Makefile grace_np/Makefile.orig
-	sed -e 's:$(GRACE_HOME)/lib:$(PREFIX)/lib:g' \
-		-e 's:$(GRACE_HOME)/include:$(PREFIX)/include:g' \
-		grace_np/Makefile.orig >grace_np/Makefile || die
-
-	cp examples/Makefile examples/Makefile.orig
-	sed -e 's:/examples:/share/doc/$(PF)/examples:g' \
-		-e 's:$(GRACE_HOME):$(PREFIX):g' \
-		examples/Makefile.orig >examples/Makefile || die
-
-	make || die
-}
-
-src_install() {
-
-	make \
-		GRACE_HOME="${D}/usr/share/grace" \
-		PREFIX="${D}/usr" \
-		install || die
-
-	dodoc CHANGES COPYRIGHT ChangeLog DEVELOPERS LICENSE README
-
-	doman "${D}"/usr/share/doc/${PF}/html/*.1
-	rm -f "${D}"/usr/share/doc/${PF}/html/*.1
-
-	dosym /usr/share/doc/${PF}/examples /usr/share/grace/examples
-
-	insinto /usr/share/pixmaps/
-	doins ${FILESDIR}/${PN}.png
-
-	insinto /usr/share/applications/
-	doins ${FILESDIR}/${PN}.desktop
-
-	into /usr/
-	dobin ${FILESDIR}/xm${PN}.sh
-
-}
diff --git a/sci-visualization/grace/grace-5.1.22.ebuild b/sci-visualization/grace/grace-5.1.22.ebuild
new file mode 100644
index 000000000000..44eae26b1c8b
--- /dev/null
+++ b/sci-visualization/grace/grace-5.1.22.ebuild
@@ -0,0 +1,117 @@
+# 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.22.ebuild,v 1.1 2008/07/16 11:47:31 bicatali Exp $
+
+EAPI="1"
+inherit eutils fortran
+
+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"
+
+SLOT="0"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="fortran fftw jpeg netcdf pdf png"
+
+DEPEND="x11-libs/openmotif
+	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}
+
+	cd "${S}"
+
+	# move tmpnam to mkstemp (adapted from debian)
+	epatch "${FILESDIR}"/${P}-mkstemp.patch
+	# fix configure instead of aclocal.m4
+	epatch "${FILESDIR}"/${PN}-5.1.21-netcdf.patch
+	# fix for missing defines when fortran is disabled
+	epatch "${FILESDIR}"/${PN}-5.1.21-fortran.patch
+	# fix a leak and pdf driver (from freebsd)
+	epatch "${FILESDIR}"/${P}-dlmodule.patch
+	epatch "${FILESDIR}"/${P}-pdfdrv.patch
+
+	# fix for glibc-2.7 (bug #217971)
+	# removed (bug #231607)
+	# epatch "${FILESDIR}"/${P}-stdc99.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
+}
+
+src_compile() {
+	local myconf
+	if use fortran; then
+		myconf="--with-f77=${FORTRANC}"
+	else
+		myconf="--without-f77"
+	fi
+
+	# the configure script just produces a basic Make.conf
+	# and a config.h
+	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 "${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
+}