summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Pielmeier <billie@gentoo.org>2012-11-30 15:28:51 +0000
committerDaniel Pielmeier <billie@gentoo.org>2012-11-30 15:28:51 +0000
commit59e8ba40b6d93c39f0f62b0dfb282edd77a51d88 (patch)
tree412c98d42a9b9198cfe17798a9c4bd38df2b5a71 /app-admin/conky
parentStable for ppc, wrt bug #442394 (diff)
downloadgentoo-2-59e8ba40b6d93c39f0f62b0dfb282edd77a51d88.tar.gz
gentoo-2-59e8ba40b6d93c39f0f62b0dfb282edd77a51d88.tar.bz2
gentoo-2-59e8ba40b6d93c39f0f62b0dfb282edd77a51d88.zip
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.
(Portage version: 2.1.11.31/cvs/Linux i686, signed Manifest commit with key 215AD14D)
Diffstat (limited to 'app-admin/conky')
-rw-r--r--app-admin/conky/ChangeLog9
-rw-r--r--app-admin/conky/conky-1.9.0-r1.ebuild4
-rw-r--r--app-admin/conky/conky-1.9.0.ebuild4
-rw-r--r--app-admin/conky/metadata.xml2
4 files changed, 13 insertions, 6 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/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>