Fix two compilation errors, due to missing libgnomeui CFLAGS and missing header. Add libgnomeui missing RDEPEND, switch to eapi 2, add GCONF_DEBUG=no, and add a blocker on lm_sensors-3

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

3 files changed, 56 insertions, 5 deletions

diff --git a/gnome-extra/hardware-monitor/ChangeLog b/gnome-extra/hardware-monitor/ChangeLog
index 7f90c84faff6..54f9eea0a04f 100644
--- a/gnome-extra/hardware-monitor/ChangeLog
+++ b/gnome-extra/hardware-monitor/ChangeLog
@@ -1,6 +1,12 @@
 # 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.24 2009/07/20 21:38:12 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hardware-monitor/ChangeLog,v 1.25 2009/07/21 19:26:06 mrpouet Exp $
+
+  22 Jul 2009; Romain Perier <mrpouet@gentoo.org> hardware-monitor-1.4.ebuild,
+  +files/hardware-monitor-1.4-libgnomeui.patch:
+  Fix two compilation errors, due to missing libgnomeui CFLAGS and missing
+  header. Add libgnomeui missing RDEPEND, switch to eapi 2, add
+  GCONF_DEBUG=no, and add a blocker on sys-apps/lm_sensors-3
 
   21 Jul 2009; Romain Perier <mrpouet@gentoo.org> 
   hardware-monitor-1.4.2.ebuild:
diff --git a/gnome-extra/hardware-monitor/files/hardware-monitor-1.4-libgnomeui.patch b/gnome-extra/hardware-monitor/files/hardware-monitor-1.4-libgnomeui.patch
new file mode 100644
index 000000000000..e7865bf24d31
--- /dev/null
+++ b/gnome-extra/hardware-monitor/files/hardware-monitor-1.4-libgnomeui.patch
@@ -0,0 +1,32 @@
+Fix compilation error due to missing libgnomeui CFLAGS into DEPS_CFLAGS,
+and undefined GNOME_CLIENT_PARAM_SM_CONNECT macroconstant due to missing
+"libgnomeui/gnome-client.h" header file.
+
+ configure.ac |    1 +
+ src/main.cpp |    1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6a1280b..7db94ea 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,6 +19,7 @@ dnl checks for libraries
+ PKG_CHECK_MODULES(DEPS, gconfmm-2.6 >= 2.6.0 \
+                         gtkmm-2.4 >= 2.6.0 \
+                         libgnomecanvasmm-2.6 >= 2.6.0 \
++			libgnomeui-2.0 >= 2.0.0 \
+ 			libglademm-2.4 >= 2.4.0 \
+ 			libpanelapplet-2.0 >= 2.0.0 \
+                         libgtop-2.0 >= 2.6.0)
+diff --git a/src/main.cpp b/src/main.cpp
+index 73cc528..f7f8a00 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -28,6 +28,7 @@
+ #include <gtkmm/main.h>
+ 
+ #include <libgnomeui/gnome-ui-init.h>
++#include <libgnomeui/gnome-client.h>
+ #include <panel-applet.h>
+ 
+ #include "applet.hpp"
diff --git a/gnome-extra/hardware-monitor/hardware-monitor-1.4.ebuild b/gnome-extra/hardware-monitor/hardware-monitor-1.4.ebuild
index 20631f9c6a10..d531b5019d34 100644
--- a/gnome-extra/hardware-monitor/hardware-monitor-1.4.ebuild
+++ b/gnome-extra/hardware-monitor/hardware-monitor-1.4.ebuild
@@ -1,8 +1,11 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.ebuild,v 1.1 2008/07/27 09:12:20 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hardware-monitor/hardware-monitor-1.4.ebuild,v 1.2 2009/07/21 19:26:06 mrpouet Exp $
 
-inherit gnome2
+EAPI="2"
+GCONF_DEBUG="no"
+
+inherit gnome2 eutils autotools
 
 DESCRIPTION="Gnome2 Hardware Monitor Applet"
 HOMEPAGE="http://people.iola.dk/olau/hardware-monitor/"
@@ -16,10 +19,12 @@ IUSE="lm_sensors"
 RDEPEND=">=dev-cpp/gconfmm-2.6.0
 		>=dev-cpp/gtkmm-2.6.0
 		>=dev-cpp/libgnomecanvasmm-2.6.0
+		>=gnome-base/libgnomeui-2.20
 		>=dev-cpp/libglademm-2.6.0
 		>=gnome-base/gnome-panel-2
 		>=gnome-base/libgtop-2.6.0
-		lm_sensors? ( sys-apps/lm_sensors )"
+		lm_sensors? ( sys-apps/lm_sensors
+			!>=sys-apps/lm_sensors-3 )"
 DEPEND="${RDEPEND}
 		dev-util/pkgconfig
 		>=dev-util/intltool-0.29"
@@ -28,3 +33,11 @@ pkg_setup() {
 	G2CONF="${G2CONF} \
 			$(use_with lm_sensors libsensors)"
 }
+
+src_prepare() {
+	# Fix compilation error due to missing libgnomeui CFLAGS,
+	# and missing header
+	epatch "${FILESDIR}/${P}-libgnomeui.patch"
+
+	eautoreconf
+}