Merge branch 'master' of git://git.overlays.gentoo.org/proj/sci; github.com:gentoo-science/sci

10 files changed, 180 insertions, 8 deletions

diff --git a/dev-util/ndiff/ChangeLog b/dev-util/ndiff/ChangeLog
index de5d8a393..500ef0901 100644
--- a/dev-util/ndiff/ChangeLog
+++ b/dev-util/ndiff/ChangeLog
@@ -1,11 +1,14 @@
 # ChangeLog for dev-util/ndiff
 
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Jan 2013; AstroFloyd <AstroFloyd@gmail.com> ndiff-2.00.ebuild:
+  Removed obsolete description in ebuild, no revision bump
+
 *ndiff-2.00 (29 Jan 2012)
 
-  29 Jan 2012; Marc van der Sluys <AstroFloyd@gmail.com> +ndiff-2.00.ebuild,
+  29 Jan 2012; AstroFloyd <AstroFloyd@gmail.com> +ndiff-2.00.ebuild,
   +metadata.xml:
   Initial import
 
diff --git a/dev-util/ndiff/metadata.xml b/dev-util/ndiff/metadata.xml
index d99531576..e8ef06d2d 100644
--- a/dev-util/ndiff/metadata.xml
+++ b/dev-util/ndiff/metadata.xml
@@ -4,6 +4,6 @@
 	<herd>sci</herd>
 	<maintainer>
 		<email>AstroFloyd@gmail.com</email>
-		<name>Marc van der Sluys (AstroFloyd)</name>
+		<name>AstroFloyd</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/ndiff/ndiff-2.00.ebuild b/dev-util/ndiff/ndiff-2.00.ebuild
index 7628f46d0..d0609231b 100644
--- a/dev-util/ndiff/ndiff-2.00.ebuild
+++ b/dev-util/ndiff/ndiff-2.00.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=4
 
-DESCRIPTION="A diff program that ignores small numeric differences (actually called ndiff)"
+DESCRIPTION="A diff program that ignores small numeric differences"
 HOMEPAGE="http://www.math.utah.edu/~beebe/software/ndiff/"
 SRC_URI="ftp://ftp.math.utah.edu/pub/misc/${P}.tar.gz"
 
@@ -16,8 +16,8 @@ IUSE="doc"
 DEPEND="dev-libs/gmp"
 RDEPEND="${DEPEND}"
 
-# Rename the files from ndiff to numdiff, since /usr/bin/ndiff is already
-# provided by net-analyzer/nmap:
+# Rename the files from ndiff to numdiff, since /usr/bin/ndiff used to be
+# provided by net-analyzer/nmap, before v4.85:
 src_install() {
 	newbin ndiff numdiff
 	dodoc README* INSTALL ChangeLog
diff --git a/sci-libs/cgnstools/Manifest b/sci-libs/cgnstools/Manifest
index 4999be3f2..7bdeeb79d 100644
--- a/sci-libs/cgnstools/Manifest
+++ b/sci-libs/cgnstools/Manifest
@@ -1 +1 @@
-DIST cgnstools-2-5-4.tar.gz 1339468 RMD160 4b0bab0fb8e080d92ec29b9f2fe6d17d3e7b21cc SHA1 2c4514b5e7d2a0a645d3672a837c066bc5c80e14 SHA256 28c263b8838da73eea6a497d1555f87391b44b5c917758d09176275a2a4130f5
+DIST cgnstools-2-5-4.tar.gz 1339468 SHA256 28c263b8838da73eea6a497d1555f87391b44b5c917758d09176275a2a4130f5 SHA512 84720ec61dc686315f53c5d76f5721a177df567ee43020cb4e45a87b501d70283d7df28584ad2656605677677e477e14c4a78482f45fff018aac877d1e099eca WHIRLPOOL 9ea74dade3f689030959834adfd6ab9c0fc90f322f66d27639735cad41e00c47e4303a0511eb4a61689e1d1ad0eb953a35a59e8bfb96612a6b6c55359602931d
diff --git a/sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild b/sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild
index f1526cd21..7166ada2e 100644
--- a/sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild
+++ b/sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild
@@ -30,6 +30,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}.patch
 	epatch "${FILESDIR}"/${P}_cgns_to_vtk2D.patch
 	epatch "${FILESDIR}"/${P}_gcc4.4.patch
+	epatch "${FILESDIR}"/${P}_tcltk.patch
 }
 
 src_configure() {
diff --git a/sci-libs/cgnstools/files/cgnstools-2.5.4_tcltk.patch b/sci-libs/cgnstools/files/cgnstools-2.5.4_tcltk.patch
new file mode 100644
index 000000000..d9036d0bf
--- /dev/null
+++ b/sci-libs/cgnstools/files/cgnstools-2.5.4_tcltk.patch
@@ -0,0 +1,114 @@
+From c9606ed1914d88c40e9b076b645bc5f7a8046c86 Mon Sep 17 00:00:00 2001
+From: James Cloos <cloos@jhcloos.com>
+Date: Wed, 16 Jan 2013 20:40:23 -0500
+Subject: [PATCH] Update for current tcl/tk, based on cgns svn trunk.
+
+Signed-off-by: James Cloos <cloos@jhcloos.com>
+---
+ tkogl/nurbs.c    |  4 +++-
+ tkogl/printstr.c |  4 +++-
+ tkogl/quadric.c  |  4 +++-
+ tkogl/tess.c     |  4 +++-
+ tkogl/tkogl.c    | 12 +++++++++---
+ 5 files changed, 21 insertions(+), 7 deletions(-)
+
+diff --git a/tkogl/nurbs.c b/tkogl/nurbs.c
+index 6d89be7..34086a3 100644
+--- a/tkogl/nurbs.c
++++ b/tkogl/nurbs.c
+@@ -278,7 +278,9 @@ done:
+    DestroyFloatArray (cPoint);
+ 
+    if (result == TCL_OK) {
+-      sprintf (interp->result, "%d", dlist);
++      char tmp[128];
++      sprintf (tmp, "%d", dlist);
++      Tcl_SetResult(interp, tmp, TCL_VOLATILE);
+    }
+ 
+    return result;
+diff --git a/tkogl/printstr.c b/tkogl/printstr.c
+index 8807525..e3d04f6 100644
+--- a/tkogl/printstr.c
++++ b/tkogl/printstr.c
+@@ -131,7 +131,9 @@ int LoadBitmapFont(Tcl_Interp *interp, int argc, char* argv [])
+ 	return TCL_ERROR;
+     }
+ 
+-    sprintf (interp->result, "%d", fontOffset);
++    char tmp[128];
++    sprintf (tmp, "%d", fontOffset);
++    Tcl_SetResult(interp, tmp, TCL_VOLATILE);
+     return TCL_OK;
+ }
+ 
+diff --git a/tkogl/quadric.c b/tkogl/quadric.c
+index ea8e7b3..859e440 100644
+--- a/tkogl/quadric.c
++++ b/tkogl/quadric.c
+@@ -147,7 +147,9 @@ done:
+    if (dlist != 0) glEndList(); else return result;
+ 
+    if (result == TCL_OK) {
+-      sprintf (interp->result, "%d", dlist);
++      char tmp[128];
++      sprintf (tmp, "%d", dlist);
++      Tcl_SetResult(interp, tmp, TCL_VOLATILE);
+    }
+    else {
+       glDeleteLists (dlist, 1);
+diff --git a/tkogl/tess.c b/tkogl/tess.c
+index fa9cf37..c054820 100644
+--- a/tkogl/tess.c
++++ b/tkogl/tess.c
+@@ -122,7 +122,9 @@ Tesselate (Tcl_Interp *interp, int argc, char* argv [])
+    }
+    
+    if (dlist != 0) {
+-      sprintf (interp->result, "%d", dlist);
++      char tmp[128];
++      sprintf (tmp, "%d", dlist);
++      Tcl_SetResult(interp, tmp, TCL_VOLATILE);
+    }
+    return TCL_OK;
+ }
+diff --git a/tkogl/tkogl.c b/tkogl/tkogl.c
+index 1e7323d..6c91dd1 100644
+--- a/tkogl/tkogl.c
++++ b/tkogl/tkogl.c
+@@ -641,7 +641,7 @@ OGLwinCmd(clientData, interp, argc, argv)
+     ARRANGE_REDRAW(glxwinPtr);
+     GetAbsXY (glxwinPtr);
+     
+-    interp->result = Tk_PathName(glxwinPtr->tkwin);
++    Tcl_SetResult(interp, Tk_PathName(glxwinPtr->tkwin), TCL_VOLATILE);
+     return TCL_OK;
+ }
+ 
+@@ -998,7 +998,11 @@ OGLwinWidgetCmd(clientData, interp, argc, argv)
+ 	        argv += narg;
+         }
+         glEndList();
+-        if (result == TCL_OK) sprintf (interp->result, "%d", newlist);
++        if (result == TCL_OK) {
++	  char tmp[128];
++	  sprintf (tmp, "%d", newlist);
++	  Tcl_SetResult(interp, tmp, TCL_VOLATILE);
++	}
+    }
+    else if ((c == 'e') && (strncmp(argv[1], "eval", length) == 0)) {
+       /* sends the gl commands directly */
+@@ -1090,7 +1094,9 @@ OGLwinWidgetCmd(clientData, interp, argc, argv)
+ 				viewport, &x, &y, &z);	 
+       }
+       if (retval) {
+-    	 sprintf (interp->result, "%f %f %f", x, y, z);
++    	 char tmp[128];
++	 sprintf (tmp, "%f %f %f", x, y, z);
++	 Tcl_SetResult(interp, tmp, TCL_VOLATILE);
+       }
+    } 
+    else if ((c == 'r') && (strncmp(argv[1], "redraw", length) == 0)) {
+-- 
+1.8.1
+
diff --git a/sci-libs/pg2plplot/ChangeLog b/sci-libs/pg2plplot/ChangeLog
new file mode 100644
index 000000000..ebe27d178
--- /dev/null
+++ b/sci-libs/pg2plplot/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for sci-libs/pg2plplot
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*pg2plplot-0.2.0 (13 Jan 2013)
+
+  13 Jan 2013; AstroFloyd <AstroFloyd@gmail.com> +pg2plplot-0.2.0.ebuild,
+  +metadata.xml:
+  Created initial ebuild for PG2PLplot-0.2.0
+
diff --git a/sci-libs/pg2plplot/Manifest b/sci-libs/pg2plplot/Manifest
new file mode 100644
index 000000000..8af865206
--- /dev/null
+++ b/sci-libs/pg2plplot/Manifest
@@ -0,0 +1 @@
+DIST pg2plplot-0.2.0.tar.gz 34232 SHA256 b4ee8a52619b49d1b1d6fc0b982a20f0c1dcb33a0c725526fd55180b9d5dff4e SHA512 04d79f5c730965450d2cebd3a28d9d7908ccda9dcb6d6c0ae6fd91dae4149f2b837006eb35cd7f9e4fdb7245a971eb575a40abb8a445904614815af164e3cc8d WHIRLPOOL b3444ca96cd62a3510dc4336e0aede821901f68eeacee949dffa80780921e83f91762ccfefd5996034d033639561e36a40b0c0f2b31a5ef7d047b7501c489e50
diff --git a/sci-libs/pg2plplot/metadata.xml b/sci-libs/pg2plplot/metadata.xml
new file mode 100644
index 000000000..e8ef06d2d
--- /dev/null
+++ b/sci-libs/pg2plplot/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sci</herd>
+	<maintainer>
+		<email>AstroFloyd@gmail.com</email>
+		<name>AstroFloyd</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sci-libs/pg2plplot/pg2plplot-0.2.0.ebuild b/sci-libs/pg2plplot/pg2plplot-0.2.0.ebuild
new file mode 100644
index 000000000..e37ce0e90
--- /dev/null
+++ b/sci-libs/pg2plplot/pg2plplot-0.2.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit cmake-utils fortran-2
+
+DESCRIPTION="Assist the transition from PGPlot to PLplot in Fortran programs"
+HOMEPAGE="http://pg2plplot.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X png postscript static-libs"
+
+DEPEND="virtual/fortran
+		sci-libs/plplot[fortran]"
+
+# If USE="png" or "postscript", ensure PLplot has USE="cairo":
+RDEPEND="${DEPEND}
+		 sci-libs/plplot[fortran,X?]
+		 png? ( sci-libs/plplot[cairo] )
+		 postscript? ( sci-libs/plplot[cairo] )"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use static-libs CREATE_STATICLIB)
+	)
+	cmake-utils_src_configure
+}
+
+DOCS="CHANGELOG README VERSION"