gentoo resync : 02.08.2019

16 files changed, 171 insertions, 188 deletions

diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index 65998456597c..ead3bbc8965a 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/fldigi/Manifest b/media-radio/fldigi/Manifest
index 05b99ac0bd7b..b515b9701b4e 100644
--- a/media-radio/fldigi/Manifest
+++ b/media-radio/fldigi/Manifest
@@ -4,9 +4,11 @@ DIST fldigi-4.1.02.tar.gz 4681621 BLAKE2B d9ec93332d26f1db959f5d56388ebba63dd68a
 DIST fldigi-4.1.03.tar.gz 4682813 BLAKE2B cf9f032844c46de1e6712e2bfdebe624693f873eed9e9babd21f0dbaee70348ddf8d3fd235b2e3b9fc3d99ca1432c5d7b62a4bb2d4fdb25a5841ee451c9ff1ca SHA512 058089fcc3aeef688ba867159b0d7d8ebd1e13c7164db95b0aacadec7509b8a76d415e86783197d009e575bff168a86152066f8454b87274b746bfaaf43a9f94
 DIST fldigi-4.1.04.tar.gz 4689833 BLAKE2B 7d793f8dba75320e02f2f432c69573638dc4ba495859d78a368c90bb353e8aaa06cc71a4f7275bde40670fcf5ef8b4d17ea0133e87a399f880a89d444f32230a SHA512 fba42a60ed9e524f3387f9911d5734749afa11e941a7d002ad519a5019fafafdb3c4d91416f5b51c73ba3d20bd9c18d3cfb0863bc21ca715d6197b559c56ed25
 DIST fldigi-4.1.05.tar.gz 4636043 BLAKE2B f0378dbddba91f31eed49c2465b4fea68e3a4553ad5ab4c758d815dc06b84b1db26c81ebfc49b3e25d93e1225a0d4e09d34b57c61a0c549017a36b6c5d1e4756 SHA512 079f6404117381dbfef3ffcf31de527a6edb8d46223e00c8f331d860008ad737e8d51bd0cc18242e34c6835f92cb35887807a7089b40a70f8ebf83c626e84a55
+DIST fldigi-4.1.06.tar.gz 4633753 BLAKE2B 2eed9be5c1e0d0fdb29b9a2d5b7c7eedca7cdb5dc9149532776083cd56d67cbbfea1760f2287d9de2880508e950c4a87e96b4d818f56b3ce4f2f4025057eb54e SHA512 fc3ef66e9ce8c231af27d17f098e1767ba35038afac124be2a1db846246bf2e6d86ba078cd82e28d73b7389079eff87545c2f3e81bef95c525b90a8886c612be
 EBUILD fldigi-4.1.01.ebuild 1288 BLAKE2B cfdfc65149ae821a9c8ea5a56ae7876999115e74dff72f4ed92b0a988b625ffd689d7eb23c0f06297ab4b2f144f5437a8a0765f7b6bd54677cef3ea951050196 SHA512 05654807edbb91a8d35073962f8d525e498bd3c233949759cb8ca1f4abebf3b02c3ec60b5c87c070bb5ec64ab00bb3b58528ddcb8f8ed2c43d6e81384c5ee8f6
 EBUILD fldigi-4.1.02.ebuild 1290 BLAKE2B ec9e779275fed3b2c5b7464a2b1062b1a4ab98290e78449b47687e2fb2fa7b4adfaea6533607976af298a84ad2844c507d9765f2e37463b6051abebc929be497 SHA512 b86cf76fe0ae34cd02285f5ed1da2abf09081017f9213d7ffdc299f8195e94c31556da0303a308c2a9a9e1cbcc0101f51c54b4159f3aefa7158592363caf75f7
 EBUILD fldigi-4.1.03.ebuild 1290 BLAKE2B ec9e779275fed3b2c5b7464a2b1062b1a4ab98290e78449b47687e2fb2fa7b4adfaea6533607976af298a84ad2844c507d9765f2e37463b6051abebc929be497 SHA512 b86cf76fe0ae34cd02285f5ed1da2abf09081017f9213d7ffdc299f8195e94c31556da0303a308c2a9a9e1cbcc0101f51c54b4159f3aefa7158592363caf75f7
 EBUILD fldigi-4.1.04.ebuild 1290 BLAKE2B 3a7295846fc1523f1ffa312e4cdc010adab6c0f72639f5976130df3caa4b8a8e111c72473ab979d636c86e901929cdc89ce46bf364a305f6095858d3800b3c20 SHA512 2490596ae8f595473f2343ef7b20d26a40e1dedbc0af85c119711a342243fd590b5b37849055426ea9cc8e72867cb4d2db197643265e01c7bd51d2c8d1091dc9
 EBUILD fldigi-4.1.05.ebuild 1290 BLAKE2B 3a7295846fc1523f1ffa312e4cdc010adab6c0f72639f5976130df3caa4b8a8e111c72473ab979d636c86e901929cdc89ce46bf364a305f6095858d3800b3c20 SHA512 2490596ae8f595473f2343ef7b20d26a40e1dedbc0af85c119711a342243fd590b5b37849055426ea9cc8e72867cb4d2db197643265e01c7bd51d2c8d1091dc9
