gentoo resync : 12.03.2021

3 files changed, 114 insertions, 0 deletions

diff --git a/media-radio/grig/Manifest b/media-radio/grig/Manifest
index dd93701bac6c..5680d1a46a24 100644
--- a/media-radio/grig/Manifest
+++ b/media-radio/grig/Manifest
@@ -1,3 +1,5 @@
+AUX grig-0.8.1-hamlib4.patch 3897 BLAKE2B f855040e1860d840cc993c46a0b17a341d3820f342dc1082e2a4a9ed5f1b598f50ba61215add86f6c1b59afef04194d82a80a2de1f033328e37e0edfe51f422f SHA512 b8573228232d24fe0fd750857a5b60a358279fd5e3a07dde9eff18ed3b38c09ff4bf693f63ad9f63f691d3b8937e0a7e7dff222f9aaa74d53bd064b3adf379cf
 DIST grig-0.8.1.tar.gz 621728 BLAKE2B 096ac037d3e5871e32bbb80669e2bafdf061c28c420362e26aea9f01f2e399a4cb769e65aa8261b0726444d08006495de13c62ca9d9e094c44fd8cb28b36a3f1 SHA512 84eda8db5d18324f26f0775483c8272296aad05dd75f0572c01a3c7af6dbd14bff7b98cc6a61fe3c43d25193866be4b3dafdc4e68dfc37217e88b53ca53266f9
+EBUILD grig-0.8.1-r1.ebuild 707 BLAKE2B 64a5e3c62a6a8730b7a0d9f2b66dd7830db16ce7fcb47410a97eab40d8e4241ac10261a3cc353e5ed4c7ec4990115cfc265ba108c5267ccc0bd11d3d9afd9f94 SHA512 0a097576033328fc1a439f9da699d5efa818d6dca6a95f3f1cc422c7695e2a01ad83c6eb4441b93dc240848cc934d34411f2210a1b29554c7ba2163e681ce652
 EBUILD grig-0.8.1.ebuild 653 BLAKE2B d206a2a2d1d58d40cc9d1071007fe1f3f4fe290e1c339a6517f74973ee82cce8394836d59fc1c7bb57f1d6aaa992e4d54b63966f420a0b428adf68a1dbbe47cc SHA512 faa93641e1a2c26a4358d4a54b90f7036728e44ac88a52a358b95f781fb04f8c06ec3d77d9a7af9182ac5a97aa469d1ccb0ca8818d17f0d13ad25b7112e60bd4
 MISC metadata.xml 332 BLAKE2B 79bcf349f891026edaa1a92ff783eec4e1800f8c5b86c8b500b799c5be8605f0c9fd150e623a70446b9637a78b93b12ec35b1b259dc64d672cbb2c1dcd416aca SHA512 4f7b94abe8a2e6106a68f77e32aac0156c5d138b2eda01d4cc3e1c51c3fc530c75992c0b6e901a083f98028d751876359c3e7d06465cabb5988174b5d28b4e9e
diff --git a/media-radio/grig/files/grig-0.8.1-hamlib4.patch b/media-radio/grig/files/grig-0.8.1-hamlib4.patch
new file mode 100644
index 000000000000..e73a4ec4eb9a
--- /dev/null
+++ b/media-radio/grig/files/grig-0.8.1-hamlib4.patch
@@ -0,0 +1,79 @@
+Picked up from Debians grig-0.8.1-3
+Description: align affected parts for Hamlib4.0
+Author: Ervin Hegedus <airween@gmail.com>
+--- grig-0.8.1.orig/src/rig-daemon.c
++++ grig-0.8.1/src/rig-daemon.c
+@@ -1674,12 +1674,12 @@ rig_daemon_exec_cmd         (rig_cmd_t c
+ 						   is the current frequency within this range?
+ 						*/
+ 						if (((mode & myrig->state.rx_range_list[i].modes) == mode) &&
+-						    (get->freq1 >= myrig->state.rx_range_list[i].start)    &&
+-						    (get->freq1 <= myrig->state.rx_range_list[i].end)) {
++						    (get->freq1 >= myrig->state.rx_range_list[i].startf)    &&
++						    (get->freq1 <= myrig->state.rx_range_list[i].endf)) {
+ 					
+ 							found_mode = 1;
+-							get->fmin = myrig->state.rx_range_list[i].start;
+-							get->fmax = myrig->state.rx_range_list[i].end;
++							get->fmin = myrig->state.rx_range_list[i].startf;
++							get->fmax = myrig->state.rx_range_list[i].endf;
+ 				
+ 							grig_debug_local (RIG_DEBUG_VERBOSE,
+ 									  _("%s: Found frequency range for mode %d"),
+@@ -2971,7 +2971,7 @@ rig_daemon_exec_cmd         (rig_cmd_t c
+ 			val.i = set->voxdel;
+ 
+ 			/* try to execute command */
+-			retcode = rig_set_level (myrig, RIG_VFO_CURR, RIG_LEVEL_VOX, val);
++			retcode = rig_set_level (myrig, RIG_VFO_CURR, RIG_LEVEL_VOXDELAY, val);
+ 
+ 			/* raise anomaly if execution did not succeed */
+ 			if (retcode != RIG_OK) {
+@@ -2996,7 +2996,7 @@ rig_daemon_exec_cmd         (rig_cmd_t c
+ 			value_t val;
+ 
+ 			/* try to execute command */
+-			retcode = rig_get_level (myrig, RIG_VFO_CURR, RIG_LEVEL_VOX, &val);
++			retcode = rig_get_level (myrig, RIG_VFO_CURR, RIG_LEVEL_VOXDELAY, &val);
+ 
+ 			/* raise anomaly if execution did not succeed */
+ 			if (retcode != RIG_OK) {
+--- grig-0.8.1.orig/src/rig-daemon-check.c
++++ grig-0.8.1/src/rig-daemon-check.c
+@@ -398,12 +398,12 @@ rig_daemon_check_mode     (RIG
+ 			*/
+ 			if (!found_mode &&
+ 			    ((mode & myrig->state.rx_range_list[i].modes) == mode) &&
+-			    (get->freq1 >= myrig->state.rx_range_list[i].start)    &&
+-			    (get->freq1 <= myrig->state.rx_range_list[i].end)) {
++			    (get->freq1 >= myrig->state.rx_range_list[i].startf)    &&
++			    (get->freq1 <= myrig->state.rx_range_list[i].endf)) {
+ 					
+ 				found_mode = 1;
+-				get->fmin = myrig->state.rx_range_list[i].start;
+-				get->fmax = myrig->state.rx_range_list[i].end;
++				get->fmin = myrig->state.rx_range_list[i].startf;
++				get->fmax = myrig->state.rx_range_list[i].endf;
+ 				
+ 				grig_debug_local (RIG_DEBUG_VERBOSE,
+ 						  _("%s: Found frequency range for mode %d"),
+--- grig-0.8.1.orig/src/rig-data.h
++++ grig-0.8.1/src/rig-data.h
+@@ -190,7 +190,7 @@ typedef struct {
+ 
+ #define GRIG_LEVEL_RD (RIG_LEVEL_RFPOWER | RIG_LEVEL_AGC | RIG_LEVEL_SWR | RIG_LEVEL_ALC | \
+                        RIG_LEVEL_STRENGTH | RIG_LEVEL_ATT | RIG_LEVEL_PREAMP | \
+-                       RIG_LEVEL_VOX | RIG_LEVEL_AF | RIG_LEVEL_RF | RIG_LEVEL_SQL | \
++                       RIG_LEVEL_VOXDELAY | RIG_LEVEL_AF | RIG_LEVEL_RF | RIG_LEVEL_SQL | \
+                        RIG_LEVEL_IF | RIG_LEVEL_APF | RIG_LEVEL_NR | RIG_LEVEL_PBT_IN | \
+                        RIG_LEVEL_PBT_OUT | RIG_LEVEL_CWPITCH |          \
+                        RIG_LEVEL_MICGAIN | RIG_LEVEL_KEYSPD | RIG_LEVEL_NOTCHF | \
+@@ -198,7 +198,7 @@ typedef struct {
+                        RIG_LEVEL_VOXGAIN | RIG_LEVEL_ANTIVOX)
+ 
+ #define GRIG_LEVEL_WR (RIG_LEVEL_RFPOWER | RIG_LEVEL_AGC | RIG_LEVEL_ATT | RIG_LEVEL_PREAMP | \
+-                       RIG_LEVEL_VOX | RIG_LEVEL_AF | RIG_LEVEL_RF | RIG_LEVEL_SQL | \
++                       RIG_LEVEL_VOXDELAY | RIG_LEVEL_AF | RIG_LEVEL_RF | RIG_LEVEL_SQL | \
+                        RIG_LEVEL_IF | RIG_LEVEL_APF | RIG_LEVEL_NR | RIG_LEVEL_PBT_IN | \
+                        RIG_LEVEL_PBT_OUT | RIG_LEVEL_CWPITCH |          \
+                        RIG_LEVEL_MICGAIN | RIG_LEVEL_KEYSPD | RIG_LEVEL_NOTCHF | \
diff --git a/media-radio/grig/grig-0.8.1-r1.ebuild b/media-radio/grig/grig-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..8a3e3a176bbe
--- /dev/null
+++ b/media-radio/grig/grig-0.8.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop
+
+DESCRIPTION="A tool for controlling amateur radios"
+HOMEPAGE="http://groundstation.sourceforge.net/grig/"
+SRC_URI="mirror://sourceforge/groundstation/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:2
+	>=media-libs/hamlib-4:="
+RDEPEND="${DEPEND}"
+
+PATCHES=( "$FILESDIR"/grig-0.8.1-hamlib4.patch )
+
+src_configure() {
+	econf --enable-hardware
+}
+
+src_install() {
+	default
+	make_desktop_entry ${PN} "GRig" "/usr/share/pixmaps/grig/grig-logo.png" "HamRadio"
+	rm -rf "${D}/usr/share/grig" || die "cleanup docs failed"
+}