gentoo resync : 25.08.2020

33 files changed, 124 insertions, 538 deletions

diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index d968aa4f0971..33c2f1e59427 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/fldigi/Manifest b/media-radio/fldigi/Manifest
index 95cfb6c36fbe..576d79bc1725 100644
--- a/media-radio/fldigi/Manifest
+++ b/media-radio/fldigi/Manifest
@@ -1,8 +1,6 @@
 AUX fldigi-c++11.patch 1140 BLAKE2B 987d33126e80340d7687cc1e346a8cc8b5701c9f6a4259357c08c8ab828eb71d871e1bb70652f4d35a57243fbb0738db2c59717a822f178bf2c7afb960305c42 SHA512 a2399caf67947b129d32563d3deb0f209f0814e39ea48ea46f664bacf7b64a2639f9c237889004af45df6553ef5668ec9d5c389d3ea7a6fb9922f54654bcc9ee
-DIST fldigi-4.1.09.tar.gz 4778091 BLAKE2B 2053cccbe84141ee4b43149f043a9f66c568d962d6ef01a694e7dcb876d76e2a74d87158cd3e811b44b7495152b8fdb191098d55ac64793e8c76a0b26783bd0a SHA512 b4c284f599f7985205c8198df32f02fade55bfba6c4630b0c385f9f2d734ef0be11b5620e73324d88a5d5dfc4258c44c8e1759a57cd8da77186bb7d4277e1503
-DIST fldigi-4.1.11.tar.gz 4792572 BLAKE2B 7f96b5f8e83af28f522f0dc55e794d3b5beef05c54c990fb6304c2cfbbc21adced39d29be24ccbc0a50bbb3d97e7c3d71530169ceeaf5aa59e52389462c6e135 SHA512 37e5a40ae67bcce3fe1480c6c9cbb7d56a4f6cbf6dd042d676524cc96007d487fd50027394655aa6ad44f583e3b36b13cb5e0af2da0656803368ad3a243b579b
 DIST fldigi-4.1.12.tar.gz 4790381 BLAKE2B 8be45c87bce298f91cb3975c8fe348b8ef39ea5ffe5eb719df496c075aa0773f8bf9b139312ea809057f926ffd27087fd41d350342f0f8ac198800a65178f367 SHA512 f74fd5915119d9d04a54260268d1dcd753ca50b48b388d2cc86a6ac2534ce0a0b1595124415b9aa19e518e58344a993510f5e9817f7893814821ebd3df7fa5ae
-EBUILD fldigi-4.1.09.ebuild 1288 BLAKE2B ec1418efca40ed21851d84bb2095588a2b4c3cd98eaa199777694638ceab6c69e5fbcfc3162b250d419bc0f57ec8cc08954fabf644402537e38faaf0025f1e98 SHA512 29903bbc6e4d60957c1f6849e335ba562d8cc58d790d6fa6e605f9be88e778871b03a57c60a2ee8c7cfd11e859625a73d6aeda01f078e734016d82ddd6d49a8a
-EBUILD fldigi-4.1.11.ebuild 1290 BLAKE2B 545cc510b01cf7ba73c01b59ba77865e5f533866b32942215b068b567ba064a5d881739ccef95417a75c12cd7489eab8aa472faf176bf9b41623c099c448e03e SHA512 e93c4d87b94e762a114e7e766791a1d8aaa8cfb2d80011ba2e28597a273435f4ef06c083eba0e8b8eea4e962b84c3cdd2b02e7910f818244f8c3258cb368cdb2
-EBUILD fldigi-4.1.12.ebuild 1290 BLAKE2B 545cc510b01cf7ba73c01b59ba77865e5f533866b32942215b068b567ba064a5d881739ccef95417a75c12cd7489eab8aa472faf176bf9b41623c099c448e03e SHA512 e93c4d87b94e762a114e7e766791a1d8aaa8cfb2d80011ba2e28597a273435f4ef06c083eba0e8b8eea4e962b84c3cdd2b02e7910f818244f8c3258cb368cdb2
+DIST fldigi-4.1.14.tar.gz 4792805 BLAKE2B 2f910c9eabb22dcc31e03fcebd5088edff9db128ab59ada553a3cd1016864a326204b7a082d1310c45ea682ed9264038e7e59a19ba68cf4ff5a30443b8033cd5 SHA512 b96a9d724087bacad93b6e729039ab67231ee6ebbd1b082c143e7bfb58f103012f98448f3ea0badabeeb748ed81d6d44e503b71bcb5ee6d0fa8108ab6d029d8d
+EBUILD fldigi-4.1.12.ebuild 1288 BLAKE2B ec1418efca40ed21851d84bb2095588a2b4c3cd98eaa199777694638ceab6c69e5fbcfc3162b250d419bc0f57ec8cc08954fabf644402537e38faaf0025f1e98 SHA512 29903bbc6e4d60957c1f6849e335ba562d8cc58d790d6fa6e605f9be88e778871b03a57c60a2ee8c7cfd11e859625a73d6aeda01f078e734016d82ddd6d49a8a
+EBUILD fldigi-4.1.14.ebuild 1290 BLAKE2B 545cc510b01cf7ba73c01b59ba77865e5f533866b32942215b068b567ba064a5d881739ccef95417a75c12cd7489eab8aa472faf176bf9b41623c099c448e03e SHA512 e93c4d87b94e762a114e7e766791a1d8aaa8cfb2d80011ba2e28597a273435f4ef06c083eba0e8b8eea4e962b84c3cdd2b02e7910f818244f8c3258cb368cdb2
 MISC metadata.xml 495 BLAKE2B 9c6f1b29ffb13a553b74ded93c11d29ffdc5a02336adb8fef55b862800a1856e712cdcb06c4e7d90858712d43aafce79f6cf9a357dc0a3c3ca0fc5cdb0ff770e SHA512 fdd9bc3f065ccb354ed0ad5c6544ca70f2011828870b942f2bf2f7001bf1342f858d60a6031cf005623795d1f1d2ccbc3a42fb54dcbd465c3c73f29a928d9091
diff --git a/media-radio/fldigi/fldigi-4.1.09.ebuild b/media-radio/fldigi/fldigi-4.1.09.ebuild
deleted file mode 100644
index 2ce4f991e275..000000000000
--- a/media-radio/fldigi/fldigi-4.1.09.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
-HOMEPAGE="http://www.w1hkj.com"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="hamlib nls pulseaudio"
-IUSE_CPU_FLAGS=" sse sse2 sse3"
-IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}"
-
-RDEPEND="x11-libs/fltk:1[threads,xft]
-	media-libs/libsamplerate
-	media-libs/libpng:0
-	x11-misc/xdg-utils
-	dev-perl/RPC-XML
-	dev-perl/Term-ReadLine-Perl
-	|| (
-		media-libs/portaudio[oss]
-		media-libs/portaudio[alsa]
-	)
-	hamlib? ( media-libs/hamlib )
-	pulseaudio? ( media-sound/pulseaudio )
-	>=media-libs/libsndfile-1.0.10"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-PATCHES=( "$FILESDIR"/$PN-c++11.patch )
-
-src_configure() {
-	local myconf=""
-
-	use cpu_flags_x86_sse && myconf="${myconf} --enable-optimizations=sse"
-	use cpu_flags_x86_sse2 && myconf="${myconf} --enable-optimizations=sse2"
-	use cpu_flags_x86_sse3 && myconf="${myconf} --enable-optimizations=sse3"
-
-	econf ${myconf} \
-		--with-sndfile \
-		$(use_with hamlib) \
-		$(use_enable nls) \
-		$(use_with pulseaudio) \
-		--without-asciidoc
-}
diff --git a/media-radio/fldigi/fldigi-4.1.12.ebuild b/media-radio/fldigi/fldigi-4.1.12.ebuild
index 7ded0b14db4c..2ce4f991e275 100644
--- a/media-radio/fldigi/fldigi-4.1.12.ebuild
+++ b/media-radio/fldigi/fldigi-4.1.12.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="hamlib nls pulseaudio"
 IUSE_CPU_FLAGS=" sse sse2 sse3"
 IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}"
