diff options
Diffstat (limited to 'gnome-extra')
5 files changed, 10 insertions, 106 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/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() { |