gentoo resync : 05.12.2021

20 files changed, 291 insertions, 20 deletions

diff --git a/media-radio/KochMorse/Manifest b/media-radio/KochMorse/Manifest
deleted file mode 100644
index f2a285e5d44b..000000000000
--- a/media-radio/KochMorse/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST KochMorse-3.4.0.tar.gz 1066631 BLAKE2B a435ab85ea782cb09ceab23109651572a2ed8fab6764ed54cdb5c1f2a51814f477fca013913f81b806404abf0d210edce7cca589b10b19b39fece5d8e1f7b581 SHA512 43cf5c3c9d66c4ef23016246a80ab426976a20ca5a2639d47ff2622adcaa3a9444dbfcd2d5c28c5ee32e0f041e8ecd8a33f82a9ed3040753699ebbb43d8f0faa
-EBUILD KochMorse-3.4.0-r1.ebuild 783 BLAKE2B 1efbd9fe4a61bf620c454d056e8a44e3caf1120cd55d8ecf24fa12f260bd922a6a2cf7a52ebee561e693d6edc26eaa6684338d57556e9e0bcffc9433912feda3 SHA512 d9874b089edb52a2a0a13a96c6a29320bf1330b89dd9c26561a22242365553f019f0d9a7591c86106020e0a9d3f219082a760f70a480be3e404a4b19193421d6
-MISC metadata.xml 426 BLAKE2B e421395256aa86a68186fbb160da537051fc29c8c7f196db97f4ff6ef0c885f0ecc6b84132d7edcb7b6b985476f432d648b9ed247837150f58d63a5a83b13b67 SHA512 31ced6d7369322c61ac0f0927c159a83bd0898348ccf433d04e541d35688f68ffbabd628162e1e3db2d6810ffac9f3198ac8e0b4b071ebc77c031d11a7fdafaa
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index 3b86735f8afd..5008f2455a85 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/direwolf/Manifest b/media-radio/direwolf/Manifest
index fd1da4b87c3b..9d54a216e455 100644
--- a/media-radio/direwolf/Manifest
+++ b/media-radio/direwolf/Manifest
@@ -1,7 +1,12 @@
 AUX 1.5-makefile.patch 17617 BLAKE2B 499ccaa4488fc098d1e080713badd0eb7bcd2c8c7c2b2210c9962cd3a6566c31dc447243164beb23b0d9941f8937d5a993c06eb28c945c64672d01015524f969 SHA512 ad79ea4a937bfa9e169d0e592406dd6aabe297fdc2b3aa6a84b32c01a6e9077b89a13ec5e4dd54fb6ebe4de57a27e87c9f59e30a7037a0e991587e639f182141
+AUX direwolf-1.5-respect-AR.patch 645 BLAKE2B 8649a2ef4372dc79b2eb4fc087eb58bac5c0fa83c2d0826fbc6f81a42159d699747c57568ec8e5b9fe28ffb3e9fee268e2aa98c6b2b76c3d705531bb5dcb5da2 SHA512 b4670d0a50d77b5eb4842da7471d662704f17f4bbd98e0c63988076e755368ff62e4c09ab1b448aca5654b568fee43925e38654765c184aa34231734aa34fe35
+AUX direwolf-1.5-respect-LDFLAGS.patch 781 BLAKE2B ce604ad005b6b1c93d9c8ddfa2a2ab81552e4f6b19d5b6e4e2f5534692e01159a4ce1294e7f21b1f772a18c57a95c6bf2aa2a9a5b6a254a1f58ab3c15c1d8795 SHA512 88e401076e90b65b4a6b314e0c957bda2dbb7b714ef7a4052ebbc2f32099e367b32ed3532386b97f12c9ea7175719b7d5409d27d78827f25efa9e7a9f95cff87
+AUX direwolf-1.6-use-standard-doc-dir.patch 1511 BLAKE2B 7ebb61c89e024f2ae3a3114cb74f2c74bead1d58566f10dbc1b06f42bb5763bb501332a7be12dfae5350de9cad9385a5060e067668f1a2c1ede3fbf6812b57bc SHA512 9452f7c522f0bdad0486ff188ce63ea5dfcf9c93ba14a1af302c5667c28d949d6946fb92bc3b8d0141c66a1c5874f8c1f903336bd7240c687f6bbe31c4c603d5
 AUX direwolf-gpsd-API-9.patch 7419 BLAKE2B 961156fb5c2f04979d01b9cdbdd1d28438faad3841c8245b1e07a9cc75fe22391e399998644bf62b3b48053a0cd7dfe00eae8d4858531bc290857548db52a746 SHA512 1cfd04cf51758ad3657952dde3023fb959020a85f842c1bea7fc8e6ce3f14d5f6a1bcae40188e7989b795806a7e099def5661e13a9b636e98d3103fea166b5a0
 AUX direwolf-kiss.service 157 BLAKE2B d0fef86335f3fecd7234dc75a670747c96ea774e136d4cf89a455fe66d5f65c2c777ddc9ae2e277e16ceee2a7ccea14ddb151bc9c334c8f5ff300d64798570b8 SHA512 bdeda52f52a9e1fb1b9611877d7c52c7e70c559aaab88471d82ceb872d8bbe5aefb5d938e59c4e3aa815f00c1506a85be224a48396f476842e60e2e451fa75fa
 AUX direwolf.service 154 BLAKE2B 1284b0f93085f5e8a8cd8452b86c0ddf4b8abf9c01496bfc8534e3b21f0268acb53c365fbf70b6a1e69fd02e34a78887f65d1374f339d03ddf492faf473a563f SHA512 43a98ebfa7c9fa7c21e4044496ff2f5cddac7c2298253167e6db5a23c849485080444db1ed45c0cdf55e9681b66d9cfc9bfaf830353bee9c71345cb6d0bbd4e8
 DIST direwolf-1.5.tar.gz 17996557 BLAKE2B 6860075b764248f1e0ff06e2a533e2e31f65851ea45d74fb0aca11827940c6df0a8bab4b6b78aa98847ee54b2b344d3c5fc8da6947f9113d2fac6d3ea427d68b SHA512 c23e2ccebd47235f76a9583e14cf8e8df299b8f7456a6388534536e7b1114b3d9b9efee43da2c1708e01a0b9534db0ed93314368e20e9002bfcd5b3a2855d8a5