diff --git a/media-radio/fldigi/fldigi-4.1.11.ebuild b/media-radio/fldigi/fldigi-4.1.14.ebuild
index 7ded0b14db4c..7ded0b14db4c 100644
--- a/media-radio/fldigi/fldigi-4.1.11.ebuild
+++ b/media-radio/fldigi/fldigi-4.1.14.ebuild
diff --git a/media-radio/flrig/Manifest b/media-radio/flrig/Manifest
index e1c55d8d0e48..2ef7ce185341 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -1,10 +1,4 @@
 AUX fix-bashism.patch 547 BLAKE2B b04673f95b56dc9258b2953e90aabf81b2ef3d2b7bc7e3aee736dad07c96bbb962ddb37061713ddebf39f543bc1ad46c2667345660e07aed37576487e95d8dd8 SHA512 4e37cac97a340171fbe995fa17b63827e278ce1b46fdafbd82ed03c5967565e1e09348d43fec9801a500e3d3793dde3111fb4c3bd4b0541cb2a0696e78f645a9
-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 583 BLAKE2B b106c6f19739f97d709eef5f6400f8d96365eb1bda992ef2a3a5e813bb44a476ab800b8e006a3e874cce2d02bd0964eb38136b276bc80e43ae75be29fd5d1910 SHA512 460255763b871d7f3e6a53c88724e996dd08ecd69cd6e4b87f423832a59e6dcd4b72d87b5b507b1e96dbb53c0e30a9039f7631f99df2a210732bd644c4a393c1
-EBUILD flrig-1.3.50.ebuild 585 BLAKE2B d3e69851d8f35bf5cbc5ee58923018663be29b6fb6193b6f8f3f8d03124f6f307bf7970412c92213187a8fd3e45e65c6438b55c67d4af1e252d9367e19487b35 SHA512 9f87e5a57a2fec7c8a629a627a87a535001b8566320c24411d9d2557cddda831a976981ef7066332aca7e5ef8a53b77d4e6579b7edc8d7a06c5bbbfe0c3d9ac6
+EBUILD flrig-1.3.50.ebuild 583 BLAKE2B b106c6f19739f97d709eef5f6400f8d96365eb1bda992ef2a3a5e813bb44a476ab800b8e006a3e874cce2d02bd0964eb38136b276bc80e43ae75be29fd5d1910 SHA512 460255763b871d7f3e6a53c88724e996dd08ecd69cd6e4b87f423832a59e6dcd4b72d87b5b507b1e96dbb53c0e30a9039f7631f99df2a210732bd644c4a393c1
 MISC metadata.xml 325 BLAKE2B c4c98ed723dff91c8935c44ee552e25a08366edb7b73593d29d790622a49e130ef56137de21e1df16e1f968b1d5a0c984ce6df5b817a39f38523fb71353a3e1f SHA512 ca601e14e79450d08e0679e86827071a323fbc60cdf89412257747490046ca6efb2e78ae27f69c0e3ad449427049a35d478f2a7524a0606658ef9b302d9c0d43
diff --git a/media-radio/flrig/flrig-1.3.46.ebuild b/media-radio/flrig/flrig-1.3.46.ebuild
deleted file mode 100644
index e6f8b25a04c3..000000000000
--- a/media-radio/flrig/flrig-1.3.46.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 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/flrig/flrig-1.3.48.ebuild b/media-radio/flrig/flrig-1.3.48.ebuild
deleted file mode 100644
index e6f8b25a04c3..000000000000
--- a/media-radio/flrig/flrig-1.3.48.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 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/flrig/flrig-1.3.49.ebuild b/media-radio/flrig/flrig-1.3.49.ebuild
deleted file mode 100644
index 8b174faaddca..000000000000
--- a/media-radio/flrig/flrig-1.3.49.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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/flrig/flrig-1.3.50.ebuild b/media-radio/flrig/flrig-1.3.50.ebuild
index 76d6201bcbf2..8b174faaddca 100644
--- a/media-radio/flrig/flrig-1.3.50.ebuild
+++ b/media-radio/flrig/flrig-1.3.50.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
 DOCS=(AUTHORS ChangeLog README)
diff --git a/media-radio/qsstv/Manifest b/media-radio/qsstv/Manifest
index d7b65aec49c3..d9063ad2e271 100644
--- a/media-radio/qsstv/Manifest
+++ b/media-radio/qsstv/Manifest
@@ -1,3 +1,3 @@
 DIST qsstv_9.4.4.tar.gz 7716392 BLAKE2B df285cc26c195dce05e54401de4fce70ea91c3af1f774d90d81b62a366c66c3cde4f0cce5c370bad45b81230ca7c2be624542cde10b94d388785d13b49ed646d SHA512 d206c6c108827b607dfe360e7afe31065518f03ab04609ccca9a9bda16207d12966eb49d486d13eebb814716252c50aa5963d090f1e505e508ccb1b6ccc4728c
 EBUILD qsstv-9.4.4.ebuild 1022 BLAKE2B 44dccc88a935574850e264d856b3afacdfe0c8f65e6384b71fa2003691ae52d82a47091ea8fc2def42e10fd2404f9ebc947de07b9c8c93a9e80da50dc7ca87f4 SHA512 4e4016ce9adddef9ff6c34f1ca9dc5a875165800ff1d7ad503023289e79ca0a10929faa895afd80b3bea15e516907a2232b3f65df26c93f55121831138e6c913
-MISC metadata.xml 410 BLAKE2B ce47d5a977b2b6b76940c5b2c74434ea382d4188f319234935a12fa4927f4b493ea664ec6fca2302aea1a31b8234d20819b585f5e56384085541445f4e8bab2d SHA512 2c6aca4abe5c944966fd5c63f9534024453cd67560f406971d6281604bfed5800f384cee8d1aadb0b85bf636530a2b7eb5c2ba002a499eb41f2670d38a89b69c
+MISC metadata.xml 344 BLAKE2B e091d6e9d0f8a59216bf966dae15ff5d0e588e71a53b936b3dbf979603334407a5e6b378f7a756cd0b320eb0c1294573ba0f1dd3ae392318f854d6c7b482db76 SHA512 e3a236b5b670bb921dd8c7ef87153d16a15ab3b10e4e039c2de68253d56d1356e57d1491c16fac6249265d68639a280f592c62f47d906f4b680fa5571ba9ec75
diff --git a/media-radio/qsstv/metadata.xml b/media-radio/qsstv/metadata.xml
index 7cc52ef45b96..9ac3dbf05c19 100644
--- a/media-radio/qsstv/metadata.xml
+++ b/media-radio/qsstv/metadata.xml
@@ -9,5 +9,4 @@
   <email>radio@gentoo.org</email>
   <name>Radio</name>
 </maintainer>
