gentoo resync : 20.10.2021

16 files changed, 263 insertions, 13 deletions

diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index 95385ce35cb7..63aa17459c1f 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/flrig/Manifest b/media-radio/flrig/Manifest
index ff34a9033c89..9444680c7f22 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -1,3 +1,3 @@
 DIST flrig-1.4.2.tar.gz 918730 BLAKE2B 85c2ac351e833b19dab0e36899df58665c86ac397035e8eabad29bb38018a0d2c822ca73b721f2db938a1f7cf2cd2b3a6878f605d5d65f01608563f3f4a0d89e SHA512 094f50a427cabc5c596a4315e7182ea4040218467f06fac456a0fe8923726f30cf3220379033024449066b4379a3877d48449971afe3f4b46b4307f9a64c3ff8
-EBUILD flrig-1.4.2.ebuild 494 BLAKE2B 36486ca125bd2701b4679178896a1b9455a1e8486e13a331df9118fc96c8e3655c92651f3e766b625919a5c0edb7a33183a54abd1ed26375930d25470dd9dff0 SHA512 aa6b14cb3c8fedfb8472fc5cee20d5e5cac1d81abb0dc740ab25e16d73ddd23c75e7d551434404a68635ec9d780807fc251765d4681c1f2507615916756c9277
+EBUILD flrig-1.4.2.ebuild 476 BLAKE2B 8665ccf1ef91f3f25912d4af906aeb74a579a5c865ce52f392f34f9ecaf14309a2d936ab6f3916b02e50fa8ea5d92d1171c9de3ef0cb7fb80491d02eec96cd99 SHA512 aec358712976dcaceada364545bcd9306cc5b3441db9100a71dae0d8d5f3a09e1e69b855a79524722840b3090c40c6fc000aa03fc0ba399a8cbc84dfebb0bc32
 MISC metadata.xml 326 BLAKE2B fb57e943fa61222b3967939ff95da7bb17aae2651e55d960a9c405e6d5965843ed0ec9e6fadd0df1f41602c0f3c90c78c6ca2ab12ea72b515484f7c2ec34ec68 SHA512 e48dc185e9eaa074ed92d1ed27920e41b72760cd3e878fd40583efdca0a6997598a7d82221a33c7987fb19dea090f92eee070b9e89ea452ddce028d88db7bf9c
diff --git a/media-radio/flrig/flrig-1.4.2.ebuild b/media-radio/flrig/flrig-1.4.2.ebuild
index 070168983962..bee49b2172f4 100644
--- a/media-radio/flrig/flrig-1.4.2.ebuild
+++ b/media-radio/flrig/flrig-1.4.2.ebuild
@@ -2,7 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-inherit autotools
 
 DESCRIPTION="Transceiver control program for Amateur Radio use"
 HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html"
diff --git a/media-radio/tucnak/Manifest b/media-radio/tucnak/Manifest
index 749a6ca18f61..332d79eb221d 100644
--- a/media-radio/tucnak/Manifest
+++ b/media-radio/tucnak/Manifest
@@ -1,3 +1,5 @@
 DIST tucnak-4.30.tar.gz 3594691 BLAKE2B 41ea3469ebd7ab4a50805c2806289c78ec4fe2ab28b3fea0301e486c9b9232a86b3c93ed26dc1ffc3dc531b69acb847f5cfe66b48ea2579d702d0a5427387d79 SHA512 dd840295c69c2a42ab2ac803444684e06bbf4f47623f9200832f2600bf4540817e2e375ffd1e1dcb6bb57743991396eea7f99a79182397d22dcb78adcf98f500
