Add nvidia flag for temperatures; thanks to Greg Fitzgerald. (bug #234882)

(Portage version: 2.2_rc8/cvs/Linux 2.6.24-gentoo-r3 x86_64)

4 files changed, 16 insertions, 7 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 7ab54809379d..9c89c5807f77 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/conky
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.95 2008/09/19 01:17:42 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.96 2008/09/21 06:17:35 omp Exp $
+
+  21 Sep 2008; David Shakaryan <omp@gentoo.org> metadata.xml,
+  conky-1.6.1.ebuild, conky-1.6.2_pre01247.ebuild:
+  Add nvidia flag for temperatures; thanks to Greg Fitzgerald. (bug #234882)
 
   19 Sep 2008; Brent Baude <ranger@gentoo.org> conky-1.6.1.ebuild:
   stable ppc, bug 237868
diff --git a/app-admin/conky/conky-1.6.1.ebuild b/app-admin/conky/conky-1.6.1.ebuild
index 9de452a86b97..fecce831f9d0 100644
--- a/app-admin/conky/conky-1.6.1.ebuild
+++ b/app-admin/conky/conky-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.6.1.ebuild,v 1.7 2008/09/19 01:17:42 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.6.1.ebuild,v 1.8 2008/09/21 06:17:35 omp Exp $
 
 inherit eutils
 # used for epause
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc ~ppc64 sparc x86"
-IUSE="audacious bmpx debug hddtemp ipv6 mpd nano-syntax rss truetype vim-syntax smapi wifi X"
+IUSE="audacious bmpx debug hddtemp ipv6 mpd nano-syntax nvidia rss truetype vim-syntax smapi wifi X"
 
 DEPEND_COMMON="
 	virtual/libc
@@ -34,6 +34,7 @@ DEPEND_COMMON="
 			net-misc/curl
 			)
 	wifi? ( net-wireless/wireless-tools )
+	nvidia? ( media-video/nvidia-settings )
 	!ipv6? ( >=dev-libs/glib-2.0 )"
 RDEPEND="${DEPEND_COMMON}
 	hddtemp? ( app-admin/hddtemp )
@@ -51,7 +52,7 @@ DEPEND="
 
 pkg_setup() {
 	if use audacious; then
-		if has_version <media-sound/audacious-1.5.0 && ! built_with_use media-sound/audacious dbus; then
+		if has_version '<media-sound/audacious-1.5.0' && ! built_with_use media-sound/audacious dbus; then
 			eerror "media-sound/audacious is not built with dbus USE flag."
 			eerror "Please add 'dbus' to your USE flags, and re-emerge media-sound/audacious."
 			die "media-sound/audacious needs USE=dbus"
@@ -84,6 +85,7 @@ src_compile() {
 		$(use_enable debug) \
 		$(use_enable hddtemp ) \
 		$(use_enable mpd) \
+		$(use_enable nvidia) \
 		$(use_enable rss) \
 		$(use_enable smapi) \
 		$(use_enable wifi wlan) \
diff --git a/app-admin/conky/conky-1.6.2_pre01247.ebuild b/app-admin/conky/conky-1.6.2_pre01247.ebuild
index 518c3526a3b0..33dc56cf9fa4 100644
--- a/app-admin/conky/conky-1.6.2_pre01247.ebuild
+++ b/app-admin/conky/conky-1.6.2_pre01247.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.6.2_pre01247.ebuild,v 1.1 2008/09/11 19:14:07 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.6.2_pre01247.ebuild,v 1.2 2008/09/21 06:17:35 omp Exp $
 
 inherit eutils
 # used for epause
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="audacious bmpx debug hddtemp ipv6 mpd nano-syntax rss truetype vim-syntax smapi wifi X"
+IUSE="audacious bmpx debug hddtemp ipv6 mpd nano-syntax nvidia rss truetype vim-syntax smapi wifi X"
 
 DEPEND_COMMON="
 	virtual/libc
@@ -34,6 +34,7 @@ DEPEND_COMMON="
 			net-misc/curl
 			)
 	wifi? ( net-wireless/wireless-tools )
+	nvidia? ( media-video/nvidia-settings )
 	!ipv6? ( >=dev-libs/glib-2.0 )"
 RDEPEND="${DEPEND_COMMON}
 	hddtemp? ( app-admin/hddtemp )
@@ -51,7 +52,7 @@ DEPEND="
 
 pkg_setup() {
 	if use audacious; then
-		if has_version <media-sound/audacious-1.5.0 && ! built_with_use media-sound/audacious dbus; then
+		if has_version '<media-sound/audacious-1.5.0' && ! built_with_use media-sound/audacious dbus; then
 			eerror "media-sound/audacious is not built with dbus USE flag."
 			eerror "Please add 'dbus' to your USE flags, and re-emerge media-sound/audacious."
 			die "media-sound/audacious needs USE=dbus"
@@ -84,6 +85,7 @@ src_compile() {
 		$(use_enable debug) \
 		$(use_enable hddtemp ) \
 		$(use_enable mpd) \
+		$(use_enable nvidia) \
 		$(use_enable rss) \
 		$(use_enable smapi) \
 		$(use_enable wifi wlan) \
diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml
index e8977390efe1..50da4b8fcc63 100644
--- a/app-admin/conky/metadata.xml
+++ b/app-admin/conky/metadata.xml
@@ -24,6 +24,7 @@ It is a fork of Torsmo that is actually maintained.
 	<flag name='bmpx'>enable monitoring of audio tracks that are playing <pkg>media-sound/bmpx</pkg></flag>
 	<flag name='mpd'>enable monitoring mpd controlled music <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='smapi'>enable support for smapi</flag>
 </use>
 </pkgmetadata>