Fix bug #339971. Thanks to Lars Wendler for the report and Brenden Matthews for the fix.

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 49 insertions, 4 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index d02805c3ea6c..2f18cf715514 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/conky
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.143 2010/10/06 16:35:57 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.144 2010/10/06 19:22:14 billie Exp $
+
+  06 Oct 2010; Daniel Pielmeier <billie@gentoo.org> conky-1.8.1.ebuild,
+  +files/conky-1.8.1-nvidia-x.patch:
+  Fix bug #339971. Thanks to Lars Wendler for the report and Brenden
+  Matthews for the fix.
 
 *conky-1.8.1 (06 Oct 2010)
 
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 8f4da97b10fa..cdddf0795399 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -2,11 +2,12 @@ AUX conky-1.8.0-audacious-2.3.patch 595 RMD160 5ce471fc07a8f8dfe85e0b74f5ffc18a7
 AUX conky-1.8.0-ibm-x.patch 723 RMD160 7e3ba5540539232ad96b6882432974c02cf687f8 SHA1 2524266b71ea934e65528c0614496ba05c56f5f1 SHA256 80feec0984fde9e2d114d6fbfdf587fa2163042d1661b07e45516ccf6f4564b1
 AUX conky-1.8.0-if-existing.patch 827 RMD160 f04dd3c6423239118b28fb3d6e2a97ddc2a5f599 SHA1 88833bcad141c3a461d6e85739c9f7b318cd45dd SHA256 6a5b0bc9058f4a97cc9377110c4b5350197945fc1f7e7b100619c16438196493
 AUX conky-1.8.0-ncurses.patch 4359 RMD160 deb00ff8338881bf97a8ed26aeb6cdb3d53c0a07 SHA1 13dd57185c5ab8118cf2ca9c7e86222b9dc4e166 SHA256 9ac58ffcebe10447ac0255a5e7c569d1f22ddb3f6b1a1b8b0854e55d781c6f59
+AUX conky-1.8.1-nvidia-x.patch 883 RMD160 f6e85e117ba5b895ba23db0d6e4160a0c0141c21 SHA1 1e3dc3f2a8e44d62e25ab2ab22726e0e91ecf666 SHA256 290ffdf4094167715bf11b86ee2cf73574a3af32ffb50fa09517d89c56bc0853
 DIST conky-1.7.2.tar.bz2 585099 RMD160 6d419c7bdeded5890c4c99cdef884bc0a79a50cb SHA1 3f4e5cc13651fbf94892b079d447a8549818809e SHA256 b3c0a1b0ff90579d48df542a6070adbe67d3926d6d0c66ee12b52b2d5a2c675c
 DIST conky-1.8.0.tar.bz2 610545 RMD160 5ea6accf73e1d41ebe8390722a53ae50e0c23df8 SHA1 eef214c2917ea5666d24f03128b12d00fa313b58 SHA256 badb3824a9655eee90281939df8bdb3ca95cf8bab03269b3b3775bfea2ed0a51
 DIST conky-1.8.1.tar.bz2 612481 RMD160 f3203131e2d8f3756eb29f5c5a9034b9c269fdc6 SHA1 9581419b1a53a8a7e37b0291cd4e55ab166d221a SHA256 f85a278f2869596b1fd68b6d26d58c93af8dcc39d5186bbcfd587d4c545e5e43
 EBUILD conky-1.7.2-r2.ebuild 4115 RMD160 919d049392827b928c262962d13a319fb1b539e9 SHA1 026757ee426bd25a82ff0bef2cccb323d30eafd2 SHA256 6bea285b3344a9888f0b0207d8c3c836252570dcca3e55595e9df88301fe16f1
 EBUILD conky-1.8.0-r1.ebuild 3964 RMD160 14b2a611c63f3d6b3699aa6e76993b9400c93de4 SHA1 aa61f3fbd6538b72521735d6ea226d06ca69f82a SHA256 6057738f8f1185513fc9687538bb31c9fb4ad142073c548de4feeccfd3eaf681
-EBUILD conky-1.8.1.ebuild 3756 RMD160 31ac53fb31128468575d247eb6a60bb325c8a49b SHA1 ff453027e2a6f3240a6f95f351a0d6b5054233ab SHA256 7e46a1343df5e1c50b04c16bb7a1f46e2df9f863425fded0696b1b96e32c3d5a
-MISC ChangeLog 22138 RMD160 d82520a0a3622c89c29e1218ab13d1fb361c73ef SHA1 6c0147f652cf7b4ad1c147c0609c108a90c9d8ee SHA256 4a4a461100df6b1f6f38b726027aeb54b6d43493ba1f4923d915e4c5d6175d1f
+EBUILD conky-1.8.1.ebuild 3840 RMD160 45af2518cbb561b3bf221c43b73e810beb5b236b SHA1 3304fda731d3c94bc4e75387633170f668fd1f1b SHA256 d0cdc1d5b395436a38fc0ce07847c525d2323c61e749bfb8f33477977523b4c3
+MISC ChangeLog 22341 RMD160 2a104bcc4912f8bff5fb9c2847f1991458f2c2d6 SHA1 8cc507c6cecd60e2701676d861fc4af70df69815 SHA256 ca3d95a45ed78b425e348c0f5d1486ccaf775d1776092079c907960632ded5ab
 MISC metadata.xml 2154 RMD160 911d61ea1b3a10bf4c49fafba1b82b067ee0eee3 SHA1 dac481d15b6279f6d573cb8c76aa38267a9186d7 SHA256 a2ab7e0c213f854ed36387d6ca1702a77a77842d9d96d3b97351d48e0472d9f9
diff --git a/app-admin/conky/conky-1.8.1.ebuild b/app-admin/conky/conky-1.8.1.ebuild
index 0d6b33eef79b..c04db24aed6f 100644
--- a/app-admin/conky/conky-1.8.1.ebuild
+++ b/app-admin/conky/conky-1.8.1.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.1.ebuild,v 1.1 2010/10/06 16:35:57 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.1.ebuild,v 1.2 2010/10/06 19:22:14 billie Exp $
 
 EAPI=2
 
+inherit eutils
+
 DESCRIPTION="An advanced, highly configurable system monitor for X"
 HOMEPAGE="http://conky.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
@@ -50,6 +52,10 @@ DEPEND="
 	dev-util/pkgconfig
 	"
 
+src_prepare() {
+	epatch "${FILESDIR}/conky-1.8.1-nvidia-x.patch"
+}
+
 src_configure() {
 	local myconf
 
diff --git a/app-admin/conky/files/conky-1.8.1-nvidia-x.patch b/app-admin/conky/files/conky-1.8.1-nvidia-x.patch
new file mode 100644
index 000000000000..b56cee5f9795
--- /dev/null
+++ b/app-admin/conky/files/conky-1.8.1-nvidia-x.patch
@@ -0,0 +1,33 @@
+From b72004787038371098a745c9358e8e1552d945d5 Mon Sep 17 00:00:00 2001
+From: Brenden Matthews <brenden@diddyinc.com>
+Date: Wed, 6 Oct 2010 11:49:27 -0700
+Subject: [PATCH] Bulid fix for nvidia support.
+
+See http://bugs.gentoo.org/show_bug.cgi?id=339971 for details.
+---
+ src/nvidia.c |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/src/nvidia.c b/src/nvidia.c
+index 8a6423e..5f378d8 100644
+--- a/src/nvidia.c
++++ b/src/nvidia.c
+@@ -32,6 +32,7 @@
+ #include "logging.h"
+ #include "nvidia.h"
+ #include "temphelper.h"
++#include "x11.h"
+ #include <NVCtrl/NVCtrlLib.h>
+ 
+ const int nvidia_query_to_attr[] = {NV_CTRL_GPU_CORE_TEMPERATURE,
+@@ -145,5 +146,6 @@ void set_nvidia_display(const char *disp)
+ 		if ((nvdisplay = XOpenDisplay(disp)) == NULL) {
+ 			CRIT_ERR(NULL, NULL, "can't open nvidia display: %s", XDisplayName(disp));
+ 		}
+-	}	
++	}
+ }
++
+-- 
+1.7.0.4
+