1 |
commit: 09890b0556cc43b45c5fd728dd9b61e51263911e |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 29 10:17:30 2018 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 29 10:18:29 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09890b05 |
7 |
|
8 |
media-video/nvidia-settings: Remove last-rited pkg |
9 |
|
10 |
Closes: https://bugs.gentoo.org/664638 |
11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
12 |
|
13 |
media-video/nvidia-settings/Manifest | 3 - |
14 |
media-video/nvidia-settings/metadata.xml | 8 --- |
15 |
.../nvidia-settings-340.58-r1.ebuild | 76 -------------------- |
16 |
.../nvidia-settings/nvidia-settings-340.58.ebuild | 76 -------------------- |
17 |
.../nvidia-settings/nvidia-settings-355.11.ebuild | 80 ---------------------- |
18 |
.../nvidia-settings/nvidia-settings-358.16.ebuild | 80 ---------------------- |
19 |
profiles/hardened/linux/amd64/package.mask | 6 +- |
20 |
profiles/hardened/linux/x86/package.mask | 6 +- |
21 |
profiles/package.mask | 6 -- |
22 |
9 files changed, 2 insertions(+), 339 deletions(-) |
23 |
|
24 |
diff --git a/media-video/nvidia-settings/Manifest b/media-video/nvidia-settings/Manifest |
25 |
deleted file mode 100644 |
26 |
index 991a5063c59..00000000000 |
27 |
--- a/media-video/nvidia-settings/Manifest |
28 |
+++ /dev/null |
29 |
@@ -1,3 +0,0 @@ |
30 |
-DIST nvidia-settings-340.58.tar.bz2 1549850 BLAKE2B 3b526854c231a999c6072b1251f9cc542fc7ddead7ad07cbf702dbacea584d99f3e8f7e8a3f2246b53cfff409f4d0b8a93f7260c170446d8cf2008fdd6ce99d0 SHA512 4c581a940c99fac28564ab6154f47cae496ebfda6339b7f10c5decf8fea52b6c12e5b63dfcf78f8365909e49539560a50338edb17117881b6a03c196bd51836c |
31 |
-DIST nvidia-settings-355.11.tar.bz2 1570699 BLAKE2B 8eafd72d71d7469420b4b0e916dcdc876f3a2b84e3f49749465825de674cec8bcb40d1ea50efc757b0c8c8c9bf96c7bccd521f9f264482c3ef4e9ca674d08707 SHA512 7565e3d809c5f27ec9ca092a6369cf89ca7571e0cb1b1285c50192cc1cc763e95316d9c71d06ed2333077b97946318e825c6d672f48549b58bd41faa673fb49c |
32 |
-DIST nvidia-settings-358.16.tar.bz2 1571104 BLAKE2B 0d56d4f54279712a2f8f549539e9cb6953dce9cc35784d4aea9d13f45a477dfab3afa5b622ea877413e80b8c57a14c392d0309e38815c8da02b3bd1ef6c9635c SHA512 0438aa2599e98f68a04c9f663f4ef9b05092df512fbca40ad0fe17e25ca4d940d02cc55e9fd44a2551950a2a30782d1e48553c4bebd071bfff280869a6dde556 |
33 |
|
34 |
diff --git a/media-video/nvidia-settings/metadata.xml b/media-video/nvidia-settings/metadata.xml |
35 |
deleted file mode 100644 |
36 |
index c2b094fe3ac..00000000000 |
37 |
--- a/media-video/nvidia-settings/metadata.xml |
38 |
+++ /dev/null |
39 |
@@ -1,8 +0,0 @@ |
40 |
-<?xml version="1.0" encoding="UTF-8"?> |
41 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
42 |
-<pkgmetadata> |
43 |
- <!-- maintainer-needed --> |
44 |
- <use> |
45 |
- <flag name="gtk3">Additionally build the GTK 3 library</flag> |
46 |
- </use> |
47 |
-</pkgmetadata> |
48 |
|
49 |
diff --git a/media-video/nvidia-settings/nvidia-settings-340.58-r1.ebuild b/media-video/nvidia-settings/nvidia-settings-340.58-r1.ebuild |
50 |
deleted file mode 100644 |
51 |
index 10851bb2c8f..00000000000 |
52 |
--- a/media-video/nvidia-settings/nvidia-settings-340.58-r1.ebuild |
53 |
+++ /dev/null |
54 |
@@ -1,76 +0,0 @@ |
55 |
-# Copyright 1999-2018 Gentoo Foundation |
56 |
-# Distributed under the terms of the GNU General Public License v2 |
57 |
- |
58 |
-EAPI=5 |
59 |
- |
60 |
-inherit eutils multilib toolchain-funcs |
61 |
- |
62 |
-DESCRIPTION="NVIDIA Linux X11 Settings Utility" |
63 |
-HOMEPAGE="http://www.nvidia.com/" |
64 |
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2" |
65 |
- |
66 |
-LICENSE="GPL-2" |
67 |
-SLOT="0" |
68 |
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" |
69 |
-IUSE="examples" |
70 |
- |
71 |
-COMMON_DEPEND="x11-libs/libX11 |
72 |
- x11-libs/libXext |
73 |
- x11-libs/libXxf86vm |
74 |
- x11-libs/gtk+:2 |
75 |
- x11-libs/gdk-pixbuf[X] |
76 |
- media-libs/mesa |
77 |
- x11-libs/pango[X] |
78 |
- x11-libs/libXv |
79 |
- x11-libs/libXrandr |
80 |
- dev-libs/glib:2 |
81 |
- dev-libs/jansson" |
82 |
- |
83 |
-RDEPEND=" |
84 |
- x11-drivers/nvidia-drivers:0/340 |
85 |
- ${COMMON_DEPEND} |
86 |
- x11-libs/libvdpau" |
87 |
-DEPEND="${RDEPEND} |
88 |
- virtual/pkgconfig |
89 |
- x11-base/xorg-proto" |
90 |
- |
91 |
-src_compile() { |
92 |
- einfo "Building libXNVCtrl..." |
93 |
- emake -C src/ \ |
94 |
- CC="$(tc-getCC)" \ |
95 |
- AR="$(tc-getAR)" \ |
96 |
- RANLIB="$(tc-getRANLIB)" \ |
97 |
- build-xnvctrl |
98 |
- |
99 |
- einfo "Building nvidia-settings..." |
100 |
- emake -C src/ \ |
101 |
- CC="$(tc-getCC)" \ |
102 |
- LD="$(tc-getLD)" \ |
103 |
- STRIP_CMD="$(type -P true)" \ |
104 |
- NV_VERBOSE=1 \ |
105 |
- NV_USE_BUNDLED_LIBJANSSON=0 |
106 |
-} |
107 |
- |
108 |
-src_install() { |
109 |
- emake -C src/ DESTDIR="${D}" PREFIX=/usr NV_USE_BUNDLED_LIBJANSSON=0 install |
110 |
- |
111 |
- insinto /usr/$(get_libdir) |
112 |
- doins src/libXNVCtrl/libXNVCtrl.a |
113 |
- |
114 |
- insinto /usr/include/NVCtrl |
115 |
- doins src/libXNVCtrl/*.h |
116 |
- |
117 |
-# doicon doc/${PN}.png # Installed through nvidia-drivers |
118 |
- make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings |
119 |
- |
120 |
- # bug 412569 - Installed through nvidia-drivers |
121 |
-# rm -rf "${D}"/usr/share/man |
122 |
- |
123 |
- dodoc doc/*.txt |
124 |
- |
125 |
- if use examples; then |
126 |
- docinto examples/ |
127 |
- dodoc samples/*.c |
128 |
- dodoc samples/README |
129 |
- fi |
130 |
-} |
131 |
|
132 |
diff --git a/media-video/nvidia-settings/nvidia-settings-340.58.ebuild b/media-video/nvidia-settings/nvidia-settings-340.58.ebuild |
133 |
deleted file mode 100644 |
134 |
index 5e890a832b1..00000000000 |
135 |
--- a/media-video/nvidia-settings/nvidia-settings-340.58.ebuild |
136 |
+++ /dev/null |
137 |
@@ -1,76 +0,0 @@ |
138 |
-# Copyright 1999-2018 Gentoo Foundation |
139 |
-# Distributed under the terms of the GNU General Public License v2 |
140 |
- |
141 |
-EAPI=5 |
142 |
- |
143 |
-inherit eutils multilib toolchain-funcs |
144 |
- |
145 |
-DESCRIPTION="NVIDIA Linux X11 Settings Utility" |
146 |
-HOMEPAGE="http://www.nvidia.com/" |
147 |
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2" |
148 |
- |
149 |
-LICENSE="GPL-2" |
150 |
-SLOT="0" |
151 |
-KEYWORDS="-* amd64 x86 ~x86-fbsd" |
152 |
-IUSE="examples" |
153 |
- |
154 |
-COMMON_DEPEND="x11-libs/libX11 |
155 |
- x11-libs/libXext |
156 |
- x11-libs/libXxf86vm |
157 |
- x11-libs/gtk+:2 |
158 |
- x11-libs/gdk-pixbuf[X] |
159 |
- media-libs/mesa |
160 |
- x11-libs/pango[X] |
161 |
- x11-libs/libXv |
162 |
- x11-libs/libXrandr |
163 |
- dev-libs/glib:2 |
164 |
- dev-libs/jansson" |
165 |
- |
166 |
-RDEPEND=" |
167 |
- ~x11-drivers/nvidia-drivers-340.93 |
168 |
- ${COMMON_DEPEND} |
169 |
- x11-libs/libvdpau" |
170 |
-DEPEND="${RDEPEND} |
171 |
- virtual/pkgconfig |
172 |
- x11-base/xorg-proto" |
173 |
- |
174 |
-src_compile() { |
175 |
- einfo "Building libXNVCtrl..." |
176 |
- emake -C src/ \ |
177 |
- CC="$(tc-getCC)" \ |
178 |
- AR="$(tc-getAR)" \ |
179 |
- RANLIB="$(tc-getRANLIB)" \ |
180 |
- build-xnvctrl |
181 |
- |
182 |
- einfo "Building nvidia-settings..." |
183 |
- emake -C src/ \ |
184 |
- CC="$(tc-getCC)" \ |
185 |
- LD="$(tc-getLD)" \ |
186 |
- STRIP_CMD="$(type -P true)" \ |
187 |
- NV_VERBOSE=1 \ |
188 |
- NV_USE_BUNDLED_LIBJANSSON=0 |
189 |
-} |
190 |
- |
191 |
-src_install() { |
192 |
- emake -C src/ DESTDIR="${D}" PREFIX=/usr NV_USE_BUNDLED_LIBJANSSON=0 install |
193 |
- |
194 |
- insinto /usr/$(get_libdir) |
195 |
- doins src/libXNVCtrl/libXNVCtrl.a |
196 |
- |
197 |
- insinto /usr/include/NVCtrl |
198 |
- doins src/libXNVCtrl/*.h |
199 |
- |
200 |
-# doicon doc/${PN}.png # Installed through nvidia-drivers |
201 |
- make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings |
202 |
- |
203 |
- # bug 412569 - Installed through nvidia-drivers |
204 |
-# rm -rf "${D}"/usr/share/man |
205 |
- |
206 |
- dodoc doc/*.txt |
207 |
- |
208 |
- if use examples; then |
209 |
- docinto examples/ |
210 |
- dodoc samples/*.c |
211 |
- dodoc samples/README |
212 |
- fi |
213 |
-} |
214 |
|
215 |
diff --git a/media-video/nvidia-settings/nvidia-settings-355.11.ebuild b/media-video/nvidia-settings/nvidia-settings-355.11.ebuild |
216 |
deleted file mode 100644 |
217 |
index 8225afc77a3..00000000000 |
218 |
--- a/media-video/nvidia-settings/nvidia-settings-355.11.ebuild |
219 |
+++ /dev/null |
220 |
@@ -1,80 +0,0 @@ |
221 |
-# Copyright 1999-2018 Gentoo Foundation |
222 |
-# Distributed under the terms of the GNU General Public License v2 |
223 |
- |
224 |
-EAPI=5 |
225 |
- |
226 |
-inherit eutils multilib toolchain-funcs |
227 |
- |
228 |
-DESCRIPTION="NVIDIA Linux X11 Settings Utility" |
229 |
-HOMEPAGE="http://www.nvidia.com/" |
230 |
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2" |
231 |
- |
232 |
-LICENSE="GPL-2" |
233 |
-SLOT="0" |
234 |
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" |
235 |
-IUSE="examples gtk3" |
236 |
- |
237 |
-COMMON_DEPEND=" |
238 |
- x11-libs/gtk+:2 |
239 |
- gtk3? ( x11-libs/gtk+:3 ) |
240 |
- x11-libs/libX11 |
241 |
- x11-libs/libXext |
242 |
- x11-libs/libXxf86vm |
243 |
- x11-libs/gdk-pixbuf[X] |
244 |
- media-libs/mesa |
245 |
- x11-libs/pango[X] |
246 |
- x11-libs/libXv |
247 |
- x11-libs/libXrandr |
248 |
- dev-libs/glib:2 |
249 |
- dev-libs/jansson |
250 |
- x11-libs/cairo |
251 |
- >=x11-libs/libvdpau-1.0" |
252 |
- |
253 |
-RDEPEND="${COMMON_DEPEND} |
254 |
- x11-drivers/nvidia-drivers:0/355" |
255 |
-DEPEND="${RDEPEND} |
256 |
- virtual/pkgconfig |
257 |
- x11-base/xorg-proto" |
258 |
- |
259 |
-src_compile() { |
260 |
- einfo "Building libXNVCtrl..." |
261 |
- emake -C src/ \ |
262 |
- CC="$(tc-getCC)" \ |
263 |
- AR="$(tc-getAR)" \ |
264 |
- RANLIB="$(tc-getRANLIB)" \ |
265 |
- build-xnvctrl |
266 |
- |
267 |
- einfo "Building nvidia-settings..." |
268 |
- emake -C src/ \ |
269 |
- CC="$(tc-getCC)" \ |
270 |
- LD="$(tc-getLD)" \ |
271 |
- STRIP_CMD="$(type -P true)" \ |
272 |
- NV_VERBOSE=1 \ |
273 |
- NV_USE_BUNDLED_LIBJANSSON=0 \ |
274 |
- NVML_AVAILABLE=0 \ |
275 |
- GTK3_AVAILABLE=$(usex gtk3 1 0) |
276 |
-} |
277 |
- |
278 |
-src_install() { |
279 |
- emake -C src/ DESTDIR="${D}" PREFIX=/usr NV_USE_BUNDLED_LIBJANSSON=0 GTK3_AVAILABLE=$(usex gtk3 1 0) install |
280 |
- |
281 |
- insinto /usr/$(get_libdir) |
282 |
- doins src/libXNVCtrl/libXNVCtrl.a |
283 |
- |
284 |
- insinto /usr/include/NVCtrl |
285 |
- doins src/libXNVCtrl/*.h |
286 |
- |
287 |
-# doicon doc/${PN}.png # Installed through nvidia-drivers |
288 |
- make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings |
289 |
- |
290 |
- # bug 412569 - Installed through nvidia-drivers |
291 |
-# rm -rf "${D}"/usr/share/man |
292 |
- |
293 |
- dodoc doc/*.txt |
294 |
- |
295 |
- if use examples; then |
296 |
- docinto examples/ |
297 |
- dodoc samples/*.c |
298 |
- dodoc samples/README |
299 |
- fi |
300 |
-} |
301 |
|
302 |
diff --git a/media-video/nvidia-settings/nvidia-settings-358.16.ebuild b/media-video/nvidia-settings/nvidia-settings-358.16.ebuild |
303 |
deleted file mode 100644 |
304 |
index 1ef8e7edc4b..00000000000 |
305 |
--- a/media-video/nvidia-settings/nvidia-settings-358.16.ebuild |
306 |
+++ /dev/null |
307 |
@@ -1,80 +0,0 @@ |
308 |
-# Copyright 1999-2018 Gentoo Foundation |
309 |
-# Distributed under the terms of the GNU General Public License v2 |
310 |
- |
311 |
-EAPI=5 |
312 |
- |
313 |
-inherit eutils multilib toolchain-funcs |
314 |
- |
315 |
-DESCRIPTION="NVIDIA Linux X11 Settings Utility" |
316 |
-HOMEPAGE="http://www.nvidia.com/" |
317 |
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2" |
318 |
- |
319 |
-LICENSE="GPL-2" |
320 |
-SLOT="0" |
321 |
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" |
322 |
-IUSE="examples gtk3" |
323 |
- |
324 |
-COMMON_DEPEND=" |
325 |
- x11-libs/gtk+:2 |
326 |
- gtk3? ( x11-libs/gtk+:3 ) |
327 |
- x11-libs/libX11 |
328 |
- x11-libs/libXext |
329 |
- x11-libs/libXxf86vm |
330 |
- x11-libs/gdk-pixbuf[X] |
331 |
- media-libs/mesa |
332 |
- x11-libs/pango[X] |
333 |
- x11-libs/libXv |
334 |
- x11-libs/libXrandr |
335 |
- dev-libs/glib:2 |
336 |
- dev-libs/jansson |
337 |
- x11-libs/cairo |
338 |
- >=x11-libs/libvdpau-1.0" |
339 |
- |
340 |
-RDEPEND="${COMMON_DEPEND} |
341 |
- x11-drivers/nvidia-drivers:0/358" |
342 |
-DEPEND="${RDEPEND} |
343 |
- virtual/pkgconfig |
344 |
- x11-base/xorg-proto" |
345 |
- |
346 |
-src_compile() { |
347 |
- einfo "Building libXNVCtrl..." |
348 |
- emake -C src/ \ |
349 |
- CC="$(tc-getCC)" \ |
350 |
- AR="$(tc-getAR)" \ |
351 |
- RANLIB="$(tc-getRANLIB)" \ |
352 |
- build-xnvctrl |
353 |
- |
354 |
- einfo "Building nvidia-settings..." |
355 |
- emake -C src/ \ |
356 |
- CC="$(tc-getCC)" \ |
357 |
- LD="$(tc-getLD)" \ |
358 |
- STRIP_CMD="$(type -P true)" \ |
359 |
- NV_VERBOSE=1 \ |
360 |
- NV_USE_BUNDLED_LIBJANSSON=0 \ |
361 |
- NVML_AVAILABLE=0 \ |
362 |
- GTK3_AVAILABLE=$(usex gtk3 1 0) |
363 |
-} |
364 |
- |
365 |
-src_install() { |
366 |
- emake -C src/ DESTDIR="${D}" PREFIX=/usr NV_USE_BUNDLED_LIBJANSSON=0 GTK3_AVAILABLE=$(usex gtk3 1 0) install |
367 |
- |
368 |
- insinto /usr/$(get_libdir) |
369 |
- doins src/libXNVCtrl/libXNVCtrl.a |
370 |
- |
371 |
- insinto /usr/include/NVCtrl |
372 |
- doins src/libXNVCtrl/*.h |
373 |
- |
374 |
-# doicon doc/${PN}.png # Installed through nvidia-drivers |
375 |
- make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings |
376 |
- |
377 |
- # bug 412569 - Installed through nvidia-drivers |
378 |
-# rm -rf "${D}"/usr/share/man |
379 |
- |
380 |
- dodoc doc/*.txt |
381 |
- |
382 |
- if use examples; then |
383 |
- docinto examples/ |
384 |
- dodoc samples/*.c |
385 |
- dodoc samples/README |
386 |
- fi |
387 |
-} |
388 |
|
389 |
diff --git a/profiles/hardened/linux/amd64/package.mask b/profiles/hardened/linux/amd64/package.mask |
390 |
index 33e09b35488..d4ef1963438 100644 |
391 |
--- a/profiles/hardened/linux/amd64/package.mask |
392 |
+++ b/profiles/hardened/linux/amd64/package.mask |
393 |
@@ -1,10 +1,6 @@ |
394 |
-# Copyright 1999-2017 Gentoo Foundation |
395 |
+# Copyright 1999-2018 Gentoo Foundation |
396 |
# Distributed under the terms of the GNU General Public License v2 |
397 |
|
398 |
-# Magnus Granberg <zorry@g.o> (20 Nov 2012) |
399 |
-# Need X |
400 |
-media-video/nvidia-settings |
401 |
- |
402 |
# Depends on x11-drivers/nvidia-drivers |
403 |
#dev-python/pyopencl |
404 |
|
405 |
|
406 |
diff --git a/profiles/hardened/linux/x86/package.mask b/profiles/hardened/linux/x86/package.mask |
407 |
index 6312ebcd340..5b60d78864c 100644 |
408 |
--- a/profiles/hardened/linux/x86/package.mask |
409 |
+++ b/profiles/hardened/linux/x86/package.mask |
410 |
@@ -1,9 +1,5 @@ |
411 |
-# Copyright 1999-2017 Gentoo Foundation |
412 |
+# Copyright 1999-2018 Gentoo Foundation |
413 |
# Distributed under the terms of the GNU General Public License v2 |
414 |
|
415 |
-# Rick Farina <zerochaos@g.o> (26 Nov 2012) |
416 |
-# Need X |
417 |
-media-video/nvidia-settings |
418 |
- |
419 |
# Depends on x11-drivers/nvidia-drivers |
420 |
#dev-python/pyopencl |
421 |
|
422 |
diff --git a/profiles/package.mask b/profiles/package.mask |
423 |
index 8c630c09ea1..a55ecc710b9 100644 |
424 |
--- a/profiles/package.mask |
425 |
+++ b/profiles/package.mask |
426 |
@@ -511,12 +511,6 @@ media-plugins/gst-plugins-ffmpeg |
427 |
# Needs openssl-1.1 |
428 |
>=dev-libs/opencryptoki-3.6 |
429 |
|
430 |
-# Jeroen Roovers <jer@g.o> (12 Jan 2017) |
431 |
-# Use x11-drivers/nvidia-drivers[tools] instead. |
432 |
-# Michał Górny <mgorny@g.o> (26 Aug 2018) |
433 |
-# Removal in 30 days. Bug #664638. |
434 |
-media-video/nvidia-settings |
435 |
- |
436 |
# Michael Orlitzky <mjo@g.o> (07 Jan 2017) |
437 |
# This package has some dangerous quality and security issues, but |
438 |
# people may still find it useful. It is masked to prevent accidental |