alpha/ia64/sparc stable wrt #358407

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

5 files changed, 7 insertions, 79 deletions

diff --git a/xfce-extra/xfce4-systemload-plugin/ChangeLog b/xfce-extra/xfce4-systemload-plugin/ChangeLog
index aa5d26c7bf24..282e0714f962 100644
--- a/xfce-extra/xfce4-systemload-plugin/ChangeLog
+++ b/xfce-extra/xfce4-systemload-plugin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-extra/xfce4-systemload-plugin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systemload-plugin/ChangeLog,v 1.16 2011/03/29 13:15:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systemload-plugin/ChangeLog,v 1.17 2011/04/23 17:42:52 ssuominen Exp $
+
+  23 Apr 2011; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-systemload-plugin-1.0.0.ebuild:
+  alpha/ia64/sparc stable wrt #358407
 
   29 Mar 2011; Jeroen Roovers <jer@gentoo.org>
   xfce4-systemload-plugin-1.0.0.ebuild:
diff --git a/xfce-extra/xfce4-systemload-plugin/files/xfce4-systemload-plugin-0.4.2-fix-tooltip-gtk2.12.patch b/xfce-extra/xfce4-systemload-plugin/files/xfce4-systemload-plugin-0.4.2-fix-tooltip-gtk2.12.patch
deleted file mode 100644
index d407678ac427..000000000000
--- a/xfce-extra/xfce4-systemload-plugin/files/xfce4-systemload-plugin-0.4.2-fix-tooltip-gtk2.12.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/panel-plugin/systemload.c b/panel-plugin/systemload.c
-index cc96ec4..027e8fe 100644
---- a/panel-plugin/systemload.c
-+++ b/panel-plugin/systemload.c
-@@ -315,11 +315,18 @@ monitor_control_new(XfcePanelPlugin *plugin)
- {
-     int count;
-     t_global_monitor *global;
-+    GtkSettings *settings;
- 
-     tooltips = gtk_tooltips_new ();
-     g_object_ref (tooltips);
-     gtk_object_sink (GTK_OBJECT (tooltips));
-     
-+    /* reduce the default tooltip timeout to be smaller than the update
-+     * interval otherwise we won't see tooltips on GTK 2.16 or newer */
-+    settings = gtk_settings_get_default();
-+    if (g_object_class_find_property(G_OBJECT_GET_CLASS(settings), "gtk-tooltip-timeout"))
-+      g_object_set(settings, "gtk-tooltip-timeout", UPDATE_TIMEOUT - 10, NULL);
-+
-     global = g_new(t_global_monitor, 1);
-     global->plugin = plugin;
-     global->timeout_id = 0;
diff --git a/xfce-extra/xfce4-systemload-plugin/files/xfce4-systemload-plugin-0.4.2-libtool.patch b/xfce-extra/xfce4-systemload-plugin/files/xfce4-systemload-plugin-0.4.2-libtool.patch
deleted file mode 100644
index a25f05cd3048..000000000000
--- a/xfce-extra/xfce4-systemload-plugin/files/xfce4-systemload-plugin-0.4.2-libtool.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- xfce4-systemload-plugin-0.4.2/configure.in.orig	2008-09-21 20:44:52.000000000 +0200
-+++ xfce4-systemload-plugin-0.4.2/configure.in	2008-09-21 20:45:01.000000000 +0200
-@@ -37,6 +37,7 @@
- AC_PROG_CC()
- AC_PROG_LD()
- AC_PROG_INSTALL()
-+AC_PROG_LIBTOOL()
- AC_PROG_INTLTOOL()
- 
- dnl *************************************
diff --git a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-0.4.2-r1.ebuild b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-0.4.2-r1.ebuild
deleted file mode 100644
index 9ba8bf37bc6a..000000000000
--- a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-0.4.2-r1.ebuild,v 1.9 2011/02/04 18:01:05 ssuominen Exp $
-
-EAPI=3
-EAUTORECONF=yes
-EINTLTOOLIZE=yes
-inherit xfconf
-
-DESCRIPTION="System load monitor panel plugin"
-HOMEPAGE="http://www.xfce.org/"
-SRC_URI="http://www.us.xfce.org/archive/src/panel-plugins/xfce4-systemload-plugin/0.4/xfce4-systemload-plugin-0.4.2.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND=">=x11-libs/gtk+-2.6:2
-	>=xfce-base/xfce4-panel-4.3.99.1
-	>=xfce-base/libxfcegui4-4.3.99.1
-	>=xfce-base/libxfce4util-4.3.99.1"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool"
-
-pkg_setup() {
-	PATCHES=(
-		"${FILESDIR}"/${P}-libtool.patch
-		"${FILESDIR}"/${P}-fix-tooltip-gtk2.12.patch
-		)
-	DOCS="AUTHORS ChangeLog NEWS README"
-	XFCONF=(
-		--disable-dependency-tracking
-		$(use_enable debug)
-		)
-}
-
-src_prepare() {
-	sed -i -e "/^AC_INIT/s/systemload_version()/systemload_version/" \
-		configure.in || die
-	xfconf_src_prepare
-}
diff --git a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.0.0.ebuild b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.0.0.ebuild
index 2565178cc059..103b4b79d182 100644
--- a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.0.0.ebuild
+++ b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.0.0.ebuild,v 1.6 2011/03/29 13:15:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.0.0.ebuild,v 1.7 2011/04/23 17:42:52 ssuominen Exp $
 
 EAPI=3
 inherit xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/panel-plugins/${PN}/1.0/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="debug"
 
 RDEPEND=">=x11-libs/gtk+-2.6:2