gentoo resync : 02.08.2019

12 files changed, 2 insertions, 488 deletions

diff --git a/sci-electronics/gwave/Manifest b/sci-electronics/gwave/Manifest
index d6e2263ed600..603be0c1146c 100644
--- a/sci-electronics/gwave/Manifest
+++ b/sci-electronics/gwave/Manifest
@@ -1,18 +1,6 @@
-AUX gwave-20090213-as-needed.patch 2257 BLAKE2B 6bf35061f11f699c160ae0451c1bfdb4003547eecce08761c2771d629675013ca1ec349994ecaa3c9194805ac760d1ad4c8d1f89772c4a223698e2914aa67581 SHA512 299c92352456b50af69a3b5606b9c97d36975ad597cc0c7871db60249652b6472a85d0d971dfe91e987a52877520951645fd68b13818e126960fd23e5f4d8f88
-AUX gwave-20120229_as-needed.patch 2565 BLAKE2B d027aa16a568327751e13946f949abceda7d114f2c600e085140426a00aae871320f58d7f28caa11161da6b8b8d650589d8c1d36835f71f30d88c76b3ddd479a SHA512 df46790d8da9bfd346b1435f02b64accb7378d610269d8e2fa7093a053178eeb5ef752ad60c46025d938fbd2523245a358ba99aa2580b92bf755ef516cd77471
-AUX gwave-20120229_doc.patch 1689 BLAKE2B c64926eea7e5b40b6a0bc1f9a9cdcedd9abcfbe712ac6b1ba9148980d04a089aa860dcc8563208c073debd3756f98f7c1c97dfba7c7fa3e538d623e9808ce84f SHA512 e9f60a0a04a2655ff9c4e99d0f9858ee2f19b7827d9ddf6c8f3e7ca0ce314c34d1852092127b177b8f869418f20fcc8282bdf851d2e20f614e760ababdf67e1a
-AUX gwave-20120229_missing_externs.patch 969 BLAKE2B c1ed4cd5d8f637fd95ffc6aa76f5d534e5aab5e319db5906f3d45027f1ae1c11c89560c61707205bfd639d83baf42321091d8e21d5fd547d884e3c5c46b6059b SHA512 bef1ea5a0df3588b4a851fb1d17a4570e17143c01edef36c794dff5910b42d582319951dc6de36b7102a2fcbb6f1e75f176da0c9e5a4176e92597429e88f087e
-AUX gwave-20120229_remove_gh.patch 3324 BLAKE2B 4473407744f9b1e7ed68f46b01d12b7fdbfb9e1a69e8ee9c63e6d476134b8ebc6bf3003285f40280d17d730f5831d5024262295034df848cc9ae67da3a760bf1 SHA512 c9d9a1a974e2a950bb033c001dea6593da1b4fa91a534e8230066ddf43e8407699a19c4cddcdccb06c6940b95b8144f63e54ce16465688e3bae5d11e9fb0d19c
-AUX gwave-20120229_remove_old_and_broken_compatibility_check.patch 1757 BLAKE2B 799a87b4a800d941205ee654c0ebb9eaca33316c1b0b79133401523b9a2a0d54f83d0daf0d3dae103cfba28286df2fd1915861c3caeba3d115d080f4b73c3d29 SHA512 2abbaae746743ac2f287985656778fa12b0f23f2d9e0d726925656aeab48ba07d92c13c30aea236439aa6cbac32ceb22e6dbb66c9649277ab315b4fe6ff3a7fe
-AUX gwave-20120229_stdlib.patch 396 BLAKE2B 4242963c3fc41d2ef86777f7e055448eaf9d27bf18d2d3b6071613037d048d0167d3b1570fe2fa082aa996e7497af522f64d5c20837221d5684fc648d8eb779c SHA512 5a960da39b2bc3f9d6646bbbac5f291e407578e13be7910c3f14dc3ecf5a5b6a3fe907cae8322e3888035d3d5844266d7ddb912ad567377543866671a640ae5c
-AUX gwave-20120229_unistd.patch 802 BLAKE2B 95d5b62714b25e8dfd6f7158303b92fcc2a8d3951af1201c714ff6d50691467df3b4235136d64d66c6e680131fb92f94d016c9398bed8a253e32b6c74895c206 SHA512 4b45b5606072675e3bede8852c5aaa25f25d2d9544970cf5eb81f896ed9c65fcc18e7f301254490165736b07dd9203e63bab93681366482baff8d995f0c105ea
 AUX gwave-20190116-as-needed.patch 4951 BLAKE2B 793ce3ac5eef8bacc7bd2959efcf6a22c93dbbda9a9785dfe6135983ff496c733e10bd873a396150f9443afbcd5efc16b3769f339837b3102d21f5d3bafa9e7c SHA512 35d07b15bcdb027bfba21a1eedbb2f212866777be6117afd111e9706b11799e6c7a54772069f07ea61a24db5d16cb2217c68456b0429f69a90990683b7ba7dfa
 AUX gwave-20190116-fix-configure.patch 704 BLAKE2B 095e1de7917fc391d95ae867dc07990311f214495704d47d715ddf678edb12c748d0b9bdd98565f6efb0a1b3aa1fedbf015abe620b8fcfcf32c869f4a20700d9 SHA512 60e616dfa86c055d94ab0f9fa5add1fe1c15771c5ab084fbd351e60d6233cf429d80cddfad55ff5e0d7ae2e5d2249c4c402a20e2808c62fbabbb390ab2f0a703
 AUX gwave-20190116-multiple-little-bugfixes.patch 4003 BLAKE2B 328eba93e6f8a8c4df62cd47ce411550cd2938777201fe8bd72457f867f373cb70683d33ec7426f97c937c86ada314aed6cb94d287cea57726a995324d93e6cc SHA512 878a881d33898111c6bf528a6be8ee496fae5a07553656f1c64371cf191b2c80f85e51b72c4ed39fac54b961192b5ba774600c74515e2b0682ff139fd809a877
 DIST gwave-20190116.tar.gz 472342 BLAKE2B d3781a757d288548600626c2105828162c9eb72930b1a3c741adc63eb275097a98f75fc73c31c4d57bee2e959952ca51e8af54090ff5ea0a2b780ee645da7e4e SHA512 5c83306dfa4aaf7a0e9bb27be3c8a0e9e47d02b15afe78938e23b815d302bb162ab35aab05b67ede132d0a7c51519b15ef64a7f87df4b8da9ca9b93b82410b7b
