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

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 94 insertions, 7 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/Manifest b/gnome-extra/sensors-applet/Manifest
index e9cc991c71fb..0a7db25f7ea5 100644
--- a/gnome-extra/sensors-applet/Manifest
+++ b/gnome-extra/sensors-applet/Manifest
@@ -2,20 +2,23 @@
 Hash: SHA1
 
 AUX sensors-applet-1.7.12-test-fix.patch 540 RMD160 70ef1df3979ee72bb4232698335492e99aaed4bc SHA1 fe26c932a3b40e812e7eac184418fc72804fc297 SHA256 8cb8cb3781d26fddc5c11bff869328d237460d617e240a84ceb08f21bb6328e6
+AUX sensors-applet-2.2.2-nvidia-check.patch 951 RMD160 c9699308b389c31d848d6d2a55004a7a753caf87 SHA1 a25b9dfd69388fe051a19ae3b3c087c72d2c04ed SHA256 bfc7ecae661ff492f13c646e30659524e130dd34cbca74fe2d14f4d7bf9991c7
 DIST sensors-applet-1.6.tar.gz 212215 RMD160 a9836b907bece45fdb7026ee75f27f7b8c2c8663 SHA1 d152f59e933961b3d8378563d71559fcd05f06c7 SHA256 3d076c4c4d9e321a06c36ba6a55ff5f41625abd3a0b6304ea5692c22ac824f28
 DIST sensors-applet-1.7.12.tar.gz 280611 RMD160 9d90ee667405a6dc09fe78ff7209f6aabc6f55d7 SHA1 56c8129a8bbfcada1bb43bb7aa3df7d50963335a SHA256 195df33c123484c37fda5c4153403943190b20b6895b3a84b420c1b63bf872cb
 DIST sensors-applet-1.8.2.tar.gz 281720 RMD160 78ee5b36978a14d004c7c1bdd873b1fa4f5eac32 SHA1 bd05380c89757fdebed1ad2e18e6da66a0aba1d9 SHA256 033c8e25a8cf0b216b63bc5b410802b74d4230ce4b608733aefa84bab0743273
 DIST sensors-applet-2.2.1.tar.gz 518257 RMD160 3b6c5ea65b68e694c0db5b2776a89847b8fd57a9 SHA1 445b658dcb3d462b85368bbbfa62a9facfc203bc SHA256 6be95f70458d299f28bfc81dee201b3e1c328bc55df00fc7f2c30d7f8f6faba0
+DIST sensors-applet-2.2.2.tar.gz 464462 RMD160 8383ac3f680ff9c79cc8e39d93d39db955de5ad5 SHA1 9e3a26607f51b77ceb9f3f4066b8c2496e7ab3aa SHA256 20059d2152baca147e9df8bdecdace34c1ce250512a5b8a0c4c864c9a6b9b059
 EBUILD sensors-applet-1.6.ebuild 839 RMD160 54f3bb21bd4a9e408dc6257ba3e6ed7463445435 SHA1 b6f2927fccbcaf5b9fa0a7f15bfb28cd5e3dfb87 SHA256 280168fb066d32a271ed15521812bb9ac9554496b15c361924c38089e34b7a5e
 EBUILD sensors-applet-1.7.12.ebuild 1236 RMD160 4ae24726f0e32f86e2fbd72343eb0f4a1f74d629 SHA1 f5aa21f15a2d3185ad03197f64e98e43dda3ee43 SHA256 e30447a4004d28507a29ebc03cfb8fe67e706c7a565a2447820c6902d649c02a
 EBUILD sensors-applet-1.8.2.ebuild 1158 RMD160 cbec3b155bd6330cee1f6c53ea3606699a262e09 SHA1 a98f8c08c8d922176189b5eac00e098bb4d0baa4 SHA256 d1412b30f1416bfc8283d6fd0c64ff5d90d45033d8fe635428e0f36e3371f393
 EBUILD sensors-applet-2.2.1.ebuild 1267 RMD160 5579b34bc35584cc3357f014cfa94f6d24218942 SHA1 3dbde183ffdf5041bae1af5770ab49b856bce955 SHA256 fd2182425172714225da05636b4be1ac73f46f14f2dab2f8704492d51002eb3f
-MISC ChangeLog 6626 RMD160 a432454371982665028ab5e3ce3401bf426e6829 SHA1 c0c48289f44e47091419c088e41b1f1f11a4d63d SHA256 fe7bbc6eaf6c73997e74b936810095395e1c09686f39d57b44a527ec7e49797b
+EBUILD sensors-applet-2.2.2.ebuild 1446 RMD160 c2283b7e1b27e9176c2b49a46677637cc021bd74 SHA1 3eddcecc81372a650e25da701b91c0c9e9cc066a SHA256 8377244d3800cfd778ad5b99ed0e731a84bd3e50aae04f3d0f26726ef739fe3b
+MISC ChangeLog 6854 RMD160 44f35dc75086c026b21059a059bcc7e413aed8ae SHA1 1670b55cc08e0ae42f832df3d665871acfa09e70 SHA256 63963542a4a8138f7c7cd77a1bdf751d5c748ad8019629015288bfc6e6ab1de0
 MISC metadata.xml 243 RMD160 9ba821aa09d58f5e447bbd1b25e6addb05dd3d08 SHA1 7134bfa97d38f3ae693ab9b9d564c334a266d038 SHA256 d0c547e50e21cdef480884dec335bd8108831a945653905d7e5c230ef6dd3035
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkkgTCUACgkQAiZjviIA2Xj1HgCdGTpxssG0hNKVextBVeky9ZTq
-b0gAoMyA67tcJLNoGQEBQiOwYo/UHBdY
-=sK6y
+iEYEARECAAYFAkmzrNAACgkQ1fmVwcYIWAYw2gCeJa3/e+OQseWhl4Nv+riTycyU
+4fgAn2FxqcrLiakNc3900i8PIuH0Mh0w
+=Nhyv
 -----END PGP SIGNATURE-----
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
+}