-<longdescription>An amateur radio SSTV software</longdescription>
 </pkgmetadata>
diff --git a/media-radio/tlf/Manifest b/media-radio/tlf/Manifest
index fe7cef928554..f90baed31c09 100644
--- a/media-radio/tlf/Manifest
+++ b/media-radio/tlf/Manifest
@@ -1,7 +1,3 @@
-DIST tlf-1.3.2.tar.gz 691287 BLAKE2B 130e1e070e2846cfec2989c20716e713b3b9269ba5395f96e19e049c87b321673d5bfd005c887fef0d8945e46db179eca7e7a1e1f96cc5fb0ab7be2cd74185bf SHA512 797afe9d4dcd83c315ff62b07d24d44a76fd08dabb0f081d20eb8181232630cf2a1792dcf4afa0e74a6ca6e3c4cbe0a42958884aecbe8ee31bc8c6f9bd05215c
-DIST tlf-1.4.0.tar.gz 702237 BLAKE2B a8e8aaacafe961bc4c33eccca066eaadf86cdca6de6b5585c09b808da9f85d62e704be16feaffaa81748de4a3ccddf04f4f56edde963adcb3bb210f75ba0a054 SHA512 8abf1b3bbabc506cd844d7b9bea5985cd8c73cd4401819bf4144022b41711e5fd58cf792638bb93c2ee52586c953f4115c0055799469f5c1edd157afddae1631
 DIST tlf-1.4.1.tar.gz 708105 BLAKE2B 18cd617a8780293bbfec87875491935d16022e104eed128ab69cbc3824aa5f8ab77dd07728d952e9b932ea74ee1c258522c26b5458b715320d452d58a65cfd3c SHA512 89076ba3b870f65b1469d64a223a9d35f1afd3edc6801446990d7ce197b04dacf141efc40382c69c78935a16f386385df0c7b48a040072cecc311cda56d479b5
-EBUILD tlf-1.3.2.ebuild 646 BLAKE2B 918cba31fdf42cf3e1ee5dbf81246f98f013bb16069abc4e01cc3b8c4970a25990e47b72fe42c4de28b0d3076f22ac566f3510e37761ee6cbed7d8e9342e1df7 SHA512 9a94e4d61390fbdbb4366824619cde1cf204a71a1e0023be057396f8e1b6d0891bbf4fff723337ded5e6b7bd13a0cae2447d7cfb62412af4ac1c3c912d46157e
-EBUILD tlf-1.4.0.ebuild 631 BLAKE2B 0164a96547dff1b494eeb3793787025eaa52acbc91582d26beb2e361ac3eebde8959eb3811ad9b59cdf304e132a680d3ae39efe8a8976c3bf1f45fec60e193e2 SHA512 740d86aa0ea795321fc9c3c987cf0c9959d8f046ddbc492a32e9b2450e7350a2656df8fb6fe53d8d7df46db7d855c84b2b218f977f52ad00ada9b30624b5bbf7
-EBUILD tlf-1.4.1.ebuild 633 BLAKE2B ec3cfece9568931c92b5892e37179b0b67c76751a97159c75e1535f9ba0ba9a5d902e3912d17562469f176d41465906f888abdb3f0f1df55c2c37c03f870eed8 SHA512 72faf35a1e742d16dc626df408c753ad0611c4c2452ff3db54e5bdb58c71f8b14040ba8d703de3082d6df67be65114b736ed68f90d02a0175a4650b6c3374065
+EBUILD tlf-1.4.1.ebuild 631 BLAKE2B 0164a96547dff1b494eeb3793787025eaa52acbc91582d26beb2e361ac3eebde8959eb3811ad9b59cdf304e132a680d3ae39efe8a8976c3bf1f45fec60e193e2 SHA512 740d86aa0ea795321fc9c3c987cf0c9959d8f046ddbc492a32e9b2450e7350a2656df8fb6fe53d8d7df46db7d855c84b2b218f977f52ad00ada9b30624b5bbf7
 MISC metadata.xml 249 BLAKE2B d6fa8a349066f9684c68c3086f53e41ebf30b6e313e8e8e752a953c0eaa0853448fe17e5ed46836bc5e149a282a33c7408c675d3b39eb3d59ddc1c1ad86bf716 SHA512 965ae00fa198dd8f5869c4c14ff3e28c7d76be7182be6ba4bedbb68d7138da5be3c8bb993689db2c73ac328456015ebdf018ee1b308d6988067810d1156bd179
diff --git a/media-radio/tlf/tlf-1.3.2.ebuild b/media-radio/tlf/tlf-1.3.2.ebuild
deleted file mode 100644
index e118aafaaeed..000000000000
--- a/media-radio/tlf/tlf-1.3.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic
-
-DESCRIPTION="Console-mode amateur radio contest logger"
-HOMEPAGE="http://home.iae.nl/users/reinc/TLF-0.2.html"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-libs/ncurses:=
-	dev-libs/glib:2
-	media-libs/hamlib
-	media-sound/sox
-	dev-libs/xmlrpc-c[curl]"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-util/cmocka )"
-
-src_configure() {
-	append-ldflags -L/usr/$(get_libdir)/hamlib
-	econf --enable-hamlib --enable-fldigi-xmlrpc
-}
diff --git a/media-radio/tlf/tlf-1.4.0.ebuild b/media-radio/tlf/tlf-1.4.0.ebuild
deleted file mode 100644
index 23bc6b749b8e..000000000000
--- a/media-radio/tlf/tlf-1.4.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic
-
-DESCRIPTION="Console-mode amateur radio contest logger"
-HOMEPAGE="http://home.iae.nl/users/reinc/TLF-0.2.html"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-libs/ncurses:=
-	dev-libs/glib:2
-	media-libs/hamlib
-	media-sound/sox
-	dev-libs/xmlrpc-c[curl]"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-util/cmocka )"
-
-src_configure() {
-	append-ldflags -L/usr/$(get_libdir)/hamlib
-	econf --enable-fldigi-xmlrpc
-}
diff --git a/media-radio/tlf/tlf-1.4.1.ebuild b/media-radio/tlf/tlf-1.4.1.ebuild
index f247636cf630..23bc6b749b8e 100644
--- a/media-radio/tlf/tlf-1.4.1.ebuild
+++ b/media-radio/tlf/tlf-1.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/media-radio/tucnak/Manifest b/media-radio/tucnak/Manifest
index ae96b26df143..38db8edd6cf0 100644
--- a/media-radio/tucnak/Manifest
+++ b/media-radio/tucnak/Manifest
@@ -1,5 +1,3 @@
-DIST tucnak-4.20.tar.gz 3542904 BLAKE2B 7fee170215d975abac64c6425ccc7604fb0948f4713fdbdf5e0197268b2e7bca1278b3e0c2e6e3698b6a8e3884eb47016d0fff1bca6e21e94c676a4ed848f223 SHA512 755861c7e1fedd8a3e17179681930a182bf95c19f9ed6a1f5e07d5781ba0c36f5bc8a7066a792e752ce04edebfe055a426bc4757ee137df60950165b2e4a6cb9
 DIST tucnak-4.21.tar.gz 3545924 BLAKE2B dabc9647e4fde5c8c3b3e9b2ee5f072ce6e85138c6a45f635c05dcf47763a39e191a6ac3d97e71b79d3913915126261f565f8e273cd257731e04bc5ab7956aab SHA512 73fe2e92a0db3a8e152cfc25bbaefdeec6fd7f11223d02eae6c1ac5526c02404e89ecd4f2f715e7fda1d72fd872fc240694ce674d57a95c03417cf59dbd6532c
-EBUILD tucnak-4.20.ebuild 1966 BLAKE2B b1572e6f1747fb61b72ddb6902f9a8bb35d348ca3270c9778184de1a39f9f10c1406c02843f5da5a53428fb2aa0e42bf7305fa3062df6e159e8a28fa71e6599b SHA512 c42d8fc7d31bfaf3cc14d1e3ec68e74580fa56b1d26006882c10d4c457ab4f12519954899eccb47cc9d42734dec50f5f5ceb3bcc0db94e36d37276a2be505147
-EBUILD tucnak-4.21.ebuild 1968 BLAKE2B a5eab8af37cdd38ea0b0f9b0c4da56a7a137c64e1448d986a5a5078d13674bee0eeb48064d3d415f708a9edb3ae8a97f8a946de4d829d4a6931294c43b806af8 SHA512 8143e9ab2b5abaaa2d31b215fbd9b26bf2d28f848ef707caea24378d08d0799b4cf477bb9a5d15b06e0617bb7a21c5a3d5ba35bde1e58735102d517781a06896
+EBUILD tucnak-4.21.ebuild 1966 BLAKE2B b1572e6f1747fb61b72ddb6902f9a8bb35d348ca3270c9778184de1a39f9f10c1406c02843f5da5a53428fb2aa0e42bf7305fa3062df6e159e8a28fa71e6599b SHA512 c42d8fc7d31bfaf3cc14d1e3ec68e74580fa56b1d26006882c10d4c457ab4f12519954899eccb47cc9d42734dec50f5f5ceb3bcc0db94e36d37276a2be505147
 MISC metadata.xml 408 BLAKE2B 80978177d2257cefae04860fc52e43ea7f0d2221bf4a5b3050fe8057acda81625117b1ba74e7357d40d00cc7fbd44f2dac713494cd8d20679c690cf851e1b678 SHA512 ad015a404c42d5cd0f160907400f545698045bb6c7c3da59816830ec6ed51938a02988c59d4a9ade472a78fd39feeb49ebe6c2a9c625e535a37e44bf19db1b17
diff --git a/media-radio/tucnak/tucnak-4.20.ebuild b/media-radio/tucnak/tucnak-4.20.ebuild
deleted file mode 100644
index 8490a3d7874c..000000000000
--- a/media-radio/tucnak/tucnak-4.20.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic multilib
-
-DESCRIPTION="Amateur Radio VHF Contest Logbook"
-HOMEPAGE="http://tucnak.nagano.cz"
-SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa fftw gpm hamlib suid"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/libzia
-	media-libs/libsndfile
-	>=media-libs/libsdl-1.2
-	alsa? ( media-libs/alsa-lib )
-	fftw? ( sci-libs/fftw:3.0 )
-	gpm? ( sys-libs/gpm )
-	hamlib? ( media-libs/hamlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	eapply_user
-	# fix destop file
-	sed -i -e "s/HamRadio/HamRadio;/" share/applications/tucnak.desktop || die
-	# fix doc install path
-	sed -i -e "s/docsdir/# docsdir/" \
-		-e "s/docs_DATA =/# docs_DATA/" \
-		-e "s/EXTRA_DIST =/# EXTRA_DIST =/" Makefile.am doc/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -L/usr/$(get_libdir)/hamlib
-	econf $(use_with alsa) \
-		$(use_with gpm) $(use_with hamlib) \
-		$(use_with fftw fftw3)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog doc/NAVOD.pdf
-	if use suid ; then
-		fperms 4711 /usr/bin/soundwrapper
-	fi
-}
-
-pkg_postinst() {
-	elog "In order to use sound with tucnak add yourself to the 'audio' group"
-	elog "and to key your rig via the parport add yourself to the 'lp' group"
-	elog ""
-	elog "tucnak can be used with the following additional packages:"
-	elog "	   media-radio/cwdaemon  : Morse output via code cwdaemon"
-	elog "                             (No need to recompile)"
-	if use suid ; then
-		ewarn "You have choosen to install the little helper program 'soundwrapper'"
-		ewarn "setuid by setting USE=suid. That helper is only needed if you"
-		ewarn "want to use morse sidetone output via the PC speaker."
-		ewarn ""
-		ewarn "While the helper should be safe by design be aware that setting"
-		ewarn "any program setuid is a security risk."
-	fi
-}
diff --git a/media-radio/tucnak/tucnak-4.21.ebuild b/media-radio/tucnak/tucnak-4.21.ebuild
index b4c1192a2e40..8490a3d7874c 100644
--- a/media-radio/tucnak/tucnak-4.21.ebuild
+++ b/media-radio/tucnak/tucnak-4.21.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa fftw gpm hamlib suid"
 
 RDEPEND="dev-libs/glib:2
diff --git a/media-radio/unixcw/Manifest b/media-radio/unixcw/Manifest
index 51839e2a1f81..c930e7398b9c 100644
--- a/media-radio/unixcw/Manifest
+++ b/media-radio/unixcw/Manifest
@@ -1,6 +1,5 @@
 AUX unixcw-3.5-tinfo.patch 1212 BLAKE2B 00afb10b8318957f8c4d10ae9254586aef365674822d23da9fdafcc31956252e77ad754c3389ae535b5d78a8611c0750b5609bfd785b6e111d350cc98411eb00 SHA512 370f2bd601546dd5043dedf1387783c425d15d0c52a8f357c4bb1bb9eb0ebb8b54bb4afd79db14314603bf23838568041c590c830622017bc05bd9bfd97baf6f
 AUX unixcw-tests.patch 533 BLAKE2B 0b2c08f1f2bb9db4ad2c98a4af7d2097f408e873cde8f03b46c994adcbb06ed0a20f95e2951c55810821b92e7a3e529621914308726233a108879e3341e98cf5 SHA512 331a7e71a3f9686b08ce59e06e59d4812dd36c4e2597a0ae57f663c2c0b7f32eca3e70adbc1769886b12856ed2d96bd9f4279f95db70d401e31f477b183fa2b7
 DIST unixcw-3.5.1.tar.gz 740331 BLAKE2B 9b5b4b819cf75ca0b10d773ebdf9869bf835c49f10c54b5bd34441b417d48d9a92abc9390a41870bf1c09fbbfe932554307abba181cad3b8631947adcf9890b1 SHA512 b59499723d810a537a2f5ab2b4b34c83a1c8c815af82a60ba29f4d9cee445525e530136f4e202db6b87305ac7a818fa6e59214a45c6bffce299eb50b58c866e1
