15 files changed, 324 insertions, 255 deletions
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index 0f5556fea277..de0b46aecdc3 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/cwdaemon/Manifest b/media-radio/cwdaemon/Manifest
index 4fc95d64c0fe..0b082e4ca551 100644
--- a/media-radio/cwdaemon/Manifest
+++ b/media-radio/cwdaemon/Manifest
@@ -1,5 +1,3 @@
-DIST cwdaemon-0.12.0.tar.gz 433974 BLAKE2B c1ab01291e9907a4c090987573eb2914a72285c028d9b1c452be633706a683378ac2976dfddba90aa92dfdb1b821716d30a7e613c48dba0981628013bb4563d2 SHA512 1b9a29d92aa9d212f27def6a938bd170f41ea177ac552f99cbb399422e3046cfeeb440f203079cd3726042187f7cd4fd0903b8cc4c301b4b34238f4e6d842ee0
 DIST cwdaemon-0.13.0.tar.gz 663289 BLAKE2B 1661220e87eb44aac63100319e532b697d67fe24c36ed03fbda18204a3e6d41f5aee8a6aab2afd49b49c0ebf03fe849c5f154d3bb41a1023683c1faa8fcc336b SHA512 bdba023e83f410c35e4656f35f969303e2f86154a17e2f2cf96c26b82073dddf8cb431ab15b219ce775ef3ee01602cdb6f826f47b70bcdafa9fbd3dfe0b96160
-EBUILD cwdaemon-0.12.0.ebuild 568 BLAKE2B 597422cc55896b2ed11bf05d785a90558396727dedc3a4872811f3776019ba54d09101e801fe5bcb78de14cb5f6aa15b36d1064a666165e946312bc51770b318 SHA512 9546b5a3c2989b2cd19ca84bb2fa0269d9ef004743010f9742b0ee08faad7f539e74210bb27d4df8073cc52604e989a6b294c460d654fa5b3b835a4cb7433a9c
 EBUILD cwdaemon-0.13.0.ebuild 577 BLAKE2B 3e3a326930949cff869d0e9566fedd45b1833048fcd3f3ecec56536400334b1167614dca232007164d250b182680533b42f5aba2edc23d0b0ce99a5ba5781454 SHA512 e7520d485a0169cd6aec5c0b1b1447a748f127f3d54bbfe1e741105aacf33ce63ab1cc70a537404370ac584abaf7a5b90a65f4a45c2147e5acf1489ee15408e1
 MISC metadata.xml 396 BLAKE2B b5326fc8896004379456c30e8dacbc1568aa65db9821fd816f8cb22fdb4483b0dc844c4a7b3b51ed011ad0c440756c42826a32ec124f6f19ea633171f2f2ebe1 SHA512 7a7a26070a1555b354831aabad4fe3d47cea96610a01b2fba565aa7888067074b68d680abddf5cf4bef1c11338ac5e018cdaa5d824a307fa801d1107265a45d8
diff --git a/media-radio/cwdaemon/cwdaemon-0.12.0.ebuild b/media-radio/cwdaemon/cwdaemon-0.12.0.ebuild
deleted file mode 100644
index 13cbea382e23..000000000000
--- a/media-radio/cwdaemon/cwdaemon-0.12.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-DESCRIPTION="A morse daemon for the parallel or serial port"
-HOMEPAGE="http://cwdaemon.sourceforge.net"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc x86"
-
-RDEPEND=">=media-radio/unixcw-3.6.0"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	# provides header info for getaddrinfo() with C99 (bug 569970)
-	append-cppflags -D_GNU_SOURCE
-	econf
-}
diff --git a/media-radio/fldigi/Manifest b/media-radio/fldigi/Manifest
index 3dc8d3d75887..b96a04a290b3 100644
--- a/media-radio/fldigi/Manifest
+++ b/media-radio/fldigi/Manifest
@@ -1,7 +1,4 @@
 AUX fldigi-drop-nullptr-definition.patch 596 BLAKE2B d258036b22f597d82b6a66ecadbf12f8dde20be21464910e6d205d4c24dbc19ae60e00cb089818f3504d88d8dbc56e9dc4894dc5cc2f2b3925b614c3cb231206 SHA512 71993594183394a6f8f9329e43c14cf08b759b35d462632bab8a02ec4540107fbc99e50c95b0239daa61e279cb10c442ccc0b4fabf419bea3b6841f0d89ba54d
-DIST fldigi-4.2.05.tar.gz 5127250 BLAKE2B 54a144e34da47c5379256c4ece67447815c29500331e29ccce884885daa96650d6ec098839eb97d13a641d8d0078a9656c9d443016a2acc98fbe7b78c98ca6f9 SHA512 46281e65dad24c57ea344182ed053ddea70281b1682d2fe6b40aa1f111c529328c7e1e4de86828ac265ed4523882d086f5213706159fc43b61f15989fdd9d407
 DIST fldigi-4.2.06.tar.gz 5149140 BLAKE2B b7a86e22b237b91b1931b09e718ba3821f62f4a1eb529ef6ba9427d0973dcf0af86f4f8dfa5e7fa374d5f7df6e5302b06dcd0307aa836a7ac454bf994e2ffe3c SHA512 770e8650f8ba9d8276665d0683e2418bd4fa399bd92fb66c1c219633f8fb3d4c49c1568bd2a0261a72af1e9527d548a247f872fe4b4a8019de086f51db280db6
