1 |
commit: 5b4f0996e4aa19d825106112ef187d0b7cfd9b88 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 1 00:14:22 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 7 22:59:55 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b4f0996 |
7 |
|
8 |
net-wireless/gr-rftap: EAPI-7 bump, missing cmake-utils_src_prepare |
9 |
|
10 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
net-wireless/gr-rftap/gr-rftap-9999.ebuild | 42 ++++++++++++++++-------------- |
14 |
1 file changed, 22 insertions(+), 20 deletions(-) |
15 |
|
16 |
diff --git a/net-wireless/gr-rftap/gr-rftap-9999.ebuild b/net-wireless/gr-rftap/gr-rftap-9999.ebuild |
17 |
index e0f9dc95c13..621dada2edb 100644 |
18 |
--- a/net-wireless/gr-rftap/gr-rftap-9999.ebuild |
19 |
+++ b/net-wireless/gr-rftap/gr-rftap-9999.ebuild |
20 |
@@ -1,44 +1,46 @@ |
21 |
-# Copyright 1999-2016 Gentoo Foundation |
22 |
+# Copyright 1999-2019 Gentoo Authors |
23 |
# Distributed under the terms of the GNU General Public License v2 |
24 |
|
25 |
-EAPI=5 |
26 |
-PYTHON_COMPAT=( python2_7 ) |
27 |
- |
28 |
-inherit cmake-utils python-single-r1 |
29 |
+EAPI=7 |
30 |
|
31 |
-DESCRIPTION="RFtap Module for GNU Radio" |
32 |
-HOMEPAGE="https://github.com/rftap/gr-rftap" |
33 |
+PYTHON_COMPAT=( python2_7 ) |
34 |
|
35 |
if [[ ${PV} == 9999* ]]; then |
36 |
inherit git-r3 |
37 |
EGIT_REPO_URI="https://github.com/rftap/gr-rftap.git" |
38 |
+else |
39 |
KEYWORDS="" |
40 |
-#else |
41 |
-# SRC_URI="" |
42 |
-# KEYWORDS="" |
43 |
fi |
44 |
+inherit cmake-utils python-single-r1 |
45 |
+ |
46 |
+DESCRIPTION="RFtap Module for GNU Radio" |
47 |
+HOMEPAGE="https://github.com/rftap/gr-rftap" |
48 |
|
49 |
LICENSE="GPL-3" |
50 |
SLOT="0/${PV}" |
51 |
|
52 |
-RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_USEDEP}] |
53 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
54 |
+ |
55 |
+RDEPEND="${PYTHON_DEPS} |
56 |
dev-libs/boost:=[${PYTHON_USEDEP}] |
57 |
- ${PYTHON_DEPS}" |
58 |
-DEPEND="${RDEPEND} |
59 |
- dev-lang/swig:0" |
60 |
+ >=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_USEDEP}] |
61 |
+" |
62 |
+DEPEND="${RDEPEND}" |
63 |
+BDEPEND=" |
64 |
+ dev-lang/swig:0 |
65 |
+" |
66 |
#cppunit is listed in cmake, but only needed for tests and there are no tests |
67 |
# dev-util/cppunit" |
68 |
|
69 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
70 |
- |
71 |
src_prepare() { |
72 |
+ cmake-utils_src_prepare |
73 |
#although cppunit is not used, it fails if it isn't there, fix it |
74 |
- sed -i 's#FATAL_ERROR "CppUnit#MESSAGE "CppUnit#' CMakeLists.txt |
75 |
- sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt |
76 |
- sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt |
77 |
+ sed -i 's#FATAL_ERROR "CppUnit#MESSAGE "CppUnit#' CMakeLists.txt || die |
78 |
+ sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt || die |
79 |
+ sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt || die |
80 |
} |
81 |
|
82 |
src_configure() { |
83 |
- mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" ) |
84 |
+ local mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" ) |
85 |
cmake-utils_src_configure |
86 |
} |