From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7662B158094 for ; Mon, 26 Sep 2022 16:19:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BE83DE0DE5; Mon, 26 Sep 2022 16:19:43 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A5E79E0DE5 for ; Mon, 26 Sep 2022 16:19:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B3E0934128F for ; Mon, 26 Sep 2022 16:19:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 379185A2 for ; Mon, 26 Sep 2022 16:19:41 +0000 (UTC) From: "Rick Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Rick Farina" Message-ID: <1664209177.4da8c59251449a199ec14d50f0123f0a7c76e60b.zerochaos@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/uhd/uhd-4.1.0.5.ebuild net-wireless/uhd/uhd-4.2.0.0.ebuild net-wireless/uhd/uhd-4.3.0.0.ebuild X-VCS-Directories: net-wireless/uhd/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Rick Farina X-VCS-Revision: 4da8c59251449a199ec14d50f0123f0a7c76e60b X-VCS-Branch: master Date: Mon, 26 Sep 2022 16:19:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 12aece41-e644-4750-b4d5-851e841b5114 X-Archives-Hash: 13abdf01126ea98933efa898454d2d0c commit: 4da8c59251449a199ec14d50f0123f0a7c76e60b Author: Rick Farina gentoo org> AuthorDate: Mon Sep 26 16:18:37 2022 +0000 Commit: Rick Farina gentoo 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 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