From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E02131382C5 for ; Mon, 1 Jun 2020 20:46:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AB19AE0899; Mon, 1 Jun 2020 20:46:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7FDF4E0899 for ; Mon, 1 Jun 2020 20:46:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3F9C234E836 for ; Mon, 1 Jun 2020 20:46:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9F163281 for ; Mon, 1 Jun 2020 20:45:57 +0000 (UTC) From: "Rick Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Rick Farina" Message-ID: <1591044189.189ac42416a5d82a21b15ebeae36d78b4973caf7.zerochaos@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/gr-ieee802154/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/gr-ieee802154/Manifest net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20180402.ebuild net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20190606.ebuild net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20191006.ebuild net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild X-VCS-Directories: net-wireless/gr-ieee802154/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Rick Farina X-VCS-Revision: 189ac42416a5d82a21b15ebeae36d78b4973caf7 X-VCS-Branch: master Date: Mon, 1 Jun 2020 20:45:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8443e499-b585-46b8-a92f-9a06ad3e5575 X-Archives-Hash: 785ae2d5ca728b6fdcf0ec6513b4a104 commit: 189ac42416a5d82a21b15ebeae36d78b4973caf7 Author: Rick Farina gentoo org> AuthorDate: Sat May 30 03:12:13 2020 +0000 Commit: Rick Farina gentoo org> CommitDate: Mon Jun 1 20:43:09 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=189ac424 net-wireless/gr-ieee802154: bump prep for gr3.8 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Rick Farina gentoo.org> net-wireless/gr-ieee802154/Manifest | 3 ++- ...0180402.ebuild => gr-ieee802154-0.0_p20190606.ebuild} | 14 ++++++++------ ...0180402.ebuild => gr-ieee802154-0.0_p20191006.ebuild} | 16 +++++++++------- net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild | 16 +++++++++------- 4 files changed, 28 insertions(+), 21 deletions(-) diff --git a/net-wireless/gr-ieee802154/Manifest b/net-wireless/gr-ieee802154/Manifest index 1419ea0abdf..7cf49226bdd 100644 --- a/net-wireless/gr-ieee802154/Manifest +++ b/net-wireless/gr-ieee802154/Manifest @@ -1 +1,2 @@ -DIST gr-ieee802154-0.0_p20180402.tar.gz 195464 BLAKE2B 391bd4eefb5a90135a084a94c2edd83e6f2c2bd6dca26be4d9a54448382d5ee463e1740c305e9583be0107b424c67e74fac84ece147844e7c2a63f6096c7dd36 SHA512 90f164bdcd636dee68a49fe844901ca73e1f743fdeacd8019edddc57c681ec3d1fcfe209d8abd89e2013c2c2c436b7992fe0b0dbe9c88c04352aebc0813a9d96 +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 diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20180402.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20190606.ebuild similarity index 80% copy from net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20180402.ebuild copy to net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20190606.ebuild index e99620f1b2a..89e8afbf67b 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_p20180402.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20191006.ebuild similarity index 77% rename from net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20180402.ebuild rename to net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20191006.ebuild index e99620f1b2a..f398a0ebda3 100644 --- a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20180402.ebuild +++ b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20191006.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,13 @@ 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}] ') ${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-9999.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild index e99620f1b2a..f398a0ebda3 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,13 @@ 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}] ') ${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 }