commit: a947c0adf2217585c5156bed78b6ab1803ad9429
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 4 18:22:40 2020 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Dec 4 18:22:59 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a947c0ad
net-wireless/gqrx: bump
minor ebuild cleanup to remove unneeded workarounds
Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/gqrx/Manifest | 3 +-
net-wireless/gqrx/gqrx-2.11.5-r1.ebuild | 63 ----------------------
.../gqrx/{gqrx-2.14.ebuild => gqrx-2.14.2.ebuild} | 11 ----
3 files changed, 1 insertion(+), 76 deletions(-)
diff --git a/net-wireless/gqrx/Manifest b/net-wireless/gqrx/Manifest
index 8f90de4ab2b..c82ca9850a5 100644
--- a/net-wireless/gqrx/Manifest
+++ b/net-wireless/gqrx/Manifest
@@ -1,3 +1,2 @@
-DIST gqrx-2.11.5.tar.gz 1329054 BLAKE2B
205bf1d984f18d43c914bb24e59f7ed42e9faf8060b44c2f78f6d1bb7a222d87395c347626802438c45a30225acac18ca3114d412faf3f8385840276c0c08ac8
SHA512
d2928559d377b85ea683839b0e7dd1213038ee350718f9dad5064afacab20b08d1c1edc189ae8c5ae992ad019636c930555f9a441aee88964231d174db25ae6f
DIST gqrx-2.12.1.tar.gz 1334839 BLAKE2B
9ad8ab710675f4b42ff652d642026aba00dad63867f836662054aaab89cc7788874cc0f47de531257ee901f3bc58a6e6d5aef3c5a4fe30ae367d24fcd87ae763
SHA512
28d3da6c4ff750cf580db658aee267162a64103e9dac1d212f70df6bc602c8d50ccb7aaf88c7e976cfa235b884e02b4994e679f69aed640485c44ed07f183cc9
-DIST gqrx-2.14.tar.gz 1343030 BLAKE2B
8aee7586970e3060f32556be223bed99b6df496fe2565cd56c1001d2f821b3151daa716a6c27aee0c449f3a71117188fe275ad75f406ff8acaac3faaa98cc880
SHA512
cae2003f3832a7edc6c39c591a4a96c9930a7a9c8c42684e3f906df9f582b033939a591261189093d955d07f5d3a9796137a2aff6c7ba936b6cbacf000ca5bf5
+DIST gqrx-2.14.2.tar.gz 1343715 BLAKE2B
8e2e500c194aaa542ef3ffb7b355240ea77b7c583aacf5eb82b0c33d9119197341f8f14d23916482376aaa967a21cb186df67919a1708bb0371b7ce956f7e480
SHA512
4c1e31f6f246770faf6745b9e7f360f4cc74d5370f3d2fe68b4634d03ebaeec12bca27d2b25a5c96e5771dc8d9095a27c807ae7eff08762c38b55c0e90a92f6e
diff --git a/net-wireless/gqrx/gqrx-2.11.5-r1.ebuild
b/net-wireless/gqrx/gqrx-2.11.5-r1.ebuild
deleted file mode 100644
index 982b78c3a0f..00000000000
--- a/net-wireless/gqrx/gqrx-2.11.5-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils
-
-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/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"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="gr-audio portaudio pulseaudio"
-REQUIRED_USE="^^ ( pulseaudio portaudio gr-audio )"
-
-DEPEND=">=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter]
- >=net-wireless/gr-osmosdr-0.1.0:=
- dev-libs/boost:=
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- pulseaudio? ( media-sound/pulseaudio:= )
- portaudio? ( media-libs/portaudio:= )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- if use !pulseaudio; then
- sed -i 's/AUDIO_BACKEND = pulse/#AUDIO_BACKEND = pulse/'
gqrx.pro || die
- fi
- PATCHES=( "${FILESDIR}/gqrx-bladerf-samplerate.patch" )
- cmake-utils_src_prepare
- eapply_user
-}
-
-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=(
- "-DLINUX_AUDIO_BACKEND=${LINUX_AUDIO_BACKEND}"
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- dobin "${BUILD_DIR}"/src/gqrx
-}
diff --git a/net-wireless/gqrx/gqrx-2.14.ebuild
b/net-wireless/gqrx/gqrx-2.14.2.ebuild
similarity index 82%
rename from net-wireless/gqrx/gqrx-2.14.ebuild
rename to net-wireless/gqrx/gqrx-2.14.2.ebuild
index a008cc56721..9556937d851 100644
--- a/net-wireless/gqrx/gqrx-2.14.ebuild
+++ b/net-wireless/gqrx/gqrx-2.14.2.ebuild
@@ -34,17 +34,6 @@ DEPEND=">=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter]
portaudio? ( media-libs/portaudio:= )"
RDEPEND="${DEPEND}"
-src_prepare() {
- if use !pulseaudio; then
- sed -i 's/AUDIO_BACKEND = pulse/#AUDIO_BACKEND = pulse/'
gqrx.pro || die
- fi
- if use portaudio; then
- sed -i 's#find_package(Portaudio#find_package(PORTAUDIO#'
CMakeLists.txt || die
- fi
- cmake_src_prepare
- eapply_user
-}
-
src_configure() {
if use pulseaudio; then
LINUX_AUDIO_BACKEND=Pulseaudio