+EBUILD fldigi-4.1.06.ebuild 1290 BLAKE2B 3a7295846fc1523f1ffa312e4cdc010adab6c0f72639f5976130df3caa4b8a8e111c72473ab979d636c86e901929cdc89ce46bf364a305f6095858d3800b3c20 SHA512 2490596ae8f595473f2343ef7b20d26a40e1dedbc0af85c119711a342243fd590b5b37849055426ea9cc8e72867cb4d2db197643265e01c7bd51d2c8d1091dc9
 MISC metadata.xml 495 BLAKE2B 9c6f1b29ffb13a553b74ded93c11d29ffdc5a02336adb8fef55b862800a1856e712cdcb06c4e7d90858712d43aafce79f6cf9a357dc0a3c3ca0fc5cdb0ff770e SHA512 fdd9bc3f065ccb354ed0ad5c6544ca70f2011828870b942f2bf2f7001bf1342f858d60a6031cf005623795d1f1d2ccbc3a42fb54dcbd465c3c73f29a928d9091
diff --git a/media-radio/fldigi/fldigi-4.1.06.ebuild b/media-radio/fldigi/fldigi-4.1.06.ebuild
new file mode 100644
index 000000000000..17d2911234fa
--- /dev/null
+++ b/media-radio/fldigi/fldigi-4.1.06.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 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/flrig/Manifest b/media-radio/flrig/Manifest
index 2ad0a972d682..9bf4c5df1834 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -3,8 +3,10 @@ DIST flrig-1.3.42.tar.gz 785256 BLAKE2B 43e4053b4d12ec436294aca5dc096b2fe8167363
 DIST flrig-1.3.43.tar.gz 792283 BLAKE2B 28055c13e5d930913825ca75481f93a91b553f74cdfb4af1b8d136223b6d46ae0c3864e0772730fd9538e79ebede8314a4f18b6de06bbd0a9e8a33ba5d5b7c0a SHA512 a4e769ef0358e82b882a47416841d044024373fdea0f1bc576d7c0f91593a166388d315165563f2b9ebd8f999f24df1a6192978c21adb1d01443334f5053a2c5
 DIST flrig-1.3.44.tar.gz 792305 BLAKE2B 8fe7292045eddd5f1e5adc7cf54edf5acf5d4d2a0635d7b22f1ab9009b3c9e8f89afccff6924ddd21e4a91490f7d80cd27f37588f55b4556fb671b055e11572a SHA512 0b7cc12411a4e6b197975e047c55c55590975600904e40dfe7192f0a131347f459e6fc4f778ecd1cb0e5dc89174af4d4fa7f566a4015a8e6b8e8bf86966d5937
 DIST flrig-1.3.45.tar.gz 799650 BLAKE2B 013ed1205dde577593cd644bcb65e17a68e450f9e7c882cbf141db26890105fdc2777f9e3ac25035d54297020b12d9fb9be643f089ae8afa1a7b6d33a00cf325 SHA512 966e5113313c1d2dfa4e3a86dac247be44ede8576d8a4ac88f12d5cac9d247e03ba62710126fcf153f78f72045ed6ffaa3536b2b2d4b7a7418a44895c7d67b4b
