sci-visualization/grace: Version bump to 5.1.25, EAPI bump 5 -> 6

Package-Manager: portage-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/3702

6 files changed, 117 insertions, 8 deletions

diff --git a/sci-visualization/grace/Manifest b/sci-visualization/grace/Manifest
index f73411ce95bc..1fd40852f3e8 100644
--- a/sci-visualization/grace/Manifest
+++ b/sci-visualization/grace/Manifest
@@ -1,4 +1,5 @@
 DIST grace-5.1.22.tar.gz 2516576 SHA256 4ce8f058b6c1267a842419a3edbf471421dea9cf5744783745b6cb375cdf5f25 SHA512 0187f0305ff5e404e9adab60e9f3d328121c9ab8352f0b65fa523e2e9078dcee073d347a252a5e8b516728cae24b1ac0718b5011ab17247ae9ea9149336866d4 WHIRLPOOL 206ceb7dee5572e756fe67d528925705ab3b56913f26d8c9b066b07423cdd6b4e70c0739e3b66bdf7aa992dae243755f81ea097e1a33b94817322bc30b33274a
 DIST grace-5.1.23.tar.gz 2501364 SHA256 69527950fd9c056a76b7a6bf4ac37a9b87acc565c12a941ffae3c9c5a822ca10 SHA512 84b75639a5065fb0a39204b55e82471be90d78b22530e541a4e58cb5bcd94a59d51e91da38d9fecb9c23e21744c0c3b31bb9db4fd26c656233a19cffd1eef7d3 WHIRLPOOL f807245acd084973d6436f404fc9eb146543a8ce34e0089ded098e771564e9d3bc6ae7023463674101cd161a1463ab3b97ee80df5b18e191b1e9ab94c7e6afc4
+DIST grace-5.1.25.tar.gz 2957689 SHA256 751ab9917ed0f6232073c193aba74046037e185d73b77bab0f5af3e3ff1da2ac SHA512 9ea68483af1dfc98d217ae730b7a51b66deae5aaa8dfda29d5a3337ed4b5728b45aa03f561bf7d4173e73d6af8dee03cbabd95c0c8dd36999303c89451a3728a WHIRLPOOL 3c74003882b4f3455b17563b94649bb7a2abd66df4a386b0da4e91498174b414a96b705b081c8c2a1d5532b2709b2b02f5fe18145a2fc1071f2900ccef7f6e95
 DIST grace.png 338 SHA256 70130b7ddb7a64cf2d866aaf472d8badb12d72ac288275709689c631e23da9bc SHA512 804a693b867ad63f34964c7388f61719c558d253cb2c7bc7b6bd0647ad9b3ddc6b23d3950091b6804e4a94736f024486cf3dcce5f877135def34712ee95e4031 WHIRLPOOL 6cef65fc9329e7f49541e193a84c4f86498f422951ced1bd228ce854bab43a9ba5d9dfb44f780b1dcb030892cebd657d6de385df92710062f56c38f1e6cccd94
 DIST grace.png.tar 10240 SHA256 05215c72a2f45b513ba508287b5f693af145719b7a85497320d1e1e17695e99c SHA512 e94970b92894e58fd481d2f81e615c38b77fab7039985516a2ad9b2bb2bb7a82f4e3e8cdb639e7c0d55eaad6bf8abc636a342c94a356e3bd0520824252faddcf WHIRLPOOL 448e1c659475e38331c3ff2f050de52feb01db9623c0a250c7702debe920abf7e9bc56373f442d91d11ad6f55da3e9bbc58f52c1251223bdf405202ae8309556
diff --git a/sci-visualization/grace/files/grace-5.1.21-fortran.patch b/sci-visualization/grace/files/grace-5.1.21-fortran.patch
index 921d965f3893..cdec666107ee 100644
--- a/sci-visualization/grace/files/grace-5.1.21-fortran.patch
+++ b/sci-visualization/grace/files/grace-5.1.21-fortran.patch
@@ -1,5 +1,5 @@
---- 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
+--- a/grace_np/gracef_np.c	2008-03-03 11:45:12.000000000 +0000
++++ b/grace_np/gracef_np.c	2008-03-03 12:05:37.000000000 +0000
 @@ -1,5 +1,11 @@
  #include <config.h>
  
diff --git a/sci-visualization/grace/files/grace-5.1.21-netcdf.patch b/sci-visualization/grace/files/grace-5.1.21-netcdf.patch
index eabb27434e17..d843cb4b284c 100644
--- a/sci-visualization/grace/files/grace-5.1.21-netcdf.patch
+++ b/sci-visualization/grace/files/grace-5.1.21-netcdf.patch
@@ -1,5 +1,5 @@
---- configure.orig	2007-02-16 22:44:49.000000000 +0000
-+++ configure	2007-09-28 23:03:29.000000000 +0100
+--- a/configure	2007-02-16 22:44:49.000000000 +0000
++++ b/configure	2007-09-28 23:03:29.000000000 +0100
 @@ -15181,7 +15181,7 @@
        int main(void) {
          char *vlib;
diff --git a/sci-visualization/grace/files/grace-5.1.22-dlmodule.patch b/sci-visualization/grace/files/grace-5.1.22-dlmodule.patch
index 9e36b34e06f4..02fa06a8a9f9 100644
--- a/sci-visualization/grace/files/grace-5.1.22-dlmodule.patch
+++ b/sci-visualization/grace/files/grace-5.1.22-dlmodule.patch
@@ -1,5 +1,5 @@
---- src/dlmodule.c.orig	2005-11-13 07:45:16.000000000 +0900
-+++ src/dlmodule.c	2008-06-16 15:28:33.000000000 +0900
+--- a/src/dlmodule.c	2005-11-13 07:45:16.000000000 +0900
++++ b/src/dlmodule.c	2008-06-16 15:28:33.000000000 +0900
 @@ -89,6 +89,9 @@
          return RETURN_FAILURE;
      }
