12 files changed, 272 insertions, 136 deletions
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index 8a5e87a0f241..a3d3d10eb3bf 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/grig/Manifest b/media-radio/grig/Manifest
index 4aeef6caf4f2..dbd56f4a7666 100644
--- a/media-radio/grig/Manifest
+++ b/media-radio/grig/Manifest
@@ -1,4 +1,5 @@
 AUX grig-0.8.1-hamlib4.patch 3897 BLAKE2B f855040e1860d840cc993c46a0b17a341d3820f342dc1082e2a4a9ed5f1b598f50ba61215add86f6c1b59afef04194d82a80a2de1f033328e37e0edfe51f422f SHA512 b8573228232d24fe0fd750857a5b60a358279fd5e3a07dde9eff18ed3b38c09ff4bf693f63ad9f63f691d3b8937e0a7e7dff222f9aaa74d53bd064b3adf379cf
+AUX grig-0.8.1-hamlib42.patch 6661 BLAKE2B 2ba2f54d9f6d5571862ced26fdc300198c33b7430f8ea5787c02b640c80de769fcd3cecd7d44b1ec943e6a9d88d9fec322ef57c2c363d704ddefbc484bac2bc2 SHA512 c302618a824b2cb79403ca58a5506fdf0005f07ba0e0f6ef9569f0ee4043ead86589bffd9f990265253f620eddc204a4ecd9ebbf4e2cfa421d97ed7eac55e1c6
 DIST grig-0.8.1.tar.gz 621728 BLAKE2B 096ac037d3e5871e32bbb80669e2bafdf061c28c420362e26aea9f01f2e399a4cb769e65aa8261b0726444d08006495de13c62ca9d9e094c44fd8cb28b36a3f1 SHA512 84eda8db5d18324f26f0775483c8272296aad05dd75f0572c01a3c7af6dbd14bff7b98cc6a61fe3c43d25193866be4b3dafdc4e68dfc37217e88b53ca53266f9
-EBUILD grig-0.8.1-r1.ebuild 708 BLAKE2B cc8849de1ba6fec66c71fc8fe9d9d0f4706b426945342946d9deef3c12a4bab5489921d3276346ff5293cd40d88a0c77dbdf5e37bfd5cac351db9b411ef9ea30 SHA512 b23d9d72836a169ab7e9be20974593095a65c70fd9d23ef48a0e641814ecd4b9080fcc872e5d219a096d38b6968dc3a676cdd09943218caa3760b4a9c996d0e8
+EBUILD grig-0.8.1-r1.ebuild 913 BLAKE2B 163eeb4716e0d5a71ee7bca0a3fbd02325226598b630b6a5a08aa707832899d8e25fa3a8141fe025e1aeff0e63d6ad5c54f5943ef954b8575ef97715e0a3f8aa SHA512 816ac3ff3765f15799eca881af3fec07a4d3f2ae6441a69d4615056e22a0ae042d50854d19b19540e540854231d656c461500a25ce3ab1ee78078e9d0b3cd4b7
 MISC metadata.xml 332 BLAKE2B 79bcf349f891026edaa1a92ff783eec4e1800f8c5b86c8b500b799c5be8605f0c9fd150e623a70446b9637a78b93b12ec35b1b259dc64d672cbb2c1dcd416aca SHA512 4f7b94abe8a2e6106a68f77e32aac0156c5d138b2eda01d4cc3e1c51c3fc530c75992c0b6e901a083f98028d751876359c3e7d06465cabb5988174b5d28b4e9e
