gentoo resync : 12.05.2022

24 files changed, 69 insertions, 46 deletions

diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index b38c3c87b0e5..73cc3b12664d 100644
--- a/metadata/md5-cache/media-radio/Manifest.gz
+++ b/metadata/md5-cache/media-radio/Manifest.gz
diff --git a/metadata/md5-cache/media-radio/ax25-apps-0.0.8_rc5 b/metadata/md5-cache/media-radio/ax25-apps-0.0.8_rc5
index c1a493347156..27cef2fa26d5 100644
--- a/metadata/md5-cache/media-radio/ax25-apps-0.0.8_rc5
+++ b/metadata/md5-cache/media-radio/ax25-apps-0.0.8_rc5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libax25-0.0.12_rc2 sys-libs/ncurses:= virtual/pkgconfig !dev-ruby/listen
 SLOT=0
 SRC_URI=http://www.linux-ax25.org/pub/ax25-apps/ax25-apps-0.0.8-rc5.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=aeaea9de6119010565baf3bca9a7efd8
diff --git a/metadata/md5-cache/media-radio/cwdaemon-0.11.0 b/metadata/md5-cache/media-radio/cwdaemon-0.11.0
new file mode 100644
index 000000000000..db29bca0cd65
--- /dev/null
+++ b/metadata/md5-cache/media-radio/cwdaemon-0.11.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure
+DEPEND=>=media-radio/unixcw-3.3.1
+DESCRIPTION=A morse daemon for the parallel or serial port
+EAPI=8
+HOMEPAGE=http://cwdaemon.sourceforge.net
+INHERIT=flag-o-matic
+KEYWORDS=~alpha ~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-radio/unixcw-3.3.1
+SLOT=0
+SRC_URI=mirror://sourceforge/cwdaemon/cwdaemon-0.11.0.tar.gz
+_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=1a8b5aff25e40d5e78189a9f7703e0e8
diff --git a/metadata/md5-cache/media-radio/direwolf-1.6 b/metadata/md5-cache/media-radio/direwolf-1.6
index f332e5743850..0521d731c6cc 100644
--- a/metadata/md5-cache/media-radio/direwolf-1.6
+++ b/metadata/md5-cache/media-radio/direwolf-1.6
@@ -4,12 +4,13 @@ DEPEND=media-libs/alsa-lib gps? ( sci-geosciences/gpsd ) hamlib? ( media-libs/ha
 DESCRIPTION=Decoded Information from Radio Emissions for Windows Or Linux Fans
 EAPI=8
 HOMEPAGE=https://github.com/wb2osz/direwolf/blob/master/README.md
+INHERIT=cmake systemd udev
 IUSE=gps hamlib test udev
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=GPL-2 BSD
 RDEPEND=media-libs/alsa-lib gps? ( sci-geosciences/gpsd ) hamlib? ( media-libs/hamlib:= ) udev? ( virtual/libudev:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/wb2osz/direwolf/archive/1.6.tar.gz -> direwolf-1.6.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=dacf870322dc87e35590c85a873394a9
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=c1ec0b6ab06f5de83f062d66a46445fd
diff --git a/metadata/md5-cache/media-radio/flamp-2.2.03 b/metadata/md5-cache/media-radio/flamp-2.2.07
index b874a1fb768d..4d0507bb8b7c 100644
--- a/metadata/md5-cache/media-radio/flamp-2.2.03
+++ b/metadata/md5-cache/media-radio/flamp-2.2.07
@@ -1,11 +1,11 @@
 DEFINED_PHASES=-
 DEPEND=media-radio/fldigi x11-libs/fltk:= x11-libs/libX11:= virtual/pkgconfig
 DESCRIPTION=Fldigi helper for transferring files
-EAPI=6
+EAPI=8
 HOMEPAGE=http://www.w1hkj.com
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=media-radio/fldigi x11-libs/fltk:= x11-libs/libX11:=
 SLOT=0
-SRC_URI=mirror://sourceforge/fldigi/flamp-2.2.03.tar.gz
-_md5_=5276707c292ac700165558aba85f8b10
+SRC_URI=mirror://sourceforge/fldigi/flamp-2.2.07.tar.gz
+_md5_=cdf27e32efc544a44fa0456b58cca42a
diff --git a/metadata/md5-cache/media-radio/fldigi-4.1.22 b/metadata/md5-cache/media-radio/fldigi-4.1.22
new file mode 100644
index 000000000000..cb0d9a339e62
--- /dev/null
+++ b/metadata/md5-cache/media-radio/fldigi-4.1.22
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure prepare
+DEPEND=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 nls? ( sys-devel/gettext ) virtual/pkgconfig
+DESCRIPTION=Sound card based multimode software modem for Amateur Radio use
+EAPI=8
+HOMEPAGE=http://www.w1hkj.com
+INHERIT=flag-o-matic
+IUSE=hamlib nls pulseaudio cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+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
+SLOT=0
+SRC_URI=mirror://sourceforge/fldigi/fldigi-4.1.22.tar.gz
+_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=2c9df8695af2b1571418c55364cb793b
diff --git a/metadata/md5-cache/media-radio/flamp-2.2.05 b/metadata/md5-cache/media-radio/flmsg-4.0.19-r1
index 882b276a8b84..784b6feb6007 100644
--- a/metadata/md5-cache/media-radio/flamp-2.2.05
+++ b/metadata/md5-cache/media-radio/flmsg-4.0.19-r1
@@ -1,11 +1,11 @@
-DEFINED_PHASES=-
+DEFINED_PHASES=configure
 DEPEND=media-radio/fldigi x11-libs/fltk:= x11-libs/libX11:= virtual/pkgconfig
-DESCRIPTION=Fldigi helper for transferring files
-EAPI=7
+DESCRIPTION=Fldigi helper for creating radiograms
+EAPI=8
 HOMEPAGE=http://www.w1hkj.com
 KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
+LICENSE=GPL-3
 RDEPEND=media-radio/fldigi x11-libs/fltk:= x11-libs/libX11:=
 SLOT=0
-SRC_URI=mirror://sourceforge/fldigi/flamp-2.2.05.tar.gz
-_md5_=ff10595d905e61cfcca4debd52b3c4d2
+SRC_URI=mirror://sourceforge/fldigi/flmsg-4.0.19.tar.gz
+_md5_=8aa49634d6fecaec8cce835b5ca31814
diff --git a/metadata/md5-cache/media-radio/gpredict-2.3-r1 b/metadata/md5-cache/media-radio/gpredict-2.3-r1
index 940c0a879b2b..5a41d20f627b 100644
--- a/metadata/md5-cache/media-radio/gpredict-2.3-r1
+++ b/metadata/md5-cache/media-radio/gpredict-2.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:3 x11-libs/goocanvas:2.0 net-misc/curl
 SLOT=0
 SRC_URI=https://github.com/csete/gpredict/archive/v2.3.tar.gz -> gpredict-2.3.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=8163025d0abae70135de77279037a21f
diff --git a/metadata/md5-cache/media-radio/js8call-2.2.0-r1 b/metadata/md5-cache/media-radio/js8call-2.2.0-r1
index c6a2a882ea8c..5384a3bed466 100644
--- a/metadata/md5-cache/media-radio/js8call-2.2.0-r1
+++ b/metadata/md5-cache/media-radio/js8call-2.2.0-r1
@@ -4,11 +4,12 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 d
 DESCRIPTION=Weak signal ham radio communication
 EAPI=7
 HOMEPAGE=https://groups.io/g/js8call
+INHERIT=cmake vcs-snapshot
 IUSE=doc
 KEYWORDS=amd64
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtserialport:5 dev-qt/qtprintsupport:5 virtual/libusb:1 media-libs/portaudio sci-libs/fftw:3.0[threads,fortran] virtual/fortran app-text/asciidoc >=media-libs/hamlib-4 doc? ( dev-ruby/asciidoctor )
 SLOT=0
 SRC_URI=https://bitbucket.org/widefido/js8call/get/v2.2.0-ga.tar.bz2 -> js8call-2.2.0.tar.bz2
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-snapshot	19dc666868420457132a7514d4621476	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-snapshot	19dc666868420457132a7514d4621476	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=0c2cca4fb35dc4d619c326e1c5514b56
diff --git a/metadata/md5-cache/media-radio/kochmorse-3.5.1 b/metadata/md5-cache/media-radio/kochmorse-3.5.1
index 9bf0ea9ba999..a4e540c2ca8c 100644
--- a/metadata/md5-cache/media-radio/kochmorse-3.5.1
+++ b/metadata/md5-cache/media-radio/kochmorse-3.5.1
@@ -4,10 +4,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5
 DESCRIPTION=Morse-code tutor using the Koch method
 EAPI=8
 HOMEPAGE=https://github.com/hmatuschek/kochmorse
+INHERIT=cmake
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/hmatuschek/kochmorse/archive/refs/tags/v3.5.1.tar.gz -> kochmorse-3.5.1.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1d5c469dd3bed88e7b0cd88b1a5c5692
diff --git a/metadata/md5-cache/media-radio/qsstv-9.5.8 b/metadata/md5-cache/media-radio/qsstv-9.5.8
index f461df7503b1..46b5b358960e 100644
--- a/metadata/md5-cache/media-radio/qsstv-9.5.8
+++ b/metadata/md5-cache/media-radio/qsstv-9.5.8
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-
 DESCRIPTION=Amateur radio SSTV software
 EAPI=8
 HOMEPAGE=http://users.telenet.be/on4qz/
+INHERIT=qmake-utils
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=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-libs/libv4l sci-libs/fftw:3.0= || ( media-sound/pulseaudio media-sound/apulse[sdk] ) x11-misc/xdg-utils
 SLOT=0
 SRC_URI=http://users.telenet.be/on4qz/qsstv/downloads/qsstv_9.5.8.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=bbf2672e3f63d0f99581e0fb7600ddfa
diff --git a/metadata/md5-cache/media-radio/svxlink-19.09.2 b/metadata/md5-cache/media-radio/svxlink-19.09.2
index 823001897a50..f73454c16d78 100644
--- a/metadata/md5-cache/media-radio/svxlink-19.09.2
+++ b/metadata/md5-cache/media-radio/svxlink-19.09.2
@@ -4,10 +4,11 @@ DEPEND=dev-lang/tcl:0 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/q
 DESCRIPTION=Multi Purpose Voice Services System, including Qtel for EchoLink
 EAPI=7
 HOMEPAGE=http://www.svxlink.org
+INHERIT=cmake systemd
 KEYWORDS=amd64 x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-lang/tcl:0 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/alsa-lib media-sound/gsm dev-libs/libgcrypt:0 media-libs/speex media-libs/opus dev-libs/libsigc++:2 dev-libs/popt acct-group/svxlink acct-user/svxlink
 SLOT=0
 SRC_URI=https://github.com/sm0svx/svxlink/archive/19.09.2.tar.gz -> svxlink-19.09.2.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=f2f40d3d0e3c743bc8b8f5197490f627
diff --git a/metadata/md5-cache/media-radio/tqsl-2.5.1 b/metadata/md5-cache/media-radio/tqsl-2.5.1
index f97a95144175..0206e97c73b5 100644
--- a/metadata/md5-cache/media-radio/tqsl-2.5.1
+++ b/metadata/md5-cache/media-radio/tqsl-2.5.1
@@ -4,10 +4,11 @@ DEPEND=dev-libs/expat:= dev-libs/openssl:0= net-misc/curl:= sys-libs/db:= sys-li
 DESCRIPTION=ARRL Logbook of the World
 EAPI=7
 HOMEPAGE=http://www.arrl.org/tqsl-download
+INHERIT=cmake wxwidgets vcs-snapshot
 KEYWORDS=~amd64 ~x86
 LICENSE=LOTW
 RDEPEND=dev-libs/expat:= dev-libs/openssl:0= net-misc/curl:= sys-libs/db:= sys-libs/zlib:= x11-libs/wxGTK:3.0=
 SLOT=0
 SRC_URI=https://github.com/rich0/trustedqsl-tqsl/archive/v2.5.1.tar.gz -> tqsl-2.5.1.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-snapshot	19dc666868420457132a7514d4621476	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-snapshot	19dc666868420457132a7514d4621476	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=795e7f99914a7bb0f4e186ae123a3edc
diff --git a/metadata/md5-cache/media-radio/tqsl-2.5.9 b/metadata/md5-cache/media-radio/tqsl-2.5.9
index ef0b30c2b868..18d7cb61e986 100644
--- a/metadata/md5-cache/media-radio/tqsl-2.5.9
+++ b/metadata/md5-cache/media-radio/tqsl-2.5.9
@@ -4,10 +4,11 @@ DEPEND=dev-libs/expat:= dev-libs/openssl:0= net-misc/curl:= sys-libs/db:= sys-li
 DESCRIPTION=ARRL Logbook of the World
 EAPI=8
 HOMEPAGE=https://www.arrl.org/tqsl-download
+INHERIT=cmake wxwidgets
 KEYWORDS=~amd64 ~x86
 LICENSE=LOTW
 RDEPEND=dev-libs/expat:= dev-libs/openssl:0= net-misc/curl:= sys-libs/db:= sys-libs/zlib:= x11-libs/wxGTK:3.0-gtk3=
 SLOT=0
 SRC_URI=https://www.arrl.org/tqsl/tqsl-2.5.9.tar.gz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=56347208fb0b9d26b7d7a57b28d8d10d
diff --git a/metadata/md5-cache/media-radio/tucnak-4.30 b/metadata/md5-cache/media-radio/tucnak-4.30
deleted file mode 100644
index 3f7c6c4d4926..000000000000
--- a/metadata/md5-cache/media-radio/tucnak-4.30
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=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:= ) virtual/pkgconfig
-DESCRIPTION=Amateur Radio VHF Contest Logbook
-EAPI=7
-HOMEPAGE=http://tucnak.nagano.cz
-IUSE=alsa fftw gpm hamlib suid
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-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:= )
-SLOT=0
-SRC_URI=http://tucnak.nagano.cz/tucnak-4.30.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=2849bd42da30c30ea2040b6dec2dbeb4
diff --git a/metadata/md5-cache/media-radio/tucnak-4.34 b/metadata/md5-cache/media-radio/tucnak-4.34
index c0e1b2e9fa19..5204c654df42 100644
--- a/metadata/md5-cache/media-radio/tucnak-4.34
+++ b/metadata/md5-cache/media-radio/tucnak-4.34
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 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:= )
 SLOT=0
 SRC_URI=http://tucnak.nagano.cz/tucnak-4.34.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=3541d26c29f1ee0eeb90b1b27931ee83
diff --git a/metadata/md5-cache/media-radio/tucnak-4.32 b/metadata/md5-cache/media-radio/tucnak-4.36
index 09253cf71d49..0ddf2b4ee656 100644
--- a/metadata/md5-cache/media-radio/tucnak-4.32
+++ b/metadata/md5-cache/media-radio/tucnak-4.36
@@ -4,11 +4,12 @@ DEPEND=dev-libs/glib:2 dev-libs/libzia media-libs/libsndfile >=media-libs/libsdl
 DESCRIPTION=Amateur Radio VHF Contest Logbook
 EAPI=8
 HOMEPAGE=http://tucnak.nagano.cz
+INHERIT=autotools flag-o-matic
 IUSE=alsa fftw gpm hamlib suid
-KEYWORDS=amd64 ~x86
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 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:= )
 SLOT=0
-SRC_URI=http://tucnak.nagano.cz/tucnak-4.32.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=bcfaad60788b99229097bba2b414cfc9
+SRC_URI=http://tucnak.nagano.cz/tucnak-4.36.tar.gz
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=e18d6b9d8bf9e91a02358e013a2d35eb
diff --git a/metadata/md5-cache/media-radio/unixcw-3.5.1-r1 b/metadata/md5-cache/media-radio/unixcw-3.5.1-r1
index a6523e5d0e28..7e3d473604b1 100644
--- a/metadata/md5-cache/media-radio/unixcw-3.5.1-r1
+++ b/metadata/md5-cache/media-radio/unixcw-3.5.1-r1
@@ -11,5 +11,5 @@ RDEPEND=ncurses? ( sys-libs/ncurses:= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 de
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/unixcw/unixcw-3.5.1.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=5f93c2aa22e857442c7d6989b4af5fd3
diff --git a/metadata/md5-cache/media-radio/wsjtx-2.5.4 b/metadata/md5-cache/media-radio/wsjtx-2.5.4
index ba8b06144309..dc64d57aa4b7 100644
--- a/metadata/md5-cache/media-radio/wsjtx-2.5.4
+++ b/metadata/md5-cache/media-radio/wsjtx-2.5.4
@@ -4,11 +4,12 @@ DEPEND=dev-libs/boost:=[nls,python] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmult
 DESCRIPTION=Weak signal ham radio communication
 EAPI=8
 HOMEPAGE=http://physics.princeton.edu/pulsar/K1JT/wsjtx.html
+INHERIT=cmake flag-o-matic
 IUSE=doc
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 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 )
 SLOT=0
 SRC_URI=https://physics.princeton.edu/pulsar/k1jt/wsjtx-2.5.4.tgz