-EBUILD unixcw-3.5.1-r1.ebuild 1979 BLAKE2B 73d17889c2fb846caaafa01d3a40e8f06215c51349c0fb36a0102a1051e7ce01c57afe7d4c71398372e63d4e7d43f4196023ebb46b952588f865ddce60979e9f SHA512 a55ecdc7525df67aea5a078601eacccabee02cf077ce37cd393b5ee18c2f83dac3eea63e1e9c3bf1d08e48657fc59ee5259b6ee752b17c2e47e793dab2f70728
-EBUILD unixcw-3.5.1.ebuild 1954 BLAKE2B 6b41a1926e2a0a955d15eb1909d291eee2f203d9645b9253bc966f06fc91343af0af0be3119d73fd94a64aed9d0b0ba533cedae73b3c6cca6761a335a161760f SHA512 ad245d7f839c531841a2f082d202cb65e568f9a94e9b50d84a67dde5fb1a1482d9a52348f630d7f3a1f40499e716ba1f035938cffe7f1713b253c3e260447f5d
+EBUILD unixcw-3.5.1-r1.ebuild 1976 BLAKE2B b2bb72875a8729c82b8150c2e743c0364845ccbfb0e41adcad49abcab88747dc347825b03693838fa21ff86e36410de4e936749d64564468e6c5ce1b2aef9460 SHA512 222c85a253ec0992ae8ca90c82fd5160dac6586a0bbc2cacb5fc5de3e1178ff2a3c19e98cf7d610ea4827417a794ae8733243bb6e2259c2f82ea94c8fac7c984
 MISC metadata.xml 874 BLAKE2B 3927a605bcb0b3459888fcaa77a528020ed037beeff2b6e750102efc1cad99633cd94f7e6d87093c08133949dc40ea46ad5f1d44a497ef1aeedf2afd77592b29 SHA512 b4040ecf973492b76642e7df2e2fa41b6cf057490a1674e4246479b084e5a3972d109eb203337c0053c2d6924a3b2597ee42684ffb4431c8147e90d5a208247e
diff --git a/media-radio/unixcw/unixcw-3.5.1-r1.ebuild b/media-radio/unixcw/unixcw-3.5.1-r1.ebuild
index a905c627ddf7..7391c5ffa589 100644
--- a/media-radio/unixcw/unixcw-3.5.1-r1.ebuild
+++ b/media-radio/unixcw/unixcw-3.5.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+KEYWORDS="~alpha amd64 ppc x86"
 IUSE="alsa ncurses pulseaudio suid test qt5"
 RESTRICT="!test? ( test )"
 
diff --git a/media-radio/unixcw/unixcw-3.5.1.ebuild b/media-radio/unixcw/unixcw-3.5.1.ebuild
deleted file mode 100644
index ddf06d31d30d..000000000000
--- a/media-radio/unixcw/unixcw-3.5.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic ltprune multilib
-
-DESCRIPTION="A package of programs that fit together to form a morse code tutor program"
-HOMEPAGE="http://unixcw.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc x86"
-IUSE="alsa ncurses pulseaudio suid test qt5"
-RESTRICT="!test? ( test )"
-
-RDEPEND="ncurses? ( sys-libs/ncurses:= )
-	qt5? ( dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5 )
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/libtool
-	!<=app-misc/cw-1.0.16-r1"
-
-src_prepare() {
-	append-cflags -std=gnu11
-	append-cxxflags -std=gnu++11
-	epatch "${FILESDIR}"/$PN-3.5-tinfo.patch \
-	    "${FILESDIR}"/$PN-tests.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf --libdir=/usr/$(get_libdir) \
-		$(use_enable pulseaudio ) \
-		$(use_enable alsa ) \
-		$(use_enable ncurses cwcp ) \
-		$(use_enable qt5 xcwcp )
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	prune_libtool_files
-	dodoc ChangeLog NEWS README
-	if ! use suid ; then
-		fperms 711 /usr/bin/cw
-		if use ncurses ; then
-			fperms 711 /usr/bin/cwcp
-		fi
-		if use qt5 ; then
-			fperms 711 /usr/bin/xcwcp
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if use suid ; then
-		ewarn "You have choosen to install 'cw', 'cwcp' and 'xcwcp' setuid"
-		ewarn "by setting USE=suid."
-		ewarn "Be aware that this is a security risk and not recommended."
-		ewarn ""
-		ewarn "These files do only need root access if you want to use the"
-		ewarn "PC speaker for morse sidetone output. You can alternativly"
-		ewarn "drop USE=suid and use sudo."
-	else
-		elog "Be aware that 'cw', 'cwcp' and 'xcwcp' needs root access if"
-		elog "you want to use the PC speaker for morse sidetone output."
-		elog "You can call the programs via sudo for that (see 'man sudo')."
-	fi
-}
diff --git a/media-radio/wsjtx/Manifest b/media-radio/wsjtx/Manifest
index 6b20ef81ce9d..896d772a7d02 100644
--- a/media-radio/wsjtx/Manifest
+++ b/media-radio/wsjtx/Manifest
@@ -1,9 +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-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.0.tgz 23158263 BLAKE2B e605447ffe0f7e4af4df3f15fced342aa61d40100778df731b1c419ac03fd569dde3547a7082fc41a6b07080b11305517a8cdca3a1b8404548ecffdb5b7b616d SHA512 7df7c80047b34097fc26b0d8c21de8b3ca27bae15602b1bb1ad117fe13f14931145bd55fcdceb86f2ee931d51285c6175f7b7cd89891b7e88c4baf7c17ed82cd
+DIST wsjtx-2.2.2.tgz 23213092 BLAKE2B ce558180208ad33ddf2089f1747630cd07975547ba93bb693698ce599caec8d3d3367128581dfd110c6fe240bce9a0e6b8351ef178e6b53f3490a29a96367460 SHA512 923df18f5cbbd3e40294ccc4d3730f40c13c7777345723b9e66063ff0dd7db65caa9a64323711201a73b8c455dc1c29f67e4645dfbf98e0fc2c60a1630ce6cd1
 EBUILD wsjtx-2.1.2.ebuild 1470 BLAKE2B 7ce4185d8be8dd273f5ca2dd4221e29f97b0903478db6eca3f11041ca8d6ca895c1b598c9a8e3cd4bc9a4850d6b6f4447997b4b868a96db1c4183b48c5b28b4f SHA512 07456e1c31711466dce9f611f8d6ce34f9c09172fd4128f876c070add742dcc923ca8988728435aa3f3f6822308fd5a0cf1d949562401aedff788b05210039cf
