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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6FCB5138350 for ; Fri, 10 Apr 2020 20:20:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ADD08E0AAC; Fri, 10 Apr 2020 20:19:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8F587E0AAC for ; Fri, 10 Apr 2020 20:19:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3762034EF91 for ; Fri, 10 Apr 2020 20:19:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C8A4E18F for ; Fri, 10 Apr 2020 20:19:55 +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: <1586549994.6bce09ad1f3ac65679428ae402a6c6425ed412c6.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-3.15.0.0-r1.ebuild net-wireless/uhd/uhd-3.15.0.0.ebuild X-VCS-Directories: net-wireless/uhd/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Rick Farina X-VCS-Revision: 6bce09ad1f3ac65679428ae402a6c6425ed412c6 X-VCS-Branch: master Date: Fri, 10 Apr 2020 20:19:55 +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: d694aa4f-233a-47d3-9f68-70414dd711d3 X-Archives-Hash: d1dcac524772f75f8713c6eeadc210c4 commit: 6bce09ad1f3ac65679428ae402a6c6425ed412c6 Author: Rick Farina gentoo org> AuthorDate: Fri Apr 10 20:19:40 2020 +0000 Commit: Rick Farina gentoo org> CommitDate: Fri Apr 10 20:19:54 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bce09ad net-wireless/uhd: fix a ton of QA issues Package-Manager: Portage-2.3.98, Repoman-2.3.22 Signed-off-by: Rick Farina gentoo.org> net-wireless/uhd/{uhd-3.15.0.0.ebuild => uhd-3.15.0.0-r1.ebuild} | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net-wireless/uhd/uhd-3.15.0.0.ebuild b/net-wireless/uhd/uhd-3.15.0.0-r1.ebuild similarity index 93% rename from net-wireless/uhd/uhd-3.15.0.0.ebuild rename to net-wireless/uhd/uhd-3.15.0.0-r1.ebuild index aa3efa300c7..0bc67971a97 100644 --- a/net-wireless/uhd/uhd-3.15.0.0.ebuild +++ b/net-wireless/uhd/uhd-3.15.0.0-r1.ebuild @@ -67,6 +67,9 @@ src_prepare() { #this may not be needed in 3.4.3 and above, please verify sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt || die + + #rpath is set for apple and no one else, just remove the conditional + sed -i -e '/if(APPLE)/d' -e '/endif(APPLE)/d' CMakeLists.txt || die } src_configure() { @@ -92,11 +95,14 @@ src_configure() { -DENABLE_N230="$(usex n230)" -DENABLE_MPMD="$(usex mpmd)" -DENABLE_OCTOCLOCK="$(usex octoclock)" + -DPYTHON_EXECUTABLE="${PYTHON}" + -DPKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" ) cmake-utils_src_configure } src_install() { cmake-utils_src_install + python_optimize use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/ if [ "${PV}" != "9999" ]; then rm -rf "${ED}/usr/bin/uhd_images_downloader"