-_eclasses_=cmake	3c38df051095289667b6f09ebd0cc149	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	fef481272d4a8e136a7d8a0fb1329384	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=2358723ed806f388f72cd74affba6026
diff --git a/metadata/md5-cache/media-radio/xastir-2.1.6 b/metadata/md5-cache/media-radio/xastir-2.1.6
index 2e739c872c99..0819fbcc1ba1 100644
--- a/metadata/md5-cache/media-radio/xastir-2.1.6
+++ b/metadata/md5-cache/media-radio/xastir-2.1.6
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=https://github.com/Xastir/Xastir/archive/Release-2.1.6.tar.gz -> xastir-2.1.6.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=24b2419c9482acc79343627400ac6bf8
diff --git a/metadata/md5-cache/media-radio/xastir-2.1.8 b/metadata/md5-cache/media-radio/xastir-2.1.8
index cbdf3dc3bed3..ecb2a61e1931 100644
--- a/metadata/md5-cache/media-radio/xastir-2.1.8
+++ b/metadata/md5-cache/media-radio/xastir-2.1.8
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=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 )
 SLOT=0
 SRC_URI=https://github.com/Xastir/Xastir/archive/Release-2.1.8.tar.gz -> xastir-2.1.8.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=b0831c1a6d64e968e3c27881d2b9a5cc
