gentoo resync : 15.12.2019

16 files changed, 34 insertions, 160 deletions

diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index c74c6ad11e3d..5fc0f543e837 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/fldigi/Manifest b/media-radio/fldigi/Manifest
index 542a679cb14e..1b78dcea570a 100644
--- a/media-radio/fldigi/Manifest
+++ b/media-radio/fldigi/Manifest
@@ -2,5 +2,5 @@ AUX fldigi-c++11.patch 1140 BLAKE2B 987d33126e80340d7687cc1e346a8cc8b5701c9f6a42
 DIST fldigi-4.1.06.tar.gz 4633753 BLAKE2B 2eed9be5c1e0d0fdb29b9a2d5b7c7eedca7cdb5dc9149532776083cd56d67cbbfea1760f2287d9de2880508e950c4a87e96b4d818f56b3ce4f2f4025057eb54e SHA512 fc3ef66e9ce8c231af27d17f098e1767ba35038afac124be2a1db846246bf2e6d86ba078cd82e28d73b7389079eff87545c2f3e81bef95c525b90a8886c612be
 DIST fldigi-4.1.08.tar.gz 4633597 BLAKE2B 853569115aa33e768a4e7a9caba0675dfc8235bdc889317d44f2d3896c287f7117ef6983b8e41be5ec4d967cabb1c7a506a1488aa200cdab6aabef48c24986b3 SHA512 e1262aa87ddeed0618cd74327696ef9542afc3c6c4529db0224d8278ef8a270f83c51a64b0957d17f6ada07ba0d99bdd4124e453e3d0268ffa283e90fbe322d2
 EBUILD fldigi-4.1.06.ebuild 1288 BLAKE2B 335fba25a3c2809814737f583b8db2e6651b4c4b04c938666f466cf18a4ae432edb1c5194dc33aad0d306cb74a12a26e529b8fadebed3f531a79dde41799efb1 SHA512 ebdf9ae81997d15d7817c3d065541cc2b2f2e2cc20972a0c5462912a95b12bc793c8e14f851b029a32e4ee3c623b0f44dff69be76b8e5cb8a5854de758e027b2
-EBUILD fldigi-4.1.08.ebuild 1290 BLAKE2B 3a7295846fc1523f1ffa312e4cdc010adab6c0f72639f5976130df3caa4b8a8e111c72473ab979d636c86e901929cdc89ce46bf364a305f6095858d3800b3c20 SHA512 2490596ae8f595473f2343ef7b20d26a40e1dedbc0af85c119711a342243fd590b5b37849055426ea9cc8e72867cb4d2db197643265e01c7bd51d2c8d1091dc9
+EBUILD fldigi-4.1.08.ebuild 1288 BLAKE2B 335fba25a3c2809814737f583b8db2e6651b4c4b04c938666f466cf18a4ae432edb1c5194dc33aad0d306cb74a12a26e529b8fadebed3f531a79dde41799efb1 SHA512 ebdf9ae81997d15d7817c3d065541cc2b2f2e2cc20972a0c5462912a95b12bc793c8e14f851b029a32e4ee3c623b0f44dff69be76b8e5cb8a5854de758e027b2
 MISC metadata.xml 495 BLAKE2B 9c6f1b29ffb13a553b74ded93c11d29ffdc5a02336adb8fef55b862800a1856e712cdcb06c4e7d90858712d43aafce79f6cf9a357dc0a3c3ca0fc5cdb0ff770e SHA512 fdd9bc3f065ccb354ed0ad5c6544ca70f2011828870b942f2bf2f7001bf1342f858d60a6031cf005623795d1f1d2ccbc3a42fb54dcbd465c3c73f29a928d9091