-EBUILD direwolf-1.5-r1.ebuild 2168 BLAKE2B 3552637ff3f346267ab890cd4ffb77ab638dd074c2f30f6820a347bce9566243b2b17630b2444d40afcd4163a986c9d13f14e0565ff086618eb1c1faf4421bab SHA512 a4e5c4df51f1ab610b8577247522c09a6a985fc302a6c4345c0becf28143d1df768a2c5cc0480db1c1f27a9cab55bb3e12471ddf3d8c6deffaba1408135887a4
+DIST direwolf-1.6.tar.gz 22298168 BLAKE2B d0bffe78ecfdd7b41e4e2d458416e30e9151870d6890c3e4f65e44472699f0c1e1016fcbab5c30209978594ccaf567a8d53ae62194649e9df5cca4d4ea4689af SHA512 f29805dfea01ed5a81b133ac0a98455c2edfb6d18e0764db23c398475b11cc0e57c1c7c35c44cdaa5cf73129e8c18b836ad17dd3e9811e84277db0ef7b10bcd5
+EBUILD direwolf-1.5-r1.ebuild 2295 BLAKE2B acdb0f68dfef449865265bc6692f46a9966e71f2497cfc734762657fe4aa9e9ec92d68daa2c3f55aaa149b16ff118a18c13ab05d2d153209d78d06dd1cdec554 SHA512 354b9aaee3a0c5d13c629e275a3c080001e48ff2cca1e8025dd57447af74dcdc43d51a872f9d10b9ebb9b4a9b0db034cefe2373b7254c79dea08e9e7d342466d
+EBUILD direwolf-1.6.ebuild 1704 BLAKE2B 764a762ef16cbb2f7eb27af546c1fbcc534c6af5b0cbda96899c368d3b99a7fe48d111a430b924e8c97c7d2b285432cc92f2cecfb8e88ebde41426416f1fa614 SHA512 417362faeb7452929dfb4cd461f002be09952829f5d52202ba71128feeff824e448ea59859db9ef35eef31faf5fcf66e9e648ab5690943833e1ac39fd5d6dd46
 MISC metadata.xml 405 BLAKE2B 8ff48fe5c079a13419d626f07d42bcf22d19879d6cd5a48ca710a268ebe50656c83a40f92ce2dac49a7c049f3e58e4baa70a5b10d8be970fc52c5b37a034b9fd SHA512 802862b1c02705f44edd8e0a2f8e76ebee43217340c4c737bcc69a862a899847dbcdc7b3857f0052443152c3181985833e9f51455262b817187370e7bbc2c98e
