Adding metadata

5 files changed, 157 insertions, 13 deletions

diff --git a/sys-process/nvtop/Manifest b/sys-process/nvtop/Manifest
index d7633e37fe08..615b2ba33c51 100644
--- a/sys-process/nvtop/Manifest
+++ b/sys-process/nvtop/Manifest
@@ -1 +1,3 @@
+DIST nvidia-settings-455.38.tar.bz2 1057087 BLAKE2B 81a287aecd2d0e788b0fe581c3dd10aa0f1fff19746b04a426a2ce9c7fa9dd9492cc5162c6bcd42496735c1b11482c3d9409aba5ec297e69afc19ddf11b1907c SHA512 56f5684ad3258c5449d747894a441aaef17403fc5406a3d61e0d7ffd983e908e3f909dc933b57dd9c98a47c4be7205c62157ce7097bf3937b3a8145e77fb354d
 DIST nvtop-1.2.2.tar.gz 197300 BLAKE2B dcab86606e2581d5d1d18e77a59fd5c41e665bbaaa876d0cdc7211cc2fe21d14e4a38e23afaf662616bc373b2c05cc85a969fc20ee78c0b42ead1cb6ac93fa84 SHA512 034ca55e773a34b433cc54e6dabf36911973b2ec0669a7f2757f9edcd6ae6e14493c8e31ecb9d7a8e45026ddd97cf543fa57b046d96de6cc650614cd539a6c6a
+DIST nvtop-2.0.1.tar.gz 215348 BLAKE2B 9e288a51dd2f61122ceeac11711c01c13f989e06c5b85c2e4ec90d217e0eb5081aff0aa33140cc511b8864b75a572045c1572e76aaab4bdcb30bbe0a83306771 SHA512 0694fd5327f5fdab926c6bd4862499ead2a4b7d17ec9e60ca1ff2ff3dfca56386600407d6ea8d65e7bea230fb450460e9a70879563764898c4dd5d320df96886
diff --git a/sys-process/nvtop/metadata.xml b/sys-process/nvtop/metadata.xml
index 24ccbb8a7ce2..b4f700bb967b 100644
--- a/sys-process/nvtop/metadata.xml
+++ b/sys-process/nvtop/metadata.xml
@@ -2,9 +2,16 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>thomas@binaryden.de</email>
-  <name>Thomas Kemmer</name>
+  <email>vowstar@gmail.com</email>
+  <name>Huang Rui</name>
  </maintainer>
+ <longdescription lang="en">
+	Nvtop stands for NVidia TOP, a (h)top like task monitor for NVIDIA GPUs.
+	It can handle multiple GPUs and print information about them in a htop
+	familiar way. Some fields are shown as N/A: Ask NVIDIA for better support
+	of your hardware! Compatibility issues: Does not work with nouveau driver
+	stack and older NVIDIA GPU for the time being.
+	</longdescription>
  
- <origin>binaryden-overlay</origin>
+ <origin>gentoo-guru-overlay</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/sys-process/nvtop/nvtop-1.2.2.ebuild b/sys-process/nvtop/nvtop-1.2.2.ebuild
index e77a30fe6d6e..0dc4d985133b 100644
--- a/sys-process/nvtop/nvtop-1.2.2.ebuild
+++ b/sys-process/nvtop/nvtop-1.2.2.ebuild
@@ -1,20 +1,53 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit cmake
 
+NVIDIA_PV="455.38"
+
 DESCRIPTION="NVIDIA GPUs htop like monitoring tool"
-HOMEPAGE="https://github.com/syllo/nvtop"
-SRC_URI="https://github.com/syllo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+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
+	"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
 
-DEPEND="sys-libs/ncurses:=[tinfo]"
-BDEPEND="dev-util/nvidia-cuda-toolkit"
-RDEPEND="x11-drivers/nvidia-drivers[X]"
+IUSE="unicode"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	x11-drivers/nvidia-drivers
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DNVML_INCLUDE_DIRS="${S}/include"
+		-DCURSES_NEED_WIDE=$(usex unicode)
+	)
+
+	cp "${WORKDIR}/nvidia-settings-${NVIDIA_PV}/src/nvml.h" "${S}/include/nvml.h" || die
 
-RESTRICT="test"
+	cmake_src_configure
+}
diff --git a/sys-process/nvtop/nvtop-2.0.1-r1.ebuild b/sys-process/nvtop/nvtop-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..a4383e95dc5a
--- /dev/null
+++ b/sys-process/nvtop/nvtop-2.0.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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
+	"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+IUSE="unicode video_cards_amdgpu video_cards_nvidia"
+
+RDEPEND="
+	video_cards_amdgpu? ( x11-libs/libdrm[video_cards_amdgpu] )
+	video_cards_nvidia? ( x11-drivers/nvidia-drivers )
+	sys-libs/ncurses:0=
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCURSES_NEED_WIDE=$(usex unicode)
+		-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
new file mode 100644
index 000000000000..128d6f80e6fa
--- /dev/null
+++ b/sys-process/nvtop/nvtop-9999.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+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
+else
+	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"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	x11-drivers/nvidia-drivers
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.0-add-nvml.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DNVML_INCLUDE_DIRS="${S}/include"
+		-DCURSES_NEED_WIDE=$(usex unicode)
+	)
+
+	cmake_src_configure
+}