+DIST flrig-1.3.46.tar.gz 813126 BLAKE2B e88186958eb7f4492a564135144d77abae782e8d249c9678663625a0cab9b9f716f1fa616062eecfb8b0c26952e2399a9120cc0a7ddcc5ad43f8bfdde400afde SHA512 e5d02632806d5f899abecc84fe7f8d1610153ace260d9c812221a37a781dd9dffe48602507f798c98d510d79657f4deec69ce2e1513f7b51f3d60888d9c07071
 EBUILD flrig-1.3.42.ebuild 583 BLAKE2B 8edc5d77cb5e7f30f60ebc2ed75bc25324c5f66e84a15c7ff3ebac0d639bdacffa0f5659ab678b4c653a2c86473458c02968672a1cbc9c3dfcdc96739c36a927 SHA512 565f552847addee93ad7e897a06d4fe50c6438ca4b2ea8b546c4315aa0bda9478e9cd0cd002300b66651dce807afacc21cef7a5b79db227bd4607fd5c27062ed
 EBUILD flrig-1.3.43.ebuild 585 BLAKE2B a381a713c336b70d51a070b54307aa022a00ee995cdda63413b324c7674a790e5cd5b4ee389da78c61662406a098fbfbe42aaddc6ca60f1b4debd134286c591f SHA512 51af267974b437e74f12ab762cb029c8453fdb55f46efe7d932dac2568aad7d674d25df3c07f8adaa39d972d8f6af758492820ec41cd9ac774315679543c3a9a
 EBUILD flrig-1.3.44.ebuild 585 BLAKE2B edc49c5ae640ace981cd71b734dd194ee2c9b2163ad86fcd022844c37553553992f133d5d9e47f81f97c834a87b3cb04a89a9e39c28c406516a7328bc279f555 SHA512 3f90f1dbff22b366b3d89a46831671c5a23b78fb7736f246cc1634b506bd45fdb26d68b67eb44c6742b74b6c40d8ab22e29376496669cd7dfc7118af8252a1b4
 EBUILD flrig-1.3.45.ebuild 585 BLAKE2B edc49c5ae640ace981cd71b734dd194ee2c9b2163ad86fcd022844c37553553992f133d5d9e47f81f97c834a87b3cb04a89a9e39c28c406516a7328bc279f555 SHA512 3f90f1dbff22b366b3d89a46831671c5a23b78fb7736f246cc1634b506bd45fdb26d68b67eb44c6742b74b6c40d8ab22e29376496669cd7dfc7118af8252a1b4
+EBUILD flrig-1.3.46.ebuild 585 BLAKE2B edc49c5ae640ace981cd71b734dd194ee2c9b2163ad86fcd022844c37553553992f133d5d9e47f81f97c834a87b3cb04a89a9e39c28c406516a7328bc279f555 SHA512 3f90f1dbff22b366b3d89a46831671c5a23b78fb7736f246cc1634b506bd45fdb26d68b67eb44c6742b74b6c40d8ab22e29376496669cd7dfc7118af8252a1b4
 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
new file mode 100644
index 000000000000..5020c2bffaf7
--- /dev/null
+++ b/media-radio/flrig/flrig-1.3.46.ebuild
@@ -0,0 +1,29 @@
+# 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/js8call/Manifest b/media-radio/js8call/Manifest
index d338394b4f32..515ddfc7a909 100644
--- a/media-radio/js8call/Manifest
+++ b/media-radio/js8call/Manifest
@@ -1,5 +1,5 @@
 DIST js8call-1.0.0.tar.bz2 15923224 BLAKE2B 646fd869e6029d57dfd1d9762ede2407e18a18170088df65d1b16a581709065cf45edb23533b9c89193b01a85ec326638efc99202489db54455298a5033696de SHA512 64f24821c9ffd86123ede2baac46bcefd33b5dc5e0496cd44e594e79706ec2f3fdde5ce13c379addbf2bded3e392a1f0fc0f2df0298ce57a22e434a6ab6a1e7a
 DIST js8call-1.1.0.tar.bz2 15993553 BLAKE2B 3538f746b175d0623169d2a13b5c26b334561f604fa25c8dddc15ee2a41319df8bb4c0a905be6340d4d18d87bffd8bd4e9a4eb9ceec3310f33aa22005c0e1c19 SHA512 992408408888a59174811c30fcc07065bcb5e459c355955a59e638ca27da27c2c25df8fa7579ce1c322a76f12780c58821df9fc781cde2cb2b2851312d188787
 EBUILD js8call-1.0.0.ebuild 877 BLAKE2B c59f72323ba1e9a17890400ae0bf6134b6907a857c6bb89740bfbcac155e85458e808d34e352bffd9997a7e22aa256cafcc0ada12787e4f0b13b42ab9f30ebcc SHA512 a7941d4f677e003af0b7c7c3bfd63134f7fc5fa4bbb0b059ada6997918d9d1c5133391385e8e59fdc49d15d2c9cdc1bbdc13f4d63c6a8e1585b2c4cac289841a