diff --git a/media-radio/direwolf/direwolf-1.5-r1.ebuild b/media-radio/direwolf/direwolf-1.5-r1.ebuild
index ee2fa3ecbbd6..deef4a8a736a 100644
--- a/media-radio/direwolf/direwolf-1.5-r1.ebuild
+++ b/media-radio/direwolf/direwolf-1.5-r1.ebuild
@@ -30,6 +30,8 @@ INSTALLDIR="${D}"
 src_prepare() {
 	eapply "${FILESDIR}/${PV}-makefile.patch"
 	eapply "${FILESDIR}/direwolf-gpsd-API-9.patch"
+	eapply "${FILESDIR}/direwolf-1.5-respect-LDFLAGS.patch"
+	eapply "${FILESDIR}/direwolf-1.5-respect-AR.patch"
 
 	eapply_user
 
@@ -47,6 +49,8 @@ src_prepare() {
 }
 
 src_compile() {
+	tc-export AR CC
+
 	emake PKG_CONFIG="$(tc-getPKG_CONFIG)"
 }
 
diff --git a/media-radio/direwolf/direwolf-1.6.ebuild b/media-radio/direwolf/direwolf-1.6.ebuild
new file mode 100644
index 000000000000..39412b6150f1
--- /dev/null
+++ b/media-radio/direwolf/direwolf-1.6.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake systemd udev
+
+DESCRIPTION="Decoded Information from Radio Emissions for Windows Or Linux Fans"
+HOMEPAGE="https://github.com/wb2osz/direwolf/blob/master/README.md"
+SRC_URI="https://github.com/wb2osz/direwolf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gps hamlib test udev"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	media-libs/alsa-lib
+	gps? ( sci-geosciences/gpsd )
+	hamlib? ( media-libs/hamlib:= )
+	udev? ( virtual/libudev:= )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6-use-standard-doc-dir.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_GPSD=$(usex !gps)
+		-DCMAKE_DISABLE_FIND_PACKAGE_hamlib=$(usex !hamlib)
+		-DCMAKE_DISABLE_FIND_PACKAGE_udev=$(usex !udev)
+		-DUNITTEST=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# Fix udev rule installation path
+	udev_dorules "${ED}"/etc/udev/rules.d/99-direwolf-cmedia.rules
+	rm "${ED}"/etc/udev/rules.d/99-direwolf-cmedia.rules || die
+
+	keepdir /var/log/direwolf
+
+	# Pre-CMake, we installed a default config to /etc/direwolf.
+	# Should we do that now?
+	#insinto /etc/direwolf/
+	#doins direwolf.conf
+
+	systemd_dounit "${FILESDIR}"/direwolf.service
+	systemd_dounit "${FILESDIR}"/direwolf-kiss.service
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		einfo "The default configuration files are at:"
+		einfo " - ${EROOT}/usr/share/doc/${PF}/conf/direwolf.conf"
+		einfo " - ${EROOT}/usr/share/doc/${PF}/conf/sdr.conf"
+		einfo "Copy these to the /etc/direwolf/ directory to modify them."
+	fi
+}
diff --git a/media-radio/direwolf/files/direwolf-1.5-respect-AR.patch b/media-radio/direwolf/files/direwolf-1.5-respect-AR.patch
new file mode 100644
index 000000000000..1a833cc06ba8
--- /dev/null
+++ b/media-radio/direwolf/files/direwolf-1.5-respect-AR.patch
@@ -0,0 +1,22 @@
+diff --git a/Makefile.linux b/Makefile.linux
+index 3d433bd..bf8ed3d 100644
+--- a/Makefile.linux
++++ b/Makefile.linux
+@@ -474,7 +474,7 @@ ttcalc : ttcalc.o ax25_pad.o fcs_calc.o textcolor.o misc.a
+ # UTM, USNG, MGRS conversions.
+ 
+ geotranz.a : error_string.o  mgrs.o  polarst.o  tranmerc.o  ups.o  usng.o  utm.o
+-	ar -cr $@ $^
++	$(AR) -cr $@ $^
+ 
+ error_string.o : geotranz/error_string.c
+ 	$(CC) $(CFLAGS) -c -o $@ $^
+@@ -502,7 +502,7 @@ utm.o : geotranz/utm.c
+ # We don't need the others in that same directory.
+ 
+ misc.a : strlcpy.o strlcat.o
+-	ar -cr $@ $^	
++	$(AR) -cr $@ $^
+  
+ strlcpy.o : misc/strlcpy.c
+ 	$(CC) $(CFLAGS) -I. -c -o $@ $^
diff --git a/media-radio/direwolf/files/direwolf-1.5-respect-LDFLAGS.patch b/media-radio/direwolf/files/direwolf-1.5-respect-LDFLAGS.patch
new file mode 100644
index 000000000000..38dddcc281fd
--- /dev/null
+++ b/media-radio/direwolf/files/direwolf-1.5-respect-LDFLAGS.patch
@@ -0,0 +1,22 @@
+diff --git a/Makefile.linux b/Makefile.linux
+index 7418a63..3d433bd 100644
+--- a/Makefile.linux
++++ b/Makefile.linux
+@@ -447,7 +447,7 @@ atest : atest.c demod.o demod_afsk.o demod_psk.o demod_9600.o \
+ # Multiple AGWPE network or serial port clients to test TNCs side by side.
+ 
+ aclients : aclients.c ax25_pad.c fcs_calc.c textcolor.o misc.a
+-	$(CC) $(CFLAGS) -g -o $@ $^ 
++	$(CC) $(CFLAGS) -g -o $@ $^ $(LDFLAGS)
+ 
+ 
+ # Talk to a KISS TNC.
+@@ -466,7 +466,7 @@ cm108 : cm108.c textcolor.o misc.a
+ # Touch Tone to Speech sample application.
+ 
+ ttcalc : ttcalc.o ax25_pad.o fcs_calc.o textcolor.o misc.a
+-	$(CC) $(CFLAGS) -g -o $@ $^ 
++	$(CC) $(CFLAGS) -g -o $@ $^ $(LDFLAGS)
+ 
+ 
+ # -----------------------------------------  Libraries  --------------------------------------------
diff --git a/media-radio/direwolf/files/direwolf-1.6-use-standard-doc-dir.patch b/media-radio/direwolf/files/direwolf-1.6-use-standard-doc-dir.patch
new file mode 100644
index 000000000000..1377ba0b4fab
--- /dev/null
+++ b/media-radio/direwolf/files/direwolf-1.6-use-standard-doc-dir.patch
@@ -0,0 +1,50 @@
+From bfb62c085b0841818a5aaa0d2096c0d26f409553 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 26 Nov 2021 04:57:44 +0000
+Subject: [PATCH] Use standard doc directory (a la GNUInstallDirs)
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ CMakeLists.txt | 12 ++++--------
+ 1 file changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 139cb4d..e5da77c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -233,16 +233,12 @@ if (WIN32 OR CYGWIN)
+   set(INSTALL_MAN_DIR "man")
+   set(INSTALL_DATA_DIR "data")
+ else()
+-  set(INSTALL_BIN_DIR "bin")
+-  set(INSTALL_DOC_DIR "share/doc/${CMAKE_PROJECT_NAME}")
++  set(INSTALL_BIN_DIR "${CMAKE_INSTALL_BINDIR}")
++  set(INSTALL_DOC_DIR "${CMAKE_INSTALL_DOCDIR}")
+   set(INSTALL_CONF_DIR "${INSTALL_DOC_DIR}/conf")
+   set(INSTALL_SCRIPTS_DIR "${INSTALL_DOC_DIR}/scripts")
+-  if(FREEBSD)
+-    set(INSTALL_MAN_DIR "man/man1")
+-  else()
+-    set(INSTALL_MAN_DIR "share/man/man1")
+-  endif()
+-  set(INSTALL_DATA_DIR "share/${PROJECT_NAME}")
++  set(INSTALL_MAN_DIR "${CMAKE_INSTALL_MANDIR}/man1")
++  set(INSTALL_DATA_DIR "${CMAKE_INSTALL_DATAROOTDIR}/${PACKAGE_NAME}")
+ endif(WIN32 OR CYGWIN)
+ 
+ # requirements
+-- 
+2.34.1
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e5da77c..ae7ea25 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -225,6 +225,7 @@ elseif (C_GCC)
+ endif()
+ 
+ # set installation directories
++include(GNUInstallDirs)
+ if (WIN32 OR CYGWIN)
+   set(INSTALL_BIN_DIR ".")
+   set(INSTALL_DOC_DIR "doc")
diff --git a/media-radio/flrig/Manifest b/media-radio/flrig/Manifest
index 9444680c7f22..586d939cd48d 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -1,3 +1,5 @@
 DIST flrig-1.4.2.tar.gz 918730 BLAKE2B 85c2ac351e833b19dab0e36899df58665c86ac397035e8eabad29bb38018a0d2c822ca73b721f2db938a1f7cf2cd2b3a6878f605d5d65f01608563f3f4a0d89e SHA512 094f50a427cabc5c596a4315e7182ea4040218467f06fac456a0fe8923726f30cf3220379033024449066b4379a3877d48449971afe3f4b46b4307f9a64c3ff8
