commit: 4cb92581afc5261cd4ec9f77a927545bc0c95e5a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 1 12:12:37 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 8 17:03:37 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cb92581
net-wireless/gqrx: Drop IUSE qt5 (make Qt6 non-optional)
- Fix entirely missing dev-qt/qtbase:6 USEdeps
- Drop no-op slot operators from DEPEND
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../{gqrx-9999.ebuild => gqrx-2.17.2-r1.ebuild} | 30 ++++++++--------------
net-wireless/gqrx/gqrx-9999.ebuild | 30 ++++++++--------------
2 files changed, 20 insertions(+), 40 deletions(-)
diff --git a/net-wireless/gqrx/gqrx-9999.ebuild
b/net-wireless/gqrx/gqrx-2.17.2-r1.ebuild
similarity index 70%
copy from net-wireless/gqrx/gqrx-9999.ebuild
copy to net-wireless/gqrx/gqrx-2.17.2-r1.ebuild
index eaecd1663e78..5853ad507b1f 100644
--- a/net-wireless/gqrx/gqrx-9999.ebuild
+++ b/net-wireless/gqrx/gqrx-2.17.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -8,7 +8,7 @@ inherit cmake
DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt"
HOMEPAGE="https://gqrx.dk/";
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999* ]] ; then
EGIT_REPO_URI="https://github.com/gqrx-sdr/gqrx.git";
inherit git-r3
else
@@ -18,31 +18,21 @@ fi
LICENSE="GPL-3"
SLOT="0"
-IUSE="gr-audio portaudio pulseaudio qt6"
+IUSE="gr-audio portaudio pulseaudio"
REQUIRED_USE="^^ ( pulseaudio portaudio gr-audio )"
RDEPEND="
+ dev-qt/qtbase:6[gui,network,widgets]
+ dev-qt/qtsvg:6
>=net-wireless/gnuradio-3.10:0=[audio,analog,filter,network]
>=net-wireless/gr-osmosdr-0.1.0:=
- qt6? (
- dev-qt/qtbase:6
- dev-qt/qtsvg:6
- )
- !qt6? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- )
sci-libs/volk:=
pulseaudio? ( media-libs/libpulse )
portaudio? ( media-libs/portaudio:= )"
DEPEND="${RDEPEND}
- dev-libs/boost:=
- dev-libs/log4cpp:=
+ dev-libs/boost
+ dev-libs/log4cpp
"
-BDEPEND=""
src_configure() {
if use pulseaudio; then
@@ -54,9 +44,9 @@ src_configure() {
fi
local mycmakeargs=(
- -DFORCE_QT6="$(usex qt6)"
- -DFORCE_QT5="$(usex !qt6)"
- "-DLINUX_AUDIO_BACKEND=${LINUX_AUDIO_BACKEND}"
+ -DFORCE_QT6=ON
+ -DFORCE_QT5=OFF
+ -DLINUX_AUDIO_BACKEND="${LINUX_AUDIO_BACKEND}"
)
cmake_src_configure
}
diff --git a/net-wireless/gqrx/gqrx-9999.ebuild
b/net-wireless/gqrx/gqrx-9999.ebuild
index eaecd1663e78..5853ad507b1f 100644
--- a/net-wireless/gqrx/gqrx-9999.ebuild
+++ b/net-wireless/gqrx/gqrx-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -8,7 +8,7 @@ inherit cmake
DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt"
HOMEPAGE="https://gqrx.dk/";
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999* ]] ; then
EGIT_REPO_URI="https://github.com/gqrx-sdr/gqrx.git";
inherit git-r3
else
@@ -18,31 +18,21 @@ fi
LICENSE="GPL-3"
SLOT="0"
-IUSE="gr-audio portaudio pulseaudio qt6"
+IUSE="gr-audio portaudio pulseaudio"
REQUIRED_USE="^^ ( pulseaudio portaudio gr-audio )"
RDEPEND="
+ dev-qt/qtbase:6[gui,network,widgets]
+ dev-qt/qtsvg:6
>=net-wireless/gnuradio-3.10:0=[audio,analog,filter,network]
>=net-wireless/gr-osmosdr-0.1.0:=
- qt6? (
- dev-qt/qtbase:6
- dev-qt/qtsvg:6
- )
- !qt6? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- )
sci-libs/volk:=
pulseaudio? ( media-libs/libpulse )
portaudio? ( media-libs/portaudio:= )"
DEPEND="${RDEPEND}
- dev-libs/boost:=
- dev-libs/log4cpp:=
+ dev-libs/boost
+ dev-libs/log4cpp
"
-BDEPEND=""
src_configure() {
if use pulseaudio; then
@@ -54,9 +44,9 @@ src_configure() {
fi
local mycmakeargs=(
- -DFORCE_QT6="$(usex qt6)"
- -DFORCE_QT5="$(usex !qt6)"
- "-DLINUX_AUDIO_BACKEND=${LINUX_AUDIO_BACKEND}"
+ -DFORCE_QT6=ON
+ -DFORCE_QT5=OFF
+ -DLINUX_AUDIO_BACKEND="${LINUX_AUDIO_BACKEND}"
)
cmake_src_configure
}
