diff options
| author |   Rick Farina <zerochaos@gentoo.org> | 2022-09-26 12:18:37 -0400 |
|---|---|---|
| committer | Rick Farina <zerochaos@gentoo.org> | 2022-09-26 12:19:37 -0400 |
| commit | 4da8c59251449a199ec14d50f0123f0a7c76e60b (patch) | |
| tree | 1d3f24f1a4c4a14c1c45eb46e1064ac2f3dd30de /net-wireless/uhd | |
| parent | media-libs/libpulse: only depend on libpcre for mingw (diff) | |
| download | gentoo-4da8c59251449a199ec14d50f0123f0a7c76e60b.tar.gz gentoo-4da8c59251449a199ec14d50f0123f0a7c76e60b.tar.bz2 gentoo-4da8c59251449a199ec14d50f0123f0a7c76e60b.zip | |
net-wireless/uhd: fix bug 839498
fix use flag conditional file removal
minor comment spelling fix
Closes: https://bugs.gentoo.org/839498
Signed-off-by: Rick Farina <zerochaos@gentoo.org>
Diffstat (limited to 'net-wireless/uhd')
| -rw-r--r-- | net-wireless/uhd/uhd-4.1.0.5.ebuild | 12 | ||||
| -rw-r--r-- | net-wireless/uhd/uhd-4.2.0.0.ebuild | 10 | ||||
| -rw-r--r-- | net-wireless/uhd/uhd-4.3.0.0.ebuild | 10 |
3 files changed, 19 insertions, 13 deletions
diff --git a/net-wireless/uhd/uhd-4.1.0.5.ebuild b/net-wireless/uhd/uhd-4.1.0.5.ebuild index f77c3fbc8a83..abf30a8c22b6 100644 --- a/net-wireless/uhd/uhd-4.1.0.5.ebuild +++ b/net-wireless/uhd/uhd-4.1.0.5.ebuild @@ -38,7 +38,7 @@ RDEPEND="${PYTHON_DEPS} ') " DEPEND="${RDEPEND}" -#zip an gzip are directly used by the build system +#zip and gzip are directly used by the build system BDEPEND=" doc? ( app-doc/doxygen ) $(python_gen_cond_dep ' @@ -97,10 +97,12 @@ src_configure() { src_install() { cmake_src_install python_optimize - use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/ - if [[ "${PV}" != "9999" ]]; then - rm -r "${ED}/usr/bin/uhd_images_downloader" || die - rm -r "${ED}/usr/share/man/man1/uhd_images_downloader.1" || die + if use utils; then + python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/ + if [[ "${PV}" != "9999" ]]; then + rm -r "${ED}/usr/bin/uhd_images_downloader" || die + rm -r "${ED}/usr/share/man/man1/uhd_images_downloader.1" || die + fi fi udev_dorules "${S}/utils/uhd-usrp.rules" diff --git a/net-wireless/uhd/uhd-4.2.0.0.ebuild b/net-wireless/uhd/uhd-4.2.0.0.ebuild index 065339744a53..43bc62d7590a 100644 --- a/net-wireless/uhd/uhd-4.2.0.0.ebuild +++ b/net-wireless/uhd/uhd-4.2.0.0.ebuild @@ -38,7 +38,7 @@ RDEPEND="${PYTHON_DEPS} ') " DEPEND="${RDEPEND}" -#zip an gzip are directly used by the build system +#zip and gzip are directly used by the build system BDEPEND=" doc? ( app-doc/doxygen ) $(python_gen_cond_dep ' @@ -96,9 +96,11 @@ src_configure() { src_install() { cmake_src_install python_optimize - use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/ - if [[ "${PV}" != "9999" ]]; then - rm -r "${ED}/usr/bin/uhd_images_downloader" || die + if use utils; then + python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/ + if [[ "${PV}" != "9999" ]]; then + rm -r "${ED}/usr/bin/uhd_images_downloader" || die + fi fi # do not install test files (bug #857492) if use test; then diff --git a/net-wireless/uhd/uhd-4.3.0.0.ebuild b/net-wireless/uhd/uhd-4.3.0.0.ebuild index 065339744a53..43bc62d7590a 100644 --- a/net-wireless/uhd/uhd-4.3.0.0.ebuild +++ b/net-wireless/uhd/uhd-4.3.0.0.ebuild @@ -38,7 +38,7 @@ RDEPEND="${PYTHON_DEPS} ') " DEPEND="${RDEPEND}" -#zip an gzip are directly used by the build system +#zip and gzip are directly used by the build system BDEPEND=" doc? ( app-doc/doxygen ) $(python_gen_cond_dep ' @@ -96,9 +96,11 @@ src_configure() { src_install() { cmake_src_install python_optimize - use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/ - if [[ "${PV}" != "9999" ]]; then - rm -r "${ED}/usr/bin/uhd_images_downloader" || die + if use utils; then + python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/ + if [[ "${PV}" != "9999" ]]; then + rm -r "${ED}/usr/bin/uhd_images_downloader" || die + fi fi # do not install test files (bug #857492) if use test; then |