4 files changed, 136 insertions, 6 deletions
diff --git a/net-analyzer/gr-fosphor/Manifest b/net-analyzer/gr-fosphor/Manifest
new file mode 100644
index 000000000000..2fcba5917b5f
--- /dev/null
+++ b/net-analyzer/gr-fosphor/Manifest
@@ -0,0 +1,2 @@
+DIST gr-fosphor-0.0_p20191202.tar.gz 254103 BLAKE2B 460b4ff2ff9f4a6faa70c541dd8ce936ba8419a89cca7715913b6f93f07a151c467a5737860a362198d609dfe0e4bfc4a476278bfc720d89c1876ff56addf226 SHA512 6bc26be4aa3116af33a214046c76e5a7623e049e27e86d866892de611ffd4bfa4bd841b66535fc40320fa7c7a46d19af2d391ee594f9a7ed997355cd2ade6fa1
+DIST gr-fosphor-0.0_p20200131.tar.gz 244685 BLAKE2B db01b9df87f377db2adaaca3d1542f99eaca9f73303c71ea9add1845307704817c8930736d44462191476b4cb935a18401b7012a1ea6465bdb5cf3624c182f2c SHA512 7bf2758f98ae7d088256060878fbf33966880ddbb7fb132da00f9c2530d84b91a6385eabbf61ff40d3002d3a42eadf5e2d78b8c797bc93501cafaf8a7bdde7ae
diff --git a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20191202.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20191202.ebuild
new file mode 100644
index 000000000000..78c0f817bcf6
--- /dev/null
+++ b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20191202.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="gnuradio fosphor block (GPU spectrum display)"
+HOMEPAGE="https://sdr.osmocom.org/trac/wiki/fosphor"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/osmocom/${PN}.git"
+else
+	COMMIT="fa6761afbf8c2658782e0c7fc5d51063679b7ae4"
+	SRC_URI="https://github.com/osmocom/gr-fosphor/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="glfw qt5 wxwidgets"
+
+RDEPEND="qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+	)
+	=net-wireless/gnuradio-3.7*:0=[qt5,wxwidgets?,${PYTHON_SINGLE_USEDEP}]
+	media-libs/freetype
+	dev-libs/boost:=
+	glfw? ( >=media-libs/glfw-3 )
+	virtual/opencl
+	virtual/opengl
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+	dev-lang/swig:0
+	dev-util/cppunit
+"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	default
+}
+
+src_configure() {
+	# tries to run OpenCL test program, but failing doesn't hurt
+	addpredict /dev/dri
+
+	local mycmakeargs=(
+		-DENABLE_DEFAULT=OFF
+		-DENABLE_GLFW="$(usex glfw)"
+		-DENABLE_QT="$(usex qt5)"
+		-DENABLE_WX="$(usex wxwidgets)"
+		-DENABLE_PYTHON=ON
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild
new file mode 100644
index 000000000000..79dc792325fc
--- /dev/null
+++ b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="gnuradio fosphor block (GPU spectrum display)"
+HOMEPAGE="https://sdr.osmocom.org/trac/wiki/fosphor"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/osmocom/${PN}.git"
+else
+	COMMIT="fa6761afbf8c2658782e0c7fc5d51063679b7ae4"
+	SRC_URI="https://github.com/osmocom/gr-fosphor/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="glfw qt5"
+
+RDEPEND="qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+	)
+	=net-wireless/gnuradio-3.8*:0=[qt5,${PYTHON_SINGLE_USEDEP}]
+	media-libs/freetype
+	dev-libs/boost:=
+	glfw? ( >=media-libs/glfw-3 )
+	virtual/opencl
+	virtual/opengl
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+	dev-lang/swig:0
+	dev-util/cppunit
+"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	default
+}
+
+src_configure() {
+	# tries to run OpenCL test program, but failing doesn't hurt
+	addpredict /dev/dri
+
+	local mycmakeargs=(
+		-DENABLE_DEFAULT=OFF
+		-DENABLE_GLFW="$(usex glfw)"
+		-DENABLE_QT="$(usex qt5)"
+		-DENABLE_WX="$(usex wxwidgets)"
+		-DENABLE_PYTHON=ON
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
index 0eceaac74e02..79dc792325fc 100644
--- a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
+++ b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit cmake-utils python-single-r1
 
@@ -11,11 +11,11 @@ HOMEPAGE="https://sdr.osmocom.org/trac/wiki/fosphor"
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	#EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
 	EGIT_REPO_URI="https://github.com/osmocom/${PN}.git"
-	EGIT_BRANCH="gr3.7-qt5"
 else
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
+	COMMIT="fa6761afbf8c2658782e0c7fc5d51063679b7ae4"
+	SRC_URI="https://github.com/osmocom/gr-fosphor/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -23,7 +23,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="glfw qt5 wxwidgets"
+IUSE="glfw qt5"
 
 RDEPEND="qt5? (
 		dev-qt/qtcore:5
@@ -31,7 +31,7 @@ RDEPEND="qt5? (
 		dev-qt/qtopengl:5
 		dev-qt/qtwidgets:5
 	)
-	>=net-wireless/gnuradio-3.7_rc:0=[qt5,wxwidgets?,${PYTHON_SINGLE_USEDEP}]
+	=net-wireless/gnuradio-3.8*:0=[qt5,${PYTHON_SINGLE_USEDEP}]
 	media-libs/freetype
 	dev-libs/boost:=
 	glfw? ( >=media-libs/glfw-3 )