gentoo resync : 25.11.2020

22 files changed, 673 insertions, 25 deletions

diff --git a/media-radio/KochMorse/Manifest b/media-radio/KochMorse/Manifest
index ef068e6bf614..38754ce855a2 100644
--- a/media-radio/KochMorse/Manifest
+++ b/media-radio/KochMorse/Manifest
@@ -1,3 +1,3 @@
 DIST KochMorse-3.4.0.tar.gz 1066631 BLAKE2B a435ab85ea782cb09ceab23109651572a2ed8fab6764ed54cdb5c1f2a51814f477fca013913f81b806404abf0d210edce7cca589b10b19b39fece5d8e1f7b581 SHA512 43cf5c3c9d66c4ef23016246a80ab426976a20ca5a2639d47ff2622adcaa3a9444dbfcd2d5c28c5ee32e0f041e8ecd8a33f82a9ed3040753699ebbb43d8f0faa
 EBUILD KochMorse-3.4.0-r1.ebuild 783 BLAKE2B 1efbd9fe4a61bf620c454d056e8a44e3caf1120cd55d8ecf24fa12f260bd922a6a2cf7a52ebee561e693d6edc26eaa6684338d57556e9e0bcffc9433912feda3 SHA512 d9874b089edb52a2a0a13a96c6a29320bf1330b89dd9c26561a22242365553f019f0d9a7591c86106020e0a9d3f219082a760f70a480be3e404a4b19193421d6
-MISC metadata.xml 623 BLAKE2B a5dc157aa180f197ef055d643f18b72242d98f807fd5d8ad465df0d12d0769b73a2c726e6c1daf31e9a269a3af2e1253dd5cfbadd254c773279d504cf7cf95a6 SHA512 7ec69b0f22be7b23ab92513d64383eec7c255e192ac5d1136a5fb2262326c1be52e7615f445eda1703f94642d0ef41f28fe4f2e13f42eba843884350922fc143
+MISC metadata.xml 425 BLAKE2B c2864f5bb699637f66a1bebdf5857331e59e8a90fc8424c42da4b4154823e46db2b8cf41ecab6e182532d0569580822fa53c8adf6b388a0b28a6c4c8bddfc26a SHA512 378ed2d2084148be4d5d3e1e0f51a5cbda7459e6a2a2002d1bed26d6eb2e80824ed9ac989fc3152c564b18e47c397611c188dd511986c2fa1516af394a40eee7
diff --git a/media-radio/KochMorse/metadata.xml b/media-radio/KochMorse/metadata.xml
index 9db9e59f2d8e..c32e524da1f9 100644
--- a/media-radio/KochMorse/metadata.xml
+++ b/media-radio/KochMorse/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gentoo@seichter.de</email>
-		<name>Ralph Seichter</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		KochMorse is a simple morse-code tutor using the Koch method. It is
 		written in C++ and uses Qt5 for the graphical user interface.
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index 384db52e2b08..eff16968ed36 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/direwolf/Manifest b/media-radio/direwolf/Manifest
index 6a5ace9f3eb0..1b4e17391070 100644
--- a/media-radio/direwolf/Manifest
+++ b/media-radio/direwolf/Manifest
@@ -1,6 +1,10 @@
 AUX 1.4-makefile.patch 5964 BLAKE2B 4f90c390db99aef035886f74792e54c43eb93a30c1091bc9d823a901c733af5011676d3e6ca6e086a2072b3555fdc8ed99068a151fef86632a1d01b3149316ff SHA512 79dabff024c92958065ae091734a0a65ba57e02c318b64111643f066b18eea26b446260d3a8bdd34f8b244212301015524aaf4b46565b0fb9c67065dabb09ef4
+AUX 1.5-makefile.patch 17713 BLAKE2B d943de0a9afd255308533d03aab649b3fa5b528aa6be115cc48469c01e88ad4eba41b6d5192d8639047d6032a974a130ae87d493cca77762f75b13d68de3d00a SHA512 a30951aad309c3bef2a5049fc5993c9a15a445b6d15696594b2742146c2c9ddaf0d7b591ba47b6581cf80bff8afcb33718654716fc431ff2bb58e18d2f5899e8
+AUX direwolf-gpsd-API-9.patch 7419 BLAKE2B 961156fb5c2f04979d01b9cdbdd1d28438faad3841c8245b1e07a9cc75fe22391e399998644bf62b3b48053a0cd7dfe00eae8d4858531bc290857548db52a746 SHA512 1cfd04cf51758ad3657952dde3023fb959020a85f842c1bea7fc8e6ce3f14d5f6a1bcae40188e7989b795806a7e099def5661e13a9b636e98d3103fea166b5a0
 AUX direwolf-kiss.service 157 BLAKE2B d0fef86335f3fecd7234dc75a670747c96ea774e136d4cf89a455fe66d5f65c2c777ddc9ae2e277e16ceee2a7ccea14ddb151bc9c334c8f5ff300d64798570b8 SHA512 bdeda52f52a9e1fb1b9611877d7c52c7e70c559aaab88471d82ceb872d8bbe5aefb5d938e59c4e3aa815f00c1506a85be224a48396f476842e60e2e451fa75fa
 AUX direwolf.service 154 BLAKE2B 1284b0f93085f5e8a8cd8452b86c0ddf4b8abf9c01496bfc8534e3b21f0268acb53c365fbf70b6a1e69fd02e34a78887f65d1374f339d03ddf492faf473a563f SHA512 43a98ebfa7c9fa7c21e4044496ff2f5cddac7c2298253167e6db5a23c849485080444db1ed45c0cdf55e9681b66d9cfc9bfaf830353bee9c71345cb6d0bbd4e8
 DIST direwolf-1.4.tar.gz 17554878 BLAKE2B a8eea6777df93d66d67c993c23eba86f37ff1e23d95df842b17be1a9a0b83c4bb0b7b14b97f43a1756512d060e50136712d1d9d499b2567eabbe1092a2f5edf0 SHA512 597b0652e910642d5a3c538297e4306f9317c29b3629e7fd96cc33b92b2f09d743cea8b8a0cc6451347dc0877fcf1f3933a420ae58e33ad7be7d899f80036eb3
+DIST direwolf-1.5.tar.gz 17996557 BLAKE2B 6860075b764248f1e0ff06e2a533e2e31f65851ea45d74fb0aca11827940c6df0a8bab4b6b78aa98847ee54b2b344d3c5fc8da6947f9113d2fac6d3ea427d68b SHA512 c23e2ccebd47235f76a9583e14cf8e8df299b8f7456a6388534536e7b1114b3d9b9efee43da2c1708e01a0b9534db0ed93314368e20e9002bfcd5b3a2855d8a5
 EBUILD direwolf-1.4.ebuild 1588 BLAKE2B 636e95a3e21fdccde9e0593cb47fd013941d1cdfdda74881cf145e43638359144585e3c99b24c877e45343a3ec0ebfa522694abd8c929a42816688d1a56b0840 SHA512 c66ce7a380bb9a767605094936d3b74269551d1fdf41e5cbad32d534595535019e6918c7616b3a1e0e74439b418364f96e526b4002af79d1eeb48844a7a97431