+DIST flrig-1.4.3.tar.gz 944556 BLAKE2B dcdb4a4306e3558e189094ec6f231ccae406f75d256bcb942aeee4ff67641e846fd99c73c263f98e2ed3a3074c6a4e473934186749c3dfc0b84d7d24e178c541 SHA512 93a5f3caeedcaed7de4988183d182872d4c3d22e670e2cd6b9aeb9cc969a09729a2765e1c7c93be72931f8948a0aeda7a75611f7dbc4b4d4adefe936a4006dca
 EBUILD flrig-1.4.2.ebuild 476 BLAKE2B 8665ccf1ef91f3f25912d4af906aeb74a579a5c865ce52f392f34f9ecaf14309a2d936ab6f3916b02e50fa8ea5d92d1171c9de3ef0cb7fb80491d02eec96cd99 SHA512 aec358712976dcaceada364545bcd9306cc5b3441db9100a71dae0d8d5f3a09e1e69b855a79524722840b3090c40c6fc000aa03fc0ba399a8cbc84dfebb0bc32
+EBUILD flrig-1.4.3.ebuild 478 BLAKE2B 3e3ac013bb0d0809685c34da78ae3735899a5df4d4f60923adc29df72799c0113af1fc3f5da65b6f654146c633fec9bd20a4149b4e4bc01e097196c9fa2c70b0 SHA512 7ffc8f30cf411a2b20fcd0657b0da86887f82700c78e4e91271418970a43ea6022eb96eb2671460fc1390c67cae0ea9ababd4b6d770ac207fd552c9c8ef59393
 MISC metadata.xml 326 BLAKE2B fb57e943fa61222b3967939ff95da7bb17aae2651e55d960a9c405e6d5965843ed0ec9e6fadd0df1f41602c0f3c90c78c6ca2ab12ea72b515484f7c2ec34ec68 SHA512 e48dc185e9eaa074ed92d1ed27920e41b72760cd3e878fd40583efdca0a6997598a7d82221a33c7987fb19dea090f92eee070b9e89ea452ddce028d88db7bf9c
diff --git a/media-radio/flrig/flrig-1.4.3.ebuild b/media-radio/flrig/flrig-1.4.3.ebuild
new file mode 100644
index 000000000000..a98ec86ead1f
--- /dev/null
+++ b/media-radio/flrig/flrig-1.4.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
diff --git a/media-radio/kochmorse/Manifest b/media-radio/kochmorse/Manifest
new file mode 100644
index 000000000000..e38dd5dd5298
--- /dev/null
+++ b/media-radio/kochmorse/Manifest
@@ -0,0 +1,5 @@
+DIST kochmorse-3.4.0.tar.gz 1066631 BLAKE2B a435ab85ea782cb09ceab23109651572a2ed8fab6764ed54cdb5c1f2a51814f477fca013913f81b806404abf0d210edce7cca589b10b19b39fece5d8e1f7b581 SHA512 43cf5c3c9d66c4ef23016246a80ab426976a20ca5a2639d47ff2622adcaa3a9444dbfcd2d5c28c5ee32e0f041e8ecd8a33f82a9ed3040753699ebbb43d8f0faa
+DIST kochmorse-3.5.1.tar.gz 1154862 BLAKE2B eb74aadc1e2029576f3cc96ea698742aca70bcd616f7123543c189924689b71bae6d330e2f857027ac57026effa26a6b27866184e391840073c48aff4503e3d1 SHA512 3d073ae25461a30d58ee58e8a606f240313b32c5d036ee3087c78daf2fd78da9640d720649b807e1b19b19bc60f00bb077a7cbc9d799b4c6d232dc8bea8c2168
+EBUILD kochmorse-3.4.0-r1.ebuild 674 BLAKE2B 31ea4f85ec4be3448fbd748a8bc2c9eccf6d6574c61d4dcf67f1a8458f8505f62046ccb6b916854557f07dac9f54327dab27a6c2679cff3e9ce177dbfd0372a6 SHA512 15ad7c533cc5c850b6fdcfbfb81a8fcf17249ef152ca1f26aa97f76072730d8dec35ce613cba2f87e40ba466e4388f7b0ca3e285a9681601cd392ce688ffff1c
+EBUILD kochmorse-3.5.1.ebuild 524 BLAKE2B 467d91bef68534190170a89fed659f713c996ef32d6f4c393d5edfed4bff6fad86641967e25afef1ce3ab88b6824f95ddbda05d60ddbf431287e825d01f40c4a SHA512 9c2d856f2c5afbf41d8b856a14b45dff6a6e8ae060da2957060bb21aa3cd3522dce0756fa701cef6db6c32846b9b191a14ad0edf3f07f68867027b39cbca2007
+MISC metadata.xml 504 BLAKE2B bc60b5ff7930238757c403945ddba0bc35d844bd7682b88e883d8eb249d981939189b44a538079ad215b875ebd984817411bcd3c934418ab16dfdb7aae6aa3a8 SHA512 a64abad0cf8c5c2cb5d6404c36e8b94f8c2a239fb31b9d7f9bf9ce322dbc2b3a28c8b6ae19f23db6b58ddba03f94453f8a659bbe920b4355544a90cf237bede6
diff --git a/media-radio/KochMorse/KochMorse-3.4.0-r1.ebuild b/media-radio/kochmorse/kochmorse-3.4.0-r1.ebuild
index 190a657b9151..066f0da13b21 100644
--- a/media-radio/KochMorse/KochMorse-3.4.0-r1.ebuild
+++ b/media-radio/kochmorse/kochmorse-3.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit cmake
 
 DESCRIPTION="Morse-code tutor using the Koch method"
 HOMEPAGE="https://github.com/hmatuschek/kochmorse"
