commit: f92000531b77a5ff659fa560c1480eb89cbd47f6
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 3 14:20:02 2020 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Jun 3 14:20:31 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9200053
net-wireless/gnuradio: remove unneeded dep
migrate from cmake-utils to cmake eclass
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
.../{gnuradio-3.8.1.0.ebuild => gnuradio-3.8.1.0-r1.ebuild} | 11 +++++------
net-wireless/gnuradio/gnuradio-9999.ebuild | 11 +++++------
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/net-wireless/gnuradio/gnuradio-3.8.1.0.ebuild
b/net-wireless/gnuradio/gnuradio-3.8.1.0-r1.ebuild
similarity index 96%
rename from net-wireless/gnuradio/gnuradio-3.8.1.0.ebuild
rename to net-wireless/gnuradio/gnuradio-3.8.1.0-r1.ebuild
index 1ba2694abe7..3fd0a24eac1 100644
--- a/net-wireless/gnuradio/gnuradio-3.8.1.0.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.8.1.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
CMAKE_BUILD_TYPE="None"
-inherit cmake-utils python-single-r1 virtualx xdg-utils desktop
+inherit cmake python-single-r1 virtualx xdg-utils desktop
DESCRIPTION="Toolkit that provides signal processing blocks to implement
software radios"
HOMEPAGE="https://www.gnuradio.org/";
@@ -47,7 +47,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
"
RDEPEND="${PYTHON_DEPS}
- >=dev-lang/orc-0.4.12
$(python_gen_cond_dep 'dev-libs/boost:0=[python,${PYTHON_USEDEP}]')
dev-libs/log4cpp
$(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]')
@@ -123,7 +122,7 @@ src_prepare() {
use !oss && sed -i 's#soundcard.h#oss-nonexistent.h#g'
cmake/Modules/FindOSS.cmake
use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistent.h#g'
cmake/Modules/FindPORTAUDIO.cmake
- cmake-utils_src_prepare
+ cmake_src_prepare
}
src_configure() {
@@ -160,11 +159,11 @@ src_configure() {
-DGR_PYTHON_DIR="$(python_get_sitedir)"
-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
if use examples ; then
dodir /usr/share/doc/${PF}/
@@ -202,7 +201,7 @@ src_install() {
src_test()
{
- virtx cmake-utils_src_test
+ virtx cmake_src_test
}
pkg_postinst()
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild
b/net-wireless/gnuradio/gnuradio-9999.ebuild
index c3f9aab150e..aa068b0e06b 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
CMAKE_BUILD_TYPE="None"
-inherit cmake-utils python-single-r1 virtualx xdg-utils
+inherit cmake python-single-r1 virtualx xdg-utils
DESCRIPTION="Toolkit that provides signal processing blocks to implement
software radios"
HOMEPAGE="https://www.gnuradio.org/";
@@ -48,7 +48,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
RDEPEND="${PYTHON_DEPS}
$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')
- >=dev-lang/orc-0.4.12
$(python_gen_cond_dep 'dev-libs/boost:0=[python,${PYTHON_USEDEP}]')
dev-libs/log4cpp
$(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]')
@@ -124,7 +123,7 @@ src_prepare() {
use !oss && sed -i 's#soundcard.h#oss-nonexistent.h#g'
cmake/Modules/FindOSS.cmake
use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistent.h#g'
cmake/Modules/FindPORTAUDIO.cmake
- cmake-utils_src_prepare
+ cmake_src_prepare
}
src_configure() {
@@ -160,11 +159,11 @@ src_configure() {
-DGR_PYTHON_DIR="$(python_get_sitedir)"
-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
if use examples ; then
dodir /usr/share/doc/${PF}/
@@ -202,7 +201,7 @@ src_install() {
src_test()
{
- virtx cmake-utils_src_test
+ virtx cmake_src_test
}
pkg_postinst()
