Needs gnome-panel with bonobo support. Remove old.

Package-Manager: portage-2.1.9.25/cvs/Linux x86_64

6 files changed, 22 insertions, 112 deletions

diff --git a/gnome-extra/hardware-monitor/ChangeLog b/gnome-extra/hardware-monitor/ChangeLog
index 1503c56d99a3..02cc2feb928c 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hardware-monitor/ChangeLog,v 1.33 2010/09/06 19:17:43 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hardware-monitor/ChangeLog,v 1.34 2010/12/08 17:20:43 pacho Exp $
+
+  08 Dec 2010; Pacho Ramos <pacho@gentoo.org> -hardware-monitor-1.4.2.ebuild,
+  -hardware-monitor-1.4.2-r1.ebuild,
+  -files/hardware-monitor-1.4.2-create-viewer-type-key.patch,
+  hardware-monitor-1.4.3.ebuild:
+  Needs gnome-panel with bonobo support. Remove old.
 
   06 Sep 2010; Michael Weber <xmw@gentoo.org> hardware-monitor-1.4.3.ebuild:
   Remove unneeded src_unpack.
diff --git a/gnome-extra/hardware-monitor/Manifest b/gnome-extra/hardware-monitor/Manifest
index e774299b43da..bb885ca57294 100644
--- a/gnome-extra/hardware-monitor/Manifest
+++ b/gnome-extra/hardware-monitor/Manifest
@@ -1,11 +1,17 @@
-AUX hardware-monitor-1.4.2-create-viewer-type-key.patch 728 RMD160 211c8ef2ff33e63c508c2c8231bedfdeefe93c37 SHA1 e7cb62d3eacd66b05d65cefa947d5005445f376e SHA256 db0eab01ff86fc2eec85778938abfda3384845f7f89999439792abaf50df704b
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX hardware-monitor-1.4.3-create-viewer-type-key.patch 468 RMD160 c464ca07ca34467a65838b46abe44b4f6c0e6e38 SHA1 91b4405099ec45b6adb87ceb9f72ec131764819b SHA256 f8f6cd0ba2e00a00c46cc00a04f8eb4e3017c2949237e1d385c944ab9f715638
 DIST hardware-monitor-1.3.tar.bz2 309565 RMD160 f564991c1479890077e4d4f4bcf4bee1d96f92dc SHA1 177c8ca641ac5641737707a0997f7605f9a7c835 SHA256 0604b39711a291159a97b41809071381d0ed9add2562c55704dee38b4510a280
-DIST hardware-monitor-1.4.2.tar.bz2 219872 RMD160 58ecffc6fc2d2425cf1c5cb376c4a104a970b15b SHA1 8e4ce4b5c5b5809c8e4ec8757715fb40977d413f SHA256 1ea4f25b1c15e4f97db1ff91beda1b2a9ceb70cf3c91e329298ca2771e50f3a9
 DIST hardware-monitor-1.4.3.tar.bz2 147593 RMD160 db96c22b7c422b76bf98b959d50d6828fd140d81 SHA1 2556d63f136c8c8e268342d57dc2a38daea79386 SHA256 9320df58649a43621749be79b5d6cc8cbb16ee73a10a7673afbc3558d500a4db
 EBUILD hardware-monitor-1.3.ebuild 768 RMD160 b561372a1f6748c9b4a611159903db54a396d945 SHA1 5751cce99be60019e927b455934cb49cbe5de8c4 SHA256 d67f0f011e02a1dc5190fa41c21164aa24c3ab1a524e73a66909982f3528ab09
