From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1208381-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 7CBF9138359
for <garchives@archives.gentoo.org>; Mon, 21 Sep 2020 19:15:20 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 69133E0823;
Mon, 21 Sep 2020 19:15:19 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 4D5F5E0823
for <gentoo-commits@lists.gentoo.org>; Mon, 21 Sep 2020 19:15:19 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id C9975335D47
for <gentoo-commits@lists.gentoo.org>; Mon, 21 Sep 2020 19:15:17 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 47E00365
for <gentoo-commits@lists.gentoo.org>; Mon, 21 Sep 2020 19:15:16 +0000 (UTC)
From: "Rick Farina" <zerochaos@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Rick Farina" <zerochaos@gentoo.org>
Message-ID: <1600715714.f044a80e16fb31ae0c015de3ac6207f2bc36ca05.zerochaos@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.12.1-r1.ebuild net-wireless/gqrx/gqrx-2.12.1.ebuild net-wireless/gqrx/gqrx-9999.ebuild
X-VCS-Directories: net-wireless/gqrx/
X-VCS-Committer: zerochaos
X-VCS-Committer-Name: Rick Farina
X-VCS-Revision: f044a80e16fb31ae0c015de3ac6207f2bc36ca05
X-VCS-Branch: master
Date: Mon, 21 Sep 2020 19:15:16 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 889bf7b0-12a3-4e71-9a90-71275127b001
X-Archives-Hash: 3c61b93d8c870cc543b8ef65e98707e5
commit: f044a80e16fb31ae0c015de3ac6207f2bc36ca05
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 19:15:05 2020 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 19:15:14 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f044a80e
net-wireless/gqrx: bug #727524
plus a little ebuild cleanup
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
.../gqrx/{gqrx-2.12.1.ebuild => gqrx-2.12.1-r1.ebuild} | 11 +++++++----
net-wireless/gqrx/gqrx-9999.ebuild | 11 +++++++----
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/net-wireless/gqrx/gqrx-2.12.1.ebuild b/net-wireless/gqrx/gqrx-2.12.1-r1.ebuild
similarity index 87%
rename from net-wireless/gqrx/gqrx-2.12.1.ebuild
rename to net-wireless/gqrx/gqrx-2.12.1-r1.ebuild
index 5497f6b12fd..a008cc56721 100644
--- a/net-wireless/gqrx/gqrx-2.12.1.ebuild
+++ b/net-wireless/gqrx/gqrx-2.12.1-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit cmake-utils
+inherit cmake
DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt"
HOMEPAGE="https://gqrx.dk/"
@@ -11,7 +11,6 @@ HOMEPAGE="https://gqrx.dk/"
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/csete/gqrx.git"
inherit git-r3
- KEYWORDS=""
else
SRC_URI="https://github.com/csete/gqrx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~x86"
@@ -30,6 +29,7 @@ DEPEND=">=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter]
dev-qt/qtnetwork:5
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
+ sci-libs/volk
pulseaudio? ( media-sound/pulseaudio:= )
portaudio? ( media-libs/portaudio:= )"
RDEPEND="${DEPEND}"
@@ -38,7 +38,10 @@ src_prepare() {
if use !pulseaudio; then
sed -i 's/AUDIO_BACKEND = pulse/#AUDIO_BACKEND = pulse/' gqrx.pro || die
fi
- cmake-utils_src_prepare
+ if use portaudio; then
+ sed -i 's#find_package(Portaudio#find_package(PORTAUDIO#' CMakeLists.txt || die
+ fi
+ cmake_src_prepare
eapply_user
}
@@ -54,7 +57,7 @@ src_configure() {
local mycmakeargs=(
"-DLINUX_AUDIO_BACKEND=${LINUX_AUDIO_BACKEND}"
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
diff --git a/net-wireless/gqrx/gqrx-9999.ebuild b/net-wireless/gqrx/gqrx-9999.ebuild
index 5497f6b12fd..a008cc56721 100644
--- a/net-wireless/gqrx/gqrx-9999.ebuild
+++ b/net-wireless/gqrx/gqrx-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit cmake-utils
+inherit cmake
DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt"
HOMEPAGE="https://gqrx.dk/"
@@ -11,7 +11,6 @@ HOMEPAGE="https://gqrx.dk/"
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/csete/gqrx.git"
inherit git-r3
- KEYWORDS=""
else
SRC_URI="https://github.com/csete/gqrx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~x86"
@@ -30,6 +29,7 @@ DEPEND=">=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter]
dev-qt/qtnetwork:5
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
+ sci-libs/volk
pulseaudio? ( media-sound/pulseaudio:= )
portaudio? ( media-libs/portaudio:= )"
RDEPEND="${DEPEND}"
@@ -38,7 +38,10 @@ src_prepare() {
if use !pulseaudio; then
sed -i 's/AUDIO_BACKEND = pulse/#AUDIO_BACKEND = pulse/' gqrx.pro || die
fi
- cmake-utils_src_prepare
+ if use portaudio; then
+ sed -i 's#find_package(Portaudio#find_package(PORTAUDIO#' CMakeLists.txt || die
+ fi
+ cmake_src_prepare
eapply_user
}
@@ -54,7 +57,7 @@ src_configure() {
local mycmakeargs=(
"-DLINUX_AUDIO_BACKEND=${LINUX_AUDIO_BACKEND}"
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {