1 |
commit: a5f3c97a845ed16803503483ac47bb61d9dfdbea |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 17 15:30:42 2016 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 18 09:01:07 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5f3c97a |
7 |
|
8 |
sci-mathematics/dataplot: Version Bump |
9 |
|
10 |
Package-Manager: portage-2.2.27 |
11 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
12 |
|
13 |
sci-mathematics/dataplot/Manifest | 1 + |
14 |
sci-mathematics/dataplot/dataplot-20131220.ebuild | 86 ++++++++++++++++++++++ |
15 |
.../dataplot/files/Makefile.am.20131220 | 46 ++++++++++++ |
16 |
.../dataplot/files/configure.ac.20090821 | 2 +- |
17 |
...configure.ac.20090821 => configure.ac.20131220} | 2 +- |
18 |
.../dataplot/files/dataplot-20090821-opengl.patch | 4 +- |
19 |
6 files changed, 137 insertions(+), 4 deletions(-) |
20 |
|
21 |
diff --git a/sci-mathematics/dataplot/Manifest b/sci-mathematics/dataplot/Manifest |
22 |
index 4780510..2cc158c 100644 |
23 |
--- a/sci-mathematics/dataplot/Manifest |
24 |
+++ b/sci-mathematics/dataplot/Manifest |
25 |
@@ -1,2 +1,3 @@ |
26 |
DIST dplib.2009_07_15.tar.gz 7507367 SHA256 bb1dce97fbcec611cabe636bbdf20efa77c191b84e9c3db621554daea831f00d SHA512 5e4e6c866a5690c3f67b322d53b6bf1bec33c488a99c95f360ce74785a57286541945fdcab5cbbacb04039046f5ba94aeaf8112b80aa34ed2c2cf04abc6f7d40 WHIRLPOOL f531fe7fa4ef3f2ffb65777dd2e5d08f68fd32f5fcf7fbae19db2e5e015e9aba88577c71e9f4dac1f638d8fccf749b0a9c13fd30f7950a7f24669caed5e7e8b1 |
27 |
DIST dpsrc_2009_08_21.tar.gz 6656048 SHA256 ee47746fb28b88a5a0affa6a51a0e10c9350b1dc28977ecbee19d64a1e204cd4 SHA512 1e655c6832b724b9f69692f28f5497fb4064d208cde5462c4bd73c8d255605ba62b9b703f5ea32bbe7506b18ccd0ad5c4c2556381fbebdb6e05ce51625a4a339 WHIRLPOOL 7ed6951206cd35e449123bd8863f7b3ae26fbcf947156fb6b018aa200768c72861feca65392740303da644c33738d442aa59cab7a09ddb2bcc6dd9dcff70d003 |
28 |
+DIST dpsrc_2013_12_20.tar.gz 6761551 SHA256 419f2a672e2fcc076d95bb67f5c2a9c05a66dc1f697c729b52cddb860e83ae12 SHA512 a62df14f3ec59ccae4ead52b34adfc6e881ade1397e5a31b8a73c9740e7a2245317fef4f9756224c8d2fb57799c2247b15f6c4d65777de6302553fd138bb4083 WHIRLPOOL d43e99f2cc59d483f4f7843b532d324b94ec6d75c5ddd42f737570e5b058da2d8f874bea387627f6a87949677607769bf1e6c32103ed706980617ca77483955e |
29 |
|
30 |
diff --git a/sci-mathematics/dataplot/dataplot-20131220.ebuild b/sci-mathematics/dataplot/dataplot-20131220.ebuild |
31 |
new file mode 100644 |
32 |
index 0000000..c8b5dba |
33 |
--- /dev/null |
34 |
+++ b/sci-mathematics/dataplot/dataplot-20131220.ebuild |
35 |
@@ -0,0 +1,86 @@ |
36 |
+# Copyright 1999-2016 Gentoo Foundation |
37 |
+# Distributed under the terms of the GNU General Public License v2 |
38 |
+# $Id$ |
39 |
+ |
40 |
+EAPI=6 |
41 |
+ |
42 |
+inherit eutils fortran-2 toolchain-funcs autotools |
43 |
+ |
44 |
+# YEAR MONTH DAY |
45 |
+MY_PV=${PV:0:4}_${PV:4:2}_${PV:6:2} |
46 |
+MY_P=dpsrc_${MY_PV} |
47 |
+# MY_PV_AUX usually ${MY_PV} |
48 |
+MY_PV_AUX=2009_07_15 |
49 |
+MY_P_AUX=dplib.${MY_PV_AUX} |
50 |
+ |
51 |
+DESCRIPTION="Program for scientific visualization and statistical analyis" |
52 |
+HOMEPAGE="http://www.itl.nist.gov/div898/software/dataplot/" |
53 |
+SRC_URI=" |
54 |
+ ftp://ftp.nist.gov/pub/dataplot/unix/${MY_P}.tar.gz |
55 |
+ ftp://ftp.nist.gov/pub/dataplot/unix/${MY_P_AUX}.tar.gz" |
56 |
+ |
57 |
+SLOT="0" |
58 |
+LICENSE="public-domain" |
59 |
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
60 |
+IUSE="examples gd opengl X" |
61 |
+ |
62 |
+REQUIRED_USE="opengl? ( X )" |
63 |
+ |
64 |
+COMMON_DEPEND=" |
65 |
+ media-libs/plotutils |
66 |
+ opengl? ( virtual/opengl ) |
67 |
+ gd? ( media-libs/gd[png,jpeg] )" |
68 |
+DEPEND="${COMMON_DEPEND} |
69 |
+ virtual/pkgconfig" |
70 |
+RDEPEND="${COMMON_DEPEND} |
71 |
+ X? ( x11-misc/xdg-utils )" |
72 |
+ |
73 |
+S="${WORKDIR}/${MY_P}" |
74 |
+S_AUX="${WORKDIR}/${MY_P_AUX}" |
75 |
+ |
76 |
+PATCHES=( "${FILESDIR}"/${PN}-20090821-opengl.patch ) |
77 |
+ |
78 |
+src_unpack() { |
79 |
+ # unpacking and renaming because |
80 |
+ # upstream does not use directories |
81 |
+ mkdir "${S_AUX}" || die |
82 |
+ pushd "${S_AUX}" > /dev/null || die |
83 |
+ unpack ${MY_P_AUX}.tar.gz |
84 |
+ popd > /dev/null || die |
85 |
+ mkdir ${MY_P} || die |
86 |
+ cd "${S}" || die |
87 |
+ unpack ${MY_P}.tar.gz |
88 |
+} |
89 |
+ |
90 |
+src_prepare() { |
91 |
+ default |
92 |
+ cp "${FILESDIR}"/Makefile.am.${PV} Makefile.am || die |
93 |
+ cp "${FILESDIR}"/configure.ac.${PV} configure.ac || die |
94 |
+ sed -e "s:IHOST1='SUN':IHOST1='@HOST@:" \ |
95 |
+ -e "s:/usr/local/lib:@datadir@:g" \ |
96 |
+ dp1_linux.f > dp1_linux.f.in || die |
97 |
+ sed -e "s/(MAXOBV=.*)/(MAXOBV=@MAXOBV@)/" \ |
98 |
+ -e "s:/usr/local/lib:@datadir@:g" \ |
99 |
+ DPCOPA.INC > DPCOPA.INC.in || die |
100 |
+ |
101 |
+ eautoreconf |
102 |
+} |
103 |
+ |
104 |
+src_configure() { |
105 |
+ econf \ |
106 |
+ $(use_enable gd) \ |
107 |
+ $(use_enable opengl gl) \ |
108 |
+ $(use_enable X) |
109 |
+} |
110 |
+ |
111 |
+src_install() { |
112 |
+ default |
113 |
+ |
114 |
+ if use examples; then |
115 |
+ insinto /usr/share/doc/${PF}/examples |
116 |
+ doins -r "${S_AUX}"/data/* |
117 |
+ fi |
118 |
+ insinto /usr/share/dataplot |
119 |
+ doins "${S_AUX}"/dp{mes,sys,log}f.tex |
120 |
+ doenvd "${FILESDIR}"/90${PN} |
121 |
+} |
122 |
|
123 |
diff --git a/sci-mathematics/dataplot/files/Makefile.am.20131220 b/sci-mathematics/dataplot/files/Makefile.am.20131220 |
124 |
new file mode 100644 |
125 |
index 0000000..85e8c49 |
126 |
--- /dev/null |
127 |
+++ b/sci-mathematics/dataplot/files/Makefile.am.20131220 |
128 |
@@ -0,0 +1,46 @@ |
129 |
+bin_PROGRAMS = dataplot |
130 |
+dataplot_SOURCES = dp1_linux.f \ |
131 |
+ dp2.f dp3.f dp4.f dp5.f dp6.f dp7.f dp8.f dp9.f dp10.f dp11.f \ |
132 |
+ dp12.f dp13.f dp14.f dp15.f dp16.f dp17.f dp18.f dp19.f dp20.f dp21.f \ |
133 |
+ dp22.f dp23.f dp24.f dp25.f dp26.f dp27.f dp28.f dp29.f dp30.f dp31.f \ |
134 |
+ dp32.f dp33.f dp34.f dp35.f dp36.f dp37.f dp38.f dp39.f dp40.f dp41.f \ |
135 |
+ dp42.f dp43.f dp44.f dp45.f dp46.f \ |
136 |
+ dpcalc.f dpdds2.f dpdds3.f dpdds.f edinit.f edmai2.f edsear.f edsub.f \ |
137 |
+ edwrst.f fit3b.f starpac.f tcdriv_nopc.f aqua_src.f cluster.f compgeom.f \ |
138 |
+ optimi.f libplot_src.c rldp.c main.f gks_src.f |
139 |
+ |
140 |
+if ENABLE_GD |
141 |
+dataplot_SOURCES += gd_src.c |
142 |
+else |
143 |
+dataplot_SOURCES += gd_src.f |
144 |
+endif |
145 |
+ |
146 |
+if ENABLE_GL |
147 |
+dataplot_SOURCES += gl_src.c |
148 |
+else |
149 |
+dataplot_SOURCES += gl_src.f |
150 |
+endif |
151 |
+ |
152 |
+if ENABLE_X11 |
153 |
+dataplot_SOURCES += x11_src.c |
154 |
+else |
155 |
+dataplot_SOURCES += x11src.f |
156 |
+endif |
157 |
+ |
158 |
+dataplot_CFLAGS = @GL_CFLAGS@ |
159 |
+dataplot_LDADD = @GD_LIBS@ @GL_LIBS@ @X11_LIBS@ $(FLIBS) -lreadline |
160 |
+ |
161 |
+# this is to remove ambiguity between the similar filenames |
162 |
+# of the c and f77 version (shortcoming of automake) |
163 |
+# the f77 versions are forced |
164 |
+# the c versions objects are called dataplot-gd_src.o etc |
165 |
+gd_src.o: gd_src.f |
166 |
+ $(F77COMPILE) -c -o $@ $< |
167 |
+gl_src.o: gl_src.f |
168 |
+ $(F77COMPILE) -c -o $@ $< |
169 |
+aqua_src.o: aqua_src.f |
170 |
+ $(F77COMPILE) -c -o $@ $< |
171 |
+libplot_src.o: libplot_src.f |
172 |
+ $(F77COMPILE) -c -o $@ $< |
173 |
+rldp.o: rldp.f |
174 |
+ $(F77COMPILE) -c -o $@ $< |
175 |
|
176 |
diff --git a/sci-mathematics/dataplot/files/configure.ac.20090821 b/sci-mathematics/dataplot/files/configure.ac.20090821 |
177 |
index 2343b23..fa9a700 100644 |
178 |
--- a/sci-mathematics/dataplot/files/configure.ac.20090821 |
179 |
+++ b/sci-mathematics/dataplot/files/configure.ac.20090821 |
180 |
@@ -1,5 +1,5 @@ |
181 |
AC_PREREQ(2.59) |
182 |
-AC_INIT([dataplot], [20080225], [n.heckert@××××.gov]) |
183 |
+AC_INIT([dataplot], [20090821], [n.heckert@××××.gov]) |
184 |
AC_CONFIG_HEADER([config.h]) |
185 |
AC_CONFIG_AUX_DIR(config) |
186 |
AM_MAINTAINER_MODE |
187 |
|
188 |
diff --git a/sci-mathematics/dataplot/files/configure.ac.20090821 b/sci-mathematics/dataplot/files/configure.ac.20131220 |
189 |
similarity index 97% |
190 |
copy from sci-mathematics/dataplot/files/configure.ac.20090821 |
191 |
copy to sci-mathematics/dataplot/files/configure.ac.20131220 |
192 |
index 2343b23..e2e1412 100644 |
193 |
--- a/sci-mathematics/dataplot/files/configure.ac.20090821 |
194 |
+++ b/sci-mathematics/dataplot/files/configure.ac.20131220 |
195 |
@@ -1,5 +1,5 @@ |
196 |
AC_PREREQ(2.59) |
197 |
-AC_INIT([dataplot], [20080225], [n.heckert@××××.gov]) |
198 |
+AC_INIT([dataplot], [20131220], [n.heckert@××××.gov]) |
199 |
AC_CONFIG_HEADER([config.h]) |
200 |
AC_CONFIG_AUX_DIR(config) |
201 |
AM_MAINTAINER_MODE |
202 |
|
203 |
diff --git a/sci-mathematics/dataplot/files/dataplot-20090821-opengl.patch b/sci-mathematics/dataplot/files/dataplot-20090821-opengl.patch |
204 |
index 5810b60..c2640db 100644 |
205 |
--- a/sci-mathematics/dataplot/files/dataplot-20090821-opengl.patch |
206 |
+++ b/sci-mathematics/dataplot/files/dataplot-20090821-opengl.patch |
207 |
@@ -1,5 +1,5 @@ |
208 |
---- gl_src.c.orig 2001-02-28 16:45:56.000000000 -0500 |
209 |
-+++ gl_src.c 2008-04-10 17:03:03.000000000 -0400 |
210 |
+--- dpsrc_2013_12_20/gl_src.c.orig 2001-02-28 16:45:56.000000000 -0500 |
211 |
++++ dpsrc_2013_12_20/gl_src.c 2008-04-10 17:03:03.000000000 -0400 |
212 |
@@ -154,7 +154,7 @@ |
213 |
#include <stdio.h> |
214 |
#include <stdlib.h> |