6 files changed, 79 insertions, 4 deletions
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index de0b46aecdc3..dbfc56759498 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/grig/Manifest b/media-radio/grig/Manifest
index 5dda731179dd..2a7368bdb93d 100644
--- a/media-radio/grig/Manifest
+++ b/media-radio/grig/Manifest
@@ -1,6 +1,9 @@
 AUX grig-0.8.1-hamlib4.patch 3897 BLAKE2B f855040e1860d840cc993c46a0b17a341d3820f342dc1082e2a4a9ed5f1b598f50ba61215add86f6c1b59afef04194d82a80a2de1f033328e37e0edfe51f422f SHA512 b8573228232d24fe0fd750857a5b60a358279fd5e3a07dde9eff18ed3b38c09ff4bf693f63ad9f63f691d3b8937e0a7e7dff222f9aaa74d53bd064b3adf379cf
 AUX grig-0.8.1-hamlib42.patch 6661 BLAKE2B 2ba2f54d9f6d5571862ced26fdc300198c33b7430f8ea5787c02b640c80de769fcd3cecd7d44b1ec943e6a9d88d9fec322ef57c2c363d704ddefbc484bac2bc2 SHA512 c302618a824b2cb79403ca58a5506fdf0005f07ba0e0f6ef9569f0ee4043ead86589bffd9f990265253f620eddc204a4ecd9ebbf4e2cfa421d97ed7eac55e1c6
 AUX grig-0.8.1-hamlib45.patch 538 BLAKE2B b75374d210e633ce4dd02d2bf88946e54ebe444053ea3b2ad543f8ff74205d7466f378de5fc4f222f0ba8658feac4b502c1ee686eaca49cde16b62bab2c9784b SHA512 4ba44fb93c3c730c9903f51990696910f6b7959ec99312d424c78fe837cc81297a4e3e00c814ff3617186dc8b29c41d496b82517a4a4df72a5943e21ed5a3180
+AUX grig-0.8.1-hamlib46.patch 1390 BLAKE2B c25f8a5c51d9f6767a53a575559df0ba7c4a5360a4e1302f2cc425f614a22e818502bd936d27752663b6b8f8c909c03f3b4ff9d28de93e1da21a2bef2327111c SHA512 4f3d7c011f974ef8daa5e9647697a769e8f085fbe30c1f6c45395d122a0a68d35d72f9b4bf3d0e0fd43aaf841dcfd8fb30cc6669a21de62091abb02adf4c4f47
 DIST grig-0.8.1.tar.gz 621728 BLAKE2B 096ac037d3e5871e32bbb80669e2bafdf061c28c420362e26aea9f01f2e399a4cb769e65aa8261b0726444d08006495de13c62ca9d9e094c44fd8cb28b36a3f1 SHA512 84eda8db5d18324f26f0775483c8272296aad05dd75f0572c01a3c7af6dbd14bff7b98cc6a61fe3c43d25193866be4b3dafdc4e68dfc37217e88b53ca53266f9
-EBUILD grig-0.8.1-r1.ebuild 965 BLAKE2B ec2d98433cd50cfc9a4cb14891379351bd7a9c0e123990274115303454afac8d83ee946333377cc3b6a5e70f460f60d5b5dba7a56ab8c38f2f1864b02978020f SHA512 c0159a0489573e8ee5c4de7ffc2c24f12aa99cd40071fa708e16029948cbe889d366d8022becc784cca6343d460aaaef9013cd258b4167fe4e7c4405101323c8
-MISC metadata.xml 333 BLAKE2B 2620dd12d47c52bbb817b5c59be52e6abb64cb0dcc1bfa30cef17c492d5270004fcb463e7343ddae0000e8860a65a166150dced485b8149c60a72f3e9b70458f SHA512 92080dd701954afba50bb5d90bae583cabc730d2cf57045c9326657803c90ef0a8d2c55fbee3105298633fd9535e167525444cd16738653c02a8ecca777ffd6d
+DIST grig-0.9.0.tar.gz 636750 BLAKE2B 41332da0c1a9f1f938e94ad4624e2614e84829ca36d272566eeac16935de34a0b3d19c67163bda3d7c35b78158d1adb750f247709a8fa4978a45ff1daac0f7b9 SHA512 95ec5be163aaaa405ce4712f445e327fc18a0350e8a827bbed5ef0bbe22f28643e02bf352ab67dbbc4e25a1444f6097b96f31f2aba9069b47173c7450ba5d90a
+EBUILD grig-0.8.1-r1.ebuild 1009 BLAKE2B 9df4559a04482f2109dc70dce2e3a9e09fd55b0017726e39b0b7bb964b22f7971d379d3fcafaed4f26f89cd32fe87837c0e6e23fd71595118e5f45879d0061bc SHA512 4eb47dd197e4a97b8112649394bc77367aa1444cc8e09b514825145c189884fa71ce62676c0dd28242ac15fbb09700d520951920ab4863ad60be5118d01e8cd3
+EBUILD grig-0.9.0.ebuild 800 BLAKE2B c3a3ec73f2fc2090599e87424aec24b0001dbd3f3610146154c85598b293bf8185a12ffb04c595e3db15f046769a2f2357eb5d85de759e3c2e1eff419953aaed SHA512 d9b67bb151361297a6da252d28d92b46735db3343268dcabca9a8c113e28cf8795912ff0c6b083af0357e15bc945876e96faf7e72b2ecc4640f102d16e87fefd
+MISC metadata.xml 385 BLAKE2B e9ae522aa26c04e336171d55150b7d556f94de477f2c8a8202eb82cea28d77034781d8e0ed7d17803b498d626f3fe04e34712d4d44696993c0346718f8e7b2cf SHA512 713238d7ec0936b9d73b2ec9cfa268c2b66d487afa93b893ab8711b03fa83ceb61ec30021be02e47438bea1171edf319c5e9093989b5aad11f381ccdf0c1605d
diff --git a/media-radio/grig/files/grig-0.8.1-hamlib46.patch b/media-radio/grig/files/grig-0.8.1-hamlib46.patch
new file mode 100644
index 000000000000..ce6cc80c0123
--- /dev/null
+++ b/media-radio/grig/files/grig-0.8.1-hamlib46.patch
@@ -0,0 +1,30 @@
+# see discussion at https://github.com/fillods/grig/issues/22
+diff --git a/src/rig-selector.c b/src/rig-selector.c
+index 53c7e7c..4b7a0de 100644
+--- a/src/rig-selector.c
++++ b/src/rig-selector.c
+@@ -46,7 +46,7 @@ static void add     (GtkWidget *, gpointer);
+ static void delete  (GtkWidget *, gpointer);
+ static void edit    (GtkWidget *, gpointer);
+ static void cancel  (GtkWidget *, gpointer);
+-static void connect (GtkWidget *, gpointer);
++static void connectrig(GtkWidget *, gpointer);
+ static void selection_changed (GtkTreeSelection *sel, gpointer data);
+ 
+ static void render_civ (GtkTreeViewColumn *col,
+@@ -191,7 +191,7 @@ rig_selector_execute ()
+     g_signal_connect (G_OBJECT (cancbut), "clicked",
+                       G_CALLBACK (cancel), window);
+     g_signal_connect (G_OBJECT (conbut), "clicked",
+-                      G_CALLBACK (connect), window);
++                      G_CALLBACK (connectrig), window);
+     g_signal_connect (G_OBJECT (delbut), "clicked",
+                       G_CALLBACK (delete), NULL);
+     g_signal_connect (G_OBJECT (newbut), "clicked",
+@@ -439,7 +439,7 @@ static void cancel (GtkWidget *button, gpointer window)
+  * simply destroys the rig selector window and whereby control is returned
+  * to the main() function.
+  */
+-static void connect (GtkWidget *button, gpointer window)
++static void connectrig(GtkWidget *button, gpointer window)
+ {
diff --git a/media-radio/grig/grig-0.8.1-r1.ebuild b/media-radio/grig/grig-0.8.1-r1.ebuild
index 04e2f3723d8c..7d8dd1f84b6d 100644
--- a/media-radio/grig/grig-0.8.1-r1.ebuild
+++ b/media-radio/grig/grig-0.8.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,8 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}"/grig-0.8.1-hamlib4.patch
-		  "${FILESDIR}"/grig-0.8.1-hamlib45.patch )
+		  "${FILESDIR}"/grig-0.8.1-hamlib45.patch
+		  "${FILESDIR}"/grig-0.8.1-hamlib46.patch )
 
 src_configure() {
 	econf --enable-hardware
diff --git a/media-radio/grig/grig-0.9.0.ebuild b/media-radio/grig/grig-0.9.0.ebuild
new file mode 100644
index 000000000000..9ec9c6e4e2ab
--- /dev/null
+++ b/media-radio/grig/grig-0.9.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+MY_P=${P^^//./_}
+
+DESCRIPTION="A tool for controlling amateur radios"
+HOMEPAGE="http://groundstation.sourceforge.net/grig/"
+SRC_URI="https://github.com/fillods/grig/releases/download//${MY_P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:2
+	>=media-libs/hamlib-4:="
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/grig-0.8.1-hamlib46.patch )
+
+src_configure() {
+	econf --enable-hardware
+}
+
+src_prepare() {
+	eapply ${PATCHES[@]}
+
+	eapply_user
+}
+
+src_install() {
+	default
+	make_desktop_entry ${PN} "GRig" "/usr/share/pixmaps/grig/grig-logo.png" "HamRadio"
+	rm -rf "${ED}/usr/share/grig" || die "cleanup docs failed"
+}
diff --git a/media-radio/grig/metadata.xml b/media-radio/grig/metadata.xml
index a0b9bf0dfeb4..57ec3fe60612 100644
--- a/media-radio/grig/metadata.xml
+++ b/media-radio/grig/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Thomas Beierlein</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">fillods/grig</remote-id>
 		<remote-id type="sourceforge">groundstation</remote-id>
 	</upstream>
 </pkgmetadata>