From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 10BBF15813A for ; Wed, 08 Jan 2025 17:03:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 05088E079C; Wed, 08 Jan 2025 17:03:53 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E3C39E079C for ; Wed, 08 Jan 2025 17:03:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1E6CE342F8E for ; Wed, 08 Jan 2025 17:03:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 78DCD1DD4 for ; Wed, 08 Jan 2025 17:03:50 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1736355817.4cb92581afc5261cd4ec9f77a927545bc0c95e5a.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/gqrx/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/gqrx/gqrx-2.17.2-r1.ebuild net-wireless/gqrx/gqrx-9999.ebuild X-VCS-Directories: net-wireless/gqrx/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 4cb92581afc5261cd4ec9f77a927545bc0c95e5a X-VCS-Branch: master Date: Wed, 08 Jan 2025 17:03:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 52ee621a-0473-4156-b088-0b858a015aae X-Archives-Hash: d2479991eb8982141c508340de98609c commit: 4cb92581afc5261cd4ec9f77a927545bc0c95e5a Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jan 1 12:12:37 2025 +0000 Commit: Andreas Sturmlechner gentoo 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 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 }