gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /media-radio
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
59 files changed, 305 insertions, 475 deletions
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index 75f73890d556..42e4be0e6402 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/ax25-apps/Manifest b/media-radio/ax25-apps/Manifest
index 48f4339cee13..bbcd25cda7ee 100644
--- a/media-radio/ax25-apps/Manifest
+++ b/media-radio/ax25-apps/Manifest
@@ -5,5 +5,5 @@ AUX ax25ipd.rc 379 BLAKE2B dfc102809a52feffee96d0a5f67874f9241b26a9ee18ccf88a5c0
 AUX ax25mond.rc 383 BLAKE2B 65f830cea757b7c649ab31480e7beaa0e8b40017c3fd59559969942c27c6459340dfa0223de829049bdc0cedd67a2441202ecca60c341162f5eaf621c6fef01e SHA512 c8d8dc7ada7fa427da85b794969e821c5e3cde66871427d36fa5cfc3a03c30735d869444594f3f17074529465325c7b48806a67257b9b3e0ef3fa6ca258e90c2
 AUX ax25rtd.rc 379 BLAKE2B 823318cdaf456d0536d843ddf0a25e2a614ddcc6dfe69f98b7c6c8dda555ef6b2977b873c9e35aaab10974f1ea3d91d8743798f228665908859dc33ff34f3708 SHA512 95df04124449a652bf76a60822c9468bce71d02490beadef409975da3709f7cf2a43ee9088468146d985464a6992125c90980e38efd397c145799cca537ff8dc
 DIST ax25-apps-0.0.8-rc5.tar.gz 479590 BLAKE2B baa4814ebb68c435a9986158dcdad1333376c75202db8e3595ec35851fabb3c718e7015a721d587ee307b8b8c918a690b898addcf4194532f6d26b70219c4c98 SHA512 5886f79dcdd4b02374289e04a61101b1ccdcdd936a6a98bdefa7b091689381de75f722a0bf32a914c85a3759c7b42489fabf74a53492fe2f937b22c953fc230d
-EBUILD ax25-apps-0.0.8_rc5.ebuild 1171 BLAKE2B fe9afd20e742e9f41a53bc9fae96671985c151e5388db22789351ad2c9a8a00a9e19f185c7f99937023f40f1933bf40913e2e1f6ba80227a90baed972feccb7d SHA512 dc1a2db2ce80d341bcfc61c7d884a45af802b56ff663cc563ba4ea3230898a0c7254b4a776f52df147916d7b274656bbdebe19d9c121c69748dec993a5f1f62f
+EBUILD ax25-apps-0.0.8_rc5.ebuild 1228 BLAKE2B 9a67580677e0d387e146fc6ef71cb2fe462ae2c13d13b500dd5e1eee2f6d4e5e8e5d52eee1dc2762621ff294f977ab902e3235e85909a06bb5dea1d81a242e26 SHA512 fbbf685e18f4a6af2c5bea8d5a77ff1c73e51850035512995f458614744f56c1220a8772e5fee5435b5b1d4e1a0cdebe3b9584c53440401291fd65ed8e37993b
 MISC metadata.xml 255 BLAKE2B 1be00b412c042706a649da1ef71b5e431369da25a82d18464ba48a54e0353ff297feb91071ac4d75007c756f8e65cb8c59da78efbdb725fb669644de5ba018e4 SHA512 35a18c5a178cc996bb71a27b11fb361198ae96d24ee3cbbc105a64824e1dcddd71d017270539daa3688ec2f04a8f564dd08ca491f62a3da4cca650c9bf35600d
diff --git a/media-radio/ax25-apps/ax25-apps-0.0.8_rc5.ebuild b/media-radio/ax25-apps/ax25-apps-0.0.8_rc5.ebuild
index 37448bf8141a..7f142a5fac48 100644
--- a/media-radio/ax25-apps/ax25-apps-0.0.8_rc5.ebuild
+++ b/media-radio/ax25-apps/ax25-apps-0.0.8_rc5.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools
 
 MY_P=${P/_/-}
@@ -15,11 +16,14 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-RDEPEND=">=dev-libs/libax25-0.0.12_rc2
-	sys-libs/ncurses:="
-DEPEND="${RDEPEND}
+RDEPEND="
+	>=dev-libs/libax25-0.0.12_rc2
+	sys-libs/ncurses:=
 	virtual/pkgconfig
-	!dev-ruby/listen"
+	!dev-ruby/listen
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 S=${WORKDIR}/${MY_P}
 
@@ -27,7 +31,7 @@ src_prepare() {
 	eapply_user
 	# fix missing prototype for malloc
 	sed -i -e "/^#include /i #include <stdlib.h>" ax25ipd/routing.c || die
-	eapply "$FILESDIR"/$PN-0.0.8_rc5-tinfo.patch
+	eapply "${FILESDIR}"/${PN}-0.0.8_rc5-tinfo.patch
 	eautoreconf
 }
 
@@ -38,12 +42,12 @@ src_install() {
 	newinitd "${FILESDIR}"/ax25mond.rc ax25mond
 	newinitd "${FILESDIR}"/ax25rtd.rc ax25rtd
 
-	rm -rf "${ED}"/usr/share/doc/ax25-apps
+	rm -rf "${ED}"/usr/share/doc/ax25-apps || die
 
 	dodoc AUTHORS ChangeLog NEWS README ax25ipd/README.ax25ipd \
 		ax25rtd/README.ax25rtd ax25ipd/HISTORY.ax25ipd ax25rtd/TODO.ax25rtd
 
 	dodir /var/lib/ax25/ax25rtd
-	touch "${ED}"/var/lib/ax25/ax25rtd/ax25_route
-	touch "${ED}"/var/lib/ax25/ax25rtd/ip_route
+	touch "${ED}"/var/lib/ax25/ax25rtd/ax25_route || die
+	touch "${ED}"/var/lib/ax25/ax25rtd/ip_route || die
 }
diff --git a/media-radio/cqrlog/Manifest b/media-radio/cqrlog/Manifest
index 07dedb731df8..a24d101cf8e3 100644
--- a/media-radio/cqrlog/Manifest
+++ b/media-radio/cqrlog/Manifest
@@ -1,4 +1,4 @@
 AUX cqrlog-2.4.0-makefile.patch 1651 BLAKE2B 9258aae8d919ce89df3108c7e421463d7e30090eaa2fdbdc9de3d5cee8c890ec58d553992342665287f5133db1ff04ff0dffb772578253934663ef5626673244 SHA512 75ae44d33a2eec6ff00b0845656ea015ca7c4af03de4ceb8c29864e649c6e8427c00e0bddd51bb07966970f7dfc0a590853cf7b752375ca024f01ff2a7586355
 DIST cqrlog-2.4.0.tar.gz 12361259 BLAKE2B 1779abd8983b66e966b73c157e322b489c3b4005cbc84952af1d708f7d9623efa7f6abc0515ab09f13765523fa373a2829a41da43b4b0f2edaea05e1b182b5a1 SHA512 aec7b43a0d4d1cd5b1af140db149058b4cff4893e6d8ed8d1ced729bedf27baa36b71d9fa7e5312ab94dd692953346d20f7f5a55a05ba91e4eccb17919d6d49a
-EBUILD cqrlog-2.4.0.ebuild 730 BLAKE2B 5395114fb930a31f0463d7da0e24ebdd15b87d917231ee071aa2ab4e3908b96e70cccf00628093751517bdc574500743eb3368415b1d1bae8a0a584ee3bfbdb4 SHA512 69bc58da810b96dfe1ca225c7e9f2386095e1b2619aa519e118141caa998ab6f509e44874ff072b7d5894063cc25664a4935d6947bb633db9171ca4636581112
+EBUILD cqrlog-2.4.0.ebuild 747 BLAKE2B 6ade7847c575fa083c250c798e9f2ede1e45f525d746bce502823cb2fc78cb09af9636e8ecf1331e2f0543599ebf06afbe69fbd72a28e936d8b8a4d47e4490bc SHA512 67d0ec89deda7104ad825803cd8b1917d541a139e44d3009326abf19b9040329c64e9b7c09fa35e99b6900318f498cd5173cfd50677e3003f19c903f6f0fea1a
 MISC metadata.xml 174 BLAKE2B 1738b3b33ef242919964fb6a498f2215dbd528720bd193469bb20020fbedda0e9102ef85539fa9d2c3924bf2e6c0dd560671134200481054111467ba8e88fcb1 SHA512 281aa8b74dd6915f9856e5e70db000388f8b04bd5393871e67b57cec316374c6986124202dfdf4855ba57dd60f1e2cfc323a1f2cc4c6fbe0f634f67f8fb40b17
diff --git a/media-radio/cqrlog/cqrlog-2.4.0.ebuild b/media-radio/cqrlog/cqrlog-2.4.0.ebuild
index a470fe94b73d..f1bd0065b1e1 100644
--- a/media-radio/cqrlog/cqrlog-2.4.0.ebuild
+++ b/media-radio/cqrlog/cqrlog-2.4.0.ebuild
@@ -3,27 +3,31 @@
 
 EAPI=7
 
+inherit optfeature
+
 DESCRIPTION="CQRLOG is an advanced ham radio logger based on MySQL database"
 HOMEPAGE="https://www.cqrlog.com/ https://github.com/ok2cqr/cqrlog"
 SRC_URI="https://github.com/ok2cqr/cqrlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
-DEPEND=">=dev-lang/lazarus-1.8.0
-	>=dev-lang/fpc-3.0.2"
-
-RDEPEND="${DEPEND}
-	virtual/mysql[server]
+DEPEND="
+	>=dev-lang/lazarus-1.8.0
+	>=dev-lang/fpc-3.0.2
+"
+RDEPEND="
+	${DEPEND}
 	dev-libs/atk
 	dev-libs/glib
+	virtual/mysql[server]
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
 	x11-libs/gtk+
 	x11-libs/libX11