diff --git a/media-radio/fldigi/fldigi-4.1.08.ebuild b/media-radio/fldigi/fldigi-4.1.08.ebuild
index 17d2911234fa..f29b642e623f 100644
--- a/media-radio/fldigi/fldigi-4.1.08.ebuild
+++ b/media-radio/fldigi/fldigi-4.1.08.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/flrig/Manifest b/media-radio/flrig/Manifest
index 582597ae92b5..a9da2cf61f31 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -2,5 +2,5 @@ AUX fix-bashism.patch 547 BLAKE2B b04673f95b56dc9258b2953e90aabf81b2ef3d2b7bc7e3
 DIST flrig-1.3.46.tar.gz 813126 BLAKE2B e88186958eb7f4492a564135144d77abae782e8d249c9678663625a0cab9b9f716f1fa616062eecfb8b0c26952e2399a9120cc0a7ddcc5ad43f8bfdde400afde SHA512 e5d02632806d5f899abecc84fe7f8d1610153ace260d9c812221a37a781dd9dffe48602507f798c98d510d79657f4deec69ce2e1513f7b51f3d60888d9c07071
 DIST flrig-1.3.48.tar.gz 813746 BLAKE2B f86effa913ade23c50c3e1fb663e0c9daff0aaefa0e4457e10e1ac67a666e548dc1668a6e1a496cc1407a267e8f047829dcee1b0930fd1db04b28c2458a3da69 SHA512 2336c3ccb4112cea52daf07d2fdf0ced400c3b32e82b13faa8287fdac0634ac8f4596f4cd0efc8b30083a16859539d9da066c51f74f32e05d77bf02bbcdb087e
 EBUILD flrig-1.3.46.ebuild 583 BLAKE2B d01710a47858736fb029b80964358f04fc97e1ae43910dd30bcfe9215a7b25f1d12f6cb2c3770b955842a3b556f3dd42bd5f57dbd42207b50190a69175220109 SHA512 abd6e1edcec87c95f922b66225286ed16134e57ec8a304bd38a7cb52ae5190f3042dabac4629a7d41d870d444f32e485208c769f57fd79c00625d67e1d67ba79
-EBUILD flrig-1.3.48.ebuild 585 BLAKE2B edc49c5ae640ace981cd71b734dd194ee2c9b2163ad86fcd022844c37553553992f133d5d9e47f81f97c834a87b3cb04a89a9e39c28c406516a7328bc279f555 SHA512 3f90f1dbff22b366b3d89a46831671c5a23b78fb7736f246cc1634b506bd45fdb26d68b67eb44c6742b74b6c40d8ab22e29376496669cd7dfc7118af8252a1b4
+EBUILD flrig-1.3.48.ebuild 583 BLAKE2B d01710a47858736fb029b80964358f04fc97e1ae43910dd30bcfe9215a7b25f1d12f6cb2c3770b955842a3b556f3dd42bd5f57dbd42207b50190a69175220109 SHA512 abd6e1edcec87c95f922b66225286ed16134e57ec8a304bd38a7cb52ae5190f3042dabac4629a7d41d870d444f32e485208c769f57fd79c00625d67e1d67ba79
 MISC metadata.xml 325 BLAKE2B c4c98ed723dff91c8935c44ee552e25a08366edb7b73593d29d790622a49e130ef56137de21e1df16e1f968b1d5a0c984ce6df5b817a39f38523fb71353a3e1f SHA512 ca601e14e79450d08e0679e86827071a323fbc60cdf89412257747490046ca6efb2e78ae27f69c0e3ad449427049a35d478f2a7524a0606658ef9b302d9c0d43
diff --git a/media-radio/flrig/flrig-1.3.48.ebuild b/media-radio/flrig/flrig-1.3.48.ebuild
index 5020c2bffaf7..e6f8b25a04c3 100644
--- a/media-radio/flrig/flrig-1.3.48.ebuild
+++ b/media-radio/flrig/flrig-1.3.48.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/js8call/Manifest b/media-radio/js8call/Manifest
index 515ddfc7a909..1e773bf4aa84 100644
--- a/media-radio/js8call/Manifest
+++ b/media-radio/js8call/Manifest
@@ -1,5 +1,7 @@
 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
 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
 MISC metadata.xml 312 BLAKE2B 77446444162f6d430b7cd8c95ea0ff34da775e0a78d355b1e71a5a5e3c64c6f633b0339cdcd2055d3ea1fd5befa5d6655d02d2cb0fd55fd60a408efb33c6cf0a SHA512 caf176b301b2a0385c9c24d8ee1b68077d9cf49b5379f6530c27658450efa8fef6551a4d1492529bdde38e95bb4f5df5f9825c38865874514803e12ad37bc461
