diff --git a/net-wireless/op25/Manifest b/net-wireless/op25/Manifest
index f711b88e2..8d3ce22ba 100644
--- a/net-wireless/op25/Manifest
+++ b/net-wireless/op25/Manifest
@@ -1 +1 @@
-DIST op25-20210818.tar.gz 831222 BLAKE2B 0ce50444faa5750fc1cedcf2ceb08a844e76862371ff8cab82c693054cf3513b26a766043972a1f0454d9925fd843fa80c1b1f8651999e51621dee4683d2ecb4 SHA512 485db603302d9a7cf742f9ae1ee299370d122991e6184fe654e26524e397f96a41be4f990f903813aba6325660159862da88effa5f7f95dd23ac56307c810183
+DIST op25-20240327.tar.gz 1019376 BLAKE2B 2b712a9b7b9d567c78a8d66a7f3cf053366185c0752ecdb339607842812e703a53857830f60ad000154e4631ba44b1cac0a09ead1fca9b0935cc71c256feafc8 SHA512 b26524432694e41e5b7c0fdc24d1b6417d97c629ffea6c03954f4598fe3c6f032beb1fb0026f9292943b240816eedab46d8d1f33ed33a92e16dd16fe4204b268
diff --git a/net-wireless/op25/metadata.xml b/net-wireless/op25/metadata.xml
index ace7c2d3a..8b7cbd84c 100644
--- a/net-wireless/op25/metadata.xml
+++ b/net-wireless/op25/metadata.xml
@@ -2,7 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>unknown@pentoo.ch</email>
-		<name>Author Unknown</name>
+		<email>sidhayn@gmail.com</email>
+		<name>Zero_Chaos</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">boatbod/op25</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-wireless/op25/op25-20210818.ebuild b/net-wireless/op25/op25-20240327.ebuild
similarity index 77%
rename from net-wireless/op25/op25-20210818.ebuild
rename to net-wireless/op25/op25-20240327.ebuild
index 7894ea596..3631855ee 100644
--- a/net-wireless/op25/op25-20210818.ebuild
+++ b/net-wireless/op25/op25-20240327.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 
@@ -12,25 +12,28 @@ HOMEPAGE="http://osmocom.org/projects/op25/wiki"
 #inherit git-r3
 #EGIT_REPO_URI="https://github.com/balint256/op25.git"
 #EGIT_REPO_URI="https://git.osmocom.org/op25"
-#EGIT_BRANCH="max"
+#EGIT_BRANCH="gr310"
 #EGIT_REPO_URI="https://github.com/boatbod/op25.git"
 
-COMMIT="18d7f2e4c94d65c991acba6d917e501507270040"
+COMMIT="563d5e8431620d75e8592bcbcb93c41ded41679e"
 SRC_URI="https://github.com/boatbod/op25/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND="${PYTHON_DEPS}
+RDEPEND="${PYTHON_DEPS}
 	>=net-wireless/gnuradio-3.7:=[vocoder]
 	sci-libs/itpp
-	dev-libs/boost
-	dev-util/cppunit
+	dev-libs/libfmt:=
+	dev-libs/spdlog:=
 	net-libs/libpcap
-	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
+	sci-libs/volk:="
+DEPEND="${RDEPEND}
+	dev-util/cppunit
+	sci-libs/volk:="
 
 pkg_setup() {
 	python-single-r1_pkg_setup
@@ -53,10 +56,10 @@ src_configure() {
 
 src_install() {
 	cmake_src_install
-	python_optimize "${ED}/$(python_get_sitedir)"
+	find "${ED}" -name "*.py[co]" -delete || die
+	python_optimize
 
 	#this isn't right, but cmake is broken somehow
 	dodir /usr/share/${PN}
-	cp -r "${S}/op25/gr-op25_repeater/apps" "${ED}/usr/share/${PN}"
-	rm "${ED}/usr/share/${PN}/CMakeLists.txt"
+	cp -r "${S}/op25/gr-op25_repeater/apps" "${ED}/usr/share/${PN}" || die
 }