Depend on nvidia-drivers[tools] instead of nvidia-settings. Apparently nvidia-settings won't become stable anymore. Thanks to Tom Wijsman for the report and Magnus Granberg for adding the required masks in the hardened profile.

Package-Manager: portage-2.1.11.31/cvs/Linux i686
Manifest-Sign-Key: 0x215AD14D

5 files changed, 27 insertions, 10 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 30d0cf6a2a2d..97e18ab6323d 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/conky
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.191 2012/11/21 10:16:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.192 2012/11/30 15:28:51 billie Exp $
+
+  30 Nov 2012; Daniel Pielmeier <billie@gentoo.org> conky-1.9.0.ebuild,
+  conky-1.9.0-r1.ebuild, metadata.xml:
+  Depend on nvidia-drivers[tools] instead of nvidia-settings. Apparently
+  nvidia-settings won't become stable anymore. Thanks to Tom Wijsman for the
+  report and Magnus Granberg for adding the required masks in the hardened
+  profile.
 
   21 Nov 2012; Agostino Sarubbo <ago@gentoo.org> conky-1.9.0-r1.ebuild:
   Stable for x86, wrt bug #442216
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 6e847fce4aae..f99d58974b2a 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX conky-1.8.1-acpitemp.patch 2415 SHA256 57815044cd972139171b76e75267792821c783e03537eb6cf7ba8105c46cdf8d SHA512 8c376fe44e72c7bd8526bd51a4ec6a85919e4bfb1189fc2e0b15172ca5a76c6e5c6ece56f186b8da8e720bc5769b2c36fff76367c7c7a587648ad837b7085f1b WHIRLPOOL 849aa8f18b2ab021b0ffcf52cca544f5464f61df0745018bae4ddf938005ef477bc4aa702d2c335e190e353e0897fd2636c95f595202b76b7752d652f2da4f0a
 AUX conky-1.8.1-battery-time.patch 655 SHA256 d47e966e61a212048a8c752f1885e567a6b2c497da508dee8be64b205a5a422d SHA512 951ab73eca1a1ca059c127e001c556fed4dec6d9b6b63365d6826be7105b6ac87f2a36b6799aa313dd8a3519d3aea0ff7a6aa8ef46bc36cf6de7ccb7248854e5 WHIRLPOOL f6139a92d78e383dd9a006d40b96272a82165db9d94da90f729db1d65ae0bca39b62b9391c514ef23cb078007d0ccdfece3e89cde73506804c67222e75baf7b0
 AUX conky-1.8.1-curl-headers.patch 494 SHA256 53ff30aa933163a1feb646720ea21b4727d515e33521ac53e77b8bd9d0473eba SHA512 1b78d0c34b86ff75179ead6413487f827ad1ed3627cc6694bc0fd49b214ef4c9d3c05c4dcb8cf3cb4615ab25086e25d3d0f25a897daa410286df41ec38af682c WHIRLPOOL d8acd19f59063a75205b2901fe7e47a7233f73e18263132fe607208c5a6dec5cdcbba215dd7089477ae1d5a6d7d153afd54b78bed69184129a1d556d5505d779
@@ -10,7 +13,14 @@ AUX conky-1.8.1-xmms2.patch 1190 SHA256 1b64047f04239dbf24b3171fcd8d5c950e9f8aa6
 AUX conky-1.9.0-lines-fix.patch 1067 SHA256 9a406f382092632e458d368b5fff81217258729df19098836f7f9ace0130b316 SHA512 555a7234933e6967cdf7ee003e46b089f29819891551205ab7d3008037f8c8771473ced3ed3da1009e2041e9d34beb6edca25fb1017f043a824611d439094e0e WHIRLPOOL 64d88b5b94e435cd0473d18fceaa1358dcea1e1d2c5c2de93588351c0e08f6fe3461e4a1d8b470533f1d8fb80c99ec078825d4b7803f7042be5bee74a540791d
 AUX conky-1.9.0-ncurses.patch 939 SHA256 76a777bab29009c2053b61e9e5904aea131c93d5f026acc161048374f75e72f6 SHA512 0a0737bec67eb241dee4029907d9f3e5bc8d49c8239fbdda5cbfa2b7b0aa50fb2ac9bf3397ccecd94768a176fc6c3ec0e18d67391d9285aff9658ba234202d4e WHIRLPOOL 0893db6ffbc2b37c58b2de8e34e4288640a1d3a5e3a754bd39faec141a7e94e49c83011f5eb58c86afe838fff1b77a661ff63a61f6780f9ca5e5b24f50463014
 DIST conky-1.9.0.tar.bz2 626555 SHA256 baf1b550f135fbfb53e5e286a33aadc03a667d63bf6c4d52ba7637366295bb6f SHA512 98c9f69fd8bee2062e3eddeb7a394cce932199ffd6c8664006d1222f0453569406613e63637848c77a455f7dae3f16be3079a2cab56ecafea51ec043de23c889 WHIRLPOOL 41bbe95ec838dbda2c2d4a9422d2f2f7d22d0cb99e87c59fbd32c0c7856cc83de36cbeefd982c964ec5229ae0b0342e84525aa5343d8c5cf9525205cea4a274a