diff --git a/media-radio/wsjtx/wsjtx-1.9.1.ebuild b/media-radio/js8call/js8call-2.0.0-r1.ebuild
index ae6d8b705d45..cb6116245d91 100644
--- a/media-radio/wsjtx/wsjtx-1.9.1.ebuild
+++ b/media-radio/js8call/js8call-2.0.0-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit cmake-utils
+inherit cmake-utils vcs-snapshot
 
 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"
+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"
@@ -28,27 +28,12 @@ RDEPEND="dev-qt/qtcore:5
 	sci-libs/fftw:3.0[threads,fortran]
 	virtual/fortran
 	app-text/asciidoc
+	media-libs/hamlib
 	doc? ( dev-ruby/asciidoctor )"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWSJT_GENERATE_DOCS="$(usex doc)"
-		-DWSJT_DOC_DESTINATION="/doc/${PF}"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
 src_install() {
 	cmake-utils_src_install
-	rm "${D}"/usr/bin/rigctl{,d}-wsjtx || die
-	rm "${D}"/usr/share/man/man1/rigctl{,d}-wsjtx.1.gz || die
-	rm "${D}"/usr/share/doc/WSJT-X -R || die
-
+	rm "${D}"/usr/bin/rigctl{,d}-local || die
+	rm "${D}"/usr/share/doc/JS8Call -R || die
 }
diff --git a/media-radio/tlf/Manifest b/media-radio/tlf/Manifest
index 7e6650ae0e75..6f729c2b4c5b 100644
--- a/media-radio/tlf/Manifest
+++ b/media-radio/tlf/Manifest
@@ -1,5 +1,5 @@
 DIST tlf-1.3.2.tar.gz 691287 BLAKE2B 130e1e070e2846cfec2989c20716e713b3b9269ba5395f96e19e049c87b321673d5bfd005c887fef0d8945e46db179eca7e7a1e1f96cc5fb0ab7be2cd74185bf SHA512 797afe9d4dcd83c315ff62b07d24d44a76fd08dabb0f081d20eb8181232630cf2a1792dcf4afa0e74a6ca6e3c4cbe0a42958884aecbe8ee31bc8c6f9bd05215c
 DIST tlf-1.4.0.tar.gz 702237 BLAKE2B a8e8aaacafe961bc4c33eccca066eaadf86cdca6de6b5585c09b808da9f85d62e704be16feaffaa81748de4a3ccddf04f4f56edde963adcb3bb210f75ba0a054 SHA512 8abf1b3bbabc506cd844d7b9bea5985cd8c73cd4401819bf4144022b41711e5fd58cf792638bb93c2ee52586c953f4115c0055799469f5c1edd157afddae1631
-EBUILD tlf-1.3.2.ebuild 649 BLAKE2B 1361e008a0054614a841bc7f6c1382703634eacead1ce0e953da4e2469840cf0fa150d926bc71194d41a0592acd973f5e49863684770e1d64d53cf65360b89d5 SHA512 8054e82c9c7cdd5fba2369a0f6b0f3888eaac9dc9c2f2ed12f05e42c388d0c25894e1f40b51d946bf4e9e9f0998a7344a2d039db217c0ffe3643f24c1e4e3272
+EBUILD tlf-1.3.2.ebuild 676 BLAKE2B fb91182c2d0756c51587016b59ed6b30a5ee80ee7aa72e7bc1b880aa7feade873d36cacb91011508324187e0edb64cebead8776e9932e4be93818e7ff6e1b114 SHA512 cd4fd79e58b1b66413714ed1da9eb1080f968be641845376c46a4192f425e0175d5438002aac54dbdc4d46140a19a232bccb2dd0a0b23b41471a893b42a46c39
 EBUILD tlf-1.4.0.ebuild 663 BLAKE2B 4c50f89f105c3abfc9fde23aea42f08fa726ae6e2c945b082021870bf13f2bf7c253a8f723194c9110b996a95866812b9e075c81b91beeaf854cf41c92c6f535 SHA512 c22430cea3bf6edd52fe2f6f6f3f671222d40b9d8558482ae3acb4098ca1f3dd70111beee56e6ee15201247c1c24cd55984aa8ab5345aa8383e349ba25ef3f9d
 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
index 01ca9e2d468f..ae139df1f829 100644
--- a/media-radio/tlf/tlf-1.3.2.ebuild
+++ b/media-radio/tlf/tlf-1.3.2.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="sys-libs/ncurses:=
 	dev-libs/glib:2
