| 1 |
commit: dc540a68d43af328ff42494c3f18a42d5fb6aece |
| 2 |
Author: Huang Rui <vowstar <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Feb 7 15:51:27 2022 +0000 |
| 4 |
Commit: Rui Huang <vowstar <AT> gmail <DOT> com> |
| 5 |
CommitDate: Mon Feb 7 15:51:27 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=dc540a68 |
| 7 |
|
| 8 |
sys-process/nvtop: EAPI=8 and happy new year 2022 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 11 |
Signed-off-by: Huang Rui <vowstar <AT> gmail.com> |
| 12 |
|
| 13 |
sys-process/nvtop/nvtop-1.2.2.ebuild | 13 ++++--------- |
| 14 |
sys-process/nvtop/nvtop-9999.ebuild | 29 +++++++++-------------------- |
| 15 |
2 files changed, 13 insertions(+), 29 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-process/nvtop/nvtop-1.2.2.ebuild b/sys-process/nvtop/nvtop-1.2.2.ebuild |
| 18 |
index 7df8c6766..0dc4d9851 100644 |
| 19 |
--- a/sys-process/nvtop/nvtop-1.2.2.ebuild |
| 20 |
+++ b/sys-process/nvtop/nvtop-1.2.2.ebuild |
| 21 |
@@ -1,7 +1,7 @@ |
| 22 |
-# Copyright 1999-2021 Gentoo Authors |
| 23 |
+# Copyright 1999-2022 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
-EAPI=7 |
| 27 |
+EAPI=8 |
| 28 |
|
| 29 |
inherit cmake |
| 30 |
|
| 31 |
@@ -27,7 +27,7 @@ fi |
| 32 |
LICENSE="GPL-3" |
| 33 |
SLOT="0" |
| 34 |
|
| 35 |
-IUSE="debug unicode" |
| 36 |
+IUSE="unicode" |
| 37 |
|
| 38 |
RDEPEND=" |
| 39 |
sys-libs/ncurses:0= |
| 40 |
@@ -41,15 +41,10 @@ BDEPEND=" |
| 41 |
" |
| 42 |
|
| 43 |
src_configure() { |
| 44 |
- local CMAKE_CONF=" |
| 45 |
- !debug? ( -DCMAKE_BUILD_TYPE=Release ) |
| 46 |
- debug? ( -DCMAKE_BUILD_TYPE=Debug ) |
| 47 |
- unicode? ( -DCURSES_NEED_WIDE=TRUE ) |
| 48 |
- " |
| 49 |
local mycmakeargs=( |
| 50 |
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" |
| 51 |
-DNVML_INCLUDE_DIRS="${S}/include" |
| 52 |
- ${CMAKE_CONF} |
| 53 |
+ -DCURSES_NEED_WIDE=$(usex unicode) |
| 54 |
) |
| 55 |
|
| 56 |
cp "${WORKDIR}/nvidia-settings-${NVIDIA_PV}/src/nvml.h" "${S}/include/nvml.h" || die |
| 57 |
|
| 58 |
diff --git a/sys-process/nvtop/nvtop-9999.ebuild b/sys-process/nvtop/nvtop-9999.ebuild |
| 59 |
index 7df8c6766..128d6f80e 100644 |
| 60 |
--- a/sys-process/nvtop/nvtop-9999.ebuild |
| 61 |
+++ b/sys-process/nvtop/nvtop-9999.ebuild |
| 62 |
@@ -1,33 +1,25 @@ |
| 63 |
-# Copyright 1999-2021 Gentoo Authors |
| 64 |
+# Copyright 1999-2022 Gentoo Authors |
| 65 |
# Distributed under the terms of the GNU General Public License v2 |
| 66 |
|
| 67 |
-EAPI=7 |
| 68 |
+EAPI=8 |
| 69 |
|
| 70 |
inherit cmake |
| 71 |
|
| 72 |
-NVIDIA_PV="455.38" |
| 73 |
- |
| 74 |
DESCRIPTION="NVIDIA GPUs htop like monitoring tool" |
| 75 |
HOMEPAGE="https://github.com/Syllo/nvtop" |
| 76 |
|
| 77 |
if [[ "${PV}" == "9999" ]] ; then |
| 78 |
EGIT_REPO_URI="https://github.com/Syllo/${PN}.git" |
| 79 |
inherit git-r3 |
| 80 |
- SRC_URI=" |
| 81 |
- https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${NVIDIA_PV}.tar.bz2 |
| 82 |
- " |
| 83 |
else |
| 84 |
- SRC_URI=" |
| 85 |
- https://github.com/Syllo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz |
| 86 |
- https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${NVIDIA_PV}.tar.bz2 |
| 87 |
- " |
| 88 |
+ SRC_URI="https://github.com/Syllo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 89 |
KEYWORDS="~amd64 ~x86" |
| 90 |
fi |
| 91 |
|
| 92 |
LICENSE="GPL-3" |
| 93 |
SLOT="0" |
| 94 |
|
| 95 |
-IUSE="debug unicode" |
| 96 |
+IUSE="unicode" |
| 97 |
|
| 98 |
RDEPEND=" |
| 99 |
sys-libs/ncurses:0= |
| 100 |
@@ -40,19 +32,16 @@ BDEPEND=" |
| 101 |
virtual/pkgconfig |
| 102 |
" |
| 103 |
|
| 104 |
+PATCHES=( |
| 105 |
+ "${FILESDIR}"/${PN}-1.0.0-add-nvml.patch |
| 106 |
+) |
| 107 |
+ |
| 108 |
src_configure() { |
| 109 |
- local CMAKE_CONF=" |
| 110 |
- !debug? ( -DCMAKE_BUILD_TYPE=Release ) |
| 111 |
- debug? ( -DCMAKE_BUILD_TYPE=Debug ) |
| 112 |
- unicode? ( -DCURSES_NEED_WIDE=TRUE ) |
| 113 |
- " |
| 114 |
local mycmakeargs=( |
| 115 |
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" |
| 116 |
-DNVML_INCLUDE_DIRS="${S}/include" |
| 117 |
- ${CMAKE_CONF} |
| 118 |
+ -DCURSES_NEED_WIDE=$(usex unicode) |
| 119 |
) |
| 120 |
|
| 121 |
- cp "${WORKDIR}/nvidia-settings-${NVIDIA_PV}/src/nvml.h" "${S}/include/nvml.h" || die |
| 122 |
- |
| 123 |
cmake_src_configure |
| 124 |
} |
Archives