gentoo Easter resync : 12.04.2020

22 files changed, 279 insertions, 135 deletions

diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index 9f317299864d..fbbb8c42b98e 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 2cd2a382a703..c27bd90dcdc7 100644
--- a/media-radio/ax25-apps/Manifest
+++ b/media-radio/ax25-apps/Manifest
@@ -1,8 +1,11 @@
 AUX ax25-apps-0.0.8-fno-common.patch 3406 BLAKE2B 528aa74bfb7a6b51215dbc4ace9b257d9bde40dd447051c1484f9bfb82df38befe8de39cc1d91d60a9065e4227c4272606a05d3351dd1d36bf9da148a44df36a SHA512 102672cffc39a942e361ebffc3d1cd910ef7977b653e8c9d1165f5bb0ca456d196f1d63dcaee55e4ea9e257c6d37c053a451c0477a916b50745e7cec2e14aa2d
+AUX ax25-apps-0.0.8_rc5-tinfo.patch 696 BLAKE2B b17b0888a7b571ad039281ee6df87aedc9549c53e08e75ff65f6c022ad643d0e92d24d9c5a8487a4b7669fb2dffe70dea8d89a774b3f6967a793963c58c2cf27 SHA512 930d1edcd56b99c9337a7306a492a9514fa38399b74ad2d6a9d80369cf5f78d86d1f2043f737fb072071db75ae937b2fdec3260bc53595ce28c7a08c47b9f80a
 AUX ax25-apps-0.8.4-tinfo.patch 582 BLAKE2B 6f5431add14ef4c2ac789d6a3159ec30a4d0a92336a90773968453658964a18db9a6afb2917e41e3688d121718f86d5ee5205effb23b8db4c29155b6eb949b45 SHA512 901218e0dd279f61892e0eadcdcb9e1bc46007c9735efb658f1ee1bd0bb6df9ab8704eec1087ce7550674e03fe643ea13811721c28f9cf0be445e881cb19b626
 AUX ax25ipd.rc 379 BLAKE2B dfc102809a52feffee96d0a5f67874f9241b26a9ee18ccf88a5c04f154f0681f8b9da9190bbad81588de805e10bd49ec0fb0c534f5861405ab0ca59129852a33 SHA512 ce11d6f4bd4f66d79feafec81cde34a62278c9a980299da2feedba8137df8efc607298ff03324dc02ceaacebd2fef9e3a100533b887ba44dec191b759d8e1e67
 AUX ax25mond.rc 383 BLAKE2B 65f830cea757b7c649ab31480e7beaa0e8b40017c3fd59559969942c27c6459340dfa0223de829049bdc0cedd67a2441202ecca60c341162f5eaf621c6fef01e SHA512 c8d8dc7ada7fa427da85b794969e821c5e3cde66871427d36fa5cfc3a03c30735d869444594f3f17074529465325c7b48806a67257b9b3e0ef3fa6ca258e90c2
 AUX ax25rtd.rc 379 BLAKE2B 823318cdaf456d0536d843ddf0a25e2a614ddcc6dfe69f98b7c6c8dda555ef6b2977b873c9e35aaab10974f1ea3d91d8743798f228665908859dc33ff34f3708 SHA512 95df04124449a652bf76a60822c9468bce71d02490beadef409975da3709f7cf2a43ee9088468146d985464a6992125c90980e38efd397c145799cca537ff8dc
 DIST ax25-apps-0.0.8-rc4.tar.gz 442172 BLAKE2B 59a622c0e675cadc90a7d728b899b1820153d6b9e35f3ccdbac74d191f844d1642dd2e9192d6dce0f1208cbc26b98cb1643f8d1041ec3802b833ad5cbc903f81 SHA512 c99b553c5cadb0e389c1cb35e79fea61b628c76f5ef35c35876e492afc7ab796f8781c3ab5987a096f0816389e9772274fe54e88c16fca0fd30013da3d74d38b
+DIST ax25-apps-0.0.8-rc5.tar.gz 479590 BLAKE2B baa4814ebb68c435a9986158dcdad1333376c75202db8e3595ec35851fabb3c718e7015a721d587ee307b8b8c918a690b898addcf4194532f6d26b70219c4c98 SHA512 5886f79dcdd4b02374289e04a61101b1ccdcdd936a6a98bdefa7b091689381de75f722a0bf32a914c85a3759c7b42489fabf74a53492fe2f937b22c953fc230d
 EBUILD ax25-apps-0.0.8_rc4.ebuild 1121 BLAKE2B a8fc996669ddb0649340c40504fe0777621b0b555e553f0284fded4f85b9cd504b036a357a22e7a103e794eb1bfb8e7afd21cde3b6f5302ff32f979ae95f98b9 SHA512 92f3f3aba2a5307884c198d92d90e2bdacf57d8866815233859519b6b23cbb924a02b2289a28882016adfae306f76bd84dac60655614471ca89a03b2daeeed23
+EBUILD ax25-apps-0.0.8_rc5.ebuild 1174 BLAKE2B 7b57a64f8458b02dd846d23786b9ef28fcf0348e5a0565256549d2d5c4596b91e209d40debea4035f66209916b6579d00b9c2ff8ff2a407c417ea2157baea5b4 SHA512 1681b1265656bf0bb302966ff92e667ffaea4c4e4912759b277aef116142d0f1741288a0cfb7f7ee3fea3eefc652b25a74a6ab920d0c842911aaa3820dbf0ae7
 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