-MISC metadata.xml 213 BLAKE2B 968a2200bc028093589608429f0d0696f40ab32aa15b97320ea16e0a3769843a69537c5be4c96d6d95f83d49f75a133ef1d1be1419e1e88b86780aa7be036f58 SHA512 82ed61dc8b730a64e8265a7f341fe601880959c39efbd20fb923e980ca88bb07e8e5ed57d8ef677dfd519417fc2b2f5a9a72f91b32eecae6ca15a1a44f0c101c
+EBUILD direwolf-1.5.ebuild 2098 BLAKE2B c9a37621af73c18f4ce33dec0a530b65096fb3016224e35677807e59a3be277ffdfa6b0f5fc056a1cbfbafd71118a56c5cdf23df39d7b0f6abfa5aa8679e2482 SHA512 ceb9e5067d5b00044c713d6a06a806a37c456c5dbade6e3cd5bf41be197b736c08b75982a5d5ac78be0334aa90fc750ceda3c8e5a976dd74bb340121338e12ec
+MISC metadata.xml 404 BLAKE2B 597de8502b1c38246c0bf473f69767d8ba0a9c45942d790718f7065677768f175143d5eb0428baf07697263beb6abc77d0147ee814132ac9ea0863e832fb4122 SHA512 a27e29158ac2305c89b2c64cd08618a9d3f655604ce8ceca49494d7c82e030e0294eaaa70c84c7105768e6d308b57bea336d9f036b64eadd146c765a9697b92c
diff --git a/media-radio/direwolf/direwolf-1.5.ebuild b/media-radio/direwolf/direwolf-1.5.ebuild
new file mode 100644
index 000000000000..deaf27c9ab1d
--- /dev/null
+++ b/media-radio/direwolf/direwolf-1.5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils systemd
+
+DESCRIPTION="Decoded Information from Radio Emissions for Windows Or Linux Fans"
+HOMEPAGE="https://github.com/wb2osz/direwolf/blob/master/README.md"
+SRC_URI="https://github.com/wb2osz/direwolf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gps hamlib udev"
+
+RDEPEND="
+	media-libs/alsa-lib:=
+	gps? ( sci-geosciences/gpsd )
+	hamlib? ( media-libs/hamlib )
+	udev? ( virtual/libudev )
+"
+BDEPEND="hamlib? ( virtual/pkgconfig )"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES.md README.md doc/2400-4800-PSK-for-APRS-Packet-Radio.pdf doc/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf doc/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf doc/A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.pdf doc/APRS-Telemetry-Toolkit.pdf doc/APRStt-Implementation-Notes.pdf doc/APRStt-interface-for-SARTrack.pdf doc/APRStt-Listening-Example.pdf doc/Going-beyond-9600-baud.pdf doc/Raspberry-Pi-APRS.pdf doc/Raspberry-Pi-APRS-Tracker.pdf doc/Raspberry-Pi-SDR-IGate.pdf doc/README.md doc/Successful-APRS-IGate-Operation.pdf doc/User-Guide.pdf doc/WA8LMF-TNC-Test-CD-Results.pdf direwolf.conf dw-start.sh sdr.conf telemetry-toolkit/telem-m0xer-3.txt telemetry-toolkit/telem-balloon.conf telemetry-toolkit/telem-volts.conf )
+
+INSTALLDIR="${D}"
+
+src_prepare() {
+	eapply "${FILESDIR}/${PV}-makefile.patch"
+	eapply "${FILESDIR}/direwolf-gpsd-API-9.patch"
+
+	eapply_user
+
+	if use gps ; then
+		sed -i -e 's/#enable_gpsd/enable_gpsd/' Makefile.linux || die "Sed failed!"
+	fi
+
+	if use hamlib; then
+		sed -i -e 's/#enable_hamlib/enable_hamlib/' Makefile.linux || die "Sed failed!"
+	fi
+
+	if use udev ; then
+		sed -i -e 's/#enable_cm108/enable_cm108/' Makefile.linux || die "Sed failed!"
+	fi
+}
+
+src_install() {
+	dodir /usr
+	dodir /usr/bin
+	keepdir /var/log/direwolf
+	emake DESTDIR="${D}" install
+	insinto /etc/direwolf/
+	doins direwolf.conf
+	einstalldocs
+	systemd_dounit "${FILESDIR}"/direwolf.service
+	systemd_dounit "${FILESDIR}"/direwolf-kiss.service
+}
diff --git a/media-radio/direwolf/files/1.5-makefile.patch b/media-radio/direwolf/files/1.5-makefile.patch
new file mode 100644
index 000000000000..860d57811aa2
--- /dev/null
+++ b/media-radio/direwolf/files/1.5-makefile.patch
@@ -0,0 +1,295 @@
+--- direwolf-1.5/Makefile.linux.orig	2020-09-13 16:24:04.878630130 +0200
++++ direwolf-1.5/Makefile.linux	2020-09-13 16:30:13.744462027 +0200
+@@ -13,7 +13,7 @@
+ 	@echo "        sudo make install"
+ 	@echo " "
+ 
+-CC := gcc
++#CC := gcc
+ 
+ # Just for fun, let's see how clang compares to gcc.  First install like this:
+ #	sudo apt-get update
+@@ -32,7 +32,7 @@
+ # we will inherit options already set in build environment.
+ # Explanation - https://github.com/wb2osz/direwolf/pull/38
+ 
+-CFLAGS += -O3 -pthread -Igeotranz -D_XOPEN_SOURCE=600 -D_DEFAULT_SOURCE=1 -Wall
++CFLAGS += -pthread -Igeotranz -D_XOPEN_SOURCE=600 -D_DEFAULT_SOURCE=1
+ 
+ # That was fine for a recent Ubuntu and Raspbian Jessie.
+ # However, Raspbian wheezy was then missing declaration for strsep and definition of fd_set.
+@@ -97,7 +97,7 @@
+ 
+ arch := $(shell echo | gcc -E -dM - | grep __i386__)
+ ifneq ($(arch),)
+-CFLAGS += -march=pentium3
++#CFLAGS += -march=pentium3
+ endif
+ 
+ 
+@@ -154,7 +154,7 @@
+ 
+ useffast := $(shell gcc --help -v 2>/dev/null | grep ffast-math)
+ ifneq ($(useffast),)
+-CFLAGS += -ffast-math
++#CFLAGS += -ffast-math
+ endif
+ 
+ 
+@@ -217,7 +217,7 @@
+ 
+ neon := $(shell cat /proc/cpuinfo | grep neon)
+ ifneq ($(neon),)
+-CFLAGS += -mfpu=neon
++#CFLAGS += -mfpu=neon
+ endif
+ 
+ 
+@@ -276,7 +276,7 @@
+ # Finding libgps.so* is more difficult because it
+ # is in different places on different operating systems.
+ 
+-enable_gpsd := $(wildcard /usr/include/gps.h)
++#enable_gpsd := 1
+ ifneq ($(enable_gpsd),)
+ CFLAGS += -DENABLE_GPSD
+ LDFLAGS += -lgps
+@@ -285,10 +285,10 @@
+ 
+ # Enable hamlib support if header file is present.
+ 
+-enable_hamlib := $(wildcard /usr/include/hamlib/rig.h /usr/local/include/hamlib/rig.h)
++#enable_hamlib := 1
+ ifneq ($(enable_hamlib),)
+ CFLAGS += -DUSE_HAMLIB
+-LDFLAGS += -lhamlib
++LDFLAGS += $(shell pkg-config --libs hamlib)
+ endif
+ 
+ 
+@@ -304,7 +304,7 @@
+ 
+ # Enable cm108 PTT support if libudev header file is present.
+ 
+-enable_cm108 := $(wildcard /usr/include/libudev.h)
++#enable_cm108 := 1
+ ifneq ($(enable_cm108),)
+ CFLAGS += -DUSE_CM108
+ LDFLAGS += -ludev
+@@ -536,6 +536,7 @@
+ # If not specified on the make command line, this is our default.
+ 
+ DESTDIR ?= /usr/local
++INSTALLDIR ?= $(DESTDIR)/usr/
+ 
+ # However, if you are preparing a "binary" DEB or RPM package, the installation location
+ # would normally be  /usr/...  instead.   In this case, use a command line like this:
+@@ -560,15 +561,15 @@
+ 	@echo '[Desktop Entry]' > $@
+ 	@echo 'Type=Application' >> $@
+ ifneq ($(wildcard /usr/bin/lxterminal),)
+-	@echo "Exec=lxterminal -t \"Dire Wolf\" -e \"$(DESTDIR)/bin/direwolf\"" >> $@
++	@echo "Exec=lxterminal -t \"Dire Wolf\" -e \"$(INSTALLDIR)/bin/direwolf\"" >> $@
+ else ifneq ($(wildcard /usr/bin/lxterm),)
+-	@echo "Exec=lxterm -hold -title \"Dire Wolf\" -bg white -e \"$(DESTDIR)/bin/direwolf\"" >> $@
++	@echo "Exec=lxterm -hold -title \"Dire Wolf\" -bg white -e \"$(INSTALLDIR)/bin/direwolf\"" >> $@
+ else
+-	@echo "Exec=xterm -hold -title \"Dire Wolf\" -bg white -e \"$(DESTDIR)/bin/direwolf\"" >> $@
++	@echo "Exec=xterm -hold -title \"Dire Wolf\" -bg white -e \"$(INSTALLDIR)/bin/direwolf\"" >> $@
+ endif
+ 	@echo 'Name=Dire Wolf' >> $@
+ 	@echo 'Comment=APRS Soundcard TNC' >> $@
+-	@echo 'Icon=$(DESTDIR)/share/direwolf/pixmaps/dw-icon.png' >> $@
++	@echo 'Icon=$(INSTALLDIR)/share/direwolf/pixmaps/dw-icon.png' >> $@
+ 	@echo "Path=$(HOME)" >> $@
+ 	@echo '#Terminal=true' >> $@
+ 	@echo 'Categories=HamRadio' >> $@
+@@ -585,102 +586,104 @@
+ # Applications, not installed with package manager, normally go in /usr/local/bin.
+ # /usr/bin is used instead when installing from .DEB or .RPM package.
+ #
+-	$(INSTALL) -D --mode=755 direwolf $(DESTDIR)/bin/direwolf
+-	$(INSTALL) -D --mode=755 decode_aprs $(DESTDIR)/bin/decode_aprs
+-	$(INSTALL) -D --mode=755 text2tt $(DESTDIR)/bin/text2tt
+-	$(INSTALL) -D --mode=755 tt2text $(DESTDIR)/bin/tt2text
+-	$(INSTALL) -D --mode=755 ll2utm $(DESTDIR)/bin/ll2utm
+-	$(INSTALL) -D --mode=755 utm2ll $(DESTDIR)/bin/utm2ll
+-	$(INSTALL) -D --mode=755 aclients $(DESTDIR)/bin/aclients
+-	$(INSTALL) -D --mode=755 log2gpx $(DESTDIR)/bin/log2gpx
+-	$(INSTALL) -D --mode=755 gen_packets $(DESTDIR)/bin/gen_packets
+-	$(INSTALL) -D --mode=755 atest $(DESTDIR)/bin/atest
+-	$(INSTALL) -D --mode=755 ttcalc $(DESTDIR)/bin/ttcalc
+-	$(INSTALL) -D --mode=755 kissutil $(DESTDIR)/bin/kissutil
+-	$(INSTALL) -D --mode=755 cm108 $(DESTDIR)/bin/cm108
+-	$(INSTALL) -D --mode=755 dwespeak.sh $(DESTDIR)/bin/dwspeak.sh
++	$(INSTALL) -D --mode=755 direwolf $(INSTALLDIR)/bin/direwolf
++	$(INSTALL) -D --mode=755 decode_aprs $(INSTALLDIR)/bin/decode_aprs
++	$(INSTALL) -D --mode=755 text2tt $(INSTALLDIR)/bin/text2tt
++	$(INSTALL) -D --mode=755 tt2text $(INSTALLDIR)/bin/tt2text
++	$(INSTALL) -D --mode=755 ll2utm $(INSTALLDIR)/bin/ll2utm
++	$(INSTALL) -D --mode=755 utm2ll $(INSTALLDIR)/bin/utm2ll
++	$(INSTALL) -D --mode=755 aclients $(INSTALLDIR)/bin/aclients
++	$(INSTALL) -D --mode=755 log2gpx $(INSTALLDIR)/bin/log2gpx
++	$(INSTALL) -D --mode=755 gen_packets $(INSTALLDIR)/bin/gen_packets
++	$(INSTALL) -D --mode=755 atest $(INSTALLDIR)/bin/atest
++	$(INSTALL) -D --mode=755 ttcalc $(INSTALLDIR)/bin/ttcalc
++	$(INSTALL) -D --mode=755 kissutil $(INSTALLDIR)/bin/kissutil
++	$(INSTALL) -D --mode=755 cm108 $(INSTALLDIR)/bin/cm108
++	$(INSTALL) -D --mode=755 dwespeak.sh $(INSTALLDIR)/bin/dwspeak.sh
+ #
+ # Telemetry Toolkit executables.   Other .conf and .txt files will go into doc directory.
+ #
+-	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-balloon.pl $(DESTDIR)/bin/telem-balloon.pl
+-	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-bits.pl $(DESTDIR)/bin/telem-bits.pl
+-	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-data.pl $(DESTDIR)/bin/telem-data.pl
+-	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-data91.pl $(DESTDIR)/bin/telem-data91.pl
+-	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-eqns.pl $(DESTDIR)/bin/telem-eqns.pl
+-	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-parm.pl $(DESTDIR)/bin/telem-parm.pl
+-	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-seq.sh $(DESTDIR)/bin/telem-seq.sh
+-	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-unit.pl $(DESTDIR)/bin/telem-unit.pl
+-	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-volts.py $(DESTDIR)/bin/telem-volts.py
++	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-balloon.pl $(INSTALLDIR)/bin/telem-balloon.pl
++	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-bits.pl $(INSTALLDIR)/bin/telem-bits.pl
++	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-data.pl $(INSTALLDIR)/bin/telem-data.pl
++	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-data91.pl $(INSTALLDIR)/bin/telem-data91.pl
++	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-eqns.pl $(INSTALLDIR)/bin/telem-eqns.pl
++	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-parm.pl $(INSTALLDIR)/bin/telem-parm.pl
++	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-seq.sh $(INSTALLDIR)/bin/telem-seq.sh
++	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-unit.pl $(INSTALLDIR)/bin/telem-unit.pl
++	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-volts.py $(INSTALLDIR)/bin/telem-volts.py
+ #
+ # Misc. data such as "tocall" to system mapping.
+ #
+-	$(INSTALL) -D --mode=644 tocalls.txt $(DESTDIR)/share/direwolf/tocalls.txt
+-	$(INSTALL) -D --mode=644 symbols-new.txt $(DESTDIR)/share/direwolf/symbols-new.txt
+-	$(INSTALL) -D --mode=644 symbolsX.txt $(DESTDIR)/share/direwolf/symbolsX.txt
++	$(INSTALL) -D --mode=644 tocalls.txt $(INSTALLDIR)/share/direwolf/tocalls.txt
++	$(INSTALL) -D --mode=644 symbols-new.txt $(INSTALLDIR)/share/direwolf/symbols-new.txt
++	$(INSTALL) -D --mode=644 symbolsX.txt $(INSTALLDIR)/share/direwolf/symbolsX.txt
+ #
+ # For desktop icon.
+ #
+-	$(INSTALL) -D --mode=644 dw-icon.png $(DESTDIR)/share/direwolf/pixmaps/dw-icon.png
+-	$(INSTALL) -D --mode=644 direwolf.desktop $(DESTDIR)/share/applications/direwolf.desktop
++	$(INSTALL) -D --mode=644 dw-icon.png $(INSTALLDIR)/share/direwolf/pixmaps/dw-icon.png
++	$(INSTALL) -D --mode=644 direwolf.desktop $(INSTALLDIR)/share/applications/direwolf.desktop
+ #
+ # Documentation.  Various plain text files and PDF.
+ #
+-	$(INSTALL) -D --mode=644 CHANGES.md $(DESTDIR)/share/doc/direwolf/CHANGES.md
+-	$(INSTALL) -D --mode=644 LICENSE-dire-wolf.txt $(DESTDIR)/share/doc/direwolf/LICENSE-dire-wolf.txt
+-	$(INSTALL) -D --mode=644 LICENSE-other.txt $(DESTDIR)/share/doc/direwolf/LICENSE-other.txt
++	$(INSTALL) -D --mode=644 CHANGES.md $(INSTALLDIR)/share/doc/direwolf-$(PV)/CHANGES.md
++	$(INSTALL) -D --mode=644 LICENSE-dire-wolf.txt $(INSTALLDIR)/share/doc/direwolf-$(PV)/LICENSE-dire-wolf.txt
++	$(INSTALL) -D --mode=644 LICENSE-other.txt $(INSTALLDIR)/share/doc/direwolf-$(PV)/LICENSE-other.txt
+ #
+ # ./README.md is an overview for the project main page.
+ # Maybe we could stick it in some other place.
+ # doc/README.md contains an overview of the PDF file contents and is more useful here.
+ #
+-	$(INSTALL) -D --mode=644 doc/README.md $(DESTDIR)/share/doc/direwolf/README.md
+-	$(INSTALL) -D --mode=644 doc/2400-4800-PSK-for-APRS-Packet-Radio.pdf $(DESTDIR)/share/doc/direwolf/2400-4800-PSK-for-APRS-Packet-Radio.pdf
+-	$(INSTALL) -D --mode=644 doc/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf $(DESTDIR)/share/doc/direwolf/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf
+-	$(INSTALL) -D --mode=644 doc/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf $(DESTDIR)/share/doc/direwolf/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf
+-	$(INSTALL) -D --mode=644 doc/A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.pdf $(DESTDIR)/share/doc/direwolf/A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.pdf
+-	$(INSTALL) -D --mode=644 doc/APRS-Telemetry-Toolkit.pdf $(DESTDIR)/share/doc/direwolf/APRS-Telemetry-Toolkit.pdf
+-	$(INSTALL) -D --mode=644 doc/APRStt-Implementation-Notes.pdf $(DESTDIR)/share/doc/direwolf/APRStt-Implementation-Notes.pdf
+-	$(INSTALL) -D --mode=644 doc/APRStt-interface-for-SARTrack.pdf $(DESTDIR)/share/doc/direwolf/APRStt-interface-for-SARTrack.pdf
+-	$(INSTALL) -D --mode=644 doc/APRStt-Listening-Example.pdf $(DESTDIR)/share/doc/direwolf/APRStt-Listening-Example.pdf
+-	$(INSTALL) -D --mode=644 doc/Bluetooth-KISS-TNC.pdf $(DESTDIR)/share/doc/direwolf/Bluetooth-KISS-TNC.pdf
+-	$(INSTALL) -D --mode=644 doc/Going-beyond-9600-baud.pdf $(DESTDIR)/share/doc/direwolf/Going-beyond-9600-baud.pdf
+-	$(INSTALL) -D --mode=644 doc/Raspberry-Pi-APRS.pdf $(DESTDIR)/share/doc/direwolf/Raspberry-Pi-APRS.pdf
+-	$(INSTALL) -D --mode=644 doc/Raspberry-Pi-APRS-Tracker.pdf $(DESTDIR)/share/doc/direwolf/Raspberry-Pi-APRS-Tracker.pdf
+-	$(INSTALL) -D --mode=644 doc/Raspberry-Pi-SDR-IGate.pdf $(DESTDIR)/share/doc/direwolf/Raspberry-Pi-SDR-IGate.pdf
+-	$(INSTALL) -D --mode=644 doc/Successful-APRS-IGate-Operation.pdf $(DESTDIR)/share/doc/direwolf/Successful-APRS-IGate-Operation.pdf
+-	$(INSTALL) -D --mode=644 doc/User-Guide.pdf $(DESTDIR)/share/doc/direwolf/User-Guide.pdf
+-	$(INSTALL) -D --mode=644 doc/WA8LMF-TNC-Test-CD-Results.pdf $(DESTDIR)/share/doc/direwolf/WA8LMF-TNC-Test-CD-Results.pdf
++	$(INSTALL) -D --mode=644 doc/README.md $(INSTALLDIR)/share/doc/direwolf-$(PV)/README.md
++	$(INSTALL) -D --mode=644 doc/2400-4800-PSK-for-APRS-Packet-Radio.pdf $(INSTALLDIR)/share/doc/direwolf-$(PV)/2400-4800-PSK-for-APRS-Packet-Radio.pdf
++	$(INSTALL) -D --mode=644 doc/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf $(INSTALLDIR)/share/doc/direwolf-$(PV)/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf
++	$(INSTALL) -D --mode=644 doc/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf $(INSTALLDIR)/share/doc/direwolf-$(PV)/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf
++	$(INSTALL) -D --mode=644 doc/A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.pdf $(INSTALLDIR)/share/doc/direwolf-$(PV)/A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.pdf
++	$(INSTALL) -D --mode=644 doc/APRS-Telemetry-Toolkit.pdf $(INSTALLDIR)/share/doc/direwolf-$(PV)/APRS-Telemetry-Toolkit.pdf
++	$(INSTALL) -D --mode=644 doc/APRStt-Implementation-Notes.pdf $(INSTALLDIR)/share/doc/direwolf-$(PV)/APRStt-Implementation-Notes.pdf
++	$(INSTALL) -D --mode=644 doc/APRStt-interface-for-SARTrack.pdf $(INSTALLDIR)/share/doc/direwolf-$(PV)/APRStt-interface-for-SARTrack.pdf
++	$(INSTALL) -D --mode=644 doc/APRStt-Listening-Example.pdf $(INSTALLDIR)/share/doc/direwolf-$(PV)/APRStt-Listening-Example.pdf
++	$(INSTALL) -D --mode=644 doc/Bluetooth-KISS-TNC.pdf $(INSTALLDIR)/share/doc/direwolf-$(PV)/Bluetooth-KISS-TNC.pdf
++	$(INSTALL) -D --mode=644 doc/Going-beyond-9600-baud.pdf $(INSTALLDIR)/share/doc/direwolf-$(PV)/Going-beyond-9600-baud.pdf
++	$(INSTALL) -D --mode=644 doc/Raspberry-Pi-APRS.pdf $(INSTALLDIR)/share/doc/direwolf-$(PV)/Raspberry-Pi-APRS.pdf
++	$(INSTALL) -D --mode=644 doc/Raspberry-Pi-APRS-Tracker.pdf $(INSTALLDIR)/share/doc/direwolf-$(PV)/Raspberry-Pi-APRS-Tracker.pdf
++	$(INSTALL) -D --mode=644 doc/Raspberry-Pi-SDR-IGate.pdf $(INSTALLDIR)/share/doc/direwolf-$(PV)/Raspberry-Pi-SDR-IGate.pdf
++	$(INSTALL) -D --mode=644 doc/Successful-APRS-IGate-Operation.pdf $(INSTALLDIR)/share/doc/direwolf-$(PV)/Successful-APRS-IGate-Operation.pdf
++	$(INSTALL) -D --mode=644 doc/User-Guide.pdf $(INSTALLDIR)/share/doc/direwolf-$(PV)/User-Guide.pdf
++	$(INSTALL) -D --mode=644 doc/WA8LMF-TNC-Test-CD-Results.pdf $(INSTALLDIR)/share/doc/direwolf-$(PV)/WA8LMF-TNC-Test-CD-Results.pdf
+ #
+ # Various sample config and other files go into examples under the doc directory.
+ # When building from source, these can be put in home directory with "make install-conf".
+ # When installed from .DEB or .RPM package, the user will need to copy these to
+ # the home directory or other desired location.
+ #
+-	$(INSTALL) -D --mode=644 direwolf.conf $(DESTDIR)/share/doc/direwolf/examples/direwolf.conf
+-	$(INSTALL) -D --mode=755 dw-start.sh $(DESTDIR)/share/doc/direwolf/examples/dw-start.sh
+-	$(INSTALL) -D --mode=644 sdr.conf $(DESTDIR)/share/doc/direwolf/examples/sdr.conf
+-	$(INSTALL) -D --mode=644 telemetry-toolkit/telem-m0xer-3.txt $(DESTDIR)/share/doc/direwolf/examples/telem-m0xer-3.txt
+-	$(INSTALL) -D --mode=644 telemetry-toolkit/telem-balloon.conf $(DESTDIR)/share/doc/direwolf/examples/telem-balloon.conf
+-	$(INSTALL) -D --mode=644 telemetry-toolkit/telem-volts.conf $(DESTDIR)/share/doc/direwolf/examples/telem-volts.conf
++	$(INSTALL) -D --mode=644 direwolf.conf $(INSTALLDIR)/share/doc/direwolf-$(PV)/examples/direwolf.conf
++	$(INSTALL) -D --mode=755 dw-start.sh $(INSTALLDIR)/share/doc/direwolf-$(PV)/examples/dw-start.sh
++	$(INSTALL) -D --mode=644 sdr.conf $(INSTALLDIR)/share/doc/direwolf-$(PV)/examples/sdr.conf
++	$(INSTALL) -D --mode=644 telemetry-toolkit/telem-m0xer-3.txt $(INSTALLDIR)/share/doc/direwolf-$(PV)/examples/telem-m0xer-3.txt
++	$(INSTALL) -D --mode=644 telemetry-toolkit/telem-balloon.conf $(INSTALLDIR)/share/doc/direwolf-$(PV)/examples/telem-balloon.conf
++	$(INSTALL) -D --mode=644 telemetry-toolkit/telem-volts.conf $(INSTALLDIR)/share/doc/direwolf-$(PV)/examples/telem-volts.conf
+ #
+ # "man" pages
+ #
+-	$(INSTALL) -D --mode=644 man1/aclients.1 $(DESTDIR)/share/man/man1/aclients.1
+-	$(INSTALL) -D --mode=644 man1/atest.1 $(DESTDIR)/share/man/man1/atest.1
+-	$(INSTALL) -D --mode=644 man1/decode_aprs.1 $(DESTDIR)/share/man/man1/decode_aprs.1
+-	$(INSTALL) -D --mode=644 man1/direwolf.1 $(DESTDIR)/share/man/man1/direwolf.1
+-	$(INSTALL) -D --mode=644 man1/gen_packets.1 $(DESTDIR)/share/man/man1/gen_packets.1
+-	$(INSTALL) -D --mode=644 man1/kissutil.1 $(DESTDIR)/share/man/man1/kissutil.1
+-	$(INSTALL) -D --mode=644 man1/ll2utm.1 $(DESTDIR)/share/man/man1/ll2utm.1
+-	$(INSTALL) -D --mode=644 man1/log2gpx.1 $(DESTDIR)/share/man/man1/log2gpx.1
+-	$(INSTALL) -D --mode=644 man1/text2tt.1 $(DESTDIR)/share/man/man1/text2tt.1
+-	$(INSTALL) -D --mode=644 man1/tt2text.1 $(DESTDIR)/share/man/man1/tt2text.1
+-	$(INSTALL) -D --mode=644 man1/utm2ll.1 $(DESTDIR)/share/man/man1/utm2ll.1
++	$(INSTALL) -D --mode=644 man1/aclients.1 $(INSTALLDIR)/share/man/man1/aclients.1
++	$(INSTALL) -D --mode=644 man1/atest.1 $(INSTALLDIR)/share/man/man1/atest.1
++	$(INSTALL) -D --mode=644 man1/decode_aprs.1 $(INSTALLDIR)/share/man/man1/decode_aprs.1
++	$(INSTALL) -D --mode=644 man1/direwolf.1 $(INSTALLDIR)/share/man/man1/direwolf.1
++	$(INSTALL) -D --mode=644 man1/gen_packets.1 $(INSTALLDIR)/share/man/man1/gen_packets.1
++	$(INSTALL) -D --mode=644 man1/kissutil.1 $(INSTALLDIR)/share/man/man1/kissutil.1
++	$(INSTALL) -D --mode=644 man1/ll2utm.1 $(INSTALLDIR)/share/man/man1/ll2utm.1
++	$(INSTALL) -D --mode=644 man1/log2gpx.1 $(INSTALLDIR)/share/man/man1/log2gpx.1
++	$(INSTALL) -D --mode=644 man1/text2tt.1 $(INSTALLDIR)/share/man/man1/text2tt.1
++	$(INSTALL) -D --mode=644 man1/tt2text.1 $(INSTALLDIR)/share/man/man1/tt2text.1
++	$(INSTALL) -D --mode=644 man1/utm2ll.1 $(INSTALLDIR)/share/man/man1/utm2ll.1
+ #
+ # Set group and mode of HID devices corresponding to C-Media USB Audio adapters.
+ # This will allow us to use the CM108/CM119 GPIO pins for PTT.
+ #
+-	$(INSTALL) -D --mode=644 99-direwolf-cmedia.rules /etc/udev/rules.d/99-direwolf-cmedia.rules
++ifneq ($(enable_cm108),)
++	$(INSTALL) -D --mode=644 99-direwolf-cmedia.rules $(DESTDIR)/lib/udev/rules.d/99-direwolf-cmedia.rules
++endif
+ #
+ 	@echo " "
+ 	@echo "If this is your first install, not an upgrade, type this to put a copy"
+@@ -693,7 +696,7 @@
+ # Put sample configuration & startup files in home directory.
+ # This step would be done as ordinary user.
+ # Some people like to put the direwolf config file in /etc/ax25.
+-# Note that all of these are also in $(DESTDIR)/share/doc/direwolf/examples/.
++# Note that all of these are also in $(INSTALLDIR)/share/doc/direwolf/examples/.
+ 
+ # The Raspberry Pi has ~/Desktop but Ubuntu does not.
+ 
+@@ -724,7 +727,7 @@
+ 
+ .PHONY: install-rpi
+ install-rpi : 
+-	ln -f -s $(DESTDIR)/share/applications/direwolf.desktop ~/Desktop/direwolf.desktop
++	ln -f -s $(INSTALLDIR)/share/applications/direwolf.desktop ~/Desktop/direwolf.desktop
+ 
+ 
+ 
diff --git a/media-radio/direwolf/files/direwolf-gpsd-API-9.patch b/media-radio/direwolf/files/direwolf-gpsd-API-9.patch
new file mode 100644
index 000000000000..ffaf84dee568
--- /dev/null
+++ b/media-radio/direwolf/files/direwolf-gpsd-API-9.patch
@@ -0,0 +1,213 @@
+--- direwolf-1.5/dwgpsd.orig.c	2020-09-13 13:25:07.294828708 +0200
++++ direwolf-1.5/dwgpsd.c	2020-09-13 13:26:48.957086728 +0200
+@@ -1,7 +1,7 @@
+ //
+ //    This file is part of Dire Wolf, an amateur radio packet TNC.
+ //
+-//    Copyright (C) 2013, 2014, 2015  John Langner, WB2OSZ
++//    Copyright (C) 2013, 2014, 2015, 2020  John Langner, WB2OSZ
+ //
+ //    This program is free software: you can redistribute it and/or modify
+ //    it under the terms of the GNU General Public License as published by
+@@ -54,10 +54,10 @@
+ 
+ #include <gps.h>
+ 
+-// Debian bug report:  direwolf (1.2-1) FTBFS with libgps22 as part of the gpsd transition (#803605):
+-// dwgps.c claims to only support GPSD_API_MAJOR_VERSION 5, but also builds successfully with
+-// GPSD_API_MAJOR_VERSION 6 provided by libgps22 when the attached patch is applied.
+-#if GPSD_API_MAJOR_VERSION < 5 || GPSD_API_MAJOR_VERSION > 6
++// An incompatibility was introduced with version 7
++// and again with 9 and again with 10.
++
++#if GPSD_API_MAJOR_VERSION < 5 || GPSD_API_MAJOR_VERSION > 10
+ #error libgps API version might be incompatible.
+ #endif
+ 
+@@ -112,7 +112,7 @@
+  *		  shared region via dwgps_put_data.
+  *
+  * 		The application calls dwgps_read to get the most 
+- 8		recent information.			
++ *		recent information.			
+  *
+  *--------------------------------------------------------------------*/
+ 
+@@ -122,7 +122,7 @@
+  * Originally, I wanted to use the shared memory interface to gpsd
+  * because it is simpler and more efficient.  Just access it when we
+  * actually need the data and we don't have a lot of extra unnecessary
+- * busy work going on.
++ * busy work going on constantly polling it when we don't need the information.
+  *
+  * The current version of gpsd, supplied with Raspian (Wheezy), is 3.6 from back in 
+  * May 2012, is missing support for the shared memory interface.  
+@@ -138,13 +138,28 @@
+  * 	cd gpsd-3.11
+  * 	scons prefix=/usr libdir=lib/arm-linux-gnueabihf shm_export=True python=False
+  * 	sudo scons udev-install
+- * 
++ *
+  * For now, we will use the socket interface.  Maybe get back to this again someday.
+  *
+  * Update:  January 2016.
+  *
+  *	I'm told that the shared memory interface might work in Raspian, Jessie version.
+  *	Haven't tried it yet.
++ *
++ * June 2020:  This is how to build the most recent.
++ *
++ * 	Based on https://www.satsignal.eu/raspberry-pi/UpdatingGPSD.html
++ *
++ * 	git clone https://gitlab.com/gpsd/gpsd.git  gpsd-gitlab
++ * 	cd gpsd-gitlab
++ * 	scons --config=force
++ * 	scons
++ * 	sudo scons install
++ *
++ *	The problem we have here is that the library is put in /usr/local/lib and direwolf
++ *	can't find it there.  Solution  is to define environment variable:
++ *
++ *	export LD_LIBRARY_PATH=/use/local/lib
+  */
+ 
+ 
+@@ -228,7 +243,7 @@
+  *
+  *--------------------------------------------------------------------*/
+ 
+-#define TIMEOUT 30
++#define TIMEOUT 15
+ 
+ #if ENABLE_GPSD
+ 
+@@ -251,13 +266,34 @@
+ 
+ 	while (1) {
+ 
++// Example code found here:
++// https://lists.nongnu.org/archive/html/gpsd-dev/2017-11/msg00001.html
++
+           if ( ! gps_waiting(&gpsdata, TIMEOUT * 1000000)) {
+ 	    text_color_set(DW_COLOR_ERROR);
+-	    dw_printf ("GPSD: Timeout waiting for GPS data.\n");
+-	    /* Fall thru to read which should get error and bail out. */
++	    dw_printf ("------------------------------------------\n");
++	    dw_printf ("dwgpsd: Timeout waiting for GPS data.\n");
++	    dw_printf ("Is GPSD daemon running?\n");
++	    dw_printf ("Troubleshooting tip:  Try running cgps or xgps.\n");
++	    dw_printf ("------------------------------------------\n");
++	    info.fix = DWFIX_ERROR;
++	    SLEEP_MS(5000);
++	    continue;
+ 	  }
+ 
++// https://github.com/wb2osz/direwolf/issues/196
++// https://bugzilla.redhat.com/show_bug.cgi?id=1674812
++
++// gps_read has two new parameters in API version 7.
++// It looks like this could be used to obtain the JSON message from the daemon.
++// Specify NULL, instead of message buffer space, if this is not desired.
++// Why couldn't they add a new function instead of introducing incompatibility?
++
++#if GPSD_API_MAJOR_VERSION >= 7
++	  if (gps_read (&gpsdata, NULL, 0) == -1) {
++#else
+ 	  if (gps_read (&gpsdata) == -1) {
++#endif
+ 	    text_color_set(DW_COLOR_ERROR);
+ 
+ 	    dw_printf ("------------------------------------------\n");
+@@ -274,16 +310,47 @@
+ 	    break;   // Jump out of loop and terminate thread.
+ 	  }
+ 
++#if GPSD_API_MAJOR_VERSION >= 9
++
++// The gps.h revision history says:
++//	 *       mark altitude in gps_fix_t as deprecated and undefined
++// This seems really stupid to me.
++// If it is deprecated and undefined then take it out.  Someone trying to use
++// it would get a compile error and know that something needs to be done.
++// Instead we all just go merrily on our way using a field that is [allegedly] undefined.
++// Why not simply add more variables with different definitions of altitude
++// and keep the original variable working as it always did?
++// If it is truly undefined, as the comment would have us believe, numerous
++// people will WASTE VAST AMOUNTS OF TIME pondering why altitude is now broken in
++// their applications.
++
++#define stupid_altitude altMSL
++#else
++#define stupid_altitude altitude
++#endif
++
++#if GPSD_API_MAJOR_VERSION >= 10
++
++// They did it again.  Whimsical incompatibilities that cause
++// pain and aggravation for everyone trying to use this library.
++//
++//	error: ‘struct gps_data_t’ has no member named ‘status’
++//
++// Yes, I can understand that it is a more logical place but it breaks
++// all existing code that uses this.
++// I'm really getting annoyed about wasting so much time on keeping up with all
++// of these incompatibilities that are completely unnecessary.
++
++#define stupid_status fix.status
++#else
++#define stupid_status status
++#endif
++
++	  // Inform user about change in fix status.
++
+ 	  switch (gpsdata.fix.mode) {
+ 	    default:
+ 	    case MODE_NOT_SEEN:
+-	      if (info.fix >= DWFIX_2D) {
+-		text_color_set(DW_COLOR_INFO);
+-	        dw_printf ("GPSD: Lost location fix.\n");
+-	      }
+-	      info.fix = DWFIX_NOT_SEEN;
+-	      break;
+-
+ 	    case MODE_NO_FIX:
+ 	      if (info.fix >= DWFIX_2D) {
+ 		text_color_set(DW_COLOR_INFO);
+@@ -309,11 +376,7 @@
+ 	      break;
+ 	  }
+ 
+-	    /* Data is available. */
+-	    // TODO:  what is gpsdata.status?
+-
+-
+-	  if (gpsdata.status >= STATUS_FIX && gpsdata.fix.mode >= MODE_2D) {
++	  if (gpsdata.stupid_status >= STATUS_FIX && gpsdata.fix.mode >= MODE_2D) {
+ 
+ 	    info.dlat = isnan(gpsdata.fix.latitude) ? G_UNKNOWN : gpsdata.fix.latitude;
+ 	    info.dlon = isnan(gpsdata.fix.longitude) ? G_UNKNOWN : gpsdata.fix.longitude;
+@@ -321,9 +384,15 @@
+ 	    info.speed_knots = isnan(gpsdata.fix.speed) ? G_UNKNOWN : (MPS_TO_KNOTS * gpsdata.fix.speed);
+ 
+ 	    if (gpsdata.fix.mode >= MODE_3D) {
+-	      info.altitude = isnan(gpsdata.fix.altitude) ? G_UNKNOWN : gpsdata.fix.altitude;
++	      info.altitude = isnan(gpsdata.fix.stupid_altitude) ? G_UNKNOWN : gpsdata.fix.stupid_altitude;
+ 	    }
+ 	  }
++	  else {
++	    // Keep the last known location.
++	    // Using info.fix, the caller knows if the location is current (DWFIX_[23]D),
++	    // last known (DWFIX_NONE), or never known (DWFIX_NOT_SEEN).
++	    info.fix = DWFIX_NO_FIX;
++	  }
+ 
+ 	  info.timestamp = time(NULL);
+ 	  if (s_debug >= 2) {
+@@ -357,6 +426,7 @@
+ 
+ #if ENABLE_GPSD
+ 
++	gps_stream (&gpsdata, WATCH_DISABLE, NULL);
+ 	gps_close (&gpsdata);
+ 
+ #endif
diff --git a/media-radio/direwolf/metadata.xml b/media-radio/direwolf/metadata.xml
index b9c6cabfa90c..b2d8ba721f3d 100644
--- a/media-radio/direwolf/metadata.xml
+++ b/media-radio/direwolf/metadata.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>rich0@gentoo.org</email>
-</maintainer>
+	<maintainer type="person">
+		<email>rich0@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="hamlib">Enables support by the Hamlib amateur radio rig control library</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">wb2osz/direwolf</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-radio/fldigi/Manifest b/media-radio/fldigi/Manifest
index 576d79bc1725..4175a402753f 100644
--- a/media-radio/fldigi/Manifest
+++ b/media-radio/fldigi/Manifest
@@ -1,6 +1,8 @@
 AUX fldigi-c++11.patch 1140 BLAKE2B 987d33126e80340d7687cc1e346a8cc8b5701c9f6a4259357c08c8ab828eb71d871e1bb70652f4d35a57243fbb0738db2c59717a822f178bf2c7afb960305c42 SHA512 a2399caf67947b129d32563d3deb0f209f0814e39ea48ea46f664bacf7b64a2639f9c237889004af45df6553ef5668ec9d5c389d3ea7a6fb9922f54654bcc9ee
 DIST fldigi-4.1.12.tar.gz 4790381 BLAKE2B 8be45c87bce298f91cb3975c8fe348b8ef39ea5ffe5eb719df496c075aa0773f8bf9b139312ea809057f926ffd27087fd41d350342f0f8ac198800a65178f367 SHA512 f74fd5915119d9d04a54260268d1dcd753ca50b48b388d2cc86a6ac2534ce0a0b1595124415b9aa19e518e58344a993510f5e9817f7893814821ebd3df7fa5ae
 DIST fldigi-4.1.14.tar.gz 4792805 BLAKE2B 2f910c9eabb22dcc31e03fcebd5088edff9db128ab59ada553a3cd1016864a326204b7a082d1310c45ea682ed9264038e7e59a19ba68cf4ff5a30443b8033cd5 SHA512 b96a9d724087bacad93b6e729039ab67231ee6ebbd1b082c143e7bfb58f103012f98448f3ea0badabeeb748ed81d6d44e503b71bcb5ee6d0fa8108ab6d029d8d
+DIST fldigi-4.1.15.tar.gz 4838204 BLAKE2B 3eab05ba366457fe3b1452cca37b262ba07414619c36781512ae1063e87c764a2bd562f3b7ad4733d885835df778b9ba11eb6470aa84d99ad9f9b3e1ef3675c3 SHA512 6579b557c9ce7e878f1ba7e6f59e0f676b1baddff78a94bd4b76925204e9b5a871da3080c4c13122781cb2e77311f61e15c03c82fbdd34a845051093070e9ab0
 EBUILD fldigi-4.1.12.ebuild 1288 BLAKE2B ec1418efca40ed21851d84bb2095588a2b4c3cd98eaa199777694638ceab6c69e5fbcfc3162b250d419bc0f57ec8cc08954fabf644402537e38faaf0025f1e98 SHA512 29903bbc6e4d60957c1f6849e335ba562d8cc58d790d6fa6e605f9be88e778871b03a57c60a2ee8c7cfd11e859625a73d6aeda01f078e734016d82ddd6d49a8a
-EBUILD fldigi-4.1.14.ebuild 1290 BLAKE2B 545cc510b01cf7ba73c01b59ba77865e5f533866b32942215b068b567ba064a5d881739ccef95417a75c12cd7489eab8aa472faf176bf9b41623c099c448e03e SHA512 e93c4d87b94e762a114e7e766791a1d8aaa8cfb2d80011ba2e28597a273435f4ef06c083eba0e8b8eea4e962b84c3cdd2b02e7910f818244f8c3258cb368cdb2
+EBUILD fldigi-4.1.14.ebuild 1288 BLAKE2B ec1418efca40ed21851d84bb2095588a2b4c3cd98eaa199777694638ceab6c69e5fbcfc3162b250d419bc0f57ec8cc08954fabf644402537e38faaf0025f1e98 SHA512 29903bbc6e4d60957c1f6849e335ba562d8cc58d790d6fa6e605f9be88e778871b03a57c60a2ee8c7cfd11e859625a73d6aeda01f078e734016d82ddd6d49a8a
+EBUILD fldigi-4.1.15.ebuild 1290 BLAKE2B 545cc510b01cf7ba73c01b59ba77865e5f533866b32942215b068b567ba064a5d881739ccef95417a75c12cd7489eab8aa472faf176bf9b41623c099c448e03e SHA512 e93c4d87b94e762a114e7e766791a1d8aaa8cfb2d80011ba2e28597a273435f4ef06c083eba0e8b8eea4e962b84c3cdd2b02e7910f818244f8c3258cb368cdb2
 MISC metadata.xml 495 BLAKE2B 9c6f1b29ffb13a553b74ded93c11d29ffdc5a02336adb8fef55b862800a1856e712cdcb06c4e7d90858712d43aafce79f6cf9a357dc0a3c3ca0fc5cdb0ff770e SHA512 fdd9bc3f065ccb354ed0ad5c6544ca70f2011828870b942f2bf2f7001bf1342f858d60a6031cf005623795d1f1d2ccbc3a42fb54dcbd465c3c73f29a928d9091
diff --git a/media-radio/fldigi/fldigi-4.1.14.ebuild b/media-radio/fldigi/fldigi-4.1.14.ebuild
index 7ded0b14db4c..2ce4f991e275 100644
--- a/media-radio/fldigi/fldigi-4.1.14.ebuild
+++ b/media-radio/fldigi/fldigi-4.1.14.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="hamlib nls pulseaudio"
 IUSE_CPU_FLAGS=" sse sse2 sse3"
 IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}"
diff --git a/media-radio/fldigi/fldigi-4.1.15.ebuild b/media-radio/fldigi/fldigi-4.1.15.ebuild
new file mode 100644
index 000000000000..7ded0b14db4c
--- /dev/null
+++ b/media-radio/fldigi/fldigi-4.1.15.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
+HOMEPAGE="http://www.w1hkj.com"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="hamlib nls pulseaudio"
+IUSE_CPU_FLAGS=" sse sse2 sse3"
+IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}"
+
+RDEPEND="x11-libs/fltk:1[threads,xft]
+	media-libs/libsamplerate
+	media-libs/libpng:0
+	x11-misc/xdg-utils
+	dev-perl/RPC-XML
+	dev-perl/Term-ReadLine-Perl
+	|| (
+		media-libs/portaudio[oss]
+		media-libs/portaudio[alsa]
+	)
+	hamlib? ( media-libs/hamlib )
+	pulseaudio? ( media-sound/pulseaudio )
+	>=media-libs/libsndfile-1.0.10"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+PATCHES=( "$FILESDIR"/$PN-c++11.patch )
+
+src_configure() {
+	local myconf=""
+
+	use cpu_flags_x86_sse && myconf="${myconf} --enable-optimizations=sse"
+	use cpu_flags_x86_sse2 && myconf="${myconf} --enable-optimizations=sse2"
+	use cpu_flags_x86_sse3 && myconf="${myconf} --enable-optimizations=sse3"
+
+	econf ${myconf} \
+		--with-sndfile \
+		$(use_with hamlib) \
+		$(use_enable nls) \
+		$(use_with pulseaudio) \
+		--without-asciidoc
+}
diff --git a/media-radio/flmsg/Manifest b/media-radio/flmsg/Manifest
index dcce44418a85..8d1e5417d190 100644
--- a/media-radio/flmsg/Manifest
+++ b/media-radio/flmsg/Manifest
@@ -1,5 +1,7 @@
 DIST flmsg-4.0.14.tar.gz 874399 BLAKE2B 8daa939a1ddc52d0469ba23908a51ac3e873c93daeadea6d1b6fcd7136850db63719eb0409001a6de6c49cd71ed1be3392e17d7a128a58784185b2b8c6bb6d3c SHA512 367c881007a393c3aa6d9f4bc760717caed1681bd4479b8d7b54246c90bdaf023d60cbde92c538059fcf275ea09bbc47e49052dab3608c5e7d43830f9e573a85
+DIST flmsg-4.0.17.tar.gz 876560 BLAKE2B 553a8b71c490abdff99e2b3dbd51ba14cf6f97bbe8aed289c7efcfcdd84abfb9039a75639a377a6ff558566e8226be00643988bbc731c111fa52733810d284f5 SHA512 94abe4927c5bc8a5358d592cef55fbaba6207250798d45f8096ff1f290926a280b53db99ddf1c72a6ff30cbc58d95f639777e0d30a15b70ba8d3209664e22966
 DIST flmsg-4.0.3.tar.gz 898185 BLAKE2B 7a1b80a07b2eaa4d094ff956102bb659cffc9ad88e3a2daf5650805c9995a54383d1f296b1b0dbaca341e8087eacccf71943a3745b1bb75c8fd2a5f4d8cee227 SHA512 afc4e8ab40d05e6cdc6ecd86b1b3348be46a8251dbd88635316fbbf4592f9959022d0f757b9283849676fa6a4467d035568302e785017b55bafdcd99f2a2d326
 EBUILD flmsg-4.0.14.ebuild 472 BLAKE2B d4207f091e834e872b98ae473818fa65aba95d7f470dcccceb84c7f9ea67b14db43c69cc7da5b280158b5df2f6b759f5187f9fb206395f8140879cbd34b567bd SHA512 ca854d854539f4ce47c6b8a625d9e14bc099efbde542a9c5d83d3963eae2021be63bcb1433895f027e7117d14a52d582d722e4e0f82141832b016e745fa12c42
+EBUILD flmsg-4.0.17.ebuild 472 BLAKE2B d4207f091e834e872b98ae473818fa65aba95d7f470dcccceb84c7f9ea67b14db43c69cc7da5b280158b5df2f6b759f5187f9fb206395f8140879cbd34b567bd SHA512 ca854d854539f4ce47c6b8a625d9e14bc099efbde542a9c5d83d3963eae2021be63bcb1433895f027e7117d14a52d582d722e4e0f82141832b016e745fa12c42
 EBUILD flmsg-4.0.3.ebuild 475 BLAKE2B 9bad76328e1e942c37dbf176cdc712367c588da936b3acb67d97a12fe208dd08cfb17769e87d1b59374e22a978e8174a7b2c1f59d5ab78d2c3e0d588b5319dda SHA512 2414ff502f6163ee36052bbf5f6be1ce088359dff9063911235b2d128fc243508a00713e500a12cd104770fae2b5e171c9eb14ff4e79585d146bbf37447000d2
 MISC metadata.xml 390 BLAKE2B 5f998bcf02cd83987c9e562a4f283691ed9be3a5bbf6191440f6c8cf345f19cd03f206a5ace9ae2a22566296dbfdcfd976b7f57abd63c9c8a3af4d3e709b3dde SHA512 e9770b26f6305cf387a9896d4ed923ebb4600f30d945ba4f015631065c539c71c67f2a596ad3eaad39d60d8b010f89fc092b3e20166ac36a1fad1203aa099eb8
diff --git a/media-radio/flmsg/flmsg-4.0.17.ebuild b/media-radio/flmsg/flmsg-4.0.17.ebuild
new file mode 100644
index 000000000000..7f3d7374a13f
--- /dev/null
+++ b/media-radio/flmsg/flmsg-4.0.17.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils
+
+DESCRIPTION="Fldigi helper for creating radiograms"
+HOMEPAGE="http://www.w1hkj.com"
+SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-radio/fldigi
+		 x11-libs/fltk:=
+		 x11-libs/libX11:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog INSTALL README )
diff --git a/media-radio/flrig/Manifest b/media-radio/flrig/Manifest
index 4dfceb73e2b4..8eaee505d014 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -2,5 +2,5 @@ AUX fix-bashism.patch 547 BLAKE2B b04673f95b56dc9258b2953e90aabf81b2ef3d2b7bc7e3
 DIST flrig-1.3.50.tar.gz 844791 BLAKE2B ca9675a8a107c31a56536f7ba8a76a2f0df8e27353ac0dac782d21c236d3dc5c9eda766b0264f9c28ca35580aa4626c98714fe52e8d81925868842d727d9ad17 SHA512 678c91bfc4c28cedbce992bb1320dfb3a68614db10d1a0e37f03bc0d522426f70fb0ce61f0b6d49f765bf9e566522b4133863de8da84583f1c08c8ce6a2fcb76
 DIST flrig-1.3.51.tar.gz 863499 BLAKE2B 5545c6fdc1e24e3395b8fe0be9ef509dbc55b53e9148bca298a8651bf39bc136cc447a59acba4a93c886bf483a8f29606b05f498aa7d5cf814dc259a488f0f84 SHA512 a2ab9b5f43efaa61cfb495d70f2be94d3332d1eaaad5c5458012324f8afef64f08df18ed2751dc4b1971c5388db46b926e6eb6213cbde416a9cb72cbff86ab32
 EBUILD flrig-1.3.50.ebuild 583 BLAKE2B b106c6f19739f97d709eef5f6400f8d96365eb1bda992ef2a3a5e813bb44a476ab800b8e006a3e874cce2d02bd0964eb38136b276bc80e43ae75be29fd5d1910 SHA512 460255763b871d7f3e6a53c88724e996dd08ecd69cd6e4b87f423832a59e6dcd4b72d87b5b507b1e96dbb53c0e30a9039f7631f99df2a210732bd644c4a393c1
-EBUILD flrig-1.3.51.ebuild 585 BLAKE2B d3e69851d8f35bf5cbc5ee58923018663be29b6fb6193b6f8f3f8d03124f6f307bf7970412c92213187a8fd3e45e65c6438b55c67d4af1e252d9367e19487b35 SHA512 9f87e5a57a2fec7c8a629a627a87a535001b8566320c24411d9d2557cddda831a976981ef7066332aca7e5ef8a53b77d4e6579b7edc8d7a06c5bbbfe0c3d9ac6
+EBUILD flrig-1.3.51.ebuild 583 BLAKE2B b106c6f19739f97d709eef5f6400f8d96365eb1bda992ef2a3a5e813bb44a476ab800b8e006a3e874cce2d02bd0964eb38136b276bc80e43ae75be29fd5d1910 SHA512 460255763b871d7f3e6a53c88724e996dd08ecd69cd6e4b87f423832a59e6dcd4b72d87b5b507b1e96dbb53c0e30a9039f7631f99df2a210732bd644c4a393c1
 MISC metadata.xml 325 BLAKE2B c4c98ed723dff91c8935c44ee552e25a08366edb7b73593d29d790622a49e130ef56137de21e1df16e1f968b1d5a0c984ce6df5b817a39f38523fb71353a3e1f SHA512 ca601e14e79450d08e0679e86827071a323fbc60cdf89412257747490046ca6efb2e78ae27f69c0e3ad449427049a35d478f2a7524a0606658ef9b302d9c0d43
diff --git a/media-radio/flrig/flrig-1.3.51.ebuild b/media-radio/flrig/flrig-1.3.51.ebuild
index 76d6201bcbf2..8b174faaddca 100644
--- a/media-radio/flrig/flrig-1.3.51.ebuild
+++ b/media-radio/flrig/flrig-1.3.51.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
 DOCS=(AUTHORS ChangeLog README)
diff --git a/media-radio/tucnak/Manifest b/media-radio/tucnak/Manifest
index 031b2b21c3e9..3de017a0b917 100644
--- a/media-radio/tucnak/Manifest
+++ b/media-radio/tucnak/Manifest
@@ -2,6 +2,6 @@ DIST tucnak-4.21.tar.gz 3545924 BLAKE2B dabc9647e4fde5c8c3b3e9b2ee5f072ce6e85138
 DIST tucnak-4.22.tar.gz 3547159 BLAKE2B 4a08bc0f7cfa5bbef6d367e7d5780707b6500bf35938ba38bab779ab68e379dd48f6f08146c042e10f2fe4eb7c6d807fef4a8c64ab4ddd8d4fff25f9a0765436 SHA512 d4ec3707137e7a79ede5722806f30f6442988b6cf79e15578978344d6f3dc978a4ef7bfff215458a65d7436e6344e7288c911e499ad3c03b9edb754cd390e2fc
 DIST tucnak-4.23.tar.gz 3550740 BLAKE2B 559f082e19dc22fb119ba6b075f83a49838347bde8856e22a90b9bfc66c8df17ef172967e0e6c4a88a3cfb7764ad36b6fe1a2dd18a9212d8c4637346a8616e7b SHA512 febd5daf943ec4428fe4d77542e20a47d69b017d345aff00ee7e0aca0cc287cf0f1abf3f858051e23aa8d0dffa4146b22fbdb5813d97debb902b91fd99dcd50a
 EBUILD tucnak-4.21.ebuild 1966 BLAKE2B b1572e6f1747fb61b72ddb6902f9a8bb35d348ca3270c9778184de1a39f9f10c1406c02843f5da5a53428fb2aa0e42bf7305fa3062df6e159e8a28fa71e6599b SHA512 c42d8fc7d31bfaf3cc14d1e3ec68e74580fa56b1d26006882c10d4c457ab4f12519954899eccb47cc9d42734dec50f5f5ceb3bcc0db94e36d37276a2be505147
-EBUILD tucnak-4.22.ebuild 1968 BLAKE2B a5eab8af37cdd38ea0b0f9b0c4da56a7a137c64e1448d986a5a5078d13674bee0eeb48064d3d415f708a9edb3ae8a97f8a946de4d829d4a6931294c43b806af8 SHA512 8143e9ab2b5abaaa2d31b215fbd9b26bf2d28f848ef707caea24378d08d0799b4cf477bb9a5d15b06e0617bb7a21c5a3d5ba35bde1e58735102d517781a06896
-EBUILD tucnak-4.23.ebuild 1968 BLAKE2B a5eab8af37cdd38ea0b0f9b0c4da56a7a137c64e1448d986a5a5078d13674bee0eeb48064d3d415f708a9edb3ae8a97f8a946de4d829d4a6931294c43b806af8 SHA512 8143e9ab2b5abaaa2d31b215fbd9b26bf2d28f848ef707caea24378d08d0799b4cf477bb9a5d15b06e0617bb7a21c5a3d5ba35bde1e58735102d517781a06896
+EBUILD tucnak-4.22.ebuild 1966 BLAKE2B b1572e6f1747fb61b72ddb6902f9a8bb35d348ca3270c9778184de1a39f9f10c1406c02843f5da5a53428fb2aa0e42bf7305fa3062df6e159e8a28fa71e6599b SHA512 c42d8fc7d31bfaf3cc14d1e3ec68e74580fa56b1d26006882c10d4c457ab4f12519954899eccb47cc9d42734dec50f5f5ceb3bcc0db94e36d37276a2be505147
+EBUILD tucnak-4.23.ebuild 1966 BLAKE2B b1572e6f1747fb61b72ddb6902f9a8bb35d348ca3270c9778184de1a39f9f10c1406c02843f5da5a53428fb2aa0e42bf7305fa3062df6e159e8a28fa71e6599b SHA512 c42d8fc7d31bfaf3cc14d1e3ec68e74580fa56b1d26006882c10d4c457ab4f12519954899eccb47cc9d42734dec50f5f5ceb3bcc0db94e36d37276a2be505147
 MISC metadata.xml 408 BLAKE2B 80978177d2257cefae04860fc52e43ea7f0d2221bf4a5b3050fe8057acda81625117b1ba74e7357d40d00cc7fbd44f2dac713494cd8d20679c690cf851e1b678 SHA512 ad015a404c42d5cd0f160907400f545698045bb6c7c3da59816830ec6ed51938a02988c59d4a9ade472a78fd39feeb49ebe6c2a9c625e535a37e44bf19db1b17
diff --git a/media-radio/tucnak/tucnak-4.22.ebuild b/media-radio/tucnak/tucnak-4.22.ebuild
index b4c1192a2e40..8490a3d7874c 100644
--- a/media-radio/tucnak/tucnak-4.22.ebuild
+++ b/media-radio/tucnak/tucnak-4.22.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa fftw gpm hamlib suid"
 
 RDEPEND="dev-libs/glib:2
diff --git a/media-radio/tucnak/tucnak-4.23.ebuild b/media-radio/tucnak/tucnak-4.23.ebuild
index b4c1192a2e40..8490a3d7874c 100644
--- a/media-radio/tucnak/tucnak-4.23.ebuild
+++ b/media-radio/tucnak/tucnak-4.23.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa fftw gpm hamlib suid"
 
 RDEPEND="dev-libs/glib:2
diff --git a/media-radio/wsjtx/Manifest b/media-radio/wsjtx/Manifest
index 6bb7d73542d2..6b4433ebc36d 100644
--- a/media-radio/wsjtx/Manifest
+++ b/media-radio/wsjtx/Manifest
@@ -7,5 +7,5 @@ AUX wsjtx-fix-unicode.patch 565 BLAKE2B 02d26dc1b1b51e9ac38feb866ecbf38e58b861c7
 DIST wsjtx-2.1.2.tgz 44928980 BLAKE2B de4e4e892893e5087199385aaee8753c0f71eb36cd23734ae430f50d8a09520bf2bf3df7038bcf03ba4e9ca24534c98a1b6cb5dc444d68d3183279231cf18974 SHA512 037f0604b0a22f6d02f0979b94dd054157c96ee7a8c07284d072f87f6586901346bef1a3c7e19d367a82764dafc9f00b7d1a0929d163a46f1b249aaa3929b1a8
 DIST wsjtx-2.2.2.tgz 23213092 BLAKE2B ce558180208ad33ddf2089f1747630cd07975547ba93bb693698ce599caec8d3d3367128581dfd110c6fe240bce9a0e6b8351ef178e6b53f3490a29a96367460 SHA512 923df18f5cbbd3e40294ccc4d3730f40c13c7777345723b9e66063ff0dd7db65caa9a64323711201a73b8c455dc1c29f67e4645dfbf98e0fc2c60a1630ce6cd1
 EBUILD wsjtx-2.1.2.ebuild 1470 BLAKE2B 7ce4185d8be8dd273f5ca2dd4221e29f97b0903478db6eca3f11041ca8d6ca895c1b598c9a8e3cd4bc9a4850d6b6f4447997b4b868a96db1c4183b48c5b28b4f SHA512 07456e1c31711466dce9f611f8d6ce34f9c09172fd4128f876c070add742dcc923ca8988728435aa3f3f6822308fd5a0cf1d949562401aedff788b05210039cf
-EBUILD wsjtx-2.2.2.ebuild 1671 BLAKE2B eebd50797fac7eafd74e3f2cfaa4260c1df8479f4454dda9d621ea363767dd98da6ca169ce292da2f5276e80551a8bac377422aacd34e07618e1dff2992d8fd9 SHA512 f620482536a141fad9716ba18c72efbabe57896d987c8aaa38767cbf680d60450c31ea327d4b802c15cf3bd8cb7e3ce24eceb8d1d3451c407e0a3832bdfc5b87
+EBUILD wsjtx-2.2.2.ebuild 1669 BLAKE2B 487b94915ee24bd0352ff5194e6d7b4f87292a8dcf3e0cad6078e55e8bdf99d7cedd6c77b389cb5c6fe6f1bfad1a285832e1a5d62faee575ad3b386605f6c22d SHA512 866eee1a472616fd6149d6e63dc278d91cbcdee3f475f535f1ef34e2e287ade2de974a7c59cc969d56a029fcc35a08144ab38c4969e9f654588684facba3f5dd
 MISC metadata.xml 411 BLAKE2B b18268ad951aaeb11cb490e4b02fa063915d2862f81e1a9f4ef69bf391c0628e75258d4bc66ce942a51d88369033b4e9dc8f5b8fff1c26bd33a4560ca493d70e SHA512 1b11819a29e25cf3ce3932bfb200ce65fd69c0872149acb54d3c67fb35d9977feee5d87e7412d75751cbc6a9b76010a2bcbc8b3a47a50d11a0c011abc5a83efc
diff --git a/media-radio/wsjtx/wsjtx-2.2.2.ebuild b/media-radio/wsjtx/wsjtx-2.2.2.ebuild
index 923305c594b1..47399ac280d9 100644
--- a/media-radio/wsjtx/wsjtx-2.2.2.ebuild
+++ b/media-radio/wsjtx/wsjtx-2.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/wsjt/${MY_P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND="dev-qt/qtcore:5
diff --git a/media-radio/xlog/Manifest b/media-radio/xlog/Manifest
index fd7ae7574445..904fcc128dae 100644
--- a/media-radio/xlog/Manifest
+++ b/media-radio/xlog/Manifest
@@ -3,5 +3,5 @@ AUX xlog-2.0.7-desktop.patch 435 BLAKE2B 56fee116a69c99f5192f1a2e4804821d715dd15
 DIST xlog-2.0.17.tar.gz 11461214 BLAKE2B d106980f221aa8864f3bdd91589c2020f7b718bb36febbcba0987a35f38e2bd38143214733b7e6b5839a5c2220a850762f629fbf6eaf1d1e9c2e37c29f25f563 SHA512 0110c7b70794aaeded939040e9baf3093d06122ec35e7bec2599a6b68f5de6f299dbd2e0c72442ee2a3a158326b23ca88e7fec402f501f9dda4ff2cc47287c2a
 DIST xlog-2.0.19.tar.gz 11431541 BLAKE2B 0bfe396167580808344a4b0e0974959930ab577a18c0d71a70c7c020a433a150baf5322f58682fc4604718d739e01004447dffcdd325c3426d776995dd684d39 SHA512 b69e592f97fbfbd989378a2b74036f4a169be3ca1f5b7ba8715e3a5293f1efbdbc431b0c09a305c2ca0190953777010a9d9a9b53caea8eb26609111b4f7da40b
 EBUILD xlog-2.0.17.ebuild 1673 BLAKE2B 32833a48e0351c595b73f6fe771ae6382321623bad195e62d6e691cdd31bfe8b5dad7f3f75fcd50b138a8d4c758015dd7e59fa9d0f6d1c84134d42d617c74d35 SHA512 7af3c3a52c013447601f6edc023f836999755e030c374f5aa9771e5ee49d3879753e5eaf51fa585daf3d6da260392587d8866c55cd03e85e4bb08cf0196290ee
-EBUILD xlog-2.0.19.ebuild 1675 BLAKE2B 327e92c48fe47f0b4e65e8d856f797fcc5f17097140eb4671616a06cfbbee4e330bbf4d52a3e14f5ac24d3cccee41e69d95fdf17402a8fc789f72c03d8a8bc1c SHA512 ad97eddfb4d1a8d6e85e1d42870aa2fae094e0904ea14b39bd41e3236b53d4e76bde8d6662296d754f8613c513e316c611c3e73abcb11fcf7780e33d96d104b5
+EBUILD xlog-2.0.19.ebuild 1673 BLAKE2B 32833a48e0351c595b73f6fe771ae6382321623bad195e62d6e691cdd31bfe8b5dad7f3f75fcd50b138a8d4c758015dd7e59fa9d0f6d1c84134d42d617c74d35 SHA512 7af3c3a52c013447601f6edc023f836999755e030c374f5aa9771e5ee49d3879753e5eaf51fa585daf3d6da260392587d8866c55cd03e85e4bb08cf0196290ee
 MISC metadata.xml 245 BLAKE2B 1d0fb3b909203735db219043a3b6ad6a2f3fafff1813f9c9caefdb9206262ff73c4ce6b93c0a8ec7d157148cea478b38d0c835ac9948a66d8ed81726f1b4d93f SHA512 9289d414ccbc30198596601b290cf42a583a093bbd7c5f8889c8ac0e81d8570bc4d42dfcbfe210456120edb910ea8572d6806400adec144f4eeb95fa36ae6ef3
diff --git a/media-radio/xlog/xlog-2.0.19.ebuild b/media-radio/xlog/xlog-2.0.19.ebuild
index ffc34e31aba8..37de4d851ef7 100644
--- a/media-radio/xlog/xlog-2.0.19.ebuild
+++ b/media-radio/xlog/xlog-2.0.19.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://download.savannah.gnu.org/releases/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="media-libs/hamlib