gentoo resync : 30.05.2020

19 files changed, 164 insertions, 350 deletions

diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index b22c14f2a4eb..e0e20fdf2b09 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/ax25-apps/Manifest b/media-radio/ax25-apps/Manifest
index c27bd90dcdc7..48f4339cee13 100644
--- a/media-radio/ax25-apps/Manifest
+++ b/media-radio/ax25-apps/Manifest
@@ -4,8 +4,6 @@ AUX ax25-apps-0.8.4-tinfo.patch 582 BLAKE2B 6f5431add14ef4c2ac789d6a3159ec30a4d0
 AUX ax25ipd.rc 379 BLAKE2B dfc102809a52feffee96d0a5f67874f9241b26a9ee18ccf88a5c04f154f0681f8b9da9190bbad81588de805e10bd49ec0fb0c534f5861405ab0ca59129852a33 SHA512 ce11d6f4bd4f66d79feafec81cde34a62278c9a980299da2feedba8137df8efc607298ff03324dc02ceaacebd2fef9e3a100533b887ba44dec191b759d8e1e67
 AUX ax25mond.rc 383 BLAKE2B 65f830cea757b7c649ab31480e7beaa0e8b40017c3fd59559969942c27c6459340dfa0223de829049bdc0cedd67a2441202ecca60c341162f5eaf621c6fef01e SHA512 c8d8dc7ada7fa427da85b794969e821c5e3cde66871427d36fa5cfc3a03c30735d869444594f3f17074529465325c7b48806a67257b9b3e0ef3fa6ca258e90c2
 AUX ax25rtd.rc 379 BLAKE2B 823318cdaf456d0536d843ddf0a25e2a614ddcc6dfe69f98b7c6c8dda555ef6b2977b873c9e35aaab10974f1ea3d91d8743798f228665908859dc33ff34f3708 SHA512 95df04124449a652bf76a60822c9468bce71d02490beadef409975da3709f7cf2a43ee9088468146d985464a6992125c90980e38efd397c145799cca537ff8dc
-DIST ax25-apps-0.0.8-rc4.tar.gz 442172 BLAKE2B 59a622c0e675cadc90a7d728b899b1820153d6b9e35f3ccdbac74d191f844d1642dd2e9192d6dce0f1208cbc26b98cb1643f8d1041ec3802b833ad5cbc903f81 SHA512 c99b553c5cadb0e389c1cb35e79fea61b628c76f5ef35c35876e492afc7ab796f8781c3ab5987a096f0816389e9772274fe54e88c16fca0fd30013da3d74d38b
 DIST ax25-apps-0.0.8-rc5.tar.gz 479590 BLAKE2B baa4814ebb68c435a9986158dcdad1333376c75202db8e3595ec35851fabb3c718e7015a721d587ee307b8b8c918a690b898addcf4194532f6d26b70219c4c98 SHA512 5886f79dcdd4b02374289e04a61101b1ccdcdd936a6a98bdefa7b091689381de75f722a0bf32a914c85a3759c7b42489fabf74a53492fe2f937b22c953fc230d
-EBUILD ax25-apps-0.0.8_rc4.ebuild 1121 BLAKE2B a8fc996669ddb0649340c40504fe0777621b0b555e553f0284fded4f85b9cd504b036a357a22e7a103e794eb1bfb8e7afd21cde3b6f5302ff32f979ae95f98b9 SHA512 92f3f3aba2a5307884c198d92d90e2bdacf57d8866815233859519b6b23cbb924a02b2289a28882016adfae306f76bd84dac60655614471ca89a03b2daeeed23
-EBUILD ax25-apps-0.0.8_rc5.ebuild 1174 BLAKE2B 7b57a64f8458b02dd846d23786b9ef28fcf0348e5a0565256549d2d5c4596b91e209d40debea4035f66209916b6579d00b9c2ff8ff2a407c417ea2157baea5b4 SHA512 1681b1265656bf0bb302966ff92e667ffaea4c4e4912759b277aef116142d0f1741288a0cfb7f7ee3fea3eefc652b25a74a6ab920d0c842911aaa3820dbf0ae7
+EBUILD ax25-apps-0.0.8_rc5.ebuild 1171 BLAKE2B fe9afd20e742e9f41a53bc9fae96671985c151e5388db22789351ad2c9a8a00a9e19f185c7f99937023f40f1933bf40913e2e1f6ba80227a90baed972feccb7d SHA512 dc1a2db2ce80d341bcfc61c7d884a45af802b56ff663cc563ba4ea3230898a0c7254b4a776f52df147916d7b274656bbdebe19d9c121c69748dec993a5f1f62f
 MISC metadata.xml 255 BLAKE2B 1be00b412c042706a649da1ef71b5e431369da25a82d18464ba48a54e0353ff297feb91071ac4d75007c756f8e65cb8c59da78efbdb725fb669644de5ba018e4 SHA512 35a18c5a178cc996bb71a27b11fb361198ae96d24ee3cbbc105a64824e1dcddd71d017270539daa3688ec2f04a8f564dd08ca491f62a3da4cca650c9bf35600d