new file mode 100644
index 000000000000..939745d86500
--- /dev/null
+++ b/media-radio/ax25-apps/ax25-apps-0.0.8_rc5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Basic AX.25 (Amateur Radio) user tools, additional daemons"
+HOMEPAGE="http://www.linux-ax25.org"
+SRC_URI="http://www.linux-ax25.org/pub/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/libax25-0.0.12_rc2
+	sys-libs/ncurses:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	!dev-ruby/listen"
+
+S=${WORKDIR}/${MY_P}
+
+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
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/ax25ipd.rc ax25ipd
+	newinitd "${FILESDIR}"/ax25mond.rc ax25mond
+	newinitd "${FILESDIR}"/ax25rtd.rc ax25rtd
+
+	rm -rf "${ED}"/usr/share/doc/ax25-apps
+
+	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
+}
diff --git a/media-radio/ax25-apps/files/ax25-apps-0.0.8_rc5-tinfo.patch b/media-radio/ax25-apps/files/ax25-apps-0.0.8_rc5-tinfo.patch
new file mode 100644
index 000000000000..7c49d6cbb942
--- /dev/null
+++ b/media-radio/ax25-apps/files/ax25-apps-0.0.8_rc5-tinfo.patch
@@ -0,0 +1,14 @@
+# fix tinfo handling (bug 529776)
+diff --git a/configure.ac b/configure.ac
+index 0c4398a..097d1bd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -18,7 +18,7 @@ dnl Checks for libraries.
+ AC_SUBST(AX25_LIB)
+ AC_SUBST(NCURSES_LIB)
+ AC_CHECK_LIB(ax25, ax25_config_load_ports, AX25_LIB="-lax25", AC_MSG_ERROR(Could not find the libax25 libraries; aborting))
+-AC_CHECK_LIB(ncursesw, initscr,NCURSES_LIB="-lncursesw", AC_MSG_ERROR(Could not find the ncursesw library; aborting))
++PKG_CHECK_MODULES(ncursesw, ncursesw, [NCURSES_LIB="$ncursesw_LIBS"], AC_MSG_ERROR(Could not find the ncursesw library; aborting))
+ 
+ dnl Checks for working glibc 2.1 headers
+ AC_CHECK_TYPES([struct ax25_fwd_struct], [],
diff --git a/media-radio/ax25-tools/Manifest b/media-radio/ax25-tools/Manifest
index 4490b120e984..3896dfb25b38 100644
--- a/media-radio/ax25-tools/Manifest
+++ b/media-radio/ax25-tools/Manifest
@@ -5,5 +5,7 @@ AUX rip98d.rc 375 BLAKE2B ed2a72057b01d168219bbb94cfdf24dfbe5ab82ecc1c7945d7a4a4
 AUX rxecho.rc 375 BLAKE2B 0500e79dab2ed7fd2488a9a1a72344bc1ee1a8433c2703c4d63d0671e4cee11d9af5111ced837141c033db3406943eda2d128a718687d6389679d60f5649b326 SHA512 4787767fc0a2c7fda39b2817dc9809a72e666bbfe98b40d9e335fe00fa5a1136fb900b6d32f58b37edffb85327482a75063d3caef7c02c40aeb46f6158bb575a
 AUX ttylinkd.rc 383 BLAKE2B 9dd842128b64751696e704ad4a5e2930e103a8bb41931186bd60e26ed66697441abca16b52d61dfbfb2ece58c49e4328aa20b4c7dc810f26a03390b5313f5072 SHA512 499f9373ecdc76b863e43d3d508231754707087197ade8b9e9c151186e953c40e57528773ddc2e8d3f116daa16ba286bcab34b6e46a6870965780c459045a9ed
 DIST ax25-tools-0.0.10-rc4.tar.gz 364332 BLAKE2B 36ea9c72ff69a7a66927e78fb6733c64114a719d80cfb4732ccc0b54951b105a18e674e35d3c59806489f9679aabdf12ee629c41ae0f23ffdc5da26d1aed0d88 SHA512 874d1ad0097f589af0b0a72ac33d6c7d64586df25779ef1b4c0a832fdf5e528ae5101e56ded736cb2a1ad1b284d6c10fe3a77ecb43df04dccc3d80875f403612
+DIST ax25-tools-0.0.10-rc5.tar.gz 372851 BLAKE2B 1129e3aff22221662bfe3840288922e60236bbd09ec1f6be72ba4a9ef51a818923af55635bc50b5f6b7befd716732dad3536282b8875d7a996518dcd8c02342d SHA512 4aac4e53af5924f8f0b807bdc406fbba43043fcd33c509c1129f009e6cf8854abdd8f11087d17d9710fac2b231e80aca630ca17b8a2fe771f49df2c480c059cb
 EBUILD ax25-tools-0.0.10_rc4.ebuild 1097 BLAKE2B db0a0c43b1971a0c784506befbb084040fe4a62124315f6957a8956a418961e482ba9b2d85a35a4da5683f35ed4233dbfcdf00fcb8ffc36aa48700db4e279140 SHA512 de1fb085661b171e5be7c32f84d003e636bb9b8636d75562661306819ef5eefba9e42dffe0926167660742aad35f6137d718c7ed201288da13c1d2ab90686151
+EBUILD ax25-tools-0.0.10_rc5.ebuild 1022 BLAKE2B 8b7dc6cc81c5592e4f42e2a754935879434a5b53ac8106a386add1a0cbc091cf50e3ee73a86147c979302087414fd7f77ab8f220e441dc6d1214058cc4224cc4 SHA512 d5cd79657abc496164cc56e466b46fa0cca02f7622ba6bb79f03f4b8e8d9be16f262ddd40a0223ae8aaee5fe486e314013c955ee4372e26d4d60e41fea56ba9b
 MISC metadata.xml 329 BLAKE2B 423d1e9a4f83fc56ce5b9e13e26abb294f527809056a2d5c3c32dcb2a4b1c737e25740d14684afe9b89721bbd9ed3341bbe72bdd2bacf1275f8b50f8b86bbd76 SHA512 70660dbd85b868803cd2c8b27de8a6b5d81544e3c4e16d9a6ebb00be1fe074729f357ba06f6be5fad386bfd35f714a99c28c1bfe092645c8e6b4dcb29574d090
diff --git a/media-radio/ax25-tools/ax25-tools-0.0.10_rc5.ebuild b/media-radio/ax25-tools/ax25-tools-0.0.10_rc5.ebuild
new file mode 100644
index 000000000000..a6d3cf76491a
--- /dev/null
+++ b/media-radio/ax25-tools/ax25-tools-0.0.10_rc5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Basic AX.25 (Amateur Radio) administrative tools and daemons"
+HOMEPAGE="http://www.linux-ax25.org/"
+SRC_URI="http://www.linux-ax25.org/pub/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X"
+
+DOCS=(  AUTHORS ChangeLog NEWS README tcpip/ttylinkd.README \
+		user_call/README.user_call yamdrv/README.yamdrv dmascc/README.dmascc \
+		tcpip/ttylinkd.INSTALL )
+
+S=${WORKDIR}/${MY_P}
+
+DEPEND="
+	dev-libs/libax25
+	X? (
+		x11-libs/libX11
+		media-libs/mesa[X(+)]
+	)"
+RDEPEND=${DEPEND}
+
+src_configure() {
+	econf $(use_with X x)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install installconf
+	einstalldocs
+
+	newinitd "${FILESDIR}"/ax25d.rc ax25d
+	newinitd "${FILESDIR}"/mheardd.rc mheardd
+	newinitd "${FILESDIR}"/netromd.rc netromd
+	newinitd "${FILESDIR}"/rip98d.rc rip98d
+	newinitd "${FILESDIR}"/rxecho.rc rxecho
+	newinitd "${FILESDIR}"/ttylinkd.rc ttylinkd
+}
diff --git a/media-radio/dxcc/Manifest b/media-radio/dxcc/Manifest
index 7b5a3075510b..e96f919a6f0f 100644
--- a/media-radio/dxcc/Manifest
+++ b/media-radio/dxcc/Manifest
@@ -1,9 +1,7 @@
 AUX Makefile.patch 867 BLAKE2B 0eaed32692fabaa24d65ae5e52943f16bd6ec6ef96e60d7226f68a5997c41465955abe097f5d13bdcc3f678002b67918f36cd0f0d92f3cbdb925de221fe9f41a SHA512 be651068fa3c4735fc4514d7b97a7bd72483d1e6ca82c399e4bb1861f2ebb88009df9d22a23a383b22b8e7322ce510b7c499bb032c6da56051bd122942c40803
 AUX dxcc-20190309-Makefile.patch 919 BLAKE2B 457e5178742fb6247a0769df96ec65b3c80cd138471aa0ace6a41bf91fbc3f512699c642587f9799aa29fae8910f63430f5a5eb0378b18f203069ba1c0f3f33e SHA512 379da902c2a80ea8d3cdc26212f1d9e8f951ac3eaaad123d3ae07c9193f0cf12f538e3bc39d7e5cd25614a9a6837bddd01e53049422514cf4d2ebd2ae4079332
-DIST dxcc-20080225.tar.gz 110774 BLAKE2B 45673644fc3fdc0eb3ec072df64ee79441a1c7e5afcbce7e5b33c159eef75c254fe2796086fe9a1781293e8a1671e9cfe872f6ef8446d34f6168ec9cbd9f9fcc SHA512 ef976d5c94b488d3dec132850f9c4da34caf02eee77a8c38a3fce5ccb033ffb848d5814eb72756d04235b9cc454f17f4c31aa47295c9e9cecec716ff32bf3df7
 DIST dxcc-20190309.tar.gz 175488 BLAKE2B 46ef8e87e0c70b4d58f3a6533f651aff078502705206f145dc25b5380db0019faa49dbb9003896c4ace33f35d59b349155bb77584d235700ea4532f71744fb44 SHA512 c7bad51ade05d60aa077b24c87bf5370728038503e190808eb774b307089269fe21d068f86487455ec1b23e5b90a560ef53794834ffe7e6eefc6fd78effdec21
 DIST dxcc-20191204.tar.gz 176076 BLAKE2B 86f18d7ce381e2ac8c5baa31e71d26d031cae47ab19d6a89af7d18662877901649286281e55e15fe068649f54449d474d72cfdb6cf87fb9c66e698095c7093c8 SHA512 a4fe2034ebd9674dc63e998dc68aa5d56eebae2203eb7a3e90edb2b71283bee76c1b68a99561596d2afb80777ba8ef071f1d5d12c6b6e1ea6ce1e2425ab22144
-EBUILD dxcc-20080225-r1.ebuild 513 BLAKE2B 3b299ad409dafcb006b54521cf35328563a450e69e540576616fe6b00f372d4f535672a3e724e527b19714546b7d298a8a8c6db31a069bd9367603ef6886d45d SHA512 edb644fb8adbf188e7cc5ec6f0d2e043808b777ca3023ed7aae9e74028a39b22b9b3488540f26c9e6b4e17887d5d422736bd8db245926830873cba8f9673f3fb
 EBUILD dxcc-20190309.ebuild 486 BLAKE2B df95d11696f305009e3ace3edb3cf115a152c90c1b6e5db58f7616df21a0c64c4f88ee57c12c4e511ba64114d15fa0d3f1f867fdc18cdd1a8f1fa5c26465edaf SHA512 bccf02d2b8b67d7374cccc137400b08f9aeb1fb54d04f26cfe89e6e78a5c1919c61e885801c088cf4ef9eeb84fdeb9f2fd37d9aaa3f641fd1185b5bc52be3e92
 EBUILD dxcc-20191204.ebuild 498 BLAKE2B f3ef993edf457a0ee5bae0af2186181a749be2c7171dc2f2d6e9cb6fd35c717b9c93c9e51fdf16594b5963f4db0dbc552edd16b0bb7406e40ad8d563695be487 SHA512 6b7183cd445d279ec2cbe357078107b009498a59ed674257ded07d22a87b18f7acd26a758f544a29e896044c0461f32c441fdbb8bd86c6a20d252a04f816b4f8
 MISC metadata.xml 249 BLAKE2B d6fa8a349066f9684c68c3086f53e41ebf30b6e313e8e8e752a953c0eaa0853448fe17e5ed46836bc5e149a282a33c7408c675d3b39eb3d59ddc1c1ad86bf716 SHA512 965ae00fa198dd8f5869c4c14ff3e28c7d76be7182be6ba4bedbb68d7138da5be3c8bb993689db2c73ac328456015ebdf018ee1b308d6988067810d1156bd179
diff --git a/media-radio/dxcc/dxcc-20080225-r1.ebuild b/media-radio/dxcc/dxcc-20080225-r1.ebuild
deleted file mode 100644
index 41f7df911b13..000000000000
--- a/media-radio/dxcc/dxcc-20080225-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="A ham radio callsign DXCC lookup utility"
-HOMEPAGE="http://fkurz.net/ham/dxcc.html"
-SRC_URI="http://fkurz.net/ham/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="tk"
-
-RDEPEND="dev-lang/perl
-	tk? ( dev-perl/Tk )"
-
-src_prepare() {
-	epatch "${FILESDIR}/Makefile.patch"
-}
-
-src_install() {
-	emake DESTDIR="${D}/usr" install
-	dodoc README ChangeLog
-}
diff --git a/media-radio/flamp/Manifest b/media-radio/flamp/Manifest
index 07fe62b6e00f..90054cfc8b47 100644
--- a/media-radio/flamp/Manifest
+++ b/media-radio/flamp/Manifest
@@ -1,3 +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.05.ebuild 456 BLAKE2B 965fb4bf9303b03bbc3bc9e20bd23aad885fb62d64302f436646a7743abca8b94a12bd8668e0acab9bccf2497e3d1d29d10306f19f41b87856232c41f365410a SHA512 58029186ba79cd85e27ae0bf7881f67c2faa9caf4883f53c6c68d1a5ae9492c5d14ab7f5d8e262cff7844d29fcf1c25226d9bef43279334d27ffeaa193e63f9d
 MISC metadata.xml 390 BLAKE2B 5f998bcf02cd83987c9e562a4f283691ed9be3a5bbf6191440f6c8cf345f19cd03f206a5ace9ae2a22566296dbfdcfd976b7f57abd63c9c8a3af4d3e709b3dde SHA512 e9770b26f6305cf387a9896d4ed923ebb4600f30d945ba4f015631065c539c71c67f2a596ad3eaad39d60d8b010f89fc092b3e20166ac36a1fad1203aa099eb8
diff --git a/media-radio/flamp/flamp-2.2.05.ebuild b/media-radio/flamp/flamp-2.2.05.ebuild
new file mode 100644
index 000000000000..c4559c75c760
--- /dev/null
+++ b/media-radio/flamp/flamp-2.2.05.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Fldigi helper for transferring files"
+HOMEPAGE="http://www.w1hkj.com"
+SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-radio/fldigi
+		 x11-libs/fltk:=
+		 x11-libs/libX11:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog INSTALL README )
diff --git a/media-radio/fldigi/Manifest b/media-radio/fldigi/Manifest
index c4f05fa17050..7f4639be2cec 100644
--- a/media-radio/fldigi/Manifest
+++ b/media-radio/fldigi/Manifest
@@ -2,7 +2,9 @@ AUX fldigi-c++11.patch 1140 BLAKE2B 987d33126e80340d7687cc1e346a8cc8b5701c9f6a42
 DIST fldigi-4.1.06.tar.gz 4633753 BLAKE2B 2eed9be5c1e0d0fdb29b9a2d5b7c7eedca7cdb5dc9149532776083cd56d67cbbfea1760f2287d9de2880508e950c4a87e96b4d818f56b3ce4f2f4025057eb54e SHA512 fc3ef66e9ce8c231af27d17f098e1767ba35038afac124be2a1db846246bf2e6d86ba078cd82e28d73b7389079eff87545c2f3e81bef95c525b90a8886c612be
 DIST fldigi-4.1.08.tar.gz 4633597 BLAKE2B 853569115aa33e768a4e7a9caba0675dfc8235bdc889317d44f2d3896c287f7117ef6983b8e41be5ec4d967cabb1c7a506a1488aa200cdab6aabef48c24986b3 SHA512 e1262aa87ddeed0618cd74327696ef9542afc3c6c4529db0224d8278ef8a270f83c51a64b0957d17f6ada07ba0d99bdd4124e453e3d0268ffa283e90fbe322d2
 DIST fldigi-4.1.09.tar.gz 4778091 BLAKE2B 2053cccbe84141ee4b43149f043a9f66c568d962d6ef01a694e7dcb876d76e2a74d87158cd3e811b44b7495152b8fdb191098d55ac64793e8c76a0b26783bd0a SHA512 b4c284f599f7985205c8198df32f02fade55bfba6c4630b0c385f9f2d734ef0be11b5620e73324d88a5d5dfc4258c44c8e1759a57cd8da77186bb7d4277e1503
+DIST fldigi-4.1.11.tar.gz 4792572 BLAKE2B 7f96b5f8e83af28f522f0dc55e794d3b5beef05c54c990fb6304c2cfbbc21adced39d29be24ccbc0a50bbb3d97e7c3d71530169ceeaf5aa59e52389462c6e135 SHA512 37e5a40ae67bcce3fe1480c6c9cbb7d56a4f6cbf6dd042d676524cc96007d487fd50027394655aa6ad44f583e3b36b13cb5e0af2da0656803368ad3a243b579b
 EBUILD fldigi-4.1.06.ebuild 1288 BLAKE2B 335fba25a3c2809814737f583b8db2e6651b4c4b04c938666f466cf18a4ae432edb1c5194dc33aad0d306cb74a12a26e529b8fadebed3f531a79dde41799efb1 SHA512 ebdf9ae81997d15d7817c3d065541cc2b2f2e2cc20972a0c5462912a95b12bc793c8e14f851b029a32e4ee3c623b0f44dff69be76b8e5cb8a5854de758e027b2
 EBUILD fldigi-4.1.08.ebuild 1288 BLAKE2B 335fba25a3c2809814737f583b8db2e6651b4c4b04c938666f466cf18a4ae432edb1c5194dc33aad0d306cb74a12a26e529b8fadebed3f531a79dde41799efb1 SHA512 ebdf9ae81997d15d7817c3d065541cc2b2f2e2cc20972a0c5462912a95b12bc793c8e14f851b029a32e4ee3c623b0f44dff69be76b8e5cb8a5854de758e027b2
 EBUILD fldigi-4.1.09.ebuild 1290 BLAKE2B 545cc510b01cf7ba73c01b59ba77865e5f533866b32942215b068b567ba064a5d881739ccef95417a75c12cd7489eab8aa472faf176bf9b41623c099c448e03e SHA512 e93c4d87b94e762a114e7e766791a1d8aaa8cfb2d80011ba2e28597a273435f4ef06c083eba0e8b8eea4e962b84c3cdd2b02e7910f818244f8c3258cb368cdb2
+EBUILD fldigi-4.1.11.ebuild 1290 BLAKE2B 545cc510b01cf7ba73c01b59ba77865e5f533866b32942215b068b567ba064a5d881739ccef95417a75c12cd7489eab8aa472faf176bf9b41623c099c448e03e SHA512 e93c4d87b94e762a114e7e766791a1d8aaa8cfb2d80011ba2e28597a273435f4ef06c083eba0e8b8eea4e962b84c3cdd2b02e7910f818244f8c3258cb368cdb2
 MISC metadata.xml 495 BLAKE2B 9c6f1b29ffb13a553b74ded93c11d29ffdc5a02336adb8fef55b862800a1856e712cdcb06c4e7d90858712d43aafce79f6cf9a357dc0a3c3ca0fc5cdb0ff770e SHA512 fdd9bc3f065ccb354ed0ad5c6544ca70f2011828870b942f2bf2f7001bf1342f858d60a6031cf005623795d1f1d2ccbc3a42fb54dcbd465c3c73f29a928d9091
diff --git a/media-radio/fldigi/fldigi-4.1.11.ebuild b/media-radio/fldigi/fldigi-4.1.11.ebuild
new file mode 100644
index 000000000000..7ded0b14db4c
--- /dev/null
+++ b/media-radio/fldigi/fldigi-4.1.11.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
+HOMEPAGE="http://www.w1hkj.com"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="hamlib nls pulseaudio"
+IUSE_CPU_FLAGS=" sse sse2 sse3"
+IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}"
+
+RDEPEND="x11-libs/fltk:1[threads,xft]
+	media-libs/libsamplerate
+	media-libs/libpng:0
+	x11-misc/xdg-utils
+	dev-perl/RPC-XML
+	dev-perl/Term-ReadLine-Perl
+	|| (
+		media-libs/portaudio[oss]
+		media-libs/portaudio[alsa]
+	)
+	hamlib? ( media-libs/hamlib )
+	pulseaudio? ( media-sound/pulseaudio )
+	>=media-libs/libsndfile-1.0.10"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+PATCHES=( "$FILESDIR"/$PN-c++11.patch )
+
+src_configure() {
+	local myconf=""
+
+	use cpu_flags_x86_sse && myconf="${myconf} --enable-optimizations=sse"
+	use cpu_flags_x86_sse2 && myconf="${myconf} --enable-optimizations=sse2"
+	use cpu_flags_x86_sse3 && myconf="${myconf} --enable-optimizations=sse3"
+
+	econf ${myconf} \
+		--with-sndfile \
+		$(use_with hamlib) \
+		$(use_enable nls) \
+		$(use_with pulseaudio) \
+		--without-asciidoc
+}
diff --git a/media-radio/flmsg/Manifest b/media-radio/flmsg/Manifest
index db5123c3b120..dcce44418a85 100644
--- a/media-radio/flmsg/Manifest
+++ b/media-radio/flmsg/Manifest
@@ -1,3 +1,5 @@
+DIST flmsg-4.0.14.tar.gz 874399 BLAKE2B 8daa939a1ddc52d0469ba23908a51ac3e873c93daeadea6d1b6fcd7136850db63719eb0409001a6de6c49cd71ed1be3392e17d7a128a58784185b2b8c6bb6d3c SHA512 367c881007a393c3aa6d9f4bc760717caed1681bd4479b8d7b54246c90bdaf023d60cbde92c538059fcf275ea09bbc47e49052dab3608c5e7d43830f9e573a85
 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.3.ebuild 475 BLAKE2B 9bad76328e1e942c37dbf176cdc712367c588da936b3acb67d97a12fe208dd08cfb17769e87d1b59374e22a978e8174a7b2c1f59d5ab78d2c3e0d588b5319dda SHA512 2414ff502f6163ee36052bbf5f6be1ce088359dff9063911235b2d128fc243508a00713e500a12cd104770fae2b5e171c9eb14ff4e79585d146bbf37447000d2
 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
new file mode 100644
index 000000000000..7f3d7374a13f
--- /dev/null
+++ b/media-radio/flmsg/flmsg-4.0.14.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils
+
+DESCRIPTION="Fldigi helper for creating radiograms"
+HOMEPAGE="http://www.w1hkj.com"
+SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-radio/fldigi
+		 x11-libs/fltk:=
+		 x11-libs/libX11:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog INSTALL README )
diff --git a/media-radio/flrig/Manifest b/media-radio/flrig/Manifest
index fb711e56881e..2fee6c94eef0 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -2,7 +2,9 @@ AUX fix-bashism.patch 547 BLAKE2B b04673f95b56dc9258b2953e90aabf81b2ef3d2b7bc7e3
 DIST flrig-1.3.46.tar.gz 813126 BLAKE2B e88186958eb7f4492a564135144d77abae782e8d249c9678663625a0cab9b9f716f1fa616062eecfb8b0c26952e2399a9120cc0a7ddcc5ad43f8bfdde400afde SHA512 e5d02632806d5f899abecc84fe7f8d1610153ace260d9c812221a37a781dd9dffe48602507f798c98d510d79657f4deec69ce2e1513f7b51f3d60888d9c07071
 DIST flrig-1.3.48.tar.gz 813746 BLAKE2B f86effa913ade23c50c3e1fb663e0c9daff0aaefa0e4457e10e1ac67a666e548dc1668a6e1a496cc1407a267e8f047829dcee1b0930fd1db04b28c2458a3da69 SHA512 2336c3ccb4112cea52daf07d2fdf0ced400c3b32e82b13faa8287fdac0634ac8f4596f4cd0efc8b30083a16859539d9da066c51f74f32e05d77bf02bbcdb087e
 DIST flrig-1.3.49.tar.gz 838092 BLAKE2B 6f4eac6203b6d48ac41f76301e166d94e3ee81bde0b1492640a6ab550775a7bea8cee4b18476756a68edf01f9a79b39f80182c77ff65549e15fdaddc2e8c4469 SHA512 5f9f46fbd0e889abffad73f39e98d9758aaaacea3aae94c5e4a8d58e15525e312eaf573f68b98f2379072e4ae64b85b01447369c736c408e60fd286e777c61d6