-DIST gwave-code-249-trunk.zip 415799 BLAKE2B d128d9497f05f61e334886f0884a745c2cab624131ff2811162dc4ad0d39a244c4f08783dc7ddb12edde3287466744d8f6f8db6a61f77a493811d887ca611a5d SHA512 351e5db7c65a0ff3ff68785986c3c4f16e2fbf2386c944c8ed63ced4b4714e9e00c2d30a12f7180477bb8f1ac56a09208cf6379b0e0074dc92de71ff483d5d87
-DIST gwave2-20090213.tar.gz 403957 BLAKE2B aeb1db92bfc5977d1a11e0baad89919f4eafd8c9c8ceaf94e29e8a8a6aed29f38f27bec6a340c8610b0acde83c0f8fa3944313417ae3db7d91e155db920fa358 SHA512 9b39ed2923901af18253abe8e3ae1a6f71a660e31181dce31b0d784eb1dd0800a31ff48158b2c68555fcd268029e20295e87626e8e1d4cebc236b3863fe25e8c
-EBUILD gwave-20090213-r1.ebuild 1218 BLAKE2B d22a108b44951bbcf8b9f306d8e97e0a7d2f440f87c10866c363008ce8edfa303f10ae81e1bcb680e423183de0d62e3433170cffca7dee9f6ae74c4326974ff0 SHA512 9a7a38cf7911322c80326cfa8336b5afc03cda2e58152edac77a259f5dde581bf5bc95f3bde2ff733b9b0c797ef74f579e04ab41928de1e1a23c7d2b4b2c7d32
-EBUILD gwave-20120229-r1.ebuild 1627 BLAKE2B 8afb2a1f8bb7cfedb33170b237ef91f4f74a16bc8d7eedb852bb394261611b42895def16eae702068f103680f78f9ef48ff68523af1b2d417eb3d39cc9f53ff5 SHA512 cd85fbe0bf6e3746355be5db8cf1eb352ee48cecb0e839becb5fa33d275e872e5736af4be6dd43c3d0aa4106c0c93fc1350bb3543fd25b3841a4f1e272d75655
-EBUILD gwave-20190116.ebuild 1137 BLAKE2B c4be14470db3d1cf077e124f42411aeb7a75f5b7d4198c97dd3aa9e3dc88a72437200133ea806189e211d4de376df1c27ec7e6306fb2b761255ddd10adbd528f SHA512 3abaaff8929b851fbb8563706def16d54918455f978d4599972319f9e4c9cf943579731795fb5dd32b3b1109cf19e97d3f5b76e1e277c9d1bac34732722eaaa2
+EBUILD gwave-20190116.ebuild 1135 BLAKE2B 76ee0d6b232e498b7dd1e96a490f88f4e630cf0981d121a2838f06bc0976c5981449fca802b4743a659326c5cee7d9b12fe706bce07bbfa6a9927f054176987b SHA512 5611162917ac1e95a446d4d1294deca88c98885b2d2970d37110b7486947afb19a9a6a24c1193f258090f8c0426ba6cda8b15f04345aaa035d905441fefa8d96
 MISC metadata.xml 729 BLAKE2B a7e62f3f754e700c62e9d43f473837302c704b9ca800ece31a152cbfcb56024db78b4ebbdd7b6d68eb31fb026962ea630661b06668d257d1e0cbfcb160c30ecd SHA512 c38f63a842618cfed2e78374219eaabb16a0cd9198ccb339701e1a4a86cf90689d12a70277b19dc781522f9b67a7ab740fdb5475c1eda0d9cdadbe4556ee2966
