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 755BD13835B for ; Fri, 4 Dec 2020 19:21:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7307DE088C; Fri, 4 Dec 2020 19:21:29 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 5ECBBE088C for ; Fri, 4 Dec 2020 19:21:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 E66AA340FAF for ; Fri, 4 Dec 2020 19:21:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 53E5F479 for ; Fri, 4 Dec 2020 19:21:26 +0000 (UTC) From: "Rui Huang" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Rui Huang" Message-ID: <1607109667.5ebcf32f2877775706ac88d73850d19d0f678ab6.vowstar@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: sys-process/nvtop/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sys-process/nvtop/nvtop-9999.ebuild X-VCS-Directories: sys-process/nvtop/ X-VCS-Committer: vowstar X-VCS-Committer-Name: Rui Huang X-VCS-Revision: 5ebcf32f2877775706ac88d73850d19d0f678ab6 X-VCS-Branch: dev Date: Fri, 4 Dec 2020 19:21:26 +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: 1256ab26-d973-425b-9683-fc0a138d862d X-Archives-Hash: 4c13206b33c3512e7d574e331d635df7 commit: 5ebcf32f2877775706ac88d73850d19d0f678ab6 Author: Huang Rui gmail com> AuthorDate: Fri Dec 4 19:20:58 2020 +0000 Commit: Rui Huang gmail com> CommitDate: Fri Dec 4 19:21:07 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5ebcf32f sys-process/nvtop: fix live ebuild Package-Manager: Portage-3.0.11, Repoman-3.0.2 Signed-off-by: Huang Rui gmail.com> sys-process/nvtop/nvtop-9999.ebuild | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/sys-process/nvtop/nvtop-9999.ebuild b/sys-process/nvtop/nvtop-9999.ebuild index 02eab100..ed7e5ae6 100644 --- a/sys-process/nvtop/nvtop-9999.ebuild +++ b/sys-process/nvtop/nvtop-9999.ebuild @@ -5,14 +5,22 @@ EAPI=7 inherit cmake +NVIDIA_PV="455.38" + DESCRIPTION="NVIDIA GPUs htop like monitoring tool" HOMEPAGE="https://github.com/Syllo/nvtop" if [[ "${PV}" == "9999" ]] ; then EGIT_REPO_URI="https://github.com/Syllo/${PN}.git" inherit git-r3 + SRC_URI=" + https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${NVIDIA_PV}.tar.bz2 + " else - SRC_URI="https://github.com/Syllo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI=" + https://github.com/Syllo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz + https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${NVIDIA_PV}.tar.bz2 + " KEYWORDS="~amd64 ~x86" fi @@ -32,10 +40,6 @@ BDEPEND=" virtual/pkgconfig " -PATCHES=( - "${FILESDIR}"/${PN}-1.0.0-add-nvml.patch -) - src_configure() { local CMAKE_CONF=" !debug? ( -DCMAKE_BUILD_TYPE=Release ) @@ -48,5 +52,7 @@ src_configure() { ${CMAKE_CONF} ) + cp "${WORKDIR}/nvidia-settings-${NVIDIA_PV}/src/nvml.h" "${S}/include/nvml.h" || die + cmake_src_configure }