gentoo auto-resync : 22:11:2022 - 19:06:54

5 files changed, 30 insertions, 66 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 5d3f04a58035..1d839a443dda 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/gr-fosphor/Manifest b/net-analyzer/gr-fosphor/Manifest
index e8fe7a30197d..5dc16572a4cd 100644
--- a/net-analyzer/gr-fosphor/Manifest
+++ b/net-analyzer/gr-fosphor/Manifest
@@ -1,8 +1,6 @@
 AUX gr-fosphor-0.0_p20200131-htmldir.patch 285 BLAKE2B 111862d2e2f2cccd8c9d2e182f7881f2692c31455aae55ca5e8ab3f34c8d4a507c39681ec0f914f9fbd4fa1dc6eba0fcee34957e94f478b8ae280d40cc14a2d3 SHA512 d814f8bc0ff7023a4a4df40346f3eea8835d874de2f4e05175a79b14580851f560b51fde0506ad3f6eb077bbf57433c6f406cc7269c6f8dee92e80fd169a2e22
 AUX gr-fosphor-0.0_p20210108-fix-use.patch 566 BLAKE2B 54ba73d27ca2748e366bc48bbd77e0f56a1665c410463b852083ff24ddfdd0d8e3422552e92b2d2ceba955aeb501672a2c2565a271f018d0743719a7d2d14e13 SHA512 cc56cbee84011a40b7886247ce19a9f5ccb4ade124f785da0eab9376c1d923231ddc4c176b4552a90d82bece58c3f2b199439d3ec0c68fee9b9927217f778c22
-DIST gr-fosphor-0.0_p20200131.tar.gz 244685 BLAKE2B db01b9df87f377db2adaaca3d1542f99eaca9f73303c71ea9add1845307704817c8930736d44462191476b4cb935a18401b7012a1ea6465bdb5cf3624c182f2c SHA512 7bf2758f98ae7d088256060878fbf33966880ddbb7fb132da00f9c2530d84b91a6385eabbf61ff40d3002d3a42eadf5e2d78b8c797bc93501cafaf8a7bdde7ae
 DIST gr-fosphor-0.0_p20210108.tar.gz 223873 BLAKE2B 4c44ea026760a12fbc9f50c439f47b9af3956270d8f0a05c951fb19cc4f23a7064476a0a111d39e79183d52e8c6e686d17bf17f76df92e052f81d8940df588fe SHA512 fa2e4c28f8910eb82de42c76f2c00e8b832c023844f1d61aedb5ef3b0fafa7f3f7f26ab535a936d4ad8a42bedb380e71fe6c03f5e1b767afe731d70e080d241e
-EBUILD gr-fosphor-0.0_p20200131-r1.ebuild 1320 BLAKE2B b00a1cc5c5f1d7505290ab93242ca028336a29f0831691f9cb8e4b5c33130dfd4ce2c598a8a1d7e8f8ba60c1fc46a994ec172e0d4dfb3e1151c1bc0abc18aa6c SHA512 9abaa23e2f4f3b3077b32d24ab93ff508b8cd894478e860157fb7fe01bd126385b2572ee98a27008f542d00a6fbd381b49472ad1f28cef6c93b4fc24fbd04981
 EBUILD gr-fosphor-0.0_p20210108.ebuild 1879 BLAKE2B 6758901afc343109b692fcdc493b143ebc8eb7b183fac5ddf83d5cd9c1d71eba0a13af6eff1c34cd3e448afdc4eeae0fbec1e8ade56bc1b26537ac4362603db7 SHA512 ab3c8ecd1a8881593bbfa3a3b0f6ba005cad70d3b9f0d0f73fe66202877d4f33c40a46ab17bc80fc1f96b5d59626a453e5877c324493a6e805678c6d06606306