-EBUILD wsjtx-2.2.0.ebuild 1448 BLAKE2B 2c30406ccbda9e8cdda512dffe4b5b5da89e1e61d8e15add891921fdb9fa7bc162eca4b4a35754064feeda4f16a49b5b425c2db5843d5efc6d731d2709eb4b9d SHA512 2fa473df5e41e8c9a3f93b5c6ceff0dee39f08af1d04d49f9f337418672ddae6a0b3817893ed0f314e26071eaa723d6deb1d3e91a0b71143e67c191d465b1416
+EBUILD wsjtx-2.2.0.ebuild 1491 BLAKE2B 952664335601511113cacd14c404500d29502479dea950d929d4d333e7853346c5ca874765c92ed22ea28b84f9301f017d1b0ab6bba4d337fbb51248dd3ed527 SHA512 c00d076f535638ccc2beda4a10101cf02f8cfbfdc2dec3bc8e19ae60720014fb567ac9eb7fe2c7122d22d5284dd3a98073265fdf4033a69d078291b3fb066c3e
+EBUILD wsjtx-2.2.2.ebuild 1635 BLAKE2B d29bc7e272ffabf101358bb816460309e4f2680572acffbbd3855f790d6993bc702d5f698b361e6c7d6e055a2bae210e99a549b30bf6d2da4e8931a9736269bc SHA512 498bc32bfc180d7f1808d6fff66559053ef3e35c75bdd67587329413fe61366a83488f97b07424c1a54fca06e9316d164bd2f99a9483175970ed5a5fe94be24a
 MISC metadata.xml 411 BLAKE2B b18268ad951aaeb11cb490e4b02fa063915d2862f81e1a9f4ef69bf391c0628e75258d4bc66ce942a51d88369033b4e9dc8f5b8fff1c26bd33a4560ca493d70e SHA512 1b11819a29e25cf3ce3932bfb200ce65fd69c0872149acb54d3c67fb35d9977feee5d87e7412d75751cbc6a9b76010a2bcbc8b3a47a50d11a0c011abc5a83efc
diff --git a/media-radio/wsjtx/files/wsjtx-2.2.0-werror.patch b/media-radio/wsjtx/files/wsjtx-2.2.0-werror.patch
new file mode 100644
index 000000000000..dcde5b18a07a
--- /dev/null
+++ b/media-radio/wsjtx/files/wsjtx-2.2.0-werror.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2020-07-09 12:52:57.776437846 +0200
++++ b/CMakeLists.txt	2020-07-09 12:53:16.607083283 +0200
+@@ -921,7 +921,7 @@
+ #
+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra")
+ 
+-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra -fexceptions -frtti")
++set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -fexceptions -frtti")
+ 
+ if (NOT APPLE)
+   set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-pragmas")
diff --git a/media-radio/wsjtx/wsjtx-2.2.0.ebuild b/media-radio/wsjtx/wsjtx-2.2.0.ebuild
index 3abba8aeac25..dca5c4436768 100644
--- a/media-radio/wsjtx/wsjtx-2.2.0.ebuild
+++ b/media-radio/wsjtx/wsjtx-2.2.0.ebuild
@@ -40,7 +40,8 @@ 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.1.2-qt_helpers.patch"
+		  "${FILESDIR}/${PN}-2.2.0-werror.patch" )
 
 DOCS=( AUTHORS BUGS NEWS README THANKS )
 
diff --git a/media-radio/wsjtx/wsjtx-2.2.2.ebuild b/media-radio/wsjtx/wsjtx-2.2.2.ebuild
new file mode 100644
index 000000000000..01c2452f0a84
--- /dev/null
+++ b/media-radio/wsjtx/wsjtx-2.2.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake
+
+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-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/qtprintsupport:5
+	virtual/libusb:1
+	media-libs/hamlib
+	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}-fix-unicode.patch"
+		  "${FILESDIR}/${PN}-drop-docs.patch"
+		  "${FILESDIR}/${PN}-2.1.2-qt_helpers.patch"
+		  "${FILESDIR}/${PN}-2.2.0-werror.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() {
+	cmake_comment_add_subdirectory debian
+
+	local mycmakeargs=(
+		-DWSJT_GENERATE_DOCS="$(usex doc)"
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+	)
+	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/xastir/Manifest b/media-radio/xastir/Manifest
index d65c0107bf5a..c299ba89e152 100644
--- a/media-radio/xastir/Manifest
+++ b/media-radio/xastir/Manifest
@@ -1,8 +1,5 @@
 AUX xastir-2.0.0-dont-filter-flags.diff 621 BLAKE2B 7bb56ddfd744123b705e7f00866fa5ac76a3ee0cd5379ee8cb41b7f1eac94ab9e704802b64eb22fe182d594c4d62ece3215122c22f5cd30b3f00c4c60dde875e SHA512 da94db0dcbd79c7b258f3657d0e6135fb93de81f3a2c25a73d68051b1a92156392a638f6a5478f4a0b8b568c4780a4091d7345e4c8cc60ecc190633123da0a6b
 AUX xastir-2.1.2-scripts.diff 3766 BLAKE2B fbad015655864f26dfed1b50ea6c1399fc70088ff092a2cdd1a173879db4bdbba43aea9107cc961890012682d0e265f888b908d553c50018d34ea040dc08243e SHA512 aef4410c53aa3d80c4f3ea48a50759a9a1813801d18fb6dd0cf4e90b8e49358c9f6040cca964b5ce4eefcea2966f197207b25e67dd1b69e1bbd5cf0ba640ae46
-AUX xastir-2.1.4-fno-common.diff 1930 BLAKE2B 97393a5a11af3797819ec68558fc273b059358b6df463b4aa28b5babc31a0fdba395fead457aa485b18bb9119ffdbb865457e7455891194bcd67fc7184126427 SHA512 e4a671f44ad0b4664be30487c45908466acf646389a890ab7448eacfa11ff22fc9a335e18dc06683b3a0b4789c8e2d85c510e456a387647e589b504e77853530
-DIST xastir-2.1.4.tar.gz 2694124 BLAKE2B 90fd8ef340fc5bad43c9501c6530dcd4bd60eaab9c04638c68f80add46f0df24c45db334549915edaee95cbdcc9b7580d6343d81d84cb819f4ef5a76c9f79242 SHA512 e96f9de52499615cfe88708656d111d417e0d0e08f798b2d97f6a270db3e639c4fb5219767f8fd399fe75f51f02391ace87ae7175ae9a44cb5a4056ab7b573b1
 DIST xastir-2.1.6.tar.gz 2687180 BLAKE2B 053ee4e8d1fd589bf0767c6ffdaa7de2ef14d292d5773b2f08239fc4b73d3695e5c061dccab75caae068bc8887f7924d3793f0dfb8368b2cd25526211e240914 SHA512 91f40f3788f51589619833102d1db997ff725f84e6fa5f9b7dd8942094a1b7a94433779243be1c14b980d96613972482a397cec8e15b8ea4784fdd106c32ae08
-EBUILD xastir-2.1.4.ebuild 2039 BLAKE2B 3dda4bc66aba2db047b0ba56b19aea2a0110491efc32d1539f9a487c8636b0d7439f664072e62f1ae48448669dacea49919230fba71931326539367f911a52cd SHA512 6fb0927483b04660af44b1a4a939569ae852a7ec010f48f89048b84e25a434a0cf616505fde70da5d9e07c2b1eef008d4e5f49f3d2d1d8cb78ffb814340fe64c
-EBUILD xastir-2.1.6.ebuild 1927 BLAKE2B 6ad4c099272f06e258f408e40c07ccebe68c54287715630e5bb385e045e646361187d26f36c0ee7a635619905ed532d6ecba8378baaf160d7943264505f8294f SHA512 d0db47118ce95e9eea198375bf07620065fbe042f50b4e88f3099073699599f91d8ec9ae9e6be1b57fd1e9bb27049ac09298583a66a908c7d015c5a24137b2a4
+EBUILD xastir-2.1.6.ebuild 1925 BLAKE2B eb058e099fb416870dc9269b59fa853f7c54e65cc890b341ed3df3e143ad06e1f05b63e7ec0d0b7d8d9a3e5a65450b642f771b2612dcb0bc2b709f38d00c33ee SHA512 490fbceccc239a2174f83bd7a0d4fd7a777a9cd7f63ea8918ac2cc87801cce42d3ba9ac3f15d8bde27b041b96765ef617e6e43b9e0fc13856ef57e42689b90c0
 MISC metadata.xml 469 BLAKE2B 2e70497e0928a6ca00c783a8dd257ac66333cd2d9e34e271ca222b0df4dd5ea55b124d2728398d0a8b013355d63bf30907b29b121578921d09f7aee8667f480b SHA512 9ad337ee6c62205e9f7d3350763123bc25ff2e75bd3af6ac4438cc0b164439aa406339b9c2f7a3d6eef439965c888513c5089108944a281a781f27b1fb735758
