[gentoo-commits] repo/proj/guru:dev commit in: sys-process/nvtop/

[Carlos Eduardo]

commit:     4ca43753e12770f342915f1a6cebfde90d829a8b
Author:     Carlos Eduardo <carana2099 <AT> gmail <DOT> com>
AuthorDate: Tue Oct 25 02:46:19 2022 +0000
Commit:     Carlos Eduardo <carana2099 <AT> gmail <DOT> com>
CommitDate: Tue Oct 25 02:46:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4ca43753

sys-process/nvtop: add 3.0.0, update 9999 build

Signed-off-by: Carlos Eduardo <carana2099 <AT> gmail.com>

 sys-process/nvtop/Manifest                              |  1 +
 .../nvtop/{nvtop-9999.ebuild => nvtop-3.0.0.ebuild}     | 17 +++++------------
 sys-process/nvtop/nvtop-9999.ebuild                     | 17 +++++------------
 3 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/sys-process/nvtop/Manifest b/sys-process/nvtop/Manifest
index 480f101b4..a33d415b5 100644
--- a/sys-process/nvtop/Manifest
+++ b/sys-process/nvtop/Manifest
@@ -1,2 +1,3 @@
 DIST nvidia-settings-455.38.tar.bz2 1057087 BLAKE2B 
81a287aecd2d0e788b0fe581c3dd10aa0f1fff19746b04a426a2ce9c7fa9dd9492cc5162c6bcd42496735c1b11482c3d9409aba5ec297e69afc19ddf11b1907c
 SHA512 
56f5684ad3258c5449d747894a441aaef17403fc5406a3d61e0d7ffd983e908e3f909dc933b57dd9c98a47c4be7205c62157ce7097bf3937b3a8145e77fb354d
 DIST nvtop-2.0.3.tar.gz 221071 BLAKE2B 
a1bd8d3e58aac36e1d21b79d8310e41efe3237a3df603d60115230eee76b1f106bd48dd48ab8ad99e3f1c42ebc895fb45efc46ada9169cbcdb5df93326f9e680
 SHA512 
ffd9d88898b7c6365d8bcff3c7b187760bc0036fba80ab6a0e3a586217ebf48b3377cdbe84f2fbbe10fb650f96de108973f95ccd29766e45da3901ee5d45f63c
+DIST nvtop-3.0.0.tar.gz 233849 BLAKE2B 
bae5fda51bdf3597189e9685f08dca545b90b091c8071d92f264574a23c130920f2f5845d55c4ae956aceb46132421573d65aef78e85acc66e2e0040fec99ebd
 SHA512 
fc1525e4040cdf75c09705eefc351c957c815d15d5e8f06591294f4f901c5f3a235a706dc249740f478a3e0b5812d061d142ea7095dbb2a0f620b3511a387f79

diff --git a/sys-process/nvtop/nvtop-9999.ebuild 
b/sys-process/nvtop/nvtop-3.0.0.ebuild
similarity index 65%
copy from sys-process/nvtop/nvtop-9999.ebuild
copy to sys-process/nvtop/nvtop-3.0.0.ebuild
index a4383e95d..326aef999 100644
--- a/sys-process/nvtop/nvtop-9999.ebuild
+++ b/sys-process/nvtop/nvtop-3.0.0.ebuild
@@ -5,31 +5,24 @@ EAPI=8
 
 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
-               
https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${NVIDIA_PV}.tar.bz2
-       "
+       SRC_URI="https://github.com/Syllo/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
        KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
 
-IUSE="unicode video_cards_amdgpu video_cards_nvidia"
+IUSE="unicode video_cards_intel video_cards_amdgpu video_cards_nvidia"
 
 RDEPEND="
+       video_cards_intel?  ( virtual/udev )
        video_cards_amdgpu? ( x11-libs/libdrm[video_cards_amdgpu] )
        video_cards_nvidia? ( x11-drivers/nvidia-drivers )
        sys-libs/ncurses:0=
@@ -45,11 +38,11 @@ src_configure() {
        local mycmakeargs=(
                -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
                -DCURSES_NEED_WIDE=$(usex unicode)
+               -DINTEL_SUPPORT=$(usex video_cards_intel)
                -DNVIDIA_SUPPORT=$(usex video_cards_nvidia)
                -DAMDGPU_SUPPORT=$(usex video_cards_amdgpu)
        )
 
-       cp "${WORKDIR}/nvidia-settings-${NVIDIA_PV}/src/nvml.h" 
"${S}/include/nvml.h" || die
-
        cmake_src_configure
 }
+

diff --git a/sys-process/nvtop/nvtop-9999.ebuild 
b/sys-process/nvtop/nvtop-9999.ebuild
index a4383e95d..326aef999 100644
--- a/sys-process/nvtop/nvtop-9999.ebuild
+++ b/sys-process/nvtop/nvtop-9999.ebuild
@@ -5,31 +5,24 @@ EAPI=8
 
 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
-               
https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${NVIDIA_PV}.tar.bz2
-       "
+       SRC_URI="https://github.com/Syllo/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
        KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
 
-IUSE="unicode video_cards_amdgpu video_cards_nvidia"
+IUSE="unicode video_cards_intel video_cards_amdgpu video_cards_nvidia"
 
 RDEPEND="
+       video_cards_intel?  ( virtual/udev )
        video_cards_amdgpu? ( x11-libs/libdrm[video_cards_amdgpu] )
        video_cards_nvidia? ( x11-drivers/nvidia-drivers )
        sys-libs/ncurses:0=
@@ -45,11 +38,11 @@ src_configure() {
        local mycmakeargs=(
                -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
                -DCURSES_NEED_WIDE=$(usex unicode)
+               -DINTEL_SUPPORT=$(usex video_cards_intel)
                -DNVIDIA_SUPPORT=$(usex video_cards_nvidia)
                -DAMDGPU_SUPPORT=$(usex video_cards_amdgpu)
        )
 
-       cp "${WORKDIR}/nvidia-settings-${NVIDIA_PV}/src/nvml.h" 
"${S}/include/nvml.h" || die
-
        cmake_src_configure
 }
+