-SRC_URI="https://github.com/hmatuschek/kochmorse/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/hmatuschek/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -22,11 +22,8 @@ RDEPEND="
 	dev-qt/qtwidgets:5"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/kochmorse-${PV}"
-
 src_prepare() {
 	cmake_src_prepare
-	# Upstream uses a non-standard category in release 3.4.0. I submitted
-	# a fix which has been accepted, but not yet released.
-	sed -i -e 's/Teaching;/X-Teaching;/' shared/kochmorse.desktop || die
+	# Upstream uses a non-standard category in release 3.4.0
+	sed -i -e 's/Teaching;/X-Teaching;/' shared/${PN}.desktop || die
 }
diff --git a/media-radio/kochmorse/kochmorse-3.5.1.ebuild b/media-radio/kochmorse/kochmorse-3.5.1.ebuild
new file mode 100644
index 000000000000..689ae8ad3fa8
--- /dev/null
+++ b/media-radio/kochmorse/kochmorse-3.5.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Morse-code tutor using the Koch method"
+HOMEPAGE="https://github.com/hmatuschek/kochmorse"
+SRC_URI="https://github.com/hmatuschek/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="dev-qt/linguist-tools:5"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtwidgets:5"
+DEPEND="${RDEPEND}"
diff --git a/media-radio/KochMorse/metadata.xml b/media-radio/kochmorse/metadata.xml
index 136b7868ebc4..baed555c7d9a 100644
--- a/media-radio/KochMorse/metadata.xml
+++ b/media-radio/kochmorse/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 	<longdescription>
 		KochMorse is a simple morse-code tutor using the Koch method. It is
 		written in C++ and uses Qt5 for the graphical user interface.
diff --git a/media-radio/tqsl/Manifest b/media-radio/tqsl/Manifest
index 90b20bfc9748..b69c3fb84623 100644
--- a/media-radio/tqsl/Manifest
+++ b/media-radio/tqsl/Manifest
@@ -1,3 +1,6 @@
+AUX tqsl-2.5.9-lib_suffix.patch 372 BLAKE2B 49eef5accc1cd3400d1bfcedcb60b37cb505ac42b401446cb11db952d9aa285d4e5cade25398b4c5c81d92ce8e84887337ec3c1334e87b75fea083b322aadbf7 SHA512 92fe9941ec12a24b656f20e503887b83fb0cb3c964aa9a45c6152d6a18a9c84d9fb6b276ab8dbca451993c14fa4329ca4692175538ce7090e87020523af20408
 DIST tqsl-2.5.1.tar.gz 4462202 BLAKE2B f62afe6003b782e5e092fbd99a90a79cc4b020004092f958dad6f7c695d125e31b28b47e7945ccee1fd88c87b290f93145592cac1bd9c52501c34de901f78d74 SHA512 7578572f64c269a41f3fa62ebe526baee4ac382fac81549e79d676da5dc4f3dd3d2a4ce31bc741b43a07eaf164a33beeb1987dd61df1a92ede7b762a8df532f3
+DIST tqsl-2.5.9.tar.gz 3677621 BLAKE2B dc367eb9206665d5cf3126715c04e9a718b5cf54915082c0de088767f646f0d2b40d16fda7ae77e5cddf66034f49f3400a30b00e300454fbe794532b8bf674ea SHA512 feb6bc94d801c5e698df0ea206d9cd5df79c2cba066bc0420ac96f75254e7989eb5d03237e50f31b2d58b921818a3bfc1d8e1a449d5fa5c4869525bf16173118
 EBUILD tqsl-2.5.1.ebuild 657 BLAKE2B 0af55d3464c48f2c8170e5f40ca7a033296130484cfa157ec8b8fa62b10ee57593315b8443c579f5128551cc64a74a608fbef0e1df883103a093e87e1e3c131a SHA512 cc59b5e71285feb782e94ba58e4c97e8973f186da72af4e7bc144f0dd527b7fd4110ff572ac7795f27d162f6047f4106585f338290aaf21f2b513c5f7f206683
+EBUILD tqsl-2.5.9.ebuild 668 BLAKE2B d24518bf0ccadf459d71e3b57aef1b07f36b388df8d05cefeedafde5df2c9a36090edeee0ee4bca9ba16f7d72949a1f7e04bf4d0eab27fee9f326321b7a146df SHA512 c17bc9ba4fe9e8ffd6607e815f3b9a51e870f3ad2bf95e45a3b735e53a9711f5af0e04b71b397268b1f34cee6476dbdfbed9d509eb13d051f9cb64c13f42b5b6
 MISC metadata.xml 291 BLAKE2B c8f0e0ebc3b625eac2168e41e2d9772e0b03fa293a5c057209b3b1a0485f3d882810ff4a8eb060efb4d6739f265f268a3f8a35777071c2e4102d8c7578e66b26 SHA512 1e2ab60b78d6a013be338bea0565d133fcc8f9433e2e4191e56722691a2b5ed78c9566f3c85987685eb84c5d6425d0fd6fc0fff2945e7de38c7f7eca5013ae8a
diff --git a/media-radio/tqsl/files/tqsl-2.5.9-lib_suffix.patch b/media-radio/tqsl/files/tqsl-2.5.9-lib_suffix.patch
new file mode 100644
index 000000000000..2a35736ae83d
--- /dev/null
+++ b/media-radio/tqsl/files/tqsl-2.5.9-lib_suffix.patch
@@ -0,0 +1,14 @@
+This definition causes the following tests to effectively turn no-op,
+resulting in strict-multilib violations on amd64.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -18,8 +18,6 @@
+     SET(LINUX TRUE)
+ ENDIF ()
+ 
+-SET (LIB_SUFFIX "")
+-
+ # Pre-set LIB_SUFFIX for 64-bit Linux platforms
+ IF (LINUX AND CMAKE_SHARED_LIBRARY_PREFIX STREQUAL "lib64")
+   SET (LIB_SUFFIX "64")
diff --git a/media-radio/tqsl/tqsl-2.5.9.ebuild b/media-radio/tqsl/tqsl-2.5.9.ebuild
new file mode 100644
index 000000000000..22cc02985616
--- /dev/null
+++ b/media-radio/tqsl/tqsl-2.5.9.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+inherit cmake wxwidgets
+
+DESCRIPTION="ARRL Logbook of the World"
+HOMEPAGE="https://www.arrl.org/tqsl-download"
+SRC_URI="https://www.arrl.org/${PN}/${P}.tar.gz"
+
+LICENSE="LOTW"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/expat:=
+	dev-libs/openssl:0=
+	net-misc/curl:=
+	sys-libs/db:=
+	sys-libs/zlib:=
+	x11-libs/wxGTK:${WX_GTK_VER}="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.9-lib_suffix.patch
+)
+
+DOCS=( AUTHORS.txt INSTALL README )
+HTML_DOCS=( html/. )
+
+src_configure() {
+	setup-wxwidgets
+	cmake_src_configure
+}
diff --git a/media-radio/wsjtx/Manifest b/media-radio/wsjtx/Manifest
index 159767639d9f..04521447ccf8 100644
--- a/media-radio/wsjtx/Manifest
+++ b/media-radio/wsjtx/Manifest
@@ -3,10 +3,10 @@ AUX wsjtx-2.1.2-qt_helpers.patch 625 BLAKE2B 50a45636ed9ed410002866235d3d6feca21
 AUX wsjtx-2.2.0-werror.patch 434 BLAKE2B c36c445cb7216b2cb2d1a7888aa480f0b6ffbb05389070159c2763ff979ea5faaf342d4b0a121ad616e4e2a9e2c10d1979c1fd9df8be7dc44a2df16290f43d45 SHA512 497cf4602e0e4b8eec04010822c05d3e195ff408133dff64d6c9c926bbfab06a31fbd92798f2b46e3aa8c61287399db13d4da462861782b4f3a84409f9090cdc
 AUX wsjtx-2.3.0-drop-docs.patch 676 BLAKE2B b5d6edb900dd9f26026ba3752ad14bd4b944b7829a00c9cc10194e95ac623c7f0bd1b9deee869360cf763e16966dd9a9a974cf80c12173d3346b767e6f3f47ac SHA512 193577a652fa90f23b43a052c1efb085c2ed244b318c34dab972ae6ec16c05ad290c2bd76a40502765d5964b82ceac6326f33a6d434f292e4830983be57c2ce4
 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
