gentoo resync : 29.06.2020

4 files changed, 56 insertions, 28 deletions

diff --git a/net-wireless/inspectrum/Manifest b/net-wireless/inspectrum/Manifest
index 1479be19423a..cc405aa14643 100644
--- a/net-wireless/inspectrum/Manifest
+++ b/net-wireless/inspectrum/Manifest
@@ -1,4 +1,5 @@
+AUX inspectrum-0.2.2-qt-5.15.patch 526 BLAKE2B 5262b6d57ca5161ba185d051ca7d2c757ac4427954ef5ee7d03998607a74d604c5e1ae5977c95858310ce70e55e003bc27e1d4383d29666ecb03971effad4391 SHA512 012c4fa5e7fdf0bb995d71c761137733f693ccafa557577fc6599cc88efa381246f81febd342b94c60c3441ed07fea3a84cf425734c6ae56aaa3461eeb03f19c
 DIST inspectrum-0.2.2.tar.gz 109165 BLAKE2B 62926305bfa03bb3a404ed2a9098b9afd93f0de7f35846cfcf66b42ec6a81532003976bcc9a6916217044ad80fce8df689d200aa5861778f0e3f00d67373cbb6 SHA512 37ad48f87889731b7aa83a6cfa401c9986d2657f5f06f8dbdf02213123ff4d0d7cb23aa21e9b4062b7ab746d32c937dd56e85bd5c8d0bbf2181a54929e3fc501
-EBUILD inspectrum-0.2.2.ebuild 701 BLAKE2B 08445e6eada91acc1728a4ac137875b32ca78ae359310ba8c9d375b991ffe23dabc3791c1cc41354110302143dc4bc4d018b3acab67815d6a7b1445ef768f01a SHA512 e6da862809dd1ffcef94a8e6951e776c0c09542f9d3fca873c33902997919ad259065e274e264a089c66f645aa5a09bf8202e617931adf1e97a79a44ba6626e3
-EBUILD inspectrum-9999.ebuild 701 BLAKE2B 867db11a0499c8c67ff1b7f94fa66209b1957e1c6381982c6e5d81e3cd4c74656252ecd71923b777571901aa6d6a308f15b590559611b77cf30da7408a4df7aa SHA512 0e448bfb2a47728a9ea6de25ef792aa03bc953f3d9d19078533898ee63c36129fbcf87f20a82762449c699301372ea335e9ccc134d1d7b5d5f22af6c18ed9413
+EBUILD inspectrum-0.2.2.ebuild 736 BLAKE2B 3e21127f7564fec3828b2c66da6812705c940d4b4e3ed3751aae4c518bea9853769347613c1640b1807809f0c7769b508f0869612c59f1734a6fa70d9b1300ec SHA512 81a875d319d25ad26220d53880d669bdf9d1e6e3e1f3ccdf8249c3fe96a46e79acdbd047cbee95cede029ede8ad1d85690f91eeb51ae5367bbb86cd2dc8aa493
+EBUILD inspectrum-9999.ebuild 690 BLAKE2B 3ec85ef5ced6fafb7fcb667584d3289b7b532c8213182872a9e9d89e041b1f0ffa272c4e4b2272a1b220bdade1970c1db9fa8afd74f7fdaab6c5b366167e15dd SHA512 695d6ed182377da010e113e52e26a43c0a9d00e913f980ee10924a4241e3d677df3b2b5931c932f3d5466596ef8cd41a2b17daf15e6472106fcbf74f5d5f6296
 MISC metadata.xml 426 BLAKE2B a117a458ba8b91db0841ba470ee987daf8c5b55c1f87064d203b58feb9e0650b6c33f37f4259a2f5ad051c9ade4d67c7b37077f9772c3c84c942e00789ce655e SHA512 a1da383e40f0fccae9fbb2b8b29051619104e4276b8d4027c9584de14625b3612d6bdf1343f1261e5d6df8b13789f1d4f95e62b76d1ef1eda84b66c82464520e
diff --git a/net-wireless/inspectrum/files/inspectrum-0.2.2-qt-5.15.patch b/net-wireless/inspectrum/files/inspectrum-0.2.2-qt-5.15.patch
new file mode 100644
index 000000000000..3e55e814ecbe
--- /dev/null
+++ b/net-wireless/inspectrum/files/inspectrum-0.2.2-qt-5.15.patch
@@ -0,0 +1,21 @@
+From 1f2b4587ec2c6d1a1945eee8bbf361dbdf3dc8af Mon Sep 17 00:00:00 2001
+From: Martin Hauke <mardnh@gmx.de>
+Date: Sun, 7 Jun 2020 21:56:38 +0200
+Subject: [PATCH] Fix build with Qt 5.15+
+
+---
+ traceplot.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/traceplot.cpp b/traceplot.cpp
+index 3704d24..04bdba8 100644
+--- a/traceplot.cpp
++++ b/traceplot.cpp
+@@ -20,6 +20,7 @@
+ #include <QPixmapCache>
+ #include <QTextStream>
+ #include <QtConcurrent>
++#include <QPainterPath>
+ #include "samplesource.h"
+ #include "traceplot.h"
+ 
diff --git a/net-wireless/inspectrum/inspectrum-0.2.2.ebuild b/net-wireless/inspectrum/inspectrum-0.2.2.ebuild
index 55640eba8fb0..13dd958f53de 100644
--- a/net-wireless/inspectrum/inspectrum-0.2.2.ebuild
+++ b/net-wireless/inspectrum/inspectrum-0.2.2.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
-DESCRIPTION="a tool for analysing captured signals from software-defined radio receivers"
+DESCRIPTION="Tool for analysing captured signals from software-defined radio receivers"
 HOMEPAGE="https://github.com/miek/inspectrum"
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
+
+if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/miek/inspectrum.git"
-	KEYWORDS=""
+	inherit git-r3
 else
 	SRC_URI="https://github.com/miek/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
@@ -20,11 +20,15 @@ LICENSE="GPL-3+"
 SLOT="0"
 IUSE=""
 
-RDEPEND="sci-libs/fftw:3.0=
-	dev-qt/qtwidgets:5
-	dev-qt/qtgui:5
+RDEPEND="
 	dev-qt/qtcore:5
-	net-libs/liquid-dsp"
-DEPEND="virtual/pkgconfig
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	net-libs/liquid-dsp
+	sci-libs/fftw:3.0="
+DEPEND="${RDEPEND}
 	dev-qt/qtconcurrent:5
-	${RDEPEND}"
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" )
diff --git a/net-wireless/inspectrum/inspectrum-9999.ebuild b/net-wireless/inspectrum/inspectrum-9999.ebuild
index a9a777d77d39..fef5f60bfd84 100644
--- a/net-wireless/inspectrum/inspectrum-9999.ebuild
+++ b/net-wireless/inspectrum/inspectrum-9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
-DESCRIPTION="a tool for analysing captured signals from software-defined radio receivers"
+DESCRIPTION="Tool for analysing captured signals from software-defined radio receivers"
 HOMEPAGE="https://github.com/miek/inspectrum"
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
+
+if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/miek/inspectrum.git"
-	KEYWORDS=""
+	inherit git-r3
 else
 	SRC_URI="https://github.com/miek/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
@@ -20,11 +20,13 @@ LICENSE="GPL-3+"
 SLOT="0"
 IUSE=""
 
-RDEPEND="sci-libs/fftw:3.0=
-	dev-qt/qtwidgets:5
-	dev-qt/qtgui:5
+RDEPEND="
 	dev-qt/qtcore:5
-	net-libs/liquid-dsp"
-DEPEND="virtual/pkgconfig
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	net-libs/liquid-dsp
+	sci-libs/fftw:3.0="
+DEPEND="${RDEPEND}
 	dev-qt/qtconcurrent:5
-	${RDEPEND}"
+"
+BDEPEND="virtual/pkgconfig"