[gentoo-commits] repo/gentoo:master commit in: net-wireless/gr-rftap/
commit: df24b2dbf901c5cea862ffbbbe28403b9a261040
Author: Michał Górny gentoo org>
AuthorDate: Fri Feb 7 17:45:16 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Sun Feb 9 16:34:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df24b2db
net-wireless/gr-rftap: Switch to PYTHON_MULTI_USEDEP API
Signed-off-by: Michał Górny gentoo.org>
net-wireless/gr-rftap/gr-rftap-.ebuild | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/net-wireless/gr-rftap/gr-rftap-.ebuild
b/net-wireless/gr-rftap/gr-rftap-.ebuild
index 621dada2edb..54059b6ad6c 100644
--- a/net-wireless/gr-rftap/gr-rftap-.ebuild
+++ b/net-wireless/gr-rftap/gr-rftap-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -22,8 +22,10 @@ SLOT="0/${PV}"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
- dev-libs/boost:=[${PYTHON_USEDEP}]
- >=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
+ ')
+ >=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}]
"
DEPEND="${RDEPEND}"
BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: net-wireless/gr-rftap/
commit: 5b4f0996e4aa19d825106112ef187d0b7cfd9b88
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Jan 1 00:14:22 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Jan 7 22:59:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b4f0996
net-wireless/gr-rftap: EAPI-7 bump, missing cmake-utils_src_prepare
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
net-wireless/gr-rftap/gr-rftap-.ebuild | 42 --
1 file changed, 22 insertions(+), 20 deletions(-)
diff --git a/net-wireless/gr-rftap/gr-rftap-.ebuild
b/net-wireless/gr-rftap/gr-rftap-.ebuild
index e0f9dc95c13..621dada2edb 100644
--- a/net-wireless/gr-rftap/gr-rftap-.ebuild
+++ b/net-wireless/gr-rftap/gr-rftap-.ebuild
@@ -1,44 +1,46 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-single-r1
+EAPI=7
-DESCRIPTION="RFtap Module for GNU Radio"
-HOMEPAGE="https://github.com/rftap/gr-rftap";
+PYTHON_COMPAT=( python2_7 )
if [[ ${PV} == * ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/rftap/gr-rftap.git";
+else
KEYWORDS=""
-#else
-# SRC_URI=""
-# KEYWORDS=""
fi
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="RFtap Module for GNU Radio"
+HOMEPAGE="https://github.com/rftap/gr-rftap";
LICENSE="GPL-3"
SLOT="0/${PV}"
-RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_USEDEP}]
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
dev-libs/boost:=[${PYTHON_USEDEP}]
- ${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
- dev-lang/swig:0"
+ >=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ 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}"
-
src_prepare() {
+ cmake-utils_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 's#FATAL_ERROR "CppUnit#MESSAGE "CppUnit#' CMakeLists.txt || die
+ sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt || die
+ sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt || die
}
src_configure() {
- mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" )
+ local mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" )
cmake-utils_src_configure
}
[gentoo-commits] repo/gentoo:master commit in: net-wireless/gr-rftap/
commit: d4860fdd5ddca52a5cdd22a5fbc9d28434862b8c
Author: Zero_Chaos gentoo org>
AuthorDate: Wed Nov 9 19:09:17 2016 +
Commit: Richard Farina gentoo org>
CommitDate: Wed Nov 9 19:09:44 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4860fdd
gr-rftap: and why not
net-wireless/gr-rftap/gr-rftap-.ebuild | 45 ++
net-wireless/gr-rftap/metadata.xml | 11
2 files changed, 56 insertions(+)
diff --git a/net-wireless/gr-rftap/gr-rftap-.ebuild
b/net-wireless/gr-rftap/gr-rftap-.ebuild
new file mode 100644
index ..7fc8831
--- /dev/null
+++ b/net-wireless/gr-rftap/gr-rftap-.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="RFtap Module for GNU Radio"
+HOMEPAGE="https://github.com/rftap/gr-rftap";
+
+if [[ ${PV} == * ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/rftap/gr-rftap.git";
+ KEYWORDS=""
+#else
+# SRC_URI=""
+# KEYWORDS=""
+fi
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+
+RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_USEDEP}]
+ dev-libs/boost:=[${PYTHON_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}"
+
+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
+}
+
+src_configure() {
+ mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" )
+ cmake-utils_src_configure
+}
diff --git a/net-wireless/gr-rftap/metadata.xml
b/net-wireless/gr-rftap/metadata.xml
new file mode 100644
index ..390b5fa
--- /dev/null
+++ b/net-wireless/gr-rftap/metadata.xml
@@ -0,0 +1,11 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+
+ ra...@gentoo.org
+ Radio
+
+
+ rftap/gr-rftap
+
+