-EBUILD tucnak-4.30.ebuild 1968 BLAKE2B 33060a1288edd2bc2f564f58bd541419a43404b0206fb8d62738002f49d01e6a206ab17f986c90326b194876bab55e8e4b477afe48f4c5046e19c3451b846a88 SHA512 8912dc644b499c39dc65c8fa502793f40b498a23a9bade6d0399e2a961304ced5e51342bc0581d13ac123cf247747d083757508bfb5f1501d98a9f1127bb76ef
+DIST tucnak-4.32.tar.gz 3595195 BLAKE2B 6fd837efd0f649eec8c78f232b00e51d7f08a52e7651f6bbea3a16d3e1fcc21a7ad8a7a69e1507ce9a95b4c2da3a3605708849e0fc856511da9d297689d2163f SHA512 a414007e5090fcfb2f538dce2b8a33b5f9d8491cdbdb21a2067f976b9db8778de1b6cefff1e42fe161e8c0965e069102653ac9bb64ac8a1fbd0539d6a14f5b8f
+EBUILD tucnak-4.30.ebuild 1959 BLAKE2B 94972eddb358f2910ea869829343cd73f1b665fac521f8079a0d8a2bc7bca833519fdb4d6f931748727d65f89ff3d4c3b705963cf173d3cbe180c0f56ae05aeb SHA512 2079ead9bad0d6510c610adb9dfa35a4512ba7bbe5c7601fa03de99ad48de385f91bb160bb2a43e7ef940c00ebfe27a755d5e307dfe7e824632ddbfdd48ea60f
+EBUILD tucnak-4.32.ebuild 1961 BLAKE2B 03bb6db83fe82d2f7a455ba581ea22f29b2e82c90599879a951a0ea11efb7b7f7d9d995e325edaf73aaf9e2f53bbe3f538a874e73807608820b728bc7ab744bf SHA512 b1f2a920e2d077225be1e4033c01e62ed86a0c5f97864412c2512546054d1d3d31016628648991d00def38991f9fc97664956a379042d4217c3278b1df2010ba
 MISC metadata.xml 409 BLAKE2B 8179722b95bb5d639bbf3755eac5ec6d3a2492d117a9af0edd5aba1910974f7ca99c35bf759f9c44a6ee59d18a4b7088c1f009abf0dbdfbafd04f6c3a6875b3a SHA512 e07f3bbf055dfafb6d6fb2596fe20bdb0aaccb8960fc5d1ad5ea372a51baafb75458571729f99afc1086fcc596aa35cd22aafbc9af4d422dba2aba1243c93422
diff --git a/media-radio/tucnak/tucnak-4.30.ebuild b/media-radio/tucnak/tucnak-4.30.ebuild
index 9d0aeaa30bb1..4365636151e0 100644
--- a/media-radio/tucnak/tucnak-4.30.ebuild
+++ b/media-radio/tucnak/tucnak-4.30.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools flag-o-matic multilib
+inherit autotools flag-o-matic
 
 DESCRIPTION="Amateur Radio VHF Contest Logbook"
 HOMEPAGE="http://tucnak.nagano.cz"
diff --git a/media-radio/tucnak/tucnak-4.32.ebuild b/media-radio/tucnak/tucnak-4.32.ebuild
new file mode 100644
index 000000000000..ae02ee026cda
--- /dev/null
+++ b/media-radio/tucnak/tucnak-4.32.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit autotools flag-o-matic
+
+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 df1fdc750c74..13c21c5f177d 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-r1.ebuild 1980 BLAKE2B d7c577e1295ce61faa5d2099281aca2354279aa170722e1c900bf9b5ac12865e0300f4e567bebcac90c9e9ccb4f663769f495fc9ef0176b4c8c859303da2a4c4 SHA512 da0a2afc4bd2d9ffee89e645097cdf171ec7f1ef2d0ee8fc9aaad31e1a972cc1b513b1c25a533156ea95184d664c63c62cbf693c91dc7e91a3d8f5f330b3de59
+EBUILD unixcw-3.5.1-r1.ebuild 1971 BLAKE2B bfd6b8e0086a2cf2f8658aa38764c90db77cb814177be08b3d8b250d2699e9cc706858852701f729396daa0c3cf421994dd41956ce9151999a0cb4a7062571f5 SHA512 5c486e4cbd7f52d2318c1ee79634db552e582a641092881f6a21f2817491a7b51bd0cda85c49cd1cb870c07e0f1ede73c428119ea6f91f09bbf9c261d83a0cbf
 MISC metadata.xml 875 BLAKE2B 582b1ba40e9424d308e33d5f2bf430e270a2d4d106aeffec3d03e1736360758776f5aa8a8d0078aa03c0e4ca8ea206b9805be2223db69282bca0cb752c531314 SHA512 07b92861370f28e4723e48d75dac80e3517c7a944f7a4ac07e6afc75f80871b6ca6a4904d042bd79bce1dfcd81b74d3b85a25b0eab3f8c83dac7742f6fb10219
