[gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/

["Rick Farina" <zerochaos@gentoo.org>]

commit:     4da8c59251449a199ec14d50f0123f0a7c76e60b
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 26 16:18:37 2022 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Sep 26 16:19:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4da8c592

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 <AT> gentoo.org>

 net-wireless/uhd/uhd-4.1.0.5.ebuild | 12 +++++++-----
 net-wireless/uhd/uhd-4.2.0.0.ebuild | 10 ++++++----
 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