-EBUILD fldigi-4.2.05-r3.ebuild 1508 BLAKE2B f6dfc862039a1a67f560aef42076de773a588c6426d338075a2df8d01a9abcc73b64e5c75872f19087d11e4977df8157d2a8c0a67fdd16a5754ad546fcfc32ce SHA512 7f93afe7c05316962527cd0bd2816c657c9ed344f95cbc2c1887447b7f180037bbbcb33340376a07e9c205a8b38dcd0c4d9d72d4651709c9895a14af2c8c6fb5
-EBUILD fldigi-4.2.05-r4.ebuild 1537 BLAKE2B c657dc111b18d4b5ca84971b2a75cd0fadd14cdea105418f16512956edbc0761f77877369aa67a71c3e81eb72410d2ed95a57817afaaf28314dcce2520039578 SHA512 c21223a55e1370857c849e29159dab9a62e18fd70aa5f73ee696a4610b42bf2dd11e54f25312e014841df8e17611f11277171068a7f106d3e58bace2ff6e912f
 EBUILD fldigi-4.2.06-r1.ebuild 1535 BLAKE2B d5620134ddb5785d924fe3259d947cc2adee15fe650e51b44817f7a025ec7ac630b422e88d20628a435384e32797b2495d7702bd65eac2a7842635c857ad64f0 SHA512 05ee9f34e573e7729b4fa96c2113cab5cf84257f805f93d729167d49b18679d3a195cb77afae2fe61e371f2bd15ab6e81721564d22a63391569190eb55f02735
 MISC metadata.xml 647 BLAKE2B 1acc1909ca9e9e64ce6387c1775ee3947848ac1f7f29cd0e43cec1936967595b7d2bbf44b68080e23d4ddcc23f74075ff0fad1bfc45d9ad4477679adbc452e7b SHA512 89f0532a41977f17d7c36d218a967739b47f0a6ac73d92666a2d7b06ebdfd320bab28bbaf4c9dc97a59ffa8ce6ed963796ca053501480863d0c82a5d144b68d8
diff --git a/media-radio/fldigi/fldigi-4.2.05-r3.ebuild b/media-radio/fldigi/fldigi-4.2.05-r3.ebuild
deleted file mode 100644
index bb65c55744f8..000000000000
--- a/media-radio/fldigi/fldigi-4.2.05-r3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
-HOMEPAGE="http://www.w1hkj.com"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="hamlib nls pulseaudio"
-IUSE_CPU_FLAGS=" sse sse2 sse3"
-IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}"
-
-RDEPEND="x11-libs/fltk:1=[threads(+),xft(+)]
-	media-libs/libsamplerate
-	media-libs/libpng:0
-	x11-misc/xdg-utils
-	dev-perl/RPC-XML
-	dev-perl/Term-ReadLine-Perl
-	|| (
-		media-libs/portaudio[oss]
-		media-libs/portaudio[alsa]
-	)
-	hamlib? ( media-libs/hamlib:= )
-	pulseaudio? ( media-libs/libpulse )
-	>=media-libs/libsndfile-1.0.10"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-PATCHES=( "${FILESDIR}/${PN}-drop-nullptr-definition.patch" )
-
-src_prepare() {
-	eapply ${PATCHES[@]}
-	eapply_user
-}
-
-src_configure() {
-	#fails to compile with -flto (bug #860405)
-	filter-lto
-
-	append-cxxflags $(test-flags-CXX -std=c++14)
-	local myconf=""
-
-	use cpu_flags_x86_sse && myconf="${myconf} --enable-optimizations=sse"
-	use cpu_flags_x86_sse2 && myconf="${myconf} --enable-optimizations=sse2"
-	use cpu_flags_x86_sse3 && myconf="${myconf} --enable-optimizations=sse3"
-
-	econf ${myconf} \
-		--with-sndfile \
-		$(use_with hamlib) \
-		$(use_enable nls) \
-		$(use_with pulseaudio) \
-		--without-asciidoc
-}
diff --git a/media-radio/fldigi/fldigi-4.2.05-r4.ebuild b/media-radio/fldigi/fldigi-4.2.05-r4.ebuild
deleted file mode 100644
index 0000e5a5d512..000000000000
--- a/media-radio/fldigi/fldigi-4.2.05-r4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
-HOMEPAGE="http://www.w1hkj.com"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="hamlib nls pulseaudio"
-IUSE_CPU_FLAGS=" sse sse2 sse3"
-IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}"
-
-RDEPEND="x11-libs/fltk:1=[threads(+),xft(+)]
-	x11-libs/libX11
-	virtual/libudev:=
-	media-libs/libsamplerate
-	media-libs/libpng:=
-	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-libs/libpulse )
-	media-libs/libsndfile"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-PATCHES=( "${FILESDIR}/${PN}-drop-nullptr-definition.patch" )
-
-src_prepare() {
-	eapply ${PATCHES[@]}
-	eapply_user
-}
-
-src_configure() {
-	#fails to compile with -flto (bug #860405)
-	filter-lto
-
-	append-cxxflags $(test-flags-CXX -std=c++14)
-	local myconf=""
-
-	use cpu_flags_x86_sse && myconf="${myconf} --enable-optimizations=sse"
-	use cpu_flags_x86_sse2 && myconf="${myconf} --enable-optimizations=sse2"
-	use cpu_flags_x86_sse3 && myconf="${myconf} --enable-optimizations=sse3"
-
-	econf ${myconf} \
-		--with-sndfile \
-		$(use_with hamlib) \
-		$(use_enable nls) \
-		$(use_with pulseaudio) \
-		--without-asciidoc
-}
diff --git a/media-radio/unixcw/Manifest b/media-radio/unixcw/Manifest
index c006e361b7a3..f4afb906d52a 100644
--- a/media-radio/unixcw/Manifest
+++ b/media-radio/unixcw/Manifest
@@ -1,4 +1,7 @@
 AUX unixcw-3.6-tinfo.patch 1226 BLAKE2B 139f81ffeec979517523c72ca1724ad280976160f4857640913a0e4a85595ca01e1a08b2043520fe7099974f5b8ca63812c851146b4c447b9325d43c58e9abd8 SHA512 8a4e217118a5bce1b87d7f2ab2a57ba43903da82f03bcc467dcec37a8cb673f576e778ddec1a26ed4a3edd151f75f1728dcfc01565d9c7134e360908e0bcc413
