1 |
commit: 9fa31de207ec8ee6bf88d3862243c6735efdd410 |
2 |
Author: Gerhard Bräunlich <wippbox <AT> gmx <DOT> net> |
3 |
AuthorDate: Sat Jan 28 17:16:35 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 29 22:51:32 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fa31de2 |
7 |
|
8 |
sci-visualization/grace: Version bump to 5.1.25, EAPI bump 5 -> 6 |
9 |
|
10 |
Package-Manager: portage-2.3.3 |
11 |
Closes: https://github.com/gentoo/gentoo/pull/3702 |
12 |
|
13 |
sci-visualization/grace/Manifest | 1 + |
14 |
.../grace/files/grace-5.1.21-fortran.patch | 4 +- |
15 |
.../grace/files/grace-5.1.21-netcdf.patch | 4 +- |
16 |
.../grace/files/grace-5.1.22-dlmodule.patch | 4 +- |
17 |
.../grace/files/grace-5.1.22-libpng15.patch | 4 +- |
18 |
sci-visualization/grace/grace-5.1.25.ebuild | 108 +++++++++++++++++++++ |
19 |
6 files changed, 117 insertions(+), 8 deletions(-) |
20 |
|
21 |
diff --git a/sci-visualization/grace/Manifest b/sci-visualization/grace/Manifest |
22 |
index f73411c..1fd4085 100644 |
23 |
--- a/sci-visualization/grace/Manifest |
24 |
+++ b/sci-visualization/grace/Manifest |
25 |
@@ -1,4 +1,5 @@ |
26 |
DIST grace-5.1.22.tar.gz 2516576 SHA256 4ce8f058b6c1267a842419a3edbf471421dea9cf5744783745b6cb375cdf5f25 SHA512 0187f0305ff5e404e9adab60e9f3d328121c9ab8352f0b65fa523e2e9078dcee073d347a252a5e8b516728cae24b1ac0718b5011ab17247ae9ea9149336866d4 WHIRLPOOL 206ceb7dee5572e756fe67d528925705ab3b56913f26d8c9b066b07423cdd6b4e70c0739e3b66bdf7aa992dae243755f81ea097e1a33b94817322bc30b33274a |
27 |
DIST grace-5.1.23.tar.gz 2501364 SHA256 69527950fd9c056a76b7a6bf4ac37a9b87acc565c12a941ffae3c9c5a822ca10 SHA512 84b75639a5065fb0a39204b55e82471be90d78b22530e541a4e58cb5bcd94a59d51e91da38d9fecb9c23e21744c0c3b31bb9db4fd26c656233a19cffd1eef7d3 WHIRLPOOL f807245acd084973d6436f404fc9eb146543a8ce34e0089ded098e771564e9d3bc6ae7023463674101cd161a1463ab3b97ee80df5b18e191b1e9ab94c7e6afc4 |
28 |
+DIST grace-5.1.25.tar.gz 2957689 SHA256 751ab9917ed0f6232073c193aba74046037e185d73b77bab0f5af3e3ff1da2ac SHA512 9ea68483af1dfc98d217ae730b7a51b66deae5aaa8dfda29d5a3337ed4b5728b45aa03f561bf7d4173e73d6af8dee03cbabd95c0c8dd36999303c89451a3728a WHIRLPOOL 3c74003882b4f3455b17563b94649bb7a2abd66df4a386b0da4e91498174b414a96b705b081c8c2a1d5532b2709b2b02f5fe18145a2fc1071f2900ccef7f6e95 |
29 |
DIST grace.png 338 SHA256 70130b7ddb7a64cf2d866aaf472d8badb12d72ac288275709689c631e23da9bc SHA512 804a693b867ad63f34964c7388f61719c558d253cb2c7bc7b6bd0647ad9b3ddc6b23d3950091b6804e4a94736f024486cf3dcce5f877135def34712ee95e4031 WHIRLPOOL 6cef65fc9329e7f49541e193a84c4f86498f422951ced1bd228ce854bab43a9ba5d9dfb44f780b1dcb030892cebd657d6de385df92710062f56c38f1e6cccd94 |
30 |
DIST grace.png.tar 10240 SHA256 05215c72a2f45b513ba508287b5f693af145719b7a85497320d1e1e17695e99c SHA512 e94970b92894e58fd481d2f81e615c38b77fab7039985516a2ad9b2bb2bb7a82f4e3e8cdb639e7c0d55eaad6bf8abc636a342c94a356e3bd0520824252faddcf WHIRLPOOL 448e1c659475e38331c3ff2f050de52feb01db9623c0a250c7702debe920abf7e9bc56373f442d91d11ad6f55da3e9bbc58f52c1251223bdf405202ae8309556 |
31 |
|
32 |
diff --git a/sci-visualization/grace/files/grace-5.1.21-fortran.patch b/sci-visualization/grace/files/grace-5.1.21-fortran.patch |
33 |
index 921d965..cdec666 100644 |
34 |
--- a/sci-visualization/grace/files/grace-5.1.21-fortran.patch |
35 |
+++ b/sci-visualization/grace/files/grace-5.1.21-fortran.patch |
36 |
@@ -1,5 +1,5 @@ |
37 |
---- grace_np/gracef_np.c.orig 2008-03-03 11:45:12.000000000 +0000 |
38 |
-+++ grace_np/gracef_np.c 2008-03-03 12:05:37.000000000 +0000 |
39 |
+--- a/grace_np/gracef_np.c 2008-03-03 11:45:12.000000000 +0000 |
40 |
++++ b/grace_np/gracef_np.c 2008-03-03 12:05:37.000000000 +0000 |
41 |
@@ -1,5 +1,11 @@ |
42 |
#include <config.h> |
43 |
|
44 |
|
45 |
diff --git a/sci-visualization/grace/files/grace-5.1.21-netcdf.patch b/sci-visualization/grace/files/grace-5.1.21-netcdf.patch |
46 |
index eabb274..d843cb4 100644 |
47 |
--- a/sci-visualization/grace/files/grace-5.1.21-netcdf.patch |
48 |
+++ b/sci-visualization/grace/files/grace-5.1.21-netcdf.patch |
49 |
@@ -1,5 +1,5 @@ |
50 |
---- configure.orig 2007-02-16 22:44:49.000000000 +0000 |
51 |
-+++ configure 2007-09-28 23:03:29.000000000 +0100 |
52 |
+--- a/configure 2007-02-16 22:44:49.000000000 +0000 |
53 |
++++ b/configure 2007-09-28 23:03:29.000000000 +0100 |
54 |
@@ -15181,7 +15181,7 @@ |
55 |
int main(void) { |
56 |
char *vlib; |
57 |
|
58 |
diff --git a/sci-visualization/grace/files/grace-5.1.22-dlmodule.patch b/sci-visualization/grace/files/grace-5.1.22-dlmodule.patch |
59 |
index 9e36b34..02fa06a 100644 |
60 |
--- a/sci-visualization/grace/files/grace-5.1.22-dlmodule.patch |
61 |
+++ b/sci-visualization/grace/files/grace-5.1.22-dlmodule.patch |
62 |
@@ -1,5 +1,5 @@ |
63 |
---- src/dlmodule.c.orig 2005-11-13 07:45:16.000000000 +0900 |
64 |
-+++ src/dlmodule.c 2008-06-16 15:28:33.000000000 +0900 |
65 |
+--- a/src/dlmodule.c 2005-11-13 07:45:16.000000000 +0900 |
66 |
++++ b/src/dlmodule.c 2008-06-16 15:28:33.000000000 +0900 |
67 |
@@ -89,6 +89,9 @@ |
68 |
return RETURN_FAILURE; |
69 |
} |
70 |
|
71 |
diff --git a/sci-visualization/grace/files/grace-5.1.22-libpng15.patch b/sci-visualization/grace/files/grace-5.1.22-libpng15.patch |
72 |
index 43db9e0..1e27bb3 100644 |
73 |
--- a/sci-visualization/grace/files/grace-5.1.22-libpng15.patch |
74 |
+++ b/sci-visualization/grace/files/grace-5.1.22-libpng15.patch |
75 |
@@ -1,5 +1,5 @@ |
76 |
---- src/rstdrv.c |
77 |
-+++ src/rstdrv.c |
78 |
+--- a/src/rstdrv.c |
79 |
++++ b/src/rstdrv.c |
80 |
@@ -53,6 +53,7 @@ |
81 |
#endif |
82 |
|
83 |
|
84 |
diff --git a/sci-visualization/grace/grace-5.1.25.ebuild b/sci-visualization/grace/grace-5.1.25.ebuild |
85 |
new file mode 100644 |
86 |
index 00000000..ed55f6f |
87 |
--- /dev/null |
88 |
+++ b/sci-visualization/grace/grace-5.1.25.ebuild |
89 |
@@ -0,0 +1,108 @@ |
90 |
+# Copyright 1999-2017 Gentoo Foundation |
91 |
+# Distributed under the terms of the GNU General Public License v2 |
92 |
+# $Id$ |
93 |
+ |
94 |
+EAPI=6 |
95 |
+ |
96 |
+FORTRAN_NEEDED=fortran |
97 |
+ |
98 |
+inherit eutils fortran-2 toolchain-funcs |
99 |
+ |
100 |
+DESCRIPTION="Motif based XY-plotting tool" |
101 |
+HOMEPAGE="http://plasma-gate.weizmann.ac.il/Grace/" |
102 |
+SRC_URI=" |
103 |
+ http://pkgs.fedoraproject.org/cgit/grace.git/plain/grace.png |
104 |
+ https://dev.gentoo.org/~jlec/distfiles/${PN}.png.tar |
105 |
+ ftp://plasma-gate.weizmann.ac.il/pub/${PN}/src/stable/${P}.tar.gz" |
106 |
+ |
107 |
+SLOT="0" |
108 |
+LICENSE="GPL-2 LGPL-2" |
109 |
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
110 |
+IUSE="fftw fortran jpeg netcdf png" |
111 |
+ |
112 |
+DEPEND=" |
113 |
+ media-libs/t1lib |
114 |
+ media-libs/tiff:0 |
115 |
+ sys-libs/zlib |
116 |
+ >=x11-libs/motif-2.3:0 |
117 |
+ x11-libs/xbae |
118 |
+ fftw? ( sci-libs/fftw:2.1= ) |
119 |
+ jpeg? ( virtual/jpeg:0 ) |
120 |
+ netcdf? ( sci-libs/netcdf ) |
121 |
+ png? ( media-libs/libpng:0= )" |
122 |
+RDEPEND="${DEPEND} |
123 |
+ x11-misc/xdg-utils" |
124 |
+ |
125 |
+PATCHES=( |
126 |
+ # move tmpnam to mkstemp (adapted from debian) |
127 |
+ "${FILESDIR}"/${PN}-5.1.22-mkstemp.patch |
128 |
+ # fix configure instead of aclocal.m4 |
129 |
+ "${FILESDIR}"/${PN}-5.1.21-netcdf.patch |
130 |
+ # fix for missing defines when fortran is disabled |
131 |
+ "${FILESDIR}"/${PN}-5.1.21-fortran.patch |
132 |
+ # fix a leak (from freebsd) |
133 |
+ "${FILESDIR}"/${PN}-5.1.22-dlmodule.patch |
134 |
+ "${FILESDIR}"/${PN}-5.1.22-ldflags.patch |
135 |
+) |
136 |
+ |
137 |
+pkg_setup() { |
138 |
+ fortran-2_pkg_setup |
139 |
+} |
140 |
+ |
141 |
+src_prepare() { |
142 |
+ default |
143 |
+ |
144 |
+ # don't strip if not asked for |
145 |
+ sed -i \ |
146 |
+ -e 's:$(INSTALL_PROGRAM) -s:$(INSTALL_PROGRAM):g' \ |
147 |
+ {auxiliary,grconvert,src}/Makefile || die |
148 |
+ |
149 |
+ sed -i \ |
150 |
+ -e 's:$(GRACE_HOME)/bin:$(PREFIX)/bin:g' \ |
151 |
+ -e "s:\$(GRACE_HOME)/lib:\$(PREFIX)/$(get_libdir):g" \ |
152 |
+ -e 's:$(GRACE_HOME)/include:$(PREFIX)/include:g' \ |
153 |
+ -e 's:$(PREFIX)/man:$(PREFIX)/share/man:g' \ |
154 |
+ Makefile */Makefile || die "sed failed" |
155 |
+ |
156 |
+ sed -i \ |
157 |
+ -e 's:bin/grconvert:grconvert:' \ |
158 |
+ -e 's:auxiliary/fdf2fit:fdf2fit:' \ |
159 |
+ gracerc || die |
160 |
+} |
161 |
+ |
162 |
+src_configure() { |
163 |
+ tc-export CC AR |
164 |
+ |
165 |
+ # the configure script just produces a basic Make.conf |
166 |
+ # and a config.h |
167 |
+ econf \ |
168 |
+ --disable-pdfdrv \ |
169 |
+ --disable-xmhtml \ |
170 |
+ --without-bundled-xbae \ |
171 |
+ --without-bundled-t1lib \ |
172 |
+ --enable-grace-home="${EPREFIX}"/usr/share/${PN} \ |
173 |
+ --with-helpviewer="xdg-open %s" \ |
174 |
+ --with-editor="xdg-open %s" \ |
175 |
+ --with-printcmd="lpr" \ |
176 |
+ --x-includes="${EPREFIX}"/usr/include \ |
177 |
+ --x-libraries="${EPREFIX}"/usr/$(get_libdir) \ |
178 |
+ $(use_with fftw) \ |
179 |
+ $(use_enable fortran f77-wrapper) \ |
180 |
+ $(use_enable netcdf) \ |
181 |
+ $(use_enable jpeg jpegdrv) \ |
182 |
+ $(use_enable png pngdrv) \ |
183 |
+ $(use_with fortran f77 $(tc-getFC)) |
184 |
+} |
185 |
+ |
186 |
+src_install() { |
187 |
+ default |
188 |
+ |
189 |
+ dosym ../../${PN}/examples /usr/share/doc/${PF}/examples |
190 |
+ dosym ../../${PN}/doc /usr/share/doc/${PF}/html |
191 |
+ |
192 |
+ doman "${ED%/}"/usr/share/doc/${PF}/html/*.1 |
193 |
+ rm -f "${ED%/}"/usr/share/doc/${PF}/html/*.1 || die |
194 |
+ |
195 |
+ domenu "${FILESDIR}"/${PN}.desktop |
196 |
+ doicon "${WORKDIR}"/${PN}.png |
197 |
+} |