diff --git a/metadata/md5-cache/media-radio/xlog-2.0.24 b/metadata/md5-cache/media-radio/xlog-2.0.24
index 51c1ac5a3d45..c7176269c028 100644
--- a/metadata/md5-cache/media-radio/xlog-2.0.24
+++ b/metadata/md5-cache/media-radio/xlog-2.0.24
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/hamlib:= dev-libs/glib:2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/xlog/xlog-2.0.24.tar.gz
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=ac1784c1b3f16bfee4bcc56dfb66469a
diff --git a/metadata/md5-cache/media-radio/xwxapt-3.4.2 b/metadata/md5-cache/media-radio/xwxapt-3.4.2
index 8c56bf813d8c..c66ea8ef574c 100644
--- a/metadata/md5-cache/media-radio/xwxapt-3.4.2
+++ b/metadata/md5-cache/media-radio/xwxapt-3.4.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 media-libs/alsa-lib net-wireless/rtl-sdr x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://www.qsl.net/5b4az/pkg/apt/xwxapt/xwxapt-3.4.2.tar.bz2
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=ffe56947eecced7e1f9611f63c85da29
diff --git a/metadata/md5-cache/media-radio/xwxapt-3.4.3 b/metadata/md5-cache/media-radio/xwxapt-3.4.3
index f65bd9c8c89f..41597bc9cdd3 100644
--- a/metadata/md5-cache/media-radio/xwxapt-3.4.3
+++ b/metadata/md5-cache/media-radio/xwxapt-3.4.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 media-libs/alsa-lib net-wireless/rtl-sdr x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://www.qsl.net/5b4az/pkg/apt/xwxapt/xwxapt-3.4.3.tar.bz2
-_eclasses_=autotools	9724194ab651ce63fd9bc06e4e1410b4	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=bfa05f58dfd8cd2e96ba8714db2bb4a6