diff --git a/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild b/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild
deleted file mode 100644
index f63f96a8ec95..000000000000
--- a/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Basic AX.25 (Amateur Radio) user tools, additional daemons"
-HOMEPAGE="http://www.linux-ax25.org"
-SRC_URI="http://www.linux-ax25.org/pub/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/libax25-0.0.12_rc2
-	sys-libs/ncurses:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	!media-sound/listen
-	!dev-ruby/listen"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "$FILESDIR"/$PN-0.8.4-tinfo.patch
-	epatch "$FILESDIR"/$PN-0.0.8-fno-common.patch
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/ax25ipd.rc ax25ipd
-	newinitd "${FILESDIR}"/ax25mond.rc ax25mond
-	newinitd "${FILESDIR}"/ax25rtd.rc ax25rtd
-
-	rm -rf "${ED}"/usr/share/doc/ax25-apps
-
-	dodoc AUTHORS ChangeLog NEWS README ax25ipd/README.ax25ipd \
-		ax25rtd/README.ax25rtd ax25ipd/HISTORY.ax25ipd ax25rtd/TODO.ax25rtd
-
-	dodir /var/lib/ax25/ax25rtd
-	touch "${ED}"/var/lib/ax25/ax25rtd/ax25_route
-	touch "${ED}"/var/lib/ax25/ax25rtd/ip_route
-}
diff --git a/media-radio/ax25-apps/ax25-apps-0.0.8_rc5.ebuild b/media-radio/ax25-apps/ax25-apps-0.0.8_rc5.ebuild
index 939745d86500..37448bf8141a 100644
--- a/media-radio/ax25-apps/ax25-apps-0.0.8_rc5.ebuild
+++ b/media-radio/ax25-apps/ax25-apps-0.0.8_rc5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.linux-ax25.org/pub/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/libax25-0.0.12_rc2
diff --git a/media-radio/ax25-tools/Manifest b/media-radio/ax25-tools/Manifest
index 3896dfb25b38..5728c13ad2d0 100644
--- a/media-radio/ax25-tools/Manifest
+++ b/media-radio/ax25-tools/Manifest
@@ -4,8 +4,6 @@ AUX netromd.rc 379 BLAKE2B 5ea6e91d4d5f3851ff759536e0f90a37258759afc915dab3f26bc
 AUX rip98d.rc 375 BLAKE2B ed2a72057b01d168219bbb94cfdf24dfbe5ab82ecc1c7945d7a4a42bff353f906bfc0cf858a0be3017686814c53fcc3343fb148f0b811419685f9c10810978df SHA512 cae7c5f2dd4753e5052b5d154f261e0ad09b58d32cac2d52ade8a56753c019dd3cdd1058f98faa4677c947c83306a256f2552a545580b811cd710bb9b3091405
 AUX rxecho.rc 375 BLAKE2B 0500e79dab2ed7fd2488a9a1a72344bc1ee1a8433c2703c4d63d0671e4cee11d9af5111ced837141c033db3406943eda2d128a718687d6389679d60f5649b326 SHA512 4787767fc0a2c7fda39b2817dc9809a72e666bbfe98b40d9e335fe00fa5a1136fb900b6d32f58b37edffb85327482a75063d3caef7c02c40aeb46f6158bb575a
 AUX ttylinkd.rc 383 BLAKE2B 9dd842128b64751696e704ad4a5e2930e103a8bb41931186bd60e26ed66697441abca16b52d61dfbfb2ece58c49e4328aa20b4c7dc810f26a03390b5313f5072 SHA512 499f9373ecdc76b863e43d3d508231754707087197ade8b9e9c151186e953c40e57528773ddc2e8d3f116daa16ba286bcab34b6e46a6870965780c459045a9ed