diff --git a/media-radio/unixcw/unixcw-3.5.1-r1.ebuild b/media-radio/unixcw/unixcw-3.5.1-r1.ebuild
index 56f654e4a8fb..09e46e9788f0 100644
--- a/media-radio/unixcw/unixcw-3.5.1-r1.ebuild
+++ b/media-radio/unixcw/unixcw-3.5.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic multilib
+inherit autotools flag-o-matic
 
 DESCRIPTION="A package of programs that fit together to form a morse code tutor program"
 HOMEPAGE="http://unixcw.sourceforge.net"
diff --git a/media-radio/wsjtx/Manifest b/media-radio/wsjtx/Manifest
index 066fe7d91989..75b194c46e19 100644
--- a/media-radio/wsjtx/Manifest
+++ b/media-radio/wsjtx/Manifest
@@ -5,6 +5,8 @@ AUX wsjtx-2.3.0-drop-docs.patch 676 BLAKE2B b5d6edb900dd9f26026ba3752ad14bd4b944
 AUX wsjtx-clang.patch 619 BLAKE2B 8019381b563bfede3977e37c96c0c664089458f0be7704a5267eece14a48b8cbd4a6348803d4a4e4ef0023006363e26f89f03788ac20f01d227126952f8d2375 SHA512 cf40f9ad542ca07f70ae507a74625663541c05968e1cac78eff7ec1fc0668b683b62ed35effc03b7028a317694e1056b70b862169900f3dc9655ae1ba057210d
 DIST wsjtx-2.3.1.tgz 18040272 BLAKE2B 37b90842470d5565d49d5ed7b9d92207904216d29b8a9966dc38142303d48e92eb640901e4f0a80350f915963f725e36daa7c6fe8034743d30a253eeb02f9e1d SHA512 0a709ca605fb8d93f7583393ec4bdf6416b93233e2910e7e59942f4e40bdb9f2591e3e4b8e0822f49e104e74198a861ed2995cbb4976c7597ef1a1bd6fc43b44
 DIST wsjtx-2.4.0.tgz 18239827 BLAKE2B c58081fe4fe8afe08a137727ea492e61060f8bd4e5674a3c8daba35e4f89bc925d9e6d4ecbd8e1ed003ab4ad9bca71df24d6012456d5a64eb899fb79ba0be40e SHA512 c40e145ccab9e7339046994a08394f5a41604762e7998431648beb4b7c3067a87e32e346e3fb74615f7be64c71151c80286ffb217589f1f7e276dcc4761a9406
+DIST wsjtx-2.5.0.tgz 25180010 BLAKE2B 09a50f8bbaca4fa6883ad335a6eb3e0d60d3e20382140ab69e3165ba4a38c9e96b059831db9a28452b15f5a0b98118e1269f3484ac8f375525135236b9d7ce02 SHA512 d5f801c9ec038a84d5b12a3843de9af7bbd6d628bd5eb8d3dd1e1621f04b319f9cc2ed01c882bf09ad3801800ee1b1fbeb49c8a9f991a2c03f3170ac192a6017
 EBUILD wsjtx-2.3.1.ebuild 1687 BLAKE2B 9332b16222b137b0226429aaa4940fe8c968e2f4d23d7a3221d74fe1cef0e543f8a33e75cad5e497af79fed0b97a0ef30ac444f92506c956572bb2b92ca4dc0e SHA512 1a8258078a1a8cc10e011e27d31de464320a5acb41368c7ed874cd0ce7dd4b1d960ae78a9c0e719b6e90c696d8cd1c27c8597cc51a9a36e53c339ed3415cac27
 EBUILD wsjtx-2.4.0.ebuild 1687 BLAKE2B 9332b16222b137b0226429aaa4940fe8c968e2f4d23d7a3221d74fe1cef0e543f8a33e75cad5e497af79fed0b97a0ef30ac444f92506c956572bb2b92ca4dc0e SHA512 1a8258078a1a8cc10e011e27d31de464320a5acb41368c7ed874cd0ce7dd4b1d960ae78a9c0e719b6e90c696d8cd1c27c8597cc51a9a36e53c339ed3415cac27
+EBUILD wsjtx-2.5.0.ebuild 1689 BLAKE2B dd6a09e69b77941ace5d69e756359d3f321d982831160b05eaba1a7ed4befba470d18c684a0776a2efa78b6f64c2c1a5eeec527118cbf180b582643c7f2c9463 SHA512 d407ea31a2c61f46f98f21b2736b76e25e212a87a047f6c506ce336ed561ee7aa554d0bb1b4b7b632902ddbcb6968ea2af7943a174cf62e774c1665cc6e7b3f1
 MISC metadata.xml 412 BLAKE2B a8910c8ec81f720c209c3d9cb6cdfbde76be4c5a96941dfc3b799e9ba6b4d967928508c04bc5805536319a20f0b7cb292a2475f91de27471c11b9fd0f9073bec SHA512 2215cd7cea5ed62ef70bb2823ce85628877e3c204f7a55e582431c2d90ec8f77e6523b3e81c1747b339d58eeaf7c026ea26b6245af86294904e1c34887da943f
diff --git a/media-radio/wsjtx/wsjtx-2.5.0.ebuild b/media-radio/wsjtx/wsjtx-2.5.0.ebuild
new file mode 100644
index 000000000000..aef0bd374750
--- /dev/null
+++ b/media-radio/wsjtx/wsjtx-2.5.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake flag-o-matic
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Weak signal ham radio communication"
+HOMEPAGE="http://physics.princeton.edu/pulsar/K1JT/wsjtx.html"
+SRC_URI="mirror://sourceforge/wsjt/${MY_P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	dev-libs/boost:=[nls,python]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtserialport:5
+	dev-qt/qtsql:5
+	dev-qt/qttest:5
+	dev-qt/qtprintsupport:5
+	virtual/libusb:1
+	>=media-libs/hamlib-4.0:=
+	media-libs/portaudio
+	sci-libs/fftw:3.0[threads,fortran]
+	virtual/fortran
+	app-text/asciidoc
+	doc? ( dev-ruby/asciidoctor )"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools
+	"
+
+S=${WORKDIR}/wsjtx
+
+PATCHES=( "${FILESDIR}/${PN}-2.0.1-hamlib.patch"
+		  "${FILESDIR}/${PN}-2.3.0-drop-docs.patch"
+		  "${FILESDIR}/${PN}-2.1.2-qt_helpers.patch"
+		  "${FILESDIR}/${PN}-2.2.0-werror.patch"
+		  "${FILESDIR}/${PN}-clang.patch" )
+
+DOCS=( AUTHORS BUGS NEWS README THANKS )
+
+src_unpack() {
+	unpack ${A}
+	unpack "${WORKDIR}/${MY_P}/src/wsjtx.tgz"
+}
+
+src_prepare() {
+	sed -i -e "s/COMMAND \${GZIP_EXECUTABLE}/#  COMMAND/" \
+								manpages/CMakeLists.txt || die
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWSJT_GENERATE_DOCS="$(usex doc)"
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+	)
+	append-ldflags -no-pie
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+	rm "${D}"/usr/bin/rigctl{,d}-wsjtx || die
+	rm "${D}"/usr/share/man/man1/rigctl{,d,com}-wsjtx.1 || die
+}
diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest
index 3c4b9e4c20bd..c841f8e0d930 100644
--- a/media-radio/xastir/Manifest
+++ b/media-radio/xastir/Manifest
@@ -1,5 +1,6 @@
 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.6-automake-1.16.5.patch 426 BLAKE2B bded6c304ce675046d833fe1b52d474ef47ec1c237eaa8b23976cba80e2d773cea94ff3f0e28b7c4ea33a75092710be312c37940684223cc2959b07a1224bb7e SHA512 c5ea9a433473a2f0766911ad9acb38f21bd168fe46af166cef2c338cc5277e24bb972f8edb90b1664ecbb4eb991e34290d8661163579c2c91e9491b41f62705f
 DIST xastir-2.1.6.tar.gz 2687180 BLAKE2B 053ee4e8d1fd589bf0767c6ffdaa7de2ef14d292d5773b2f08239fc4b73d3695e5c061dccab75caae068bc8887f7924d3793f0dfb8368b2cd25526211e240914 SHA512 91f40f3788f51589619833102d1db997ff725f84e6fa5f9b7dd8942094a1b7a94433779243be1c14b980d96613972482a397cec8e15b8ea4784fdd106c32ae08
