diff --git a/net-wireless/trunk-recorder/Manifest b/net-wireless/trunk-recorder/Manifest
index 0309a9c0e..d97b2570f 100644
--- a/net-wireless/trunk-recorder/Manifest
+++ b/net-wireless/trunk-recorder/Manifest
@@ -1 +1,2 @@
 DIST trunk-recorder-3.3.7.tar.gz 1405700 BLAKE2B 2ace29513a9be3425a7abd19ccd3b4f0f45c4aa5f8d7aede9ec54615f8a67cb3bb2e2f2cf8ba38a0bf1a66e494d16d07e7be757a2e130b9742c83edb5300d27c SHA512 4ebd125f539d3c9f9e34477259d153aad25a9e8cd43aa433c0db2a612174c47002db1e55a15f4ed54aedbe867fd0ce0ff33aa779ad39da3edb3cced870c6c803
+DIST trunk-recorder-4.1.1.tar.gz 2495504 BLAKE2B 1753e6a533ba64d7b3b760a8ccfaf3b0bf0c20d69c824842dfce3d3af1084ed212c8d6e30b0aa3a56a65fd32ecb0d24f8fdf1c39d4ff6a5deb6f8989d7390fba SHA512 fbce3bb4425156629f0cac0d48bfa800c915607dc4c65daafad4f6fa453fdebb60fb9648f2484274fef7ebf2a911d03a425be171a721b14956aa7c2c1bb74ec3
diff --git a/net-wireless/trunk-recorder/trunk-recorder-9999.ebuild b/net-wireless/trunk-recorder/trunk-recorder-4.1.1.ebuild
similarity index 52%
rename from net-wireless/trunk-recorder/trunk-recorder-9999.ebuild
rename to net-wireless/trunk-recorder/trunk-recorder-4.1.1.ebuild
index 4229abd0d..dd573a11b 100644
--- a/net-wireless/trunk-recorder/trunk-recorder-9999.ebuild
+++ b/net-wireless/trunk-recorder/trunk-recorder-4.1.1.ebuild
@@ -1,21 +1,19 @@
 # Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-#THIS FAILS WITH EAPI7
-EAPI=6
+EAPI=7
 
-CMAKE_MAKEFILE_GENERATOR=ninja
-inherit cmake-utils multilib
+inherit cmake
 
 DESCRIPTION="Records calls from a Trunked Radio System (P25 & SmartNet)"
 HOMEPAGE="https://github.com/robotastic/trunk-recorder"
 if [[ "${PV}" = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/robotastic/trunk-recorder.git"
-	EGIT_BRANCH="master"
+	EGIT_BRANCH="4.0-beta"
 	inherit git-r3
 else
 	SRC_URI="https://github.com/robotastic/trunk-recorder/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~amd64 ~x86"
 fi
 
 LICENSE="GPL-3"
@@ -23,7 +21,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND="net-wireless/gr-osmosdr:=
-	net-wireless/gnuradio:=
+	net-wireless/gnuradio:=[uhd]
 	net-wireless/uhd:=
 	!net-wireless/op25
 	net-misc/curl:=
@@ -32,16 +30,3 @@ DEPEND="net-wireless/gr-osmosdr:=
 	dev-libs/boost"
 RDEPEND="${DEPEND}"
 BDEPEND=""
-
-src_configure() {
-	#sed -i -e '/set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}\/lib\/trunk-recorder")/d' \
-	#	-e '/set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)/d' \
-	#	CMakeLists.txt
-	cmake-utils_src_configure
-	#this fails without this, probably because it installs the libs in the wrong directory
-	#sed -i "s#-Wl,-rpath,${BUILD_DIR}: ##" "${BUILD_DIR}"/build.ninja || die
-}
-
-src_install() {
-	CMAKE_SKIP_RPATH=true cmake-utils_src_install
-}
diff --git a/profiles/pentoo/base/package.accept_keywords/net-wireless b/profiles/pentoo/base/package.accept_keywords/net-wireless
index a568b69ec..c7f6f40cc 100644
--- a/profiles/pentoo/base/package.accept_keywords/net-wireless
+++ b/profiles/pentoo/base/package.accept_keywords/net-wireless
@@ -1,3 +1,5 @@
+=net-wireless/trunk-recorder-4*
+
 net-wireless/create_ap
 
 net-wireless/dsdcc