gentoo resync : 14.12.2020

3 files changed, 2 insertions, 78 deletions

diff --git a/net-wireless/gqrx/Manifest b/net-wireless/gqrx/Manifest
index 39bc7657808f..83f5bf62bbaa 100644
--- a/net-wireless/gqrx/Manifest
+++ b/net-wireless/gqrx/Manifest
@@ -1,9 +1,7 @@
 AUX gqrx-bladerf-samplerate.patch 1197 BLAKE2B 1496903e5ae8ce0cba7b0fc30a34d42afe5e76adefc4ab4566fdd5e6c7e88994843c1ba3462be5f30740e35ddbea451317e0910fc5c6fe3f4564d3afc5bff2e4 SHA512 40e02bdaa7af30ae30eb447f01b79776f792a5f30fe3e1d3317d3a40ff8dedb3f19ef13b1e8566781c07ff1086bc919723c2aed940b7fbe88dff9c124116e73f
-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
-EBUILD gqrx-2.11.5-r1.ebuild 1460 BLAKE2B 88cf1bfa99c38b3b4bf74de16b0cd3d624f24fe9a7d8801ea0fc1e79114fea5c2eac6ec441fa6da08a31317b87c7a7266063b4867b3c33d32f7a5b37961fe041 SHA512 4dda5191329758fd82c199a595e44a2e2aae879ecc603ff975e87121713a628f6a1e7d8a78456d77bdb20c6f9804eda1dcf3314e97c5a1fc21ed6d3e78dd2aa4
+DIST gqrx-2.14.2.tar.gz 1343715 BLAKE2B 8e2e500c194aaa542ef3ffb7b355240ea77b7c583aacf5eb82b0c33d9119197341f8f14d23916482376aaa967a21cb186df67919a1708bb0371b7ce956f7e480 SHA512 4c1e31f6f246770faf6745b9e7f360f4cc74d5370f3d2fe68b4634d03ebaeec12bca27d2b25a5c96e5771dc8d9095a27c807ae7eff08762c38b55c0e90a92f6e
 EBUILD gqrx-2.12.1-r1.ebuild 1490 BLAKE2B f0f5bd7edea78f4c31b25122afb2b5434c03081fcf310c508547e1a5c7065cecd9ec75a4daf8c726510ddfd9e42d7d5422151e00a19f42e6c3163cce9d52bd43 SHA512 8162527686dfd3063efa02b9437b359f76b3aebe8ae41409134b4e4697f06b099ec36387d35cdb8baac74659a7ead58eb566a42769ac55956ff44a788ed343ee
-EBUILD gqrx-2.14.ebuild 1490 BLAKE2B f0f5bd7edea78f4c31b25122afb2b5434c03081fcf310c508547e1a5c7065cecd9ec75a4daf8c726510ddfd9e42d7d5422151e00a19f42e6c3163cce9d52bd43 SHA512 8162527686dfd3063efa02b9437b359f76b3aebe8ae41409134b4e4697f06b099ec36387d35cdb8baac74659a7ead58eb566a42769ac55956ff44a788ed343ee
+EBUILD gqrx-2.14.2.ebuild 1224 BLAKE2B 6698c8084603cac9ffa4075097ded605d8e8f505a24a1fb1f18792b4429115cbfeada988abff06d3d1566ab7dd3cad215ef1a7ed5083883eefbf0a51a13dd9d9 SHA512 95204bc851a13f35dd6dbbb00657530a135393b066396fe19df50bb5473bc6954ba60c9b47ea27b4edda88539f83d3785875a8bcf7ace661be10b4510f715bfc
 EBUILD gqrx-9999.ebuild 1490 BLAKE2B f0f5bd7edea78f4c31b25122afb2b5434c03081fcf310c508547e1a5c7065cecd9ec75a4daf8c726510ddfd9e42d7d5422151e00a19f42e6c3163cce9d52bd43 SHA512 8162527686dfd3063efa02b9437b359f76b3aebe8ae41409134b4e4697f06b099ec36387d35cdb8baac74659a7ead58eb566a42769ac55956ff44a788ed343ee
 MISC metadata.xml 523 BLAKE2B e40faae08e17b5c9c887870f51a9ea731c60037fa023d85ef386483108047c05b7a1cca299d1d9f92e8933957949b818d5c58c784d0032bb62031348f396dfe7 SHA512 26a1e52770090a69982939ebff1ec4ee26f7c637abf2748c5de5997087e17c0624871e311b17b1b5857ba9ac0bdc8113fd71e13975404462cc84946535adecd8
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 982b78c3a0f2..000000000000
--- 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
index a008cc56721e..9556937d851a 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