diff --git a/media-radio/unixcw/Manifest b/media-radio/unixcw/Manifest
index dc33eca15f64..3bbe41b497c3 100644
--- a/media-radio/unixcw/Manifest
+++ b/media-radio/unixcw/Manifest
@@ -1,5 +1,5 @@
 AUX unixcw-3.5-tinfo.patch 1212 BLAKE2B 00afb10b8318957f8c4d10ae9254586aef365674822d23da9fdafcc31956252e77ad754c3389ae535b5d78a8611c0750b5609bfd785b6e111d350cc98411eb00 SHA512 370f2bd601546dd5043dedf1387783c425d15d0c52a8f357c4bb1bb9eb0ebb8b54bb4afd79db14314603bf23838568041c590c830622017bc05bd9bfd97baf6f
 AUX unixcw-tests.patch 533 BLAKE2B 0b2c08f1f2bb9db4ad2c98a4af7d2097f408e873cde8f03b46c994adcbb06ed0a20f95e2951c55810821b92e7a3e529621914308726233a108879e3341e98cf5 SHA512 331a7e71a3f9686b08ce59e06e59d4812dd36c4e2597a0ae57f663c2c0b7f32eca3e70adbc1769886b12856ed2d96bd9f4279f95db70d401e31f477b183fa2b7
 DIST unixcw-3.5.1.tar.gz 740331 BLAKE2B 9b5b4b819cf75ca0b10d773ebdf9869bf835c49f10c54b5bd34441b417d48d9a92abc9390a41870bf1c09fbbfe932554307abba181cad3b8631947adcf9890b1 SHA512 b59499723d810a537a2f5ab2b4b34c83a1c8c815af82a60ba29f4d9cee445525e530136f4e202db6b87305ac7a818fa6e59214a45c6bffce299eb50b58c866e1
-EBUILD unixcw-3.5.1.ebuild 1921 BLAKE2B 697418f6eda8a746400bc9d914bfaba466b811415039d9af6f32861ddc3334246553c307eb2cdac24d36bd2410287d499b2ba018f8226cdfb5a497d95b3ef3d2 SHA512 af5a22f6a9f0b05b1b2a4c32b728c782f4f55f2dcfd23c272b41707fae3e4ae98478797042859201117ce56f2cb5359027ca1704c64e4b218bde56d0a5024250
+EBUILD unixcw-3.5.1.ebuild 1945 BLAKE2B 7e61c896d2b93ef4f465d7e42c0e7d49a46d3831717232c9a6de0ccf2fd3594b09ca73b6b0189edb9ac1dcea685f7c80f3003874248683f9197e5aef405b42a8 SHA512 04ebd0b91c3aee1fe98907e8ef01967c433d9c82c2eab273d8fa4cf24db6ebff172ac5677bc3ed91aa29032d9586e21a2a53c7081ec134d91db896a2ae01fb52
 MISC metadata.xml 874 BLAKE2B 3927a605bcb0b3459888fcaa77a528020ed037beeff2b6e750102efc1cad99633cd94f7e6d87093c08133949dc40ea46ad5f1d44a497ef1aeedf2afd77592b29 SHA512 b4040ecf973492b76642e7df2e2fa41b6cf057490a1674e4246479b084e5a3972d109eb203337c0053c2d6924a3b2597ee42684ffb4431c8147e90d5a208247e