+AUX unixcw-3.6.1-qt6-build.patch 4798 BLAKE2B 98f4e88b6dee71befa5c92d5439b1244fd72e88e6a49f216512a68d3d12fc2b1d851c47f1f8275e45de5c72d286ed55e59d124d5d93dab35aa36da8117bac6d3 SHA512 febaf450fe31aff33b47cf2b766e6dcf2f96b9006b414178320351342fa18993789018ff8837af1547fba04beb56c4406d39a797873ca158250ad315fa878541
+AUX unixcw-3.6.1-qt6-src.patch 1572 BLAKE2B 59051094719107f8a283edf7c1713f45d6899981f3fef6f3f12b17c96a5b8156c7b7ee46950f6b2babc45cddc58d2b7c4ef07c84c7e31eb2051b0524f31b7068 SHA512 515e450eebee03004d6299dd67d8036ecc620c4929300baef628313243366da7b4e7bd63584fd7adc43eddfee2b07e31868622156e188dd53f80d88e6f82895c
 DIST unixcw-3.6.1.tar.gz 975795 BLAKE2B 5bc7822d216bef2ac452593c0e9dc537f2dfcd31f446c8795abc76d1d2ccfd4010a3b95982bc404ddc4c974456177e9f54bdefc169a14110bb503fd539025b07 SHA512 d91457b9b2247ce2be75773e2c37ca8b69c75c42c187ddfac5a9a8f4c9ad16acae3e4b0223e885bf7ae9c7201869581becd444f32c375ac521d2a712b7ddfb69
+EBUILD unixcw-3.6.1-r1.ebuild 2090 BLAKE2B 17c38d598588c4d2ee2dbf8a71a1ee64da0933a2f157f99883354808045043c66ab86d4d677a1debcf0f3c94823d92f6b00674ba627025c050a8dffb6249a6c0 SHA512 7b31d263208500c5c0970b3f664a0336c1526415662ff9e73610fee9548945f31e08190ca4935e801e77afa6308bb9cb5d73dfd99dcb828e642fea5638c811be
 EBUILD unixcw-3.6.1.ebuild 2061 BLAKE2B d1deacbae68158252741ff59fc4cd9ec3b419366030c2817f18d8a39b22d0d26db5afd3a9626802e3dd920b7d5aa7d5eacb431b8c0436bce779a04807a61c5c4 SHA512 c50d9686a0e550cd6c0d6323476b534bb70e305161e467ad6d489c7b33edd9a33b7c02a445b7dd130faa5662f27eeea63e5951057f5e79a4bcdd1f2c45e4f465
 MISC metadata.xml 875 BLAKE2B 582b1ba40e9424d308e33d5f2bf430e270a2d4d106aeffec3d03e1736360758776f5aa8a8d0078aa03c0e4ca8ea206b9805be2223db69282bca0cb752c531314 SHA512 07b92861370f28e4723e48d75dac80e3517c7a944f7a4ac07e6afc75f80871b6ca6a4904d042bd79bce1dfcd81b74d3b85a25b0eab3f8c83dac7742f6fb10219