-EBUILD gr-fosphor-9999.ebuild 1274 BLAKE2B 9c420d39d7ebd6f8001a7eab0eee4702e4698e37947bd8f8867162c230e55e69430845a50099dc72f782ecca82d0b3af5240a5cd3bf8881a148cf1f6aaa378b5 SHA512 febd9b645b3aebaf31fc05201b352cb6174de0bb2fcfb782ffa6fc0678127752eaf30d2b8cf6490191cf6a71142b2688572e359f6e2d4302d877e7a91dc73667
-MISC metadata.xml 309 BLAKE2B 37919b71ccbab01f305f01b618c18d1eb9ec5073ea7498daee75016faa65241d6ec835cad89d3a143650d27164e04091fa3f72d028ad6dd2d8634d67656e37af SHA512 3a0cb1788a6c420b95b9ddb283d3423749254059064f50c8f7436dc1a928657e43ae732ac54a5edfab03d5c30d572b2947a04b84709b435836664013d51e35e3
+EBUILD gr-fosphor-9999.ebuild 1894 BLAKE2B 0612257a331c102a896bf9fcc43d2fa9a416acafcd0a166be255ace1db0de861b3a0966092cf8f05cff8b347f6b7f757f1783d3661eead9f2aa1a08f90e62a35 SHA512 3b7d237c87662f26261aa58462b8fe174222ff34266ea7d81bb07b188991dc4dc71888956141215a6d51a2ffed2d57cc02bbf332ebf74501737c89d0d761a635
+MISC metadata.xml 392 BLAKE2B 676db09c61462dd9bfacd384748ec85313a55823d9639964bfbf51a897fb0c616edca8d8ad0c12440b70a8ecc283ca68480594b4f8cc0cd37df09c02c272f80c SHA512 5bb12129a8c9962c954648ad163da3577c9616c52ac923ab6c97e5bbf3c89a938c69ce361e7da964bcb6543d0d5453e86fc69697336a5cbbc2430dafacd80519
diff --git a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131-r1.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131-r1.ebuild
deleted file mode 100644
index a95757d28db1..000000000000
--- a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/osmocom/${PN}.git"
-else
-	COMMIT="defdd4aca6cd157ccc3b10ea16b5b4f552f34b96"
-	SRC_URI="https://github.com/osmocom/gr-fosphor/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${COMMIT}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="glfw qt5"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/log4cpp
-	media-libs/freetype
-	=net-wireless/gnuradio-3.8*:0=[qt5,${PYTHON_SINGLE_USEDEP}]
-	glfw? ( >=media-libs/glfw-3 )
-	virtual/opencl
-	virtual/opengl
-	${PYTHON_DEPS}
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/swig:0"
-
-PATCHES=( "${FILESDIR}"/${P}-htmldir.patch )
-
-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_PYTHON=ON
-	)
-	cmake_src_configure
-}
diff --git a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
index efd198c13e93..7490f5d58e59 100644
--- a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
+++ b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/osmocom/${PN}.git"
 else
-	COMMIT="defdd4aca6cd157ccc3b10ea16b5b4f552f34b96"
+	COMMIT="974ab2fe54c25e8b6c37aa4de148ba0625eef652"
 	SRC_URI="https://github.com/osmocom/gr-fosphor/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${COMMIT}"
 	KEYWORDS="~amd64 ~x86"
@@ -29,7 +29,8 @@ RDEPEND="
 	dev-libs/boost:=
 	dev-libs/log4cpp
 	media-libs/freetype
-	=net-wireless/gnuradio-3.8*:0=[qt5,${PYTHON_SINGLE_USEDEP}]
+	>=net-wireless/gnuradio-3.9:0=[qt5,${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/pygccxml[${PYTHON_USEDEP}]')
 	glfw? ( >=media-libs/glfw-3 )
 	virtual/opencl
 	virtual/opengl
@@ -41,7 +42,22 @@ RDEPEND="
 		dev-qt/qtwidgets:5
 	)"
 DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/swig:0"
+BDEPEND="$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.0_p20200131-htmldir.patch
+		  "${FILESDIR}"/${PN}-0.0_p20210108-fix-use.patch )
+
+src_prepare() {
+	cmake_src_prepare
+
+	# adapt python bindings to use flags
+	use glfw || sed -i -e "s#bind_glfw_sink_c(m)##" \
+					"${S}"/python/bindings/python_bindings.cc ||die
+	use qt5 || sed -i -e "s#bind_qt_sink_c(m)##" \
+					"${S}"/python/bindings/python_bindings.cc ||die
+
+	eapply_user
+}
 
 src_configure() {
 	# tries to run OpenCL test program, but failing doesn't hurt
@@ -55,3 +71,9 @@ src_configure() {
 	)
 	cmake_src_configure
 }
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name '*.py[oc]' -delete || die
+	python_optimize
+}
diff --git a/net-analyzer/gr-fosphor/metadata.xml b/net-analyzer/gr-fosphor/metadata.xml
index e2304ffe68ec..2b496fa3b1f7 100644
--- a/net-analyzer/gr-fosphor/metadata.xml
+++ b/net-analyzer/gr-fosphor/metadata.xml
@@ -8,4 +8,7 @@
 	<use>
 		<flag name="glfw">enable GLFW based interface</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">osmocom/gr-fosphor</remote-id>
+	</upstream>
 </pkgmetadata>