Bump to 2.2.2 with fix for nvidia detection, bug #221817.

(Portage version: 2.2_rc23/cvs/Linux x86_64)

3 files changed, 86 insertions, 2 deletions

diff --git a/gnome-extra/sensors-applet/ChangeLog b/gnome-extra/sensors-applet/ChangeLog
index 67b47387b0f7..6b2d82661ea1 100644
--- a/gnome-extra/sensors-applet/ChangeLog
+++ b/gnome-extra/sensors-applet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/sensors-applet
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sensors-applet/ChangeLog,v 1.33 2008/11/16 16:36:55 flameeyes Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sensors-applet/ChangeLog,v 1.34 2009/03/08 11:32:14 eva Exp $
+
+*sensors-applet-2.2.2 (08 Mar 2009)
+
+  08 Mar 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/sensors-applet-2.2.2-nvidia-check.patch,
+  +sensors-applet-2.2.2.ebuild:
+  Bump to 2.2.2 with fix for nvidia detection, bug #221817.
 
   16 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   sensors-applet-2.2.1.ebuild:
diff --git a/gnome-extra/sensors-applet/files/sensors-applet-2.2.2-nvidia-check.patch b/gnome-extra/sensors-applet/files/sensors-applet-2.2.2-nvidia-check.patch
new file mode 100644
index 000000000000..f26192385bd4
--- /dev/null
+++ b/gnome-extra/sensors-applet/files/sensors-applet-2.2.2-nvidia-check.patch
@@ -0,0 +1,22 @@
+# Fix detection of nvidia library
+# https://bugs.gentoo.org/attachment.cgi?id=180397
+# https://sourceforge.net/tracker2/?func=detail&aid=2672290&group_id=128538&atid=711980
+--- a/configure.ac	2009-01-31 13:59:36.000000000 +0100
++++ b/configure.ac	2009-01-31 14:01:06.000000000 +0100
+@@ -29,6 +29,7 @@
+ # ========== export compiler / linker options ======== #
+ AC_SUBST(CFLAGS)
+ AC_SUBST(CPPFLAGS)
++AC_SUBST(LIBS)
+ AC_SUBST(LDFLAGS)
+ 
+ # ============== look for dependencies =============== #
+@@ -170,7 +171,7 @@
+                 AC_CHECK_LIB(X11, XOpenDisplay, [ HAVE_X11=true ]))
+ 	# can't embed next AC_CHECK_HEADERS in true case of AC_CHECK_LIB
+ 	if test "${HAVE_X11}" = "true"; then
+-	        LDFLAGS="${LDFLAGS} -lX11 -lXext"
++	        LIBS="${LIBS} -lX11 -lXext"
+ 		# need to specifically include X11/Xlib header when
+ 		# doing checks for NVCtrl headers
+ 	        AC_CHECK_HEADERS(NVCtrl/NVCtrl.h NVCtrl/NVCtrlLib.h, [ HAVE_NVIDIA=true ], [], 
diff --git a/gnome-extra/sensors-applet/sensors-applet-2.2.2.ebuild b/gnome-extra/sensors-applet/sensors-applet-2.2.2.ebuild
new file mode 100644
index 000000000000..053c3ee4e477
--- /dev/null
+++ b/gnome-extra/sensors-applet/sensors-applet-2.2.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sensors-applet/sensors-applet-2.2.2.ebuild,v 1.1 2009/03/08 11:32:14 eva Exp $
+
+EAPI="2"
+
+inherit autotools gnome2 eutils
+
+DESCRIPTION="GNOME panel applet to display readings from hardware sensors"
+HOMEPAGE="http://sensors-applet.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sensors-applet/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="hddtemp libnotify lm_sensors nvidia"
+
+RDEPEND="
+	>=dev-libs/glib-2.6
+	>=x11-libs/gtk+-2.8.0
+	>=gnome-base/gnome-panel-2
+	>=gnome-base/libgnome-2.8
+	>=gnome-base/libgnomeui-2.8
+	>=x11-libs/cairo-1.0.4
+	hddtemp? ( >=app-admin/hddtemp-0.3_beta13 )
+	libnotify? ( >=x11-libs/libnotify-0.4.0 )
+	lm_sensors? ( sys-apps/lm_sensors )
+	nvidia? ( || (
+		>=x11-drivers/nvidia-drivers-100.14.09
+		media-video/nvidia-settings
+	) )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12
+	>=app-text/gnome-doc-utils-0.3.2
+	dev-util/intltool"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_with nvidia)
+		$(use_with lm_sensors libsensors)
+		$(use_enable libnotify)
+		--disable-static"
+}
+
+src_prepare() {
+	# Fix nvidia library detection, bug #221817
+	if use nvidia; then
+		epatch "${FILESDIR}/${P}-nvidia-check.patch"
+		intltoolize --force --copy --automake || die "intltoolize failed"
+		eautoreconf
+	fi
+}