-DIST ax25-tools-0.0.10-rc4.tar.gz 364332 BLAKE2B 36ea9c72ff69a7a66927e78fb6733c64114a719d80cfb4732ccc0b54951b105a18e674e35d3c59806489f9679aabdf12ee629c41ae0f23ffdc5da26d1aed0d88 SHA512 874d1ad0097f589af0b0a72ac33d6c7d64586df25779ef1b4c0a832fdf5e528ae5101e56ded736cb2a1ad1b284d6c10fe3a77ecb43df04dccc3d80875f403612
 DIST ax25-tools-0.0.10-rc5.tar.gz 372851 BLAKE2B 1129e3aff22221662bfe3840288922e60236bbd09ec1f6be72ba4a9ef51a818923af55635bc50b5f6b7befd716732dad3536282b8875d7a996518dcd8c02342d SHA512 4aac4e53af5924f8f0b807bdc406fbba43043fcd33c509c1129f009e6cf8854abdd8f11087d17d9710fac2b231e80aca630ca17b8a2fe771f49df2c480c059cb
-EBUILD ax25-tools-0.0.10_rc4.ebuild 1097 BLAKE2B db0a0c43b1971a0c784506befbb084040fe4a62124315f6957a8956a418961e482ba9b2d85a35a4da5683f35ed4233dbfcdf00fcb8ffc36aa48700db4e279140 SHA512 de1fb085661b171e5be7c32f84d003e636bb9b8636d75562661306819ef5eefba9e42dffe0926167660742aad35f6137d718c7ed201288da13c1d2ab90686151
-EBUILD ax25-tools-0.0.10_rc5.ebuild 1022 BLAKE2B 8b7dc6cc81c5592e4f42e2a754935879434a5b53ac8106a386add1a0cbc091cf50e3ee73a86147c979302087414fd7f77ab8f220e441dc6d1214058cc4224cc4 SHA512 d5cd79657abc496164cc56e466b46fa0cca02f7622ba6bb79f03f4b8e8d9be16f262ddd40a0223ae8aaee5fe486e314013c955ee4372e26d4d60e41fea56ba9b
+EBUILD ax25-tools-0.0.10_rc5.ebuild 1019 BLAKE2B b469bd0cda14be830c10f1893d558b54bbfba185798d507c37e535dd9e236deacf24fa347ab9740fa02be9135793e4319d1799eafb594f7647f9e24c463fa93c SHA512 3fbe3c57b236b9a17607b9b0865b8d6e817b2db5b544ff65eb04a7b5ac80fa63e1eb300c6d92c09b9755c57d2e6acda5425c7a23a8ab5f719e405593797b2f69
 MISC metadata.xml 329 BLAKE2B 423d1e9a4f83fc56ce5b9e13e26abb294f527809056a2d5c3c32dcb2a4b1c737e25740d14684afe9b89721bbd9ed3341bbe72bdd2bacf1275f8b50f8b86bbd76 SHA512 70660dbd85b868803cd2c8b27de8a6b5d81544e3c4e16d9a6ebb00be1fe074729f357ba06f6be5fad386bfd35f714a99c28c1bfe092645c8e6b4dcb29574d090
diff --git a/media-radio/ax25-tools/ax25-tools-0.0.10_rc4.ebuild b/media-radio/ax25-tools/ax25-tools-0.0.10_rc4.ebuild
deleted file mode 100644
index ea8cbe259bf6..000000000000
--- a/media-radio/ax25-tools/ax25-tools-0.0.10_rc4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit eutils
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Basic AX.25 (Amateur Radio) administrative tools and daemons"
-HOMEPAGE="http://www.linux-ax25.org/"
-SRC_URI="http://www.linux-ax25.org/pub/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="X"
-
-S=${WORKDIR}/${MY_P}
-
-DEPEND="dev-libs/libax25
-	X? ( x11-libs/libX11
-		media-libs/mesa[X(+)] )"
-RDEPEND=${DEPEND}
-
-src_configure() {
-	econf $(use_with X x)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install installconf
-
-	# Package does not respect --docdir
-	rm -rf "${D}"/usr/share/doc/ax25-tools || die
-	dodoc AUTHORS ChangeLog NEWS README tcpip/ttylinkd.README \
-	user_call/README.user_call yamdrv/README.yamdrv dmascc/README.dmascc \
-	tcpip/ttylinkd.INSTALL
-
-	newinitd "${FILESDIR}"/ax25d.rc ax25d
-	newinitd "${FILESDIR}"/mheardd.rc mheardd
-	newinitd "${FILESDIR}"/netromd.rc netromd
-	newinitd "${FILESDIR}"/rip98d.rc rip98d
-	newinitd "${FILESDIR}"/rxecho.rc rxecho
-	newinitd "${FILESDIR}"/ttylinkd.rc ttylinkd
-}
diff --git a/media-radio/ax25-tools/ax25-tools-0.0.10_rc5.ebuild b/media-radio/ax25-tools/ax25-tools-0.0.10_rc5.ebuild
index a6d3cf76491a..eeac9ffacb63 100644
--- a/media-radio/ax25-tools/ax25-tools-0.0.10_rc5.ebuild
+++ b/media-radio/ax25-tools/ax25-tools-0.0.10_rc5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.linux-ax25.org/pub/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="X"
 
 DOCS=(  AUTHORS ChangeLog NEWS README tcpip/ttylinkd.README \
diff --git a/media-radio/qsstv/Manifest b/media-radio/qsstv/Manifest
index c6eeff665469..d7b65aec49c3 100644
--- a/media-radio/qsstv/Manifest
+++ b/media-radio/qsstv/Manifest
@@ -1,7 +1,3 @@
-DIST qsstv_9.2.6.tar.gz 11385735 BLAKE2B b7192255a3df32d5fbf07f54e1a8b7a7fd092fc4f7cca794df66d73687342e2169cdf8a2e08e7d665e6c27cefa3e9e4574c10c685cc9647caae1156d5c88522f SHA512 10ad86db8a4db432dc757314375487d4128a612a54496105c2acaadce4f2cba8d044f1c5bf1d38534664ef7c065742606027306b3542ae834673ffce58885557
-DIST qsstv_9.4.2.tar.gz 7409123 BLAKE2B d20c81f8a84ffc21d2afa2f481f2aa5313668beb922fe27e97b8b68f9420edad4544358b6166296183e2b8806f32bba54e25a035ec82481ed24a3dc1c343694e SHA512 e7e5fe925dd925fef4e2fcff15b33634aa0ea1f50ca01db2c2dcdd428b4c4c1f45cf5aaa9ad2c3b9374c588bb6f65bf99924537012ecf2065a03b3f4d1c46db9
 DIST qsstv_9.4.4.tar.gz 7716392 BLAKE2B df285cc26c195dce05e54401de4fce70ea91c3af1f774d90d81b62a366c66c3cde4f0cce5c370bad45b81230ca7c2be624542cde10b94d388785d13b49ed646d SHA512 d206c6c108827b607dfe360e7afe31065518f03ab04609ccca9a9bda16207d12966eb49d486d13eebb814716252c50aa5963d090f1e505e508ccb1b6ccc4728c
-EBUILD qsstv-9.2.6.ebuild 1011 BLAKE2B d24f2e9717a4532f25e7f0428948186cf8f94a1a85c668f944a7450118a35c22a4ce72927b16fd7d94588ddc324ec904b199cd7a87eafd6feb4b588adbc66271 SHA512 26a7cda1fca6b68af89406b4764cc6df62e39d0465f30fc8d95268c63a89dfd700f71be28c2ec30d8e8f6e6041c8440cc6f202ff334e1169503d8a5947872b1a
-EBUILD qsstv-9.4.2.ebuild 1022 BLAKE2B 44dccc88a935574850e264d856b3afacdfe0c8f65e6384b71fa2003691ae52d82a47091ea8fc2def42e10fd2404f9ebc947de07b9c8c93a9e80da50dc7ca87f4 SHA512 4e4016ce9adddef9ff6c34f1ca9dc5a875165800ff1d7ad503023289e79ca0a10929faa895afd80b3bea15e516907a2232b3f65df26c93f55121831138e6c913
 EBUILD qsstv-9.4.4.ebuild 1022 BLAKE2B 44dccc88a935574850e264d856b3afacdfe0c8f65e6384b71fa2003691ae52d82a47091ea8fc2def42e10fd2404f9ebc947de07b9c8c93a9e80da50dc7ca87f4 SHA512 4e4016ce9adddef9ff6c34f1ca9dc5a875165800ff1d7ad503023289e79ca0a10929faa895afd80b3bea15e516907a2232b3f65df26c93f55121831138e6c913
 MISC metadata.xml 410 BLAKE2B ce47d5a977b2b6b76940c5b2c74434ea382d4188f319234935a12fa4927f4b493ea664ec6fca2302aea1a31b8234d20819b585f5e56384085541445f4e8bab2d SHA512 2c6aca4abe5c944966fd5c63f9534024453cd67560f406971d6281604bfed5800f384cee8d1aadb0b85bf636530a2b7eb5c2ba002a499eb41f2670d38a89b69c
diff --git a/media-radio/qsstv/qsstv-9.2.6.ebuild b/media-radio/qsstv/qsstv-9.2.6.ebuild
deleted file mode 100644
index 5d4268989ecd..000000000000
--- a/media-radio/qsstv/qsstv-9.2.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-MY_P=${P/-/_}
-
-DESCRIPTION="Amateur radio SSTV software"
-HOMEPAGE="http://users.telenet.be/on4qz/"
-SRC_URI="http://users.telenet.be/on4qz/qsstv/downloads/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/hamlib
-	media-libs/openjpeg:2
-	media-libs/alsa-lib
-	media-sound/pulseaudio
-	media-libs/libv4l
-	sci-libs/fftw:3.0="
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	x11-misc/xdg-utils"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	eapply_user
-	# fix docdirectory, install path and hamlib search path
-	sed -i -e "s:/doc/\$\$TARGET:/doc/${PF}:" \
-		-e "s:-lhamlib:-L/usr/$(get_libdir)/hamlib -lhamlib:g" \
-		qsstv/qsstv.pro || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	dodoc README.txt
-}
diff --git a/media-radio/qsstv/qsstv-9.4.2.ebuild b/media-radio/qsstv/qsstv-9.4.2.ebuild
deleted file mode 100644
index 6963627f6646..000000000000
--- a/media-radio/qsstv/qsstv-9.4.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-MY_P=${P/-/_}
-
-DESCRIPTION="Amateur radio SSTV software"
-HOMEPAGE="http://users.telenet.be/on4qz/"
-SRC_URI="http://users.telenet.be/on4qz/qsstv/downloads/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/hamlib
-	media-libs/openjpeg:2
-	media-libs/alsa-lib
-	media-sound/pulseaudio
-	media-libs/libv4l
-	sci-libs/fftw:3.0="
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	x11-misc/xdg-utils"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	eapply_user
-	# fix docdirectory, install path and hamlib search path
-	sed -i -e "s:/doc/\$\$TARGET:/doc/${PF}:" \
-		-e "s:-lhamlib:-L/usr/$(get_libdir)/hamlib -lhamlib:g" \
-		qsstv/qsstv.pro || die
-}
-
-src_configure() {
-	eqmake5 PREFIX="/usr"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	dodoc README.txt
-}
diff --git a/media-radio/tucnak/Manifest b/media-radio/tucnak/Manifest
index 70e897e7b48c..ae96b26df143 100644
--- a/media-radio/tucnak/Manifest
+++ b/media-radio/tucnak/Manifest
@@ -1,9 +1,5 @@
-DIST tucnak-4.18.tar.gz 3527134 BLAKE2B 2e059875fb22a9027dde486d82eaa2bfd1d339440b59ffbde3b3923365096e4e7a77edc0690d79d66d1b9b218b2a7698b7783f1f07c0a8f94bc002ee5acc8528 SHA512 9c986bd4e9221a2956722423d8c31e3e420d5f50f2c68577a73d62f5e0913e79526dfbbee29e9f98f25445e35587a95aa709d538e4ba5e17d739a1220e41f0de
-DIST tucnak-4.19.tar.gz 3542661 BLAKE2B 0ce6b387f47bae01b21a9c63a8530f8eb0e82c9ba5c7c983190c43e11cbc18b477c30db4f5f3fe743d7a99de9fd1787e64f018180338856e9f8306a3f5849a5a SHA512 4217a073f3b085fd11e92d3eb38386563f7cef022c0e30bc959fd6d6ca6b2efaacfcaa9dc5f48208114490a414e4cfc89bb500560d7f3add28f9534eb205a8f8
 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.18.ebuild 1966 BLAKE2B b918e611e92f3d68bae29f3f5a8ff297e98f6db7a2908bd2de4078d960220a82bed0e60d5e5677418bcb6b5f6375b760710cfe057c7d475185bfa2b728abe50e SHA512 2d3cebfb599a2f255d2ed81c3c955d728b6e4806074772898a3adb90a8cf814a420c2976040dbb6b0b9dcbe82bbe74ace3c5151d90f3b0cefa7db7a7134bfdff