-EBUILD js8call-1.1.0.ebuild 878 BLAKE2B 523cff43f98e36870187557b0db258ff26aa38444ec2d09a75a90b51790da0fdc778019e95a749c602676d83873a6b470b799ae91b20c9682f262359d39c4bb3 SHA512 8aab4cc95997048718b174e5ab088cd62b938954f7bd3c81d451c7c96252158bc930b71ed04711be57fe6615682ad0cda50334169f4fdcc1fbc9c3447cd98246
+EBUILD js8call-1.1.0.ebuild 877 BLAKE2B c59f72323ba1e9a17890400ae0bf6134b6907a857c6bb89740bfbcac155e85458e808d34e352bffd9997a7e22aa256cafcc0ada12787e4f0b13b42ab9f30ebcc SHA512 a7941d4f677e003af0b7c7c3bfd63134f7fc5fa4bbb0b059ada6997918d9d1c5133391385e8e59fdc49d15d2c9cdc1bbdc13f4d63c6a8e1585b2c4cac289841a
 MISC metadata.xml 312 BLAKE2B 77446444162f6d430b7cd8c95ea0ff34da775e0a78d355b1e71a5a5e3c64c6f633b0339cdcd2055d3ea1fd5befa5d6655d02d2cb0fd55fd60a408efb33c6cf0a SHA512 caf176b301b2a0385c9c24d8ee1b68077d9cf49b5379f6530c27658450efa8fef6551a4d1492529bdde38e95bb4f5df5f9825c38865874514803e12ad37bc461
diff --git a/media-radio/js8call/js8call-1.1.0.ebuild b/media-radio/js8call/js8call-1.1.0.ebuild
index ed7e9ce100ed..78808ea84e4b 100644
--- a/media-radio/js8call/js8call-1.1.0.ebuild
+++ b/media-radio/js8call/js8call-1.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://bitbucket.org/widefido/js8call/get/v${PV}.tar.bz2 -> ${P}.tar.b
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc"
 
 RDEPEND="dev-qt/qtcore:5
diff --git a/media-radio/wsjtx/Manifest b/media-radio/wsjtx/Manifest
index 5c6346c56f47..cc90e421b342 100644
--- a/media-radio/wsjtx/Manifest
+++ b/media-radio/wsjtx/Manifest
@@ -1,4 +1,6 @@
 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
@@ -8,5 +10,5 @@ EBUILD wsjtx-1.8.0.ebuild 1108 BLAKE2B 2fd3b590d9c0aa4591d0387d504f74b8aeb772405
 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 1270 BLAKE2B b1fa2fc3e666b87f919a20acdf4d9ef75615a1e8aaa5b6d6b93c1d8841077f6f1c4541240cde03389897a3f00b931525b4dbabd7c90d8c6c618e6e1421d410a1 SHA512 032369232c691d6dd33bb01406ba7eee064fc997cb0ca9a0f97d367dc75e6ff49a94fa6764d6b6e19dd8a7cd7b6d0ae6cbbdb27fa1302e774f457f2b8cd59daa
+EBUILD wsjtx-2.1.0.ebuild 1425 BLAKE2B b4b56b261ec2e82b4e2d062bddb8a09a18b5b8da409ab11d45ec9043524243c1561ab65f1374e82c1979f136ba46c5be73cbdc50e67bbe92ddcc61bcf27c3002 SHA512 8532b20f97fb1cd293a4d6532c573cf716245cf373f7857e52a68379ededcb8651c3b901a00952aac82dc8709150e9c13cf230e9bc07af23d79e58cfb4b43947
 MISC metadata.xml 411 BLAKE2B b18268ad951aaeb11cb490e4b02fa063915d2862f81e1a9f4ef69bf391c0628e75258d4bc66ce942a51d88369033b4e9dc8f5b8fff1c26bd33a4560ca493d70e SHA512 1b11819a29e25cf3ce3932bfb200ce65fd69c0872149acb54d3c67fb35d9977feee5d87e7412d75751cbc6a9b76010a2bcbc8b3a47a50d11a0c011abc5a83efc
diff --git a/media-radio/wsjtx/files/wsjtx-drop-docs.patch b/media-radio/wsjtx/files/wsjtx-drop-docs.patch
new file mode 100644
index 000000000000..50bd9cc095b8
--- /dev/null
+++ b/media-radio/wsjtx/files/wsjtx-drop-docs.patch
@@ -0,0 +1,21 @@
+--- a/CMakeLists.txt	2019-07-24 16:42:07.128890166 +0200
++++ b/CMakeLists.txt	2019-07-24 16:42:40.001023963 +0200
+@@ -1493,18 +1493,6 @@
+   )
+ 
+ install (FILES
+-  README
+-  COPYING
+-  AUTHORS
+-  THANKS
+-  NEWS
+-  INSTALL
+-  BUGS
+-  DESTINATION ${CMAKE_INSTALL_DOCDIR}
+-  #COMPONENT runtime
+-  )
+-
+-install (FILES
+   contrib/Ephemeris/JPLEPH
+   DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}
+   #COMPONENT runtime
diff --git a/media-radio/wsjtx/files/wsjtx-fix-unicode.patch b/media-radio/wsjtx/files/wsjtx-fix-unicode.patch
new file mode 100644
index 000000000000..925199863a11
--- /dev/null
+++ b/media-radio/wsjtx/files/wsjtx-fix-unicode.patch
@@ -0,0 +1,11 @@
+--- a/manpages/man1/jt65code.1.txt	2019-07-23 19:27:07.690602674 +0200
++++ b/manpages/man1/jt65code.1.txt	2019-07-23 19:27:22.098060819 +0200
+@@ -31,7 +31,7 @@
+ 
+ *jt65code*, *jt9code* and *jt4code* are utility programs that let you
+ explore the conversion of user-level messages into channel symbols or
+-“tone numbers.”  These programs can be useful to someone designing a
++"tone numbers."  These programs can be useful to someone designing a
+ beacon generator for JT9 or JT65, or for studying behavior of the
+ error-control codes for each of the protocols.
+ 
diff --git a/media-radio/wsjtx/wsjtx-2.1.0.ebuild b/media-radio/wsjtx/wsjtx-2.1.0.ebuild
index 4cba731ef520..15c7d5cf22d8 100644
--- a/media-radio/wsjtx/wsjtx-2.1.0.ebuild
+++ b/media-radio/wsjtx/wsjtx-2.1.0.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}/${PN}-2.0.1-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
 }
diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest
index 071b43ee2f7a..2535ff5709be 100644
--- a/media-radio/xastir/Manifest
+++ b/media-radio/xastir/Manifest
@@ -1,15 +1,12 @@
 AUX xastir-2.0.0-dont-filter-flags.diff 621 BLAKE2B 7bb56ddfd744123b705e7f00866fa5ac76a3ee0cd5379ee8cb41b7f1eac94ab9e704802b64eb22fe182d594c4d62ece3215122c22f5cd30b3f00c4c60dde875e SHA512 da94db0dcbd79c7b258f3657d0e6135fb93de81f3a2c25a73d68051b1a92156392a638f6a5478f4a0b8b568c4780a4091d7345e4c8cc60ecc190633123da0a6b
 AUX xastir-2.0.4-fortify.diff 4404 BLAKE2B 46f9d2adfd70575301e7d5f9874520baf60e006f315bd6c97ba1683a97a852067ad5b460a4ea68b3854d70882a1a24f7d7873af7f2e350b010853b124af00944 SHA512 f8ba2e3820e599a41dfcb4e60570b320c54625833e3bf0ab649655b1925e1d21d8de776d705bffd3cf85b2ebf43868de17923cf94fa3e4abd787c5d3ec09b920
