commit: 6ce4f667e83edbc149399cfe66fa493661b790c0 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Nov 2 20:04:06 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Nov 3 18:54:54 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ce4f667
net-analyzer/gr-fosphor: Drop IUSE qt5 and net-wireless/gnuradio[qt5] dep Cleanup indentation and superfluous eapply_user. Closes: https://bugs.gentoo.org/961742 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...9.ebuild => gr-fosphor-0.0_p20210108-r3.ebuild} | 36 +++++++++------------- net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild | 36 +++++++++------------- 2 files changed, 30 insertions(+), 42 deletions(-) diff --git a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20210108-r3.ebuild similarity index 70% copy from net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild copy to net-analyzer/gr-fosphor/gr-fosphor-0.0_p20210108-r3.ebuild index 48ef1f3f534b..93e78383564e 100644 --- a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild +++ b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20210108-r3.ebuild @@ -3,14 +3,14 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..13} ) +PYTHON_COMPAT=( python3_{11..13} ) 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 @@ -22,41 +22,35 @@ fi LICENSE="GPL-3+" SLOT="0" -IUSE="glfw qt5" +IUSE="glfw" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RDEPEND=" +RDEPEND="${PYTHON_DEPS} dev-libs/boost:= dev-libs/log4cpp - media-libs/freetype - >=net-wireless/gnuradio-3.9:0=[qt5,${PYTHON_SINGLE_USEDEP}] $(python_gen_cond_dep 'dev-python/pygccxml[${PYTHON_USEDEP}]') + media-libs/freetype + >=net-wireless/gnuradio-3.9:0=[${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="$(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 ) +PATCHES=( + "${FILESDIR}"/${PN}-0.0_p20200131-htmldir.patch + "${FILESDIR}"/${P}-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 + python/bindings/python_bindings.cc || die + sed -i -e "s#bind_qt_sink_c(m)##" \ + python/bindings/python_bindings.cc || die } src_configure() { @@ -66,7 +60,7 @@ src_configure() { local mycmakeargs=( -DENABLE_DEFAULT=OFF -DENABLE_GLFW="$(usex glfw)" - -DENABLE_QT="$(usex qt5)" + -DENABLE_QT=OFF # bug #961742 -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 48ef1f3f534b..cfe9eefecee3 100644 --- a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild +++ b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild @@ -3,14 +3,14 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..13} ) +PYTHON_COMPAT=( python3_{11..13} ) 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 @@ -22,41 +22,35 @@ fi LICENSE="GPL-3+" SLOT="0" -IUSE="glfw qt5" +IUSE="glfw" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RDEPEND=" +RDEPEND="${PYTHON_DEPS} dev-libs/boost:= dev-libs/log4cpp - media-libs/freetype - >=net-wireless/gnuradio-3.9:0=[qt5,${PYTHON_SINGLE_USEDEP}] $(python_gen_cond_dep 'dev-python/pygccxml[${PYTHON_USEDEP}]') + media-libs/freetype + >=net-wireless/gnuradio-3.9:0=[${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="$(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 ) +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 + python/bindings/python_bindings.cc || die + sed -i -e "s#bind_qt_sink_c(m)##" \ + python/bindings/python_bindings.cc || die } src_configure() { @@ -66,7 +60,7 @@ src_configure() { local mycmakeargs=( -DENABLE_DEFAULT=OFF -DENABLE_GLFW="$(usex glfw)" - -DENABLE_QT="$(usex qt5)" + -DENABLE_QT=OFF # bug #961742 -DENABLE_PYTHON=ON ) cmake_src_configure
