| 1 |
commit: f92000531b77a5ff659fa560c1480eb89cbd47f6 |
| 2 |
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jun 3 14:20:02 2020 +0000 |
| 4 |
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 3 14:20:31 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9200053 |
| 7 |
|
| 8 |
net-wireless/gnuradio: remove unneeded dep |
| 9 |
|
| 10 |
migrate from cmake-utils to cmake eclass |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.100, Repoman-2.3.22 |
| 13 |
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org> |
| 14 |
|
| 15 |
.../{gnuradio-3.8.1.0.ebuild => gnuradio-3.8.1.0-r1.ebuild} | 11 +++++------ |
| 16 |
net-wireless/gnuradio/gnuradio-9999.ebuild | 11 +++++------ |
| 17 |
2 files changed, 10 insertions(+), 12 deletions(-) |
| 18 |
|
| 19 |
diff --git a/net-wireless/gnuradio/gnuradio-3.8.1.0.ebuild b/net-wireless/gnuradio/gnuradio-3.8.1.0-r1.ebuild |
| 20 |
similarity index 96% |
| 21 |
rename from net-wireless/gnuradio/gnuradio-3.8.1.0.ebuild |
| 22 |
rename to net-wireless/gnuradio/gnuradio-3.8.1.0-r1.ebuild |
| 23 |
index 1ba2694abe7..3fd0a24eac1 100644 |
| 24 |
--- a/net-wireless/gnuradio/gnuradio-3.8.1.0.ebuild |
| 25 |
+++ b/net-wireless/gnuradio/gnuradio-3.8.1.0-r1.ebuild |
| 26 |
@@ -5,7 +5,7 @@ EAPI=7 |
| 27 |
PYTHON_COMPAT=( python3_{6,7,8} ) |
| 28 |
|
| 29 |
CMAKE_BUILD_TYPE="None" |
| 30 |
-inherit cmake-utils python-single-r1 virtualx xdg-utils desktop |
| 31 |
+inherit cmake python-single-r1 virtualx xdg-utils desktop |
| 32 |
|
| 33 |
DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios" |
| 34 |
HOMEPAGE="https://www.gnuradio.org/" |
| 35 |
@@ -47,7 +47,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 36 |
" |
| 37 |
|
| 38 |
RDEPEND="${PYTHON_DEPS} |
| 39 |
- >=dev-lang/orc-0.4.12 |
| 40 |
$(python_gen_cond_dep 'dev-libs/boost:0=[python,${PYTHON_USEDEP}]') |
| 41 |
dev-libs/log4cpp |
| 42 |
$(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]') |
| 43 |
@@ -123,7 +122,7 @@ src_prepare() { |
| 44 |
use !oss && sed -i 's#soundcard.h#oss-nonexistent.h#g' cmake/Modules/FindOSS.cmake |
| 45 |
use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistent.h#g' cmake/Modules/FindPORTAUDIO.cmake |
| 46 |
|
| 47 |
- cmake-utils_src_prepare |
| 48 |
+ cmake_src_prepare |
| 49 |
} |
| 50 |
|
| 51 |
src_configure() { |
| 52 |
@@ -160,11 +159,11 @@ src_configure() { |
| 53 |
-DGR_PYTHON_DIR="$(python_get_sitedir)" |
| 54 |
-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" |
| 55 |
) |
| 56 |
- cmake-utils_src_configure |
| 57 |
+ cmake_src_configure |
| 58 |
} |
| 59 |
|
| 60 |
src_install() { |
| 61 |
- cmake-utils_src_install |
| 62 |
+ cmake_src_install |
| 63 |
|
| 64 |
if use examples ; then |
| 65 |
dodir /usr/share/doc/${PF}/ |
| 66 |
@@ -202,7 +201,7 @@ src_install() { |
| 67 |
|
| 68 |
src_test() |
| 69 |
{ |
| 70 |
- virtx cmake-utils_src_test |
| 71 |
+ virtx cmake_src_test |
| 72 |
} |
| 73 |
|
| 74 |
pkg_postinst() |
| 75 |
|
| 76 |
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild |
| 77 |
index c3f9aab150e..aa068b0e06b 100644 |
| 78 |
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild |
| 79 |
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild |
| 80 |
@@ -5,7 +5,7 @@ EAPI=7 |
| 81 |
PYTHON_COMPAT=( python3_{6,7,8} ) |
| 82 |
|
| 83 |
CMAKE_BUILD_TYPE="None" |
| 84 |
-inherit cmake-utils python-single-r1 virtualx xdg-utils |
| 85 |
+inherit cmake python-single-r1 virtualx xdg-utils |
| 86 |
|
| 87 |
DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios" |
| 88 |
HOMEPAGE="https://www.gnuradio.org/" |
| 89 |
@@ -48,7 +48,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 90 |
|
| 91 |
RDEPEND="${PYTHON_DEPS} |
| 92 |
$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]') |
| 93 |
- >=dev-lang/orc-0.4.12 |
| 94 |
$(python_gen_cond_dep 'dev-libs/boost:0=[python,${PYTHON_USEDEP}]') |
| 95 |
dev-libs/log4cpp |
| 96 |
$(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]') |
| 97 |
@@ -124,7 +123,7 @@ src_prepare() { |
| 98 |
use !oss && sed -i 's#soundcard.h#oss-nonexistent.h#g' cmake/Modules/FindOSS.cmake |
| 99 |
use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistent.h#g' cmake/Modules/FindPORTAUDIO.cmake |
| 100 |
|
| 101 |
- cmake-utils_src_prepare |
| 102 |
+ cmake_src_prepare |
| 103 |
} |
| 104 |
|
| 105 |
src_configure() { |
| 106 |
@@ -160,11 +159,11 @@ src_configure() { |
| 107 |
-DGR_PYTHON_DIR="$(python_get_sitedir)" |
| 108 |
-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" |
| 109 |
) |
| 110 |
- cmake-utils_src_configure |
| 111 |
+ cmake_src_configure |
| 112 |
} |
| 113 |
|
| 114 |
src_install() { |
| 115 |
- cmake-utils_src_install |
| 116 |
+ cmake_src_install |
| 117 |
|
| 118 |
if use examples ; then |
| 119 |
dodir /usr/share/doc/${PF}/ |
| 120 |
@@ -202,7 +201,7 @@ src_install() { |
| 121 |
|
| 122 |
src_test() |
| 123 |
{ |
| 124 |
- virtx cmake-utils_src_test |
| 125 |
+ virtx cmake_src_test |
| 126 |
} |
| 127 |
|
| 128 |
pkg_postinst() |
Archives