gentoo resync : 06.04.2022

16 files changed, 118 insertions, 376 deletions

diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index fa51c0454b3d..da14d275ec97 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/flrig/Manifest b/media-radio/flrig/Manifest
index 094101fe2087..c82e4dde6c5c 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -2,7 +2,9 @@ AUX flrig-1.4.4-musl.patch 618 BLAKE2B e03367cea46747325ab98a9a9b2a7bb2b977e21e4
 DIST flrig-1.4.2.tar.gz 918730 BLAKE2B 85c2ac351e833b19dab0e36899df58665c86ac397035e8eabad29bb38018a0d2c822ca73b721f2db938a1f7cf2cd2b3a6878f605d5d65f01608563f3f4a0d89e SHA512 094f50a427cabc5c596a4315e7182ea4040218467f06fac456a0fe8923726f30cf3220379033024449066b4379a3877d48449971afe3f4b46b4307f9a64c3ff8
 DIST flrig-1.4.3.tar.gz 944556 BLAKE2B dcdb4a4306e3558e189094ec6f231ccae406f75d256bcb942aeee4ff67641e846fd99c73c263f98e2ed3a3074c6a4e473934186749c3dfc0b84d7d24e178c541 SHA512 93a5f3caeedcaed7de4988183d182872d4c3d22e670e2cd6b9aeb9cc969a09729a2765e1c7c93be72931f8948a0aeda7a75611f7dbc4b4d4adefe936a4006dca
 DIST flrig-1.4.4.tar.gz 978339 BLAKE2B 2cd285cd0ab8053ba1d6db7b7c44ca6298b910fb93b349196272b2c0e45123758d24b403f7173e38995da4e0c87d6c47eb4f59e4f61f070ef9188a196a2c4347 SHA512 81593529d27c9e4c1912f9dc64195972838eb4d784a0c1c3e5d0c31eada654b34ea6981e180756963a1fe876df0ff1064d991d22cee0c0b1696b09b9a5dbc2e2
+DIST flrig-1.4.5.tar.gz 995774 BLAKE2B 7853c38521c880cd0b1622dae339f6e5120ca9679e7f661e9b0aacc9b3bb12708c3c9a8b1204db0ebe69358bf0dd0daa0a5989163cc304b43c6906cc1872da4d SHA512 f4bd283900975f59b82208e21d9258b25901ed893e339cfc80eb27ce464439eb9df7b04af855a2c87b73cc477d327f965fd48d89589539bdf0da907078f765d3
 EBUILD flrig-1.4.2.ebuild 476 BLAKE2B 8665ccf1ef91f3f25912d4af906aeb74a579a5c865ce52f392f34f9ecaf14309a2d936ab6f3916b02e50fa8ea5d92d1171c9de3ef0cb7fb80491d02eec96cd99 SHA512 aec358712976dcaceada364545bcd9306cc5b3441db9100a71dae0d8d5f3a09e1e69b855a79524722840b3090c40c6fc000aa03fc0ba399a8cbc84dfebb0bc32
 EBUILD flrig-1.4.3.ebuild 476 BLAKE2B 8665ccf1ef91f3f25912d4af906aeb74a579a5c865ce52f392f34f9ecaf14309a2d936ab6f3916b02e50fa8ea5d92d1171c9de3ef0cb7fb80491d02eec96cd99 SHA512 aec358712976dcaceada364545bcd9306cc5b3441db9100a71dae0d8d5f3a09e1e69b855a79524722840b3090c40c6fc000aa03fc0ba399a8cbc84dfebb0bc32
 EBUILD flrig-1.4.4.ebuild 582 BLAKE2B b09dfce22f77aa2d6d5a6438c17ef42e0bddb9789c32abf5adf457af92008637f3ccc2d567aa4b4ebb4961cfcad3362619c69f0408f347f97259a32a6c1fec77 SHA512 f3a0722ae497b9d4c28d35ff26b77294de34cd131b01ee2a5118023638996b4f93e5de661fe4b2bd5b11c1a0938ea47918a0b26cb57ca8888e932ec85ec94816
+EBUILD flrig-1.4.5.ebuild 582 BLAKE2B b09dfce22f77aa2d6d5a6438c17ef42e0bddb9789c32abf5adf457af92008637f3ccc2d567aa4b4ebb4961cfcad3362619c69f0408f347f97259a32a6c1fec77 SHA512 f3a0722ae497b9d4c28d35ff26b77294de34cd131b01ee2a5118023638996b4f93e5de661fe4b2bd5b11c1a0938ea47918a0b26cb57ca8888e932ec85ec94816
 MISC metadata.xml 326 BLAKE2B fb57e943fa61222b3967939ff95da7bb17aae2651e55d960a9c405e6d5965843ed0ec9e6fadd0df1f41602c0f3c90c78c6ca2ab12ea72b515484f7c2ec34ec68 SHA512 e48dc185e9eaa074ed92d1ed27920e41b72760cd3e878fd40583efdca0a6997598a7d82221a33c7987fb19dea090f92eee070b9e89ea452ddce028d88db7bf9c
diff --git a/media-radio/flrig/flrig-1.4.5.ebuild b/media-radio/flrig/flrig-1.4.5.ebuild
new file mode 100644
index 000000000000..fa8591685185
--- /dev/null
+++ b/media-radio/flrig/flrig-1.4.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+
+PATCHES=( "${FILESDIR}/${PN}-1.4.4-musl.patch" )
+
+src_prepare() {
+	eapply ${PATCHES[@]}
+	eapply_user
+}
diff --git a/media-radio/qrq/Manifest b/media-radio/qrq/Manifest
index 3666d9a37770..85e57a970486 100644
--- a/media-radio/qrq/Manifest
+++ b/media-radio/qrq/Manifest
@@ -1,6 +1,4 @@
 AUX qrq-0.3.2-tinfo.patch 642 BLAKE2B e7d865bf046c3fca8b5d100054e6408321cb8452db59a7be1786acf71c23142174bf73783e49dd072885cb7196bd9597a4645145ea318a3851ed7771b5515302 SHA512 3c732f033aa33b44f225b0b6302db3d629a9adabf92dcac4715d2236ab77715705a646d29fdc04d790cad624d9fde547f4ea841a39089d49cd52d4368f6b42ac
-DIST qrq-0.3.3.tar.gz 159832 BLAKE2B 7af974175777f6166303ece0e0cfa0a035d49e0c265cd513b771a280dc7ac0772a979f45923a14737ff58a64147f8c97a3978ccd7e4cd81fe4a38f3156766057 SHA512 025f0a350600a9f3f24cb00afcaa0e99c0be881e40684cc7ccbb9927d883372336c0b668bae21f232ce52dd221eb4ed950d306a32bab34e65f9f3cba9f28a484
 DIST qrq-0.3.5.tar.gz 195012 BLAKE2B 55787fae08f730beda4c61b347da0c6ea874eaeb1c3fbadb57019eca62f24a3cb8b4c6dd43b4afab81d3b55d4ca1986a870d5d1d0da32ebc6033498741188c42 SHA512 f4db39cce484f9c2b7a55ec4aaf57bf720ae3a2465b5420a46c1100008c20ad245088be691174c9221683a70ac4c3af5f8fb48577706d4db24a55fe90624d034
-EBUILD qrq-0.3.3.ebuild 942 BLAKE2B 3ebc21f7477067a14ed26cbc05fef590dc5bf967075f547eb3d406834629c67d78845c86028062bde8231e1a7b8b7d96313bceda3de857ce525bacb8d9bfd9ed SHA512 293e2120591f3895010fbfe459ea8e7705dc1a8636568f0050eca57d19451d1b6bd0c03d8c0468c58439edcce17ea9745c06bb18119450316c9e525ac12420fe
-EBUILD qrq-0.3.5.ebuild 946 BLAKE2B 7f580f68c62d92e7574e0f7e6ddda5bf96e9bbd6aed10c4042bfb9551e246d2bde868f67fcabc25c82520f46694c41ce3d4af4a9686a4765057e61093c2152ce SHA512 b5866b9ca5a51087fdaf6ec4d04c1c015386b7ec2d57ec655c4fed5f0504f13f51bb24afe43dc9e70282ecaaff74ac109571597ebcaee194139f4f8e0b6be4c0
+EBUILD qrq-0.3.5.ebuild 944 BLAKE2B 10388884494258f69aa441c6b618af8785a17768c4fe590d311854ab49c9c020b0d1dc7e7bc65876d43f776dcb6952a278e22a800940b9ef3c777ac1c192ef3c SHA512 ec4a36f26f78a2ccc8b9e839c1146d2885cc8801606ea5ebedf65a73e691b5dd9c249d3956c3ec01a752d01fc7d94d1624f4d165fff736c6a09526f38f1c7698
 MISC metadata.xml 250 BLAKE2B 73afdd27824ddad49c748f845fb81e8b64d10b29a271175198b7c893096d6d5c64bf736446ec01c9679b7978925de4df8159761e1c3fdb83436468c882a72f85 SHA512 f5d1c70de88ecdf2edd6f5d68f44e26fd99705a91c52269b39c03240b06ab1d8299d03a2af5828c8f22198ec1188f14f957064c8459f27a8f2efea25398bdf4d