diff --git a/media-radio/unixcw/unixcw-3.5.1.ebuild b/media-radio/unixcw/unixcw-3.5.1.ebuild
index b50fdf97de9c..a80f7d96363c 100644
--- a/media-radio/unixcw/unixcw-3.5.1.ebuild
+++ b/media-radio/unixcw/unixcw-3.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,6 +13,7 @@ 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
diff --git a/media-radio/wsjtx/Manifest b/media-radio/wsjtx/Manifest
index cc90e421b342..1277d62ba9e3 100644
--- a/media-radio/wsjtx/Manifest
+++ b/media-radio/wsjtx/Manifest
@@ -1,14 +1,8 @@
 AUX wsjtx-2.0.1-hamlib.patch 479 BLAKE2B 6c77f178ab0aab9519c8e356d14f1d6050545e10d2bb2c25686afa1844107c5ddd86c9696ca1a9d8812e0c8a2194e23649ae02322555b7b9fc67f7e12a9fd623 SHA512 753b4c832f0cb442cbde73597ed5b9305e68328cb0fa69972d43be3bca480de6dab9e04906fad07abc431292bca4b0081ab65406e27e5bb688418a147e27afee
 AUX wsjtx-drop-docs.patch 425 BLAKE2B facdb48f573ef35d74b27b03abd9983a8df162d8843ca846285e2525fe86e4eef2892f0203c64939a9ca5478e27795415487d14eee8ca6cb0a79d0c15f9c0d6a SHA512 2c5000551313b6ee81e50841d286478bb0dba8b8df31e97cbd09ee84ae479ada8ee7fb84fb464c1524245d7b8a24a00f70fb8429a2c67e41842410d939e1800a
 AUX wsjtx-fix-unicode.patch 565 BLAKE2B 02d26dc1b1b51e9ac38feb866ecbf38e58b861c74b3a7dfb1f210d41945a8fa11ee62844416f3a6b0cccb847d393986ccd74a7db2d920382ce7c53e997d3a612 SHA512 ed3cf5972325aaccdffea7d99bd9ae4f32ecf80cf2ded57a738c491bbe0e75e538663342d3efbe7a35811d206652ae5939e2c7b2a65a4a22451b593ffa504dbf
-DIST wsjtx-1.8.0.tgz 29041865 BLAKE2B 3eb3d4e2711443a9e895c1b5771ae6378b13cccbe9b50dce97e9551218700a4e22ae10b618e346b52d2037ee26c5d41f1cf2376d8cc19d143d263db5c683a482 SHA512 793e88604661b03e2e6d5a910ea4045f800b9c59174af3286fd8afdaf65d8a3ca7d1aeae557c6afc66d9bbe398be8c7030950dda03d6bc6279061c3a3107beaa
-DIST wsjtx-1.9.1.tgz 29264406 BLAKE2B 0eb00737851a7877d894a21218c6a408eac30caa4114a0edd69400701f0c8c702d4c373adc5c9f7896a4d8f96c338a92e0a997e0270240917b5e236db36c9aa0 SHA512 16c84e7bb8cf9e6eff288b74ee1f9083e0133ff69fdefca7fbc986c912663f744a75db353242024fe8c64ff9e6e8558fd825b9b106abf02cdd4b43be91680557
-DIST wsjtx-2.0.0.tgz 42090145 BLAKE2B 8a439dc37daaa7e989dc1cbe007a9493268e2590282f1d88781f8f8bc40690511533a0c668654ada81a0504af880eb7d361b305ca523fc432603eafdcccc88eb SHA512 9cbda699345c4e18ae450415701700f19219f81b75080abf04a9136e40017d7113dd099bdff44414a1f0060c8687e46d6df2dd5cd15730c98eed36f9765ef82d
-DIST wsjtx-2.0.1.tgz 43779157 BLAKE2B ecebc4020ff6d095f550aafda59ab1b7de197dbbec2c0278fa00a3f30cb63bd41ebfe135ed4f2583953e4d895b2a93ae3fb474977945bec5922650c0bfc060c2 SHA512 c49a2148b009c1f485fb0a775708f248a7d3b7c0d240879fbd0ffd18e0181c6573b63dec96137ab6643314ff0e0b10661914400c877901475b0ebaba4569b297
 DIST wsjtx-2.1.0.tgz 44904654 BLAKE2B 4d36a9099356225ff2cf12108c0f42da67396a2602c1dbcabcbb001684212fbc81a7f4be23b8d35e32903119cdf04a41fe199429dd8693452b17084481691d74 SHA512 3a76b879586d285d570d05ae5ecca4a27b2da2153d4845c5b3b0a047721ef153af8745764403cb85555097c6778032f559e5848bad7e1cc7d469a874858ad40e