+DIST flrig-1.3.50.tar.gz 844791 BLAKE2B ca9675a8a107c31a56536f7ba8a76a2f0df8e27353ac0dac782d21c236d3dc5c9eda766b0264f9c28ca35580aa4626c98714fe52e8d81925868842d727d9ad17 SHA512 678c91bfc4c28cedbce992bb1320dfb3a68614db10d1a0e37f03bc0d522426f70fb0ce61f0b6d49f765bf9e566522b4133863de8da84583f1c08c8ce6a2fcb76
 EBUILD flrig-1.3.46.ebuild 583 BLAKE2B d01710a47858736fb029b80964358f04fc97e1ae43910dd30bcfe9215a7b25f1d12f6cb2c3770b955842a3b556f3dd42bd5f57dbd42207b50190a69175220109 SHA512 abd6e1edcec87c95f922b66225286ed16134e57ec8a304bd38a7cb52ae5190f3042dabac4629a7d41d870d444f32e485208c769f57fd79c00625d67e1d67ba79
 EBUILD flrig-1.3.48.ebuild 583 BLAKE2B d01710a47858736fb029b80964358f04fc97e1ae43910dd30bcfe9215a7b25f1d12f6cb2c3770b955842a3b556f3dd42bd5f57dbd42207b50190a69175220109 SHA512 abd6e1edcec87c95f922b66225286ed16134e57ec8a304bd38a7cb52ae5190f3042dabac4629a7d41d870d444f32e485208c769f57fd79c00625d67e1d67ba79
 EBUILD flrig-1.3.49.ebuild 585 BLAKE2B d3e69851d8f35bf5cbc5ee58923018663be29b6fb6193b6f8f3f8d03124f6f307bf7970412c92213187a8fd3e45e65c6438b55c67d4af1e252d9367e19487b35 SHA512 9f87e5a57a2fec7c8a629a627a87a535001b8566320c24411d9d2557cddda831a976981ef7066332aca7e5ef8a53b77d4e6579b7edc8d7a06c5bbbfe0c3d9ac6
+EBUILD flrig-1.3.50.ebuild 585 BLAKE2B d3e69851d8f35bf5cbc5ee58923018663be29b6fb6193b6f8f3f8d03124f6f307bf7970412c92213187a8fd3e45e65c6438b55c67d4af1e252d9367e19487b35 SHA512 9f87e5a57a2fec7c8a629a627a87a535001b8566320c24411d9d2557cddda831a976981ef7066332aca7e5ef8a53b77d4e6579b7edc8d7a06c5bbbfe0c3d9ac6
 MISC metadata.xml 325 BLAKE2B c4c98ed723dff91c8935c44ee552e25a08366edb7b73593d29d790622a49e130ef56137de21e1df16e1f968b1d5a0c984ce6df5b817a39f38523fb71353a3e1f SHA512 ca601e14e79450d08e0679e86827071a323fbc60cdf89412257747490046ca6efb2e78ae27f69c0e3ad449427049a35d478f2a7524a0606658ef9b302d9c0d43
diff --git a/media-radio/flrig/flrig-1.3.50.ebuild b/media-radio/flrig/flrig-1.3.50.ebuild
new file mode 100644
index 000000000000..76d6201bcbf2
--- /dev/null
+++ b/media-radio/flrig/flrig-1.3.50.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Transceiver control program for Amateur Radio use"
+HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html"
+SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+DOCS=(AUTHORS ChangeLog README)
+
+RDEPEND="x11-libs/libX11
+	x11-libs/fltk:1
+	x11-misc/xdg-utils"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+src_prepare() {
+	eapply_user
+	eapply -p0 "${FILESDIR}"/fix-bashism.patch
+	eautoreconf
+}
diff --git a/media-radio/qrq/Manifest b/media-radio/qrq/Manifest
index 544a710292c9..17c694a2a55f 100644
--- a/media-radio/qrq/Manifest
+++ b/media-radio/qrq/Manifest
@@ -1,9 +1,4 @@
-AUX qrq-0.3.1-tinfo.patch 689 BLAKE2B 2f20094d33f7d445cdf1ec0b1e7e6704d7a6aada276d8d913f82436f7a0823224eee1dea8ea20731ec6477969de9a672ad7c76aa86ebe6d811ceec857fc34fd7 SHA512 cb2bfa48ae5c6c4874e5ea4e54eed53b30ffb4f1c6d73c9fd9e3cac8a97b40861907261c8a06601b71c41c60e96bba0aa845ba8d3128d424a3bba0e016a52ebb
 AUX qrq-0.3.2-tinfo.patch 708 BLAKE2B 710671010b3bacf75b2bfde1b98d27aaa5d5eac57161b91e54943244aaac161cfc48fd27ec51d3179fca431982fde8122d9d8690f473e5057ae447cc20158148 SHA512 7acbb250efe78e5fd65336a01bcc8cd96293e92cce7bb74d1f0d2231e7a676f9b3597575e013b162a6072a41f267cfb186c8009eab36417d584a1888ce12a20a
-DIST qrq-0.3.1.tar.gz 131508 BLAKE2B f33f970b7d94291740ad4a7f0136a4ecf98aa9e7ef927e776326792da3dee884e114ea265354c2f5e15048a4979cfc195b9f5b827b76a11a267b15e6f9f58cc6 SHA512 ce6e3b6f79575f11457f56e1044267dbefda20b13ba43fd79b2ad5821b4502a8a2badacbd891e154472d6f26334a0a8fcddf9521d905d8e7a72d8a687346e23d
-DIST qrq-0.3.2.tar.gz 132546 BLAKE2B a19be5742deb719471c43e873c387995ab51a776d0f5b303f0f2fa15a87c697961cd5c93cc615a496f7377e0ab43ac8a2c12edbc7bc11ac44997b1b6788ad809 SHA512 1513428ee836610c7d755315a1cfc03dadacc33d78605fa9d0dd84786f4122f7ba7f928afa40a4fdc0bb9b19151fb8acdd1a7684a2ac6a76703379b9121e6ac5
 DIST qrq-0.3.3.tar.gz 159832 BLAKE2B 7af974175777f6166303ece0e0cfa0a035d49e0c265cd513b771a280dc7ac0772a979f45923a14737ff58a64147f8c97a3978ccd7e4cd81fe4a38f3156766057 SHA512 025f0a350600a9f3f24cb00afcaa0e99c0be881e40684cc7ccbb9927d883372336c0b668bae21f232ce52dd221eb4ed950d306a32bab34e65f9f3cba9f28a484
-EBUILD qrq-0.3.1-r1.ebuild 940 BLAKE2B 14bb28d8fe65d5c50a513bb7bdf93efeefa10d8903de614c608a534384c53ba8b25b01db7c19119e96ac8a4a18eb26b2d83ae397098b8d3f77a7db057dfd0916 SHA512 d6aac6e98701cd5f95e0b166abfc46f614262a2a598fa40b645131a1208ec308327af3a5775503f66aa075cec3adb7ae68ebd7abacfd3dd9bde354dc8a2955ed
-EBUILD qrq-0.3.2.ebuild 872 BLAKE2B 5b585a3327491e70e62b7353533cbc8e2e220a89d869ef0e974fcd41efe392b2b57ef2db57e7d85623bfecc892257e3e7a38a2c149089521949b3b11e695abba SHA512 e71ea9543b733b2204bc14ed41fb0f074ae1e393ffb67ce377a553744ccaa32850a554d538db2728c6ea2738b743a9533bdd2bab672b86c8853ac8dbfb6dc7cd
 EBUILD qrq-0.3.3.ebuild 877 BLAKE2B f8e4bb17454196463e77f5dfd3751749ee72f96e8de6ebf692afe0f4fc92d7b53a47fc19b8b4947e7b6e9424f479743a0c6c8d6891774fb9f88e8744dfb2a61c SHA512 0bbb9845fbba79a6222464ede0b6e40f5727dc349044c8b8912b2523a2a8e9207dc308ea8860ff56ba004125387c670ebeedd106ed39fbea956c900626bcf116
 MISC metadata.xml 249 BLAKE2B d6fa8a349066f9684c68c3086f53e41ebf30b6e313e8e8e752a953c0eaa0853448fe17e5ed46836bc5e149a282a33c7408c675d3b39eb3d59ddc1c1ad86bf716 SHA512 965ae00fa198dd8f5869c4c14ff3e28c7d76be7182be6ba4bedbb68d7138da5be3c8bb993689db2c73ac328456015ebdf018ee1b308d6988067810d1156bd179