-EBUILD xastir-2.1.6.ebuild 1925 BLAKE2B eb058e099fb416870dc9269b59fa853f7c54e65cc890b341ed3df3e143ad06e1f05b63e7ec0d0b7d8d9a3e5a65450b642f771b2612dcb0bc2b709f38d00c33ee SHA512 490fbceccc239a2174f83bd7a0d4fd7a777a9cd7f63ea8918ac2cc87801cce42d3ba9ac3f15d8bde27b041b96765ef617e6e43b9e0fc13856ef57e42689b90c0
-MISC metadata.xml 470 BLAKE2B 7c08b1868815e6c07c0f62906cbaeea5927f97b59a26b6acc7527ffd68e2ee7f4f5c225fe8c8722cf0975f0ff0277319f405294b181a96cbb04bb50d190bd78a SHA512 f1e8b59093f5239fa014a028fe64b03418d161282f07b70ff8078174c481640f9956a1a4d567205860e101b807e0f8491efc0d2b18c012df0bdaba7a5f849027
+EBUILD xastir-2.1.6.ebuild 2053 BLAKE2B 9aee91db280c9719be855d381f31c2acf43b0b6dda48f830b5d9c0125b093f1264597462fd3bad24b79a49eea57cf45f66b658aeb9e943550c127c942a59b253 SHA512 bd9b236d04fc845b0a7c235089e55ee52ef17e0ea0643979bc26b44b1e9a5cbdfdee054fcc13d807338f62b54e2d4f32b777574d8970a1f270e71563ed3285bb
+MISC metadata.xml 394 BLAKE2B f1277742dc42b3ec0fd74c6ad56fccac145b0a6635232a0e64823cfcc002f79a912f5298a929a9dc3555d94f8771c8a405147f25d4383de8ef8786b65d349c94 SHA512 71caf8df00b9bd50a6c84799002e904f08461c9d3aefdb105fb12bf09f07c1c6090e0c83fc6f822178603d610f868d053afe84f0c7bc30558e5032fb480388b6
diff --git a/media-radio/xastir/files/xastir-2.1.6-automake-1.16.5.patch b/media-radio/xastir/files/xastir-2.1.6-automake-1.16.5.patch
new file mode 100644
index 000000000000..51d10a2c8159
--- /dev/null
+++ b/media-radio/xastir/files/xastir-2.1.6-automake-1.16.5.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/816615
+https://github.com/Xastir/Xastir/pull/181
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -23,7 +23,6 @@
+ # It should look something like this:  ([xastir], [2.0.8], [xastir@xastir.org])
+ # The revision number must contain at least one '.' and two digits.
+ AC_INIT([xastir], [2.1.6], [xastir@xastir.org])
+-AM_INIT_AUTOMAKE
+ #########################################################################
+ 
+ 
diff --git a/media-radio/xastir/metadata.xml b/media-radio/xastir/metadata.xml
index c4a39d650212..b96de3345070 100644
--- a/media-radio/xastir/metadata.xml
+++ b/media-radio/xastir/metadata.xml
@@ -9,7 +9,4 @@
 		<flag name="geotiff">Install geotiff support. Allows using USGS DRG topo
 			maps or other types of geotiff mapes/images</flag>
 	</use>
