Add new version for Gnome 2.30

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

4 files changed, 71 insertions, 5 deletions

diff --git a/x11-themes/gtk-engines/ChangeLog b/x11-themes/gtk-engines/ChangeLog
index 2ea60216b8e0..3b7a762f65f2 100644
--- a/x11-themes/gtk-engines/ChangeLog
+++ b/x11-themes/gtk-engines/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-themes/gtk-engines
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/ChangeLog,v 1.165 2010/04/05 14:58:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/ChangeLog,v 1.166 2010/06/13 16:16:22 pacho Exp $
+
+*gtk-engines-2.20.1-r1 (13 Jun 2010)
+
+  13 Jun 2010; Pacho Ramos <pacho@gentoo.org> -gtk-engines-2.18.4.ebuild,
+  +gtk-engines-2.20.1-r1.ebuild,
+  +files/gtk-engines-2.20.1-evolution-workaround.patch,
+  +files/gtk-engines-2.20.1-xfce-workaround.patch:
+  Add new version for Gnome 2.30, clean old version.
 
   05 Apr 2010; Raúl Porcel <armin76@gentoo.org> gtk-engines-2.18.5.ebuild:
   alpha/arm/ia64/sh/sparc stable wrt #308549
diff --git a/x11-themes/gtk-engines/files/gtk-engines-2.20.1-evolution-workaround.patch b/x11-themes/gtk-engines/files/gtk-engines-2.20.1-evolution-workaround.patch
new file mode 100644
index 000000000000..160f703be0ad
--- /dev/null
+++ b/x11-themes/gtk-engines/files/gtk-engines-2.20.1-evolution-workaround.patch
@@ -0,0 +1,24 @@
+From bc8e41851f670186c09a71e6525c4aea9766b1b6 Mon Sep 17 00:00:00 2001
+From: Benjamin Berg <benjamin@sipsolutions.net>
+Date: Sat, 22 May 2010 10:26:51 +0000
+Subject: Fix evolution table header workaround for new evo versions.
+
+---
+diff --git a/themes/Clearlooks/gtk-2.0/gtkrc b/themes/Clearlooks/gtk-2.0/gtkrc
+index 3f193ea..6df11b2 100644
+--- a/themes/Clearlooks/gtk-2.0/gtkrc
++++ b/themes/Clearlooks/gtk-2.0/gtkrc
+@@ -400,9 +400,9 @@ widget "gtk-tooltip*" style "tooltips"
+ ##########################################################################
+ 
+ # Workaround for the evolution ETable (bug #527532)
+-widget_class "*.ETable.ECanvas" style "treeview_header"
++widget_class "*.<ETable>.<ECanvas>" style "treeview_header"
+ # Workaround for the evolution ETree
+-widget_class "*.ETree.ECanvas" style "treeview_header"
++widget_class "*.<ETree>.<ECanvas>" style "treeview_header"
+ 
+ # Special case the nautilus-extra-view-widget
+ # ToDo: A more generic approach for all applications that have a widget like this.
+--
+cgit v0.8.3.1
diff --git a/x11-themes/gtk-engines/files/gtk-engines-2.20.1-xfce-workaround.patch b/x11-themes/gtk-engines/files/gtk-engines-2.20.1-xfce-workaround.patch
new file mode 100644
index 000000000000..1a8ba1ce7d5c
--- /dev/null
+++ b/x11-themes/gtk-engines/files/gtk-engines-2.20.1-xfce-workaround.patch
@@ -0,0 +1,24 @@
+From ee5d780dc2e424bce8a75b21eb6f1b74ea177247 Mon Sep 17 00:00:00 2001
+From: Benjamin Berg <benjamin@sipsolutions.net>
+Date: Thu, 29 Apr 2010 15:07:31 +0000
+Subject: Remove Xfce workaround. (bug #616124)
+
+---
+diff --git a/engines/clearlooks/src/clearlooks_style.c b/engines/clearlooks/src/clearlooks_style.c
+index 97ff857..647e447 100644
+--- a/engines/clearlooks/src/clearlooks_style.c
++++ b/engines/clearlooks/src/clearlooks_style.c
+@@ -250,9 +250,8 @@ clearlooks_style_draw_shadow (DRAW_ARGS)
+ 		clearlooks_set_widget_parameters (widget, style, state_type, &params);
+ 		params.corners = CR_CORNER_NONE;
+ 
+-		if (widget && !g_str_equal ("XfcePanelWindow", gtk_widget_get_name (gtk_widget_get_toplevel (widget))))
+-			STYLE_FUNCTION(draw_frame) (cr, colors, &params, &frame,
+-			                            x, y, width, height);
++		STYLE_FUNCTION(draw_frame) (cr, colors, &params, &frame,
++		                            x, y, width, height);
+ 	}
+ 	else if (DETAIL ("scrolled_window") || DETAIL ("viewport") || detail == NULL)
+ 	{
+--
+cgit v0.8.3.1
diff --git a/x11-themes/gtk-engines/gtk-engines-2.18.4.ebuild b/x11-themes/gtk-engines/gtk-engines-2.20.1-r1.ebuild
index e5ce98b26465..5656b6acf206 100644
--- a/x11-themes/gtk-engines/gtk-engines-2.18.4.ebuild
+++ b/x11-themes/gtk-engines/gtk-engines-2.20.1-r1.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/gtk-engines-2.18.4.ebuild,v 1.1 2009/10/29 22:41:00 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/gtk-engines-2.20.1-r1.ebuild,v 1.1 2010/06/13 16:16:22 pacho Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="GTK+2 standard engines and themes"
 HOMEPAGE="http://www.gtk.org/"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="accessibility lua"
 
 RDEPEND=">=x11-libs/gtk+-2.12
@@ -27,3 +27,13 @@ pkg_setup() {
 	G2CONF="${G2CONF} --enable-animation $(use_enable lua) $(use_with lua system-lua)"
 	use accessibility || G2CONF="${G2CONF} --disable-hc"
 }
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Upstream bug 616124: drop xfce workaround that will break
+	epatch "${FILESDIR}/${P}-xfce-workaround.patch"
+
+	# Fix evolution table header workaround for new evo versions
+	epatch "${FILESDIR}/${P}-evolution-workaround.patch"
+}