-	x11-libs/pango"
+	x11-libs/pango
+"
 
 PATCHES=(
 	"${FILESDIR}/${P}-makefile.patch"
diff --git a/media-radio/direwolf/Manifest b/media-radio/direwolf/Manifest
index 7ea5abaca187..f70d08c51166 100644
--- a/media-radio/direwolf/Manifest
+++ b/media-radio/direwolf/Manifest
@@ -1,11 +1,7 @@
-AUX 1.4-makefile.patch 5964 BLAKE2B 4f90c390db99aef035886f74792e54c43eb93a30c1091bc9d823a901c733af5011676d3e6ca6e086a2072b3555fdc8ed99068a151fef86632a1d01b3149316ff SHA512 79dabff024c92958065ae091734a0a65ba57e02c318b64111643f066b18eea26b446260d3a8bdd34f8b244212301015524aaf4b46565b0fb9c67065dabb09ef4
-AUX 1.5-makefile.patch 17713 BLAKE2B d943de0a9afd255308533d03aab649b3fa5b528aa6be115cc48469c01e88ad4eba41b6d5192d8639047d6032a974a130ae87d493cca77762f75b13d68de3d00a SHA512 a30951aad309c3bef2a5049fc5993c9a15a445b6d15696594b2742146c2c9ddaf0d7b591ba47b6581cf80bff8afcb33718654716fc431ff2bb58e18d2f5899e8
+AUX 1.5-makefile.patch 17617 BLAKE2B 499ccaa4488fc098d1e080713badd0eb7bcd2c8c7c2b2210c9962cd3a6566c31dc447243164beb23b0d9941f8937d5a993c06eb28c945c64672d01015524f969 SHA512 ad79ea4a937bfa9e169d0e592406dd6aabe297fdc2b3aa6a84b32c01a6e9077b89a13ec5e4dd54fb6ebe4de57a27e87c9f59e30a7037a0e991587e639f182141
 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
-EBUILD direwolf-1.5-r1.ebuild 2100 BLAKE2B deb75671e19dc27cc43e32e903034502ba0db6fdeb9707eb5a629ad3eec26966267252e01679429122e3ba49400e8aa7313f9e544d700fa54278a47772a4a975 SHA512 2334e2bf6f07f30379a167bcf199a0c1384ce14602f57abf9542309830ad37ad418a6e68226e6f15f8c2fff0edfa542ac5e2ea52584066b07b569150953a92dd
-EBUILD direwolf-1.5.ebuild 2098 BLAKE2B c9a37621af73c18f4ce33dec0a530b65096fb3016224e35677807e59a3be277ffdfa6b0f5fc056a1cbfbafd71118a56c5cdf23df39d7b0f6abfa5aa8679e2482 SHA512 ceb9e5067d5b00044c713d6a06a806a37c456c5dbade6e3cd5bf41be197b736c08b75982a5d5ac78be0334aa90fc750ceda3c8e5a976dd74bb340121338e12ec
+EBUILD direwolf-1.5-r1.ebuild 2168 BLAKE2B 3552637ff3f346267ab890cd4ffb77ab638dd074c2f30f6820a347bce9566243b2b17630b2444d40afcd4163a986c9d13f14e0565ff086618eb1c1faf4421bab SHA512 a4e5c4df51f1ab610b8577247522c09a6a985fc302a6c4345c0becf28143d1df768a2c5cc0480db1c1f27a9cab55bb3e12471ddf3d8c6deffaba1408135887a4
 MISC metadata.xml 404 BLAKE2B 597de8502b1c38246c0bf473f69767d8ba0a9c45942d790718f7065677768f175143d5eb0428baf07697263beb6abc77d0147ee814132ac9ea0863e832fb4122 SHA512 a27e29158ac2305c89b2c64cd08618a9d3f655604ce8ceca49494d7c82e030e0294eaaa70c84c7105768e6d308b57bea336d9f036b64eadd146c765a9697b92c
diff --git a/media-radio/direwolf/direwolf-1.4.ebuild b/media-radio/direwolf/direwolf-1.4.ebuild
deleted file mode 100644
index 04a0995bbf20..000000000000
--- a/media-radio/direwolf/direwolf-1.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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=""
-
-RDEPEND="media-libs/alsa-lib:="
-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_user
-	epatch "${FILESDIR}/${PV}-makefile.patch"
-}
-
-src_install() {
-	dodir /usr
-	dodir /usr/bin
-	dodir /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/direwolf-1.5-r1.ebuild b/media-radio/direwolf/direwolf-1.5-r1.ebuild
index 1bc1ce3d60ee..ee2fa3ecbbd6 100644
--- a/media-radio/direwolf/direwolf-1.5-r1.ebuild
+++ b/media-radio/direwolf/direwolf-1.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils systemd
+inherit systemd toolchain-funcs
 
 DESCRIPTION="Decoded Information from Radio Emissions for Windows Or Linux Fans"
 HOMEPAGE="https://github.com/wb2osz/direwolf/blob/master/README.md"
@@ -46,6 +46,10 @@ src_prepare() {
 	fi
 }
 
+src_compile() {
+	emake PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
+
 src_install() {
 	dodir /usr
 	dodir /usr/bin
diff --git a/media-radio/direwolf/direwolf-1.5.ebuild b/media-radio/direwolf/direwolf-1.5.ebuild
deleted file mode 100644
index deaf27c9ab1d..000000000000
--- a/media-radio/direwolf/direwolf-1.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.4-makefile.patch b/media-radio/direwolf/files/1.4-makefile.patch
deleted file mode 100644
index 6424d8a72cc3..000000000000
--- a/media-radio/direwolf/files/1.4-makefile.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- direwolf-1.4-orig/Makefile.linux
-+++ direwolf-1.4/Makefile.linux
-@@ -484,11 +484,12 @@ direwolf.conf : generic.conf
- # This is a step in the right direction but not sufficient to use /usr instead.
- # Eventually I'd like to have targets here to build the .DEB and .RPM packages.
- 
--INSTALLDIR := /usr/local
-+DESTDIR ?= /usr/local
-+INSTALLDIR ?= $(DESTDIR)usr/
- 
- # Command to "install" to system directories.  Use "ginstall" for Mac.
- 
--INSTALL=install
-+INSTALL=install 
- 
- # direwolf.desktop was previously handcrafted for the Raspberry Pi.
- # It was hardcoded with lxterminal, /home/pi, and so on.
-@@ -554,56 +555,37 @@ install : $(APPS) direwolf.conf tocalls.txt symbols-new.txt symbolsX.txt dw-icon
- #
- # Misc. data such as "tocall" to system mapping.
- #
--	$(INSTALL) -D --mode=644 tocalls.txt /usr/share/direwolf/tocalls.txt
--	$(INSTALL) -D --mode=644 symbols-new.txt /usr/share/direwolf/symbols-new.txt
--	$(INSTALL) -D --mode=644 symbolsX.txt /usr/share/direwolf/symbolsX.txt
--	$(INSTALL) -D --mode=644 dw-icon.png /usr/share/direwolf/dw-icon.png
--	$(INSTALL) -D --mode=644 direwolf.desktop /usr/share/applications/direwolf.desktop
-+	$(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
-+	$(INSTALL) -D --mode=644 dw-icon.png $(INSTALLDIR)/share/direwolf/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 $(INSTALLDIR)/share/doc/direwolf/CHANGES.md
--	$(INSTALL) -D --mode=644 LICENSE-dire-wolf.txt $(INSTALLDIR)/share/doc/direwolf/LICENSE-dire-wolf.txt
--	$(INSTALL) -D --mode=644 LICENSE-other.txt $(INSTALLDIR)/share/doc/direwolf/LICENSE-other.txt
- #
- # ./README.md is an overview for the project main page.
- # doc/README.md contains an overview of the PDF file contents and is more useful here.
- #
--	$(INSTALL) -D --mode=644 doc/README.md $(INSTALLDIR)/share/doc/direwolf/README.md
--	$(INSTALL) -D --mode=644 doc/User-Guide.pdf $(INSTALLDIR)/share/doc/direwolf/User-Guide.pdf
--	$(INSTALL) -D --mode=644 doc/Raspberry-Pi-APRS.pdf $(INSTALLDIR)/share/doc/direwolf/Raspberry-Pi-APRS.pdf
--	$(INSTALL) -D --mode=644 doc/Raspberry-Pi-APRS-Tracker.pdf $(INSTALLDIR)/share/doc/direwolf/Raspberry-Pi-APRS-Tracker.pdf
--	$(INSTALL) -D --mode=644 doc/Raspberry-Pi-SDR-IGate.pdf $(INSTALLDIR)/share/doc/direwolf/Raspberry-Pi-SDR-IGate.pdf
--	$(INSTALL) -D --mode=644 doc/APRStt-Implementation-Notes.pdf $(INSTALLDIR)/share/doc/direwolf/APRStt-Implementation-Notes.pdf
--	$(INSTALL) -D --mode=644 doc/APRStt-interface-for-SARTrack.pdf $(INSTALLDIR)/share/doc/direwolf/APRStt-interface-for-SARTrack.pdf
--	$(INSTALL) -D --mode=644 doc/APRS-Telemetry-Toolkit.pdf $(INSTALLDIR)/share/doc/direwolf/APRS-Telemetry-Toolkit.pdf
--	$(INSTALL) -D --mode=644 doc/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf $(INSTALLDIR)/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 $(INSTALLDIR)/share/doc/direwolf/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.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 $(INSTALLDIR)/share/doc/direwolf/examples/direwolf.conf
--	$(INSTALL) -D --mode=755 dw-start.sh $(INSTALLDIR)/share/doc/direwolf/examples/dw-start.sh
--	$(INSTALL) -D --mode=644 sdr.conf $(INSTALLDIR)/share/doc/direwolf/examples/sdr.conf
--	$(INSTALL) -D --mode=644 telemetry-toolkit/telem-m0xer-3.txt $(INSTALLDIR)/share/doc/direwolf/examples/telem-m0xer-3.txt
--	$(INSTALL) -D --mode=644 telemetry-toolkit/telem-balloon.conf $(INSTALLDIR)/share/doc/direwolf/examples/telem-balloon.conf
--	$(INSTALL) -D --mode=644 telemetry-toolkit/telem-volts.conf $(INSTALLDIR)/share/doc/direwolf/examples/telem-volts.conf
- #
- # "man" pages
- #
--	$(INSTALL) -D --mode=644 man1/aclients.1 $(INSTALLDIR)/man/man1/aclients.1
--	$(INSTALL) -D --mode=644 man1/atest.1 $(INSTALLDIR)/man/man1/atest.1
--	$(INSTALL) -D --mode=644 man1/decode_aprs.1 $(INSTALLDIR)/man/man1/decode_aprs.1
--	$(INSTALL) -D --mode=644 man1/direwolf.1 $(INSTALLDIR)/man/man1/direwolf.1
--	$(INSTALL) -D --mode=644 man1/gen_packets.1 $(INSTALLDIR)/man/man1/gen_packets.1
--	$(INSTALL) -D --mode=644 man1/ll2utm.1 $(INSTALLDIR)/man/man1/ll2utm.1
--	$(INSTALL) -D --mode=644 man1/log2gpx.1 $(INSTALLDIR)/man/man1/log2gpx.1
--	$(INSTALL) -D --mode=644 man1/text2tt.1 $(INSTALLDIR)/man/man1/text2tt.1
--	$(INSTALL) -D --mode=644 man1/tt2text.1 $(INSTALLDIR)/man/man1/tt2text.1
--	$(INSTALL) -D --mode=644 man1/utm2ll.1 $(INSTALLDIR)/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/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
- #
- 	@echo " "
- 	@echo "If this is your first install, not an upgrade, type this to put a copy"
diff --git a/media-radio/direwolf/files/1.5-makefile.patch b/media-radio/direwolf/files/1.5-makefile.patch
index 860d57811aa2..2b7f87945011 100644
--- a/media-radio/direwolf/files/1.5-makefile.patch
+++ b/media-radio/direwolf/files/1.5-makefile.patch
@@ -1,5 +1,5 @@
---- 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
+--- a/Makefile.linux
++++ b/Makefile.linux
 @@ -13,7 +13,7 @@
  	@echo "        sudo make install"
  	@echo " "
@@ -63,7 +63,7 @@
  ifneq ($(enable_hamlib),)
  CFLAGS += -DUSE_HAMLIB
 -LDFLAGS += -lhamlib
-+LDFLAGS += $(shell pkg-config --libs hamlib)
++LDFLAGS += $(shell ${PKG_CONFIG} --libs hamlib)
  endif
  
  
diff --git a/media-radio/flamp/Manifest b/media-radio/flamp/Manifest
index 90054cfc8b47..d8b387036e25 100644
--- a/media-radio/flamp/Manifest
+++ b/media-radio/flamp/Manifest
@@ -1,5 +1,5 @@
 DIST flamp-2.2.03.tar.gz 518242 BLAKE2B 831fa1dc00976b7e627c0d36d594aab3c3668ae38153d3e76f1cc8460dddb7064882f6c8eb69b1fecf9abae75848acb235a1023cd6d8ba9d5c7c6731718ea907 SHA512 f5675d0703bbdc59897341e44bc3c558c6e24473d6b5b8750f3242884bfe978ef8ff276e375f50115c5ce01ef0531704d2704e39c89a415e3830cd205fc4667e
 DIST flamp-2.2.05.tar.gz 518900 BLAKE2B 1cdc2989d2b8bc2a513b4152bd3c3bc9a19bf5c3c8ede49e661688b9bbc093ba3d619873f6729b66b9747a00c2bfb1860a664164be39c20281b2bf34398db57b SHA512 cbd8eb9a39502d9eca99bc35c08a439816e247ad3929905831ed757c4baf034d1b024cf27d48581ce61bc4f488359f91628911920ebf3f990de47c199c386634
-EBUILD flamp-2.2.03.ebuild 475 BLAKE2B ef79385b3de32c364b2cf6df2042a9509ab7e55966fae1b968ae48e72d2c799d18e5628d765e1532a30bb3306be17d7457e85713b6d4de4d3a0de2887af4e0d1 SHA512 c3751d843b287ae5eefd339924b174c628c19bb7ac96bd8d70c0f28984bb8c56deb1119d1b7dcf4e18346681896686a8edec6f9ed961bbe6edd3933c4889e44a
+EBUILD flamp-2.2.03.ebuild 456 BLAKE2B c8a8ee0511aba705339df820ea1cb5da8926f00b4ee722592576310d065bdef68e3dca18dade868dbf6a9d64a7616ac16346bbaee705e33fbf1535633d944a42 SHA512 027ec9e7d58211f79d05f86d2a2de685d6d0a62244c5c05a23af57697652cbfc62b882d832b6f04bbc78e05e7866a59a77e19648a579353798557827df98bfd4
 EBUILD flamp-2.2.05.ebuild 456 BLAKE2B 965fb4bf9303b03bbc3bc9e20bd23aad885fb62d64302f436646a7743abca8b94a12bd8668e0acab9bccf2497e3d1d29d10306f19f41b87856232c41f365410a SHA512 58029186ba79cd85e27ae0bf7881f67c2faa9caf4883f53c6c68d1a5ae9492c5d14ab7f5d8e262cff7844d29fcf1c25226d9bef43279334d27ffeaa193e63f9d
 MISC metadata.xml 390 BLAKE2B 5f998bcf02cd83987c9e562a4f283691ed9be3a5bbf6191440f6c8cf345f19cd03f206a5ace9ae2a22566296dbfdcfd976b7f57abd63c9c8a3af4d3e709b3dde SHA512 e9770b26f6305cf387a9896d4ed923ebb4600f30d945ba4f015631065c539c71c67f2a596ad3eaad39d60d8b010f89fc092b3e20166ac36a1fad1203aa099eb8
diff --git a/media-radio/flamp/flamp-2.2.03.ebuild b/media-radio/flamp/flamp-2.2.03.ebuild
index 12318219772a..cb3efa6375c0 100644
--- a/media-radio/flamp/flamp-2.2.03.ebuild
+++ b/media-radio/flamp/flamp-2.2.03.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils
-
 DESCRIPTION="Fldigi helper for transferring files"
 HOMEPAGE="http://www.w1hkj.com"
 SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
diff --git a/media-radio/fldigi/Manifest b/media-radio/fldigi/Manifest
index 8ad20634e882..193de999262d 100644
--- a/media-radio/fldigi/Manifest
+++ b/media-radio/fldigi/Manifest
@@ -1,10 +1,4 @@
 AUX fldigi-c++11.patch 1140 BLAKE2B 987d33126e80340d7687cc1e346a8cc8b5701c9f6a4259357c08c8ab828eb71d871e1bb70652f4d35a57243fbb0738db2c59717a822f178bf2c7afb960305c42 SHA512 a2399caf67947b129d32563d3deb0f209f0814e39ea48ea46f664bacf7b64a2639f9c237889004af45df6553ef5668ec9d5c389d3ea7a6fb9922f54654bcc9ee
-DIST fldigi-4.1.14.tar.gz 4792805 BLAKE2B 2f910c9eabb22dcc31e03fcebd5088edff9db128ab59ada553a3cd1016864a326204b7a082d1310c45ea682ed9264038e7e59a19ba68cf4ff5a30443b8033cd5 SHA512 b96a9d724087bacad93b6e729039ab67231ee6ebbd1b082c143e7bfb58f103012f98448f3ea0badabeeb748ed81d6d44e503b71bcb5ee6d0fa8108ab6d029d8d
-DIST fldigi-4.1.15.tar.gz 4838204 BLAKE2B 3eab05ba366457fe3b1452cca37b262ba07414619c36781512ae1063e87c764a2bd562f3b7ad4733d885835df778b9ba11eb6470aa84d99ad9f9b3e1ef3675c3 SHA512 6579b557c9ce7e878f1ba7e6f59e0f676b1baddff78a94bd4b76925204e9b5a871da3080c4c13122781cb2e77311f61e15c03c82fbdd34a845051093070e9ab0
-DIST fldigi-4.1.17.tar.gz 4844153 BLAKE2B 332ad513060e3655183bc371bace76784204bdd5556386d6b8ade0e57e00305069fee6d45397592761e27d101ae7ea060de6624ed235ff4ee673d07b4444b1c0 SHA512 0a98dbca2c8db16b9a9da847a315964ab8c221070a25717f2df95e1fd1edb08bda6fab3992fa7188e5fbc6830e2abba624053fcc9d285a8a3375556bed90dfc9
 DIST fldigi-4.1.18.tar.gz 4847091 BLAKE2B 5b5ab773a78370b3c6ea86d63af7631bea97b16c3eacdb3d3b4e1b18dbbe70c727afa2ddf04c1ca7934f483503b2373d5d94bf4fcd896ad52a843c723a7c5cd2 SHA512 4d7fef4d464fcedf075d226bae7fd7134cd7436d737e17b7e21607e5120c957a909d1775900dbfea608c68629409c04eaa70a399bef6cba27b6e12b255696633
-EBUILD fldigi-4.1.14.ebuild 1288 BLAKE2B ec1418efca40ed21851d84bb2095588a2b4c3cd98eaa199777694638ceab6c69e5fbcfc3162b250d419bc0f57ec8cc08954fabf644402537e38faaf0025f1e98 SHA512 29903bbc6e4d60957c1f6849e335ba562d8cc58d790d6fa6e605f9be88e778871b03a57c60a2ee8c7cfd11e859625a73d6aeda01f078e734016d82ddd6d49a8a
-EBUILD fldigi-4.1.15.ebuild 1290 BLAKE2B 545cc510b01cf7ba73c01b59ba77865e5f533866b32942215b068b567ba064a5d881739ccef95417a75c12cd7489eab8aa472faf176bf9b41623c099c448e03e SHA512 e93c4d87b94e762a114e7e766791a1d8aaa8cfb2d80011ba2e28597a273435f4ef06c083eba0e8b8eea4e962b84c3cdd2b02e7910f818244f8c3258cb368cdb2
-EBUILD fldigi-4.1.17.ebuild 1290 BLAKE2B 545cc510b01cf7ba73c01b59ba77865e5f533866b32942215b068b567ba064a5d881739ccef95417a75c12cd7489eab8aa472faf176bf9b41623c099c448e03e SHA512 e93c4d87b94e762a114e7e766791a1d8aaa8cfb2d80011ba2e28597a273435f4ef06c083eba0e8b8eea4e962b84c3cdd2b02e7910f818244f8c3258cb368cdb2
-EBUILD fldigi-4.1.18.ebuild 1292 BLAKE2B 00370fc28e5ca31e7a03a9a6db91cff7ff20e987cc808719c6a99eea5621cac2caf3b31703d6d9be5b3862c79ab03e8900a3449eb931232d46207dc0f556af3a SHA512 f88480377463f0869daa566318d77ba60957f42fd557b6985f43119d2323820e6a8e37eaa58036952df895a48f364ed7938910f8df4429628b11dcda06e61ed3
+EBUILD fldigi-4.1.18.ebuild 1294 BLAKE2B 42e009ceec8ed2f22ada43ad5b7d0c4480b2e5b00dcc56a97bc992015da5d73485a70e6e3463d8e0e49dc29d04171854f1d3b27d7d9ec83cf217b1dc395e4c96 SHA512 cf08da38690c49cc7336be5e83644061374d802fdbd6e533ace5e7c20eeb396ce5cc4c29c294b3542b880f67a6f1582760db372fdaf94f4037ff9d444b7ce1ee
 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
deleted file mode 100644
index 2ce4f991e275..000000000000
--- a/media-radio/fldigi/fldigi-4.1.14.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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/fldigi/fldigi-4.1.15.ebuild b/media-radio/fldigi/fldigi-4.1.15.ebuild
deleted file mode 100644
index 7ded0b14db4c..000000000000
--- a/media-radio/fldigi/fldigi-4.1.15.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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/fldigi/fldigi-4.1.17.ebuild b/media-radio/fldigi/fldigi-4.1.17.ebuild
deleted file mode 100644
index 7ded0b14db4c..000000000000
--- a/media-radio/fldigi/fldigi-4.1.17.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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/fldigi/fldigi-4.1.18.ebuild b/media-radio/fldigi/fldigi-4.1.18.ebuild
index bc4ea9a9bb66..816703cc962d 100644
--- a/media-radio/fldigi/fldigi-4.1.18.ebuild
+++ b/media-radio/fldigi/fldigi-4.1.18.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_}"
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog NEWS README )
 
-PATCHES=( "$FILESDIR"/$PN-c++11.patch )
+PATCHES=( "${FILESDIR}"/${PN}-c++11.patch )
 
 src_configure() {
 	local myconf=""
diff --git a/media-radio/flmsg/Manifest b/media-radio/flmsg/Manifest
index 8d1e5417d190..93c1027e0213 100644
--- a/media-radio/flmsg/Manifest
+++ b/media-radio/flmsg/Manifest
@@ -1,7 +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
+EBUILD flmsg-4.0.14.ebuild 456 BLAKE2B 8159729a363ef0715bf884c7f7a236aa6249e78a20b63f6b47a9afcea4e3585e8d68fbc5ea3f537e6aac5414be478095780dea955fe1509b32370bde3d3de316 SHA512 40d07dbd48554a367bfcee10e7c2735161640ca74a64f5f28a69a2ab9d7a4bd432b8003e428f71a975558358647563eb00ad57daca3b79140f6a9843ffbf6598
+EBUILD flmsg-4.0.17.ebuild 456 BLAKE2B 8159729a363ef0715bf884c7f7a236aa6249e78a20b63f6b47a9afcea4e3585e8d68fbc5ea3f537e6aac5414be478095780dea955fe1509b32370bde3d3de316 SHA512 40d07dbd48554a367bfcee10e7c2735161640ca74a64f5f28a69a2ab9d7a4bd432b8003e428f71a975558358647563eb00ad57daca3b79140f6a9843ffbf6598
+EBUILD flmsg-4.0.3.ebuild 456 BLAKE2B c833e12ed6a029016b926dd9eda838f2a10d6e60f8cb497327d22f51f7d059cf1a65cbd69c67ad6cae8bb5fb151b9d9378ca17c12f810b9301aeec576e0ec54c SHA512 5a658f38dbe17065c187d2f5642d0dbeb9cd6747dd4199de224c98613d05ccf9fdb026af200ad9e95ff9b24aaca432950f97d2cdcbab69ec5b3591e2ff44492a
 MISC metadata.xml 390 BLAKE2B 5f998bcf02cd83987c9e562a4f283691ed9be3a5bbf6191440f6c8cf345f19cd03f206a5ace9ae2a22566296dbfdcfd976b7f57abd63c9c8a3af4d3e709b3dde SHA512 e9770b26f6305cf387a9896d4ed923ebb4600f30d945ba4f015631065c539c71c67f2a596ad3eaad39d60d8b010f89fc092b3e20166ac36a1fad1203aa099eb8
diff --git a/media-radio/flmsg/flmsg-4.0.14.ebuild b/media-radio/flmsg/flmsg-4.0.14.ebuild
index 7f3d7374a13f..5a5f5ba918ba 100644
--- a/media-radio/flmsg/flmsg-4.0.14.ebuild
+++ b/media-radio/flmsg/flmsg-4.0.14.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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"
diff --git a/media-radio/flmsg/flmsg-4.0.17.ebuild b/media-radio/flmsg/flmsg-4.0.17.ebuild
index 7f3d7374a13f..5a5f5ba918ba 100644
--- a/media-radio/flmsg/flmsg-4.0.17.ebuild
+++ b/media-radio/flmsg/flmsg-4.0.17.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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"
diff --git a/media-radio/flmsg/flmsg-4.0.3.ebuild b/media-radio/flmsg/flmsg-4.0.3.ebuild
index eecbc9ec9864..f47400eb5fad 100644
--- a/media-radio/flmsg/flmsg-4.0.3.ebuild
+++ b/media-radio/flmsg/flmsg-4.0.3.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils
-
 DESCRIPTION="Fldigi helper for creating radiograms"
 HOMEPAGE="http://www.w1hkj.com"
 SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
diff --git a/media-radio/flrig/Manifest b/media-radio/flrig/Manifest
index f04512225f10..92c727f06f4a 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -4,5 +4,5 @@ DIST flrig-1.3.53.tar.gz 882614 BLAKE2B e97ec9903b634797f1d251e1bd77501a9c060ed0
 DIST flrig-1.3.54.tar.gz 891644 BLAKE2B 9bb87c9a0960a3975cf27c67b0850c3d6ad3ac4efd41c5f49857fe9e3c1ea22c2db7e7fabfdaa1aeacb82ee3d712313681c5a0bf08cf790a6f63813d6de9a4e1 SHA512 0f143a2ba5afe766219133d76c398b0a8b3d61cd8313d50a18585f2b1454e4aa5802b9a4995b40e0dc4de3b1e58850f76fa9a5342ebe06be20ea1ace5c187eba
 EBUILD flrig-1.3.51.ebuild 583 BLAKE2B b106c6f19739f97d709eef5f6400f8d96365eb1bda992ef2a3a5e813bb44a476ab800b8e006a3e874cce2d02bd0964eb38136b276bc80e43ae75be29fd5d1910 SHA512 460255763b871d7f3e6a53c88724e996dd08ecd69cd6e4b87f423832a59e6dcd4b72d87b5b507b1e96dbb53c0e30a9039f7631f99df2a210732bd644c4a393c1
 EBUILD flrig-1.3.53.ebuild 496 BLAKE2B dc5ffe3cbfe399585de2aaeae75343ca3143742cda83b798d4f690a24fd52fc4fee4d0fe4bafccc98669de7aaa1a7dfbd01132e9dcb7caaf7edb422a8e2d1a70 SHA512 0bb2ddb590127ff929650400cfbf43ea2dcd299acece85fb3cf93bd78e6ecc786a2e05c00ef65886c87ed6ac44f481b55bd624c2553dc5c24ddb0442d99fd5a7
-EBUILD flrig-1.3.54.ebuild 496 BLAKE2B 4064896c9153034ae69222521400e4d86cf5569e05470b9676ffd235583ec22700c2a8c9649e749e311fec52fd1a3070b4eb2b8c1c6a536e1d475c69cdaac297 SHA512 a12f538adb54c474e5acb4cfeefd19f432e586aea2be9b8ffb5d2a1b271da98df1c30337d517a8197e7334141ee5a6e295485b31af1d58993d5510b757bda068
+EBUILD flrig-1.3.54.ebuild 494 BLAKE2B 18a4362c3b53317561478c01954baffbe8b446143cc28d699a8b07c407ccba3b588052d9fd153e024e9605dc310716fe18c882d5a227537bcbf1150d7c2bea99 SHA512 186692d333262ddcd7454760618d5e075464cf43b7769d38804a38419fe7dc120befa0c687cccb19e3a3fdf732338d3c17a04c5edc36b0c3b51a71af90875e18
 MISC metadata.xml 325 BLAKE2B 5a0f279d13c08ae0f8f26ccab563978f7aaf5b4919bdd1b4eb0e5ef102f40d86ac46802d43f7303e97106ad6fb3f52256b03222623bea4b1ce1f7c5350dcceb1 SHA512 90a892833f50bb0d2c4cf95887f83f0fa2c1afd4f33c498e72e157ab9713677127511b44e13d9c4146b6aedd0876acde69cc89c6b5a80a0a847a00683945ffca
diff --git a/media-radio/flrig/flrig-1.3.54.ebuild b/media-radio/flrig/flrig-1.3.54.ebuild
index 955cc391d619..6935ddd0e9e6 100644
--- a/media-radio/flrig/flrig-1.3.54.ebuild
+++ b/media-radio/flrig/flrig-1.3.54.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/fsync-mdc1200-decode/Manifest b/media-radio/fsync-mdc1200-decode/Manifest
index bdaa5b94a991..468ed6e7d9c5 100644
--- a/media-radio/fsync-mdc1200-decode/Manifest
+++ b/media-radio/fsync-mdc1200-decode/Manifest
@@ -1,4 +1,4 @@
 DIST fsync-mdc1200-decode-1.0.tar.gz 19791 BLAKE2B 86000b3b6a71895c211ae123eedfd54ba0dfa9bfc8619a28effb1f5187349aa33968acf6a24fd4e7b10e07a5693cf3410d5242d9719f34bec0a847794098196a SHA512 94525b88800f285816d6c76f0474854543a805f85a3156cd516a3c952ce05e40c9c845dfb799eb5aea9cd2e659713c468e35407804b42db98981dff91d08fb92
-EBUILD fsync-mdc1200-decode-1.0.ebuild 795 BLAKE2B fd6cbe0ee4f8f5fe531ed815bff1dca1e2f475e19485d955f78d57b80895667ef64c94dd7b40e7b91d39e77546012a3c89e641be1a4fbc047c12c2b4f207184b SHA512 e587d39f75918e1782731a6c843a7cfaa8cf25c82286a77cbb610fcaab2a153dbe47112d7343a6a6c1b21dfbd902b876a40408d737ac6f6a114278880664af93
-EBUILD fsync-mdc1200-decode-9999.ebuild 795 BLAKE2B fd6cbe0ee4f8f5fe531ed815bff1dca1e2f475e19485d955f78d57b80895667ef64c94dd7b40e7b91d39e77546012a3c89e641be1a4fbc047c12c2b4f207184b SHA512 e587d39f75918e1782731a6c843a7cfaa8cf25c82286a77cbb610fcaab2a153dbe47112d7343a6a6c1b21dfbd902b876a40408d737ac6f6a114278880664af93
+EBUILD fsync-mdc1200-decode-1.0.ebuild 809 BLAKE2B de869adbf5af54417d8bcf15d80ae2a5613840bc19a68b437a5fdaa662197799d33e34f9f843bf433954833879c883c8427014a480686df4d74b0616e502516b SHA512 566f24f94bcde7bdf2392dbb49507c3c46460fea102413ebab565b090c72bceaff6cf3495ba6365597eaf35b23f2772e3ec544ecd6d56e3135529cd146914bb8
+EBUILD fsync-mdc1200-decode-9999.ebuild 809 BLAKE2B de869adbf5af54417d8bcf15d80ae2a5613840bc19a68b437a5fdaa662197799d33e34f9f843bf433954833879c883c8427014a480686df4d74b0616e502516b SHA512 566f24f94bcde7bdf2392dbb49507c3c46460fea102413ebab565b090c72bceaff6cf3495ba6365597eaf35b23f2772e3ec544ecd6d56e3135529cd146914bb8
 MISC metadata.xml 430 BLAKE2B 630acc81c8b5fe9af29816801bb95c49e6aa27b5e2bcac6ea803dad2e9767be83d666c8bd576bfda25607ebe6bef09d7debfe8a562e7276bb081bb44451219de SHA512 701207e4fd82cc75107b8a1669ae9354140811ff828a1f9b0313f39a4bfa663ebaa549f64b0b422255f9014f9fd6d8e0819d6d2b32d4df6504ac7bcc80c44cd9
diff --git a/media-radio/fsync-mdc1200-decode/fsync-mdc1200-decode-1.0.ebuild b/media-radio/fsync-mdc1200-decode/fsync-mdc1200-decode-1.0.ebuild
index a452f7447737..2316114ab76b 100644
--- a/media-radio/fsync-mdc1200-decode/fsync-mdc1200-decode-1.0.ebuild
+++ b/media-radio/fsync-mdc1200-decode/fsync-mdc1200-decode-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,7 @@ RDEPEND="${DEPEND}"
 BDEPEND=""
 
 src_compile() {
-	$(tc-getCC) -o fsync-mdc1200-decode ${CFLAGS} ${LDFLAGS} demod.c fsync_decode.c mdc_decode.c $(pkg-config --cflags --libs libpulse-simple)
+	$(tc-getCC) -o fsync-mdc1200-decode ${CFLAGS} ${LDFLAGS} demod.c fsync_decode.c mdc_decode.c $($(tc-getPKG_CONFIG) --cflags --libs libpulse-simple)
 }
 
 src_install() {
diff --git a/media-radio/fsync-mdc1200-decode/fsync-mdc1200-decode-9999.ebuild b/media-radio/fsync-mdc1200-decode/fsync-mdc1200-decode-9999.ebuild
index a452f7447737..2316114ab76b 100644
--- a/media-radio/fsync-mdc1200-decode/fsync-mdc1200-decode-9999.ebuild
+++ b/media-radio/fsync-mdc1200-decode/fsync-mdc1200-decode-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,7 @@ RDEPEND="${DEPEND}"
 BDEPEND=""
 
 src_compile() {
-	$(tc-getCC) -o fsync-mdc1200-decode ${CFLAGS} ${LDFLAGS} demod.c fsync_decode.c mdc_decode.c $(pkg-config --cflags --libs libpulse-simple)
+	$(tc-getCC) -o fsync-mdc1200-decode ${CFLAGS} ${LDFLAGS} demod.c fsync_decode.c mdc_decode.c $($(tc-getPKG_CONFIG) --cflags --libs libpulse-simple)
 }
 
 src_install() {
diff --git a/media-radio/gpredict/Manifest b/media-radio/gpredict/Manifest
index a57b9c76eb38..2c6fd945292a 100644
--- a/media-radio/gpredict/Manifest
+++ b/media-radio/gpredict/Manifest
@@ -4,5 +4,5 @@ AUX gpredict-2.3-doc.patch 473 BLAKE2B ed1a1a742ca972a53cd2ac35723f5b02eb212f8d6
 DIST gpredict-2.2.1.tar.bz2 4647342 BLAKE2B 989b80fd0f0029551854c18c1e00bd5d223bffe4aa20004b828bec87ab56dd488edf4d62289d394225e2a6b0c89ca1c9962cf63afe076a355757371127712ea7 SHA512 590a218bc95a465ca9772f892b77763b92a6c41c7d9f3b48279f28916cef8a5bfe616e6cdda1002e7dda082f37f37a98af8c8180895c572fec9c96aa76888f5d
 DIST gpredict-2.3.tar.gz 7742902 BLAKE2B 1ff567871838b062c59ab0076330a354afee082506044f5ce2ae1c7553e7f3462770f7134d13e3b603f7966476d13b365dd3575cc6c7e32d23865ba29b602cc9 SHA512 d7434aff482c943951a79cb607c91f118cfbde8209b4b370d0d2147766244fab2839b5c712864c2c521635f31c484ef2bfd3c771371e946f5a3561801ab474b5
 EBUILD gpredict-2.2.1.ebuild 714 BLAKE2B c25ebeaa964701bbac76f8ba1a143f8107213dc9b7d5b3bf5ad7ae4d5f740448ec9ef49a4a25fd88d2f62c3cd2a0f5960ce9574eea640cdeb6cebadbfaa2f41f SHA512 48265566a3b5fbd07d6eea3cf2146b7d7ad42b1bee5bf80db3f4b48a00d155535604bb069a51329cc4101a93220b3316017fd3346732fe6d0f59a17f521bef25
-EBUILD gpredict-2.3.ebuild 815 BLAKE2B 7f676e29d950587e25e6a73a10f80015c12d2a53bd12f12cfff623ca6a2e4b633321b9d57cfea472e9f619a207579dd6fca40e82c80bdc7b42a4ab65c754edaf SHA512 ae46291db0848e38dfb00902c528c3259753034a25f322f10441a5afdf99211a4a0758554ff0af1abf91a18089a0ccbc5f9505463a216aa9c78566c0ec6d6957
+EBUILD gpredict-2.3.ebuild 812 BLAKE2B 3c4265ab4f1c824ea19941c554e2d5eca1ab7a55842e92f38ee0a15a8253cbc22f60ee8f33c60645d1837b8a897720ce4a2334eb1ff6a9f45f8fc354c7055b83 SHA512 ca0d609e84a3055847fdae6b9c35bf64beb9a4732d300f9cf16d1ddae5581366a7fc4a8597e496cd7e3f44b2b351a10b84e871fdbea95e95f3510401e82f70de
 MISC metadata.xml 327 BLAKE2B 337b6c3aaf2d60785241601818dcaa4c831b122e339826560343f32712bda042b0f5140f321e9de6f2fc680e66702b39b0148aea2aaac52aa3b3faa7ef5292d4 SHA512 8e461ba4d187a96f1e15e1fab90da3755ec7ad6b24f1182b65eeacffa996375bd0bd905907c329bb53a92b94c22b08283ea936956acc58e5153634e464d9a147
diff --git a/media-radio/gpredict/gpredict-2.3.ebuild b/media-radio/gpredict/gpredict-2.3.ebuild
index 41323787c2a8..0b284758603f 100644
--- a/media-radio/gpredict/gpredict-2.3.ebuild
+++ b/media-radio/gpredict/gpredict-2.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/csete/gpredict/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="dev-libs/glib:2
diff --git a/media-radio/grig/Manifest b/media-radio/grig/Manifest
index 5680d1a46a24..258abf1377b1 100644
--- a/media-radio/grig/Manifest
+++ b/media-radio/grig/Manifest
@@ -1,5 +1,5 @@
 AUX grig-0.8.1-hamlib4.patch 3897 BLAKE2B f855040e1860d840cc993c46a0b17a341d3820f342dc1082e2a4a9ed5f1b598f50ba61215add86f6c1b59afef04194d82a80a2de1f033328e37e0edfe51f422f SHA512 b8573228232d24fe0fd750857a5b60a358279fd5e3a07dde9eff18ed3b38c09ff4bf693f63ad9f63f691d3b8937e0a7e7dff222f9aaa74d53bd064b3adf379cf
 DIST grig-0.8.1.tar.gz 621728 BLAKE2B 096ac037d3e5871e32bbb80669e2bafdf061c28c420362e26aea9f01f2e399a4cb769e65aa8261b0726444d08006495de13c62ca9d9e094c44fd8cb28b36a3f1 SHA512 84eda8db5d18324f26f0775483c8272296aad05dd75f0572c01a3c7af6dbd14bff7b98cc6a61fe3c43d25193866be4b3dafdc4e68dfc37217e88b53ca53266f9
-EBUILD grig-0.8.1-r1.ebuild 707 BLAKE2B 64a5e3c62a6a8730b7a0d9f2b66dd7830db16ce7fcb47410a97eab40d8e4241ac10261a3cc353e5ed4c7ec4990115cfc265ba108c5267ccc0bd11d3d9afd9f94 SHA512 0a097576033328fc1a439f9da699d5efa818d6dca6a95f3f1cc422c7695e2a01ad83c6eb4441b93dc240848cc934d34411f2210a1b29554c7ba2163e681ce652
+EBUILD grig-0.8.1-r1.ebuild 710 BLAKE2B c692db7497f30e461abf212721b111f6861c0b8a68134294d0d8f2e8f0954a6701432041c805f0850eae934eaa704e0d52b0d1c8ecc1a5aa1e8df2ba4fee6b3c SHA512 b8b907adfc5b8a4e869155f689837e22f2a90e1e1138485d34457855f30af53cef14a14ac62ddf1a9f21f73ac159ffb1274bfeef54c65b924fdd6a31f7148745
 EBUILD grig-0.8.1.ebuild 653 BLAKE2B d206a2a2d1d58d40cc9d1071007fe1f3f4fe290e1c339a6517f74973ee82cce8394836d59fc1c7bb57f1d6aaa992e4d54b63966f420a0b428adf68a1dbbe47cc SHA512 faa93641e1a2c26a4358d4a54b90f7036728e44ac88a52a358b95f781fb04f8c06ec3d77d9a7af9182ac5a97aa469d1ccb0ca8818d17f0d13ad25b7112e60bd4
 MISC metadata.xml 332 BLAKE2B 79bcf349f891026edaa1a92ff783eec4e1800f8c5b86c8b500b799c5be8605f0c9fd150e623a70446b9637a78b93b12ec35b1b259dc64d672cbb2c1dcd416aca SHA512 4f7b94abe8a2e6106a68f77e32aac0156c5d138b2eda01d4cc3e1c51c3fc530c75992c0b6e901a083f98028d751876359c3e7d06465cabb5988174b5d28b4e9e
diff --git a/media-radio/grig/grig-0.8.1-r1.ebuild b/media-radio/grig/grig-0.8.1-r1.ebuild
index 8a3e3a176bbe..f8d41c8ebd3e 100644
--- a/media-radio/grig/grig-0.8.1-r1.ebuild
+++ b/media-radio/grig/grig-0.8.1-r1.ebuild
@@ -20,7 +20,7 @@ DEPEND="
 	>=media-libs/hamlib-4:="
 RDEPEND="${DEPEND}"
 
-PATCHES=( "$FILESDIR"/grig-0.8.1-hamlib4.patch )
+PATCHES=( "${FILESDIR}"/grig-0.8.1-hamlib4.patch )
 
 src_configure() {
 	econf --enable-hardware
@@ -29,5 +29,5 @@ src_configure() {
 src_install() {
 	default
 	make_desktop_entry ${PN} "GRig" "/usr/share/pixmaps/grig/grig-logo.png" "HamRadio"
-	rm -rf "${D}/usr/share/grig" || die "cleanup docs failed"
+	rm -rf "${ED}/usr/share/grig" || die "cleanup docs failed"
 }
diff --git a/media-radio/ibp/Manifest b/media-radio/ibp/Manifest
index 7942f9c39ef1..792d9a17acd9 100644
--- a/media-radio/ibp/Manifest
+++ b/media-radio/ibp/Manifest
@@ -1,3 +1,3 @@
 DIST ibp-0.21.tgz 33536 BLAKE2B 0fee17215d6e6fc99dba6d216f4e2b79bf0be89f6edd68fe5b0c0f4ca6fee794274a9ec0c08b73f502fd57dd0208d1d0fcf362d0a8671d94d4a6a613f578e443 SHA512 784bdcae61ce41dff7d88eb2068171dafa607012660393188326e94e323fdf5badebf3d8a24016c83c96c770b6d0935fc35aef5aca6bbfd665b7f2ccf39118ca
-EBUILD ibp-0.21-r1.ebuild 1074 BLAKE2B 2938bb737f8d208f42205db8f395b02fe57f1f7b1312bb7ed30036d3bdc5b7a995cb872a43bb4dfe1c4c892416e42bc1433f80394609552923d8dc2c5bafe63a SHA512 ec8f75a8de2d2118d3cc4d3bfc224bb0cdb1b422189c0bb038a939ef646d89137e5c7039f92a48c8fcfd8eab4979d29afc09fe5f7c8c1e3f5e5c33bbbafe1665
+EBUILD ibp-0.21-r1.ebuild 1167 BLAKE2B cebd1220a37cb8105b7f5e4a4b8ef3e0f19e2d82476cb5cdeed9e08ccfc16f3eb2be488a77980de1097ab85c94091c7076b925ca9859ede6e03cfdaad2b64f6b SHA512 e3991259438d90d4cfd8183b1d962dd9f3fa660759b46c713df31e30db5cc30c6eed72d31a0e42a8ddc654151d0ce12ad946e6fb6f38e6ff6e45fa580709b360
 MISC metadata.xml 249 BLAKE2B d6fa8a349066f9684c68c3086f53e41ebf30b6e313e8e8e752a953c0eaa0853448fe17e5ed46836bc5e149a282a33c7408c675d3b39eb3d59ddc1c1ad86bf716 SHA512 965ae00fa198dd8f5869c4c14ff3e28c7d76be7182be6ba4bedbb68d7138da5be3c8bb993689db2c73ac328456015ebdf018ee1b308d6988067810d1156bd179
diff --git a/media-radio/ibp/ibp-0.21-r1.ebuild b/media-radio/ibp/ibp-0.21-r1.ebuild
index 0d4596ba3e93..a02af617b34f 100644
--- a/media-radio/ibp/ibp-0.21-r1.ebuild
+++ b/media-radio/ibp/ibp-0.21-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,7 +16,7 @@ IUSE="X"
 RDEPEND="sys-libs/ncurses:0
 	X? ( x11-libs/libX11  )"
 DEPEND="${RDEPEND}
-	X? ( x11-misc/imake )"
+	X? ( >=x11-misc/imake-1.0.8-r1 )"
 
 src_prepare() {
 	# respect CFLAGS if built without USE=X
@@ -31,7 +31,8 @@ src_prepare() {
 
 src_configure() {
 	if use X ;then
-		xmkmf || die
+		CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+			IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
 	fi
 }
 
diff --git a/media-radio/js8call/Manifest b/media-radio/js8call/Manifest
index 954b431dc981..259c13e02236 100644
--- a/media-radio/js8call/Manifest
+++ b/media-radio/js8call/Manifest
@@ -1,4 +1,5 @@
 AUX js8call-2.2.0-hamlib-type.patch 463 BLAKE2B a34effb789b9113fcdee91f631dd8abec6e9fb1aea8317c1ef99dfb005e9ac266fe8b2c1be2cf83ba128f9f52a03206e4dc5c2458537ad2878c78f756b91a6a4 SHA512 426227025f7b7039890e2d22eeda218491de883150abbfe6066fd82f604da90c321a8ee6f7916ed08dcebee38c94d681280fc7824713b663bc2aaa09f538d8d4
 DIST js8call-2.2.0.tar.bz2 16249923 BLAKE2B 9bd3124bee7253f48adb0bea031f3c83c3e9487aac7208ce3dfc94208f4c861645bacd581bd44cde19ad3b3e3ac5f7f60993bece2d1fad0164afdae7b3bd290a SHA512 3e66ba0b9bb88b834b0e025b37a395008a058b87fb70c09887936fa18c192c501d127eff6e9ccf792863ccc932aa76feacc4be903ebe7ab2915298aed3689672
+EBUILD js8call-2.2.0-r1.ebuild 830 BLAKE2B c5e8dcbef4dcd3ae528c3db533438c285a228d4177349d2805107d519bec7bd2b39bf83032afa34a851c38df9862a5ac82712244a517d2e909ac7ce563d95f12 SHA512 d3c803be2278aa79625b0348a81f610b1ae533b7a91b295f03e1e78acf20a14f75d1e85c71d565c3c8b759696a3c44106598f80e046b0c7450389a1b4bb59b5a
 EBUILD js8call-2.2.0.ebuild 892 BLAKE2B 1125c60df60d5907ad5a5972064167245d072761c093772bcb9f3911ec97b4c454ecb8cdaa2e35c4164edea3dddf2300fcfcf284e92e5b97468836938c9fd726 SHA512 1b7fd8e7970256e5dfa319766e125b8abb71d3a4f23df1d6c07a7b19ed6367fc4a1ef51bd246560d3edfccade468d82ad04a0c84fe88370afb4aa1155b16f755
 MISC metadata.xml 312 BLAKE2B 77446444162f6d430b7cd8c95ea0ff34da775e0a78d355b1e71a5a5e3c64c6f633b0339cdcd2055d3ea1fd5befa5d6655d02d2cb0fd55fd60a408efb33c6cf0a SHA512 caf176b301b2a0385c9c24d8ee1b68077d9cf49b5379f6530c27658450efa8fef6551a4d1492529bdde38e95bb4f5df5f9825c38865874514803e12ad37bc461
diff --git a/media-radio/js8call/js8call-2.2.0-r1.ebuild b/media-radio/js8call/js8call-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..9537e009da38
--- /dev/null
+++ b/media-radio/js8call/js8call-2.2.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake vcs-snapshot
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Weak signal ham radio communication"
+HOMEPAGE="https://groups.io/g/js8call"
+SRC_URI="https://bitbucket.org/widefido/js8call/get/v${PV}-ga.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+RDEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtserialport:5
+	dev-qt/qtprintsupport:5
+	virtual/libusb:1
+	media-libs/portaudio
+	sci-libs/fftw:3.0[threads,fortran]
+	virtual/fortran
+	app-text/asciidoc
+	>=media-libs/hamlib-4
+	doc? ( dev-ruby/asciidoctor )"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	cmake_src_install
+	rm "${D}"/usr/bin/rigctl{,d}-local || die
+}
diff --git a/media-radio/qrq/Manifest b/media-radio/qrq/Manifest
index 17c694a2a55f..c2cf4f2aa9ad 100644
--- a/media-radio/qrq/Manifest
+++ b/media-radio/qrq/Manifest
@@ -1,4 +1,4 @@
-AUX qrq-0.3.2-tinfo.patch 708 BLAKE2B 710671010b3bacf75b2bfde1b98d27aaa5d5eac57161b91e54943244aaac161cfc48fd27ec51d3179fca431982fde8122d9d8690f473e5057ae447cc20158148 SHA512 7acbb250efe78e5fd65336a01bcc8cd96293e92cce7bb74d1f0d2231e7a676f9b3597575e013b162a6072a41f267cfb186c8009eab36417d584a1888ce12a20a
+AUX qrq-0.3.2-tinfo.patch 642 BLAKE2B e7d865bf046c3fca8b5d100054e6408321cb8452db59a7be1786acf71c23142174bf73783e49dd072885cb7196bd9597a4645145ea318a3851ed7771b5515302 SHA512 3c732f033aa33b44f225b0b6302db3d629a9adabf92dcac4715d2236ab77715705a646d29fdc04d790cad624d9fde547f4ea841a39089d49cd52d4368f6b42ac
 DIST qrq-0.3.3.tar.gz 159832 BLAKE2B 7af974175777f6166303ece0e0cfa0a035d49e0c265cd513b771a280dc7ac0772a979f45923a14737ff58a64147f8c97a3978ccd7e4cd81fe4a38f3156766057 SHA512 025f0a350600a9f3f24cb00afcaa0e99c0be881e40684cc7ccbb9927d883372336c0b668bae21f232ce52dd221eb4ed950d306a32bab34e65f9f3cba9f28a484
-EBUILD qrq-0.3.3.ebuild 877 BLAKE2B f8e4bb17454196463e77f5dfd3751749ee72f96e8de6ebf692afe0f4fc92d7b53a47fc19b8b4947e7b6e9424f479743a0c6c8d6891774fb9f88e8744dfb2a61c SHA512 0bbb9845fbba79a6222464ede0b6e40f5727dc349044c8b8912b2523a2a8e9207dc308ea8860ff56ba004125387c670ebeedd106ed39fbea956c900626bcf116
+EBUILD qrq-0.3.3.ebuild 942 BLAKE2B 3ebc21f7477067a14ed26cbc05fef590dc5bf967075f547eb3d406834629c67d78845c86028062bde8231e1a7b8b7d96313bceda3de857ce525bacb8d9bfd9ed SHA512 293e2120591f3895010fbfe459ea8e7705dc1a8636568f0050eca57d19451d1b6bd0c03d8c0468c58439edcce17ea9745c06bb18119450316c9e525ac12420fe
 MISC metadata.xml 249 BLAKE2B d6fa8a349066f9684c68c3086f53e41ebf30b6e313e8e8e752a953c0eaa0853448fe17e5ed46836bc5e149a282a33c7408c675d3b39eb3d59ddc1c1ad86bf716 SHA512 965ae00fa198dd8f5869c4c14ff3e28c7d76be7182be6ba4bedbb68d7138da5be3c8bb993689db2c73ac328456015ebdf018ee1b308d6988067810d1156bd179
diff --git a/media-radio/qrq/files/qrq-0.3.2-tinfo.patch b/media-radio/qrq/files/qrq-0.3.2-tinfo.patch
index 6a0f38d18fab..90c26ab6220a 100644
--- a/media-radio/qrq/files/qrq-0.3.2-tinfo.patch
+++ b/media-radio/qrq/files/qrq-0.3.2-tinfo.patch
@@ -1,11 +1,11 @@
---- a/Makefile	2019-04-19 16:16:08.354994946 +0200
-+++ b/Makefile	2019-04-19 16:18:30.711734410 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -56,7 +56,7 @@
  		endif
  else ifeq ($(USE_PA), YES)
  		CFLAGS:=$(CFLAGS) -D PA -pthread
 -		LDFLAGS:=$(LDFLAGS) -lpthread -lpulse-simple -lpulse -lncurses
-+		LDFLAGS:=$(LDFLAGS) -lpthread -lpulse-simple -lpulse $(shell pkg-config ncurses --libs)
++		LDFLAGS:=$(LDFLAGS) -lpthread -lpulse-simple -lpulse $(shell ${PKG_CONFIG} ncurses --libs)
  		OBJECTS=qrq.o pulseaudio.o
  else ifeq ($(USE_WIN32), YES)
  		CFLAGS:=$(CFLAGS) -D WIN32 -Iinclude -Iinclude/ncursesw
@@ -14,7 +14,7 @@
  else
  		OBJECTS=qrq.o oss.o
 -		LDFLAGS:=$(LDFLAGS) -lpthread -lncurses
-+		LDFLAGS:=$(LDFLAGS) -lpthread $(shell pkg-config ncurses --libs)
++		LDFLAGS:=$(LDFLAGS) -lpthread $(shell ${PKG_CONFIG} ncurses --libs)
  		CFLAGS:=$(CFLAGS) -D OSS
  endif
  
diff --git a/media-radio/qrq/qrq-0.3.3.ebuild b/media-radio/qrq/qrq-0.3.3.ebuild
index 18cee98d5be7..ad8dcdd3caa1 100644
--- a/media-radio/qrq/qrq-0.3.3.ebuild
+++ b/media-radio/qrq/qrq-0.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -17,6 +17,7 @@ IUSE="pulseaudio"
 DEPEND="sys-libs/ncurses:=
 	pulseaudio? ( media-sound/pulseaudio )"
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=( "${FILESDIR}/${PN}-0.3.2-tinfo.patch" )
 
@@ -32,10 +33,10 @@ src_compile() {
 	if use pulseaudio; then
 		CONF="USE_PA=YES USE_OSS=NO"
 	fi
-	emake $CONF
+	emake PKG_CONFIG="$(tc-getPKG_CONFIG)" ${CONF}
 }
 
 src_install() {
-	emake $CONF DESTDIR="${D}/usr" install
+	emake ${CONF} DESTDIR="${D}/usr" install
 	dodoc AUTHORS ChangeLog README
 }
diff --git a/media-radio/qsstv/Manifest b/media-radio/qsstv/Manifest
index d9063ad2e271..101aa4851aa6 100644
--- a/media-radio/qsstv/Manifest
+++ b/media-radio/qsstv/Manifest
@@ -1,3 +1,5 @@
 DIST qsstv_9.4.4.tar.gz 7716392 BLAKE2B df285cc26c195dce05e54401de4fce70ea91c3af1f774d90d81b62a366c66c3cde4f0cce5c370bad45b81230ca7c2be624542cde10b94d388785d13b49ed646d SHA512 d206c6c108827b607dfe360e7afe31065518f03ab04609ccca9a9bda16207d12966eb49d486d13eebb814716252c50aa5963d090f1e505e508ccb1b6ccc4728c
-EBUILD qsstv-9.4.4.ebuild 1022 BLAKE2B 44dccc88a935574850e264d856b3afacdfe0c8f65e6384b71fa2003691ae52d82a47091ea8fc2def42e10fd2404f9ebc947de07b9c8c93a9e80da50dc7ca87f4 SHA512 4e4016ce9adddef9ff6c34f1ca9dc5a875165800ff1d7ad503023289e79ca0a10929faa895afd80b3bea15e516907a2232b3f65df26c93f55121831138e6c913
+DIST qsstv_9.5.3.tar.gz 7466438 BLAKE2B 8d38f106f72e051bf4d100c3c10c6ded15e69dfb33289206cce34bfde9210d5231c4d4ddc695417d5511aa8f33a08866ddb224dd9140863264a7a324cc2ffc2e SHA512 1753bb498163d17c80c3c322eda2725eae3de17c99e07fd99f4223508c3048521547148d69623f16f4192212a754f415e0f12f5fc98527b14bf00afcb3ae7c6d
+EBUILD qsstv-9.4.4-r1.ebuild 1024 BLAKE2B 3e8aff288db025d9195da16829acb6069702e40453c512dd56629d7a490962b148a5b41c4d80782181a13cdb94e415d306dcc26593df2f17271095d95b3f23c9 SHA512 3e7d740eda8e6f26edf59c51dccc3d29906aa76788a2e5a5c774b7dd2201a4670d6c2100de44ec1a189c0a69936a471cb0277173dfad2601fffeefe5e3890918
+EBUILD qsstv-9.5.3.ebuild 1020 BLAKE2B 572059ecf6dc3c124b32f953e5e3d984291e312e4b751a36d7435ab1f17b08cb6cfa75ad3f9f39498321ecb025339337937f3072ace2ae413378e683997ea07f SHA512 d3ee10d28908fbbfe7f49765e18f05551621e6040bc252e2ee90d3ae9cc3703d29f36c9e46ce3957b060be75c877931a5fbecc8c62c8600fb4315b9c4139a462
 MISC metadata.xml 344 BLAKE2B e091d6e9d0f8a59216bf966dae15ff5d0e588e71a53b936b3dbf979603334407a5e6b378f7a756cd0b320eb0c1294573ba0f1dd3ae392318f854d6c7b482db76 SHA512 e3a236b5b670bb921dd8c7ef87153d16a15ab3b10e4e039c2de68253d56d1356e57d1491c16fac6249265d68639a280f592c62f47d906f4b680fa5571ba9ec75
diff --git a/media-radio/qsstv/qsstv-9.4.4.ebuild b/media-radio/qsstv/qsstv-9.4.4-r1.ebuild
index 6963627f6646..8ff1f20da16e 100644
--- a/media-radio/qsstv/qsstv-9.4.4.ebuild
+++ b/media-radio/qsstv/qsstv-9.4.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ CDEPEND="dev-qt/qtcore:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
-	media-libs/hamlib
+	media-libs/hamlib:=
 	media-libs/openjpeg:2
 	media-libs/alsa-lib
 	media-sound/pulseaudio
diff --git a/media-radio/qsstv/qsstv-9.5.3.ebuild b/media-radio/qsstv/qsstv-9.5.3.ebuild
new file mode 100644
index 000000000000..f5dd486e8d1a
--- /dev/null
+++ b/media-radio/qsstv/qsstv-9.5.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+MY_P=${P/-/_}
+
+DESCRIPTION="Amateur radio SSTV software"
+HOMEPAGE="http://users.telenet.be/on4qz/"
+SRC_URI="http://users.telenet.be/on4qz/qsstv/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/hamlib:=
+	media-libs/openjpeg:2
+	media-libs/alsa-lib
+	media-sound/pulseaudio
+	media-libs/libv4l
+	sci-libs/fftw:3.0="
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	x11-misc/xdg-utils"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	eapply_user
+	# fix docdirectory, install path and hamlib search path
+	sed -i -e "s:/doc/\$\$TARGET:/doc/${PF}:" \
+		-e "s:-lhamlib:-L/usr/$(get_libdir)/hamlib -lhamlib:g" \
+		qsstv.pro || die
+}
+
+src_configure() {
+	eqmake5 PREFIX="/usr"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	dodoc README.txt
+}
diff --git a/media-radio/svxlink/Manifest b/media-radio/svxlink/Manifest
index e32b56681091..32d386a193ed 100644
--- a/media-radio/svxlink/Manifest
+++ b/media-radio/svxlink/Manifest
@@ -6,6 +6,8 @@ AUX svxlink.rc 568 BLAKE2B 7e0fa55b6d7d099778f2b20cf3b85b54a943460ade694bdf75159
 AUX svxlink.service 690 BLAKE2B 7f62518556c7c0fd0a4e759031520181f5a9a61a4d5ebcf874e60e8cd400327feee0306011ab8c88b17b8a5b666cc0fda90244b7a9e5ad9734ec629e0bf3d2f3 SHA512 2879820eaa64bc574e1a2c57492ba429cb4b5748b56132fac8922727a8924197b719075c39a6ab0ffcb698b3cf4b5eb889f19c2aac0a9d143f0aef6de778b225
 DIST svxlink-17.12.1.tar.gz 1621559 BLAKE2B 8a1d9498f451a730ee8d961d4ebd548f34f977367069658bdf4af7d91726e558c9e1ab084423b0238ae1f5fdcafd8e88480b818491e5f91d176d07d81fced5a3 SHA512 90bd74420fcd78d974d12ee13ac792f2a0ecd7cb483ec36ef1085e905f9d6c62af707cb65d04079ec66d7df6da615080a2058a0a559c82171b4882a4b20289f9
 DIST svxlink-17.12.2.tar.gz 1622039 BLAKE2B f67e74605d371f37bddc06f2092d7c9c355a549df2dcfcda3e48e3238dd38d57e195f2fe7edf390e3d48324ef8ab4accf18975ead9216259e484d96597275937 SHA512 cace3894da3b94ae8bd41c47c76c9c6203cb7eaaca6d2c847509b733ed4a6a1dc9ca8c4c16c060dfb0d9ee2982f2a0a2746aa06a5507640d5ed9c9b4fdf90f7e
+DIST svxlink-19.09.2.tar.gz 1730836 BLAKE2B 7fe8a1b018dba7837486dbed21242d8514a1f546b5eecbd2d2bfdf620d7e093cddbedab17f19d5f2cbd79c9a66825713c45a981335f0b526ba0946e764efc535 SHA512 f3c8b29953da3b2f61eba528a07152f40a2aca2efe511cb98637b1ef77fa676e506a3f4766edb81069f13333ddbae2d39f679874455b05286d3daf96a903e1c1
 EBUILD svxlink-17.12.1.ebuild 1672 BLAKE2B a78139f14e1a4d8d8351a7367230df9f5522d3c92124f5c21e4e3f19b181c42ce28d0f52f99398e7ba4a851d7068faa1c54627cb7f4987e258b4329b0b614950 SHA512 bdd8c8ce8841d96fc1ed63287d0f9bf0e8c07b0918449a231bb87debbe1820c890fc64864c41fb0cf07b15393e5cb5034b0e655f4200fb93144f08f4237ee1a3
 EBUILD svxlink-17.12.2.ebuild 1795 BLAKE2B b46352f97710784cf73ecd7e4abbfc0f6087b503bd7c23d5cd295a83579b155048b7e15d62e8632b8dc09d9f81ba3897a38c035cf85082b7b23103c72400dd1c SHA512 4bca680ce3c89d77f0491f31f43f2436fe40e17e433735b71493c70ff299671eec036393f90c0f45ceb0979906d3e5c92598cdc7405dfa777af631a2596d6f67
+EBUILD svxlink-19.09.2.ebuild 1782 BLAKE2B 2d9cbe7a4b86151b94284b9b3c1ee62f2443555f774c4c3e8847b5305c28d413527dff227eca7739a1cd39653b3dd821cf1a2758f29ad1d2f4182a9da9e0e03b SHA512 4fe4a3b67a46d1763ec854e56381aa6f464b872e60c2fa5dc6eb73499d4829f6ef697b3bd56da9e1e29baf930ecc4a51145eafd5dda5b305487253d81fcf2dbb
 MISC metadata.xml 696 BLAKE2B 6bf4c1b0c6be3993885cf24eff479637cb6b99a6bc7b5c671637d12115c125fc63be37753bcaa4abe029504da13f5ed023a7de238ce1b386b4be3baf6944c72f SHA512 fcf27a9ed0fe5b05a6053a8ef965eb9e5a43c9c2510d59fdf14aa0144291ddff290e5a55c08403deffc31d1b5b43db1fb8d2fc92b4784c119341f7778052d4d2
diff --git a/media-radio/svxlink/svxlink-19.09.2.ebuild b/media-radio/svxlink/svxlink-19.09.2.ebuild
new file mode 100644
index 000000000000..6d392debf618
--- /dev/null
+++ b/media-radio/svxlink/svxlink-19.09.2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit cmake systemd
+
+CMAKE_USE_DIR="${S}/src"
+
+DESCRIPTION="Multi Purpose Voice Services System, including Qtel for EchoLink"
+HOMEPAGE="http://www.svxlink.org"
+SRC_URI="https://github.com/sm0svx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-lang/tcl:0
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	media-sound/gsm
+	dev-libs/libgcrypt:0
+	media-libs/speex
+	media-libs/opus
+	dev-libs/libsigc++:2
+	dev-libs/popt"
+RDEPEND="${CDEPEND}
+	acct-group/svxlink
+	acct-user/svxlink"
+DEPEND="${CDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+src_prepare() {
+	cmake_src_prepare
+	# drop deprecated desktop category (bug #475730)
+	sed -i -e "s:Categories=Application;:Categories=:g" src/qtel/qtel.desktop || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR=/etc
+		-DLOCAL_STATE_DIR=/var
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+
+	fowners -R svxlink.svxlink /var/spool/svxlink
+
+	rm -R "${D}"/usr/share/doc/${P}/man || die
+	doman src/doc/man/*.1 src/doc/man/*.5
+
+	insinto /etc/logrotate.d
+	doins   distributions/gentoo/etc/logrotate.d/*
+
+	newinitd "${FILESDIR}"/remotetrx.init remotetrx
+	newinitd "${FILESDIR}"/svxlink.init svxlink
+	newconfd "${FILESDIR}"/remotetrx.rc remotetrx
+	newconfd "${FILESDIR}"/svxlink.rc svxlink
+
+	systemd_dounit "${FILESDIR}"/remotetrx.service
+	systemd_dounit "${FILESDIR}"/svxlink.service
+
+	keepdir /var/spool/${PN}/propagation_monitor
+	keepdir /var/spool/${PN}/qso_recorder
+	keepdir /var/spool/${PN}/voice_mail
+}
diff --git a/media-radio/tqsl/Manifest b/media-radio/tqsl/Manifest
index 589bbd5c0591..4af790460c02 100644
--- a/media-radio/tqsl/Manifest
+++ b/media-radio/tqsl/Manifest
@@ -1,3 +1,3 @@
 DIST tqsl-2.5.1.tar.gz 4462202 BLAKE2B f62afe6003b782e5e092fbd99a90a79cc4b020004092f958dad6f7c695d125e31b28b47e7945ccee1fd88c87b290f93145592cac1bd9c52501c34de901f78d74 SHA512 7578572f64c269a41f3fa62ebe526baee4ac382fac81549e79d676da5dc4f3dd3d2a4ce31bc741b43a07eaf164a33beeb1987dd61df1a92ede7b762a8df532f3
-EBUILD tqsl-2.5.1.ebuild 636 BLAKE2B bf6f6a87b44e3f19f9db08d4a935b56377f1d86ae0f60ff4af8aea2e5f50475fae44a9d41d3282a3f5c623db70a99190ffc4de244f3246e85e80ae69f1eeb82d SHA512 e7adeb8ac8f3b4d10b3410d3c258ebc8a7b3f6f02aa2d9339fe4acfc8d988c1ff1ea7de77d00bf7c44c52f6fe04f3098c2cb7483eef45dce5c4ac622139f4ce9
+EBUILD tqsl-2.5.1.ebuild 657 BLAKE2B 0af55d3464c48f2c8170e5f40ca7a033296130484cfa157ec8b8fa62b10ee57593315b8443c579f5128551cc64a74a608fbef0e1df883103a093e87e1e3c131a SHA512 cc59b5e71285feb782e94ba58e4c97e8973f186da72af4e7bc144f0dd527b7fd4110ff572ac7795f27d162f6047f4106585f338290aaf21f2b513c5f7f206683
 MISC metadata.xml 290 BLAKE2B f7cef55d87602daf43b81563c336871a73782896b4114ef472be770bf6fa28af5672cd6eb846e8a00fd486878d39912f3599fe8b0699683ffd0970727cdbf517 SHA512 77d017e74467e30678cdda40874f4905e78c3589f51d5e0e90952227c10a070ba4132b028d18825134e7bf9a36c98ed7f7b2a19e22324202261c1098db42f7c1
diff --git a/media-radio/tqsl/tqsl-2.5.1.ebuild b/media-radio/tqsl/tqsl-2.5.1.ebuild
index a6cbd247c04e..479817e6c433 100644
--- a/media-radio/tqsl/tqsl-2.5.1.ebuild
+++ b/media-radio/tqsl/tqsl-2.5.1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils wxwidgets vcs-snapshot
+WX_GTK_VER="3.0"
+inherit cmake wxwidgets vcs-snapshot
 
 DESCRIPTION="ARRL Logbook of the World"
 HOMEPAGE="http://www.arrl.org/tqsl-download"
@@ -12,21 +13,20 @@ SRC_URI="https://github.com/rich0/trustedqsl-tqsl/archive/v${PV}.tar.gz -> ${P}.
 LICENSE="LOTW"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND="dev-libs/expat:=
-		dev-libs/openssl:0=
-		net-misc/curl:=
-		sys-libs/db:=
-		sys-libs/zlib:=
-		x11-libs/wxGTK:3.0="
+RDEPEND="
+	dev-libs/expat:=
+	dev-libs/openssl:0=
+	net-misc/curl:=
+	sys-libs/db:=
+	sys-libs/zlib:=
+	x11-libs/wxGTK:${WX_GTK_VER}="
 DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS.txt INSTALL README )
-HTML_DOCS=( html )
+HTML_DOCS=( html/. )
 
-WX_GTK_VER=3.0
-
-pkg_setup() {
+src_configure() {
 	setup-wxwidgets
+	cmake_src_configure
 }
diff --git a/media-radio/tucnak/Manifest b/media-radio/tucnak/Manifest
index aebc08f54c63..49388ae2d88e 100644
--- a/media-radio/tucnak/Manifest
+++ b/media-radio/tucnak/Manifest
@@ -1,7 +1,7 @@
-DIST tucnak-4.23.tar.gz 3550740 BLAKE2B 559f082e19dc22fb119ba6b075f83a49838347bde8856e22a90b9bfc66c8df17ef172967e0e6c4a88a3cfb7764ad36b6fe1a2dd18a9212d8c4637346a8616e7b SHA512 febd5daf943ec4428fe4d77542e20a47d69b017d345aff00ee7e0aca0cc287cf0f1abf3f858051e23aa8d0dffa4146b22fbdb5813d97debb902b91fd99dcd50a
-DIST tucnak-4.24.tar.gz 3556553 BLAKE2B 78f75a6da859937fa36099f9adcb508065800e62d3ad5f9b21f294d86fe0b40f0384e7e15a35d3a0708f5516e117d29667a34653f00009f51ebb582923b993cd SHA512 5dbb129bc638b1f69dd159dd46237ceef1c830922266a663be0437e5f0fee612282a238315448aababb781950a8945f0e2ecf375eef61567291c07acc80526dd
 DIST tucnak-4.25.tar.gz 3588485 BLAKE2B ade2db19e3be9981d4c3813306e347f47df4e89d62a9b2c382f4b5ac04700850af40e63d8b4b13d7f7ae59f47c864c3af4a8fd7eb572919e4163b106da5d9ce8 SHA512 b9666877f322e3142dae6d95e65b7b1da7e14eac5517d11ae108bf96715205558697a80bb40faa20bf89a01385c30869c48aa8af197dd2c206b4bc8f8b5859b9
-EBUILD tucnak-4.23.ebuild 1966 BLAKE2B b1572e6f1747fb61b72ddb6902f9a8bb35d348ca3270c9778184de1a39f9f10c1406c02843f5da5a53428fb2aa0e42bf7305fa3062df6e159e8a28fa71e6599b SHA512 c42d8fc7d31bfaf3cc14d1e3ec68e74580fa56b1d26006882c10d4c457ab4f12519954899eccb47cc9d42734dec50f5f5ceb3bcc0db94e36d37276a2be505147
-EBUILD tucnak-4.24.ebuild 1968 BLAKE2B a5eab8af37cdd38ea0b0f9b0c4da56a7a137c64e1448d986a5a5078d13674bee0eeb48064d3d415f708a9edb3ae8a97f8a946de4d829d4a6931294c43b806af8 SHA512 8143e9ab2b5abaaa2d31b215fbd9b26bf2d28f848ef707caea24378d08d0799b4cf477bb9a5d15b06e0617bb7a21c5a3d5ba35bde1e58735102d517781a06896
-EBUILD tucnak-4.25.ebuild 1970 BLAKE2B d218d6fa3a2447f0983f076d9ad7a46a77374d1a2429c22b2fb2f2594d6b8a422906a29ae9e34ed50eb10caf54b76f9c8446b15c6ed2ed67cce977b7c2f8c0b5 SHA512 4c78b7d2a222360f8cb8d40de6c4c4357b9d871a82068ce7b3d097871757e197d94dccaead83fc99b1d47cfe3e58e192f4c9fde81dbc66c88e16ef780c576b6b
+DIST tucnak-4.27.tar.gz 3589057 BLAKE2B df089401ce82d6b956e2be8f3a069ba3db5af11a0eb7e5cc4b6e9aeeca0bbaa8a82a22f16ad02d5ed89144415d491f8941add457eb61ef9b3fd62e518068da4e SHA512 a112cc02259c3ae05404bf2fb17e56902fe68681be418a89b53eb54e067671236f0764d717334b89949355499f0119db46b1afb8329245ac6ce5db8d514a55e2
+DIST tucnak-4.28.tar.gz 3592213 BLAKE2B 24a6a381367b823e24584541c56b4d34bfeab883cf6e488a42f20fe0f05d79432017f82c10702bd97cdb9a2454129410bfc3a894803ea3aaea8dad11029c702e SHA512 c5186ba331a0127d14f637548c738482ee3050749135404dd93d636c392e1e3b5032b1c92941b22548095d3b3131cc0768f71061feed532c40c8ff1e8a06cea7
+EBUILD tucnak-4.25.ebuild 1968 BLAKE2B 33060a1288edd2bc2f564f58bd541419a43404b0206fb8d62738002f49d01e6a206ab17f986c90326b194876bab55e8e4b477afe48f4c5046e19c3451b846a88 SHA512 8912dc644b499c39dc65c8fa502793f40b498a23a9bade6d0399e2a961304ced5e51342bc0581d13ac123cf247747d083757508bfb5f1501d98a9f1127bb76ef
+EBUILD tucnak-4.27.ebuild 1970 BLAKE2B d218d6fa3a2447f0983f076d9ad7a46a77374d1a2429c22b2fb2f2594d6b8a422906a29ae9e34ed50eb10caf54b76f9c8446b15c6ed2ed67cce977b7c2f8c0b5 SHA512 4c78b7d2a222360f8cb8d40de6c4c4357b9d871a82068ce7b3d097871757e197d94dccaead83fc99b1d47cfe3e58e192f4c9fde81dbc66c88e16ef780c576b6b
+EBUILD tucnak-4.28.ebuild 1970 BLAKE2B d218d6fa3a2447f0983f076d9ad7a46a77374d1a2429c22b2fb2f2594d6b8a422906a29ae9e34ed50eb10caf54b76f9c8446b15c6ed2ed67cce977b7c2f8c0b5 SHA512 4c78b7d2a222360f8cb8d40de6c4c4357b9d871a82068ce7b3d097871757e197d94dccaead83fc99b1d47cfe3e58e192f4c9fde81dbc66c88e16ef780c576b6b
 MISC metadata.xml 408 BLAKE2B 80978177d2257cefae04860fc52e43ea7f0d2221bf4a5b3050fe8057acda81625117b1ba74e7357d40d00cc7fbd44f2dac713494cd8d20679c690cf851e1b678 SHA512 ad015a404c42d5cd0f160907400f545698045bb6c7c3da59816830ec6ed51938a02988c59d4a9ade472a78fd39feeb49ebe6c2a9c625e535a37e44bf19db1b17
diff --git a/media-radio/tucnak/tucnak-4.25.ebuild b/media-radio/tucnak/tucnak-4.25.ebuild
index 74d1b35b9c84..9d0aeaa30bb1 100644
--- a/media-radio/tucnak/tucnak-4.25.ebuild
+++ b/media-radio/tucnak/tucnak-4.25.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.24.ebuild b/media-radio/tucnak/tucnak-4.27.ebuild
index b4c1192a2e40..74d1b35b9c84 100644
--- a/media-radio/tucnak/tucnak-4.24.ebuild
+++ b/media-radio/tucnak/tucnak-4.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ RDEPEND="dev-libs/glib:2
 	alsa? ( media-libs/alsa-lib )
 	fftw? ( sci-libs/fftw:3.0 )
 	gpm? ( sys-libs/gpm )
-	hamlib? ( media-libs/hamlib )"
+	hamlib? ( media-libs/hamlib:= )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/media-radio/tucnak/tucnak-4.23.ebuild b/media-radio/tucnak/tucnak-4.28.ebuild
index 8490a3d7874c..74d1b35b9c84 100644
--- a/media-radio/tucnak/tucnak-4.23.ebuild
+++ b/media-radio/tucnak/tucnak-4.28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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
@@ -20,7 +20,7 @@ RDEPEND="dev-libs/glib:2
 	alsa? ( media-libs/alsa-lib )
 	fftw? ( sci-libs/fftw:3.0 )
 	gpm? ( sys-libs/gpm )
-	hamlib? ( media-libs/hamlib )"
+	hamlib? ( media-libs/hamlib:= )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/media-radio/unixcw/Manifest b/media-radio/unixcw/Manifest
index c930e7398b9c..ea5973e44623 100644
--- a/media-radio/unixcw/Manifest
+++ b/media-radio/unixcw/Manifest
@@ -1,5 +1,5 @@
 AUX unixcw-3.5-tinfo.patch 1212 BLAKE2B 00afb10b8318957f8c4d10ae9254586aef365674822d23da9fdafcc31956252e77ad754c3389ae535b5d78a8611c0750b5609bfd785b6e111d350cc98411eb00 SHA512 370f2bd601546dd5043dedf1387783c425d15d0c52a8f357c4bb1bb9eb0ebb8b54bb4afd79db14314603bf23838568041c590c830622017bc05bd9bfd97baf6f
 AUX unixcw-tests.patch 533 BLAKE2B 0b2c08f1f2bb9db4ad2c98a4af7d2097f408e873cde8f03b46c994adcbb06ed0a20f95e2951c55810821b92e7a3e529621914308726233a108879e3341e98cf5 SHA512 331a7e71a3f9686b08ce59e06e59d4812dd36c4e2597a0ae57f663c2c0b7f32eca3e70adbc1769886b12856ed2d96bd9f4279f95db70d401e31f477b183fa2b7
 DIST unixcw-3.5.1.tar.gz 740331 BLAKE2B 9b5b4b819cf75ca0b10d773ebdf9869bf835c49f10c54b5bd34441b417d48d9a92abc9390a41870bf1c09fbbfe932554307abba181cad3b8631947adcf9890b1 SHA512 b59499723d810a537a2f5ab2b4b34c83a1c8c815af82a60ba29f4d9cee445525e530136f4e202db6b87305ac7a818fa6e59214a45c6bffce299eb50b58c866e1
-EBUILD unixcw-3.5.1-r1.ebuild 1976 BLAKE2B b2bb72875a8729c82b8150c2e743c0364845ccbfb0e41adcad49abcab88747dc347825b03693838fa21ff86e36410de4e936749d64564468e6c5ce1b2aef9460 SHA512 222c85a253ec0992ae8ca90c82fd5160dac6586a0bbc2cacb5fc5de3e1178ff2a3c19e98cf7d610ea4827417a794ae8733243bb6e2259c2f82ea94c8fac7c984
+EBUILD unixcw-3.5.1-r1.ebuild 1980 BLAKE2B d7c577e1295ce61faa5d2099281aca2354279aa170722e1c900bf9b5ac12865e0300f4e567bebcac90c9e9ccb4f663769f495fc9ef0176b4c8c859303da2a4c4 SHA512 da0a2afc4bd2d9ffee89e645097cdf171ec7f1ef2d0ee8fc9aaad31e1a972cc1b513b1c25a533156ea95184d664c63c62cbf693c91dc7e91a3d8f5f330b3de59
 MISC metadata.xml 874 BLAKE2B 3927a605bcb0b3459888fcaa77a528020ed037beeff2b6e750102efc1cad99633cd94f7e6d87093c08133949dc40ea46ad5f1d44a497ef1aeedf2afd77592b29 SHA512 b4040ecf973492b76642e7df2e2fa41b6cf057490a1674e4246479b084e5a3972d109eb203337c0053c2d6924a3b2597ee42684ffb4431c8147e90d5a208247e
diff --git a/media-radio/unixcw/unixcw-3.5.1-r1.ebuild b/media-radio/unixcw/unixcw-3.5.1-r1.ebuild
index 7391c5ffa589..56f654e4a8fb 100644
--- a/media-radio/unixcw/unixcw-3.5.1-r1.ebuild
+++ b/media-radio/unixcw/unixcw-3.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,8 +28,8 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	append-cflags -std=gnu11
 	append-cxxflags -std=gnu++11
-	eapply -p0 "${FILESDIR}"/$PN-3.5-tinfo.patch \
-		"${FILESDIR}"/$PN-tests.patch
+	eapply -p0 "${FILESDIR}"/${PN}-3.5-tinfo.patch \
+		"${FILESDIR}"/${PN}-tests.patch
 	eapply_user
 	eautoreconf
 }
diff --git a/media-radio/wsjtx/Manifest b/media-radio/wsjtx/Manifest
index eeb7dbba128b..c6e3c7e88838 100644
--- a/media-radio/wsjtx/Manifest
+++ b/media-radio/wsjtx/Manifest
@@ -6,7 +6,7 @@ AUX wsjtx-clang.patch 619 BLAKE2B 8019381b563bfede3977e37c96c0c664089458f0be7704
 AUX wsjtx-drop-docs.patch 425 BLAKE2B facdb48f573ef35d74b27b03abd9983a8df162d8843ca846285e2525fe86e4eef2892f0203c64939a9ca5478e27795415487d14eee8ca6cb0a79d0c15f9c0d6a SHA512 2c5000551313b6ee81e50841d286478bb0dba8b8df31e97cbd09ee84ae479ada8ee7fb84fb464c1524245d7b8a24a00f70fb8429a2c67e41842410d939e1800a
 AUX wsjtx-fix-unicode.patch 565 BLAKE2B 02d26dc1b1b51e9ac38feb866ecbf38e58b861c74b3a7dfb1f210d41945a8fa11ee62844416f3a6b0cccb847d393986ccd74a7db2d920382ce7c53e997d3a612 SHA512 ed3cf5972325aaccdffea7d99bd9ae4f32ecf80cf2ded57a738c491bbe0e75e538663342d3efbe7a35811d206652ae5939e2c7b2a65a4a22451b593ffa504dbf
 DIST wsjtx-2.2.2.tgz 23213092 BLAKE2B ce558180208ad33ddf2089f1747630cd07975547ba93bb693698ce599caec8d3d3367128581dfd110c6fe240bce9a0e6b8351ef178e6b53f3490a29a96367460 SHA512 923df18f5cbbd3e40294ccc4d3730f40c13c7777345723b9e66063ff0dd7db65caa9a64323711201a73b8c455dc1c29f67e4645dfbf98e0fc2c60a1630ce6cd1
-DIST wsjtx-2.3.0.tgz 17245200 BLAKE2B b6fc4c080008ae32ef823ecb397ed4e5c2d47b878ee37ceaf23dbc36e9b894b7d167c9b8deb92d02a5714ec46383aa34755432063da8b1ecd5554c9cb8b00ce9 SHA512 1b521a7c81d235b2f17b2a314528f5f9fc8b29de95a2f7f5471104866ff13d138f9913666bc00de71f34ed16e692f0f4b93c878cc3538d30a52852e4c179702c
-EBUILD wsjtx-2.2.2.ebuild 1669 BLAKE2B 487b94915ee24bd0352ff5194e6d7b4f87292a8dcf3e0cad6078e55e8bdf99d7cedd6c77b389cb5c6fe6f1bfad1a285832e1a5d62faee575ad3b386605f6c22d SHA512 866eee1a472616fd6149d6e63dc278d91cbcdee3f475f535f1ef34e2e287ade2de974a7c59cc969d56a029fcc35a08144ab38c4969e9f654588684facba3f5dd
-EBUILD wsjtx-2.3.0.ebuild 1685 BLAKE2B ac4bd6af7be77994bb6bb5d7bc9ebca550ee05168d855e945d990a7127c1accbeaa018f6cce7f3f608cc97bbfbba003349ab5f0d1a3b27196a7923e40d3d9a4d SHA512 cb24564d3112a94941b798fe754e33789b0fdd4ef2efe8716988d4d5843b72a58a790766d7c073c63c71a46004a7b7177680e27ebf1e4c857b05d50d1a4bb1d1
+DIST wsjtx-2.3.1.tgz 18040272 BLAKE2B 37b90842470d5565d49d5ed7b9d92207904216d29b8a9966dc38142303d48e92eb640901e4f0a80350f915963f725e36daa7c6fe8034743d30a253eeb02f9e1d SHA512 0a709ca605fb8d93f7583393ec4bdf6416b93233e2910e7e59942f4e40bdb9f2591e3e4b8e0822f49e104e74198a861ed2995cbb4976c7597ef1a1bd6fc43b44
+EBUILD wsjtx-2.2.2-r1.ebuild 1671 BLAKE2B 015d7ec6d9a89a5352c45965795e9456d777337e5fe41ce536ab8b042e4cb57bc28a3cbe020ec8cf8ed758600800d291d7c371fea1e8153d7d8ed6cccd5c67f6 SHA512 fd2fe389e95e4dfc90c0be8e9fe7bcfcc05d775f9655f6d13bc0c9b5e4492a84cd08e5be88dd0bdba5ee1715f2bd44f4598287059407e98f9e914cd34b58c94c
+EBUILD wsjtx-2.3.1.ebuild 1685 BLAKE2B ac4bd6af7be77994bb6bb5d7bc9ebca550ee05168d855e945d990a7127c1accbeaa018f6cce7f3f608cc97bbfbba003349ab5f0d1a3b27196a7923e40d3d9a4d SHA512 cb24564d3112a94941b798fe754e33789b0fdd4ef2efe8716988d4d5843b72a58a790766d7c073c63c71a46004a7b7177680e27ebf1e4c857b05d50d1a4bb1d1
 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-r1.ebuild
index 47399ac280d9..84e70327f729 100644
--- a/media-radio/wsjtx/wsjtx-2.2.2.ebuild
+++ b/media-radio/wsjtx/wsjtx-2.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,7 +25,7 @@ RDEPEND="dev-qt/qtcore:5
 	dev-qt/qtsql:5
 	dev-qt/qtprintsupport:5
 	virtual/libusb:1
-	media-libs/hamlib
+	media-libs/hamlib:=
 	media-libs/portaudio
 	sci-libs/fftw:3.0[threads,fortran]
 	virtual/fortran
diff --git a/media-radio/wsjtx/wsjtx-2.3.0.ebuild b/media-radio/wsjtx/wsjtx-2.3.1.ebuild
index c6c1be8efa7e..c6c1be8efa7e 100644
--- a/media-radio/wsjtx/wsjtx-2.3.0.ebuild
+++ b/media-radio/wsjtx/wsjtx-2.3.1.ebuild
diff --git a/media-radio/xdx/Manifest b/media-radio/xdx/Manifest
index f8e82a446e8a..7c10438b3c91 100644
--- a/media-radio/xdx/Manifest
+++ b/media-radio/xdx/Manifest
@@ -1,4 +1,4 @@
 AUX xdx-2.5.0-fno-common.patch 720 BLAKE2B 9ac513df6b9d6f4bd4ab34f97ec3bf5d7815d441b85b4ec6dcbd2b1318988b76660e9997bcd39a9585761387ea1aeb617ae98ee37bf74393848e46078487d502 SHA512 43c1a08ba59a06a8d8d6984e78a117328f4ee8910b8cef2cb66e6415a432a54131a48f8018e4fc4c2f85562bb9c3cbd79bd087fd6b57810088bb4ffb5fdb225c
 DIST xdx-2.5.0.tar.gz 342548 BLAKE2B 58f0ab6740f77460d7fc6d19fa7d43a399de4a79d5647174491043eded515dc03e2fb97de8d10e5be16f5ff2b65dda96be78b5710e52c02d48ebcf23b575e6c4 SHA512 e03ac1fde04f921d33a7075a0f9ddc632336c2c4506e69c3e51386c25080c527eb7195729a89edb895308beff05e7544c93831ad03df6db376b9624063a2972a
-EBUILD xdx-2.5.0.ebuild 838 BLAKE2B 8a004da7c5d7ad7541eff68ef4ebe493987af67191f4e27bcf0006b68196ad20af400d4210f7301c8ac694e826166c32bc8b52016cb43325ed2c6793e42c2b0f SHA512 0b14aea08da15e73b6ecd4495293724e9e4f8ece123e5ed3e51c6a268baaca7fc47f7cdf765567d77d53dcfce9fa9599964f51603e3214385361426244954a4b
+EBUILD xdx-2.5.0.ebuild 822 BLAKE2B 91f1e4023e08b69e9f260506da49f9e752694d89bacee57f126d5e1ceedccfaeec2368070e1abf516b9ca89d7829a41d642a3fbe305237cd1af8f71df6e27015 SHA512 959c77045d2abdeec946fbc165a888924706dd7fa9cff208cf2153fa9cc657d68b0205c5df8b1224e15a57c0507dcd40bbd7de721f3cd0405e7abbab202f94e4
 MISC metadata.xml 335 BLAKE2B d8d6b599df79920e9b97d52adf01f12668c12d61a546367cea81fa7ed31d8bcbce7e4b124cc8e575d9064ed4086e1de32d26b985add25c83ed417ea71d3f7524 SHA512 491d22817b73ee8eda2c59a361682fb63ee8eeaeb15f610e7f55ffbf297f85b667c33ebad1fe1739d36f5995ccaec77d363a9c53f1976742c338553c347c5f0b
diff --git a/media-radio/xdx/xdx-2.5.0.ebuild b/media-radio/xdx/xdx-2.5.0.ebuild
index ed0eaf1b2f52..0078c84ed621 100644
--- a/media-radio/xdx/xdx-2.5.0.ebuild
+++ b/media-radio/xdx/xdx-2.5.0.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-inherit eutils
-
 DESCRIPTION="a GTK+ TCP/IP DX-cluster and ON4KST chat client"
 HOMEPAGE="https://sourceforge.net/projects/xdxclusterclient"
 SRC_URI="mirror://sourceforge/xdxclusterclient/${P}.tar.gz"
diff --git a/media-radio/xlog/Manifest b/media-radio/xlog/Manifest
index 71538ca4953a..af6bd4c91035 100644
--- a/media-radio/xlog/Manifest
+++ b/media-radio/xlog/Manifest
@@ -1,7 +1,7 @@
 AUX xlog-2.0.13-desktop-update.patch 1393 BLAKE2B c44070ad106834a89fa2323b33d5df90f2eaab50e0e3d2a03884a2f997f1e9cf0ac4c9e03e819956e7af09dc538729baac0ae8ac612f06f1b4a44929047795c1 SHA512 7e4f9f83eabf9a598e2e1382c6934240991f3743da50eb0da6b7532435d2dce3264e30aded7b6ca32a685b9b7c203f694268c500c89be76175194c0900296865
 AUX xlog-2.0.7-desktop.patch 435 BLAKE2B 56fee116a69c99f5192f1a2e4804821d715dd15f927525694100471b296412675eb97237c7e239cc407a2ffb145dbf779e802c1a1f5914a064d70f73ad269d12 SHA512 5119356e9635ca7b6d028d4bb3be12542636ce5d2967540b20ad9c22d62792b81a1a06fcd8722c7cbe8df706d8113e60b308d1db7c6fa8f3238bea039eb4b4f6
-DIST xlog-2.0.19.tar.gz 11431541 BLAKE2B 0bfe396167580808344a4b0e0974959930ab577a18c0d71a70c7c020a433a150baf5322f58682fc4604718d739e01004447dffcdd325c3426d776995dd684d39 SHA512 b69e592f97fbfbd989378a2b74036f4a169be3ca1f5b7ba8715e3a5293f1efbdbc431b0c09a305c2ca0190953777010a9d9a9b53caea8eb26609111b4f7da40b
 DIST xlog-2.0.20.tar.gz 11437051 BLAKE2B a6d6618b62d1f5591cf44efe4ce2e3ba8a1f27bc2fe218f0b65d05f26bb2f8abeea69d3ec2c2009f50209257769647bc6fe9307999f5fede5b72cb0ca9259b16 SHA512 50feaede582ea505021c5530efa702915f2ec6f64e4677055657adbaefca92b3b45b6c6fe5af8d65ed2ae38d0d0e4cda6782fa7781516b5263f738c90fb17c89
-EBUILD xlog-2.0.19.ebuild 1673 BLAKE2B 32833a48e0351c595b73f6fe771ae6382321623bad195e62d6e691cdd31bfe8b5dad7f3f75fcd50b138a8d4c758015dd7e59fa9d0f6d1c84134d42d617c74d35 SHA512 7af3c3a52c013447601f6edc023f836999755e030c374f5aa9771e5ee49d3879753e5eaf51fa585daf3d6da260392587d8866c55cd03e85e4bb08cf0196290ee
-EBUILD xlog-2.0.20.ebuild 1677 BLAKE2B 0871e9041fa57796402fd9ffc1e25f67a65a31150b496ff6677d849198df820d2d52664a488bcacba75fe2ea2a199802caca4a51fe4693f721e5985e553a6631 SHA512 3011950454167bfaef91f3f0016a534e0b4e74a20e2a653945d0d34b6fbe6a51fe7047c9481578f7ec9908d0572d0c68f702e31c8670ad2ae4ae9b437ed63052
+DIST xlog-2.0.22.tar.gz 11407849 BLAKE2B 85d2e904d33ef39883cb8ac086eed4dc7e65503cdccb95e8d33f169d12de4f1ed556a28ac2f40e0044e937185bf4d93fe55608088d6e95744617c9c3a051fb55 SHA512 a261f8e28b75aed9380c29b3da69c7615b0d32346eaf84a0ace5cf77c53407372c4985c599078dba5ed92f77bd8052a74c7dca40028b99bca49cc3164d4ec490
+EBUILD xlog-2.0.20.ebuild 1675 BLAKE2B 9fe9b75b047031fffa73c1a02d53ec550419b4f39d6c08b11acca00efef89318647f6ae753d54b9e8e61ecad9d6ec6833370fdd21b4e5f8865c418b61dc8b2ee SHA512 91cdd27e7805063853a08cfcd214a4f1ee57c4dc7dad8d28dc9137ce8979fc49d59cd5c1b1d0fce8a59fab165b847055800d0ac0605196df9903d919057469fe
+EBUILD xlog-2.0.22.ebuild 1704 BLAKE2B 28528457ec57e17ceeaeddc32ec8eb0b8c41a87d31eafaab9561451e54359459be26400d26aec652b8200b528299c7c829178e0835d4c0e4e2055035b420df6d SHA512 55607f0e99e77d3d04cbf548efe5b1504b32d8a37d9b600dcd74cbaac34ec84f82ed9c10b258042e3b6ff11f59218207ee611a845f0825822b97f7e06f93121a
 MISC metadata.xml 245 BLAKE2B 1d0fb3b909203735db219043a3b6ad6a2f3fafff1813f9c9caefdb9206262ff73c4ce6b93c0a8ec7d157148cea478b38d0c835ac9948a66d8ed81726f1b4d93f SHA512 9289d414ccbc30198596601b290cf42a583a093bbd7c5f8889c8ac0e81d8570bc4d42dfcbfe210456120edb910ea8572d6806400adec144f4eeb95fa36ae6ef3
diff --git a/media-radio/xlog/xlog-2.0.20.ebuild b/media-radio/xlog/xlog-2.0.20.ebuild
index 0af194321353..60591aa739b1 100644
--- a/media-radio/xlog/xlog-2.0.20.ebuild
+++ b/media-radio/xlog/xlog-2.0.20.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:=
diff --git a/media-radio/xlog/xlog-2.0.19.ebuild b/media-radio/xlog/xlog-2.0.22.ebuild
index 37de4d851ef7..b3ac50566f61 100644
--- a/media-radio/xlog/xlog-2.0.19.ebuild
+++ b/media-radio/xlog/xlog-2.0.22.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools toolchain-funcs xdg-utils
 MY_P=${P/_}
@@ -12,10 +12,10 @@ 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
+RDEPEND="media-libs/hamlib:=
 	dev-libs/glib:2
 	x11-libs/gtk+:2"
 DEPEND="${RDEPEND}
@@ -28,15 +28,14 @@ S=${WORKDIR}/${MY_P}
 DOCS=( AUTHORS data/doc/THANKS NEWS README )
 
 src_prepare() {
+	eapply_user
 	eapply -p0 "${FILESDIR}/${PN}-2.0.7-desktop.patch"
 
-	# Let portage handle updating mime/desktop databases,
-	eapply -p0 "${FILESDIR}/${PN}-2.0.13-desktop-update.patch"
 	# Drop -Werror
-	sed -i -e "s:-Werror::" configure.ac || die
+	sed -i -e "s:-Werror::g" configure.ac || die
 	# fix underlinking
 	sed -i -e "s:HAMLIB_LIBS@:HAMLIB_LIBS@ -lm:g" src/Makefile.am || die
-	eautoreconf
+	eautoconf
 
 	# Fix broken png files<<
 	einfo "Fixing broken png files."
@@ -48,12 +47,11 @@ src_prepare() {
 	popd
 	einfo "done ..."
 
-	eapply_user
 }
 
 src_configure() {
 	# mime-update causes file collisions if enabled
-	econf --disable-mime-update --disable-desktop-update
+	econf --disable-mime-update
 }
 
 src_compile() {
@@ -62,6 +60,9 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install
+	# build system makes it complicate to inhibit updating desktop
+	# database, so just remove the offending file
+	rm  "${D}"/usr/share/applications/mimeinfo.cache || die
 	docompress -x /usr/share/doc/${PF}/{KEYS,ChangeLog,TODO,BUGS}
 	einstalldocs
 }
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /media-radio
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)