Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gwave/, sci-electronics/gwave/files/
Date: Wed, 31 Jul 2019 13:56:03
Message-Id: 1564581016.38f12f34398ef3b330926b5d2f049a5e12520a98.asturm@gentoo
1 commit: 38f12f34398ef3b330926b5d2f049a5e12520a98
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 31 13:25:01 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 31 13:50:16 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38f12f34
7
8 sci-electronics/gwave: Drop 20120229 and 20090213
9
10 Package-Manager: Portage-2.3.69, Repoman-2.3.16
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 sci-electronics/gwave/Manifest | 2 -
14 .../gwave/files/gwave-20090213-as-needed.patch | 54 -------------
15 .../gwave/files/gwave-20120229_as-needed.patch | 58 --------------
16 .../gwave/files/gwave-20120229_doc.patch | 42 ----------
17 .../files/gwave-20120229_missing_externs.patch | 23 ------
18 .../gwave/files/gwave-20120229_remove_gh.patch | 92 ----------------------
19 ...remove_old_and_broken_compatibility_check.patch | 45 -----------
20 .../gwave/files/gwave-20120229_stdlib.patch | 11 ---
21 .../gwave/files/gwave-20120229_unistd.patch | 23 ------
22 sci-electronics/gwave/gwave-20090213-r1.ebuild | 57 --------------
23 sci-electronics/gwave/gwave-20120229-r1.ebuild | 69 ----------------
24 11 files changed, 476 deletions(-)
25
26 diff --git a/sci-electronics/gwave/Manifest b/sci-electronics/gwave/Manifest
27 index 3301677fd77..d193bbadefd 100644
28 --- a/sci-electronics/gwave/Manifest
29 +++ b/sci-electronics/gwave/Manifest
30 @@ -1,3 +1 @@
31 DIST gwave-20190116.tar.gz 472342 BLAKE2B d3781a757d288548600626c2105828162c9eb72930b1a3c741adc63eb275097a98f75fc73c31c4d57bee2e959952ca51e8af54090ff5ea0a2b780ee645da7e4e SHA512 5c83306dfa4aaf7a0e9bb27be3c8a0e9e47d02b15afe78938e23b815d302bb162ab35aab05b67ede132d0a7c51519b15ef64a7f87df4b8da9ca9b93b82410b7b
32 -DIST gwave-code-249-trunk.zip 415799 BLAKE2B d128d9497f05f61e334886f0884a745c2cab624131ff2811162dc4ad0d39a244c4f08783dc7ddb12edde3287466744d8f6f8db6a61f77a493811d887ca611a5d SHA512 351e5db7c65a0ff3ff68785986c3c4f16e2fbf2386c944c8ed63ced4b4714e9e00c2d30a12f7180477bb8f1ac56a09208cf6379b0e0074dc92de71ff483d5d87
33 -DIST gwave2-20090213.tar.gz 403957 BLAKE2B aeb1db92bfc5977d1a11e0baad89919f4eafd8c9c8ceaf94e29e8a8a6aed29f38f27bec6a340c8610b0acde83c0f8fa3944313417ae3db7d91e155db920fa358 SHA512 9b39ed2923901af18253abe8e3ae1a6f71a660e31181dce31b0d784eb1dd0800a31ff48158b2c68555fcd268029e20295e87626e8e1d4cebc236b3863fe25e8c
34
35 diff --git a/sci-electronics/gwave/files/gwave-20090213-as-needed.patch b/sci-electronics/gwave/files/gwave-20090213-as-needed.patch
36 deleted file mode 100644
37 index 7ec72ed2aab..00000000000
38 --- a/sci-electronics/gwave/files/gwave-20090213-as-needed.patch
39 +++ /dev/null
40 @@ -1,54 +0,0 @@
41 ---- gwave2-20090213.orig/src/Makefile.am 2008-01-22 05:36:59.000000000 +0100
42 -+++ gwave2-20090213/src/Makefile.am 2010-02-06 18:10:38.011218381 +0100
43 -@@ -15,8 +15,7 @@
44 - rgeval.c xgserver.c measurebtn.c measurebtn.h \
45 - GtkTable_indel.c GtkTable_indel.h xsnarf.h
46 -
47 --gwave_LDADD = ../spicefile/libspicefile.a @GTK_LIBS@ @GUILE_GNOME_LIBS@
48 --gwave_LDFLAGS = @GUILE_LDFLAGS@
49 -+gwave_LDADD = ../spicefile/libspicefile.a @GTK_LIBS@ @GUILE_GNOME_LIBS@ @GUILE_LDFLAGS@
50 -
51 - AM_CFLAGS = @GTK_CFLAGS@ @GUILE_CFLAGS@ @GUILE_GNOME_CFLAGS@ \
52 - -DDATADIR=\"$(datadir)\" -DBINGWAVE=\"$(bindir)/gwave\"
53 ---- gwave2-20090213.orig/spicefile/Makefile.am 2008-01-22 05:31:45.000000000 +0100
54 -+++ gwave2-20090213/spicefile/Makefile.am 2010-02-06 18:11:53.008964326 +0100
55 -@@ -10,11 +10,9 @@
56 -
57 - noinst_PROGRAMS = test_read
58 - test_read_SOURCES = test_read.c
59 --test_read_LDFLAGS = @GTK_LIBS@
60 --test_read_LDADD = libspicefile.a
61 -+test_read_LDADD = libspicefile.a @GTK_LIBS@
62 -
63 - bin_PROGRAMS=sp2sp
64 - sp2sp_SOURCES=sp2sp.c
65 --sp2sp_LDFLAGS= @GTK_LIBS@
66 --sp2sp_LDADD= libspicefile.a
67 -+sp2sp_LDADD= libspicefile.a @GTK_LIBS@
68 -
69 ---- gwave2-20090213.orig/configure.ac 2009-02-13 06:00:57.000000000 +0100
70 -+++ gwave2-20090213/configure.ac 2010-02-06 18:23:11.522964311 +0100
71 -@@ -84,7 +84,8 @@
72 - dnl GUILE_MODULE_REQUIRED(gnome gtk)
73 -
74 - PKG_CHECK_MODULES(GUILE_GNOME, guile-gnome-gtk-2, ,AC_MSG_ERROR(Can not find Guile-gnome-platform))
75 --
76 -+PKG_CHECK_MODULES([X11], [x11])
77 -+PKG_CHECK_MODULES([GLIB], [glib-2.0])
78 - dnl remind myself how to check for somthing I know exists
79 - dnl GUILE_MODULE_EXPORTS(foo_widget_show, (gnome-0)(gnome gtk),gtk-widget-show)
80 - dnl if test "$foo_widget_show" = yes; then
81 ---- gwave2-20090213.orig/remote/Makefile.am 2010-02-06 18:33:14.340215309 +0100
82 -+++ gwave2-20090213/remote/Makefile.am 2010-02-06 18:34:19.810967947 +0100
83 -@@ -4,7 +4,9 @@
84 - AM_CFLAGS = @GTK_CFLAGS@
85 - bin_PROGRAMS=gwave-exec gwaverepl
86 - gwave_exec_SOURCES=gwave-exec.c xgclient.c xgexec.h
87 --gwave_exec_LDADD= @GTK_LIBS@
88 -+gwave_exec_CFLAGS= @X11_CFLAGS@
89 -+gwave_exec_LDADD= @GTK_LIBS@ @X11_LIBS@
90 -
91 - gwaverepl_SOURCES=gwaverepl.c xgclient.c xgexec.h repllib.c
92 --gwaverepl_LDADD= @GTK_LIBS@ @READLINE_LIB@
93 -+gwaverepl_CFLAGS= @X11_CFLAGS@ @GLIB_CFLAGS@
94 -+gwaverepl_LDADD= @GTK_LIBS@ @READLINE_LIB@ @X11_LIBS@ @GLIB_LIBS@
95
96 diff --git a/sci-electronics/gwave/files/gwave-20120229_as-needed.patch b/sci-electronics/gwave/files/gwave-20120229_as-needed.patch
97 deleted file mode 100644
98 index 75d57f26b71..00000000000
99 --- a/sci-electronics/gwave/files/gwave-20120229_as-needed.patch
100 +++ /dev/null
101 @@ -1,58 +0,0 @@
102 -diff -ur gwave-code-249-trunk.orig/configure.ac gwave-code-249-trunk/configure.ac
103 ---- gwave-code-249-trunk.orig/configure.ac 2016-08-15 12:51:39.170423625 -0600
104 -+++ gwave-code-249-trunk/configure.ac 2016-08-15 12:53:13.049707178 -0600
105 -@@ -140,6 +140,9 @@
106 - AC_SUBST(ggtk_hack_cflags)
107 - AC_SUBST(ggtk_extra_loadpath)
108 -
109 -+PKG_CHECK_MODULES([X11], [x11])
110 -+PKG_CHECK_MODULES([GLIB], [glib-2.0])
111 -+
112 - dnl doesn't work if prefix isn't specified.
113 - dnl AC_DEFINE_UNQUOTED(DATADIR,"${datadir}",Installation prefix for finding necessary guile code)
114 -
115 -diff -ur gwave-code-249-trunk.orig/remote/Makefile.am gwave-code-249-trunk/remote/Makefile.am
116 ---- gwave-code-249-trunk.orig/remote/Makefile.am 2016-08-15 12:51:39.170423625 -0600
117 -+++ gwave-code-249-trunk/remote/Makefile.am 2016-08-15 12:52:15.810144514 -0600
118 -@@ -4,7 +4,9 @@
119 - AM_CFLAGS = @GTK_CFLAGS@
120 - bin_PROGRAMS=gwave-exec gwaverepl
121 - gwave_exec_SOURCES=gwave-exec.c xgclient.c xgexec.h
122 --gwave_exec_LDADD= @GTK_LIBS@
123 -+gwave_exec_LDADD= @GTK_LIBS@ @X11_LIBS@
124 -+gwave_exec_CFLAGS= @X11_CFLAGS@
125 -
126 - gwaverepl_SOURCES=gwaverepl.c xgclient.c xgexec.h repllib.c
127 --gwaverepl_LDADD= @GTK_LIBS@ @READLINE_LIB@
128 -+gwaverepl_LDADD= @GTK_LIBS@ @READLINE_LIB@ @X11_LIBS@ @GLIB_LIBS@
129 -+gwaverepl_CFLAGS= @X11_CFLAGS@ @GLIB_CFLAGS@
130 -diff -ur gwave-code-249-trunk.orig/spicefile/Makefile.am gwave-code-249-trunk/spicefile/Makefile.am
131 ---- gwave-code-249-trunk.orig/spicefile/Makefile.am 2016-08-15 12:51:39.170423625 -0600
132 -+++ gwave-code-249-trunk/spicefile/Makefile.am 2016-08-15 12:52:15.810144514 -0600
133 -@@ -10,11 +10,9 @@
134 -
135 - noinst_PROGRAMS = test_read
136 - test_read_SOURCES = test_read.c
137 --test_read_LDFLAGS = @GTK_LIBS@
138 --test_read_LDADD = libspicefile.a
139 -+test_read_LDADD = libspicefile.a @GTK_LIBS@
140 -
141 - bin_PROGRAMS=sp2sp
142 - sp2sp_SOURCES=sp2sp.c
143 --sp2sp_LDFLAGS= @GTK_LIBS@
144 --sp2sp_LDADD= libspicefile.a
145 -+sp2sp_LDADD= libspicefile.a @GTK_LIBS@
146 -
147 -diff -ur gwave-code-249-trunk.orig/src/Makefile.am gwave-code-249-trunk/src/Makefile.am
148 ---- gwave-code-249-trunk.orig/src/Makefile.am 2016-08-15 12:51:39.170423625 -0600
149 -+++ gwave-code-249-trunk/src/Makefile.am 2016-08-15 12:52:15.810144514 -0600
150 -@@ -16,8 +16,7 @@
151 - rgeval.c xgserver.c measurebtn.c measurebtn.h \
152 - GtkTable_indel.c GtkTable_indel.h xsnarf.h
153 -
154 --gwave_LDADD = ../spicefile/libspicefile.a @GTK_LIBS@ @GUILEGTK_LIBS@
155 --gwave_LDFLAGS = @GUILE_LDFLAGS@
156 -+gwave_LDADD = ../spicefile/libspicefile.a @GTK_LIBS@ @GUILEGTK_LIBS@ @GUILE_LDFLAGS@ -lX11 -lm
157 -
158 - AM_CFLAGS = @GTK_CFLAGS@ @GUILE_CFLAGS@ @GUILEGTK_CFLAGS@ \
159 - -DDATADIR=\"$(datadir)\" -DBINGWAVE=\"$(bindir)/gwave\" @ggtk_hack_cflags@
160
161 diff --git a/sci-electronics/gwave/files/gwave-20120229_doc.patch b/sci-electronics/gwave/files/gwave-20120229_doc.patch
162 deleted file mode 100644
163 index 558de4aa75e..00000000000
164 --- a/sci-electronics/gwave/files/gwave-20120229_doc.patch
165 +++ /dev/null
166 @@ -1,42 +0,0 @@
167 -diff -ur gwave-code-249-trunk.orig/doc/Makefile.am gwave-code-249-trunk/doc/Makefile.am
168 ---- gwave-code-249-trunk.orig/doc/Makefile.am 2003-12-24 13:42:48.000000000 -0700
169 -+++ gwave-code-249-trunk/doc/Makefile.am 2016-08-17 13:11:07.142818075 -0600
170 -@@ -18,7 +18,7 @@
171 -
172 - # Make the reference-document textfiles
173 - gwave-procedures.txt gwave-variables.txt gwave-hooks.txt gwave-concepts.txt:
174 -- @GUILE@ -e main -s $(top_srcdir)/utilities/doc-split --basename gwave $(top_srcdir)/src/*.doc $(top_srcdir)/scheme/*.doc
175 -+ guile -e main -s $(top_srcdir)/utilities/doc-split --basename gwave $(top_srcdir)/src/*.doc $(top_srcdir)/scheme/*.doc
176 -
177 - html: gwave.sgml
178 - mkdir -p html && cd html && \
179 -@@ -39,7 +39,7 @@
180 - SUFFIXES=.sgml .1 .5
181 -
182 - .sgml.1:
183 -- docbook-to-man $*.sgml > $@
184 -+ docbook2man $*.sgml
185 -
186 - .PHONY: html tex dvi ps pdf
187 -
188 -diff -ur gwave-code-249-trunk.orig/utilities/doc-split.in gwave-code-249-trunk/utilities/doc-split.in
189 ---- gwave-code-249-trunk.orig/utilities/doc-split.in 2008-01-22 20:52:08.000000000 -0700
190 -+++ gwave-code-249-trunk/utilities/doc-split.in 2016-08-17 13:13:59.944653789 -0600
191 -@@ -100,13 +100,13 @@
192 - (if (not (eof-object? line))
193 - (begin
194 - (cond
195 -- ((regexp-exec #+"^Concept: " line)
196 -+ ((regexp-exec (make-regexp "^Concept: ") line)
197 - (set! fp concept-fp))
198 -- ((regexp-exec #+"^Hook: " line)
199 -+ ((regexp-exec (make-regexp "^Hook: ") line)
200 - (set! fp hook-fp))
201 -- ((regexp-exec #+"^Variable: " line)
202 -+ ((regexp-exec (make-regexp "^Variable: ") line)
203 - (set! fp var-fp))
204 -- ((regexp-exec #+"^Procedure: " line)
205 -+ ((regexp-exec (make-regexp "^Procedure: ") line)
206 - (set! fp proc-fp))
207 - (else
208 - (set! fp #f)))
209
210 diff --git a/sci-electronics/gwave/files/gwave-20120229_missing_externs.patch b/sci-electronics/gwave/files/gwave-20120229_missing_externs.patch
211 deleted file mode 100644
212 index c3c48ecddcf..00000000000
213 --- a/sci-electronics/gwave/files/gwave-20120229_missing_externs.patch
214 +++ /dev/null
215 @@ -1,23 +0,0 @@
216 -diff -ur gwave-code-249-trunk.orig/remote/gwaverepl.c gwave-code-249-trunk/remote/gwaverepl.c
217 ---- gwave-code-249-trunk.orig/remote/gwaverepl.c 2000-11-05 23:39:09.000000000 -0700
218 -+++ gwave-code-249-trunk/remote/gwaverepl.c 2016-08-17 13:20:17.071406553 -0600
219 -@@ -32,6 +32,8 @@
220 - Window w;
221 -
222 - extern char *split_at(char **to_split, int i);
223 -+extern int check_balance(char *expr);
224 -+extern int appending_fgets(char **sofar);
225 -
226 -
227 - int
228 -diff -ur gwave-code-249-trunk.orig/spicefile/spicestream.h gwave-code-249-trunk/spicefile/spicestream.h
229 ---- gwave-code-249-trunk.orig/spicefile/spicestream.h 2004-12-26 20:10:24.000000000 -0700
230 -+++ gwave-code-249-trunk/spicefile/spicestream.h 2016-08-17 13:20:24.208011807 -0600
231 -@@ -100,6 +100,7 @@
232 - extern int fread_line(FILE *fp, char **bufp, int *bufsize);
233 - extern void ss_msg(SSMsgLevel type, const char *id, const char *msg, ...);
234 - extern char *ss_filetype_name(int n);
235 -+extern void ss_delete(SpiceStream *ss);
236 -
237 -
238 - #ifdef __cplusplus
239
240 diff --git a/sci-electronics/gwave/files/gwave-20120229_remove_gh.patch b/sci-electronics/gwave/files/gwave-20120229_remove_gh.patch
241 deleted file mode 100644
242 index 64cb026474a..00000000000
243 --- a/sci-electronics/gwave/files/gwave-20120229_remove_gh.patch
244 +++ /dev/null
245 @@ -1,92 +0,0 @@
246 -diff -ur gwave-code-249-trunk.orig/src/guile-compat.c gwave-code-249-trunk/src/guile-compat.c
247 ---- gwave-code-249-trunk.orig/src/guile-compat.c 2008-12-27 12:19:42.000000000 -0700
248 -+++ gwave-code-249-trunk/src/guile-compat.c 2016-08-15 11:35:19.686041341 -0600
249 -@@ -23,7 +23,7 @@
250 - #include <config.h>
251 - #endif
252 -
253 --#include <guile/gh.h>
254 -+#include <libguile.h>
255 -
256 - #include "guile-compat.h"
257 -
258 -@@ -56,7 +56,7 @@
259 - *lenp = 0;
260 - return NULL;
261 - }
262 -- len = scm_i_string_length (str);
263 -+ len = scm_c_string_length (str);
264 - res = scm_malloc (len + 1);
265 - memcpy (res, scm_i_string_chars (str), len);
266 - res[len] = '\0'; //unconditionaly null terminate
267 -diff -ur gwave-code-249-trunk.orig/src/rgeval.c gwave-code-249-trunk/src/rgeval.c
268 ---- gwave-code-249-trunk.orig/src/rgeval.c 2008-12-27 12:19:42.000000000 -0700
269 -+++ gwave-code-249-trunk/src/rgeval.c 2016-08-15 11:35:19.686041341 -0600
270 -@@ -8,7 +8,7 @@
271 - */
272 - #include <stdio.h>
273 - #include <string.h>
274 --#include <guile/gh.h>
275 -+#include <libguile.h>
276 -
277 - #ifdef HAVE_CONFIG_H
278 - #include "config.h"
279 -diff -ur gwave-code-249-trunk.orig/src/scwm_guile.c gwave-code-249-trunk/src/scwm_guile.c
280 ---- gwave-code-249-trunk.orig/src/scwm_guile.c 2008-01-22 20:52:08.000000000 -0700
281 -+++ gwave-code-249-trunk/src/scwm_guile.c 2016-08-15 11:37:03.732234328 -0600
282 -@@ -31,7 +31,6 @@
283 - #include <limits.h>
284 - #include <assert.h>
285 -
286 --#include <guile/gh.h>
287 - #include <libguile.h>
288 - #include <libguile/fluids.h>
289 -
290 -@@ -401,7 +400,7 @@
291 -
292 - void init_scwm_guile()
293 - {
294 -- run_hook_proc = gh_lookup("run-hook");
295 -+ run_hook_proc = scm_variable_ref (scm_c_lookup ("run-hook"));
296 -
297 - #ifndef SCM_MAGIC_SNARF_INITS
298 - #include "scwm_guile.x"
299 -diff -ur gwave-code-249-trunk.orig/src/scwm_guile.h gwave-code-249-trunk/src/scwm_guile.h
300 ---- gwave-code-249-trunk.orig/src/scwm_guile.h 2008-01-22 20:52:08.000000000 -0700
301 -+++ gwave-code-249-trunk/src/scwm_guile.h 2016-08-15 11:35:19.686041341 -0600
302 -@@ -12,7 +12,7 @@
303 - #define SCWM_GUILE_H__
304 -
305 - #include "arg_unused.h"
306 --#include <guile/gh.h>
307 -+#include <libguile.h>
308 - #include "validate.h"
309 - #include <xsnarf.h>
310 -
311 -diff -ur gwave-code-249-trunk.orig/src/validate.h gwave-code-249-trunk/src/validate.h
312 ---- gwave-code-249-trunk.orig/src/validate.h 2008-01-19 12:28:50.000000000 -0700
313 -+++ gwave-code-249-trunk/src/validate.h 2016-08-15 11:35:19.686041341 -0600
314 -@@ -192,20 +192,20 @@
315 -
316 - #define VALIDATE_ARG_STR_NEWCOPY(pos,scm,pch) \
317 - do { \
318 -- if (SCM_NFALSEP (scm_string_p(scm))) pch = gh_scm2newstr(scm,NULL); \
319 -+ if (SCM_NFALSEP (scm_string_p(scm))) pch = scm_to_locale_string(scm); \
320 - else { pch = NULL; scm_wrong_type_arg(FUNC_NAME,pos,scm); } \
321 - } while (0)
322 -
323 - #define VALIDATE_ARG_STR_NEWCOPY_LEN(pos,scm,pch,len) \
324 - do { \
325 -- if (SCM_NFALSEP (scm_string_p(scm))) pch = gh_scm2newstr(scm,&len); \
326 -+ if (SCM_NFALSEP (scm_string_p(scm))) pch = scm_from_locale_stringn(scm,&len); \
327 - else { pch = NULL; scm_wrong_type_arg(FUNC_NAME,pos,scm); } \
328 - } while (0)
329 -
330 - #define VALIDATE_ARG_STR_NEWCOPY_USE_NULL(pos,scm,pch) \
331 - do { \
332 - if (UNSET_SCM(scm)) pch = NULL; \
333 -- else if (SCM_NFALSEP (scm_string_p(scm))) pch = gh_scm2newstr(scm,NULL); \
334 -+ else if (SCM_NFALSEP (scm_string_p(scm))) pch = scm_from_locale_string(scm); \
335 - else { pch = NULL; scm_wrong_type_arg(FUNC_NAME,pos,scm); } \
336 - } while (0)
337 -
338
339 diff --git a/sci-electronics/gwave/files/gwave-20120229_remove_old_and_broken_compatibility_check.patch b/sci-electronics/gwave/files/gwave-20120229_remove_old_and_broken_compatibility_check.patch
340 deleted file mode 100644
341 index b3444f6d554..00000000000
342 --- a/sci-electronics/gwave/files/gwave-20120229_remove_old_and_broken_compatibility_check.patch
343 +++ /dev/null
344 @@ -1,45 +0,0 @@
345 -diff -ur gwave-code-249-trunk.orig/src/scwm_guile.c gwave-code-249-trunk/src/scwm_guile.c
346 ---- gwave-code-249-trunk.orig/src/scwm_guile.c 2016-08-12 16:55:04.598733712 -0600
347 -+++ gwave-code-249-trunk/src/scwm_guile.c 2016-08-12 16:55:43.508392247 -0600
348 -@@ -328,41 +328,6 @@
349 - SCM port = scm_current_error_port();
350 - #endif
351 -
352 -- /* GJB:FIXME:MS: is this a guile compatibility test that can be dropped
353 -- now? */
354 -- if (scm_ilength (throw_args) >= 3)
355 -- {
356 -- SCM fl;
357 -- fl = SCM_VARIABLE_REF (scm_the_last_stack_fluid_var);
358 --
359 -- /* GJB:FIXME:MS: This is a horrible hack,
360 -- but DEREF_LAST_STACK macro was throwing a wrong type
361 -- argument at weird times, and I'm trying to avoid
362 -- a crash when I demo to RMS tomorrow, hence this
363 -- ugly hack --04/27/99 gjb */
364 -- if (SCM_NIMP (fl) && SCM_FLUIDP (fl)) {
365 -- SCM stack = DEREF_LAST_STACK;
366 -- SCM subr = SCM_CAR (throw_args);
367 -- SCM message = SCM_CADR (throw_args);
368 -- SCM args = SCM_CADDR (throw_args);
369 --
370 -- scm_newline(port);
371 -- scm_display_backtrace (stack, port, SCM_UNDEFINED, SCM_UNDEFINED);
372 -- scm_newline(port);
373 -- scm_display_error (stack, port, subr, message, args, SCM_EOL);
374 -- } else {
375 --/* scwm_msg(ERR,"scwm_handle_error","scm_the_last_stack_fluid not holding a fluid!"); */
376 -- }
377 -- }
378 -- else
379 -- {
380 -- scm_puts ("uncaught throw to ", port);
381 -- scm_prin1 (tag, port, 0);
382 -- scm_puts (": ", port);
383 -- scm_prin1 (throw_args, port, 1);
384 -- scm_putc ('\n', port);
385 -- exit (2);
386 -- }
387 - /* GJB:FIXME:MS: can the scheme code display a backtrace without the
388 - stack argument? */
389 - return scwm_run_hook_message_only(error_hook, scm_cons(tag, throw_args));
390
391 diff --git a/sci-electronics/gwave/files/gwave-20120229_stdlib.patch b/sci-electronics/gwave/files/gwave-20120229_stdlib.patch
392 deleted file mode 100644
393 index fd7d6f6f641..00000000000
394 --- a/sci-electronics/gwave/files/gwave-20120229_stdlib.patch
395 +++ /dev/null
396 @@ -1,11 +0,0 @@
397 -diff -ur gwave-code-249-trunk.orig/src/xgserver.c gwave-code-249-trunk/src/xgserver.c
398 ---- gwave-code-249-trunk.orig/src/xgserver.c 2016-08-15 13:12:41.694012802 -0600
399 -+++ gwave-code-249-trunk/src/xgserver.c 2016-08-15 13:13:26.810327097 -0600
400 -@@ -22,6 +22,7 @@
401 - #include <sys/time.h>
402 - #include <unistd.h>
403 - #include <signal.h>
404 -+#include <stdlib.h>
405 -
406 - #include <X11/Xlib.h>
407 - #include <X11/Xatom.h>
408
409 diff --git a/sci-electronics/gwave/files/gwave-20120229_unistd.patch b/sci-electronics/gwave/files/gwave-20120229_unistd.patch
410 deleted file mode 100644
411 index a9644468ff7..00000000000
412 --- a/sci-electronics/gwave/files/gwave-20120229_unistd.patch
413 +++ /dev/null
414 @@ -1,23 +0,0 @@
415 -diff -ur gwave-code-249-trunk.orig/spicefile/sp2sp.c gwave-code-249-trunk/spicefile/sp2sp.c
416 ---- gwave-code-249-trunk.orig/spicefile/sp2sp.c 2016-08-12 14:00:32.647427290 -0600
417 -+++ gwave-code-249-trunk/spicefile/sp2sp.c 2016-08-12 14:03:21.445956110 -0600
418 -@@ -26,6 +26,8 @@
419 - #include <float.h>
420 - #include <errno.h>
421 - #include <glib.h>
422 -+#include <unistd.h>
423 -+
424 - #include "spicestream.h"
425 -
426 - #define SWEEP_NONE 0
427 -diff -ur gwave-code-249-trunk.orig/spicefile/test_read.c gwave-code-249-trunk/spicefile/test_read.c
428 ---- gwave-code-249-trunk.orig/spicefile/test_read.c 2016-08-12 14:00:32.647427290 -0600
429 -+++ gwave-code-249-trunk/spicefile/test_read.c 2016-08-12 14:02:52.806205722 -0600
430 -@@ -27,6 +27,7 @@
431 - #include <string.h>
432 - #include <errno.h>
433 - #include <glib.h>
434 -+#include <unistd.h>
435 -
436 - #include "wavefile.h"
437 -
438
439 diff --git a/sci-electronics/gwave/gwave-20090213-r1.ebuild b/sci-electronics/gwave/gwave-20090213-r1.ebuild
440 deleted file mode 100644
441 index 22101b0a0ea..00000000000
442 --- a/sci-electronics/gwave/gwave-20090213-r1.ebuild
443 +++ /dev/null
444 @@ -1,57 +0,0 @@
445 -# Copyright 1999-2015 Gentoo Foundation
446 -# Distributed under the terms of the GNU General Public License v2
447 -
448 -EAPI="5"
449 -
450 -inherit autotools eutils flag-o-matic fdo-mime gnome2-utils
451 -
452 -MY_PN="gwave2"
453 -MY_P="${MY_PN}-${PV}"
454 -
455 -DESCRIPTION="Analog waveform viewer for SPICE-like simulations"
456 -LICENSE="GPL-2"
457 -HOMEPAGE="http://gwave.sourceforge.net"
458 -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
459 -
460 -KEYWORDS="amd64 x86"
461 -IUSE="gnuplot plotutils"
462 -SLOT="0"
463 -
464 -DEPEND="=dev-scheme/guile-1.8*[networking]
465 - =dev-scheme/guile-gnome-platform-2.16*"
466 -
467 -RDEPEND="${DEPEND}
468 - sci-electronics/electronics-menu
469 - gnuplot? ( sci-visualization/gnuplot )
470 - plotutils? ( media-libs/plotutils )"
471 -
472 -S="${WORKDIR}/${MY_P}"
473 -
474 -src_prepare() {
475 - append-libs -lX11
476 - epatch "${FILESDIR}"/${P}-as-needed.patch
477 - eautoreconf
478 -}
479 -
480 -src_install() {
481 - emake DESTDIR="${D}" install
482 - dodoc AUTHORS NEWS README TODO
483 - newicon icons/wave-drag-ok.xpm gwave.xpm
484 - make_desktop_entry gwave "Gwave" gwave "Electronics"
485 -}
486 -
487 -pkg_preinst() {
488 - gnome2_icon_savelist
489 -}
490 -
491 -pkg_postinst() {
492 - fdo-mime_desktop_database_update
493 - fdo-mime_mime_database_update
494 - gnome2_icon_cache_update
495 -}
496 -
497 -pkg_postrm() {
498 - fdo-mime_desktop_database_update
499 - fdo-mime_mime_database_update
500 - gnome2_icon_cache_update
501 -}
502
503 diff --git a/sci-electronics/gwave/gwave-20120229-r1.ebuild b/sci-electronics/gwave/gwave-20120229-r1.ebuild
504 deleted file mode 100644
505 index a5697a7a0ed..00000000000
506 --- a/sci-electronics/gwave/gwave-20120229-r1.ebuild
507 +++ /dev/null
508 @@ -1,69 +0,0 @@
509 -# Copyright 1999-2018 Gentoo Foundation
510 -# Distributed under the terms of the GNU General Public License v2
511 -
512 -EAPI=6
513 -
514 -REV="249"
515 -WANT_AUTOMAKE=1.9
516 -inherit autotools desktop gnome2-utils xdg-utils
517 -
518 -DESCRIPTION="Analog waveform viewer for SPICE-like simulations"
519 -HOMEPAGE="http://gwave.sourceforge.net"
520 -SRC_URI="https://sourceforge.net/code-snapshots/svn/g/gw/gwave/code/gwave-code-${REV}-trunk.zip"
521 -
522 -LICENSE="GPL-2"
523 -KEYWORDS="~amd64 ~x86"
524 -IUSE="gnuplot plotutils"
525 -SLOT="0"
526 -
527 -COMMON_DEPEND="
528 - >=dev-scheme/guile-2[deprecated,networking]
529 - <dev-scheme/guile-2.2
530 - dev-scheme/guile-gnome-platform
531 - x11-libs/guile-gtk"
532 -
533 -RDEPEND="${COMMON_DEPEND}
534 - sci-electronics/electronics-menu
535 - gnuplot? ( sci-visualization/gnuplot )
536 - plotutils? ( media-libs/plotutils )"
537 -
538 -DEPEND="${COMMON_DEPEND}
539 - app-arch/unzip
540 - app-text/docbook-sgml-utils"
541 -
542 -S="${WORKDIR}/gwave-code-${REV}-trunk"
543 -
544 -PATCHES=(
545 - "${FILESDIR}"/${P}_as-needed.patch
546 - "${FILESDIR}"/${P}_doc.patch
547 - "${FILESDIR}"/${P}_missing_externs.patch
548 - "${FILESDIR}"/${P}_remove_gh.patch
549 - "${FILESDIR}"/${P}_remove_old_and_broken_compatibility_check.patch
550 - "${FILESDIR}"/${P}_stdlib.patch
551 - "${FILESDIR}"/${P}_unistd.patch
552 - )
553 -
554 -src_prepare() {
555 - default
556 - sed -e 's/AM_INIT_AUTOMAKE(gwave, [0-9]*)/AM_INIT_AUTOMAKE(gwave, ${PV})/' \
557 - -i configure.ac || die
558 - eautoreconf
559 -}
560 -
561 -src_install() {
562 - default
563 - newicon icons/wave-drag-ok.xpm gwave.xpm
564 - make_desktop_entry gwave "Gwave" gwave "Electronics"
565 -}
566 -
567 -pkg_postinst() {
568 - xdg_desktop_database_update
569 - xdg_mimeinfo_database_update
570 - gnome2_icon_cache_update
571 -}
572 -
573 -pkg_postrm() {
574 - xdg_desktop_database_update
575 - xdg_mimeinfo_database_update
576 - gnome2_icon_cache_update
577 -}