-	<upstream>
-		<remote-id type="sourceforge">xastir</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/media-radio/xastir/xastir-2.1.6.ebuild b/media-radio/xastir/xastir-2.1.6.ebuild
index 1da0b5592d83..fcd3f2a7f254 100644
--- a/media-radio/xastir/xastir-2.1.6.ebuild
+++ b/media-radio/xastir/xastir-2.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,9 +40,12 @@ src_prepare() {
 	# fix script location (bug #407185)
 	eapply  "${FILESDIR}"/${PN}-2.1.2-scripts.diff
 
-	# do not filter duplicate flags (see bug 411095)
+	# do not filter duplicate flags (see bug #411095)
 	eapply -p0 "${FILESDIR}"/${PN}-2.0.0-dont-filter-flags.diff
 
+	# fix eautoreconf with >=sys-devel/automake-1.16.5 (see bug #816615)
+	eapply "${FILESDIR}"/${PN}-2.1.6-automake-1.16.5.patch
+
 	eautoreconf
 }
 
diff --git a/media-radio/xlog/Manifest b/media-radio/xlog/Manifest
index 69f71a11f5a3..c321386962d5 100644
--- a/media-radio/xlog/Manifest
+++ b/media-radio/xlog/Manifest
@@ -1,6 +1,8 @@
 AUX xlog-2.0.7-desktop.patch 435 BLAKE2B 56fee116a69c99f5192f1a2e4804821d715dd15f927525694100471b296412675eb97237c7e239cc407a2ffb145dbf779e802c1a1f5914a064d70f73ad269d12 SHA512 5119356e9635ca7b6d028d4bb3be12542636ce5d2967540b20ad9c22d62792b81a1a06fcd8722c7cbe8df706d8113e60b308d1db7c6fa8f3238bea039eb4b4f6
 DIST xlog-2.0.22.tar.gz 11407849 BLAKE2B 85d2e904d33ef39883cb8ac086eed4dc7e65503cdccb95e8d33f169d12de4f1ed556a28ac2f40e0044e937185bf4d93fe55608088d6e95744617c9c3a051fb55 SHA512 a261f8e28b75aed9380c29b3da69c7615b0d32346eaf84a0ace5cf77c53407372c4985c599078dba5ed92f77bd8052a74c7dca40028b99bca49cc3164d4ec490
 DIST xlog-2.0.23.tar.gz 11407743 BLAKE2B 82828d043006b7f73ee32bae5b0beb261684aa70a2c556af34a8a269b790ad76e24d40a7ddb5c9b5cfd74ac7feb510c19deacc1b3dea647594d1f5f8c1293ca4 SHA512 1c235e6a49c7d6dd049aade4a0c34ffed61c211ea31c0f8d4d62db1a03b2d1e025ffd2fd9ae42b639113485d36e1ee2e40439f74e1971eb99847f4564b21bd10