diff --git a/media-radio/xastir/files/xastir-2.1.4-fno-common.diff b/media-radio/xastir/files/xastir-2.1.4-fno-common.diff
deleted file mode 100644
index f2580b5977e6..000000000000
--- a/media-radio/xastir/files/xastir-2.1.4-fno-common.diff
+++ /dev/null
@@ -1,63 +0,0 @@
-# Fixes build with -fno-common (bug #706952)
-
-diff --git a/src/objects.h b/src/objects.h
-index b1bf8b5..ef5b9b1 100644
---- a/src/objects.h
-+++ b/src/objects.h
-@@ -95,7 +95,7 @@ if (debug_level & 4) { fprintf(stderr, "Changing euid to %d and egid to %d\n", (
- //
- // number_of_predefined_objects holds the actual number of predefined
- // objects available to display on the Create/Move popup menu.
--int number_of_predefined_objects;
-+extern int number_of_predefined_objects;
- // File name of ~/.xastir/config file containing definitions for
- // a predefined object menu.
- extern char predefined_object_definition_filename[256];
-diff --git a/src/x_spider.c b/src/x_spider.c
-index a1fabc4..e5a0bc3 100644
---- a/src/x_spider.c
-+++ b/src/x_spider.c
-@@ -185,6 +185,7 @@ extern void split_string( char *data, char *cptr[], int max, char search_char );
- // From database.h
- extern char my_callsign[];
- 
-+extern char *pname;
- 
- typedef struct _pipe_object
- {
-diff --git a/src/x_spider.h b/src/x_spider.h
-index d8af8e9..a168b1f 100644
---- a/src/x_spider.h
-+++ b/src/x_spider.h
-@@ -31,7 +31,7 @@
- #define SERV_UDP_PORT       2023
- 
- 
--char *pname;
-+extern char *pname;
- extern int pipe_xastir_to_tcp_server;
- extern int pipe_tcp_server_to_xastir;
- extern int pipe_xastir_to_udp_server;
-diff --git a/src/xa_config.c b/src/xa_config.c
-index 9a6f1f3..2ded26c 100644
---- a/src/xa_config.c
-+++ b/src/xa_config.c
-@@ -65,7 +65,7 @@
- 
- #define MAX_VALUE 300
- 
--//extern char xa_config_dir[];
-+char xa_config_dir[1000];       /* cmdline option user config dir */
- 
- 
- 
-diff --git a/src/xa_config.h b/src/xa_config.h
-index 9947145..530fc06 100644
---- a/src/xa_config.h
-+++ b/src/xa_config.h
-@@ -31,4 +31,4 @@ char *get_data_base_dir(char *dir);
- void save_data(void);
- void load_data_or_default(void);
- 
--char xa_config_dir[1000];       /* cmdline option user config dir */
-+extern char xa_config_dir[1000];       /* cmdline option user config dir */
diff --git a/media-radio/xastir/xastir-2.1.4.ebuild b/media-radio/xastir/xastir-2.1.4.ebuild
deleted file mode 100644
index d779bc0c568b..000000000000
--- a/media-radio/xastir/xastir-2.1.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic toolchain-funcs
-
-MY_P=${PN/x/X}-Release-${PV}
-
-DESCRIPTION="X Amateur Station Tracking and Information Reporting"
-HOMEPAGE="http://xastir.org/"
-SRC_URI="https://github.com/Xastir/Xastir/archive/Release-${PV}.tar.gz
-			-> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="geotiff +graphicsmagick"
-
-DEPEND=">=x11-libs/motif-2.3:0
-	x11-libs/libXt
-	x11-libs/libX11
-	x11-libs/libXpm
-	x11-apps/xfontsel
-	dev-libs/libpcre
-	net-misc/curl
-	sys-libs/db:4.8
-	sci-libs/shapelib
-	!graphicsmagick? ( <media-gfx/imagemagick-7:0=[-hdri,-q32] )
-	graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] )
-	geotiff? ( sci-libs/proj
-		sci-libs/libgeotiff:=
-		media-libs/tiff:0 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	eapply_user
-
-	# fix script location (bug #407185)
-	eapply  "${FILESDIR}"/${PN}-2.1.2-scripts.diff
-
-	# do not filter duplicate flags (see bug 411095)
-	eapply -p0 "${FILESDIR}"/${PN}-2.0.0-dont-filter-flags.diff
-
-	# build with -fno-common (bug #706952)
-	eapply "${FILESDIR}"/${P}-fno-common.diff
-
-	eautoreconf
-}
-
-src_configure() {
-	# provide include path to GraphicsMagic for configure stage
-	use graphicsmagick && append-cflags -I/usr/include/GraphicsMagick
-	econf --with-pcre \
-		--with-shapelib \
-		--with-dbfawk \
-		--without-ax25 \
-		--without-festival \
-		--without-gpsman \
-		$(use_with !graphicsmagick imagemagick) \
-		$(use_with graphicsmagick) \
-		$(use_with geotiff libproj) \
-		$(use_with geotiff)
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	rm -rf "${D}"/usr/share/doc/${PN}
-	dodoc AUTHORS ChangeLog CONTRIBUTING.md FAQ README \
-		README.Getting-Started README.MAPS README.OSM_maps
-}
-
-pkg_postinst() {
-	elog "Kernel mode AX.25 and GPSman library not supported."
-	elog
-	elog "Remember you have to be root to add addditional scripts,"
-	elog "maps and other configuration data under /usr/share/xastir."
-}
diff --git a/media-radio/xastir/xastir-2.1.6.ebuild b/media-radio/xastir/xastir-2.1.6.ebuild
index 344c4d649b7b..1da0b5592d83 100644
--- a/media-radio/xastir/xastir-2.1.6.ebuild
+++ b/media-radio/xastir/xastir-2.1.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Xastir/Xastir/archive/Release-${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="geotiff +graphicsmagick"
 
 DEPEND=">=x11-libs/motif-2.3:0
diff --git a/media-radio/xlog/Manifest b/media-radio/xlog/Manifest
index 7c2de7a09ffe..fd7ae7574445 100644
--- a/media-radio/xlog/Manifest
+++ b/media-radio/xlog/Manifest
@@ -1,7 +1,7 @@
 AUX xlog-2.0.13-desktop-update.patch 1393 BLAKE2B c44070ad106834a89fa2323b33d5df90f2eaab50e0e3d2a03884a2f997f1e9cf0ac4c9e03e819956e7af09dc538729baac0ae8ac612f06f1b4a44929047795c1 SHA512 7e4f9f83eabf9a598e2e1382c6934240991f3743da50eb0da6b7532435d2dce3264e30aded7b6ca32a685b9b7c203f694268c500c89be76175194c0900296865
 AUX xlog-2.0.7-desktop.patch 435 BLAKE2B 56fee116a69c99f5192f1a2e4804821d715dd15f927525694100471b296412675eb97237c7e239cc407a2ffb145dbf779e802c1a1f5914a064d70f73ad269d12 SHA512 5119356e9635ca7b6d028d4bb3be12542636ce5d2967540b20ad9c22d62792b81a1a06fcd8722c7cbe8df706d8113e60b308d1db7c6fa8f3238bea039eb4b4f6
-DIST xlog-2.0.15.tar.gz 11461174 BLAKE2B 99b1d1cdcf6bad60f283d6885eb8c9317d5d35e411d2c449732e8f8bf9ed69e552fd73f2c1fcfc56ca386df447df8e5e2bbbffa80d596d8da4c347379231890c SHA512 58403d6cd05a222900236a9b165d1b51951f2efa668aba5989970036135a91955af64a4662a5cd6f6e7c4629e3353b3c93c79c3e14d81c7ae65a82cf9ade6397
 DIST xlog-2.0.17.tar.gz 11461214 BLAKE2B d106980f221aa8864f3bdd91589c2020f7b718bb36febbcba0987a35f38e2bd38143214733b7e6b5839a5c2220a850762f629fbf6eaf1d1e9c2e37c29f25f563 SHA512 0110c7b70794aaeded939040e9baf3093d06122ec35e7bec2599a6b68f5de6f299dbd2e0c72442ee2a3a158326b23ca88e7fec402f501f9dda4ff2cc47287c2a
-EBUILD xlog-2.0.15.ebuild 1684 BLAKE2B 3e9e3b8b98a3ec4de3d4dfaf2390d09839658f34040e0cb10897dd50bdad0fe01804fd1c0b7358cb4534e3b53fec339d453940475982b53d59e00b85b7dd1ec9 SHA512 325c2a5b31e40232c70100333766ceaf66e1c52c866889985ddc5b651961e33c4f1133fe2c346af2177da00b6d3a7bd75118015d9c620c7f9dcafc0ec173e6ef
-EBUILD xlog-2.0.17.ebuild 1684 BLAKE2B 3e9e3b8b98a3ec4de3d4dfaf2390d09839658f34040e0cb10897dd50bdad0fe01804fd1c0b7358cb4534e3b53fec339d453940475982b53d59e00b85b7dd1ec9 SHA512 325c2a5b31e40232c70100333766ceaf66e1c52c866889985ddc5b651961e33c4f1133fe2c346af2177da00b6d3a7bd75118015d9c620c7f9dcafc0ec173e6ef
+DIST xlog-2.0.19.tar.gz 11431541 BLAKE2B 0bfe396167580808344a4b0e0974959930ab577a18c0d71a70c7c020a433a150baf5322f58682fc4604718d739e01004447dffcdd325c3426d776995dd684d39 SHA512 b69e592f97fbfbd989378a2b74036f4a169be3ca1f5b7ba8715e3a5293f1efbdbc431b0c09a305c2ca0190953777010a9d9a9b53caea8eb26609111b4f7da40b
+EBUILD xlog-2.0.17.ebuild 1673 BLAKE2B 32833a48e0351c595b73f6fe771ae6382321623bad195e62d6e691cdd31bfe8b5dad7f3f75fcd50b138a8d4c758015dd7e59fa9d0f6d1c84134d42d617c74d35 SHA512 7af3c3a52c013447601f6edc023f836999755e030c374f5aa9771e5ee49d3879753e5eaf51fa585daf3d6da260392587d8866c55cd03e85e4bb08cf0196290ee
+EBUILD xlog-2.0.19.ebuild 1675 BLAKE2B 327e92c48fe47f0b4e65e8d856f797fcc5f17097140eb4671616a06cfbbee4e330bbf4d52a3e14f5ac24d3cccee41e69d95fdf17402a8fc789f72c03d8a8bc1c SHA512 ad97eddfb4d1a8d6e85e1d42870aa2fae094e0904ea14b39bd41e3236b53d4e76bde8d6662296d754f8613c513e316c611c3e73abcb11fcf7780e33d96d104b5
 MISC metadata.xml 245 BLAKE2B 1d0fb3b909203735db219043a3b6ad6a2f3fafff1813f9c9caefdb9206262ff73c4ce6b93c0a8ec7d157148cea478b38d0c835ac9948a66d8ed81726f1b4d93f SHA512 9289d414ccbc30198596601b290cf42a583a093bbd7c5f8889c8ac0e81d8570bc4d42dfcbfe210456120edb910ea8572d6806400adec144f4eeb95fa36ae6ef3
diff --git a/media-radio/xlog/xlog-2.0.17.ebuild b/media-radio/xlog/xlog-2.0.17.ebuild
index c87300418dde..37de4d851ef7 100644
--- a/media-radio/xlog/xlog-2.0.17.ebuild
+++ b/media-radio/xlog/xlog-2.0.17.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools fdo-mime toolchain-funcs
+inherit autotools toolchain-funcs xdg-utils
 MY_P=${P/_}
 
 DESCRIPTION="An amateur radio logging program"
@@ -67,11 +67,11 @@ src_install() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
diff --git a/media-radio/xlog/xlog-2.0.15.ebuild b/media-radio/xlog/xlog-2.0.19.ebuild
index c87300418dde..ffc34e31aba8 100644
--- a/media-radio/xlog/xlog-2.0.15.ebuild
+++ b/media-radio/xlog/xlog-2.0.19.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools fdo-mime toolchain-funcs
+inherit autotools toolchain-funcs xdg-utils
 MY_P=${P/_}
 
 DESCRIPTION="An amateur radio logging program"
@@ -12,7 +12,7 @@ SRC_URI="https://download.savannah.gnu.org/releases/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="media-libs/hamlib
@@ -67,11 +67,11 @@ src_install() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }