net-analyzer/gr-fosphor: update EAPI 7 -> 8

Closes: https://bugs.gentoo.org/834127
Signed-off-by: David Seifert <soap@gentoo.org>

3 files changed, 43 insertions, 47 deletions

diff --git a/net-analyzer/gr-fosphor/files/gr-fosphor-0.0_p20200131-htmldir.patch b/net-analyzer/gr-fosphor/files/gr-fosphor-0.0_p20200131-htmldir.patch
new file mode 100644
index 000000000000..16a4475299bf
--- /dev/null
+++ b/net-analyzer/gr-fosphor/files/gr-fosphor-0.0_p20200131-htmldir.patch
@@ -0,0 +1,8 @@
+--- a/docs/doxygen/CMakeLists.txt
++++ b/docs/doxygen/CMakeLists.txt
+@@ -50,4 +50,4 @@
+ 
+ add_custom_target(doxygen_target ALL DEPENDS ${BUILT_DIRS})
+ 
+-install(DIRECTORY ${BUILT_DIRS} DESTINATION ${GR_PKG_DOC_DIR})
++install(DIRECTORY ${BUILT_DIRS} DESTINATION ${CMAKE_INSTALL_DOCDIR})
diff --git a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131-r1.ebuild
index e3c5413176f4..a95757d28db1 100644
--- a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild
+++ b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131-r1.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+EAPI=8
 
-inherit cmake-utils python-single-r1
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-single-r1
 
 DESCRIPTION="gnuradio fosphor block (GPU spectrum display)"
 HOMEPAGE="https://sdr.osmocom.org/trac/wiki/fosphor"
 
-if [[ ${PV} == 9999* ]]; then
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/osmocom/${PN}.git"
 else
@@ -19,18 +20,12 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE="glfw qt5"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-	)
+RDEPEND="
 	dev-libs/boost:=
 	dev-libs/log4cpp
 	media-libs/freetype
@@ -39,16 +34,16 @@ RDEPEND="qt5? (
 	virtual/opencl
 	virtual/opengl
 	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	dev-lang/swig:0
-	dev-util/cppunit
-"
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/swig:0"
 
-src_prepare() {
-	cmake-utils_src_prepare
-	default
-}
+PATCHES=( "${FILESDIR}"/${P}-htmldir.patch )
 
 src_configure() {
 	# tries to run OpenCL test program, but failing doesn't hurt
@@ -60,5 +55,5 @@ src_configure() {
 		-DENABLE_QT="$(usex qt5)"
 		-DENABLE_PYTHON=ON
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
index e3c5413176f4..efd198c13e93 100644
--- a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
+++ b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+EAPI=8
 
-inherit cmake-utils python-single-r1
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-single-r1
 
 DESCRIPTION="gnuradio fosphor block (GPU spectrum display)"
 HOMEPAGE="https://sdr.osmocom.org/trac/wiki/fosphor"
 
-if [[ ${PV} == 9999* ]]; then
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/osmocom/${PN}.git"
 else
@@ -19,18 +20,12 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE="glfw qt5"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-	)
+RDEPEND="
 	dev-libs/boost:=
 	dev-libs/log4cpp
 	media-libs/freetype
@@ -39,16 +34,14 @@ RDEPEND="qt5? (
 	virtual/opencl
 	virtual/opengl
 	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	dev-lang/swig:0
-	dev-util/cppunit
-"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	default
-}
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/swig:0"
 
 src_configure() {
 	# tries to run OpenCL test program, but failing doesn't hurt
@@ -60,5 +53,5 @@ src_configure() {
 		-DENABLE_QT="$(usex qt5)"
 		-DENABLE_PYTHON=ON
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }