From 7a5bcb3478788f79d54743ad37a07279c37f1925 Mon Sep 17 00:00:00 2001 From: Rick Farina Date: Wed, 7 Sep 2022 20:54:34 -0400 Subject: net-wireless/gr-ieee802154: add missing dep pybind11 required to build Signed-off-by: Rick Farina --- .../gr-ieee802154-0.0_p20210719-r1.ebuild | 62 --------------------- .../gr-ieee802154-0.0_p20210719-r2.ebuild | 63 ++++++++++++++++++++++ .../gr-ieee802154/gr-ieee802154-9999.ebuild | 1 + 3 files changed, 64 insertions(+), 62 deletions(-) delete mode 100644 net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20210719-r1.ebuild create mode 100644 net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20210719-r2.ebuild diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20210719-r1.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20210719-r1.ebuild deleted file mode 100644 index 2e84883f202d..000000000000 --- a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20210719-r1.ebuild +++ /dev/null @@ -1,62 +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="IEEE 802.15.4 ZigBee Transceiver" -HOMEPAGE="https://github.com/bastibl/gr-ieee802-15-4" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/bastibl/gr-ieee802-15-4.git" - EGIT_BRANCH="maint-3.9" -else - COMMIT="1a2999ce2778df279870f028a4ce15d94e60fbd9" - SRC_URI="https://github.com/bastibl/gr-ieee802-15-4/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/gr-ieee802-15-4-${COMMIT}" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0/${PV}" - -RDEPEND="net-wireless/gnuradio:0=[${PYTHON_SINGLE_USEDEP}] - $(python_gen_cond_dep ' - dev-libs/boost:=[python,${PYTHON_USEDEP}] - ') - dev-libs/gmp - sci-libs/volk:= - ${PYTHON_DEPS}" -DEPEND="${RDEPEND} - dev-libs/spdlog - dev-lang/swig:0" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -src_prepare() { - #although cppunit is not used, it fails if it isn't there, fix it - sed -i 's#FATAL_ERROR "CppUnit#MESSAGE "CppUnit#' CMakeLists.txt - sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt - sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt - sed -i '/GR_PKG_DOC_DIR/d' CMakeLists.txt - cmake_src_prepare -} - -src_configure() { - mycmakeargs=( - -DPYTHON_EXECUTABLE="${PYTHON}" - -DGR_PKG_DOC_DIR="/usr/share/doc/${P}" - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - # Remove stray python files generated by the build system - find "${ED}" -name '*.pyc' -exec rm -f {} \; || die - find "${ED}" -name '*.pyo' -exec rm -f {} \; || die - python_optimize -} diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20210719-r2.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20210719-r2.ebuild new file mode 100644 index 000000000000..96bd914b3e98 --- /dev/null +++ b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20210719-r2.ebuild @@ -0,0 +1,63 @@ +# 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="IEEE 802.15.4 ZigBee Transceiver" +HOMEPAGE="https://github.com/bastibl/gr-ieee802-15-4" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/bastibl/gr-ieee802-15-4.git" + EGIT_BRANCH="maint-3.9" +else + COMMIT="1a2999ce2778df279870f028a4ce15d94e60fbd9" + SRC_URI="https://github.com/bastibl/gr-ieee802-15-4/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/gr-ieee802-15-4-${COMMIT}" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-3" +SLOT="0/${PV}" + +RDEPEND="net-wireless/gnuradio:0=[${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep ' + dev-libs/boost:=[python,${PYTHON_USEDEP}] + dev-python/pybind11[${PYTHON_USEDEP}] + ') + dev-libs/gmp + sci-libs/volk:= + ${PYTHON_DEPS}" +DEPEND="${RDEPEND} + dev-libs/spdlog + dev-lang/swig:0" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +src_prepare() { + #although cppunit is not used, it fails if it isn't there, fix it + sed -i 's#FATAL_ERROR "CppUnit#MESSAGE "CppUnit#' CMakeLists.txt + sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt + sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt + sed -i '/GR_PKG_DOC_DIR/d' CMakeLists.txt + cmake_src_prepare +} + +src_configure() { + mycmakeargs=( + -DPYTHON_EXECUTABLE="${PYTHON}" + -DGR_PKG_DOC_DIR="/usr/share/doc/${P}" + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + # Remove stray python files generated by the build system + find "${ED}" -name '*.pyc' -exec rm -f {} \; || die + find "${ED}" -name '*.pyo' -exec rm -f {} \; || die + python_optimize +} diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild index 2e84883f202d..96bd914b3e98 100644 --- a/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild +++ b/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild @@ -26,6 +26,7 @@ SLOT="0/${PV}" RDEPEND="net-wireless/gnuradio:0=[${PYTHON_SINGLE_USEDEP}] $(python_gen_cond_dep ' dev-libs/boost:=[python,${PYTHON_USEDEP}] + dev-python/pybind11[${PYTHON_USEDEP}] ') dev-libs/gmp sci-libs/volk:= -- cgit v1.2.3-65-gdbad