-EBUILD tucnak-4.19.ebuild 1968 BLAKE2B a5eab8af37cdd38ea0b0f9b0c4da56a7a137c64e1448d986a5a5078d13674bee0eeb48064d3d415f708a9edb3ae8a97f8a946de4d829d4a6931294c43b806af8 SHA512 8143e9ab2b5abaaa2d31b215fbd9b26bf2d28f848ef707caea24378d08d0799b4cf477bb9a5d15b06e0617bb7a21c5a3d5ba35bde1e58735102d517781a06896
 EBUILD tucnak-4.20.ebuild 1966 BLAKE2B b1572e6f1747fb61b72ddb6902f9a8bb35d348ca3270c9778184de1a39f9f10c1406c02843f5da5a53428fb2aa0e42bf7305fa3062df6e159e8a28fa71e6599b SHA512 c42d8fc7d31bfaf3cc14d1e3ec68e74580fa56b1d26006882c10d4c457ab4f12519954899eccb47cc9d42734dec50f5f5ceb3bcc0db94e36d37276a2be505147
 EBUILD tucnak-4.21.ebuild 1968 BLAKE2B a5eab8af37cdd38ea0b0f9b0c4da56a7a137c64e1448d986a5a5078d13674bee0eeb48064d3d415f708a9edb3ae8a97f8a946de4d829d4a6931294c43b806af8 SHA512 8143e9ab2b5abaaa2d31b215fbd9b26bf2d28f848ef707caea24378d08d0799b4cf477bb9a5d15b06e0617bb7a21c5a3d5ba35bde1e58735102d517781a06896
 MISC metadata.xml 408 BLAKE2B 80978177d2257cefae04860fc52e43ea7f0d2221bf4a5b3050fe8057acda81625117b1ba74e7357d40d00cc7fbd44f2dac713494cd8d20679c690cf851e1b678 SHA512 ad015a404c42d5cd0f160907400f545698045bb6c7c3da59816830ec6ed51938a02988c59d4a9ade472a78fd39feeb49ebe6c2a9c625e535a37e44bf19db1b17
diff --git a/media-radio/tucnak/tucnak-4.18.ebuild b/media-radio/tucnak/tucnak-4.18.ebuild
deleted file mode 100644
index b78b8fb5f572..000000000000
--- a/media-radio/tucnak/tucnak-4.18.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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.19.ebuild b/media-radio/tucnak/tucnak-4.19.ebuild
deleted file mode 100644
index b4c1192a2e40..000000000000
--- a/media-radio/tucnak/tucnak-4.19.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/unixcw/Manifest b/media-radio/unixcw/Manifest
index b147ece4a228..51839e2a1f81 100644
--- a/media-radio/unixcw/Manifest
+++ b/media-radio/unixcw/Manifest
@@ -1,5 +1,6 @@
 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
 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
new file mode 100644
index 000000000000..a905c627ddf7
--- /dev/null
+++ b/media-radio/unixcw/unixcw-3.5.1-r1.ebuild
@@ -0,0 +1,75 @@
+# 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="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"
+
+src_prepare() {
+	append-cflags -std=gnu11
+	append-cxxflags -std=gnu++11
+	eapply -p0 "${FILESDIR}"/$PN-3.5-tinfo.patch \
+		"${FILESDIR}"/$PN-tests.patch
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf --libdir=/usr/$(get_libdir) \
+		$(use_enable pulseaudio ) \
+		$(use_enable alsa ) \
+		$(use_enable ncurses cwcp ) \
+		$(use_enable qt5 xcwcp ) \
+		--disable-static
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -type f -delete || die
+	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 78e41287af12..40c22d6b687d 100644
--- a/media-radio/wsjtx/Manifest
+++ b/media-radio/wsjtx/Manifest
@@ -5,5 +5,5 @@ AUX wsjtx-fix-unicode.patch 565 BLAKE2B 02d26dc1b1b51e9ac38feb866ecbf38e58b861c7
 DIST wsjtx-2.1.0.tgz 44904654 BLAKE2B 4d36a9099356225ff2cf12108c0f42da67396a2602c1dbcabcbb001684212fbc81a7f4be23b8d35e32903119cdf04a41fe199429dd8693452b17084481691d74 SHA512 3a76b879586d285d570d05ae5ecca4a27b2da2153d4845c5b3b0a047721ef153af8745764403cb85555097c6778032f559e5848bad7e1cc7d469a874858ad40e
 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 1472 BLAKE2B 701daa49573d3879a003f3aaf2ac3989a5cb2a986e9b593a2c7dd40ba398f35daa0c0bfec78da5063a0ff5c569e34e561352dab5fcd0790765ea59c5290e3e7f SHA512 856f022fc79f55c12efcd9bca26ea74233b63b346503f4f4d784bb0ca2f2bba10d7e4a22dcd7ba08456dbf4461236765ece845288b4e74cd0f4132d73f662fb0
+EBUILD wsjtx-2.1.2.ebuild 1471 BLAKE2B 43fe9f0737d8cd450e805dc14dcdc661fb8f23042fcadb44eb575f979ff9a977bfdc1f4e1f717c9b61ea6c8a6e691c83f60ff3ae3c82158252d503a2608cfb54 SHA512 32fc6e795a423076401dbb84f5fbf1013b62a082c187d57b1f5792a9cd6d6ede50f6bd4f7ac2dd029e10aeb7cc405925220d53e120925274359c7b0cda6df275
 MISC metadata.xml 411 BLAKE2B b18268ad951aaeb11cb490e4b02fa063915d2862f81e1a9f4ef69bf391c0628e75258d4bc66ce942a51d88369033b4e9dc8f5b8fff1c26bd33a4560ca493d70e SHA512 1b11819a29e25cf3ce3932bfb200ce65fd69c0872149acb54d3c67fb35d9977feee5d87e7412d75751cbc6a9b76010a2bcbc8b3a47a50d11a0c011abc5a83efc
diff --git a/media-radio/wsjtx/wsjtx-2.1.2.ebuild b/media-radio/wsjtx/wsjtx-2.1.2.ebuild
index b1d82d5b375b..c5c72c6d3455 100644
--- a/media-radio/wsjtx/wsjtx-2.1.2.ebuild
+++ b/media-radio/wsjtx/wsjtx-2.1.2.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/xastir/Manifest b/media-radio/xastir/Manifest
index 6e74f5366294..d65c0107bf5a 100644
--- a/media-radio/xastir/Manifest
+++ b/media-radio/xastir/Manifest
@@ -2,5 +2,7 @@ AUX xastir-2.0.0-dont-filter-flags.diff 621 BLAKE2B 7bb56ddfd744123b705e7f00866f
 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
 MISC metadata.xml 469 BLAKE2B 2e70497e0928a6ca00c783a8dd257ac66333cd2d9e34e271ca222b0df4dd5ea55b124d2728398d0a8b013355d63bf30907b29b121578921d09f7aee8667f480b SHA512 9ad337ee6c62205e9f7d3350763123bc25ff2e75bd3af6ac4438cc0b164439aa406339b9c2f7a3d6eef439965c888513c5089108944a281a781f27b1fb735758
diff --git a/media-radio/xastir/xastir-2.1.6.ebuild b/media-radio/xastir/xastir-2.1.6.ebuild
new file mode 100644
index 000000000000..344c4d649b7b
--- /dev/null
+++ b/media-radio/xastir/xastir-2.1.6.ebuild
@@ -0,0 +1,80 @@
+# 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
+
+	eautoreconf
+}
+
+src_configure() {
+	# provide include path to GraphicsMagic for configure stage
+	use graphicsmagick && append-cflags -I/usr/include/GraphicsMagick
+	econf \
+		--with-shapelib \
+		--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."
+}