gentoo resync : 13.06.2020

4 files changed, 87 insertions, 16 deletions

diff --git a/net-wireless/gr-ieee802154/Manifest b/net-wireless/gr-ieee802154/Manifest
index 12909b33d6fd..be91a7f66642 100644
--- a/net-wireless/gr-ieee802154/Manifest
+++ b/net-wireless/gr-ieee802154/Manifest
@@ -1,4 +1,6 @@
-DIST gr-ieee802154-0.0_p20180402.tar.gz 195464 BLAKE2B 391bd4eefb5a90135a084a94c2edd83e6f2c2bd6dca26be4d9a54448382d5ee463e1740c305e9583be0107b424c67e74fac84ece147844e7c2a63f6096c7dd36 SHA512 90f164bdcd636dee68a49fe844901ca73e1f743fdeacd8019edddc57c681ec3d1fcfe209d8abd89e2013c2c2c436b7992fe0b0dbe9c88c04352aebc0813a9d96
-EBUILD gr-ieee802154-0.0_p20180402.ebuild 1365 BLAKE2B c6794369bc025bd6c6e770e4d9ce15823367d504c4fae45cdc8e4645980fcebc61c1ba997da5448e3983a5f385a30b36d3bf90abbe28d944fa299ae5e8bf48b7 SHA512 43a1b12f4d6d86f117602f5ea205788bd1bf6afe4c2370e5df748c4ff98d2a051dee85c0003c5c6cfbb68a32fca1555e58a9eeed61b30ef58198a2cfb9d7dff4
-EBUILD gr-ieee802154-9999.ebuild 1365 BLAKE2B c6794369bc025bd6c6e770e4d9ce15823367d504c4fae45cdc8e4645980fcebc61c1ba997da5448e3983a5f385a30b36d3bf90abbe28d944fa299ae5e8bf48b7 SHA512 43a1b12f4d6d86f117602f5ea205788bd1bf6afe4c2370e5df748c4ff98d2a051dee85c0003c5c6cfbb68a32fca1555e58a9eeed61b30ef58198a2cfb9d7dff4
+DIST gr-ieee802154-0.0_p20190606.tar.gz 195541 BLAKE2B f565808788c463816633774362be0bf6e6900db52051ef4f8e2eed5b110c7b9edcf05458f8a4a8e3afef59c4a76101a5606ea9c9023ad922162ee9466cc7e343 SHA512 b430ee6c16356307566619cd50258c3fd05ca198a67f0b47eea6b8d1038de6cc070823dd7392a56c4308cd74495802b4b52a4a425ce43ce4afb56386ec5fa39a
+DIST gr-ieee802154-0.0_p20191006.tar.gz 94443 BLAKE2B f561b401b97741e6a06d36b97be765f66778002c6ea7814ffcc08e7aa93d6236705a25c1f32d536d3e2d2193b92608cdd469ba086f459f0f8290c74f52297d6a SHA512 1c552cfe3739165382c36aeb8f556b17ee7925459d74c96d36a7b1f821e177860ddab601c87184cd33db9c97d1231edeb4267bbfbf9df198708db692e27a1a86
+EBUILD gr-ieee802154-0.0_p20190606.ebuild 1351 BLAKE2B 268f659fe1b7219fa2e515613fcbe0052637b847996193e436e87d7866783c54ae30d85a43657c030fe73b0f1f7d87558b936044e3abe85b3706ae4e85da1ec1 SHA512 68fa564c2187038c01221086ca7a7a86413c5bb6199a276d289722eb81fbe1a3f2e3803577aaeb1253ec6afbc6d5d5fdb3d22b6f9bfa75c3e384b69afad75183
+EBUILD gr-ieee802154-0.0_p20191006.ebuild 1477 BLAKE2B 073a9067e81be3fdae9241348d525cef835d7c89766e84fe76a78319ccb951d7f072be1532d927f136f570bc8533d61a6e6de4a55a2d925cfb24563df16f6c12 SHA512 c05ac91dfccbe2ef6da651f9e7578fef44626256dbdb912dc049e16ae801a176e4092514f713b30ae1c1d3b3dc3fc91b3b62fea1211d80be65b172dc4863a39a
+EBUILD gr-ieee802154-9999.ebuild 1477 BLAKE2B 073a9067e81be3fdae9241348d525cef835d7c89766e84fe76a78319ccb951d7f072be1532d927f136f570bc8533d61a6e6de4a55a2d925cfb24563df16f6c12 SHA512 c05ac91dfccbe2ef6da651f9e7578fef44626256dbdb912dc049e16ae801a176e4092514f713b30ae1c1d3b3dc3fc91b3b62fea1211d80be65b172dc4863a39a
 MISC metadata.xml 326 BLAKE2B 0c715a85a0e2a4aa2ff0ac84318ea552eab5731a60b9b8391ec2540cd30c0f28e13e0b9aa17c45169d335bd10f457b79b11cd2c81538f6b3b11773223ca13364 SHA512 725d903a1befe5e9b41eae5478f65f11dd30a42c5c73597cd8a613347a271528357a176d5e88359ff6cd1074070e6ff413cb70f23d21b9467dd53a5b0d2d65a9
diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20180402.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20190606.ebuild
index e99620f1b2aa..89e8afbf67b3 100644
--- a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20180402.ebuild
+++ b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20190606.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python2_7 )
 
 inherit cmake-utils python-single-r1
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/bastibl/gr-ieee802-15-4.git"
 	KEYWORDS=""
 else
-	COMMIT="c969b3fd2059472a28dee6f911083dd03d1dd569"
+	COMMIT="d3d94023c71af9e6d7721f7412fba88ff5325234"
 	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"
@@ -23,15 +23,13 @@ fi
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 
-RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}]
+RDEPEND="=net-wireless/gnuradio-3.7*:0=[${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
 	')
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	dev-lang/swig:0"
-#cppunit is listed in cmake, but only needed for tests and there are no tests
-#	dev-util/cppunit"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -40,10 +38,14 @@ src_prepare() {
 	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-utils_src_prepare
 }
 
 src_configure() {
-	mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" )
+	mycmakeargs=(
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DGR_PKG_DOC_DIR="/usr/share/doc/${P}"
+	)
 	cmake-utils_src_configure
 }
diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20191006.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20191006.ebuild
new file mode 100644
index 000000000000..48499a6bf347
--- /dev/null
+++ b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20191006.ebuild
@@ -0,0 +1,58 @@
+# 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="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"
+	KEYWORDS=""
+else
+	COMMIT="a3c79af96e18de3eb3a76659e1669a370efccf17"
+	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-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
+	')
+	dev-libs/gmp
+	sci-libs/volk
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	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-utils_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DGR_PKG_DOC_DIR="/usr/share/doc/${P}"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_optimize "${ED}/$(python_get_sitedir)"
+}
diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild
index e99620f1b2aa..48499a6bf347 100644
--- a/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild
+++ b/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit cmake-utils python-single-r1
 
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/bastibl/gr-ieee802-15-4.git"
 	KEYWORDS=""
 else
-	COMMIT="c969b3fd2059472a28dee6f911083dd03d1dd569"
+	COMMIT="a3c79af96e18de3eb3a76659e1669a370efccf17"
 	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"
@@ -23,15 +23,15 @@ fi
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 
-RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}]
+RDEPEND="=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
 	')
+	dev-libs/gmp
+	sci-libs/volk
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	dev-lang/swig:0"
-#cppunit is listed in cmake, but only needed for tests and there are no tests
-#	dev-util/cppunit"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -40,10 +40,19 @@ src_prepare() {
 	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-utils_src_prepare
 }
 
 src_configure() {
-	mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" )
+	mycmakeargs=(
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DGR_PKG_DOC_DIR="/usr/share/doc/${P}"
+	)
 	cmake-utils_src_configure
 }
+
+src_install() {
+	cmake-utils_src_install
+	python_optimize "${ED}/$(python_get_sitedir)"
+}