gentoo resync : 03.03.2021

18 files changed, 64 insertions, 388 deletions

diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index 52024a519d26..95d85668e65a 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/js8call/Manifest b/media-radio/js8call/Manifest
index 956a1c1df190..954b431dc981 100644
--- a/media-radio/js8call/Manifest
+++ b/media-radio/js8call/Manifest
@@ -1,16 +1,4 @@
-AUX js8call-2.1.0-hamlib-type.patch 752 BLAKE2B b58e648597d467ff559d6ea77abef4fa31b3cc3bf14b72a2e66ba6cb839377c59ced2fad97c104cbd8b90acf09e477584baae6238d90524442d10409fb4a0e09 SHA512 ac65d9f6755d2fa2e5ca3593bf73c2d44716e6bbea29906d59e2a023bbe9821ad98a48e6f8d56eafdb5648884b0d1f9f23c05900e0ec67b5785cf65dcc98e899
-AUX js8call-2.1.1-hamlib-type.patch 377 BLAKE2B 32d0de06d20ec6172a8a2b703f55bbcb46d584ba2fec7de21ae37e8c123f6d27867ff5f6406985dde84186b14f9e048377a43d35562fb7c239b1f1b4d7283891 SHA512 2db6db5042c17cb01a0fb84b93c2b0b4af6912c61c4b2fac02f3097d4325aa4e4d897ef615a37c1348b9a46168c1aa3b1decd07ebecda265314f12afe5570d53
 AUX js8call-2.2.0-hamlib-type.patch 463 BLAKE2B a34effb789b9113fcdee91f631dd8abec6e9fb1aea8317c1ef99dfb005e9ac266fe8b2c1be2cf83ba128f9f52a03206e4dc5c2458537ad2878c78f756b91a6a4 SHA512 426227025f7b7039890e2d22eeda218491de883150abbfe6066fd82f604da90c321a8ee6f7916ed08dcebee38c94d681280fc7824713b663bc2aaa09f538d8d4
-DIST js8call-1.0.0.tar.bz2 15923224 BLAKE2B 646fd869e6029d57dfd1d9762ede2407e18a18170088df65d1b16a581709065cf45edb23533b9c89193b01a85ec326638efc99202489db54455298a5033696de SHA512 64f24821c9ffd86123ede2baac46bcefd33b5dc5e0496cd44e594e79706ec2f3fdde5ce13c379addbf2bded3e392a1f0fc0f2df0298ce57a22e434a6ab6a1e7a
-DIST js8call-1.1.0.tar.bz2 15993553 BLAKE2B 3538f746b175d0623169d2a13b5c26b334561f604fa25c8dddc15ee2a41319df8bb4c0a905be6340d4d18d87bffd8bd4e9a4eb9ceec3310f33aa22005c0e1c19 SHA512 992408408888a59174811c30fcc07065bcb5e459c355955a59e638ca27da27c2c25df8fa7579ce1c322a76f12780c58821df9fc781cde2cb2b2851312d188787
-DIST js8call-2.0.0.tar.bz2 14434190 BLAKE2B 2d016c93175fe41cd4c24b57fc0a6c65ff5d5630aff68aac4e3e941570f315abe9f083f1686cb95e49d90ea41ac82752fcdd37041727e95820d34bcd0e82e2b1 SHA512 58566d4e6009339ef9a1459bdf2902748200b7a002c8be22067ec97eae16cc42465001e7084ebc00b1e406ae47fe45092226e1c6568253a1bbf95c65f040ab75
-DIST js8call-2.1.0.tar.bz2 14432328 BLAKE2B 3f48be58905cf05af8230b715956ecfec71fd792fafb029cba84c799e51bb1189e158c16ef05bd8959572778aad556a11b0896647a47cc1e6b10ddd48bd033cd SHA512 0edfbc8cbbe3df551d7dc97c7362100d2714e2d37934a053233ca8107247f7fdc67a36b59b1fe701154c9348f27171ddab9c21ffc763072d390431f9dd5382a0
-DIST js8call-2.1.1.tar.bz2 14467115 BLAKE2B 8ebac342a1fc0bd22d6d53d9d6548ba4ec8f49088aa4901fb542f1d82ecdb9c2a23024aa8638191a3e862ab689c004cdde1562a834029bf53c535510300ed82a SHA512 deee4fe56f457b2bd533e9a44a812d8abcd5733079722504d4f06bee5c824a0a1b8c21ae805793fe419fde85f9e2e4aed10c33192f71378cf40afd68648a20a1
 DIST js8call-2.2.0.tar.bz2 16249923 BLAKE2B 9bd3124bee7253f48adb0bea031f3c83c3e9487aac7208ce3dfc94208f4c861645bacd581bd44cde19ad3b3e3ac5f7f60993bece2d1fad0164afdae7b3bd290a SHA512 3e66ba0b9bb88b834b0e025b37a395008a058b87fb70c09887936fa18c192c501d127eff6e9ccf792863ccc932aa76feacc4be903ebe7ab2915298aed3689672