+AUX xastir-2.0.8-fix-graphicsmagick.diff 1201 BLAKE2B 60c16089c786178b91eb6731b1b95d676fe3a1620d8e55709ccf657a8f3b155d62cebfd141ae41eaac03d8ff26230d6e4f59a0e5bc795db7eb00ea64cf276d1e SHA512 d3ec865bdb2645ef54e555e33659761588f79aafb96261c65112d94a6d17ce3825555dc33cee6b3af1ef45f9c9e588cf8c6f3f67f5587c3a2651886c6869ec11
 AUX xastir-2.0.8-no-builtin-shapelib.diff 2588 BLAKE2B 7de77fa6a75819579084f69ac0aabf4b0d87c7524bedd9b989ecf861949c6c21ce759f40502295f9da41ef1d570087356a9f62ec8545cf2836b98dfea35d0552 SHA512 da7374fd129956887efcf9b21047e75a34d32b391cc5a65416481971dc94722f1c538997ac85c5b47a8b6fb69f85611f04f73859736fe747f41f1edeac53aae6
 AUX xastir-2.0.8-scripts.diff 3398 BLAKE2B 0095733a8c590a76bfbed1596fe6a4bd2faca2070989e703fff6b40ec2e5ee3ad628203de12d321b3e4afd27c6626af5d80453212b9a5b8ba8e2d70178a082a1 SHA512 3e7bf50a1aa0abc67f6c83aa13aceb4478965ad21dea48351ab8d45f72a37e165efda07e822642f1bd1095355823f73a02207f84934ca1fc614a3d4784742dda
 AUX xastir-2.1.0-scripts.diff 3506 BLAKE2B 64dcad59b08bb50a558e80b889eb25fec2c3677f9bc2d1d2d19d728df47f977b546fcddac036eb42b086f7bb73394269175dd3a8e13aeac9fe4ceac8de85bd01 SHA512 28d74029262de2ec58805ca8e042d100436369d330667574c01507a1085d96aa15c5e7ee84c200ccca869941acfe73f46959919c4f205608233505138c80aa8f
 AUX xastir-2.1.2-scripts.diff 3766 BLAKE2B fbad015655864f26dfed1b50ea6c1399fc70088ff092a2cdd1a173879db4bdbba43aea9107cc961890012682d0e265f888b908d553c50018d34ea040dc08243e SHA512 aef4410c53aa3d80c4f3ea48a50759a9a1813801d18fb6dd0cf4e90b8e49358c9f6040cca964b5ce4eefcea2966f197207b25e67dd1b69e1bbd5cf0ba640ae46
 DIST xastir-2.0.8.tar.gz 2697256 BLAKE2B 12a12219885d7923e3262494ac39b7b7f200118953b1e47ae25917f3f1732a1cff931de06462de7d5f1216c9b61561f8090fc49e18b40380eaa58b3559c5f123 SHA512 fd98a880392e9fcb049c6049ebc6a6a5e600571b7b59fd7061a72404abd68530ae6f152c9eabdc39be0458b33b363ce7fa3fdd5330003298bca8eaac62a6982f
-DIST xastir-2.1.0.tar.gz 2996246 BLAKE2B c4b607f09a5cc52daa18ac5ac8c761cf99adc7ae7d61c481d56383ac8a62302b8ec96593a24a8f5870ec7b6aa12ca619f1b93954d120cceaa1126343e080517f SHA512 32c1297d6399c34078158853beba32a4d018d060088b014be004b0837a887c6360e417e1d59ed7865ea1caa3c07f59d7bb4ee3cf9c035e2aabf6ba4783e3d288
-DIST xastir-2.1.2.tar.gz 2724737 BLAKE2B 4b3fe45fb666b1c66f07f57b93f09ab0118daa266e5120ce089b3f95686fc7dc4e10148a2518f0bea9f4411a316db4f1137c898594489bda6c9198b4f34a95ef SHA512 6bfa759df34e68b6431cf5a5c2fe3a501284fac4039af2242c745645d6ccb3476d2f42bd4a8889c3ea01d70cad52d39aac3949d9d5b6cf2c0deff5aa06ffbe93
 DIST xastir-2.1.4.tar.gz 2694124 BLAKE2B 90fd8ef340fc5bad43c9501c6530dcd4bd60eaab9c04638c68f80add46f0df24c45db334549915edaee95cbdcc9b7580d6343d81d84cb819f4ef5a76c9f79242 SHA512 e96f9de52499615cfe88708656d111d417e0d0e08f798b2d97f6a270db3e639c4fb5219767f8fd399fe75f51f02391ace87ae7175ae9a44cb5a4056ab7b573b1
-EBUILD xastir-2.0.8-r1.ebuild 2203 BLAKE2B dc61aac6fedf3718670c310bb6bf7543a3c6b89cde7ce268ae649412573e3abc1b276887dce805cea66bed9a012807bd37c545b32b1b049235645aaa8dc78d5d SHA512 ecbcff6241fa73b88de005fc101c61188f808cf25769144185e42525396cb7ac9b8f0eebd0d1821693cd8ed375ea1fd4afbcb25bf4b54487ba6bd68e4f52196a
-EBUILD xastir-2.1.0.ebuild 2333 BLAKE2B a67bf08f7dfa2f21ec517e14c7c38154bf2ee1a10c53152c7c40edc734d4389ff7057dbfe647fb0b679eda5a34053f9d7b47937a208d9c271709a121c9e3d086 SHA512 821d55f16f1f8e887060d9fd58a85c19e5fb81202aa5d3656f15b2db77d2445680e405118d9cc8d011fe5b047a9327ac7f85f6a6f47d4c656c53e9fb0dcf7b37
-EBUILD xastir-2.1.2.ebuild 2010 BLAKE2B b6e8f50069e874c74beff4540ca9a4765a9178459b4a335d3e650559a6ec6676f35299412878c84fa422c5a775578b284d3f0d5a3d6d56484cfcbfc3bca2179c SHA512 0c9909ee954c111d8f5df49c0f79ca5b90242f524fa2fe8724322332a284b07e57e3546b490d72fed678113bbdc2e077c9ad26c0430c63e2b32f4660087bd977
+EBUILD xastir-2.0.8-r1.ebuild 2310 BLAKE2B ddb69cb6ee6d93e096154d8c4a672cde7dd6c49566cd5e74bf13f5721d272394a9aa850fcb4cf51b87dcc47021ee412e4d5f32956352cdf359f95b8cc056f137 SHA512 84a90b62785b15199933ae4ed0812e993cf8c25666a2f885b4eb7e7b94daf238a355e261e187c88bb922e309587f91f5d2831616f21d61748c065c2ba73509d9
 EBUILD xastir-2.1.4.ebuild 2010 BLAKE2B b6e8f50069e874c74beff4540ca9a4765a9178459b4a335d3e650559a6ec6676f35299412878c84fa422c5a775578b284d3f0d5a3d6d56484cfcbfc3bca2179c SHA512 0c9909ee954c111d8f5df49c0f79ca5b90242f524fa2fe8724322332a284b07e57e3546b490d72fed678113bbdc2e077c9ad26c0430c63e2b32f4660087bd977
 MISC metadata.xml 598 BLAKE2B f264d0c4da8a00f68c94e83e15dd698a5f2332d92711347337a71fa11290570ca582ec6826ca7b62cab3d1935cb370ad71e6d8db893bc92f195fbef3fc06c4c3 SHA512 e1d392c11713b0cf692ac91df33eec85a4b47f2836851ca9d7dcd16c41a5a9540b67950731c8b943ecc1de6792449972971e295f39eda81f007c6521d6944ebb
