gentoo auto-resync : 09:01:2025 - 06:41:15

4 files changed, 21 insertions, 101 deletions

diff --git a/net-wireless/gqrx/Manifest b/net-wireless/gqrx/Manifest
index dc735da690b0..6902e3ad1605 100644
--- a/net-wireless/gqrx/Manifest
+++ b/net-wireless/gqrx/Manifest
@@ -1,6 +1,4 @@
-DIST gqrx-2.16.tar.gz 3608271 BLAKE2B 0523be1f678c8966a0f973776ed4db71b9856334df528996a1790f74454124e72a3cbe51ae75dae3b5d02794a5dde8c0d06a0ea69d5886bd5678f630504c84df SHA512 b2a2035f22b927667dd36e838dedc3db119c916eea0b9c70f37f5f6c1826ce04f05de6c459aeb84cf71bca39c036e96380b8c9531ad035558de7759864ac8569
 DIST gqrx-2.17.2.tar.gz 3620793 BLAKE2B a8354212c5084160315581840a19a28f737d2492f16aad2f58f4e508e0ac4dfda7fa139eccd38694ebd0777a4c2062f984840baa2cc2313524e0566e695dc638 SHA512 7e387dd909d0dda710e8fb7766bcd6f26abc2a6bef73d2bdf4d9c96b8cf698d3b6c6c1b2fbd51e91f907f446bb1e551b9fb99503851e02777599193717a72e35
-EBUILD gqrx-2.16.ebuild 1276 BLAKE2B ab7aa21aef72575ff0296aaf7f17ae0aa8952de4c8f85319da1ea9448a781c32b5d95d07ebd379385618ce073f6fc49e67a30cc4b63ef4980e1f0a3c3a4a68e3 SHA512 1e6bf11ad48e32054df1ceb9df4fe9623a4c27d979f9747ae512e178adf9d63320420ce5ff61f76b2b4afff5d2a0faf14e39e4797cd3f3ee6862f18751087b3a
-EBUILD gqrx-2.17.2.ebuild 1400 BLAKE2B 388ae8520616ed1539c3f0b5054403b2732ee031d4c9618b1532536fd7ba7211b9aec42b1a737f3034f5f6cb59864e82aa6952f01cdd21bb40282dec56bb6252 SHA512 b1ee6126b115ec32508b52f4ae9240230fde656a1a98e1a8454d954856ae74ecee55af0361fb8a6701f50185dcac6ba918bb3d2940c523006facf5eee4e06357
-EBUILD gqrx-9999.ebuild 1400 BLAKE2B 388ae8520616ed1539c3f0b5054403b2732ee031d4c9618b1532536fd7ba7211b9aec42b1a737f3034f5f6cb59864e82aa6952f01cdd21bb40282dec56bb6252 SHA512 b1ee6126b115ec32508b52f4ae9240230fde656a1a98e1a8454d954856ae74ecee55af0361fb8a6701f50185dcac6ba918bb3d2940c523006facf5eee4e06357
+EBUILD gqrx-2.17.2-r1.ebuild 1261 BLAKE2B 85635644b1ecd1129b98de772926b52df219777177ca2a866981b03fadb9a9784a007b8b907e592a407bd8c5674039bd0f4718313268edc2ef4e134b6e554b3e SHA512 2e3da1e6bbdad31ae17770eeeb6ea48a6829cc2a7d3a857859c5c5fc4a113a1cd5ad74cfede871ebbed1b4f0effc7a1d26dfe89b87893f55461b879ab7fe8307
+EBUILD gqrx-9999.ebuild 1261 BLAKE2B 85635644b1ecd1129b98de772926b52df219777177ca2a866981b03fadb9a9784a007b8b907e592a407bd8c5674039bd0f4718313268edc2ef4e134b6e554b3e SHA512 2e3da1e6bbdad31ae17770eeeb6ea48a6829cc2a7d3a857859c5c5fc4a113a1cd5ad74cfede871ebbed1b4f0effc7a1d26dfe89b87893f55461b879ab7fe8307
 MISC metadata.xml 527 BLAKE2B b03059834f7f1ce5a2ccac25c831783f824c93b7d45aa1a670751e135a6c5e208d759ef97b40bb3215940072a82db8e51fc4f974438a1273f3777fe623049243 SHA512 325283161c65ef63717a64d04da6aa4226ff0688e0151eebf4d4b9acb3c3fb51cb0a8d474da637a513f7fbcf062a04f20f08fb4da3e958284f41c9b00bc608fd
diff --git a/net-wireless/gqrx/gqrx-2.16.ebuild b/net-wireless/gqrx/gqrx-2.17.2-r1.ebuild
index 2cf2b96d63cd..5853ad507b1f 100644
--- a/net-wireless/gqrx/gqrx-2.16.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
@@ -22,21 +22,17 @@ 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:=
-	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
@@ -48,7 +44,9 @@ src_configure() {
 	fi
 
 	local mycmakeargs=(
-		"-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-2.17.2.ebuild b/net-wireless/gqrx/gqrx-2.17.2.ebuild
deleted file mode 100644
index eaecd1663e78..000000000000
--- a/net-wireless/gqrx/gqrx-2.17.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt"
-HOMEPAGE="https://gqrx.dk/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/gqrx-sdr/gqrx.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/gqrx-sdr/gqrx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~riscv ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="gr-audio portaudio pulseaudio qt6"
-REQUIRED_USE="^^ ( pulseaudio portaudio gr-audio )"
-
-RDEPEND="
-	>=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:=
-"
-BDEPEND=""
-
-src_configure() {
-	if use pulseaudio; then
-		LINUX_AUDIO_BACKEND=Pulseaudio
-	elif use portaudio; then
-		LINUX_AUDIO_BACKEND=Portaudio
-	elif use gr-audio; then
-		LINUX_AUDIO_BACKEND=Gr-audio
-	fi
-
-	local mycmakeargs=(
-		-DFORCE_QT6="$(usex qt6)"
-		-DFORCE_QT5="$(usex !qt6)"
-		"-DLINUX_AUDIO_BACKEND=${LINUX_AUDIO_BACKEND}"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/src/gqrx
-}
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
 }