-EBUILD wsjtx-1.8.0.ebuild 1108 BLAKE2B 2fd3b590d9c0aa4591d0387d504f74b8aeb77240546fb44a921781784f9018cebff72fffa1030cd718fe656ab87fc909e463ca576b0147705959c4330e0ff83c SHA512 3b4f9c93027d81c00cb1bf112f01fb67fe25738c6f738f3c2cd5c162b13e2e87b4ae1352d3796fd913e94226b809f8c2904adb45e334c57c650d6fd3d5b16c5c
-EBUILD wsjtx-1.9.1.ebuild 1109 BLAKE2B b535dab45720a8e8fbded73f9a3588c646cb97dc85a0fb9cc3a60915b0e6cfebed69a6175fde38c6f9cdf51ced49955b5583fdc1c387930ff215d6f7e4c1647d SHA512 10b4488f2ca1ea778b03f212bfa5cc133da1168a22b8bba63160492f6ec09c3bf971baad310d053ba803afd6441cbb9cda985aa1c00d50c032a7cffc7241f80e
-EBUILD wsjtx-2.0.0-r1.ebuild 1218 BLAKE2B d7fc133d80b9f6643f8fbe5b07a9c95d8bbd614766afcbdeb1959e6f641e1239c7b50ca662d32ed13bff6c0d2e5d630807ea1a65ba0ea1332114844afacc2f3c SHA512 9fb29b0d3d446a780a8c6ee7adf6c5224e3f082adfe66d01e77d95c8884ebfead5d0319f469fd8dcfea2ba811f620d2d5293f25aa78afd9df22032097f8cf56a
-EBUILD wsjtx-2.0.1.ebuild 1263 BLAKE2B 14282820ed4dc26bcd98fdefc49416831775fff8c26d1a52268f600d72e7c51077a0b630257d9e5b8c3920cd612616f33aa0bdadd290959e612c6001ec55de5d SHA512 9a4c107ec4f6e43f07343565e239a41cbd04a6fd9e44f40bbd8aa4087b32f0944f1ac75aaa33a55fbb29e158fa6a44dbb5f154fd2648a535d934a02a2ecc4327
-EBUILD wsjtx-2.1.0.ebuild 1425 BLAKE2B b4b56b261ec2e82b4e2d062bddb8a09a18b5b8da409ab11d45ec9043524243c1561ab65f1374e82c1979f136ba46c5be73cbdc50e67bbe92ddcc61bcf27c3002 SHA512 8532b20f97fb1cd293a4d6532c573cf716245cf373f7857e52a68379ededcb8651c3b901a00952aac82dc8709150e9c13cf230e9bc07af23d79e58cfb4b43947
+DIST wsjtx-2.1.2.tgz 44928980 BLAKE2B de4e4e892893e5087199385aaee8753c0f71eb36cd23734ae430f50d8a09520bf2bf3df7038bcf03ba4e9ca24534c98a1b6cb5dc444d68d3183279231cf18974 SHA512 037f0604b0a22f6d02f0979b94dd054157c96ee7a8c07284d072f87f6586901346bef1a3c7e19d367a82764dafc9f00b7d1a0929d163a46f1b249aaa3929b1a8
+EBUILD wsjtx-2.1.0.ebuild 1423 BLAKE2B 443a5e12525b1684bb1baf19ccea642e7a708f2022bbb141bb2338e2126c464140980eae9339fd82560972e25dfc67d8df81671820d63af8207a3a525fc7ceb2 SHA512 64964a8a9158aa12f617b99bef4c7df7c24dba5a257bc887295e0969a109d6f64a24fc0855e5dc484f3fd973c55661701b18b4290050f3a1a756a4cb693ba9ca
+EBUILD wsjtx-2.1.2.ebuild 1425 BLAKE2B b4b56b261ec2e82b4e2d062bddb8a09a18b5b8da409ab11d45ec9043524243c1561ab65f1374e82c1979f136ba46c5be73cbdc50e67bbe92ddcc61bcf27c3002 SHA512 8532b20f97fb1cd293a4d6532c573cf716245cf373f7857e52a68379ededcb8651c3b901a00952aac82dc8709150e9c13cf230e9bc07af23d79e58cfb4b43947
 MISC metadata.xml 411 BLAKE2B b18268ad951aaeb11cb490e4b02fa063915d2862f81e1a9f4ef69bf391c0628e75258d4bc66ce942a51d88369033b4e9dc8f5b8fff1c26bd33a4560ca493d70e SHA512 1b11819a29e25cf3ce3932bfb200ce65fd69c0872149acb54d3c67fb35d9977feee5d87e7412d75751cbc6a9b76010a2bcbc8b3a47a50d11a0c011abc5a83efc