diff --git a/media-radio/qrq/files/qrq-0.3.1-tinfo.patch b/media-radio/qrq/files/qrq-0.3.1-tinfo.patch
deleted file mode 100644
index 83ae2b0e7bca..000000000000
--- a/media-radio/qrq/files/qrq-0.3.1-tinfo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Makefile	2017-04-03 18:45:09.028423872 +0200
-+++ b/Makefile	2017-04-03 18:45:55.711048924 +0200
-@@ -47,7 +47,7 @@ ifeq ($(USE_CA), YES)
- 		endif
- else ifeq ($(USE_PA), YES)
- 		CFLAGS:=$(CFLAGS) -D PA -pthread
--		LDFLAGS:=$(LDFLAGS) -lpulse-simple -lpulse -lncurses
-+		LDFLAGS:=$(LDFLAGS) -lpulse-simple -lpulse $(shell pkg-config ncurses --libs)
- 		OBJECTS=qrq.o pulseaudio.o
- else ifeq ($(USE_WIN32), YES)
- 		CFLAGS:=$(CFLAGS) -D PA
-@@ -55,7 +55,7 @@
- 		OBJECTS=qrq.o qrq.res pdcurses.a libpthreadGC1.a 
- else
- 		OBJECTS=qrq.o oss.o
--		LDFLAGS:=$(LDFLAGS) -lpthread -lncurses
-+		LDFLAGS:=$(LDFLAGS) -lpthread $(shell pkg-config ncurses --libs)
- 		CFLAGS:=$(CFLAGS) -D OSS
- endif	
- 
diff --git a/media-radio/qrq/qrq-0.3.1-r1.ebuild b/media-radio/qrq/qrq-0.3.1-r1.ebuild
deleted file mode 100644
index cf605dee2b54..000000000000
--- a/media-radio/qrq/qrq-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Yet another CW trainer for Linux/Unix"
-HOMEPAGE="http://fkurz.net/ham/qrq.html"
-SRC_URI="http://fkurz.net/ham/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="pulseaudio"
-
-DEPEND="sys-libs/ncurses:=
-	pulseaudio? ( media-sound/pulseaudio )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-tinfo.patch
-	# avoid prestripping of 'qrq' binary
-	sed -i -e "s/install -s -m/install -m/" Makefile || die
-	sed -i -e "s/CC=gcc/CC=$(tc-getCC)/" Makefile || die
-	sed -i -e "s/-lpulse-simple/-lpthread -lpulse-simple/" Makefile || die
-	default
-}
-
-src_compile() {
-	CONF="USE_PA=NO USE_OSS=YES"
-	if use pulseaudio; then
-		CONF="USE_PA=YES USE_OSS=NO"
-	fi
-	emake $CONF
-}
-
-src_install() {
-	emake $CONF DESTDIR="${D}/usr" install
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/media-radio/qrq/qrq-0.3.2.ebuild b/media-radio/qrq/qrq-0.3.2.ebuild
deleted file mode 100644
index b5eeded23449..000000000000
--- a/media-radio/qrq/qrq-0.3.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Yet another CW trainer for Linux/Unix"
-HOMEPAGE="http://fkurz.net/ham/qrq.html"
-SRC_URI="http://fkurz.net/ham/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pulseaudio"
-
-DEPEND="sys-libs/ncurses:=
-	pulseaudio? ( media-sound/pulseaudio )"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-tinfo.patch" )
-
-src_prepare() {
-	# avoid prestripping of 'qrq' binary
-	sed -i -e "s/install -s -m/install -m/" Makefile || die
-	sed -i -e "s/CC=gcc/CC=$(tc-getCC)/" Makefile || die
-	default
-}
-
-src_compile() {
-	CONF="USE_PA=NO USE_OSS=YES"
-	if use pulseaudio; then
-		CONF="USE_PA=YES USE_OSS=NO"
-	fi
-	emake $CONF
-}
-
-src_install() {
-	emake $CONF DESTDIR="${D}/usr" install
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/media-radio/tqsl/Manifest b/media-radio/tqsl/Manifest
index 1c7779326e77..1a111bf09cb6 100644
--- a/media-radio/tqsl/Manifest
+++ b/media-radio/tqsl/Manifest
@@ -2,7 +2,9 @@ AUX 2.3.1-suffix.patch 639 BLAKE2B 478f9f45bc3151d4b10c1c55ac5507490de56d33dcbc7
 DIST tqsl-2.3.1.tar.gz 2896807 BLAKE2B f2937950b5328cfb0a13b87797f40594799e01139d5b307199095b8cdbe6f4532e911fd9661ad3b663d8616d9287d8a359f2fefb4364c6450ba4be2505a89c63 SHA512 edaa21b1605bcb38790a66d61e1498a04f41c4f9b3b577908a6e57cd38e1ac2e1724e9c6d5421e0ca4a4ea72d1d5f5d54f08bf5a6c202bf68181ec12f27d4afd
 DIST tqsl-2.4.1.tar.gz 4191260 BLAKE2B a70652c12e0704daecbd6d38bddcc386de55242feea9d2905c65dcfa01337c0a2f31ec8596b7cf58b35c77da0f6b79ecf9188bc4f74df51b9e2479361643e3ca SHA512 7b61cf2dc37a3216548e9b82335bae2947be2c2ea4c43860fb4baffd4ce13f5f3d61cd999a293d4baae87835c56d2eb2fcce8a36f17eeba4e18ccab3e5053b60
 DIST tqsl-2.4.3.tar.gz 4194821 BLAKE2B 6a8af8b396f349cc16ac74694b2d0b4e4a8e9f4fc2ea0850d53ce59980e59b4a89fed352118f020acffa42e502db0762e8d0eee560ec067cf620cfd798f3c23a SHA512 fb5de8eee5d72279d945b7a6f5c495b1d3c4437977c84a548062a1e9ceb657e20fe6df995b5f440077ff02e6e3ab8c28ec9fbe2a447d04f771271105e8ffb356
+DIST tqsl-2.5.1.tar.gz 4462202 BLAKE2B f62afe6003b782e5e092fbd99a90a79cc4b020004092f958dad6f7c695d125e31b28b47e7945ccee1fd88c87b290f93145592cac1bd9c52501c34de901f78d74 SHA512 7578572f64c269a41f3fa62ebe526baee4ac382fac81549e79d676da5dc4f3dd3d2a4ce31bc741b43a07eaf164a33beeb1987dd61df1a92ede7b762a8df532f3
 EBUILD tqsl-2.3.1.ebuild 643 BLAKE2B 3abb0fdbc9986af76e605f17e2de136c2be18b0b79b0abedf04eb7d399f983ac5a4c27e195954cf902293eeb30686785d18e691e6d1ebedfd58d135185061c10 SHA512 87114cd8abc4604e769a0c508ae21bbbe57349539cdb631fff90293b90b029795723f5379c2ba3b176869f5d0a0583f3266f9616e3827f0a756b230c6ebfab63
 EBUILD tqsl-2.4.1.ebuild 643 BLAKE2B 00ddfd505c0ddd1b472ec292b96644eda8c6973c1a1f0bc82d6abcece6ac832265d18d97799dbae05f4940d563cdd1e9c1f33a06e1f2c1e10d1d1f0cf559134c SHA512 1f88389b4f31966a7e4e9ab820fe74c4bd3ce73c661893c0c03f7d41ca6705b84262539d74706698c3927455b8bf39fd5d0e56a93386bb804d7a7c9e726ce69e
 EBUILD tqsl-2.4.3.ebuild 643 BLAKE2B 00ddfd505c0ddd1b472ec292b96644eda8c6973c1a1f0bc82d6abcece6ac832265d18d97799dbae05f4940d563cdd1e9c1f33a06e1f2c1e10d1d1f0cf559134c SHA512 1f88389b4f31966a7e4e9ab820fe74c4bd3ce73c661893c0c03f7d41ca6705b84262539d74706698c3927455b8bf39fd5d0e56a93386bb804d7a7c9e726ce69e
+EBUILD tqsl-2.5.1.ebuild 636 BLAKE2B bf6f6a87b44e3f19f9db08d4a935b56377f1d86ae0f60ff4af8aea2e5f50475fae44a9d41d3282a3f5c623db70a99190ffc4de244f3246e85e80ae69f1eeb82d SHA512 e7adeb8ac8f3b4d10b3410d3c258ebc8a7b3f6f02aa2d9339fe4acfc8d988c1ff1ea7de77d00bf7c44c52f6fe04f3098c2cb7483eef45dce5c4ac622139f4ce9
 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
new file mode 100644
index 000000000000..a6cbd247c04e
--- /dev/null
+++ b/media-radio/tqsl/tqsl-2.5.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils wxwidgets vcs-snapshot
+
+DESCRIPTION="ARRL Logbook of the World"
+HOMEPAGE="http://www.arrl.org/tqsl-download"
+SRC_URI="https://github.com/rich0/trustedqsl-tqsl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+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="
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS.txt INSTALL README )
+HTML_DOCS=( html )
+
+WX_GTK_VER=3.0
+
+pkg_setup() {
+	setup-wxwidgets
+}