+DIST wsjtx-2.5.1.tgz 25249461 BLAKE2B fe858e4a21434c7357aa5baab8f4aff206a22bec7305b2d7c6a3860a389ca19779f4775a5618c046b25a71006a882f7a33b30baebe6e848182bd434ff82bb9aa SHA512 bce84766ea1eb13e899ccfc252ee3bcdb6f1d50afa6b312b0509d1eea8e5dcfc958c772fee2a2c40d43058e06ecda798fa9136252e3de0c4a40df27217a4b362
+DIST wsjtx-2.5.2.tgz 25246974 BLAKE2B ada5fc73a600477fa7f1f68c9c8c53e26c56d60aea1c28edc8c35e4ff67a309bf61e82f58c93c05a24c08ed7e77419c2a6ef6862b7cac059cccbebe66512afaf SHA512 cdccbb824614d391aa8f750e3c7e47d1fe8a9704f50d8a361e8741fadea971683383d9dfe0456c674b4584a47eb9a0fdce9c36a608d164de5ae98538e9b83705
 EBUILD wsjtx-2.5.0.ebuild 1687 BLAKE2B 77b160d46cb92cbf63c72feb553ba06ebf4f1c06f41479da89f1cd4f959850a476385698f4c934b5a675a2d3f023f254d4d224515a515988d0c0f98a2dc18dfa SHA512 497807b138ef74825294b571d0ab9a4b33ef6a68f5ebb80171461772847878cd62d62090ab8de9bf69cf5065672faad173a464270ecc64427f82a5b63dad0922
+EBUILD wsjtx-2.5.1.ebuild 1689 BLAKE2B dd6a09e69b77941ace5d69e756359d3f321d982831160b05eaba1a7ed4befba470d18c684a0776a2efa78b6f64c2c1a5eeec527118cbf180b582643c7f2c9463 SHA512 d407ea31a2c61f46f98f21b2736b76e25e212a87a047f6c506ce336ed561ee7aa554d0bb1b4b7b632902ddbcb6968ea2af7943a174cf62e774c1665cc6e7b3f1
+EBUILD wsjtx-2.5.2.ebuild 1689 BLAKE2B dd6a09e69b77941ace5d69e756359d3f321d982831160b05eaba1a7ed4befba470d18c684a0776a2efa78b6f64c2c1a5eeec527118cbf180b582643c7f2c9463 SHA512 d407ea31a2c61f46f98f21b2736b76e25e212a87a047f6c506ce336ed561ee7aa554d0bb1b4b7b632902ddbcb6968ea2af7943a174cf62e774c1665cc6e7b3f1
 MISC metadata.xml 412 BLAKE2B a8910c8ec81f720c209c3d9cb6cdfbde76be4c5a96941dfc3b799e9ba6b4d967928508c04bc5805536319a20f0b7cb292a2475f91de27471c11b9fd0f9073bec SHA512 2215cd7cea5ed62ef70bb2823ce85628877e3c204f7a55e582431c2d90ec8f77e6523b3e81c1747b339d58eeaf7c026ea26b6245af86294904e1c34887da943f
diff --git a/media-radio/wsjtx/wsjtx-2.4.0.ebuild b/media-radio/wsjtx/wsjtx-2.5.1.ebuild
index 258aa7b07859..aef0bd374750 100644
--- a/media-radio/wsjtx/wsjtx-2.4.0.ebuild
+++ b/media-radio/wsjtx/wsjtx-2.5.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 inherit cmake flag-o-matic
 
 MY_P=${P/_/-}
@@ -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="
diff --git a/media-radio/wsjtx/wsjtx-2.3.1.ebuild b/media-radio/wsjtx/wsjtx-2.5.2.ebuild
index 258aa7b07859..aef0bd374750 100644
--- a/media-radio/wsjtx/wsjtx-2.3.1.ebuild
+++ b/media-radio/wsjtx/wsjtx-2.5.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 inherit cmake flag-o-matic
 
 MY_P=${P/_/-}
@@ -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="