diff --git a/sci-electronics/gwave/files/gwave-20090213-as-needed.patch b/sci-electronics/gwave/files/gwave-20090213-as-needed.patch
deleted file mode 100644
index 7ec72ed2aab7..000000000000
--- a/sci-electronics/gwave/files/gwave-20090213-as-needed.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- gwave2-20090213.orig/src/Makefile.am	2008-01-22 05:36:59.000000000 +0100
-+++ gwave2-20090213/src/Makefile.am	2010-02-06 18:10:38.011218381 +0100
-@@ -15,8 +15,7 @@
- 	rgeval.c xgserver.c measurebtn.c measurebtn.h \
- 	GtkTable_indel.c GtkTable_indel.h  xsnarf.h
- 
--gwave_LDADD = ../spicefile/libspicefile.a  @GTK_LIBS@ @GUILE_GNOME_LIBS@ 
--gwave_LDFLAGS =  @GUILE_LDFLAGS@
-+gwave_LDADD = ../spicefile/libspicefile.a  @GTK_LIBS@ @GUILE_GNOME_LIBS@ @GUILE_LDFLAGS@
- 
- AM_CFLAGS = @GTK_CFLAGS@ @GUILE_CFLAGS@ @GUILE_GNOME_CFLAGS@ \
- 	-DDATADIR=\"$(datadir)\" -DBINGWAVE=\"$(bindir)/gwave\"
---- gwave2-20090213.orig/spicefile/Makefile.am	2008-01-22 05:31:45.000000000 +0100
-+++ gwave2-20090213/spicefile/Makefile.am	2010-02-06 18:11:53.008964326 +0100
-@@ -10,11 +10,9 @@
- 
- noinst_PROGRAMS = test_read
- test_read_SOURCES =  test_read.c
--test_read_LDFLAGS = @GTK_LIBS@
--test_read_LDADD = libspicefile.a
-+test_read_LDADD = libspicefile.a @GTK_LIBS@
- 
- bin_PROGRAMS=sp2sp
- sp2sp_SOURCES=sp2sp.c
--sp2sp_LDFLAGS= @GTK_LIBS@
--sp2sp_LDADD= libspicefile.a
-+sp2sp_LDADD= libspicefile.a @GTK_LIBS@
- 
---- gwave2-20090213.orig/configure.ac	2009-02-13 06:00:57.000000000 +0100
-+++ gwave2-20090213/configure.ac	2010-02-06 18:23:11.522964311 +0100
-@@ -84,7 +84,8 @@
- dnl GUILE_MODULE_REQUIRED(gnome gtk)
- 
- PKG_CHECK_MODULES(GUILE_GNOME, guile-gnome-gtk-2, ,AC_MSG_ERROR(Can not find Guile-gnome-platform))
--
-+PKG_CHECK_MODULES([X11], [x11])
-+PKG_CHECK_MODULES([GLIB], [glib-2.0])
- dnl remind myself how to check for somthing I know exists
- dnl GUILE_MODULE_EXPORTS(foo_widget_show, (gnome-0)(gnome gtk),gtk-widget-show)
- dnl if test "$foo_widget_show" = yes; then
---- gwave2-20090213.orig/remote/Makefile.am	2010-02-06 18:33:14.340215309 +0100
-+++ gwave2-20090213/remote/Makefile.am	2010-02-06 18:34:19.810967947 +0100
-@@ -4,7 +4,9 @@
- AM_CFLAGS = @GTK_CFLAGS@ 
- bin_PROGRAMS=gwave-exec gwaverepl
- gwave_exec_SOURCES=gwave-exec.c xgclient.c xgexec.h
--gwave_exec_LDADD= @GTK_LIBS@
-+gwave_exec_CFLAGS= @X11_CFLAGS@
-+gwave_exec_LDADD= @GTK_LIBS@ @X11_LIBS@
- 
- gwaverepl_SOURCES=gwaverepl.c xgclient.c xgexec.h repllib.c
--gwaverepl_LDADD= @GTK_LIBS@ @READLINE_LIB@
-+gwaverepl_CFLAGS= @X11_CFLAGS@ @GLIB_CFLAGS@
-+gwaverepl_LDADD= @GTK_LIBS@ @READLINE_LIB@ @X11_LIBS@ @GLIB_LIBS@
diff --git a/sci-electronics/gwave/files/gwave-20120229_as-needed.patch b/sci-electronics/gwave/files/gwave-20120229_as-needed.patch
deleted file mode 100644
index 75d57f26b710..000000000000
--- a/sci-electronics/gwave/files/gwave-20120229_as-needed.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -ur gwave-code-249-trunk.orig/configure.ac gwave-code-249-trunk/configure.ac
---- gwave-code-249-trunk.orig/configure.ac	2016-08-15 12:51:39.170423625 -0600
-+++ gwave-code-249-trunk/configure.ac	2016-08-15 12:53:13.049707178 -0600
-@@ -140,6 +140,9 @@
- AC_SUBST(ggtk_hack_cflags)
- AC_SUBST(ggtk_extra_loadpath)
- 
-+PKG_CHECK_MODULES([X11], [x11])
-+PKG_CHECK_MODULES([GLIB], [glib-2.0])
-+
- dnl doesn't work if prefix isn't specified.
- dnl AC_DEFINE_UNQUOTED(DATADIR,"${datadir}",Installation prefix for finding necessary guile code)
- 
-diff -ur gwave-code-249-trunk.orig/remote/Makefile.am gwave-code-249-trunk/remote/Makefile.am
---- gwave-code-249-trunk.orig/remote/Makefile.am	2016-08-15 12:51:39.170423625 -0600
-+++ gwave-code-249-trunk/remote/Makefile.am	2016-08-15 12:52:15.810144514 -0600
-@@ -4,7 +4,9 @@
- AM_CFLAGS = @GTK_CFLAGS@ 
- bin_PROGRAMS=gwave-exec gwaverepl
- gwave_exec_SOURCES=gwave-exec.c xgclient.c xgexec.h
--gwave_exec_LDADD= @GTK_LIBS@
-+gwave_exec_LDADD= @GTK_LIBS@ @X11_LIBS@
-+gwave_exec_CFLAGS= @X11_CFLAGS@
- 
- gwaverepl_SOURCES=gwaverepl.c xgclient.c xgexec.h repllib.c
--gwaverepl_LDADD= @GTK_LIBS@ @READLINE_LIB@
-+gwaverepl_LDADD= @GTK_LIBS@ @READLINE_LIB@ @X11_LIBS@ @GLIB_LIBS@
-+gwaverepl_CFLAGS= @X11_CFLAGS@ @GLIB_CFLAGS@
-diff -ur gwave-code-249-trunk.orig/spicefile/Makefile.am gwave-code-249-trunk/spicefile/Makefile.am
---- gwave-code-249-trunk.orig/spicefile/Makefile.am	2016-08-15 12:51:39.170423625 -0600
-+++ gwave-code-249-trunk/spicefile/Makefile.am	2016-08-15 12:52:15.810144514 -0600
-@@ -10,11 +10,9 @@
- 
- noinst_PROGRAMS = test_read
- test_read_SOURCES =  test_read.c
--test_read_LDFLAGS = @GTK_LIBS@
--test_read_LDADD = libspicefile.a
-+test_read_LDADD = libspicefile.a @GTK_LIBS@
- 
- bin_PROGRAMS=sp2sp
- sp2sp_SOURCES=sp2sp.c
--sp2sp_LDFLAGS= @GTK_LIBS@
--sp2sp_LDADD= libspicefile.a
-+sp2sp_LDADD= libspicefile.a @GTK_LIBS@
- 
-diff -ur gwave-code-249-trunk.orig/src/Makefile.am gwave-code-249-trunk/src/Makefile.am
---- gwave-code-249-trunk.orig/src/Makefile.am	2016-08-15 12:51:39.170423625 -0600
-+++ gwave-code-249-trunk/src/Makefile.am	2016-08-15 12:52:15.810144514 -0600
-@@ -16,8 +16,7 @@
- 	rgeval.c xgserver.c measurebtn.c measurebtn.h \
- 	GtkTable_indel.c GtkTable_indel.h  xsnarf.h
- 
--gwave_LDADD = ../spicefile/libspicefile.a  @GTK_LIBS@ @GUILEGTK_LIBS@ 
--gwave_LDFLAGS =  @GUILE_LDFLAGS@
-+gwave_LDADD = ../spicefile/libspicefile.a  @GTK_LIBS@ @GUILEGTK_LIBS@ @GUILE_LDFLAGS@ -lX11 -lm
- 
- AM_CFLAGS = @GTK_CFLAGS@ @GUILE_CFLAGS@ @GUILEGTK_CFLAGS@ \
- 	-DDATADIR=\"$(datadir)\" -DBINGWAVE=\"$(bindir)/gwave\" @ggtk_hack_cflags@
diff --git a/sci-electronics/gwave/files/gwave-20120229_doc.patch b/sci-electronics/gwave/files/gwave-20120229_doc.patch
deleted file mode 100644
index 558de4aa75ee..000000000000
--- a/sci-electronics/gwave/files/gwave-20120229_doc.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ur gwave-code-249-trunk.orig/doc/Makefile.am gwave-code-249-trunk/doc/Makefile.am
---- gwave-code-249-trunk.orig/doc/Makefile.am	2003-12-24 13:42:48.000000000 -0700
-+++ gwave-code-249-trunk/doc/Makefile.am	2016-08-17 13:11:07.142818075 -0600
-@@ -18,7 +18,7 @@
- 
- # Make the reference-document textfiles
- gwave-procedures.txt gwave-variables.txt gwave-hooks.txt gwave-concepts.txt:
--	@GUILE@ -e main -s $(top_srcdir)/utilities/doc-split --basename gwave $(top_srcdir)/src/*.doc $(top_srcdir)/scheme/*.doc
-+	guile -e main -s $(top_srcdir)/utilities/doc-split --basename gwave $(top_srcdir)/src/*.doc $(top_srcdir)/scheme/*.doc
- 
- html: gwave.sgml
- 	mkdir -p html && cd html && \
-@@ -39,7 +39,7 @@
- SUFFIXES=.sgml .1 .5
- 
- .sgml.1:
--	docbook-to-man $*.sgml > $@
-+	docbook2man $*.sgml
- 
- .PHONY: html tex dvi ps pdf
- 
-diff -ur gwave-code-249-trunk.orig/utilities/doc-split.in gwave-code-249-trunk/utilities/doc-split.in
---- gwave-code-249-trunk.orig/utilities/doc-split.in	2008-01-22 20:52:08.000000000 -0700
-+++ gwave-code-249-trunk/utilities/doc-split.in	2016-08-17 13:13:59.944653789 -0600
-@@ -100,13 +100,13 @@
- 	    (if (not (eof-object? line))
- 		(begin
- 		  (cond 
--		   ((regexp-exec #+"^Concept: " line)
-+		   ((regexp-exec (make-regexp "^Concept: ") line)
- 		    (set! fp concept-fp))
--		   ((regexp-exec #+"^Hook: " line)
-+		   ((regexp-exec (make-regexp "^Hook: ") line)
- 		    (set! fp hook-fp))
--		   ((regexp-exec #+"^Variable: " line)
-+		   ((regexp-exec (make-regexp "^Variable: ") line)
- 		    (set! fp var-fp))
--		   ((regexp-exec #+"^Procedure: " line)
-+		   ((regexp-exec (make-regexp "^Procedure: ") line)
- 		    (set! fp proc-fp))
- 		   (else
- 		    (set! fp #f)))
diff --git a/sci-electronics/gwave/files/gwave-20120229_missing_externs.patch b/sci-electronics/gwave/files/gwave-20120229_missing_externs.patch
deleted file mode 100644
index c3c48ecddcfc..000000000000
--- a/sci-electronics/gwave/files/gwave-20120229_missing_externs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur gwave-code-249-trunk.orig/remote/gwaverepl.c gwave-code-249-trunk/remote/gwaverepl.c
---- gwave-code-249-trunk.orig/remote/gwaverepl.c	2000-11-05 23:39:09.000000000 -0700
-+++ gwave-code-249-trunk/remote/gwaverepl.c	2016-08-17 13:20:17.071406553 -0600
-@@ -32,6 +32,8 @@
- Window w;
- 
- extern char *split_at(char **to_split, int i);
-+extern int check_balance(char *expr);
-+extern int appending_fgets(char **sofar);
- 
- 
- int
-diff -ur gwave-code-249-trunk.orig/spicefile/spicestream.h gwave-code-249-trunk/spicefile/spicestream.h
---- gwave-code-249-trunk.orig/spicefile/spicestream.h	2004-12-26 20:10:24.000000000 -0700
-+++ gwave-code-249-trunk/spicefile/spicestream.h	2016-08-17 13:20:24.208011807 -0600
-@@ -100,6 +100,7 @@
- extern int fread_line(FILE *fp, char **bufp, int *bufsize);
- extern void ss_msg(SSMsgLevel type, const char *id, const char *msg, ...);
- extern char *ss_filetype_name(int n);
-+extern void ss_delete(SpiceStream *ss);
- 
- 
- #ifdef __cplusplus
diff --git a/sci-electronics/gwave/files/gwave-20120229_remove_gh.patch b/sci-electronics/gwave/files/gwave-20120229_remove_gh.patch
deleted file mode 100644
index 64cb026474af..000000000000
--- a/sci-electronics/gwave/files/gwave-20120229_remove_gh.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff -ur gwave-code-249-trunk.orig/src/guile-compat.c gwave-code-249-trunk/src/guile-compat.c
---- gwave-code-249-trunk.orig/src/guile-compat.c	2008-12-27 12:19:42.000000000 -0700
-+++ gwave-code-249-trunk/src/guile-compat.c	2016-08-15 11:35:19.686041341 -0600
-@@ -23,7 +23,7 @@
- #include <config.h>
- #endif
- 
--#include <guile/gh.h>
-+#include <libguile.h>
- 
- #include "guile-compat.h"
- 
-@@ -56,7 +56,7 @@
-                         *lenp = 0;
-                 return NULL;
-         }
--        len = scm_i_string_length (str);
-+        len = scm_c_string_length (str);
-         res = scm_malloc (len + 1);
-         memcpy (res, scm_i_string_chars (str), len);
-         res[len] = '\0';   //unconditionaly null terminate
-diff -ur gwave-code-249-trunk.orig/src/rgeval.c gwave-code-249-trunk/src/rgeval.c
---- gwave-code-249-trunk.orig/src/rgeval.c	2008-12-27 12:19:42.000000000 -0700
-+++ gwave-code-249-trunk/src/rgeval.c	2016-08-15 11:35:19.686041341 -0600
-@@ -8,7 +8,7 @@
-  */
- #include <stdio.h>
- #include <string.h>
--#include <guile/gh.h>
-+#include <libguile.h>
- 
- #ifdef HAVE_CONFIG_H
- #include "config.h"
-diff -ur gwave-code-249-trunk.orig/src/scwm_guile.c gwave-code-249-trunk/src/scwm_guile.c
---- gwave-code-249-trunk.orig/src/scwm_guile.c	2008-01-22 20:52:08.000000000 -0700
-+++ gwave-code-249-trunk/src/scwm_guile.c	2016-08-15 11:37:03.732234328 -0600
-@@ -31,7 +31,6 @@
- #include <limits.h>
- #include <assert.h>
- 
--#include <guile/gh.h>
- #include <libguile.h>
- #include <libguile/fluids.h>
- 
-@@ -401,7 +400,7 @@
- 
- void init_scwm_guile()
- {
--  run_hook_proc = gh_lookup("run-hook");
-+  run_hook_proc = scm_variable_ref (scm_c_lookup ("run-hook"));
- 
- #ifndef SCM_MAGIC_SNARF_INITS
- #include "scwm_guile.x"
-diff -ur gwave-code-249-trunk.orig/src/scwm_guile.h gwave-code-249-trunk/src/scwm_guile.h
---- gwave-code-249-trunk.orig/src/scwm_guile.h	2008-01-22 20:52:08.000000000 -0700
-+++ gwave-code-249-trunk/src/scwm_guile.h	2016-08-15 11:35:19.686041341 -0600
-@@ -12,7 +12,7 @@
- #define SCWM_GUILE_H__
- 
- #include "arg_unused.h"
--#include <guile/gh.h>
-+#include <libguile.h>
- #include "validate.h"
- #include <xsnarf.h>
- 
-diff -ur gwave-code-249-trunk.orig/src/validate.h gwave-code-249-trunk/src/validate.h
---- gwave-code-249-trunk.orig/src/validate.h	2008-01-19 12:28:50.000000000 -0700
-+++ gwave-code-249-trunk/src/validate.h	2016-08-15 11:35:19.686041341 -0600
-@@ -192,20 +192,20 @@
- 
- #define VALIDATE_ARG_STR_NEWCOPY(pos,scm,pch) \
-   do { \
-- if (SCM_NFALSEP (scm_string_p(scm))) pch = gh_scm2newstr(scm,NULL); \
-+ if (SCM_NFALSEP (scm_string_p(scm))) pch = scm_to_locale_string(scm); \
-   else { pch = NULL; scm_wrong_type_arg(FUNC_NAME,pos,scm); } \
-   } while (0)
- 
- #define VALIDATE_ARG_STR_NEWCOPY_LEN(pos,scm,pch,len) \
-   do { \
-- if (SCM_NFALSEP (scm_string_p(scm))) pch = gh_scm2newstr(scm,&len); \
-+ if (SCM_NFALSEP (scm_string_p(scm))) pch = scm_from_locale_stringn(scm,&len); \
-   else { pch = NULL; scm_wrong_type_arg(FUNC_NAME,pos,scm); } \
-   } while (0)
- 
- #define VALIDATE_ARG_STR_NEWCOPY_USE_NULL(pos,scm,pch) \
-   do { \
-   if (UNSET_SCM(scm)) pch = NULL; \
--  else if (SCM_NFALSEP (scm_string_p(scm))) pch = gh_scm2newstr(scm,NULL); \
-+  else if (SCM_NFALSEP (scm_string_p(scm))) pch = scm_from_locale_string(scm); \
-   else { pch = NULL; scm_wrong_type_arg(FUNC_NAME,pos,scm); } \
-   } while (0)
- 
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
deleted file mode 100644
index b3444f6d5545..000000000000
--- a/sci-electronics/gwave/files/gwave-20120229_remove_old_and_broken_compatibility_check.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ur gwave-code-249-trunk.orig/src/scwm_guile.c gwave-code-249-trunk/src/scwm_guile.c
---- gwave-code-249-trunk.orig/src/scwm_guile.c	2016-08-12 16:55:04.598733712 -0600
-+++ gwave-code-249-trunk/src/scwm_guile.c	2016-08-12 16:55:43.508392247 -0600
-@@ -328,41 +328,6 @@
-   SCM port =  scm_current_error_port();
- #endif
- 
--  /* GJB:FIXME:MS: is this a guile compatibility test that can be dropped
--     now?  */
--  if (scm_ilength (throw_args) >= 3)
--    {
--      SCM fl;
--      fl = SCM_VARIABLE_REF (scm_the_last_stack_fluid_var);
--
--      /* GJB:FIXME:MS: This is a horrible hack,
--         but DEREF_LAST_STACK macro was throwing a wrong type 
--         argument at weird times, and I'm trying to avoid
--         a crash when I demo to RMS tomorrow, hence this
--         ugly hack --04/27/99 gjb */
--      if (SCM_NIMP (fl) && SCM_FLUIDP (fl)) {
--        SCM stack = DEREF_LAST_STACK;
--        SCM subr = SCM_CAR (throw_args);
--        SCM message = SCM_CADR (throw_args);
--        SCM args = SCM_CADDR (throw_args);
--        
--        scm_newline(port);
--        scm_display_backtrace (stack, port, SCM_UNDEFINED, SCM_UNDEFINED);
--        scm_newline(port);
--        scm_display_error (stack, port, subr, message, args, SCM_EOL);
--      } else {
--/*        scwm_msg(ERR,"scwm_handle_error","scm_the_last_stack_fluid not holding a fluid!"); */
--      }
--    }
--  else
--    {
--      scm_puts ("uncaught throw to ", port);
--      scm_prin1 (tag, port, 0);
--      scm_puts (": ", port);
--      scm_prin1 (throw_args, port, 1);
--      scm_putc ('\n', port);
--      exit (2);
--    }
-   /* GJB:FIXME:MS: can the scheme code display a backtrace without the
-      stack argument? */
-   return scwm_run_hook_message_only(error_hook, scm_cons(tag, throw_args));
diff --git a/sci-electronics/gwave/files/gwave-20120229_stdlib.patch b/sci-electronics/gwave/files/gwave-20120229_stdlib.patch
deleted file mode 100644
index fd7d6f6f6419..000000000000
--- a/sci-electronics/gwave/files/gwave-20120229_stdlib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur gwave-code-249-trunk.orig/src/xgserver.c gwave-code-249-trunk/src/xgserver.c
---- gwave-code-249-trunk.orig/src/xgserver.c	2016-08-15 13:12:41.694012802 -0600
-+++ gwave-code-249-trunk/src/xgserver.c	2016-08-15 13:13:26.810327097 -0600
-@@ -22,6 +22,7 @@
- #include <sys/time.h>
- #include <unistd.h>
- #include <signal.h>
-+#include <stdlib.h>
- 
- #include <X11/Xlib.h>
- #include <X11/Xatom.h>
diff --git a/sci-electronics/gwave/files/gwave-20120229_unistd.patch b/sci-electronics/gwave/files/gwave-20120229_unistd.patch
deleted file mode 100644
index a9644468ff72..000000000000
--- a/sci-electronics/gwave/files/gwave-20120229_unistd.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur gwave-code-249-trunk.orig/spicefile/sp2sp.c gwave-code-249-trunk/spicefile/sp2sp.c
---- gwave-code-249-trunk.orig/spicefile/sp2sp.c	2016-08-12 14:00:32.647427290 -0600
-+++ gwave-code-249-trunk/spicefile/sp2sp.c	2016-08-12 14:03:21.445956110 -0600
-@@ -26,6 +26,8 @@
- #include <float.h>
- #include <errno.h>
- #include <glib.h>
-+#include <unistd.h>
-+
- #include "spicestream.h"
- 
- #define SWEEP_NONE 0
-diff -ur gwave-code-249-trunk.orig/spicefile/test_read.c gwave-code-249-trunk/spicefile/test_read.c
---- gwave-code-249-trunk.orig/spicefile/test_read.c	2016-08-12 14:00:32.647427290 -0600
-+++ gwave-code-249-trunk/spicefile/test_read.c	2016-08-12 14:02:52.806205722 -0600
-@@ -27,6 +27,7 @@
- #include <string.h>
- #include <errno.h>
- #include <glib.h>
-+#include <unistd.h>
- 
- #include "wavefile.h"
- 
diff --git a/sci-electronics/gwave/gwave-20090213-r1.ebuild b/sci-electronics/gwave/gwave-20090213-r1.ebuild
deleted file mode 100644
index 22101b0a0ea6..000000000000
--- a/sci-electronics/gwave/gwave-20090213-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools eutils flag-o-matic fdo-mime gnome2-utils
-
-MY_PN="gwave2"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Analog waveform viewer for SPICE-like simulations"
-LICENSE="GPL-2"
-HOMEPAGE="http://gwave.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-IUSE="gnuplot plotutils"
-SLOT="0"
-
-DEPEND="=dev-scheme/guile-1.8*[networking]
-	=dev-scheme/guile-gnome-platform-2.16*"
-
-RDEPEND="${DEPEND}
-	sci-electronics/electronics-menu
-	gnuplot? ( sci-visualization/gnuplot )
-	plotutils? ( media-libs/plotutils )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	append-libs -lX11
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS NEWS README TODO
-	newicon icons/wave-drag-ok.xpm gwave.xpm
-	make_desktop_entry gwave "Gwave" gwave "Electronics"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/sci-electronics/gwave/gwave-20120229-r1.ebuild b/sci-electronics/gwave/gwave-20120229-r1.ebuild
deleted file mode 100644
index a5697a7a0ed3..000000000000
--- a/sci-electronics/gwave/gwave-20120229-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-REV="249"
-WANT_AUTOMAKE=1.9
-inherit autotools desktop gnome2-utils xdg-utils
-
-DESCRIPTION="Analog waveform viewer for SPICE-like simulations"
-HOMEPAGE="http://gwave.sourceforge.net"
-SRC_URI="https://sourceforge.net/code-snapshots/svn/g/gw/gwave/code/gwave-code-${REV}-trunk.zip"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnuplot plotutils"
-SLOT="0"
-
-COMMON_DEPEND="
-	>=dev-scheme/guile-2[deprecated,networking]
-	<dev-scheme/guile-2.2
-	dev-scheme/guile-gnome-platform
-	x11-libs/guile-gtk"
-
-RDEPEND="${COMMON_DEPEND}
-	sci-electronics/electronics-menu
-	gnuplot? ( sci-visualization/gnuplot )
-	plotutils? ( media-libs/plotutils )"
-
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip
-	app-text/docbook-sgml-utils"
-
-S="${WORKDIR}/gwave-code-${REV}-trunk"
-
-PATCHES=(
-	"${FILESDIR}"/${P}_as-needed.patch
-	"${FILESDIR}"/${P}_doc.patch
-	"${FILESDIR}"/${P}_missing_externs.patch
-	"${FILESDIR}"/${P}_remove_gh.patch
-	"${FILESDIR}"/${P}_remove_old_and_broken_compatibility_check.patch
-	"${FILESDIR}"/${P}_stdlib.patch
-	"${FILESDIR}"/${P}_unistd.patch
-	)
-
-src_prepare() {
-	default
-	sed -e 's/AM_INIT_AUTOMAKE(gwave, [0-9]*)/AM_INIT_AUTOMAKE(gwave, ${PV})/' \
-		-i configure.ac || die
-	eautoreconf
-}
-
-src_install() {
-	default
-	newicon icons/wave-drag-ok.xpm gwave.xpm
-	make_desktop_entry gwave "Gwave" gwave "Electronics"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/sci-electronics/gwave/gwave-20190116.ebuild b/sci-electronics/gwave/gwave-20190116.ebuild
index 131a84037433..ff747645f0c4 100644
--- a/sci-electronics/gwave/gwave-20190116.ebuild
+++ b/sci-electronics/gwave/gwave-20190116.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://gwave.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/gwave3/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnuplot plotutils"
 SLOT="0"