-EBUILD js8call-1.0.0.ebuild 877 BLAKE2B c59f72323ba1e9a17890400ae0bf6134b6907a857c6bb89740bfbcac155e85458e808d34e352bffd9997a7e22aa256cafcc0ada12787e4f0b13b42ab9f30ebcc SHA512 a7941d4f677e003af0b7c7c3bfd63134f7fc5fa4bbb0b059ada6997918d9d1c5133391385e8e59fdc49d15d2c9cdc1bbdc13f4d63c6a8e1585b2c4cac289841a
-EBUILD js8call-1.1.0.ebuild 877 BLAKE2B c59f72323ba1e9a17890400ae0bf6134b6907a857c6bb89740bfbcac155e85458e808d34e352bffd9997a7e22aa256cafcc0ada12787e4f0b13b42ab9f30ebcc SHA512 a7941d4f677e003af0b7c7c3bfd63134f7fc5fa4bbb0b059ada6997918d9d1c5133391385e8e59fdc49d15d2c9cdc1bbdc13f4d63c6a8e1585b2c4cac289841a
-EBUILD js8call-2.0.0-r1.ebuild 881 BLAKE2B f2b37d220b6b7bac193df394ebc92c3c03c9b9dfa5cd0f51308a41362fa402577a7ca6d8c71c19717972f38eecac32292e39783cae824885e361a17c4ad470e8 SHA512 4836807736c2433d3e48ba50aa1adc07a6a6f6c3a43a947bc2fa0111aabde0366e4b3752066787676c2b47c3cb036bf191adc67d3683b8bf16381fca7d3c4c04
-EBUILD js8call-2.1.0.ebuild 936 BLAKE2B 23704d418b26b9f5cc02e5520a01ca67efbc5c5085067676544ed6beb18a87ccfc43b118769773d2035321ff90bfca4d432af3b98c2a4115ff5a6a00bdf734c7 SHA512 bc67a252baec3e06e00bbde9d388a4bae820012a9165d78dba56a0b82ff9db575c412d68722af07f33a20fb268811b86d6e1c3e62ee2de3173861eb40e72a289
-EBUILD js8call-2.1.1.ebuild 936 BLAKE2B 8f7fadf4e5abb1f951cf69de1e6445aaff92c0a592c0f00df3f09c7a22443f5092fc321b0593162f3686ea76dc9d6e54f8f35cd04f834cf9b625353f25ccf5da SHA512 3f0b7dc70b2ed0af0abd4e80e0cf4c1d0496a4b84f7497fd7767e8a3cbbaa0ef5e772aa841096f323ea389a97a643cc1e0354b3601f04ec27e12acf8a2319cdd
-EBUILD js8call-2.2.0.ebuild 893 BLAKE2B 2710733bae4cf9dbfd784ca790c20e0b4f93190cd4d6926e81342450bf292e4e4032f70fb70228d1b7a7ee2bf61fb39673404866e10a15725877d966a6d4fac5 SHA512 0e6e916ab655821813f2d047949fb25e8c596592a138c7c5939fb56e52dfda58c5eb91462e36c843f1d6b79bed1c3458146423d9eb04e41d24ef2bec236967b3
+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/files/js8call-2.1.0-hamlib-type.patch b/media-radio/js8call/files/js8call-2.1.0-hamlib-type.patch
deleted file mode 100644
index 5fc71b7f2940..000000000000
--- a/media-radio/js8call/files/js8call-2.1.0-hamlib-type.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From af2ed2b67665a4bb891ffa01d45043bb197f06bf Mon Sep 17 00:00:00 2001
-From: Richard Freeman <rich0@gentoo.org>
-Date: Sun, 22 Dec 2019 21:26:27 -0500
-Subject: [PATCH] Revert "Updated hamlib interface to use new unsigned int for
- vfo_t"
-
-This reverts commit 7728483481975bfe1527eab657cf636c4c3b9181.
----
- HamlibTransceiver.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/HamlibTransceiver.hpp b/HamlibTransceiver.hpp
-index 509fe4e..c8c0f74 100644
---- a/HamlibTransceiver.hpp
-+++ b/HamlibTransceiver.hpp
-@@ -14,7 +14,7 @@ extern "C"
- {
-   typedef struct rig RIG;
-   struct rig_caps;
--  typedef unsigned int vfo_t;
-+  typedef int vfo_t;
- }
- 
- // hamlib transceiver and PTT mostly delegated directly to hamlib Rig class
--- 
-2.24.1
-
diff --git a/media-radio/js8call/files/js8call-2.1.1-hamlib-type.patch b/media-radio/js8call/files/js8call-2.1.1-hamlib-type.patch
deleted file mode 100644
index 6714949468ad..000000000000
--- a/media-radio/js8call/files/js8call-2.1.1-hamlib-type.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/HamlibTransceiver.hpp	2020-02-08 19:14:50.584626858 -0500
-+++ b/HamlibTransceiver.hpp	2020-02-08 19:15:09.857524125 -0500
-@@ -14,11 +14,7 @@
- {
-   typedef struct rig RIG;
-   struct rig_caps;
--#ifdef JS8_USE_LEGACY_HAMLIB
-   typedef int vfo_t;
--#else
--  typedef unsigned int vfo_t;
--#endif
- }
- 
- // hamlib transceiver and PTT mostly delegated directly to hamlib Rig class
diff --git a/media-radio/js8call/js8call-1.0.0.ebuild b/media-radio/js8call/js8call-1.0.0.ebuild
deleted file mode 100644
index 78808ea84e4b..000000000000
--- a/media-radio/js8call/js8call-1.0.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils 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}.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
-	doc? ( dev-ruby/asciidoctor )"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	cmake-utils_src_install
-	rm "${D}"/usr/bin/rigctl{,d}-local || die
-	rm "${D}"/usr/share/doc/JS8Call -R || die
-}
diff --git a/media-radio/js8call/js8call-1.1.0.ebuild b/media-radio/js8call/js8call-1.1.0.ebuild
deleted file mode 100644
index 78808ea84e4b..000000000000
--- a/media-radio/js8call/js8call-1.1.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils 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}.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
-	doc? ( dev-ruby/asciidoctor )"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	cmake-utils_src_install
-	rm "${D}"/usr/bin/rigctl{,d}-local || die
-	rm "${D}"/usr/share/doc/JS8Call -R || die
-}
diff --git a/media-radio/js8call/js8call-2.0.0-r1.ebuild b/media-radio/js8call/js8call-2.0.0-r1.ebuild
deleted file mode 100644
index cb6116245d91..000000000000
--- a/media-radio/js8call/js8call-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils 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
-	doc? ( dev-ruby/asciidoctor )"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	cmake-utils_src_install
-	rm "${D}"/usr/bin/rigctl{,d}-local || die
-	rm "${D}"/usr/share/doc/JS8Call -R || die
-}
diff --git a/media-radio/js8call/js8call-2.1.0.ebuild b/media-radio/js8call/js8call-2.1.0.ebuild
deleted file mode 100644
index d886436dd36d..000000000000
--- a/media-radio/js8call/js8call-2.1.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils 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-3.4
-	doc? ( dev-ruby/asciidoctor )"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-hamlib-type.patch" )
-
-src_install() {
-	cmake-utils_src_install
-	rm "${D}"/usr/bin/rigctl{,d}-local || die
-	rm "${D}"/usr/share/doc/JS8Call -R || die
-}
diff --git a/media-radio/js8call/js8call-2.1.1.ebuild b/media-radio/js8call/js8call-2.1.1.ebuild
deleted file mode 100644
index f461bf8f6b3e..000000000000
--- a/media-radio/js8call/js8call-2.1.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils 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-3.4
-	doc? ( dev-ruby/asciidoctor )"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-hamlib-type.patch" )
-
-src_install() {
-	cmake-utils_src_install
-	rm "${D}"/usr/bin/rigctl{,d}-local || die
-	rm "${D}"/usr/share/doc/JS8Call -R || die
-}
diff --git a/media-radio/js8call/js8call-2.2.0.ebuild b/media-radio/js8call/js8call-2.2.0.ebuild
index 8c4fdb778104..298d01562ab6 100644
--- a/media-radio/js8call/js8call-2.2.0.ebuild
+++ b/media-radio/js8call/js8call-2.2.0.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
@@ -12,7 +12,7 @@ SRC_URI="https://bitbucket.org/widefido/js8call/get/v${PV}-ga.tar.bz2 -> ${P}.ta
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc"
 
 RDEPEND="dev-qt/qtcore:5
diff --git a/media-radio/tqsl/Manifest b/media-radio/tqsl/Manifest
index 1a111bf09cb6..589bbd5c0591 100644
--- a/media-radio/tqsl/Manifest
+++ b/media-radio/tqsl/Manifest
@@ -1,10 +1,3 @@
-AUX 2.3.1-suffix.patch 639 BLAKE2B 478f9f45bc3151d4b10c1c55ac5507490de56d33dcbc7b39ac0c52ba813a89e28c49628ff551c57c55b52da028c15d1e481508bf13a835dff244759c009cb838 SHA512 a255937915503e5d600141fdee0e85032fe39bd66de0d17d65747ee96441207be987225122bd7eed6eafb5119c93031933add7afc01ac3358b0d2255049c7397
-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/files/2.3.1-suffix.patch b/media-radio/tqsl/files/2.3.1-suffix.patch
deleted file mode 100644
index e5d44dc7b856..000000000000
--- a/media-radio/tqsl/files/2.3.1-suffix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tqsl-2.3.1-orig/src/CMakeLists.txt
-+++ tqsl-2.3.1/src/CMakeLists.txt
-@@ -54,7 +54,7 @@ include_directories(${OPENSSL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${EXPAT_INCLUDE_D
- if(NOT APPLE AND NOT WIN32)
- set_source_files_properties(location.cpp PROPERTIES COMPILE_DEFINITIONS CONFDIR="${CMAKE_INSTALL_PREFIX}/share/TrustedQSL/")
- set(HEADERS_TO_INSTALL tqsllib.h tqslerrno.h cabrillo.h adif.h tqslconvert.h)
--install(TARGETS tqsllib DESTINATION lib$(LIB_SUFFIX))
-+install(TARGETS tqsllib DESTINATION lib${LIB_SUFFIX})
- install(FILES config.xml DESTINATION share/TrustedQSL)
- install(FILES ${HEADERS_TO_INSTALL} DESTINATION include)
- endif()
diff --git a/media-radio/tqsl/tqsl-2.3.1.ebuild b/media-radio/tqsl/tqsl-2.3.1.ebuild
deleted file mode 100644
index 8f5d89ecf238..000000000000
--- a/media-radio/tqsl/tqsl-2.3.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils cmake-utils wxwidgets
-
-DESCRIPTION="ARRL Logbook of the World"
-HOMEPAGE="http://www.arrl.org/tqsl-download"
-SRC_URI="mirror://sourceforge/trustedqsl/${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
-
-PATCHES="${FILESDIR}/${PV}-suffix.patch"
-
-pkg_setup() {
-	setup-wxwidgets
-}
diff --git a/media-radio/tqsl/tqsl-2.4.1.ebuild b/media-radio/tqsl/tqsl-2.4.1.ebuild
deleted file mode 100644
index da5bebcbef25..000000000000
--- a/media-radio/tqsl/tqsl-2.4.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils 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
-}
diff --git a/media-radio/tqsl/tqsl-2.4.3.ebuild b/media-radio/tqsl/tqsl-2.4.3.ebuild
deleted file mode 100644
index da5bebcbef25..000000000000
--- a/media-radio/tqsl/tqsl-2.4.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils 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
-}
diff --git a/media-radio/wsjtx/Manifest b/media-radio/wsjtx/Manifest
index 6b4433ebc36d..18334936dc3f 100644
--- a/media-radio/wsjtx/Manifest
+++ b/media-radio/wsjtx/Manifest
@@ -1,11 +1,12 @@
 AUX wsjtx-2.0.1-hamlib.patch 479 BLAKE2B 6c77f178ab0aab9519c8e356d14f1d6050545e10d2bb2c25686afa1844107c5ddd86c9696ca1a9d8812e0c8a2194e23649ae02322555b7b9fc67f7e12a9fd623 SHA512 753b4c832f0cb442cbde73597ed5b9305e68328cb0fa69972d43be3bca480de6dab9e04906fad07abc431292bca4b0081ab65406e27e5bb688418a147e27afee
 AUX wsjtx-2.1.2-qt_helpers.patch 625 BLAKE2B 50a45636ed9ed410002866235d3d6feca21835e7619dd26012188df90156b087c463205c35e777d485c365862d5ff567da206b4e472217d8e57e3a906fd4b14f SHA512 09ac1dda4818656d7431ab453e7042630fe077a02668597f6b75ced0e3b3072eee56970a096e511eab51490765c4beaa619c308c8991e135e10d9c5c88c1281d
 AUX wsjtx-2.2.0-werror.patch 434 BLAKE2B c36c445cb7216b2cb2d1a7888aa480f0b6ffbb05389070159c2763ff979ea5faaf342d4b0a121ad616e4e2a9e2c10d1979c1fd9df8be7dc44a2df16290f43d45 SHA512 497cf4602e0e4b8eec04010822c05d3e195ff408133dff64d6c9c926bbfab06a31fbd92798f2b46e3aa8c61287399db13d4da462861782b4f3a84409f9090cdc
+AUX wsjtx-2.3.0-drop-docs.patch 676 BLAKE2B b5d6edb900dd9f26026ba3752ad14bd4b944b7829a00c9cc10194e95ac623c7f0bd1b9deee869360cf763e16966dd9a9a974cf80c12173d3346b767e6f3f47ac SHA512 193577a652fa90f23b43a052c1efb085c2ed244b318c34dab972ae6ec16c05ad290c2bd76a40502765d5964b82ceac6326f33a6d434f292e4830983be57c2ce4
 AUX wsjtx-clang.patch 619 BLAKE2B 8019381b563bfede3977e37c96c0c664089458f0be7704a5267eece14a48b8cbd4a6348803d4a4e4ef0023006363e26f89f03788ac20f01d227126952f8d2375 SHA512 cf40f9ad542ca07f70ae507a74625663541c05968e1cac78eff7ec1fc0668b683b62ed35effc03b7028a317694e1056b70b862169900f3dc9655ae1ba057210d
 AUX wsjtx-drop-docs.patch 425 BLAKE2B facdb48f573ef35d74b27b03abd9983a8df162d8843ca846285e2525fe86e4eef2892f0203c64939a9ca5478e27795415487d14eee8ca6cb0a79d0c15f9c0d6a SHA512 2c5000551313b6ee81e50841d286478bb0dba8b8df31e97cbd09ee84ae479ada8ee7fb84fb464c1524245d7b8a24a00f70fb8429a2c67e41842410d939e1800a
 AUX wsjtx-fix-unicode.patch 565 BLAKE2B 02d26dc1b1b51e9ac38feb866ecbf38e58b861c74b3a7dfb1f210d41945a8fa11ee62844416f3a6b0cccb847d393986ccd74a7db2d920382ce7c53e997d3a612 SHA512 ed3cf5972325aaccdffea7d99bd9ae4f32ecf80cf2ded57a738c491bbe0e75e538663342d3efbe7a35811d206652ae5939e2c7b2a65a4a22451b593ffa504dbf
-DIST wsjtx-2.1.2.tgz 44928980 BLAKE2B de4e4e892893e5087199385aaee8753c0f71eb36cd23734ae430f50d8a09520bf2bf3df7038bcf03ba4e9ca24534c98a1b6cb5dc444d68d3183279231cf18974 SHA512 037f0604b0a22f6d02f0979b94dd054157c96ee7a8c07284d072f87f6586901346bef1a3c7e19d367a82764dafc9f00b7d1a0929d163a46f1b249aaa3929b1a8
 DIST wsjtx-2.2.2.tgz 23213092 BLAKE2B ce558180208ad33ddf2089f1747630cd07975547ba93bb693698ce599caec8d3d3367128581dfd110c6fe240bce9a0e6b8351ef178e6b53f3490a29a96367460 SHA512 923df18f5cbbd3e40294ccc4d3730f40c13c7777345723b9e66063ff0dd7db65caa9a64323711201a73b8c455dc1c29f67e4645dfbf98e0fc2c60a1630ce6cd1
-EBUILD wsjtx-2.1.2.ebuild 1470 BLAKE2B 7ce4185d8be8dd273f5ca2dd4221e29f97b0903478db6eca3f11041ca8d6ca895c1b598c9a8e3cd4bc9a4850d6b6f4447997b4b868a96db1c4183b48c5b28b4f SHA512 07456e1c31711466dce9f611f8d6ce34f9c09172fd4128f876c070add742dcc923ca8988728435aa3f3f6822308fd5a0cf1d949562401aedff788b05210039cf
+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 1681 BLAKE2B 1448b789435746c78bf25a90dac8dc9b8bca4e4132fe89e9a2eff397bec7e1aaf49942edd36eb33b186a36ae3dcba9ec78155ab3aea9b9cb75cfd4f07fb93558 SHA512 3838813511895cc39b3334e7be67f5d3faa8deb4c406a0c1a33b93b2f704434ef0299f130e6620239ae92a657c518b65566307ff0dd0fc7d09370e097e4e5e59
 MISC metadata.xml 411 BLAKE2B b18268ad951aaeb11cb490e4b02fa063915d2862f81e1a9f4ef69bf391c0628e75258d4bc66ce942a51d88369033b4e9dc8f5b8fff1c26bd33a4560ca493d70e SHA512 1b11819a29e25cf3ce3932bfb200ce65fd69c0872149acb54d3c67fb35d9977feee5d87e7412d75751cbc6a9b76010a2bcbc8b3a47a50d11a0c011abc5a83efc
diff --git a/media-radio/wsjtx/files/wsjtx-2.3.0-drop-docs.patch b/media-radio/wsjtx/files/wsjtx-2.3.0-drop-docs.patch
new file mode 100644
index 000000000000..3654fda2f8f1
--- /dev/null
+++ b/media-radio/wsjtx/files/wsjtx-2.3.0-drop-docs.patch
@@ -0,0 +1,33 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f92d3a6..c5fb9b4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1497,10 +1497,6 @@ if (UNIX)
+     add_subdirectory (manpages)
+     add_dependencies (wsjtx manpages)
+   endif (NOT WSJT_SKIP_MANPAGES)
+-  if (NOT APPLE)
+-    add_subdirectory (debian)
+-    add_dependencies (wsjtx debian)
+-  endif (NOT APPLE)
+ endif (UNIX)
+ 
+ #
+@@ -1567,17 +1563,6 @@ install (PROGRAMS
+   RENAME rigctlcom-wsjtx${CMAKE_EXECUTABLE_SUFFIX}
+   )
+ 
+-install (FILES
+-  README
+-  COPYING
+-  AUTHORS
+-  THANKS
+-  NEWS
+-  BUGS
+-  DESTINATION ${CMAKE_INSTALL_DOCDIR}
+-  #COMPONENT runtime
+-  )
+-
+ install (FILES
+   cty.dat
+   cty.dat_copyright.txt
diff --git a/media-radio/wsjtx/wsjtx-2.1.2.ebuild b/media-radio/wsjtx/wsjtx-2.3.0.ebuild
index 92b441112d0b..65a0022c8f68 100644
--- a/media-radio/wsjtx/wsjtx-2.1.2.ebuild
+++ b/media-radio/wsjtx/wsjtx-2.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit cmake-utils
+EAPI=7
+inherit cmake flag-o-matic
 
 MY_P=${P/_/-}
 
@@ -12,10 +12,12 @@ SRC_URI="mirror://sourceforge/wsjt/${MY_P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
-RDEPEND="dev-qt/qtcore:5
+RDEPEND="
+	dev-libs/boost[python]
+	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5
 	dev-qt/qtnetwork:5
@@ -23,9 +25,10 @@ RDEPEND="dev-qt/qtcore:5
 	dev-qt/qtconcurrent:5
 	dev-qt/qtserialport:5
 	dev-qt/qtsql:5
+	dev-qt/qttest:5
 	dev-qt/qtprintsupport:5
 	virtual/libusb:1
-	media-libs/hamlib
+	>=media-libs/hamlib-4.0
 	media-libs/portaudio
 	sci-libs/fftw:3.0[threads,fortran]
 	virtual/fortran
@@ -38,9 +41,10 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/wsjtx
 
 PATCHES=( "${FILESDIR}/${PN}-2.0.1-hamlib.patch"
-		  "${FILESDIR}/${PN}-fix-unicode.patch"
-		  "${FILESDIR}/${PN}-drop-docs.patch"
-		  "${FILESDIR}/${PN}-2.1.2-qt_helpers.patch" )
+		  "${FILESDIR}/${PN}-2.3.0-drop-docs.patch"
+		  "${FILESDIR}/${PN}-2.1.2-qt_helpers.patch"
+		  "${FILESDIR}/${PN}-2.2.0-werror.patch"
+		  "${FILESDIR}/${PN}-clang.patch" )
 
 DOCS=( AUTHORS BUGS NEWS README THANKS )
 
@@ -49,22 +53,28 @@ src_unpack() {
 	unpack "${WORKDIR}/${MY_P}/src/wsjtx.tgz"
 }
 
-src_configure() {
-	cmake_comment_add_subdirectory debian
+src_prepare() {
+	sed -i -e "s/COMMAND \${GZIP_EXECUTABLE}/#  COMMAND/" \
+								manpages/CMakeLists.txt || die
+	eapply_user
+	cmake_src_prepare
+}
 
+src_configure() {
 	local mycmakeargs=(
 		-DWSJT_GENERATE_DOCS="$(usex doc)"
 		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
 	)
-	cmake-utils_src_configure
+	append-ldflags -no-pie
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	rm "${D}"/usr/bin/rigctl{,d}-wsjtx || die
-	rm "${D}"/usr/share/man/man1/rigctl{,d,com}-wsjtx.1.gz || die
+	rm "${D}"/usr/share/man/man1/rigctl{,d,com}-wsjtx.1 || die
 }