diff --git a/media-radio/unixcw/files/unixcw-3.6.1-qt6-build.patch b/media-radio/unixcw/files/unixcw-3.6.1-qt6-build.patch
new file mode 100644
index 000000000000..53cda260267e
--- /dev/null
+++ b/media-radio/unixcw/files/unixcw-3.6.1-qt6-build.patch
@@ -0,0 +1,116 @@
+diff --git a/configure.ac b/configure.ac
+index aecd270..d66151e 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -512,28 +512,28 @@ if test "$enable_xcwcp" = "no" ; then
+     WITH_XCWCP='no'
+ else
+     # http://stackoverflow.com/questions/5178511/integrate-qt-project-with-autotool
+-    PKG_CHECK_MODULES(QT5, [Qt5Widgets Qt5Gui Qt5Core >= 5.0.0], [
+-			   AC_PATH_PROGS(MOC, [moc-qt5 moc], moc,`eval $PKG_CONFIG --variable=host_bins Qt5Core`)
++    PKG_CHECK_MODULES(QT6, [Qt6Widgets Qt6Gui Qt6Core >= 6.0.0], [
++			   AC_PATH_PROGS(MOC, [moc-qt6 moc], moc,`eval $PKG_CONFIG --variable=libexecdir Qt6Core`)
+ 
+ 			   # https://stackoverflow.com/questions/11663702/how-to-suppress-warnings-for-file-included-from-header
+-			   QT_INCLUDE_DIR=`$PKG_CONFIG --variable=includedir Qt5Core`
+-			   QT5_CFLAGS="-isystem $QT_INCLUDE_DIR"
+-			   QT5_CFLAGS+=" -isystem $QT_INCLUDE_DIR/QtWidgets"
+-			   QT5_CFLAGS+=" -isystem $QT_INCLUDE_DIR/QtGui"
+-			   QT5_CFLAGS+=" -isystem $QT_INCLUDE_DIR/QtCore"
++			   QT_INCLUDE_DIR=`$PKG_CONFIG --variable=includedir Qt6Core`
++			   QT6_CFLAGS="-isystem $QT_INCLUDE_DIR"
++			   QT6_CFLAGS+=" -isystem $QT_INCLUDE_DIR/QtWidgets"
++			   QT6_CFLAGS+=" -isystem $QT_INCLUDE_DIR/QtGui"
++			   QT6_CFLAGS+=" -isystem $QT_INCLUDE_DIR/QtCore"
+ 
+-			   AC_MSG_RESULT([QT5 CLFAGS is $QT5_CFLAGS])
+-			   AC_MSG_RESULT([QT5 LIBS is $QT5_LIBS])
++			   AC_MSG_RESULT([QT6 CFLAGS is $QT6_CFLAGS])
++			   AC_MSG_RESULT([QT6 LIBS is $QT6_LIBS])
+ 
+-			   AC_SUBST(QT5_CFLAGS)
+-			   AC_SUBST(QT5_LIBS)
++			   AC_SUBST(QT6_CFLAGS)
++			   AC_SUBST(QT6_LIBS)
+ 			   AC_SUBST(MOC)
+ 
+ 			   WITH_XCWCP='yes'
+ 
+ 			   ], [
+ 
+-			   AC_MSG_WARN([Cannot find Qt5 files - unable to build xcwcp])
++			   AC_MSG_WARN([Cannot find Qt6 files - unable to build xcwcp])
+ 
+ 			   WITH_XCWCP='no'
+ 
+@@ -797,9 +797,9 @@ AC_MSG_NOTICE([  build cwgen:  ..........................................  $WITH
+ AC_MSG_NOTICE([  build cwcp:  ...........................................  $WITH_CWCP])
+ AC_MSG_NOTICE([  build xcwcp:  ..........................................  $WITH_XCWCP])
+ if test "$WITH_XCWCP" = 'yes' ; then
+-    AC_MSG_NOTICE([      Qt5 LIBS:  .........................................  $QT5_LIBS])
+-    AC_MSG_NOTICE([      Qt5 MOC:  ..........................................  $MOC])
+-    AC_MSG_NOTICE([      Qt5 CFLAGS:  .......................................  $QT5_CFLAGS])
++    AC_MSG_NOTICE([      Qt6 LIBS:  .........................................  $QT6_LIBS])
++    AC_MSG_NOTICE([      Qt6 MOC:  ..........................................  $MOC])
++    AC_MSG_NOTICE([      Qt6 CFLAGS:  .......................................  $QT6_CFLAGS])
+ fi
+ AC_MSG_NOTICE([  CFLAGS:  ...............................................  $CFLAGS])
+ 
+diff --git a/Makefile.inc.in b/Makefile.inc.in
+index dd091db..6ad9361 100644
+--- a/Makefile.inc.in
++++ b/Makefile.inc.in
+@@ -27,9 +27,9 @@ AC_LDCONFIG	= @LDCONFIG@
+ AC_LIBS		= @LIBS@
+ AC_AWK		= @AWK@
+ 
+-AC_QT5_CFLAGS	= @QT5_CFLAGS@
+-AC_QT5_LIBS	= @QT5_LIBS@
+-AC_QT5_MOC	= @MOC@
++AC_QT6_CFLAGS	= @QT6_CFLAGS@
++AC_QT6_LIBS	= @QT6_LIBS@
++AC_QT6_MOC	= @MOC@
+ AC_SRC_SUBDIRS	= @SRC_SUBDIRS@
+ 
+ AC_CFLAG_PIC	= @CFLAG_PIC@
+diff --git a/src/xcwcp/Makefile.am b/src/xcwcp/Makefile.am
+index 6d4a02d..492b321 100644
+--- a/src/xcwcp/Makefile.am
++++ b/src/xcwcp/Makefile.am
+@@ -18,7 +18,7 @@
+ 
+ # use $(top_builddir) instead of $(top_srcdir) because Makefile.inc is
+ # (re)created at build time; if you use $(top_srcdir), you may (will?)
+-# get empty $(AC_QT5_CFLAGS), $(AC_QT5_LIBS) and $(AC_QT5_MOC);
++# get empty $(AC_QT6_CFLAGS), $(AC_QT6_LIBS) and $(AC_QT6_MOC);
+ -include $(top_builddir)/Makefile.inc
+ 
+ # program(s) to be built in current dir
+@@ -36,12 +36,12 @@ xcwcp_SOURCES = \
+ nodist_xcwcp_SOURCES = moc_application.cc
+ 
+ # target-specific preprocessor flags (#defs and include dirs)
+-xcwcp_CPPFLAGS = -I$(top_srcdir)/src/ -I$(top_srcdir)/src/libcw/ $(AC_QT5_CFLAGS) $(AC_CFLAG_PIC)
++xcwcp_CPPFLAGS = -I$(top_srcdir)/src/ -I$(top_srcdir)/src/libcw/ $(AC_QT6_CFLAGS) $(AC_CFLAG_PIC)
+ 
+ # Target-specific linker flags (objects to link). Order is important:
+ # first static library then dynamic. Otherwise linker may not find
+ # symbols from the dynamic library.
+-xcwcp_LDADD = $(top_builddir)/src/cwutils/lib_xcwcp.a -L$(top_builddir)/src/libcw/.libs -lcw $(AC_QT5_LIBS) -lpthread $(INTL_LIB)
++xcwcp_LDADD = $(top_builddir)/src/cwutils/lib_xcwcp.a -L$(top_builddir)/src/libcw/.libs -lcw $(AC_QT6_LIBS) -lpthread $(INTL_LIB)
+ 
+ 
+ 
+@@ -73,10 +73,10 @@ CLEANFILES = moc_application.cc
+ # Qt5 magic
+ if HOST_IS_FREEBSD
+ moc_application.cc: application.h
+-	$(AC_QT5_MOC) application.h -o application.cc
++	$(AC_QT6_MOC) application.h -o application.cc
+ else
+ moc_application.cc: application.h
+-	$(AC_QT5_MOC) $< -o $@
++	$(AC_QT6_MOC) $< -o $@
+ endif
+ 
+ 
diff --git a/media-radio/unixcw/files/unixcw-3.6.1-qt6-src.patch b/media-radio/unixcw/files/unixcw-3.6.1-qt6-src.patch
new file mode 100644
index 000000000000..d904ee9020b5
--- /dev/null
+++ b/media-radio/unixcw/files/unixcw-3.6.1-qt6-src.patch
@@ -0,0 +1,44 @@
+diff --git a/src/xcwcp/application.cc b/src/xcwcp/application.cc
+index 12f9311..f1dd707 100644
+--- a/src/xcwcp/application.cc
++++ b/src/xcwcp/application.cc
+@@ -821,7 +821,7 @@ void Application::make_toolbar(void)
+ 	toolbar->addSeparator();
+ 
+ 
+-	QLabel *speed_label_ = new QLabel(_("Speed:"), 0, 0);
++	QLabel *speed_label_ = new QLabel(_("Speed:"), 0, Qt::Widget);
+ 	toolbar->addWidget(speed_label_);
+ 
+ 	speed_spin = new QSpinBox(toolbar);
+@@ -857,7 +857,7 @@ void Application::make_toolbar(void)
+ 	toolbar->addSeparator();
+ 
+ 
+-	QLabel *volume_label = new QLabel(_("Volume:"), 0, 0);
++	QLabel *volume_label = new QLabel(_("Volume:"), 0, Qt::Widget);
+ 	toolbar->addWidget(volume_label);
+ 
+ 	volume_spin = new QSpinBox(toolbar);
+@@ -875,7 +875,7 @@ void Application::make_toolbar(void)
+ 	toolbar->addSeparator();
+ 
+ 
+-	QLabel *gap_label = new QLabel(_("Gap:"), 0, 0);
++	QLabel *gap_label = new QLabel(_("Gap:"), 0, Qt::Widget);
+ 	toolbar->addWidget(gap_label);
+ 
+ 	gap_spin = new QSpinBox(toolbar);
+diff --git a/src/xcwcp/receiver.cc b/src/xcwcp/receiver.cc
+index 904ad22..7c785c0 100644
+--- a/src/xcwcp/receiver.cc
++++ b/src/xcwcp/receiver.cc
+@@ -165,7 +165,7 @@ void Receiver::handle_mouse_event(QMouseEvent *event, bool is_reverse_paddles)
+ 		const int is_down = event->type() == QEvent::MouseButtonPress
+ 			|| event->type() == QEvent::MouseButtonDblClick;
+ 
+-		if (event->button() == Qt::MidButton) {
++		if (event->button() == Qt::MiddleButton) {
+ 			//fprintf(stderr, "---------- handle mouse event: sk: %d\n", is_down);
+ 			sk_event(is_down);
+ 			event->accept();
diff --git a/media-radio/unixcw/unixcw-3.6.1-r1.ebuild b/media-radio/unixcw/unixcw-3.6.1-r1.ebuild
new file mode 100644
index 000000000000..22f41c23d9a4
--- /dev/null
+++ b/media-radio/unixcw/unixcw-3.6.1-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Collection of programs that fit together to form a morse code tutor program"
+HOMEPAGE="https://unixcw.sourceforge.net"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="alsa ncurses pulseaudio suid test qt6"
+RESTRICT="!test? ( test )"
+
+RDEPEND="ncurses? ( sys-libs/ncurses:= )
+	qt6? ( dev-qt/qtbase:6[gui,widgets] )
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-libs/libpulse )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	dev-build/libtool"
+
+PATCHES=( "${FILESDIR}/${PN}-3.6.1-qt6-src.patch"
+	"${FILESDIR}/${PN}-3.6.1-qt6-build.patch" )
+
+src_prepare() {
+	eapply "${PATCHES[@]}"
+	eapply -p0 "${FILESDIR}"/${PN}-3.6-tinfo.patch
+	# Bug# 837617 and 858278
+	sed -i -e "s/curses, initscr/ncurses, initscr/" \
+		-e "s/_curses_initscr/_ncurses_initscr/" configure.ac || die
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
+		$(use_enable pulseaudio ) \
+		$(use_enable alsa ) \
+		$(use_enable ncurses cwcp ) \
+		$(use_enable qt6 xcwcp ) \
+		--disable-static
+}
+
+src_install() {
+	default
+
+	if ! use suid ; then
+		fperms 711 /usr/bin/cw
+		if use ncurses ; then
+			fperms 711 /usr/bin/cwcp
+		fi
+		if use qt6 ; then
+			fperms 711 /usr/bin/xcwcp
+		fi
+	fi
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
+
+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 b7d6add082d5..23c3e8379426 100644
--- a/media-radio/wsjtx/Manifest
+++ b/media-radio/wsjtx/Manifest
@@ -4,6 +4,8 @@ AUX wsjtx-2.7.0_rc4-fix_NFFT.patch 431 BLAKE2B c8fcdd3cf934d596a4769a404f57acf58
 AUX wsjtx-clang.patch 619 BLAKE2B 8019381b563bfede3977e37c96c0c664089458f0be7704a5267eece14a48b8cbd4a6348803d4a4e4ef0023006363e26f89f03788ac20f01d227126952f8d2375 SHA512 cf40f9ad542ca07f70ae507a74625663541c05968e1cac78eff7ec1fc0668b683b62ed35effc03b7028a317694e1056b70b862169900f3dc9655ae1ba057210d
 DIST wsjtx-2.6.1.tgz 25624658 BLAKE2B 16181ea18611bf1bfaae78e4c5bf000d53cdb4401d1d07a7bd96a041c6da3bc385df71ddabb13a191fa32bd5579c7a330c2dff9a7b3e438222fd8a4ebb44412c SHA512 0f151c10b75798ab28a01604b08981f399d612135b7e9ddc3e66f9121fd49c97bb9508ce649e342791705ee5e1247f8e461a31afa871ddd46da1cf7fd5826c74
 DIST wsjtx-2.7.0-rc4.tgz 26111191 BLAKE2B 5cdbcf988209fbdad3e632cdea1535378ab69848308abc59b729a2ab3fc892319ce135b620ff8b531d9afc276c18cef65ca2560874190a57fc06990742bae16c SHA512 0960b48d83fcf1461217a15472530d04ad6276b9fe54ee33ac5ad7b32a2346e52fdfa72966c2263816066155b5ef9f1ff1a941704979f097501361c9fb379c1a
+DIST wsjtx-2.7.0-rc8.tgz 26484776 BLAKE2B dc04a0884a7ddf8d3db26926c46895f7561c8037a981ddd1c4676ec5b39eef0cb9b69aab6f4ef70f99244e5d5a5fa8f390f4ca484795ef92656ca2f36fabe97a SHA512 57026cc4f5f04174589d1a0a7496c1716c1fbbccdacb528953408c3a93cb35287bb763a5d43db791e567ac9380942a1515d434b3731f08d31d0b2a68d97e9d6a
 EBUILD wsjtx-2.6.1.ebuild 1728 BLAKE2B fc1e0edf2dadb46b6e2612e5b8bf3ec5c4405b1a1f9e13effe21f7fd51ff4f5434f41b7fe1ca5c365f50254ee498521b23989559e28e1ce5b3a83581c88a6e85 SHA512 f77f9285d27c9b8be1adabec1161bd90587f6cb7a7a7802af47b1c900f9abadb5528e9cc6ef084e0d20898bd63f708c0f100137cb80d2334cca8693f93de3388
 EBUILD wsjtx-2.7.0_rc4.ebuild 1787 BLAKE2B 3f41cddff81abfd65ea715bdd17add16f936ac4349108e47b1ed4f5ae253e291b2262474a3d930ebffb39e14c7ba5e9d6649990eb5e08594c60dc3aefa190035 SHA512 dd1d71d1d2a58d7d353b98e8dd18a67a668a1ff6835c4a53a3bbdf9dd71ed9a7ff2faa9d0d7c6944737f38a817edac04eca357378ba686d59afe5b4ebccb9dc2
+EBUILD wsjtx-2.7.0_rc8.ebuild 1753 BLAKE2B 606912c81cbb860d36af6320d34eb4582a9f1afc05ff13cf3c720ec29352f19bda23ce862611ba48f41388810648ffaad7f4482490866a9eb44759e0d00444f9 SHA512 aef7f9b87e192518164b23dcbdfd155b4d45fb8f7d6b7759189df1ff7bd055b764e20efa9762b53b6a7f411f549e67a96fcdce5b0e687cf55cf9f88dd70fe0a7
 MISC metadata.xml 412 BLAKE2B a8910c8ec81f720c209c3d9cb6cdfbde76be4c5a96941dfc3b799e9ba6b4d967928508c04bc5805536319a20f0b7cb292a2475f91de27471c11b9fd0f9073bec SHA512 2215cd7cea5ed62ef70bb2823ce85628877e3c204f7a55e582431c2d90ec8f77e6523b3e81c1747b339d58eeaf7c026ea26b6245af86294904e1c34887da943f
diff --git a/media-radio/wsjtx/wsjtx-2.7.0_rc8.ebuild b/media-radio/wsjtx/wsjtx-2.7.0_rc8.ebuild
new file mode 100644
index 000000000000..bf4446ce768a
--- /dev/null
+++ b/media-radio/wsjtx/wsjtx-2.7.0_rc8.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake edos2unix flag-o-matic
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Weak signal ham radio communication"
+HOMEPAGE="https://physics.princeton.edu//pulsar/K1JT/wsjtx.html"
+SRC_URI="https://downloads.sourceforge.net/wsjt/${MY_P}.tgz"
+
+S=${WORKDIR}/wsjtx
+
+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}"
+BDEPEND="dev-qt/linguist-tools"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.0-werror.patch"
+	"${FILESDIR}/${PN}-2.3.0-drop-docs.patch"
+	"${FILESDIR}/${PN}-clang.patch"
+)
+
+DOCS=( AUTHORS BUGS NEWS README THANKS )
+
+src_unpack() {
+	unpack ${A}
+	unpack "${WORKDIR}/${PN}-2.7.0/src/wsjtx.tgz"
+}
+
+src_prepare() {
+	edos2unix "${S}/message_aggregator.desktop"
+	edos2unix "${S}/wsjtx.desktop"
+	edos2unix "${S}/CMakeLists.txt"
+	sed -i -e "s/COMMAND \${GZIP_EXECUTABLE}/#  COMMAND/" \
+								manpages/CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	# fails to compile with -flto (bug #860417)
+	filter-lto
+
+	local mycmakeargs=(
+		-DWSJT_GENERATE_DOCS="$(usex doc)"
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+	)
+	append-ldflags -no-pie
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	rm "${D}"/usr/bin/rigctl{,d,com}-wsjtx || die
+	rm "${D}"/usr/share/man/man1/rigctl{,d,com}-wsjtx.1 || die
+}
diff --git a/media-radio/xlog/Manifest b/media-radio/xlog/Manifest
index 77efc5d4987c..8a0db29b289a 100644
--- a/media-radio/xlog/Manifest
+++ b/media-radio/xlog/Manifest
@@ -1,8 +1,5 @@
 AUX xlog-2.0.24-musl.patch 1561 BLAKE2B fb65f5e702a8103f30b41b2248187cc8c923a9d765e618328baba893fb7004541078ded9ca3b197126f7163331061802d28fd42c177f38d543f9a6ab2c9a249f SHA512 68071bfa84d2b14738801ce0ecdd668a77373fc6d92a10d84e68768a4c8790f18ed7d4b8a4dc3abb10672cde8f1574ae97b6d4afab372e019873cb61903a41d7
 AUX xlog-2.0.25-desktop.patch 365 BLAKE2B 5fa972a9a9c9c7f31aaf3a80aa08bd665db94023a514bc6b3c519ae6e857ce7d162493a0dfb22490e59b103db5d426acaa79e05d614be19a2110d79372ab2b41 SHA512 11a94639766050369ba4a86c4e5f3f0331312bad5bbb1b9cf2b4c5f53525a688b53e4c2309d04284d1de31843168db291cb6011afe6e6ac4979bd6f6a571e47a
-AUX xlog-2.0.7-desktop.patch 435 BLAKE2B 56fee116a69c99f5192f1a2e4804821d715dd15f927525694100471b296412675eb97237c7e239cc407a2ffb145dbf779e802c1a1f5914a064d70f73ad269d12 SHA512 5119356e9635ca7b6d028d4bb3be12542636ce5d2967540b20ad9c22d62792b81a1a06fcd8722c7cbe8df706d8113e60b308d1db7c6fa8f3238bea039eb4b4f6
-DIST xlog-2.0.24.tar.gz 11407825 BLAKE2B 0de5203d4229005ba84940443672a9787a9ab2a87565bcbf47e0a0fcf375dcddec7636d11a359a117c42b7e07ea81fd482a2684b8a75379da1fe72cbc991643d SHA512 cc96dfabf01a6c49ed7db1257cc102a469642bdd32a158b0a026da2017181060f8aace5de22ada5df42b3bc89c14448dd372332a9ff0101121570f5b1187e5ab
 DIST xlog-2.0.25.tar.gz 11425326 BLAKE2B d0d14a79090a37c45456da7120089193c02d2fb3df30e8e5780bc40287e4f3a0e4e444613a07b5135502c771c2bd650d81966fc59658140740259fcbca509c9f SHA512 3ce5b27a0529885862a8c5256162068504e05cbbca6e0fc6cf492bfabbb2aa84b82a54502319646ee49e78aac6cd2b685877ec3687fb962c59c8648e0be4e121
-EBUILD xlog-2.0.24.ebuild 1926 BLAKE2B 3eeece725336449efa7466efba83376f5581535540cc5de81b2460549caf6d69d5791e7d3c37abb3e0bebde45ffc5b0e601aa38751488ec3c7b3bd6e4442735c SHA512 7d3f5287c577c9756048865ca8e6c57bfcfd56e16baad0e1515e820b5c715dc498ad37eae48909df842439dd2f3de47e7e865216e579ca3c930485fd8cc9fff8
 EBUILD xlog-2.0.25.ebuild 1969 BLAKE2B e56727d866da03264be9a5004a5363593a8b24c21670f5673dc7f95c5c6619ccf00a4a22f03cbb123a87750d32699cae8a712013c56b23d1ca50b02873aec698 SHA512 cf009f68ddf47aa712df71732881dce946bc57777ce28f6bf32812011af6b5ce0a8ab326bddfef3d5e7f92a20bb13ccc738e1858e06762168d2bdf3748a366d9
 MISC metadata.xml 246 BLAKE2B 0e24c5acb9f25df4ce675d772f01ef4cca1df3e885dff8c64c0c6f255b9ec49c4761ee159c30a35f77bbeefa1ec62ac6e835d2facdae2b63fbf0d6b350ac23b0 SHA512 be18486abf39193c34501128c8f1bf7e1886b74a7d551735d00c3492c7bae8845ba2dbea93b2ca73d5467cb7764d90b670014143ae8a8ca0a480a02d9af60efb
diff --git a/media-radio/xlog/files/xlog-2.0.7-desktop.patch b/media-radio/xlog/files/xlog-2.0.7-desktop.patch
deleted file mode 100644
index e124e062351c..000000000000
--- a/media-radio/xlog/files/xlog-2.0.7-desktop.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- data/desktop/xlog.desktop.orig	2013-05-24 08:23:25.000000000 +0200
-+++ data/desktop/xlog.desktop	2013-05-24 08:24:47.000000000 +0200
-@@ -5,8 +5,8 @@
- Comment[pl]=Dziennik łączności dla radioamatorów
- TryExec=xlog
- Exec=xlog %F
--Icon=xlog-icon.png
-+Icon=xlog-icon
- Terminal=false
- Type=Application
--Categories=Utility;Database;HamRadio;GTK
--MimeType=text/x-xlog
-+Categories=Utility;Database;HamRadio;GTK;
-+MimeType=text/x-xlog;
diff --git a/media-radio/xlog/xlog-2.0.24.ebuild b/media-radio/xlog/xlog-2.0.24.ebuild
deleted file mode 100644
index 0acd2ca85fe3..000000000000
--- a/media-radio/xlog/xlog-2.0.24.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2024 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"
-
-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"
-	eapply "${FILESDIR}/${PN}-2.0.24-musl.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
-}