1 |
commit: c041c2713a0901a701e844f2dd26785bcb9f13f6 |
2 |
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Aug 19 16:33:11 2022 +0000 |
4 |
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 19 16:36:19 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c041c271 |
7 |
|
8 |
sys-apps/cpu-x: clean up USE flags a bit |
9 |
|
10 |
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> |
11 |
|
12 |
sys-apps/cpu-x/cpu-x-4.3.1.ebuild | 10 +++++----- |
13 |
sys-apps/cpu-x/metadata.xml | 14 ++++++-------- |
14 |
2 files changed, 11 insertions(+), 13 deletions(-) |
15 |
|
16 |
diff --git a/sys-apps/cpu-x/cpu-x-4.3.1.ebuild b/sys-apps/cpu-x/cpu-x-4.3.1.ebuild |
17 |
index 8f7959b187aa..61d96cc1ce04 100644 |
18 |
--- a/sys-apps/cpu-x/cpu-x-4.3.1.ebuild |
19 |
+++ b/sys-apps/cpu-x/cpu-x-4.3.1.ebuild |
20 |
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/X0rg/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
21 |
LICENSE="GPL-3" |
22 |
SLOT="0" |
23 |
KEYWORDS="-* ~amd64" |
24 |
-IUSE="+bandwidth +dmidecode force-libstatgrab +gtk +libcpuid +libglfw +libpci +ncurses +nls opencl test" |
25 |
+IUSE="+cpu force-libstatgrab +gpu +gui +ncurses +nls opencl +pci test" |
26 |
RESTRICT="!test? ( test )" |
27 |
|
28 |
COMMON_DEPEND=" |
29 |
@@ -23,11 +23,11 @@ COMMON_DEPEND=" |
30 |
x11-libs/pango |
31 |
force-libstatgrab? ( sys-libs/libstatgrab ) |
32 |
!force-libstatgrab? ( sys-process/procps:= ) |
33 |
- gtk? ( >=x11-libs/gtk+-3.12:3 ) |
34 |
- libcpuid? ( >=dev-libs/libcpuid-0.3.0:= ) |
35 |
- libglfw? ( >=media-libs/glfw-3.3 |
36 |
+ gui? ( >=x11-libs/gtk+-3.12:3 ) |
37 |
+ cpu? ( >=dev-libs/libcpuid-0.3.0:= ) |
38 |
+ gpu? ( >=media-libs/glfw-3.3 |
39 |
media-libs/libglvnd ) |
40 |
- libpci? ( sys-apps/pciutils ) |
41 |
+ pci? ( sys-apps/pciutils ) |
42 |
ncurses? ( sys-libs/ncurses:=[tinfo] ) |
43 |
opencl? ( virtual/opencl ) |
44 |
" |
45 |
|
46 |
diff --git a/sys-apps/cpu-x/metadata.xml b/sys-apps/cpu-x/metadata.xml |
47 |
index 475445e45d94..52d661f4aca7 100644 |
48 |
--- a/sys-apps/cpu-x/metadata.xml |
49 |
+++ b/sys-apps/cpu-x/metadata.xml |
50 |
@@ -6,33 +6,31 @@ |
51 |
<name>Ben Kohler</name> |
52 |
</maintainer> |
53 |
<longdescription> |
54 |
- <pkg>sys-process/cpu-x</pkg> is similar to CPU-Z (Windows), but, unlike |
55 |
+ <pkg>sys-apps/cpu-x</pkg> is similar to CPU-Z (Windows), but, unlike |
56 |
the latter, it is a Free and Open Source software, written in C and |
57 |
designed for GNU/Linux. It can also be used in graphical mode by using |
58 |
<pkg>x11-libs/gtk+</pkg>, than in text-based mode with the use of |
59 |
<pkg>sys-libs/ncurses</pkg>. |
60 |
</longdescription> |
61 |
<longdescription lang="fr"> |
62 |
- <pkg>sys-process/cpu-x</pkg> est similaire à CPU-Z (Windows), mais, |
63 |
+ <pkg>sys-apps/cpu-x</pkg> est similaire à CPU-Z (Windows), mais, |
64 |
contrairement à ce dernier, c'est un logiciel Libre et Open Source, |
65 |
écrit en C et concu pour GNU/Linux. Il peut être aussi bien utilisé en |
66 |
mode graphique en utlisant <pkg>x11-libs/gtk+</pkg>, qu'en mode textuel |
67 |
avec l'utilisation de <pkg>sys-libs/ncurses</pkg>. |
68 |
</longdescription> |
69 |
<use> |
70 |
- <flag name="bandwidth">Integrate bandwidth</flag> |
71 |
- <flag name="dmidecode">Integrate dmidecode</flag> |
72 |
<flag name="force-libstatgrab">Use <pkg>sys-libs/libstatgrab</pkg> to instead of <pkg>sys-process/procps</pkg></flag> |
73 |
- <flag name="libcpuid">Use the <pkg>sys-libs/libcpuid</pkg> library</flag> |
74 |
- <flag name="libglfw">Use the <pkg>media-libs/glfw</pkg> library</flag> |
75 |
- <flag name="libpci">Use the <pkg>sys-apps/pciutils</pkg> library</flag> |
76 |
+ <flag name="cpu">Use the <pkg>dev-libs/libcpuid</pkg> library for CPU info</flag> |
77 |
+ <flag name="gpu">Use the <pkg>media-libs/glfw</pkg> library for GPU info</flag> |
78 |
+ <flag name="pci">Use the <pkg>sys-apps/pciutils</pkg> library for PCI info</flag> |
79 |
<flag name="opencl">Use the <pkg>virtual/opencl</pkg> library</flag> |
80 |
</use> |
81 |
<use lang="fr"> |
82 |
<flag name="bandwidth">Intégrer bandwidth</flag> |
83 |
<flag name="dmidecode">Intégrer dmidecode</flag> |
84 |
<flag name="force-libstatgrab">Utiliser <pkg>sys-libs/libstatgrab</pkg> à la place de <pkg>sys-process/procps</pkg></flag> |
85 |
- <flag name="libcpuid">Utiliser la bibliothèque <pkg>sys-libs/libcpuid</pkg></flag> |
86 |
+ <flag name="libcpuid">Utiliser la bibliothèque <pkg>dev-libs/libcpuid</pkg></flag> |
87 |
<flag name="libglfw">Utiliser la bibliothèque <pkg>media-libs/glfw</pkg></flag> |
88 |
<flag name="libpci">Utiliser la bibliothèque <pkg>sys-apps/pciutils</pkg></flag> |
89 |
<flag name="opencl">Utiliser la bibliothèque <pkg>virtual/opencl</pkg></flag> |