public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:master commit in: sys-process/nvtop/
@ 2020-06-14 10:39 Andrew Ammerlaan
  0 siblings, 0 replies; 11+ messages in thread
From: Andrew Ammerlaan @ 2020-06-14 10:39 UTC (permalink / raw
  To: gentoo-commits

commit:     8c5842f9cd4372cf3f77c39e4408a4d0a319c3fd
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Sat Jun 13 15:36:18 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat Jun 13 15:36:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8c5842f9

sys-process/nvtop: change IUSE order and move CMAKE_CONF to local

Optimize the ebuild file

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 sys-process/nvtop/nvtop-9999.ebuild | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/sys-process/nvtop/nvtop-9999.ebuild b/sys-process/nvtop/nvtop-9999.ebuild
index 9ef08c8..594d987 100644
--- a/sys-process/nvtop/nvtop-9999.ebuild
+++ b/sys-process/nvtop/nvtop-9999.ebuild
@@ -19,7 +19,7 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 
-IUSE="unicode debug"
+IUSE="debug unicode"
 
 RDEPEND="
 	sys-libs/ncurses:0=[unicode?]
@@ -32,19 +32,16 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-BUILD_DIR="${WORKDIR}/build"
-
-CMAKE_CONF="
-	!debug? ( -DCMAKE_BUILD_TYPE=Release )
-	debug? ( -DCMAKE_BUILD_TYPE=Debug )
-	unicode? ( -DCURSES_NEED_WIDE=TRUE )
-"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.0-add-nvml.patch
 )
 
 src_configure() {
+	local CMAKE_CONF="
+		!debug? ( -DCMAKE_BUILD_TYPE=Release )
+		debug? ( -DCMAKE_BUILD_TYPE=Debug )
+		unicode? ( -DCURSES_NEED_WIDE=TRUE )
+	"
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DNVML_INCLUDE_DIRS="${S}/include"


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: sys-process/nvtop/
@ 2020-06-14 10:39 Andrew Ammerlaan
  0 siblings, 0 replies; 11+ messages in thread
From: Andrew Ammerlaan @ 2020-06-14 10:39 UTC (permalink / raw
  To: gentoo-commits

commit:     795fa06d3a39031447bcc489912b3bc5ae814c05
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Sat Jun 13 15:25:50 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat Jun 13 15:28:06 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=795fa06d

sys-process/nvtop: add live build

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 sys-process/nvtop/nvtop-9999.ebuild | 55 +++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/sys-process/nvtop/nvtop-9999.ebuild b/sys-process/nvtop/nvtop-9999.ebuild
new file mode 100644
index 0000000..9ef08c8
--- /dev/null
+++ b/sys-process/nvtop/nvtop-9999.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+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 debug"
+
+RDEPEND="
+	sys-libs/ncurses:0=[unicode?]
+	x11-drivers/nvidia-drivers
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+BUILD_DIR="${WORKDIR}/build"
+
+CMAKE_CONF="
+	!debug? ( -DCMAKE_BUILD_TYPE=Release )
+	debug? ( -DCMAKE_BUILD_TYPE=Debug )
+	unicode? ( -DCURSES_NEED_WIDE=TRUE )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.0-add-nvml.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DNVML_INCLUDE_DIRS="${S}/include"
+		${CMAKE_CONF}
+	)
+
+	cmake-utils_src_configure
+}


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: sys-process/nvtop/
@ 2020-06-14 10:39 Andrew Ammerlaan
  0 siblings, 0 replies; 11+ messages in thread
From: Andrew Ammerlaan @ 2020-06-14 10:39 UTC (permalink / raw
  To: gentoo-commits

commit:     5e22e4dcf91857d1ac10c5e3e6d8b400cd412594
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Sat Jun 13 17:08:16 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat Jun 13 17:08:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5e22e4dc

sys-process/nvtop: change ${PV} to "${PV}"

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 sys-process/nvtop/nvtop-1.0.0.ebuild | 2 +-
 sys-process/nvtop/nvtop-9999.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-process/nvtop/nvtop-1.0.0.ebuild b/sys-process/nvtop/nvtop-1.0.0.ebuild
index b7b88af..5a831a1 100644
--- a/sys-process/nvtop/nvtop-1.0.0.ebuild
+++ b/sys-process/nvtop/nvtop-1.0.0.ebuild
@@ -8,7 +8,7 @@ inherit cmake-utils
 DESCRIPTION="NVIDIA GPUs htop like monitoring tool"
 HOMEPAGE="https://github.com/Syllo/nvtop"
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/Syllo/${PN}.git"
 	inherit git-r3
 else

diff --git a/sys-process/nvtop/nvtop-9999.ebuild b/sys-process/nvtop/nvtop-9999.ebuild
index 594d987..42b38e8 100644
--- a/sys-process/nvtop/nvtop-9999.ebuild
+++ b/sys-process/nvtop/nvtop-9999.ebuild
@@ -8,7 +8,7 @@ inherit cmake-utils
 DESCRIPTION="NVIDIA GPUs htop like monitoring tool"
 HOMEPAGE="https://github.com/Syllo/nvtop"
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/Syllo/${PN}.git"
 	inherit git-r3
 else


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: sys-process/nvtop/
@ 2020-06-14 10:39 Andrew Ammerlaan
  0 siblings, 0 replies; 11+ messages in thread
From: Andrew Ammerlaan @ 2020-06-14 10:39 UTC (permalink / raw
  To: gentoo-commits

commit:     7c9fb8355533da7ce8cd718b601528308056ee64
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Sat Jun 13 15:36:49 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat Jun 13 15:36:49 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7c9fb835

sys-process/nvtop: change IUSE order and move CMAKE_CONF to local

Optimize the ebuild file

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 sys-process/nvtop/nvtop-1.0.0.ebuild | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/sys-process/nvtop/nvtop-1.0.0.ebuild b/sys-process/nvtop/nvtop-1.0.0.ebuild
index 5d7ced8..b7b88af 100644
--- a/sys-process/nvtop/nvtop-1.0.0.ebuild
+++ b/sys-process/nvtop/nvtop-1.0.0.ebuild
@@ -19,7 +19,7 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 
-IUSE="unicode debug"
+IUSE="debug unicode"
 
 RDEPEND="
 	sys-libs/ncurses:0=[unicode?]
@@ -32,20 +32,17 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-BUILD_DIR="${WORKDIR}/build"
-
-CMAKE_CONF="
-	!debug? ( -DCMAKE_BUILD_TYPE=Release )
-	debug? ( -DCMAKE_BUILD_TYPE=Debug )
-	unicode? ( -DCURSES_NEED_WIDE=TRUE )
-"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.0-add-nvml.patch
 	"${FILESDIR}"/${PN}-1.0.0-fix-ncurses.patch
 )
 
 src_configure() {
+	local CMAKE_CONF="
+		!debug? ( -DCMAKE_BUILD_TYPE=Release )
+		debug? ( -DCMAKE_BUILD_TYPE=Debug )
+		unicode? ( -DCURSES_NEED_WIDE=TRUE )
+	"
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DNVML_INCLUDE_DIRS="${S}/include"


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: sys-process/nvtop/
@ 2020-06-14 15:00 Andrew Ammerlaan
  0 siblings, 0 replies; 11+ messages in thread
From: Andrew Ammerlaan @ 2020-06-14 15:00 UTC (permalink / raw
  To: gentoo-commits

commit:     147fbf6bcc8a3972080db01d7a7837d4b34546d7
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Sun Jun 14 11:02:18 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sun Jun 14 11:02:38 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=147fbf6b

sys-process/nvtop: use cmake eclass replace cmake-utils

make-utils eclass will be deprecated soon

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 sys-process/nvtop/nvtop-1.0.0.ebuild | 4 ++--
 sys-process/nvtop/nvtop-9999.ebuild  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-process/nvtop/nvtop-1.0.0.ebuild b/sys-process/nvtop/nvtop-1.0.0.ebuild
index 5a831a1..cf47220 100644
--- a/sys-process/nvtop/nvtop-1.0.0.ebuild
+++ b/sys-process/nvtop/nvtop-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="NVIDIA GPUs htop like monitoring tool"
 HOMEPAGE="https://github.com/Syllo/nvtop"
@@ -49,5 +49,5 @@ src_configure() {
 		${CMAKE_CONF}
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }

diff --git a/sys-process/nvtop/nvtop-9999.ebuild b/sys-process/nvtop/nvtop-9999.ebuild
index 42b38e8..02eab10 100644
--- a/sys-process/nvtop/nvtop-9999.ebuild
+++ b/sys-process/nvtop/nvtop-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="NVIDIA GPUs htop like monitoring tool"
 HOMEPAGE="https://github.com/Syllo/nvtop"
@@ -48,5 +48,5 @@ src_configure() {
 		${CMAKE_CONF}
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: sys-process/nvtop/
@ 2021-01-01 13:14 Andrew Ammerlaan
  0 siblings, 0 replies; 11+ messages in thread
From: Andrew Ammerlaan @ 2021-01-01 13:14 UTC (permalink / raw
  To: gentoo-commits

commit:     b644cb5b3d70bbd0ee37fc36315baddba4bf3146
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Fri Jan  1 09:50:43 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Fri Jan  1 09:50:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b644cb5b

sys-process/nvtop: happy new year

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 sys-process/nvtop/nvtop-1.1.0.ebuild | 2 +-
 sys-process/nvtop/nvtop-9999.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-process/nvtop/nvtop-1.1.0.ebuild b/sys-process/nvtop/nvtop-1.1.0.ebuild
index ed7e5ae6..0fb35d00 100644
--- a/sys-process/nvtop/nvtop-1.1.0.ebuild
+++ b/sys-process/nvtop/nvtop-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7

diff --git a/sys-process/nvtop/nvtop-9999.ebuild b/sys-process/nvtop/nvtop-9999.ebuild
index ed7e5ae6..0fb35d00 100644
--- a/sys-process/nvtop/nvtop-9999.ebuild
+++ b/sys-process/nvtop/nvtop-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: sys-process/nvtop/
  2021-08-03  8:55 [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
@ 2021-08-03  8:55 ` Andrew Ammerlaan
  0 siblings, 0 replies; 11+ messages in thread
From: Andrew Ammerlaan @ 2021-08-03  8:55 UTC (permalink / raw
  To: gentoo-commits

commit:     18bac58718b117abcca567b4b0c18b901214e9d5
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  3 08:55:00 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Aug  3 08:55:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=18bac587

sys-process/nvtop: add MissingUseDepDefault

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sys-process/nvtop/nvtop-1.2.2.ebuild | 2 +-
 sys-process/nvtop/nvtop-9999.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-process/nvtop/nvtop-1.2.2.ebuild b/sys-process/nvtop/nvtop-1.2.2.ebuild
index 0fb35d006..72caa501a 100644
--- a/sys-process/nvtop/nvtop-1.2.2.ebuild
+++ b/sys-process/nvtop/nvtop-1.2.2.ebuild
@@ -30,7 +30,7 @@ SLOT="0"
 IUSE="debug unicode"
 
 RDEPEND="
-	sys-libs/ncurses:0=[unicode?]
+	sys-libs/ncurses:0=[unicode(-)?]
 	x11-drivers/nvidia-drivers
 "
 

diff --git a/sys-process/nvtop/nvtop-9999.ebuild b/sys-process/nvtop/nvtop-9999.ebuild
index 0fb35d006..72caa501a 100644
--- a/sys-process/nvtop/nvtop-9999.ebuild
+++ b/sys-process/nvtop/nvtop-9999.ebuild
@@ -30,7 +30,7 @@ SLOT="0"
 IUSE="debug unicode"
 
 RDEPEND="
-	sys-libs/ncurses:0=[unicode?]
+	sys-libs/ncurses:0=[unicode(-)?]
 	x11-drivers/nvidia-drivers
 "
 


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: sys-process/nvtop/
@ 2021-11-08 13:08 Andrew Ammerlaan
  0 siblings, 0 replies; 11+ messages in thread
From: Andrew Ammerlaan @ 2021-11-08 13:08 UTC (permalink / raw
  To: gentoo-commits

commit:     9f71a7322cb2f5acb6a5ba70abd959217c4c801a
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  8 13:08:12 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Nov  8 13:08:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9f71a732

sys-process/nvtop: drop non-existent dep

I *think* unicode is now enabled unconditionally on ncurses

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sys-process/nvtop/nvtop-1.2.2.ebuild | 2 +-
 sys-process/nvtop/nvtop-9999.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-process/nvtop/nvtop-1.2.2.ebuild b/sys-process/nvtop/nvtop-1.2.2.ebuild
index 72caa501a..7df8c6766 100644
--- a/sys-process/nvtop/nvtop-1.2.2.ebuild
+++ b/sys-process/nvtop/nvtop-1.2.2.ebuild
@@ -30,7 +30,7 @@ SLOT="0"
 IUSE="debug unicode"
 
 RDEPEND="
-	sys-libs/ncurses:0=[unicode(-)?]
+	sys-libs/ncurses:0=
 	x11-drivers/nvidia-drivers
 "
 

diff --git a/sys-process/nvtop/nvtop-9999.ebuild b/sys-process/nvtop/nvtop-9999.ebuild
index 72caa501a..7df8c6766 100644
--- a/sys-process/nvtop/nvtop-9999.ebuild
+++ b/sys-process/nvtop/nvtop-9999.ebuild
@@ -30,7 +30,7 @@ SLOT="0"
 IUSE="debug unicode"
 
 RDEPEND="
-	sys-libs/ncurses:0=[unicode(-)?]
+	sys-libs/ncurses:0=
 	x11-drivers/nvidia-drivers
 "
 


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: sys-process/nvtop/
@ 2022-02-07 20:35 Arthur Zamarin
  0 siblings, 0 replies; 11+ messages in thread
From: Arthur Zamarin @ 2022-02-07 20:35 UTC (permalink / raw
  To: gentoo-commits

commit:     dc540a68d43af328ff42494c3f18a42d5fb6aece
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Mon Feb  7 15:51:27 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Feb  7 15:51:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=dc540a68

sys-process/nvtop: EAPI=8 and happy new year 2022

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 sys-process/nvtop/nvtop-1.2.2.ebuild | 13 ++++---------
 sys-process/nvtop/nvtop-9999.ebuild  | 29 +++++++++--------------------
 2 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/sys-process/nvtop/nvtop-1.2.2.ebuild b/sys-process/nvtop/nvtop-1.2.2.ebuild
index 7df8c6766..0dc4d9851 100644
--- a/sys-process/nvtop/nvtop-1.2.2.ebuild
+++ b/sys-process/nvtop/nvtop-1.2.2.ebuild
@@ -1,7 +1,7 @@
-# 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
 
@@ -27,7 +27,7 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 
-IUSE="debug unicode"
+IUSE="unicode"
 
 RDEPEND="
 	sys-libs/ncurses:0=
@@ -41,15 +41,10 @@ BDEPEND="
 "
 
 src_configure() {
-	local CMAKE_CONF="
-		!debug? ( -DCMAKE_BUILD_TYPE=Release )
-		debug? ( -DCMAKE_BUILD_TYPE=Debug )
-		unicode? ( -DCURSES_NEED_WIDE=TRUE )
-	"
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DNVML_INCLUDE_DIRS="${S}/include"
-		${CMAKE_CONF}
+		-DCURSES_NEED_WIDE=$(usex unicode)
 	)
 
 	cp "${WORKDIR}/nvidia-settings-${NVIDIA_PV}/src/nvml.h" "${S}/include/nvml.h" || die

diff --git a/sys-process/nvtop/nvtop-9999.ebuild b/sys-process/nvtop/nvtop-9999.ebuild
index 7df8c6766..128d6f80e 100644
--- a/sys-process/nvtop/nvtop-9999.ebuild
+++ b/sys-process/nvtop/nvtop-9999.ebuild
@@ -1,33 +1,25 @@
-# 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"
 
 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="debug unicode"
+IUSE="unicode"
 
 RDEPEND="
 	sys-libs/ncurses:0=
@@ -40,19 +32,16 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.0-add-nvml.patch
+)
+
 src_configure() {
-	local CMAKE_CONF="
-		!debug? ( -DCMAKE_BUILD_TYPE=Release )
-		debug? ( -DCMAKE_BUILD_TYPE=Debug )
-		unicode? ( -DCURSES_NEED_WIDE=TRUE )
-	"
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DNVML_INCLUDE_DIRS="${S}/include"
-		${CMAKE_CONF}
+		-DCURSES_NEED_WIDE=$(usex unicode)
 	)
 
-	cp "${WORKDIR}/nvidia-settings-${NVIDIA_PV}/src/nvml.h" "${S}/include/nvml.h" || die
-
 	cmake_src_configure
 }


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: sys-process/nvtop/
@ 2023-03-31 10:16 Florian Schmaus
  0 siblings, 0 replies; 11+ messages in thread
From: Florian Schmaus @ 2023-03-31 10:16 UTC (permalink / raw
  To: gentoo-commits

commit:     bf9cc2453b88d511ad10154b5599f2789e39add5
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Fri Mar 31 04:40:18 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 04:40:18 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bf9cc245

sys-process/nvtop: drop 3.0.0

Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 sys-process/nvtop/Manifest           |  1 -
 sys-process/nvtop/nvtop-3.0.0.ebuild | 48 ------------------------------------
 2 files changed, 49 deletions(-)

diff --git a/sys-process/nvtop/Manifest b/sys-process/nvtop/Manifest
index e81c5e0e0..4a2376560 100644
--- a/sys-process/nvtop/Manifest
+++ b/sys-process/nvtop/Manifest
@@ -1,4 +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
 DIST nvtop-3.0.1.tar.gz 234246 BLAKE2B bc93ee28e81490a43fabfcbad441bf76b49890699afcabf19146aba9b87734cd6d0ff292f05ec05aab4642b0828fc1fe6de2dd2c2ecb82f21eb2920a53a86895 SHA512 2d4584c004776ac72e08ab6ffa7ade66e498a170a71310c4ef36fe6d648ab2a19dcabf4292187d7b260783b4f4b1318a35c628fa860fa57ffd47a7d998566e12

diff --git a/sys-process/nvtop/nvtop-3.0.0.ebuild b/sys-process/nvtop/nvtop-3.0.0.ebuild
deleted file mode 100644
index 326aef999..000000000
--- a/sys-process/nvtop/nvtop-3.0.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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 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=
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-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)
-	)
-
-	cmake_src_configure
-}
-


^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: sys-process/nvtop/
@ 2023-03-31 10:16 Florian Schmaus
  0 siblings, 0 replies; 11+ messages in thread
From: Florian Schmaus @ 2023-03-31 10:16 UTC (permalink / raw
  To: gentoo-commits

commit:     cbbe9965a618d99707aaed6fe32a768f7d393f4c
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Fri Mar 31 04:37:52 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 04:37:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cbbe9965

sys-process/nvtop: add 3.0.1

Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

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

diff --git a/sys-process/nvtop/Manifest b/sys-process/nvtop/Manifest
index a33d415b5..e81c5e0e0 100644
--- a/sys-process/nvtop/Manifest
+++ b/sys-process/nvtop/Manifest
@@ -1,3 +1,4 @@
 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
+DIST nvtop-3.0.1.tar.gz 234246 BLAKE2B bc93ee28e81490a43fabfcbad441bf76b49890699afcabf19146aba9b87734cd6d0ff292f05ec05aab4642b0828fc1fe6de2dd2c2ecb82f21eb2920a53a86895 SHA512 2d4584c004776ac72e08ab6ffa7ade66e498a170a71310c4ef36fe6d648ab2a19dcabf4292187d7b260783b4f4b1318a35c628fa860fa57ffd47a7d998566e12

diff --git a/sys-process/nvtop/nvtop-9999.ebuild b/sys-process/nvtop/nvtop-3.0.1.ebuild
similarity index 98%
copy from sys-process/nvtop/nvtop-9999.ebuild
copy to sys-process/nvtop/nvtop-3.0.1.ebuild
index 326aef999..e2d0d4176 100644
--- a/sys-process/nvtop/nvtop-9999.ebuild
+++ b/sys-process/nvtop/nvtop-3.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake xdg
 
 DESCRIPTION="NVIDIA GPUs htop like monitoring tool"
 HOMEPAGE="https://github.com/Syllo/nvtop"
@@ -45,4 +45,3 @@ src_configure() {
 
 	cmake_src_configure
 }
-

diff --git a/sys-process/nvtop/nvtop-9999.ebuild b/sys-process/nvtop/nvtop-9999.ebuild
index 326aef999..e2d0d4176 100644
--- a/sys-process/nvtop/nvtop-9999.ebuild
+++ b/sys-process/nvtop/nvtop-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake xdg
 
 DESCRIPTION="NVIDIA GPUs htop like monitoring tool"
 HOMEPAGE="https://github.com/Syllo/nvtop"
@@ -45,4 +45,3 @@ src_configure() {
 
 	cmake_src_configure
 }
-


^ permalink raw reply related	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2023-03-31 10:16 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-31 10:16 [gentoo-commits] repo/proj/guru:master commit in: sys-process/nvtop/ Florian Schmaus
  -- strict thread matches above, loose matches on Subject: below --
2023-03-31 10:16 Florian Schmaus
2022-02-07 20:35 Arthur Zamarin
2021-11-08 13:08 Andrew Ammerlaan
2021-08-03  8:55 [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2021-08-03  8:55 ` [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2021-01-01 13:14 Andrew Ammerlaan
2020-06-14 15:00 Andrew Ammerlaan
2020-06-14 10:39 Andrew Ammerlaan
2020-06-14 10:39 Andrew Ammerlaan
2020-06-14 10:39 Andrew Ammerlaan
2020-06-14 10:39 Andrew Ammerlaan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox