Version bump to fix bug #328735

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 74 insertions, 2 deletions

diff --git a/gnome-extra/hardware-monitor/ChangeLog b/gnome-extra/hardware-monitor/ChangeLog
index abd5e0ae0bbe..108e6d4b3fb0 100644
--- a/gnome-extra/hardware-monitor/ChangeLog
+++ b/gnome-extra/hardware-monitor/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/hardware-monitor
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hardware-monitor/ChangeLog,v 1.31 2009/11/10 04:20:24 abcd Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hardware-monitor/ChangeLog,v 1.32 2010/09/06 07:30:05 xmw Exp $
+
+*hardware-monitor-1.4.3 (06 Sep 2010)
+
+  06 Sep 2010; Michael Weber <xmw@gentoo.org>
+  +hardware-monitor-1.4.3.ebuild,
+  +files/hardware-monitor-1.4.3-create-viewer-type-key.patch:
+  Version bump to fix bug #328735, thanks to df <demmamussabebonk@gmail.com>
+  and David Abbott for the ebuild.
 
   10 Nov 2009; Jonathan Callen <abcd@gentoo.org>
   -files/hardware-monitor-1.4-libgnomeui.patch:
diff --git a/gnome-extra/hardware-monitor/files/hardware-monitor-1.4.3-create-viewer-type-key.patch b/gnome-extra/hardware-monitor/files/hardware-monitor-1.4.3-create-viewer-type-key.patch
new file mode 100644
index 000000000000..2909f4577a74
--- /dev/null
+++ b/gnome-extra/hardware-monitor/files/hardware-monitor-1.4.3-create-viewer-type-key.patch
@@ -0,0 +1,10 @@
+--- a/hardware-monitor-1.4.3/src/applet.cpp	2010-06-13 11:13:15.000000000 -0400
++++ b/hardware-monitor-1.4.3/src/applet.cpp	2010-07-25 17:33:40.000000000 -0400
+@@ -100,6 +100,7 @@
+   // circumvent GConf bug (FIXME: report it)
+   gconf_client->set(gconf_dir + "/dummy", 0);
+   gconf_client->set(gconf_dir + "/monitors/dummy", 0);
++  gconf_client->set(gconf_dir + "/viewer_type", "curve");
+   
+   // connect GConf
+   gconf_client->notify_add(gconf_dir + "/viewer_type",
diff --git a/gnome-extra/hardware-monitor/hardware-monitor-1.4.3.ebuild b/gnome-extra/hardware-monitor/hardware-monitor-1.4.3.ebuild
new file mode 100644
index 000000000000..072503717c84
--- /dev/null
+++ b/gnome-extra/hardware-monitor/hardware-monitor-1.4.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hardware-monitor/hardware-monitor-1.4.3.ebuild,v 1.1 2010/09/06 07:30:05 xmw Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
+
+inherit autotools gnome2 eutils
+
+DESCRIPTION="Gnome2 Hardware Monitor Applet"
+HOMEPAGE="http://www.fnxweb.com/hardware-monitor-applet"
+SRC_URI="http://www.fnxweb.com/software/${PN}/${P}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="lm_sensors"
+
+RDEPEND=">=dev-cpp/gconfmm-2.28.2
+	>=dev-cpp/gtkmm-2.20.3
+	>=dev-cpp/libgnomecanvasmm-2.26.0
+	>=dev-cpp/libglademm-2.2.7
+	>=gnome-base/gnome-panel-2.30.2
+	>=gnome-base/libgnomeui-2.24.3
+	>=gnome-base/libgtop-2.28.1
+	lm_sensors? ( >=sys-apps/lm_sensors-3 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.41.1"
+
+DOCS="AUTHORS ChangeLog NEWS"
+
+pkg_setup() {
+	G2CONF="${G2CONF} $(use_with lm_sensors libsensors)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Set and create "/viewer-type" key which does not exist yet
+	# when the applet is loaded, in order to avoid a segfault,
+	# bug 288552.
+	epatch "${FILESDIR}/${P}-create-viewer-type-key.patch"
+
+	# Fix intltool test failure
+	echo "HardwareMonitor.server.in" >> po/POTFILES.in
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+
+}