diff --git a/sci-visualization/grace/files/grace-5.1.22-libpng15.patch b/sci-visualization/grace/files/grace-5.1.22-libpng15.patch
index 43db9e0723a5..1e27bb385c68 100644
--- a/sci-visualization/grace/files/grace-5.1.22-libpng15.patch
+++ b/sci-visualization/grace/files/grace-5.1.22-libpng15.patch
@@ -1,5 +1,5 @@
---- src/rstdrv.c
-+++ src/rstdrv.c
+--- a/src/rstdrv.c
++++ b/src/rstdrv.c
 @@ -53,6 +53,7 @@
  #endif
  
diff --git a/sci-visualization/grace/grace-5.1.25.ebuild b/sci-visualization/grace/grace-5.1.25.ebuild
new file mode 100644
index 000000000000..ed55f6fef964
--- /dev/null
+++ b/sci-visualization/grace/grace-5.1.25.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+FORTRAN_NEEDED=fortran
+
+inherit eutils fortran-2 toolchain-funcs
+
+DESCRIPTION="Motif based XY-plotting tool"
+HOMEPAGE="http://plasma-gate.weizmann.ac.il/Grace/"
+SRC_URI="
+	http://pkgs.fedoraproject.org/cgit/grace.git/plain/grace.png
+	https://dev.gentoo.org/~jlec/distfiles/${PN}.png.tar
+	ftp://plasma-gate.weizmann.ac.il/pub/${PN}/src/stable/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="fftw fortran jpeg netcdf png"
+
+DEPEND="
+	media-libs/t1lib
+	media-libs/tiff:0
+	sys-libs/zlib
+	>=x11-libs/motif-2.3:0
+	x11-libs/xbae
+	fftw? ( sci-libs/fftw:2.1= )
+	jpeg? ( virtual/jpeg:0 )
+	netcdf? ( sci-libs/netcdf )
+	png? ( media-libs/libpng:0= )"
+RDEPEND="${DEPEND}
+	x11-misc/xdg-utils"
+
+PATCHES=(
+	# move tmpnam to mkstemp (adapted from debian)
+	"${FILESDIR}"/${PN}-5.1.22-mkstemp.patch
+	# fix configure instead of aclocal.m4
+	"${FILESDIR}"/${PN}-5.1.21-netcdf.patch
+	# fix for missing defines when fortran is disabled
+	"${FILESDIR}"/${PN}-5.1.21-fortran.patch
+	# fix a leak (from freebsd)
+	"${FILESDIR}"/${PN}-5.1.22-dlmodule.patch
+	"${FILESDIR}"/${PN}-5.1.22-ldflags.patch
+)
+
+pkg_setup() {
+	fortran-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# don't strip if not asked for
+	sed -i \
+		-e 's:$(INSTALL_PROGRAM) -s:$(INSTALL_PROGRAM):g' \
+		{auxiliary,grconvert,src}/Makefile || die
+
+	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_configure() {
+	tc-export CC AR
+
+	# the configure script just produces a basic Make.conf
+	# and a config.h
+	econf \
+		--disable-pdfdrv \
+		--disable-xmhtml \
+		--without-bundled-xbae \
+		--without-bundled-t1lib \
+		--enable-grace-home="${EPREFIX}"/usr/share/${PN} \
+		--with-helpviewer="xdg-open %s" \
+		--with-editor="xdg-open %s" \
+		--with-printcmd="lpr" \
+		--x-includes="${EPREFIX}"/usr/include \
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir) \
+		$(use_with fftw) \
+		$(use_enable fortran f77-wrapper) \
+		$(use_enable netcdf) \
+		$(use_enable jpeg jpegdrv) \
+		$(use_enable png pngdrv) \
+		$(use_with fortran f77 $(tc-getFC))
+}
+
+src_install() {
+	default
+
+	dosym ../../${PN}/examples /usr/share/doc/${PF}/examples
+	dosym ../../${PN}/doc /usr/share/doc/${PF}/html
+
+	doman "${ED%/}"/usr/share/doc/${PF}/html/*.1
+	rm -f "${ED%/}"/usr/share/doc/${PF}/html/*.1 || die
+
+	domenu "${FILESDIR}"/${PN}.desktop
+	doicon "${WORKDIR}"/${PN}.png
+}