diff --git a/media-radio/grig/files/grig-0.8.1-hamlib42.patch b/media-radio/grig/files/grig-0.8.1-hamlib42.patch
new file mode 100644
index 000000000000..16c2dc851816
--- /dev/null
+++ b/media-radio/grig/files/grig-0.8.1-hamlib42.patch
@@ -0,0 +1,203 @@
+diff --git a/src/rig-daemon-check.c b/src/rig-daemon-check.c
+index 932a84c..07045bd 100644
+--- a/src/rig-daemon-check.c
++++ b/src/rig-daemon-check.c
+@@ -884,7 +884,7 @@ rig_daemon_check_level     (RIG               *myrig,
+ 	if (has_get->att || has_set->att) {
+ 		int i = 0;
+ 
+-		while ((i < MAXDBLSTSIZ) && (myrig->state.attenuator[i] != 0)) {
++		while ((i < HAMLIB_MAXDBLSTSIZ) && (myrig->state.attenuator[i] != 0)) {
+ 			rig_data_set_att_data (i, myrig->state.attenuator[i]);
+ 			i++;
+ 		}
+@@ -895,7 +895,7 @@ rig_daemon_check_level     (RIG               *myrig,
+ 	if (has_get->preamp || has_set->preamp) {
+ 		int i = 0;
+ 
+-		while ((i < MAXDBLSTSIZ) && (myrig->state.preamp[i] != 0)) {
++		while ((i < HAMLIB_MAXDBLSTSIZ) && (myrig->state.preamp[i] != 0)) {
+ 			rig_data_set_preamp_data (i, myrig->state.preamp[i]);
+ 			i++;
+ 		}
+diff --git a/src/rig-daemon.c b/src/rig-daemon.c
+index 0070283..c8e0ee5 100644
+--- a/src/rig-daemon.c
++++ b/src/rig-daemon.c
+@@ -537,7 +537,7 @@ rig_daemon_start       (int          rigid,
+ 	}
+ 
+ 	/* configure and open rig device */
+-	strncpy (myrig->state.rigport.pathname, rigport, FILPATHLEN);
++	strncpy (myrig->state.rigport.pathname, rigport, HAMLIB_FILPATHLEN);
+ 	g_free (rigport);
+ 
+ 	/* set speed if any special whishes */
+diff --git a/src/rig-data.c b/src/rig-data.c
+index cc76268..1858a8d 100644
+--- a/src/rig-data.c
++++ b/src/rig-data.c
+@@ -64,10 +64,10 @@ grig_cmd_avail_t has_get;  /*!< Flags to indicate reading capabilities. */
+ 
+ 
+ /** \brief List of attenuator values (absolute values). */
+-static int att[MAXDBLSTSIZ];
++static int att[HAMLIB_MAXDBLSTSIZ];
+ 
+ /** \brief List of preamp values. */
+-static int preamp[MAXDBLSTSIZ];
++static int preamp[HAMLIB_MAXDBLSTSIZ];
+ 
+ /** \brief Bit field of available VFO's */
+ static int vfo_list;
+@@ -116,7 +116,7 @@ rig_data_set_vfos         (int vfos)
+ void
+ rig_data_set_att_data (int index, int data)
+ {
+-	if ((index >= 0) && (index < MAXDBLSTSIZ))
++	if ((index >= 0) && (index < HAMLIB_MAXDBLSTSIZ))
+ 		att[index] = data;
+ }
+ 
+@@ -132,7 +132,7 @@ rig_data_set_att_data (int index, int data)
+ int
+ rig_data_get_att_data (int index)
+ {
+-	if ((index >= 0) && (index < MAXDBLSTSIZ)) {
++	if ((index >= 0) && (index < HAMLIB_MAXDBLSTSIZ)) {
+ 		return att[index];
+ 	}
+ 	else {
+@@ -158,7 +158,7 @@ rig_data_get_att_index    (int data)
+ 		return -1;
+ 
+ 	/* scan through the array */
+-	while ((i < MAXDBLSTSIZ) && (att[i] != 0)) {
++	while ((i < HAMLIB_MAXDBLSTSIZ) && (att[i] != 0)) {
+ 		if (att[i] == data) {
+ 			return i;
+ 		}
+@@ -182,7 +182,7 @@ rig_data_get_att_index    (int data)
+ void
+ rig_data_set_preamp_data (int index, int data)
+ {
+-	if ((index >= 0) && (index < MAXDBLSTSIZ))
++	if ((index >= 0) && (index < HAMLIB_MAXDBLSTSIZ))
+ 		preamp[index] = data;
+ }
+ 
+@@ -198,7 +198,7 @@ rig_data_set_preamp_data (int index, int data)
+ int
+ rig_data_get_preamp_data (int index)
+ {
+-	if ((index >= 0) && (index < MAXDBLSTSIZ)) {
++	if ((index >= 0) && (index < HAMLIB_MAXDBLSTSIZ)) {
+ 		return preamp[index];
+ 	}
+ 	else {
+@@ -225,7 +225,7 @@ rig_data_get_preamp_index    (int data)
+ 		return -1;
+ 
+ 	/* scan through the array */
+-	while ((i < MAXDBLSTSIZ) && (preamp[i] != 0)) {
++	while ((i < HAMLIB_MAXDBLSTSIZ) && (preamp[i] != 0)) {
+ 		if (preamp[i] == data) {
+ 			return i;
+ 		}
+diff --git a/src/rig-gui-buttons.c b/src/rig-gui-buttons.c
+index ae95f4d..6873447 100644
+--- a/src/rig-gui-buttons.c
++++ b/src/rig-gui-buttons.c
+@@ -283,10 +283,10 @@ rig_gui_buttons_create_att_selector    ()
+     /* add ATT OFF ie. 0 dB */
+     gtk_combo_box_append_text (GTK_COMBO_BOX (att), _("ATT OFF"));
+ 
+-    /* note: MAXDBLSTSIZ is defined in hamlib; it is the max size of the
++    /* note: HAMLIB_MAXDBLSTSIZ is defined in hamlib; it is the max size of the
+         ATT and preamp arrays.
+     */
+-    while ((i < MAXDBLSTSIZ) && rig_data_get_att_data (i)) {
++    while ((i < HAMLIB_MAXDBLSTSIZ) && rig_data_get_att_data (i)) {
+ 
+         text = g_strdup_printf ("-%d dB", rig_data_get_att_data (i));
+         gtk_combo_box_append_text (GTK_COMBO_BOX (att), text);
+@@ -343,10 +343,10 @@ rig_gui_buttons_create_preamp_selector    ()
+     /* add ATT OFF ie. 0 dB */
+     gtk_combo_box_append_text (GTK_COMBO_BOX (preamp), _("PREAMP OFF"));
+ 
+-    /* note: MAXDBLSTSIZ is defined in hamlib; it is the max size of the
++    /* note: HAMLIB_MAXDBLSTSIZ is defined in hamlib; it is the max size of the
+         ATT and preamp arrays.
+     */
+-    while ((i < MAXDBLSTSIZ) && rig_data_get_preamp_data (i)) {
++    while ((i < HAMLIB_MAXDBLSTSIZ) && rig_data_get_preamp_data (i)) {
+ 
+         text = g_strdup_printf ("%d dB", rig_data_get_preamp_data (i));
+         gtk_combo_box_append_text (GTK_COMBO_BOX (preamp), text);
+diff --git a/src/rig-gui-info.c b/src/rig-gui-info.c
+index 53733bf..d73ef2d 100644
+--- a/src/rig-gui-info.c
++++ b/src/rig-gui-info.c
+@@ -714,7 +714,7 @@ rig_gui_info_create_tunstep_frame  ()
+ 	/* Create a table with enough rows to show the
+ 	   max possible number of unique tuning steps.
+ 	*/
+-	table = gtk_table_new (TSLSTSIZ, 2, FALSE);
++	table = gtk_table_new (HAMLIB_TSLSTSIZ, 2, FALSE);
+ 
+ 	label = gtk_label_new (NULL);
+ 	gtk_label_set_markup (GTK_LABEL (label), _("<b>STEP</b>"));
+@@ -746,7 +746,7 @@ rig_gui_info_create_tunstep_frame  ()
+ 	      }
+ 	*/
+ 	/* for each available tuning ste */
+-	for (i = 0; i < TSLSTSIZ; i++) {
++	for (i = 0; i < HAMLIB_TSLSTSIZ; i++) {
+ 
+ 		gboolean firsthit = TRUE;   /* indicates whether found mode is the first one
+ 					       for the current tuning step. */
+@@ -757,7 +757,7 @@ rig_gui_info_create_tunstep_frame  ()
+ 		*/
+ 		if (myrig->caps->tuning_steps[i].ts == 0) {
+ 
+-			i = TSLSTSIZ;
++			i = HAMLIB_TSLSTSIZ;
+ 		}
+ 		
+ 		/* otherwise continue */
+@@ -853,7 +853,7 @@ rig_gui_info_create_frontend_frame ()
+ 	text = g_strdup ("");
+ 
+ 	/* loop over all available preamp values and concatenate them into a label */
+-	for (i = 0; i < MAXDBLSTSIZ; i++) {
++	for (i = 0; i < HAMLIB_MAXDBLSTSIZ; i++) {
+ 
+ 		data = rig_data_get_preamp_data (i);
+ 
+@@ -861,7 +861,7 @@ rig_gui_info_create_frontend_frame ()
+ 		   reached the terminator
+ 		*/
+ 		if (data == 0) {
+-			i = MAXDBLSTSIZ;
++			i = HAMLIB_MAXDBLSTSIZ;
+ 		}
+ 		else {
+ 			if (i > 0) {
+@@ -900,7 +900,7 @@ rig_gui_info_create_frontend_frame ()
+ 
+ 	text = g_strdup ("");
+ 	/* loop over all available attenuator values and concatenate them into a label */
+-	for (i = 0; i < MAXDBLSTSIZ; i++) {
++	for (i = 0; i < HAMLIB_MAXDBLSTSIZ; i++) {
+ 
+ 		data = rig_data_get_att_data (i);
+ 
+@@ -908,7 +908,7 @@ rig_gui_info_create_frontend_frame ()
+ 		   reached the terminator
+ 		*/
+ 		if (data == 0) {
+-			i = MAXDBLSTSIZ;
++			i = HAMLIB_MAXDBLSTSIZ;
+ 		}
+ 		else {
+ 			if (i > 0) {
diff --git a/media-radio/grig/grig-0.8.1-r1.ebuild b/media-radio/grig/grig-0.8.1-r1.ebuild
index 998b4e4fa866..07f9ee0da9ba 100644
--- a/media-radio/grig/grig-0.8.1-r1.ebuild
+++ b/media-radio/grig/grig-0.8.1-r1.ebuild
@@ -26,6 +26,17 @@ src_configure() {
 	econf --enable-hardware
 }
 
+src_prepare() {
+	# prepare for media-radio/hamlib-4.2 change of API
+	if has_version '>=media-libs/hamlib-4.2' ; then
+		eapply -p1 "${FILESDIR}"/${P}-hamlib42.patch
+	fi
+
+	eapply ${PATCHES}
+
+	eapply_user
+}
+
 src_install() {
 	default
 	make_desktop_entry ${PN} "GRig" "/usr/share/pixmaps/grig/grig-logo.png" "HamRadio"
diff --git a/media-radio/qsstv/Manifest b/media-radio/qsstv/Manifest
index b9329b49ff19..24fae84294bb 100644
--- a/media-radio/qsstv/Manifest
+++ b/media-radio/qsstv/Manifest
@@ -1,5 +1,3 @@
-DIST qsstv_9.4.4.tar.gz 7716392 BLAKE2B df285cc26c195dce05e54401de4fce70ea91c3af1f774d90d81b62a366c66c3cde4f0cce5c370bad45b81230ca7c2be624542cde10b94d388785d13b49ed646d SHA512 d206c6c108827b607dfe360e7afe31065518f03ab04609ccca9a9bda16207d12966eb49d486d13eebb814716252c50aa5963d090f1e505e508ccb1b6ccc4728c
 DIST qsstv_9.5.3.tar.gz 7466438 BLAKE2B 8d38f106f72e051bf4d100c3c10c6ded15e69dfb33289206cce34bfde9210d5231c4d4ddc695417d5511aa8f33a08866ddb224dd9140863264a7a324cc2ffc2e SHA512 1753bb498163d17c80c3c322eda2725eae3de17c99e07fd99f4223508c3048521547148d69623f16f4192212a754f415e0f12f5fc98527b14bf00afcb3ae7c6d
-EBUILD qsstv-9.4.4-r1.ebuild 1024 BLAKE2B 3e8aff288db025d9195da16829acb6069702e40453c512dd56629d7a490962b148a5b41c4d80782181a13cdb94e415d306dcc26593df2f17271095d95b3f23c9 SHA512 3e7d740eda8e6f26edf59c51dccc3d29906aa76788a2e5a5c774b7dd2201a4670d6c2100de44ec1a189c0a69936a471cb0277173dfad2601fffeefe5e3890918
-EBUILD qsstv-9.5.3.ebuild 1018 BLAKE2B d59249e2992dc6265068ba5f593155461a80cca88fd203867b7b8830f4ae906111ed447d227b707cd2b6760665e7ab19a4aa64fe7ef915fbba974059cb8d6a0c SHA512 a42cf24328830c7f321ed80d312c299fee9ad588518c136d75a6cd2a7524cbc267ea4b04eaae5fe6271c9f6f6e51c5fa9ca58f007538a4f45809ee737f039427
+EBUILD qsstv-9.5.3.ebuild 1209 BLAKE2B 4f428de13d004c0c8fe957bf18389cc8662bc6060411ab587fde01ddc04096433862905b0442dfc9bf75aaac057153b195ace1f36bff98a0e2d67a3600ffdd50 SHA512 1b50c44d59c28b0400e5bdfbe0ff0c3f52f14d3576a3d2c71b1988a48760be1868f50dc2f06c002dd671cb63a334cdf1616aa07f4788f4ee4bcdedc3d35940ad
 MISC metadata.xml 344 BLAKE2B e091d6e9d0f8a59216bf966dae15ff5d0e588e71a53b936b3dbf979603334407a5e6b378f7a756cd0b320eb0c1294573ba0f1dd3ae392318f854d6c7b482db76 SHA512 e3a236b5b670bb921dd8c7ef87153d16a15ab3b10e4e039c2de68253d56d1356e57d1491c16fac6249265d68639a280f592c62f47d906f4b680fa5571ba9ec75
diff --git a/media-radio/qsstv/qsstv-9.4.4-r1.ebuild b/media-radio/qsstv/qsstv-9.4.4-r1.ebuild
deleted file mode 100644
index 8ff1f20da16e..000000000000
--- a/media-radio/qsstv/qsstv-9.4.4-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-MY_P=${P/-/_}
-
-DESCRIPTION="Amateur radio SSTV software"
-HOMEPAGE="http://users.telenet.be/on4qz/"
-SRC_URI="http://users.telenet.be/on4qz/qsstv/downloads/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/hamlib:=
-	media-libs/openjpeg:2
-	media-libs/alsa-lib
-	media-sound/pulseaudio
-	media-libs/libv4l
-	sci-libs/fftw:3.0="
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	x11-misc/xdg-utils"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	eapply_user
-	# fix docdirectory, install path and hamlib search path
-	sed -i -e "s:/doc/\$\$TARGET:/doc/${PF}:" \
-		-e "s:-lhamlib:-L/usr/$(get_libdir)/hamlib -lhamlib:g" \
-		qsstv/qsstv.pro || die
-}
-
-src_configure() {
-	eqmake5 PREFIX="/usr"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	dodoc README.txt
-}
diff --git a/media-radio/qsstv/qsstv-9.5.3.ebuild b/media-radio/qsstv/qsstv-9.5.3.ebuild
index 00291f4897a2..36c2667badf1 100644
--- a/media-radio/qsstv/qsstv-9.5.3.ebuild
+++ b/media-radio/qsstv/qsstv-9.5.3.ebuild
@@ -40,6 +40,12 @@ src_prepare() {
 	sed -i -e "s:/doc/\$\$TARGET:/doc/${PF}:" \
 		-e "s:-lhamlib:-L/usr/$(get_libdir)/hamlib -lhamlib:g" \
 		qsstv.pro || die
+
+	# 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}"/rig/rigcontrol.cpp \
+			|| die
+	fi
 }
 
 src_configure() {
diff --git a/media-radio/tlf/Manifest b/media-radio/tlf/Manifest
index 52e452c0eeeb..59be051557e2 100644
--- a/media-radio/tlf/Manifest
+++ b/media-radio/tlf/Manifest
@@ -1,4 +1,5 @@
 AUX tlf-1.4.1-zone_nr.patch 468 BLAKE2B b9dc26ba4f2775dbdf2f2aacb763a70acbe4c6331a862f9db43774d0bbdeef9214c48f4cf30b0f52de5ab65b9ac157d160b52a19777a640f3a6d53c22187e74d SHA512 e415d62ed1bbb50bf6eedbe5bc93e06c02152bbb7f4a096f9229b3314a21125eec765255a7ddfbd07a478088a5097daaab5f8702d27c04babd5a29a5db7b4e29
 DIST tlf-1.4.1.tar.gz 708105 BLAKE2B 18cd617a8780293bbfec87875491935d16022e104eed128ab69cbc3824aa5f8ab77dd07728d952e9b932ea74ee1c258522c26b5458b715320d452d58a65cfd3c SHA512 89076ba3b870f65b1469d64a223a9d35f1afd3edc6801446990d7ce197b04dacf141efc40382c69c78935a16f386385df0c7b48a040072cecc311cda56d479b5
+EBUILD tlf-1.4.1-r1.ebuild 861 BLAKE2B a13e4f88232691cad9bce217861f3bfec85ae2128931236bdf710d434e89f6d3e5c7d5957af9eda41be45b7996ae1abf9670b442cf3563a63df8f9fe44c339fa SHA512 612f9b0877c1cc382e05ab9b047cae6bf1487bfd49387b8884e896d58e70b49b6704b5268c75b4ad9204204361df65fbe93dbc5880c60701e2455a4868adb2e8
 EBUILD tlf-1.4.1.ebuild 677 BLAKE2B 8f970b1886111ace7ca4d8ba2582b602a2239c60f64cf423ef1f9f54935bbd4e4bc994927d37615ef2d89a9cc2b97d0e55bef79cd7f99a1cfc6fc81fa073eaa8 SHA512 92662a2c44cb6bb7c74e76bb791bc4d1901e406b0fcb316c4eaf8e376bd7db96f979ceea0b94981170f3d844587999c0ce5a4450da80a23963f6460d8d7f8d59
 MISC metadata.xml 249 BLAKE2B d6fa8a349066f9684c68c3086f53e41ebf30b6e313e8e8e752a953c0eaa0853448fe17e5ed46836bc5e149a282a33c7408c675d3b39eb3d59ddc1c1ad86bf716 SHA512 965ae00fa198dd8f5869c4c14ff3e28c7d76be7182be6ba4bedbb68d7138da5be3c8bb993689db2c73ac328456015ebdf018ee1b308d6988067810d1156bd179
diff --git a/media-radio/tlf/tlf-1.4.1-r1.ebuild b/media-radio/tlf/tlf-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..e50113487189
--- /dev/null
+++ b/media-radio/tlf/tlf-1.4.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic
+
+DESCRIPTION="Console-mode amateur radio contest logger"
+HOMEPAGE="http://home.iae.nl/users/reinc/TLF-0.2.html"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-libs/ncurses:=
+	dev-libs/glib:2
+	media-libs/hamlib:=
+	media-sound/sox
+	dev-libs/xmlrpc-c[curl]"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cmocka )"
+
+PATCHES=( "${FILESDIR}"/${P}-zone_nr.patch )
+
+src_prepare() {
+	if has_version '>=media-libs/hamlib-4.2' ; then
+		sed -i -e "s/FILPATHLEN/HAMLIB_FILPATHLEN/g" "${S}"/src/sendqrg.c || die
+	fi
+
+	eapply ${PATCHES}
+	eapply_user
+}
+
+src_configure() {
+	append-ldflags -L/usr/$(get_libdir)/hamlib
+	econf --enable-fldigi-xmlrpc
+}
diff --git a/media-radio/xlog/Manifest b/media-radio/xlog/Manifest
index 56eb36569db8..871b1838805c 100644
--- a/media-radio/xlog/Manifest
+++ b/media-radio/xlog/Manifest
@@ -1,7 +1,5 @@
 AUX xlog-2.0.13-desktop-update.patch 1393 BLAKE2B c44070ad106834a89fa2323b33d5df90f2eaab50e0e3d2a03884a2f997f1e9cf0ac4c9e03e819956e7af09dc538729baac0ae8ac612f06f1b4a44929047795c1 SHA512 7e4f9f83eabf9a598e2e1382c6934240991f3743da50eb0da6b7532435d2dce3264e30aded7b6ca32a685b9b7c203f694268c500c89be76175194c0900296865
 AUX xlog-2.0.7-desktop.patch 435 BLAKE2B 56fee116a69c99f5192f1a2e4804821d715dd15f927525694100471b296412675eb97237c7e239cc407a2ffb145dbf779e802c1a1f5914a064d70f73ad269d12 SHA512 5119356e9635ca7b6d028d4bb3be12542636ce5d2967540b20ad9c22d62792b81a1a06fcd8722c7cbe8df706d8113e60b308d1db7c6fa8f3238bea039eb4b4f6
-DIST xlog-2.0.20.tar.gz 11437051 BLAKE2B a6d6618b62d1f5591cf44efe4ce2e3ba8a1f27bc2fe218f0b65d05f26bb2f8abeea69d3ec2c2009f50209257769647bc6fe9307999f5fede5b72cb0ca9259b16 SHA512 50feaede582ea505021c5530efa702915f2ec6f64e4677055657adbaefca92b3b45b6c6fe5af8d65ed2ae38d0d0e4cda6782fa7781516b5263f738c90fb17c89
 DIST xlog-2.0.22.tar.gz 11407849 BLAKE2B 85d2e904d33ef39883cb8ac086eed4dc7e65503cdccb95e8d33f169d12de4f1ed556a28ac2f40e0044e937185bf4d93fe55608088d6e95744617c9c3a051fb55 SHA512 a261f8e28b75aed9380c29b3da69c7615b0d32346eaf84a0ace5cf77c53407372c4985c599078dba5ed92f77bd8052a74c7dca40028b99bca49cc3164d4ec490
-EBUILD xlog-2.0.20.ebuild 1675 BLAKE2B 9fe9b75b047031fffa73c1a02d53ec550419b4f39d6c08b11acca00efef89318647f6ae753d54b9e8e61ecad9d6ec6833370fdd21b4e5f8865c418b61dc8b2ee SHA512 91cdd27e7805063853a08cfcd214a4f1ee57c4dc7dad8d28dc9137ce8979fc49d59cd5c1b1d0fce8a59fab165b847055800d0ac0605196df9903d919057469fe
-EBUILD xlog-2.0.22.ebuild 1702 BLAKE2B 9eee680d2caf57868645c37c655867a01a1f0dfe9c76f2b168715995cb0539878b607193648554b866b353eb4363f18fc7896274d1760c9425678b14fb9c19db SHA512 a8fb75b1e8b2d82c7d815cbe9ad2a0a03f2cff8c427211460c4233730d38512791c86b45eb7cc393924100063026b714a45d46ca7801464b14008a4339d050bc
+EBUILD xlog-2.0.22.ebuild 1888 BLAKE2B bee6934c6a426de22807f032b2ef5706b2014ea3f13cb36cd9229aac625e220209a1a6a1a33bd5f95086415a612770302d2692dcc228d8c0ff642ce53764874c SHA512 8dd97e60010d3abb1985ebb3f3ead50ea5c867528705eca25035e244d3bd4ffee397c6fde5548d87b0918e636cb71476dfc21b2c7a409370764f5577210808d9
 MISC metadata.xml 245 BLAKE2B 1d0fb3b909203735db219043a3b6ad6a2f3fafff1813f9c9caefdb9206262ff73c4ce6b93c0a8ec7d157148cea478b38d0c835ac9948a66d8ed81726f1b4d93f SHA512 9289d414ccbc30198596601b290cf42a583a093bbd7c5f8889c8ac0e81d8570bc4d42dfcbfe210456120edb910ea8572d6806400adec144f4eeb95fa36ae6ef3
diff --git a/media-radio/xlog/xlog-2.0.20.ebuild b/media-radio/xlog/xlog-2.0.20.ebuild
deleted file mode 100644
index 60591aa739b1..000000000000
--- a/media-radio/xlog/xlog-2.0.20.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 -p0 "${FILESDIR}/${PN}-2.0.7-desktop.patch"
-
-	# Let portage handle updating mime/desktop databases,
-	eapply -p0 "${FILESDIR}/${PN}-2.0.13-desktop-update.patch"
-	# Drop -Werror
-	sed -i -e "s:-Werror::" configure.ac || die
-	# fix underlinking
-	sed -i -e "s:HAMLIB_LIBS@:HAMLIB_LIBS@ -lm:g" src/Makefile.am || die
-	eautoreconf
-
-	# 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 ..."
-
-	eapply_user
-}
-
-src_configure() {
-	# mime-update causes file collisions if enabled
-	econf --disable-mime-update --disable-desktop-update
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	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
-}
diff --git a/media-radio/xlog/xlog-2.0.22.ebuild b/media-radio/xlog/xlog-2.0.22.ebuild
index 7467c2953e50..3b1c9d3c1662 100644
--- a/media-radio/xlog/xlog-2.0.22.ebuild
+++ b/media-radio/xlog/xlog-2.0.22.ebuild
@@ -37,6 +37,11 @@ src_prepare() {
 	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