commit:     6880bf8fe8d708fad806f36cba5c18a36084404c
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 10 00:57:36 2023 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Oct 10 00:59:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6880bf8f

net-wireless/gqrx: add 2.17.2

Upstream added qt6 support and a handy selector flag for us!
Thanks Argilo!
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 net-wireless/gqrx/Manifest                           |  1 +
 .../gqrx/{gqrx-9999.ebuild => gqrx-2.17.2.ebuild}    | 20 ++++++++++++++------
 net-wireless/gqrx/gqrx-9999.ebuild                   | 20 ++++++++++++++------
 net-wireless/gqrx/metadata.xml                       |  2 +-
 4 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/net-wireless/gqrx/Manifest b/net-wireless/gqrx/Manifest
index 6a0c2a7eef40..1b5be7c9f5c1 100644
--- a/net-wireless/gqrx/Manifest
+++ b/net-wireless/gqrx/Manifest
@@ -1,2 +1,3 @@
 DIST gqrx-2.15.9.tar.gz 3608134 BLAKE2B 
0864e8b33efe12cbc77dc75bf9bb2c5938655e40710a99ff72da2f1bdb43bc4c2f964c1fe4d88136891417c16eed16444d8fad699f80ab8fe164bb18d62d23f6
 SHA512 
0562f5c962b7fb48e5b5b8d88f15e328bfb08284b36e289e68e77528156452075eb04a0fa530b235c383495bf4008a7c80e78aae88dfcc30da6f4ba619dfd2f3
 DIST gqrx-2.16.tar.gz 3608271 BLAKE2B 
0523be1f678c8966a0f973776ed4db71b9856334df528996a1790f74454124e72a3cbe51ae75dae3b5d02794a5dde8c0d06a0ea69d5886bd5678f630504c84df
 SHA512 
b2a2035f22b927667dd36e838dedc3db119c916eea0b9c70f37f5f6c1826ce04f05de6c459aeb84cf71bca39c036e96380b8c9531ad035558de7759864ac8569
+DIST gqrx-2.17.2.tar.gz 3620793 BLAKE2B 
a8354212c5084160315581840a19a28f737d2492f16aad2f58f4e508e0ac4dfda7fa139eccd38694ebd0777a4c2062f984840baa2cc2313524e0566e695dc638
 SHA512 
7e387dd909d0dda710e8fb7766bcd6f26abc2a6bef73d2bdf4d9c96b8cf698d3b6c6c1b2fbd51e91f907f446bb1e551b9fb99503851e02777599193717a72e35

diff --git a/net-wireless/gqrx/gqrx-9999.ebuild 
b/net-wireless/gqrx/gqrx-2.17.2.ebuild
similarity index 82%
copy from net-wireless/gqrx/gqrx-9999.ebuild
copy to net-wireless/gqrx/gqrx-2.17.2.ebuild
index 2cf2b96d63cd..eaecd1663e78 100644
--- a/net-wireless/gqrx/gqrx-9999.ebuild
+++ b/net-wireless/gqrx/gqrx-2.17.2.ebuild
@@ -18,17 +18,23 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="gr-audio portaudio pulseaudio"
+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:=
-       dev-qt/qtcore:5
-       dev-qt/qtgui:5
-       dev-qt/qtnetwork:5
-       dev-qt/qtsvg:5
-       dev-qt/qtwidgets:5
+       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:= )"
@@ -48,6 +54,8 @@ src_configure() {
        fi
 
        local mycmakeargs=(
+               -DFORCE_QT6="$(usex qt6)"
+               -DFORCE_QT5="$(usex !qt6)"
                "-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 2cf2b96d63cd..eaecd1663e78 100644
--- a/net-wireless/gqrx/gqrx-9999.ebuild
+++ b/net-wireless/gqrx/gqrx-9999.ebuild
@@ -18,17 +18,23 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="gr-audio portaudio pulseaudio"
+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:=
-       dev-qt/qtcore:5
-       dev-qt/qtgui:5
-       dev-qt/qtnetwork:5
-       dev-qt/qtsvg:5
-       dev-qt/qtwidgets:5
+       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:= )"
@@ -48,6 +54,8 @@ src_configure() {
        fi
 
        local mycmakeargs=(
+               -DFORCE_QT6="$(usex qt6)"
+               -DFORCE_QT5="$(usex !qt6)"
                "-DLINUX_AUDIO_BACKEND=${LINUX_AUDIO_BACKEND}"
        )
        cmake_src_configure

diff --git a/net-wireless/gqrx/metadata.xml b/net-wireless/gqrx/metadata.xml
index 32b6803fdaea..d9c43c9d0981 100644
--- a/net-wireless/gqrx/metadata.xml
+++ b/net-wireless/gqrx/metadata.xml
@@ -13,6 +13,6 @@
                <flag name="gr-audio">Use audio support from 
<pkg>net-wireless/gnuradio</pkg></flag>
        </use>
        <upstream>
-               <remote-id type="github">csete/gqrx</remote-id>
+               <remote-id type="github">gqrx-sdr/gqrx</remote-id>
        </upstream>
 </pkgmetadata>

Reply via email to