+DIST xlog-2.0.24.tar.gz 11407825 BLAKE2B 0de5203d4229005ba84940443672a9787a9ab2a87565bcbf47e0a0fcf375dcddec7636d11a359a117c42b7e07ea81fd482a2684b8a75379da1fe72cbc991643d SHA512 cc96dfabf01a6c49ed7db1257cc102a469642bdd32a158b0a026da2017181060f8aace5de22ada5df42b3bc89c14448dd372332a9ff0101121570f5b1187e5ab
 EBUILD xlog-2.0.22.ebuild 1888 BLAKE2B bee6934c6a426de22807f032b2ef5706b2014ea3f13cb36cd9229aac625e220209a1a6a1a33bd5f95086415a612770302d2692dcc228d8c0ff642ce53764874c SHA512 8dd97e60010d3abb1985ebb3f3ead50ea5c867528705eca25035e244d3bd4ffee397c6fde5548d87b0918e636cb71476dfc21b2c7a409370764f5577210808d9
 EBUILD xlog-2.0.23.ebuild 1890 BLAKE2B 4eee0c65853210997bd9b01b5bee76103ad7bf6b9623ddaeb3cae3f9e5284310be60cd252c25acb62d73ae2115e136ab8c34b6f2382086dc9197b1048253e522 SHA512 7f451d6585b14d8f6f9488a66491d73c849a7363e80c7388d2d41e5aa84e81c7690eb233ac0b7b9ef515f4febe621430d78a37308a2d57d34fa3876222ed2bda
+EBUILD xlog-2.0.24.ebuild 1890 BLAKE2B 4eee0c65853210997bd9b01b5bee76103ad7bf6b9623ddaeb3cae3f9e5284310be60cd252c25acb62d73ae2115e136ab8c34b6f2382086dc9197b1048253e522 SHA512 7f451d6585b14d8f6f9488a66491d73c849a7363e80c7388d2d41e5aa84e81c7690eb233ac0b7b9ef515f4febe621430d78a37308a2d57d34fa3876222ed2bda
 MISC metadata.xml 246 BLAKE2B 0e24c5acb9f25df4ce675d772f01ef4cca1df3e885dff8c64c0c6f255b9ec49c4761ee159c30a35f77bbeefa1ec62ac6e835d2facdae2b63fbf0d6b350ac23b0 SHA512 be18486abf39193c34501128c8f1bf7e1886b74a7d551735d00c3492c7bae8845ba2dbea93b2ca73d5467cb7764d90b670014143ae8a8ca0a480a02d9af60efb
diff --git a/media-radio/xlog/xlog-2.0.24.ebuild b/media-radio/xlog/xlog-2.0.24.ebuild
new file mode 100644
index 000000000000..6a50652eae61
--- /dev/null
+++ b/media-radio/xlog/xlog-2.0.24.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs xdg-utils
+MY_P=${P/_}
+
+DESCRIPTION="An amateur radio logging program"
+HOMEPAGE="https://www.nongnu.org/xlog"
+SRC_URI="https://download.savannah.gnu.org/releases/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/hamlib:=
+	dev-libs/glib:2
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	media-libs/libpng:0
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS data/doc/THANKS NEWS README )
+
+src_prepare() {
+	eapply_user
+	eapply -p0 "${FILESDIR}/${PN}-2.0.7-desktop.patch"
+
+	# Drop -Werror
+	sed -i -e "s:-Werror::g" configure.ac || die
+	# fix underlinking
+	sed -i -e "s:HAMLIB_LIBS@:HAMLIB_LIBS@ -lm:g" src/Makefile.am || die
+	eautoconf
+
+	# prepare for media-radio/hamlib-4.2 change of API
+	if has_version '>=media-libs/hamlib-4.2' ; then
+		sed -i -e "s/FILPATHLEN/HAMLIB_FILPATHLEN/g" "${S}"/src/hamlib-utils.c || die
+	fi
+
+	# Fix broken png files<<
+	einfo "Fixing broken png files."
+	pushd "${S}"/data/doc/manual/output/html
+	for png in xlog-clock.png xlog-dropdown.png xlog-editbox.png; do
+		pngfix -q --out=out.png ${png}
+		mv -f out.png "${png}" || die
+	done
+	popd
+	einfo "done ..."
+
+}
+
+src_configure() {
+	# mime-update causes file collisions if enabled
+	econf --disable-mime-update
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	# build system makes it complicate to inhibit updating desktop
+	# database, so just remove the offending file
+	rm  "${D}"/usr/share/applications/mimeinfo.cache || die
+	docompress -x /usr/share/doc/${PF}/{KEYS,ChangeLog,TODO,BUGS}
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}