diff options
| author |   Daniel Pielmeier <billie@gentoo.org> | 2012-12-04 20:58:53 +0000 |
|---|---|---|
| committer | Daniel Pielmeier <billie@gentoo.org> | 2012-12-04 20:58:53 +0000 |
| commit | d30c32cba9df81a12ec1e5745ee5dcd0146aa490 (patch) | |
| tree | 6c2df500f250e2522b1c963a95257458f355c30b | |
| parent | Support gtk2 and gtk3 builds in the same ebuild. gtk2 is always on and gtk3 i... (diff) | |
| download | gentoo-2-d30c32cba9df81a12ec1e5745ee5dcd0146aa490.tar.gz gentoo-2-d30c32cba9df81a12ec1e5745ee5dcd0146aa490.tar.bz2 gentoo-2-d30c32cba9df81a12ec1e5745ee5dcd0146aa490.zip | |
Revert previous commit as per bug #445926.
(Portage version: 2.1.11.31/cvs/Linux i686, signed Manifest commit with key 215AD14D)
| -rw-r--r-- | app-admin/conky/ChangeLog | 6 | ||||
| -rw-r--r-- | app-admin/conky/conky-1.9.0-r1.ebuild | 4 | ||||
| -rw-r--r-- | app-admin/conky/conky-1.9.0.ebuild | 4 | ||||
| -rw-r--r-- | app-admin/conky/metadata.xml | 2 |
4 files changed, 10 insertions, 6 deletions
diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog index 97e18ab6323d..6a8b0dffc1ad 100644 --- a/app-admin/conky/ChangeLog +++ b/app-admin/conky/ChangeLog @@ -1,6 +1,10 @@ # 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.192 2012/11/30 15:28:51 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.193 2012/12/04 20:58:53 billie Exp $ + + 04 Dec 2012; Daniel Pielmeier <billie@gentoo.org> conky-1.9.0.ebuild, + conky-1.9.0-r1.ebuild, metadata.xml: + Revert previous commit as per bug #445926. 30 Nov 2012; Daniel Pielmeier <billie@gentoo.org> conky-1.9.0.ebuild, conky-1.9.0-r1.ebuild, metadata.xml: diff --git a/app-admin/conky/conky-1.9.0-r1.ebuild b/app-admin/conky/conky-1.9.0-r1.ebuild index 658d1b70b30a..f27e2d74b83e 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.6 2012/11/30 15:28:51 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0-r1.ebuild,v 1.7 2012/12/04 20:58:53 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? ( x11-drivers/nvidia-drivers[tools] ) + nvidia? ( media-video/nvidia-settings ) 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 05b062b3d2c1..0172d03929f5 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.9 2012/11/30 15:28:51 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0.ebuild,v 1.10 2012/12/04 20:58:53 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? ( x11-drivers/nvidia-drivers[tools] ) + nvidia? ( media-video/nvidia-settings ) 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 e33c22b67ce9..5df39140ebaa 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>x11-drivers/nvidia-drivers</pkg></flag> + <flag name='nvidia'>enable reading of nvidia card temperature sensors via <pkg>media-video/nvidia-settings</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> |