Revision bump to pull in updated grace-5.1.22-mkstemp.patch. The previous patch version was faulty and caused printing to a file to fail (see bug #232742).

Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.25-SENTINEL-5 i686

4 files changed, 155 insertions, 37 deletions

diff --git a/sci-visualization/grace/ChangeLog b/sci-visualization/grace/ChangeLog
index 60b06f22b171..973b3b71817c 100644
--- a/sci-visualization/grace/ChangeLog
+++ b/sci-visualization/grace/ChangeLog
@@ -1,6 +1,16 @@
 # 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.34 2008/07/16 11:47:31 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/ChangeLog,v 1.35 2008/07/26 17:00:56 markusle Exp $
+
+*grace-5.1.22-r1 (26 Jul 2008)
+
+  26 Jul 2008; Markus Dittrich <markusle@gentoo.org>
+  files/grace-5.1.22-mkstemp.patch, +grace-5.1.22-r1.ebuild:
+  Revision bump to pull in updated grace-5.1.22-mkstemp.patch. The 
+  previous patch version was faulty and caused printing to a file 
+  to fail (see bug #232742). Thanks much to Stefano Carignano 
+  <scary.moo@libero.it> and Sammy Umar 
+  <umar@compsci.cas.vanderbilt.edu> for helping us track this down.
 
 *grace-5.1.22 (16 Jul 2008)
 
diff --git a/sci-visualization/grace/Manifest b/sci-visualization/grace/Manifest
index 055316c1dd65..4600c4d30aa9 100644
--- a/sci-visualization/grace/Manifest
+++ b/sci-visualization/grace/Manifest
@@ -1,11 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX grace-5.1.21-fortran.patch 650 RMD160 1eb2b9cb37cad4b103f5fe4749e65403a1dffab5 SHA1 50b5a5af6ab802936fcb227ebba46bb69e37bd7b SHA256 5001b3eb4ceb4b408b01a92651162bdf6f3ce1823199ae8f0a62c32a816a5c1e
 AUX grace-5.1.21-netcdf.patch 413 RMD160 dab48c7889042ebe741293da0184c36c00034e32 SHA1 750efdb37af1f1c1eab0f8c28f52df4621964c44 SHA256 57c36bfd320d2a3a61c2f7628ede67f96c4c165969f7162b4d3dbf07d23d5adb
 AUX grace-5.1.21-stdc99.patch 458 RMD160 79f98076d98c90bb9dde7edf76797790d53f4eba SHA1 1f5267b3fbc757704042b5d5a5c25465bb0bd8b9 SHA256 8fb25ffd450c65871d4c418a3c8a42e4e33545723c2ce6e854c534d60e035f3e
 AUX grace-5.1.22-dlmodule.patch 356 RMD160 1900c1e7a2d964d299408af73f52b32b145d976f SHA1 a06088c543c1c6ae0280af1fdba7a80c55e97a62 SHA256 b8e0b2527a2083b0594756e927f45ad9051711ac370330deb11e299ca849e05a
-AUX grace-5.1.22-mkstemp.patch 1575 RMD160 9f70350b0706891bc43ffaa326736fa01d950d05 SHA1 94916aaaabf68388341d83d7cccc4bee20ad6b2b SHA256 78b46a4cd367d2eec2b2796a580f6b4d70fff6efaa54f4969a34409e591972ca
+AUX grace-5.1.22-mkstemp.patch 1664 RMD160 5dc6c1b84d33e5848f546b17509ca1c36973d152 SHA1 5221a837385c762ad397dfdf4c733381e9318821 SHA256 6e436fe9c27d4b627a8116ca2a1bea94bd5fc01bc475be6f56a63ec9b5cf2f97
 AUX grace-5.1.22-pdfdrv.patch 353 RMD160 77dbd6af3bac15822f5e2e7e75b8172d8ca67798 SHA1 b7a1ddc3341c0208f538b660b6d8d3705c58caff SHA256 c347802157e90aa56a4fcddaea437ba016f5344354b64d50748171ba52fe27ff
 AUX grace-helpviewer-gentoo.diff 384 RMD160 c9c0ff6d9ff270cfb94ec2d91a19a1eee64e76be SHA1 949d2728e0857fb955538757b72852643a1e2b2c SHA256 d17e81fa31c1647c9b7a8dbff5a8aa75faf6d4d293ad2738de93acbdf754e206
 AUX grace.desktop 262 RMD160 5a10a1cf6f5e79aff53eb62fffb24067afcab37e SHA1 11e2ecbf7862f3e810c32ca5398da11ea182ebd8 SHA256 25b51b4216d35b44ae0d6a5d930d82fab76b5cd799898dd0797d23eec8bfdc3e
@@ -17,13 +14,7 @@ DIST grace-5.1.22.tar.gz 2516576 RMD160 ca7b1abe240de7cd3dbdc52d5182020c410b9772
 DIST grace_5.1.21-2.diff.gz 23517 RMD160 e027372cbe6bd51543ca00888da987055895eecc SHA1 5507eeb8100d750690b203db9e628d83d77d3830 SHA256 d04252fbfc1fde51e05df3f36d34dcfe88fb53a330f92e189eb6af6a459e1b23
 EBUILD grace-5.1.20.ebuild 3350 RMD160 997907ddd2ef09658db6060f1bc4227ef85da46e SHA1 93a3139b8d515d98cc7683b196238979b81639f9 SHA256 d6a650a9391bc29599e3feecd05fc325881df05e2d022fac8d4a901ac18bcf8b
 EBUILD grace-5.1.21-r1.ebuild 3104 RMD160 8949f7ba78c14eef113d1c529765fa2d8b0d2629 SHA1 4835b5cd4eb52596d220121b23b9877c2a309faa SHA256 b2ea97171632f246d00e78fdda88477934cdb98e84f0f15f3480ecb0230cff8f
+EBUILD grace-5.1.22-r1.ebuild 3095 RMD160 de17c657be53ce9f6d74202b056700238e4fa3d3 SHA1 809a32c8922c171cf7fd13977cbc43737c5c555d SHA256 e187ed7d0a77be3f03acf61ec805e976f3c27060375faa5764c3daa20209b2f4
 EBUILD grace-5.1.22.ebuild 3092 RMD160 b77416900e4611f2503e617c85732ab6fee54438 SHA1 6a899cbf486891b82c590962af7ba563c4ab5818 SHA256 4306b5bb4562e10211aa0905242d13251da2ee463fa347ff6c8dd75e731dc038
-MISC ChangeLog 12006 RMD160 74456e86303ec3261e3a58a036615f68ebb53dbf SHA1 c732059715e6f7afa97bbe2b65e0be89677d4a60 SHA256 b293c2e56003323efa368533df3ec075bfb348561602b624860c89da94fda647
+MISC ChangeLog 12459 RMD160 15f029e87189394896f6c3f7862c68ce22182fbe SHA1 5c4945b3337726147067718ec48e89efd13ae7a6 SHA256 8e4d1a8415d68239c625e2a8bcf0df2dc69fb48a79bbbc77cc419fb7c2a8cdd4
 MISC metadata.xml 645 RMD160 78fdc207c55c585d82c8282ddedf554da9ebbeaf SHA1 f905e31a079fe543bc3f81d0305c11ea3529c605 SHA256 97aa6dae00402081c1d846ef26f8a5283b5bbe62c414bb66febee13bf2d92bfe
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkh9394ACgkQ1ycZbhPLE2DWvwCgiAQPi03FseCaJTVNDb0UxdP9
-lRAAoKRXX/3LtojnnHNARlYUOz8tfwqh
-=7z95
------END PGP SIGNATURE-----
diff --git a/sci-visualization/grace/files/grace-5.1.22-mkstemp.patch b/sci-visualization/grace/files/grace-5.1.22-mkstemp.patch
index 5cb0f35ef9eb..402a5162c584 100644
--- a/sci-visualization/grace/files/grace-5.1.22-mkstemp.patch
+++ b/sci-visualization/grace/files/grace-5.1.22-mkstemp.patch
@@ -1,12 +1,30 @@
---- 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);
+diff -Naur grace-5.1.22/src/editpwin.c grace-5.1.22.new/src/editpwin.c
+--- grace-5.1.22/src/editpwin.c	2006-06-03 17:19:52.000000000 -0400
++++ grace-5.1.22.new/src/editpwin.c	2008-07-26 12:45:21.000000000 -0400
+@@ -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 -Naur grace-5.1.22/src/plotone.c grace-5.1.22.new/src/plotone.c
+--- grace-5.1.22/src/plotone.c	2005-05-19 16:30:25.000000000 -0400
++++ grace-5.1.22.new/src/plotone.c	2008-07-26 12:45:40.000000000 -0400
+@@ -121,19 +121,27 @@
              sprintf(print_file, "%s.%s", get_docbname(), dev.fext);
-+	    prstream = grace_openw(fname);
          }
          strcpy(fname, print_file);
++	prstream = grace_openw(fname);
      } else {
 +        int hdfd;
          s = get_print_cmd();
@@ -35,21 +53,3 @@
      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/grace-5.1.22-r1.ebuild b/sci-visualization/grace/grace-5.1.22-r1.ebuild
new file mode 100644
index 000000000000..ae8731a903df
--- /dev/null
+++ b/sci-visualization/grace/grace-5.1.22-r1.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-r1.ebuild,v 1.1 2008/07/26 17:00:56 markusle 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
+}