diff --git a/media-radio/xastir/files/xastir-2.0.8-fix-graphicsmagick.diff b/media-radio/xastir/files/xastir-2.0.8-fix-graphicsmagick.diff
new file mode 100644
index 000000000000..8919239fbfde
--- /dev/null
+++ b/media-radio/xastir/files/xastir-2.0.8-fix-graphicsmagick.diff
@@ -0,0 +1,32 @@
+# backported from xastir-2.1.4 (see bug #688444)
+--- a/src/map_geo.c	2019-07-26 15:54:19.534488550 +0200
++++ b/src/map_geo.c	2019-07-26 15:56:47.779713950 +0200
+@@ -125,20 +125,7 @@
+ #undef PACKAGE_TARNAME
+ #define XASTIR_PACKAGE_VERSION PACKAGE_VERSION
+ #undef PACKAGE_VERSION
+-#ifdef HAVE_GRAPHICSMAGICK
+-/*#include <GraphicsMagick/magick/api.h>*/
+-/* Define MAGICK_IMPLEMENTATION to access private interfaces
+- * such as DestroyImagePixels(). This may not be a good thing,
+- * but DestroyImagePixels() has been in this code for a long
+- * time. Defining MAGIC_IMPLEMENTATION eliminates the warning that is
+- * now (9/28/2010) being seen on some distros (Ubuntu 10.04 and
+- * OpenSuSE-11.3)
+- */
+-#define MAGICK_IMPLEMENTATION
+ #include <magick/api.h>
+-#else   // HAVE_GRAPHICSMAGICK
+-#include <magick/api.h>
+-#endif  // HAVE_GRAPHICSMAGICK
+ #undef PACKAGE_BUGREPORT
+ #define PACKAGE_BUGREPORT XASTIR_PACKAGE_BUGREPORT
+ #undef XASTIR_PACKAGE_BUGREPORT
+@@ -2030,7 +2017,6 @@
+             if (!SyncImagePixels(image))
+                 fprintf(stderr, "SyncImagePixels Failed....\n");
+ 	}
+-        DestroyImagePixels(image);
+     }
+ 
+     // If were are drawing to a low bpp display (typically < 8bpp)
diff --git a/media-radio/xastir/xastir-2.0.8-r1.ebuild b/media-radio/xastir/xastir-2.0.8-r1.ebuild
index d4421c5da9b6..c16d857f5d69 100644
--- a/media-radio/xastir/xastir-2.0.8-r1.ebuild
+++ b/media-radio/xastir/xastir-2.0.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -45,6 +45,9 @@ src_prepare() {
 	# do not filter duplicate flags (see bug 411095)
 	epatch "${FILESDIR}"/${PN}-2.0.0-dont-filter-flags.diff
 
+	# fix compile problem with newer graphicsmagic
+	epatch "${FILESDIR}"/${PN}-2.0.8-fix-graphicsmagick.diff
+
 	eautoreconf
 }
 
diff --git a/media-radio/xastir/xastir-2.1.0.ebuild b/media-radio/xastir/xastir-2.1.0.ebuild
deleted file mode 100644
index bb02b59e37fb..000000000000
--- a/media-radio/xastir/xastir-2.1.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils 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-2.1.0.tar.gz
-			-> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="festival gdal 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 )
-	gdal? ( sci-libs/gdal )
-	festival? ( app-accessibility/festival )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	eapply_user
-
-	# fix script location (bug #407185)
-	epatch "${FILESDIR}"/${P}-scripts.diff
-
-	# fix __FORTIFY_SOURCE warning (bug #337365)
-	epatch "${FILESDIR}"/${PN}-2.0.4-fortify.diff
-
-	# do not use builtin shapelib if sci-libs/shapelib is not installed
-	# instead build without shapelib support (bug #430704)
-	epatch "${FILESDIR}"/${PN}-2.0.8-no-builtin-shapelib.diff
-
-	# do not filter duplicate flags (see bug 411095)
-	epatch "${FILESDIR}"/${PN}-2.0.0-dont-filter-flags.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-gpsman \
-		$(use_with !graphicsmagick imagemagick) \
-		$(use_with graphicsmagick) \
-		$(use_with geotiff libproj) \
-		$(use_with geotiff) \
-		$(use_with gdal) \
-		$(use_with festival)
-}
-
-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.2.ebuild b/media-radio/xastir/xastir-2.1.2.ebuild
deleted file mode 100644
index b9b5bdb7a8cd..000000000000
--- a/media-radio/xastir/xastir-2.1.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 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="festival 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 )
-	festival? ( app-accessibility/festival )"
-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
-
-	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-gpsman \
-		$(use_with !graphicsmagick imagemagick) \
-		$(use_with graphicsmagick) \
-		$(use_with geotiff libproj) \
-		$(use_with geotiff) \
-		$(use_with festival)
-}
-
-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."
-}