diff --git a/media-radio/qrq/qrq-0.3.3.ebuild b/media-radio/qrq/qrq-0.3.3.ebuild
deleted file mode 100644
index ad8dcdd3caa1..000000000000
--- a/media-radio/qrq/qrq-0.3.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 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}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${PN}-0.3.2-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 PKG_CONFIG="$(tc-getPKG_CONFIG)" ${CONF}
-}
-
-src_install() {
-	emake ${CONF} DESTDIR="${D}/usr" install
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/media-radio/qrq/qrq-0.3.5.ebuild b/media-radio/qrq/qrq-0.3.5.ebuild
index 5a47c640e5d0..9ecd8b210351 100644
--- a/media-radio/qrq/qrq-0.3.5.ebuild
+++ b/media-radio/qrq/qrq-0.3.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://fkurz.net/ham/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="pulseaudio"
 
 DEPEND="sys-libs/ncurses:=
diff --git a/media-radio/wsjtx/Manifest b/media-radio/wsjtx/Manifest
index eb20c83147f5..1b1c0bc94080 100644
--- a/media-radio/wsjtx/Manifest
+++ b/media-radio/wsjtx/Manifest
@@ -3,14 +3,6 @@ AUX wsjtx-2.1.2-qt_helpers.patch 625 BLAKE2B 50a45636ed9ed410002866235d3d6feca21
 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
-DIST wsjtx-2.5.0.tgz 25180010 BLAKE2B 09a50f8bbaca4fa6883ad335a6eb3e0d60d3e20382140ab69e3165ba4a38c9e96b059831db9a28452b15f5a0b98118e1269f3484ac8f375525135236b9d7ce02 SHA512 d5f801c9ec038a84d5b12a3843de9af7bbd6d628bd5eb8d3dd1e1621f04b319f9cc2ed01c882bf09ad3801800ee1b1fbeb49c8a9f991a2c03f3170ac192a6017
-DIST wsjtx-2.5.1.tgz 25249461 BLAKE2B fe858e4a21434c7357aa5baab8f4aff206a22bec7305b2d7c6a3860a389ca19779f4775a5618c046b25a71006a882f7a33b30baebe6e848182bd434ff82bb9aa SHA512 bce84766ea1eb13e899ccfc252ee3bcdb6f1d50afa6b312b0509d1eea8e5dcfc958c772fee2a2c40d43058e06ecda798fa9136252e3de0c4a40df27217a4b362
-DIST wsjtx-2.5.2.tgz 25246974 BLAKE2B ada5fc73a600477fa7f1f68c9c8c53e26c56d60aea1c28edc8c35e4ff67a309bf61e82f58c93c05a24c08ed7e77419c2a6ef6862b7cac059cccbebe66512afaf SHA512 cdccbb824614d391aa8f750e3c7e47d1fe8a9704f50d8a361e8741fadea971683383d9dfe0456c674b4584a47eb9a0fdce9c36a608d164de5ae98538e9b83705
-DIST wsjtx-2.5.3.tgz 25599071 BLAKE2B c62fc1f4ce23ce99ddea475039b99d40b23d2a42f7d9995395ea0f2655b3b01595539ae40f78dc29bc5c97ba1f165dcd8a5daef6d4f9b55c2260667a09d47e30 SHA512 ed6664223069c7b44dac8c995b4beaa96e2a839a9049e5805d93b1f0ffe03d310b7a301150d693fcc22f96a97ed86c4948059f1e18b23cd2c9a5e44665100862
 DIST wsjtx-2.5.4.tgz 25369854 BLAKE2B 674cb64f8f30114dd4e857181502e39d5a61fdb487ef503fd945d1e91853f8aab4dead7c2e9daf4ed2863b07b9760ceec3b6c79c30b64c0c2e3115efc1e20be6 SHA512 c4092d03af3346f0244d942c3db693f5d2c1ed7a2ec9077ded039b7d162e15abdaf09dcb9997d1833d25c366eb03a0dab6114313d423e7e2c9ff37d965261efc
-EBUILD wsjtx-2.5.0.ebuild 1687 BLAKE2B 77b160d46cb92cbf63c72feb553ba06ebf4f1c06f41479da89f1cd4f959850a476385698f4c934b5a675a2d3f023f254d4d224515a515988d0c0f98a2dc18dfa SHA512 497807b138ef74825294b571d0ab9a4b33ef6a68f5ebb80171461772847878cd62d62090ab8de9bf69cf5065672faad173a464270ecc64427f82a5b63dad0922
-EBUILD wsjtx-2.5.1.ebuild 1689 BLAKE2B dd6a09e69b77941ace5d69e756359d3f321d982831160b05eaba1a7ed4befba470d18c684a0776a2efa78b6f64c2c1a5eeec527118cbf180b582643c7f2c9463 SHA512 d407ea31a2c61f46f98f21b2736b76e25e212a87a047f6c506ce336ed561ee7aa554d0bb1b4b7b632902ddbcb6968ea2af7943a174cf62e774c1665cc6e7b3f1
-EBUILD wsjtx-2.5.2.ebuild 1689 BLAKE2B dd6a09e69b77941ace5d69e756359d3f321d982831160b05eaba1a7ed4befba470d18c684a0776a2efa78b6f64c2c1a5eeec527118cbf180b582643c7f2c9463 SHA512 d407ea31a2c61f46f98f21b2736b76e25e212a87a047f6c506ce336ed561ee7aa554d0bb1b4b7b632902ddbcb6968ea2af7943a174cf62e774c1665cc6e7b3f1
-EBUILD wsjtx-2.5.3.ebuild 1702 BLAKE2B 6c4738e241760bdaf1f46040327ba08b707cfad7d7a67cde147680e816087a2a76228ca292246ccd10f854807f18a11a9e41237a4958b2320dd1e803e925ebbf SHA512 16945c4965d11d522595330bfac689ac1a4c8504ce43850db0c8a4ee26f8949e4fa406dfd29e82d581df1247d356d2cb8c114de3afd8ad5a35176bd8cd113e6d
-EBUILD wsjtx-2.5.4.ebuild 1702 BLAKE2B a5ebf298f5e46f4b8d8314cf6153e47ecd8cfb090d876ef3a24952236979cd7515878747631d4cf4c0a400e79e2764bbb4dbf93d0c944cade44f50be917e9ea2 SHA512 a532ecd0a79613578a27aaf31a419d1bd1a3048500b7b68d37dd030c94621d63c29b611aa7fe10d8a13e84f48029a4d0c4aeccb48c7240834ab8fe0e066f04ee
+EBUILD wsjtx-2.5.4.ebuild 1700 BLAKE2B db34b9f8b3f697cf9e438733402587db988def94ad31b34d7861ec8dead648f033d70446b74fa693ae80d37ebcb7a6b7abbd85a4d050db2a99a3ff86ccda1b1f SHA512 17b2c2eec12d0ce0c192c43722159b848a241db65567b0d453a368bff8985652adaac7e34a7fc522ddf59e7262cc156b2c28fa45e6a58777293a4aec9a290981
 MISC metadata.xml 412 BLAKE2B a8910c8ec81f720c209c3d9cb6cdfbde76be4c5a96941dfc3b799e9ba6b4d967928508c04bc5805536319a20f0b7cb292a2475f91de27471c11b9fd0f9073bec SHA512 2215cd7cea5ed62ef70bb2823ce85628877e3c204f7a55e582431c2d90ec8f77e6523b3e81c1747b339d58eeaf7c026ea26b6245af86294904e1c34887da943f
diff --git a/media-radio/wsjtx/wsjtx-2.5.0.ebuild b/media-radio/wsjtx/wsjtx-2.5.0.ebuild
deleted file mode 100644
index f7879402eaec..000000000000
--- a/media-radio/wsjtx/wsjtx-2.5.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit cmake flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Weak signal ham radio communication"
-HOMEPAGE="http://physics.princeton.edu/pulsar/K1JT/wsjtx.html"
-SRC_URI="mirror://sourceforge/wsjt/${MY_P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="
-	dev-libs/boost:=[nls,python]
-	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/qtsql:5
-	dev-qt/qttest:5
-	dev-qt/qtprintsupport:5
-	virtual/libusb:1
-	>=media-libs/hamlib-4.0:=
-	media-libs/portaudio
-	sci-libs/fftw:3.0[threads,fortran]
-	virtual/fortran
-	app-text/asciidoc
-	doc? ( dev-ruby/asciidoctor )"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools
-	"
-
-S=${WORKDIR}/wsjtx
-
-PATCHES=( "${FILESDIR}/${PN}-2.0.1-hamlib.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 )
-
-src_unpack() {
-	unpack ${A}
-	unpack "${WORKDIR}/${MY_P}/src/wsjtx.tgz"
-}
-
-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}"
-	)
-	append-ldflags -no-pie
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_install() {
-	cmake_src_install
-	rm "${D}"/usr/bin/rigctl{,d}-wsjtx || die
-	rm "${D}"/usr/share/man/man1/rigctl{,d,com}-wsjtx.1 || die
-}
diff --git a/media-radio/wsjtx/wsjtx-2.5.1.ebuild b/media-radio/wsjtx/wsjtx-2.5.1.ebuild
deleted file mode 100644
index aef0bd374750..000000000000
--- a/media-radio/wsjtx/wsjtx-2.5.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit cmake flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Weak signal ham radio communication"
-HOMEPAGE="http://physics.princeton.edu/pulsar/K1JT/wsjtx.html"
-SRC_URI="mirror://sourceforge/wsjt/${MY_P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	dev-libs/boost:=[nls,python]
-	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/qtsql:5
-	dev-qt/qttest:5
-	dev-qt/qtprintsupport:5
-	virtual/libusb:1
-	>=media-libs/hamlib-4.0:=
-	media-libs/portaudio
-	sci-libs/fftw:3.0[threads,fortran]
-	virtual/fortran
-	app-text/asciidoc
-	doc? ( dev-ruby/asciidoctor )"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools
-	"
-
-S=${WORKDIR}/wsjtx
-
-PATCHES=( "${FILESDIR}/${PN}-2.0.1-hamlib.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 )
-
-src_unpack() {
-	unpack ${A}
-	unpack "${WORKDIR}/${MY_P}/src/wsjtx.tgz"
-}
-
-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}"
-	)
-	append-ldflags -no-pie
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_install() {
-	cmake_src_install
-	rm "${D}"/usr/bin/rigctl{,d}-wsjtx || die
-	rm "${D}"/usr/share/man/man1/rigctl{,d,com}-wsjtx.1 || die
-}
diff --git a/media-radio/wsjtx/wsjtx-2.5.2.ebuild b/media-radio/wsjtx/wsjtx-2.5.2.ebuild
deleted file mode 100644
index aef0bd374750..000000000000
--- a/media-radio/wsjtx/wsjtx-2.5.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit cmake flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Weak signal ham radio communication"
-HOMEPAGE="http://physics.princeton.edu/pulsar/K1JT/wsjtx.html"
-SRC_URI="mirror://sourceforge/wsjt/${MY_P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	dev-libs/boost:=[nls,python]
-	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/qtsql:5
-	dev-qt/qttest:5
-	dev-qt/qtprintsupport:5
-	virtual/libusb:1
-	>=media-libs/hamlib-4.0:=
-	media-libs/portaudio
-	sci-libs/fftw:3.0[threads,fortran]
-	virtual/fortran
-	app-text/asciidoc
-	doc? ( dev-ruby/asciidoctor )"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools
-	"
-
-S=${WORKDIR}/wsjtx
-
-PATCHES=( "${FILESDIR}/${PN}-2.0.1-hamlib.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 )
-
-src_unpack() {
-	unpack ${A}
-	unpack "${WORKDIR}/${MY_P}/src/wsjtx.tgz"
-}
-
-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}"
-	)
-	append-ldflags -no-pie
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_install() {
-	cmake_src_install
-	rm "${D}"/usr/bin/rigctl{,d}-wsjtx || die
-	rm "${D}"/usr/share/man/man1/rigctl{,d,com}-wsjtx.1 || die
-}
diff --git a/media-radio/wsjtx/wsjtx-2.5.3.ebuild b/media-radio/wsjtx/wsjtx-2.5.3.ebuild
deleted file mode 100644
index 5eb5dda86065..000000000000
--- a/media-radio/wsjtx/wsjtx-2.5.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit cmake flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Weak signal ham radio communication"
-HOMEPAGE="http://physics.princeton.edu/pulsar/K1JT/wsjtx.html"
-SRC_URI="https://physics.princeton.edu/pulsar/k1jt/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	dev-libs/boost:=[nls,python]
-	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/qtsql:5
-	dev-qt/qttest:5
-	dev-qt/qtprintsupport:5
-	virtual/libusb:1
-	>=media-libs/hamlib-4.0:=
-	media-libs/portaudio
-	sci-libs/fftw:3.0[threads,fortran]
-	virtual/fortran
-	app-text/asciidoc
-	doc? ( dev-ruby/asciidoctor )"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools
-	"
-
-S=${WORKDIR}/wsjtx
-
-PATCHES=( "${FILESDIR}/${PN}-2.0.1-hamlib.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 )
-
-src_unpack() {
-	unpack ${A}
-	unpack "${WORKDIR}/${MY_P}/src/wsjtx.tgz"
-}
-
-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}"
-	)
-	append-ldflags -no-pie
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_install() {
-	cmake_src_install
-	rm "${D}"/usr/bin/rigctl{,d}-wsjtx || die
-	rm "${D}"/usr/share/man/man1/rigctl{,d,com}-wsjtx.1 || die
-}
diff --git a/media-radio/wsjtx/wsjtx-2.5.4.ebuild b/media-radio/wsjtx/wsjtx-2.5.4.ebuild
index 88d2e49b406f..e6faedc87d75 100644
--- a/media-radio/wsjtx/wsjtx-2.5.4.ebuild
+++ b/media-radio/wsjtx/wsjtx-2.5.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://physics.princeton.edu/pulsar/k1jt/${P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/media-radio/xwxapt/Manifest b/media-radio/xwxapt/Manifest
index 1dbc9b848e3c..dc58a2a01ce5 100644
--- a/media-radio/xwxapt/Manifest
+++ b/media-radio/xwxapt/Manifest
@@ -1,4 +1,8 @@
 AUX xwxapt-3.4.2-fix-autotools.patch 1339 BLAKE2B 00db95e39bd581b5fb298f88fa1105bfe39e1778e5e308b34f3ba8364771ef4e59d6bd13426549c6a2eb9d08748fd0144e1d6e70f0f5c4a87be3e6e38a50cda0 SHA512 edad4b8db138db59587f35150261f15eeae3b1e02f06cb0f814f7c34fa3e1de1c6eb42768fee5fa90659e81f0288cad3f900f45f7038c59488e7cb78a03e5216
+AUX xwxapt-example-data.patch 590 BLAKE2B 7714218b50791bd1e30275ce081b0a243cfcfc2117184635fa8d0701710ad92ddf69a09dd1d0cfe387530518662d0d231114b29dcc6488d09d5d5effc23b7f7c SHA512 7455ee649821ff1004e706d32aa6cafc9a713adec887fc12269e758f3d218d7dcfcb499f239ceb97a9ad39f417372bf88066e90d775c9c804edf2f95a8bed015
+AUX xwxapt-fix-autotools.patch 605 BLAKE2B 5aa173f6f43a83d5ab7371a7186c7e053cad4be989f458c69af666fa55e965aeb8648fcb36f67591a5595aeb720ceedd300d419cb81d5ff3d49734efbacaa165 SHA512 83d284b5ccb54c5849239dbad4b40a8eb7583c94a8696f908a513f42ff94ca35755ceeecce369318ecd04a5d32e26659549b8edeade4c6fe6680f377a6d759ec
 DIST xwxapt-3.4.2.tar.bz2 262059 BLAKE2B 5e5642523e434dee6d2a35dc1be5bead3449afddb285e367cd99c7d2de14f2b1d7181bd6bc7d91a652faaa38aac3ce1b7d51d80ece665b230667674d9cb52779 SHA512 15969db9869699b09e2ddd1f800bff4956dcdedf91c5070d6747d3fa7ec22f78460adc8533917523821712b4da9f75350a8780df45bfe8741ad88d694dda6210
