diff --git a/dev-libs/cm256cc/Manifest b/dev-libs/cm256cc/Manifest
index 0b815b2bfe..5921bce378 100644
--- a/dev-libs/cm256cc/Manifest
+++ b/dev-libs/cm256cc/Manifest
@@ -1 +1 @@
-DIST cm256cc-1.1.0.tar.gz 56994 BLAKE2B 9c4a36b923bd58a26a85292d62fbd0b4fa1975d75b3b17ca9183c311031b1efd0508a1fe899e9da2f3d31c8540c9d1cb7dcedb65b60ab6f7a780e50f3ff3ae20 SHA512 2bd02675bb2c1c2b422c626c92bd36a0c0fc7a46a0512475424b1bc781d816137eadc52f33f11e100cdc69a7a595f3153fbed0020d6038916e305a2923700959
+DIST cm256cc-1.1.1.tar.gz 56989 BLAKE2B b15cd0022343c8e0b02b645194610d3065521466c9e58e65418475f64966077fc6646a6fa2e8659ced83d0e0b4509aa62000bee08046f36570097082d4a9a70b SHA512 fcda338b766bcae1af1e25ab6237c30ed60722b2e6e679e13623005d441d3e8daa462c7a7735ca239c0a1fa5f2d8b28455fe40f40762ebefa997c2ebd3731082
diff --git a/dev-libs/cm256cc/cm256cc-1.1.0.ebuild b/dev-libs/cm256cc/cm256cc-1.1.1.ebuild
similarity index 75%
rename from dev-libs/cm256cc/cm256cc-1.1.0.ebuild
rename to dev-libs/cm256cc/cm256cc-1.1.1.ebuild
index d0ab8c8bbd..cc6ab104c5 100644
--- a/dev-libs/cm256cc/cm256cc-1.1.0.ebuild
+++ b/dev-libs/cm256cc/cm256cc-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,9 +11,4 @@ SRC_URI="https://github.com/f4exb/cm256cc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
+KEYWORDS="amd64 x86"
diff --git a/dev-libs/cm256cc/metadata.xml b/dev-libs/cm256cc/metadata.xml
new file mode 100644
index 0000000000..8897c9cb81
--- /dev/null
+++ b/dev-libs/cm256cc/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ sidhayn@gmail.com
+ Zero_Chaos
+
+
+ f4exb/cm256cc
+
+
diff --git a/net-wireless/sdrangel/Manifest b/net-wireless/sdrangel/Manifest
index 906817b870..9f83fc7cf4 100644
--- a/net-wireless/sdrangel/Manifest
+++ b/net-wireless/sdrangel/Manifest
@@ -1 +1 @@
-DIST sdrangel-7.14.2.tar.gz 80290031 BLAKE2B 9f407b0a822950d6e2b756980b80203a363fd3d21f80bd0be4db0a49f29791becca5fe120efceae823e3a9fe481a10a1cecddea03cd1e8f3d1861c0d4f86ae8a SHA512 2add0b23c1995fd08b7117597ecbc91af59f41bf87749bdd70f3d5f1d92f6d804d94f1849bc6b4d0f69b9e01e5f9acf9948caf806b80e9de042b6bd50567a45d
+DIST sdrangel-7.22.0.tar.gz 92950127 BLAKE2B ae3af50fd462d9518b450512f32ad1e9906aa8e460ec2ce5dab4f2014c9343ee85ff2f84b91ace48a4ed0f743a9ae48d06d05ca65aef4df429e4d58c0ce7de4c SHA512 e4a8f366ae1da12901c5bf29b88bef5a1e287fd36802cc1fd7724a1912538a792628584506690e0125ac44f7f4df012d6aa68266f52d1b908daaff0ac369c80f
diff --git a/net-wireless/sdrangel/metadata.xml b/net-wireless/sdrangel/metadata.xml
index 30af638768..3d0f165644 100644
--- a/net-wireless/sdrangel/metadata.xml
+++ b/net-wireless/sdrangel/metadata.xml
@@ -17,4 +17,7 @@
Support the soapysdr interface
Support NI Ettus uhd/usrp devices
+
+ f4exb/sdrangel
+
diff --git a/net-wireless/sdrangel/sdrangel-7.14.2-r1.ebuild b/net-wireless/sdrangel/sdrangel-7.14.2-r1.ebuild
deleted file mode 100644
index 2e544a15f3..0000000000
--- a/net-wireless/sdrangel/sdrangel-7.14.2-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="SDR Rx/Tx software"
-HOMEPAGE="https://github.com/f4exb/sdrangel"
-
-if [[ ${PV} =~ "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/f4exb/sdrangel.git"
-else
- SRC_URI="https://github.com/f4exb/sdrangel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="airspy bladerf cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 fcd debug doc gui hackrf limesuite plutosdr rtlsdr server soapy uhd"
-
-# TODO: perseus, xtrx, mirisdr
-
-RDEPEND="
- dev-libs/boost
- dev-libs/cm256cc
- dev-libs/serialDV
- >=media-libs/codec2-0.9.1
- media-libs/opus
- net-wireless/dsdcc
- sci-libs/fftw:3.0
- virtual/libusb:1
- >=dev-qt/qtcore-5.6.0
- dev-qt/qtcharts
- >=dev-qt/qtwidgets-5.6.0
- >=dev-qt/qtwebsockets-5.6.0
- >=dev-qt/qtmultimedia-5.6.0
- dev-qt/qtpositioning
- dev-qt/qtserialport
- gui? (
- dev-qt/qtcharts
- dev-qt/qtdeclarative
- dev-qt/qtgamepad
- dev-qt/qtgui
- dev-qt/qtlocation
- dev-qt/qtnetwork
- >=dev-qt/qtopengl-5.6.0
- dev-qt/qtpositioning
- dev-qt/qtspeech
- dev-qt/qtwebengine
- )
- media-libs/opencv
- media-video/ffmpeg
- airspy? ( net-wireless/airspy )
- bladerf? ( net-wireless/bladerf )
- hackrf? ( net-libs/libhackrf )
- plutosdr? ( net-libs/libiio )
- limesuite? ( net-wireless/limesuite )
- rtlsdr? ( net-wireless/rtl-sdr )
- soapy? ( net-wireless/soapysdr )
- uhd? ( net-wireless/uhd )
- "
-
-DEPEND="${RDEPEND}
- doc? ( app-text/doxygen )
- "
-
-src_prepare() {
- sed -i '/ARCH_OPT/,+1 d' CMakeLists.txt
- cmake_src_prepare
-}
-
-src_configure() {
- mycmakeargs=(
- -DDEBUG_OUTPUT="$(usex debug)" \
- -DSANITIZE_ADDRESS=OFF \
- -DRX_SAMPLE_24BIT=ON \
- -DBUILD_SERVER="$(usex server)" \
- -DBUILD_GUI="$(usex gui)" \
- -DENABLE_AIRSPY="$(usex airspy)" \
- -DENABLE_AIRSPYHF="$(usex airspy)" \
- -DENABLE_BLADERF="$(usex bladerf)" \
- -DWITH_DOC="$(usex doc)" \
- -DENABLE_FUNCUBE="$(usex fcd)" \
- -DENABLE_HACKRF="$(usex hackrf)" \
- -DENABLE_IIO="$(usex plutosdr)" \
- -DENABLE_LIMESUITE="$(usex limesuite)" \
- -DENABLE_MIRISDR=OFF \
- -DENABLE_PERSEUS=OFF \
- -DENABLE_SOAPYSDR="$(usex soapy)" \
- -DENABLE_USRP="$(usex uhd)" \
- -DENABLE_XTRX=OFF \
- )
- cmake_src_configure
-}
diff --git a/net-wireless/sdrangel/sdrangel-7.22.0.ebuild b/net-wireless/sdrangel/sdrangel-7.22.0.ebuild
new file mode 100644
index 0000000000..62cafa735a
--- /dev/null
+++ b/net-wireless/sdrangel/sdrangel-7.22.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="SDR Rx/Tx software"
+HOMEPAGE="https://github.com/f4exb/sdrangel"
+
+if [[ ${PV} =~ "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/f4exb/sdrangel.git"
+else
+ SRC_URI="https://github.com/f4exb/sdrangel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="airspy bladerf cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 fcd debug doc +gui hackrf limesuite plutosdr rtlsdr server soapy uhd"
+
+REQUIRED_USE="
+ airspy? ( || ( gui server ) )
+ bladerf? ( || ( gui server ) )
+ fcd? ( || ( gui server ) )
+ hackrf? ( || ( gui server ) )
+ limesuite? ( || ( gui server ) )
+ plutosdr? ( || ( gui server ) )
+ rtlsdr? ( || ( gui server ) )
+ soapy? ( || ( gui server ) )
+ uhd? ( || ( gui server ) )
+"
+
+# TODO: perseus, xtrx, mirisdr
+RDEPEND="
+ media-libs/opus
+ sci-libs/fftw:3.0=
+ dev-qt/qtbase:6[widgets]
+ dev-qt/qtwebsockets:6
+ dev-qt/qtmultimedia:6
+ dev-qt/qtpositioning:6
+ dev-qt/qt5compat:6
+ airspy? ( net-wireless/airspy )
+ bladerf? ( net-wireless/bladerf:= )
+ fcd? ( dev-libs/hidapi )
+ hackrf? ( net-libs/libhackrf:= )
+ plutosdr? ( net-libs/libiio:= )
+ limesuite? ( net-wireless/limesuite )
+ rtlsdr? ( net-wireless/rtl-sdr )
+ soapy? ( net-wireless/soapysdr:= )
+ uhd? ( net-wireless/uhd:= )
+ gui? (
+ dev-qt/qtcharts:6
+ dev-qt/qtdeclarative:6
+ dev-qt/qtsvg:6
+ dev-qt/qtspeech:6
+ dev-qt/qtlocation:6
+ dev-qt/qtwebengine:6
+
+ dev-qt/qtserialport:6
+ media-libs/opencv:=
+ dev-libs/cm256cc
+ dev-libs/serialDV
+ >=media-libs/codec2-0.9.1:=
+ media-libs/hamlib:=
+ media-video/ffmpeg:=
+ net-wireless/dsdcc
+ )
+ server? (
+ dev-qt/qtserialport:6
+ media-libs/opencv:=
+ dev-libs/cm256cc
+ dev-libs/serialDV
+ >=media-libs/codec2-0.9.1:=
+ media-libs/hamlib:=
+ media-video/ffmpeg:=
+ net-wireless/dsdcc
+ )
+ "
+
+DEPEND="${RDEPEND}
+ dev-libs/boost
+ doc? ( app-text/doxygen )
+ "
+
+src_prepare() {
+ sed -i '/ARCH_OPT/,+1 d' CMakeLists.txt || die
+ cmake_src_prepare
+}
+
+src_configure() {
+ mycmakeargs=(
+ -DDEBUG_OUTPUT="$(usex debug)" \
+ -DSANITIZE_ADDRESS=OFF \
+ -DRX_SAMPLE_24BIT=ON \
+ -DBUILD_SERVER="$(usex server)" \
+ -DBUILD_GUI="$(usex gui)" \
+ -DENABLE_AIRSPY="$(usex airspy)" \
+ -DENABLE_AIRSPYHF="$(usex airspy)" \
+ -DENABLE_BLADERF="$(usex bladerf)" \
+ -DWITH_DOC="$(usex doc)" \
+ -DENABLE_FUNCUBE="$(usex fcd)" \
+ -DENABLE_HACKRF="$(usex hackrf)" \
+ -DENABLE_IIO="$(usex plutosdr)" \
+ -DENABLE_LIMESUITE="$(usex limesuite)" \
+ -DENABLE_MIRISDR=OFF \
+ -DENABLE_PERSEUS=OFF \
+ -DENABLE_QT6=ON \
+ -DENABLE_RTLSDR="$(usex rtlsdr)" \
+ -DENABLE_SOAPYSDR="$(usex soapy)" \
+ -DENABLE_USRP="$(usex uhd)" \
+ -DENABLE_XTRX=OFF
+ )
+ cmake_src_configure
+ sed -i 's#-isystem /usr/include/qt6/QtSvg#-isystem /usr/include/qt6/QtSvg -isystem /usr/include/qt6/QtSvgWidgets#g' \
+ "${BUILD_DIR}"/build.ninja || die
+}
diff --git a/profiles/pentoo/base/package.keywords/net-wireless b/profiles/pentoo/base/package.keywords/net-wireless
index 8f9e84b7a1..bea9e9f69f 100644
--- a/profiles/pentoo/base/package.keywords/net-wireless
+++ b/profiles/pentoo/base/package.keywords/net-wireless
@@ -2,3 +2,4 @@