-EBUILD conky-1.9.0-r1.ebuild 3861 SHA256 a38252b550e7879830393510f880befd72092263fac6a9fa7631865299413ff9 SHA512 b33175c1097ad2364ee3cc360120e19eaf1dbed63548a00485a870be968b9a953da1882c2b7b79b2c6fbde8070a079d1f6967a1c9ca06a75a102968e66eecc2d WHIRLPOOL 359337b11ea108d79084ab7c35829332babb55b2ebe4c225cf9a200cb6630d76025a0afd3c99ca116b179cb03b78b44e1ceea55c5cdb5ed33fb2753c61036845
-EBUILD conky-1.9.0.ebuild 3820 SHA256 dee4d22523b0ed1456e6c94823ae387824ee0cb00d6792dbc76b7c9d8ee090d2 SHA512 3af2fcb94767988d79f92381a0c8adcac6d955571c352a81a20bced5d7e0caf9a1c607579e6dea2fcabb2da64368b8e5142816ab519918a49aba6027a640e7cf WHIRLPOOL fc01d64b93efe64f64bf2503d350229684a2ba1bbb07c18f8fd49094d6939efcce679d1664d3e203061d64ea51af06a4cad91be4ff241e2695f13d730626df4f
-MISC ChangeLog 29096 SHA256 84e8568492a45fc2b69852283623161730fc9101539164172425935298358401 SHA512 01cfd34a33c8037628be4067a12b70ea22720bf138a98a2df7996d23312a8eba7cf299a22f4de69609df7b4a3912f180ab9bacf5f877254abc1e9c5a97b653f6 WHIRLPOOL f02116d30ef019420e3dbd35e7fb73428614a9f6a16b360cad93cbe8e376c0848fdf4dfc220fe87620b2feeb17c1383baafdcc4490cb73bb2302db044e5fca2e
-MISC metadata.xml 2035 SHA256 7629c0d86a74d086f1b9934919881b5ee82c285e94d58d4a802694633ea11302 SHA512 546dafceed03c1148cdd4003021112306b636124f0f4ee13950d4a1b5bb8a7ff56256e6acf131e08e4573195e987810d562b2c202ba9c3022097a52e47c1f325 WHIRLPOOL 3e2eebfc6456a2e3d4658076ba8a02c84ff7a967768330e6df866589886b10dceccdaf8ff4d6863a2a61f676cb09d60ab8d7f5e57e1ae895b890f12de009dc23
+EBUILD conky-1.9.0-r1.ebuild 3870 SHA256 886864381c2619ae928d6a9e986fd33e20984cba1ca12f9b870fe857093bb917 SHA512 9aee19976d5de709c9fcb8b29982180d30f9b4bd99b252bb5392a53088712002ebfdd8551265ad2fecd142a8f88e1694d831d0a6f7bc2d31dff0d80f02b7dbe3 WHIRLPOOL 2ae61923ea2cdd48b9ab9637c589e82dc5075e0533701f08dcaba6e20c4fec9c7988f4e5f8f03ed1ed43a78c026877751d4db9b0c46b8e6ea74c85011756b77a
+EBUILD conky-1.9.0.ebuild 3826 SHA256 6b66544c873c08d7ba46ba002d300bdba13bdcc77364946e848cbd7bde947afa SHA512 c426845ce349cbda753e205cd794839a7c31d0df40877c37eab9d8fcf1614997ee5af49ee04691c1b4537b91870d634ffa4d1e710ee7f660254eb7e95ea8c375 WHIRLPOOL 019dada5c28a6db23bda3d5366beed58206c8b16d64c1b467879b2f15ccf1145ddce25a4a3d67b4378c38b4fa6f51c96521e4d1d3538fed157918a3b93365076
+MISC ChangeLog 29447 SHA256 a541e5772c2b940c02413abec283392d13723a86cf994edcbee619a71c889086 SHA512 1171d3cbd139130e82954f699a703b2ea3f1fede44d5819cb6034c683e6b5be133208023d03e6c7397198455d886875e7333dd7c40bc5aec9e531c2e53058d6c WHIRLPOOL 9ed71fa4cadf69953d392b7f95381da7874a57b9eac26523a8e3bb1f1bc6b45af9da2e857b420b4e9cd9eb3dc08a5e15885e7b90c51338a09fb257e4d2d5b80d
+MISC metadata.xml 2034 SHA256 d2d72283377236de4c93e30ba4e5ea2746b5ddf1bac04c09b0e60976910aaa00 SHA512 d2a240ebde0ba574d039ba9f1871e0d0ab3402b8311818301d1b6567085350dc11d17094fd4117899d07a7b7c70bae871fe235b405f46fc2e2ee8a6a526655a0 WHIRLPOOL 8f71be23f197bb44bd5ead557bb96bd74f3047e1c765a02fa036db86c7bc7243ebed78e991e39e4220599d2db808a5991b507b230f5ba6ea544c5b342ffc4075
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlC40LQACgkQlcuUeyFa0U3YbACfUg+hoxEObi4HTzSrtgG7jKkt
+YzIAoLtMEj3Zcd3leklAN7wYvnFZlTsb
+=NKM1
+-----END PGP SIGNATURE-----
diff --git a/app-admin/conky/conky-1.9.0-r1.ebuild b/app-admin/conky/conky-1.9.0-r1.ebuild
index 2ff7884ed8b1..658d1b70b30a 100644
--- a/app-admin/conky/conky-1.9.0-r1.ebuild
+++ b/app-admin/conky/conky-1.9.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0-r1.ebuild,v 1.5 2012/11/21 10:16:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0-r1.ebuild,v 1.6 2012/11/30 15:28:51 billie Exp $
 
 EAPI=4
 
@@ -26,7 +26,7 @@ DEPEND_COMMON="
 			>=dev-lua/toluapp-1.0.93
 			>=dev-lang/lua-5.1.4-r8
 			media-libs/imlib2 )
-		nvidia? ( media-video/nvidia-settings )
+		nvidia? ( x11-drivers/nvidia-drivers[tools] )
 		truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
 		x11-libs/libX11
 		x11-libs/libXdamage
diff --git a/app-admin/conky/conky-1.9.0.ebuild b/app-admin/conky/conky-1.9.0.ebuild
index cff181627440..05b062b3d2c1 100644
--- a/app-admin/conky/conky-1.9.0.ebuild
+++ b/app-admin/conky/conky-1.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0.ebuild,v 1.8 2012/11/07 17:07:56 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0.ebuild,v 1.9 2012/11/30 15:28:51 billie Exp $
 
 EAPI=4
 
@@ -26,7 +26,7 @@ DEPEND_COMMON="
 			>=dev-lua/toluapp-1.0.93
 			>=dev-lang/lua-5.1.4-r8
 			media-libs/imlib2 )
-		nvidia? ( media-video/nvidia-settings )
+		nvidia? ( x11-drivers/nvidia-drivers[tools] )
 		truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
 		x11-libs/libX11
 		x11-libs/libXdamage
diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml
index 5df39140ebaa..e33c22b67ce9 100644
--- a/app-admin/conky/metadata.xml
+++ b/app-admin/conky/metadata.xml
@@ -23,7 +23,7 @@
 		<flag name='moc'>enable monitoring of music played by <pkg>media-sound/moc</pkg></flag>
 		<flag name='mpd'>enable monitoring of music controlled by <pkg>media-sound/mpd</pkg></flag>
 		<flag name='nano-syntax'>enable syntax highlighting for <pkg>app-editors/nano</pkg></flag>
-		<flag name='nvidia'>enable reading of nvidia card temperature sensors via <pkg>media-video/nvidia-settings</pkg></flag>
+		<flag name='nvidia'>enable reading of nvidia card temperature sensors via <pkg>x11-drivers/nvidia-drivers</pkg></flag>
 		<flag name='portmon'>enable support for tcp (ip4) port monitoring</flag>
 		<flag name='thinkpad'>enable support for IBM/Lenovo notebooks</flag>
 		<flag name='weather-metar'>enable support for metar weather service</flag>