-EBUILD hardware-monitor-1.4.2-r1.ebuild 1266 RMD160 e28583dab811ba95fbba02749ca53ef43983c0be SHA1 11834151717d99d1655e439fdd7df6e8ff9fc590 SHA256 00432dbf08cfb929ab4113752400c408c6cae2a20e47af1a33068fffe2265da5
-EBUILD hardware-monitor-1.4.2.ebuild 962 RMD160 43dc40ad013aef8ac7439b10df720d778f60aded SHA1 f2086cae858edd9050f3cf87ddea80446abc8ac0 SHA256 bf133398e3aa0db912d667e09786bf713eb6b2295361f2b6bce2f68fc601c072
-EBUILD hardware-monitor-1.4.3.ebuild 1362 RMD160 fcb5f8c7e68edd69e966420daae53e465285404e SHA1 1c72a158c497ccb13fdad548f57b408168fcbe72 SHA256 cddd844a0140a6faa6a5fda92170d4efe26af5bc6a1cea6d0f29de63dd5bb6a1
-MISC ChangeLog 5607 RMD160 c420e5cd6cc7d447eede7d0fb96806c3814cd94e SHA1 303f02834f529f3381b0384a99a9d7640462ce93 SHA256 e10c239693c7ced2281467ccff9084688bdb2f7680a9cf5f21bb75c7e2dfdf16
+EBUILD hardware-monitor-1.4.3.ebuild 1399 RMD160 99a0c4f12a59f7978a3361e009b84db6eb85e08d SHA1 0e3924adbac02a515b81499cff330e8d80ac67a2 SHA256 67d2752c1f651d9c977c95931cdac405b1641e815e7d66c0dd866b7d9365a8da
+MISC ChangeLog 5873 RMD160 00fbab19dfeda85c7d60898d34acb548259b8475 SHA1 3a1df29dd2d56a9753d0b430d8a66fa90ab9910c SHA256 241596ffd4d224d22c4ccfd9f6e865482fadaa73d0b37a97e49f3a6d6f26ac9d
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkz/vnEACgkQCaWpQKGI+9T9kACfcLeP9wirPy82j9RmJ68YHIcg
+050AnRRz7wsFbx9l4DDdWJ1o5xwTILmL
+=YBVV
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/hardware-monitor/files/hardware-monitor-1.4.2-create-viewer-type-key.patch b/gnome-extra/hardware-monitor/files/hardware-monitor-1.4.2-create-viewer-type-key.patch
deleted file mode 100644
index 101f8f3e55d1..000000000000
--- a/gnome-extra/hardware-monitor/files/hardware-monitor-1.4.2-create-viewer-type-key.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Romain Perier <mrpouet@gentoo.org>
-Date: Wed, 4 Nov 2009 13:01:01 +0100
-Subject: Set and create /viewer_type key to avoid to have a NULL GConfEntry stored in a Gnome::Gconf::Entry object retourned by gconf_client->get_entry(), when this key does not exist yet.
-
----
- src/applet.cpp |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
---- a/src/applet.cpp
-+++ b/src/applet.cpp
-@@ -81,6 +81,7 @@ Applet::Applet(PanelApplet *a)
-   // 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.2-r1.ebuild b/gnome-extra/hardware-monitor/hardware-monitor-1.4.2-r1.ebuild
deleted file mode 100644
index d89bb96626de..000000000000
--- a/gnome-extra/hardware-monitor/hardware-monitor-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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.2-r1.ebuild,v 1.2 2009/11/04 22:26:03 eva Exp $
-
-GCONF_DEBUG="no"
-
-inherit gnome2 eutils
-
-DESCRIPTION="Gnome2 Hardware Monitor Applet"
-HOMEPAGE="http://people.iola.dk/olau/hardware-monitor/"
-SRC_URI="http://people.iola.dk/olau/hardware-monitor/source/${P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="lm_sensors"
-
-RDEPEND=">=dev-cpp/gconfmm-2.6.0
-	>=dev-cpp/gtkmm-2.6.0
-	>=dev-cpp/libgnomecanvasmm-2.6.0
-	>=dev-cpp/libglademm-2.6.0
-	>=gnome-base/gnome-panel-2
-	>=gnome-base/libgnomeui-2.20.1
-	>=gnome-base/libgtop-2.6.0
-	lm_sensors? ( >=sys-apps/lm_sensors-3 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29"
-
-DOCS="AUTHORS ChangeLog NEWS"
-
-pkg_setup() {
-	G2CONF="${G2CONF} $(use_with lm_sensors libsensors)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# 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
-}
diff --git a/gnome-extra/hardware-monitor/hardware-monitor-1.4.2.ebuild b/gnome-extra/hardware-monitor/hardware-monitor-1.4.2.ebuild
deleted file mode 100644
index 497ae9a971ee..000000000000
--- a/gnome-extra/hardware-monitor/hardware-monitor-1.4.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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.2.ebuild,v 1.3 2009/07/21 20:17:09 mrpouet Exp $
-
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Gnome2 Hardware Monitor Applet"
-HOMEPAGE="http://people.iola.dk/olau/hardware-monitor/"
-SRC_URI="http://people.iola.dk/olau/hardware-monitor/source/${P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="lm_sensors"
-
-RDEPEND=">=dev-cpp/gconfmm-2.6.0
-		>=dev-cpp/gtkmm-2.6.0
-		>=dev-cpp/libgnomecanvasmm-2.6.0
-		>=dev-cpp/libglademm-2.6.0
-		>=gnome-base/gnome-panel-2
-		>=gnome-base/libgnomeui-2.20.1
-		>=gnome-base/libgtop-2.6.0
-		lm_sensors? ( >=sys-apps/lm_sensors-3 )"
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig
-		>=dev-util/intltool-0.29"
-
-DOCS="AUTHORS ChangeLog NEWS"
-
-pkg_setup() {
-	G2CONF="${G2CONF} \
-			$(use_with lm_sensors libsensors)"
-
-}
diff --git a/gnome-extra/hardware-monitor/hardware-monitor-1.4.3.ebuild b/gnome-extra/hardware-monitor/hardware-monitor-1.4.3.ebuild
index 5082e906289e..22537a96adf8 100644
--- a/gnome-extra/hardware-monitor/hardware-monitor-1.4.3.ebuild
+++ b/gnome-extra/hardware-monitor/hardware-monitor-1.4.3.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2010/09/06 19:17:43 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hardware-monitor/hardware-monitor-1.4.3.ebuild,v 1.3 2010/12/08 17:20:43 pacho Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -20,7 +20,7 @@ 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/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 )
 	>=gnome-base/libgnomeui-2.24.3
 	>=gnome-base/libgtop-2.28.1
 	lm_sensors? ( >=sys-apps/lm_sensors-3 )"
@@ -28,10 +28,9 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	>=dev-util/intltool-0.41.1"
 
-DOCS="AUTHORS ChangeLog NEWS"
-
 pkg_setup() {
 	G2CONF="${G2CONF} $(use_with lm_sensors libsensors)"
+	DOCS="AUTHORS ChangeLog NEWS"
 }
 
 src_prepare() {