diff --git a/media-radio/wsjtx/wsjtx-1.8.0.ebuild b/media-radio/wsjtx/wsjtx-1.8.0.ebuild
deleted file mode 100644
index 245a9cd7f1f8..000000000000
--- a/media-radio/wsjtx/wsjtx-1.8.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-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"
-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
-	doc? ( dev-ruby/asciidoctor )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWSJT_GENERATE_DOCS="$(usex doc)"
-		-DWSJT_DOC_DESTINATION="/doc/${PF}"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	rm "${D}"/usr/bin/rigctl{,d}-wsjtx || die
-	rm "${D}"/usr/share/man/man1/rigctl{,d}-wsjtx.1.gz || die
-	rm "${D}"/usr/share/doc/WSJT-X -R || die
-
-}
diff --git a/media-radio/wsjtx/wsjtx-2.0.0-r1.ebuild b/media-radio/wsjtx/wsjtx-2.0.0-r1.ebuild
deleted file mode 100644
index 733679d6805f..000000000000
--- a/media-radio/wsjtx/wsjtx-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-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}"
-
-S=${WORKDIR}/wsjtx
-
-src_unpack() {
-	unpack ${A}
-	unpack "${WORKDIR}/${MY_P}/src/wsjtx.tgz"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWSJT_GENERATE_DOCS="$(usex doc)"
-		-DWSJT_DOC_DESTINATION="/doc/${PF}"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	rm "${D}"/usr/bin/rigctl{,d}-wsjtx || die
-	rm "${D}"/usr/share/man/man1/rigctl{,d}-wsjtx.1.gz || die
-	rm "${D}"/usr/share/doc/WSJT-X -R || die
-
-}
diff --git a/media-radio/wsjtx/wsjtx-2.1.0.ebuild b/media-radio/wsjtx/wsjtx-2.1.0.ebuild
index 15c7d5cf22d8..3e5b48e7b589 100644
--- a/media-radio/wsjtx/wsjtx-2.1.0.ebuild
+++ b/media-radio/wsjtx/wsjtx-2.1.0.ebuild
@@ -12,7 +12,7 @@ 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
diff --git a/media-radio/wsjtx/wsjtx-2.0.1.ebuild b/media-radio/wsjtx/wsjtx-2.1.2.ebuild
index 72bc67c88b13..15c7d5cf22d8 100644
--- a/media-radio/wsjtx/wsjtx-2.0.1.ebuild
+++ b/media-radio/wsjtx/wsjtx-2.1.2.ebuild
@@ -31,11 +31,17 @@ RDEPEND="dev-qt/qtcore:5
 	virtual/fortran
 	app-text/asciidoc
 	doc? ( dev-ruby/asciidoctor )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools
+	"
 
 S=${WORKDIR}/wsjtx
 
-PATCHES=( "${FILESDIR}/${P}-hamlib.patch" )
+PATCHES=( "${FILESDIR}/${PN}-2.0.1-hamlib.patch"
+		  "${FILESDIR}/${PN}-fix-unicode.patch"
+		  "${FILESDIR}/${PN}-drop-docs.patch" )
+
+DOCS=( AUTHORS BUGS NEWS README THANKS )
 
 src_unpack() {
 	unpack ${A}
@@ -43,9 +49,11 @@ src_unpack() {
 }
 
 src_configure() {
+	cmake_comment_add_subdirectory debian
+
 	local mycmakeargs=(
 		-DWSJT_GENERATE_DOCS="$(usex doc)"
-		-DWSJT_DOC_DESTINATION="/doc/${PF}"
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
 	)
 	cmake-utils_src_configure
 }
@@ -57,7 +65,5 @@ src_compile() {
 src_install() {
 	cmake-utils_src_install
 	rm "${D}"/usr/bin/rigctl{,d}-wsjtx || die
-	rm "${D}"/usr/share/man/man1/rigctl{,d}-wsjtx.1.gz || die
-	rm "${D}"/usr/share/doc/WSJT-X -R || die
-
+	rm "${D}"/usr/share/man/man1/rigctl{,d,com}-wsjtx.1.gz || die
 }