+DIST xwxapt-3.4.3.tar.bz2 265272 BLAKE2B 77b571df40baf7fc9caacb941b6a5f07e9183141ac5e431e9830665a4b3e08a0072eb4338b858803afe195a965ce1233263ac86f85d5aa69f9ecc05a8dee5e95 SHA512 a7729af02ac29a9e24968a5b9af51fb538cc04f20ae04c5af4c2fcdff808e1c47f2063bb6b18863441c17f79856e24a076328b4488bafb3158dcc7e6c3e3bf7f
 EBUILD xwxapt-3.4.2.ebuild 1148 BLAKE2B bb84773b7da60e38f910400048e92d4f9b0844398b386a3c68d7d1c83c0fa35eb77c7289fadcac3331c4474c0d7f6c416d50bd85ff6b47a249dc57172df7637e SHA512 b9f3e52855fb096f55bb8037b6a8e9130e0f05cfd28a7e4614894de1197db7cb9d171e152e7e6409aff732249db50070115cdd1580fe03ee8b389f7bae4c9ec7
+EBUILD xwxapt-3.4.3.ebuild 983 BLAKE2B f0b1bb87e66df75cf027fb5d78f7b24299c453b3cec39efcbb87e3fbc4f0f6f7b45bb884ef2d3d312260b2a2a6066dc9597c2ce0e925a0fe4897c3ea9bec8e8c SHA512 e7ba38bc4905ccc26e7cb2634fd0864af3b6e85e93d022dea000b2a78e7c1fd42fa945c1a3a1a626ecd44572f14c6d0a4b9c14180aa56a9254b3bef38d55f677
 MISC metadata.xml 246 BLAKE2B 0e24c5acb9f25df4ce675d772f01ef4cca1df3e885dff8c64c0c6f255b9ec49c4761ee159c30a35f77bbeefa1ec62ac6e835d2facdae2b63fbf0d6b350ac23b0 SHA512 be18486abf39193c34501128c8f1bf7e1886b74a7d551735d00c3492c7bae8845ba2dbea93b2ca73d5467cb7764d90b670014143ae8a8ca0a480a02d9af60efb
diff --git a/media-radio/xwxapt/files/xwxapt-example-data.patch b/media-radio/xwxapt/files/xwxapt-example-data.patch
new file mode 100644
index 000000000000..71ed56ae54e4
--- /dev/null
+++ b/media-radio/xwxapt/files/xwxapt-example-data.patch
@@ -0,0 +1,13 @@
+diff --git a/src/main.c b/src/main.c
+index 6cec142..7d7c1bf 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -127,7 +127,7 @@ main (int argc, char *argv[])
+     /* Create file path to xwxapt examples directory */
+     exe_path[bytes] = '\0';
+     Strlcpy( file_path, exe_path, sizeof(file_path) );
+-    Strlcat( file_path, "/share/examples/xwxapt", sizeof(file_path) );
++    Strlcat( file_path, "/share/xwxapt", sizeof(file_path) );
+     fprintf( stderr, "xwxapt: creating xwxapt config directory from: %s\n", file_path );
+ 
+     /* Create system command to copy examples/xwxapt to ~/.xwxapt */
diff --git a/media-radio/xwxapt/files/xwxapt-fix-autotools.patch b/media-radio/xwxapt/files/xwxapt-fix-autotools.patch
new file mode 100644
index 000000000000..ba74a4eacf19
--- /dev/null
+++ b/media-radio/xwxapt/files/xwxapt-fix-autotools.patch
@@ -0,0 +1,22 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -35,17 +35,16 @@
+ AC_CHECK_LIB([gmodule-2.0], [g_module_open])
+ 
+ # Internationalization tools
++AM_GNU_GETTEXT([external])
+ AM_GNU_GETTEXT_VERSION([0.19.8])
+ GETTEXT_PACKAGE=xwxapt
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext package.])
+-AM_GNU_GETTEXT
+ PROGRAMNAME_LOCALEDIR=[${datadir}/locale]
+ AC_SUBST(PROGRAMNAME_LOCALEDIR)
+ 
+ # Add the languages which your application supports here.
+ ALL_LINGUAS=""
+-AM_GNU_GETTEXT
+ 
+ # Checks for header files.
+ AC_CHECK_HEADERS([libintl.h stdlib.h string.h unistd.h])
+ 
diff --git a/media-radio/xwxapt/xwxapt-3.4.3.ebuild b/media-radio/xwxapt/xwxapt-3.4.3.ebuild
new file mode 100644
index 000000000000..91a98a0278fc
--- /dev/null
+++ b/media-radio/xwxapt/xwxapt-3.4.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="GTK+ linux weather satellite APT image decoder software"
+HOMEPAGE="https://www.qsl.net/5b4az/pages/apt.html"
+SRC_URI="https://www.qsl.net/5b4az/pkg/apt/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/glib:2
+	media-libs/alsa-lib
+	net-wireless/rtl-sdr
+	x11-libs/gtk+:3"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-fix-autotools.patch
+		  "${FILESDIR}"/${PN}-example-data.patch )
+HTML_DOCS=( doc/xwxapt.html )
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	docompress -x /usr/share/man/man1/xwxapt.1.gz
+	rm "${D}"/usr/share/doc/${P}/${PN}.1.gz || die
+	rm "${D}"/usr/share/doc/${P}/${PN}.html || die
+	mv "${D}"/usr/share/examples/xwxapt "${D}"/usr/share || die
+	keepdir /usr/share/${PN}/images /usr/share/${PN}/records
+}