From 8bba0fff0bc9709d45aeb68336998e11d118ab05 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 8 Sep 2022 04:37:19 +0100 Subject: gentoo auto-resync : 08:09:2022 - 04:37:19 --- net-wireless/Manifest.gz | Bin 14561 -> 14564 bytes net-wireless/gr-ieee802154/Manifest | 4 +- .../gr-ieee802154-0.0_p20210719-r1.ebuild | 62 -------------------- .../gr-ieee802154-0.0_p20210719-r2.ebuild | 63 +++++++++++++++++++++ .../gr-ieee802154/gr-ieee802154-9999.ebuild | 1 + 5 files changed, 66 insertions(+), 64 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 (limited to 'net-wireless') diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz index 77ac7b82f2b7..6ea0239bcd36 100644 Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ diff --git a/net-wireless/gr-ieee802154/Manifest b/net-wireless/gr-ieee802154/Manifest index a02fcb2eb9cc..96b2fb29f71c 100644 --- a/net-wireless/gr-ieee802154/Manifest +++ b/net-wireless/gr-ieee802154/Manifest @@ -1,4 +1,4 @@ DIST gr-ieee802154-0.0_p20210719.tar.gz 155040 BLAKE2B c198de71391ddc2ad32255476b8b9ba0e13bd3eb3c674b21846174cd3d8804c68e407f4e019cc164b1d10eae5ee672ae31a5f23a450d08abd477aa244ef479fb SHA512 77f746832bfaec53ad6439b69de8712fb444d7b45fdc9937445c6df5d6a5a9a19363ab180c063b6c0647dff8c0404797d190730124a2248418e0fee5daff26f7 -EBUILD gr-ieee802154-0.0_p20210719-r1.ebuild 1614 BLAKE2B b7485a60399b4245a338c08a41b0623413d23cdd49a902da68ace9dba624feb3892152252d6b04befe741ee4f572c182553fc6d2bb241bd056f9ee5cdb6fab02 SHA512 b39d68e2c74f67a771ecb30fd155424e153f72cf73ac15f70d306b43b348f13937d8f5e2d16383214fa255e43955af7ad9cf4aa48faac0ac770b883d36c2eba6 -EBUILD gr-ieee802154-9999.ebuild 1614 BLAKE2B b7485a60399b4245a338c08a41b0623413d23cdd49a902da68ace9dba624feb3892152252d6b04befe741ee4f572c182553fc6d2bb241bd056f9ee5cdb6fab02 SHA512 b39d68e2c74f67a771ecb30fd155424e153f72cf73ac15f70d306b43b348f13937d8f5e2d16383214fa255e43955af7ad9cf4aa48faac0ac770b883d36c2eba6 +EBUILD gr-ieee802154-0.0_p20210719-r2.ebuild 1654 BLAKE2B f851c222a6fabf677dd3ed4fc946a04242b91a40df86ab0cb4bfdf218348e7986cc0c11887e6a614298f78eaed605a459843fb67703759aaff4976658fcd7614 SHA512 b89ceb8e719ee4977b7f44f8a1e336b1649e6faacc7aab72c50b181ae2b044d9d442befdcf5917340a2ba9a4d829b4660f4db4fa5c3b619ea1699e9062b4eded +EBUILD gr-ieee802154-9999.ebuild 1654 BLAKE2B f851c222a6fabf677dd3ed4fc946a04242b91a40df86ab0cb4bfdf218348e7986cc0c11887e6a614298f78eaed605a459843fb67703759aaff4976658fcd7614 SHA512 b89ceb8e719ee4977b7f44f8a1e336b1649e6faacc7aab72c50b181ae2b044d9d442befdcf5917340a2ba9a4d829b4660f4db4fa5c3b619ea1699e9062b4eded MISC metadata.xml 327 BLAKE2B 2c9e8d4809ade74a47f5ec1e0f208345c49edc0a994226a8a29739643b1558fa3fe426ce64636742708b32a5a2ac0e9472fbd91545d30d18d0e8755d2743c483 SHA512 dd940d9241b852de89bfcb8f921663ec946f2833c2741ddf39ab6cffcbb275c63e7407a97f8c650135d79351f26622c2a23b05251ca2d9b61eb5a64108ad0200 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