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