Add new version for Gnome 2.30

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 135 insertions, 1 deletions

diff --git a/x11-themes/gnome-themes/ChangeLog b/x11-themes/gnome-themes/ChangeLog
index 33bb484ea731..a05c812b042f 100644
--- a/x11-themes/gnome-themes/ChangeLog
+++ b/x11-themes/gnome-themes/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-themes/gnome-themes
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes/ChangeLog,v 1.225 2010/06/04 19:58:13 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes/ChangeLog,v 1.226 2010/06/13 16:22:59 pacho Exp $
+
+*gnome-themes-2.30.1-r1 (13 Jun 2010)
+
+  13 Jun 2010; Pacho Ramos <pacho@gentoo.org>
+  +gnome-themes-2.30.1-r1.ebuild,
+  +files/gnome-themes-2.30.1-evolution-workaround.patch:
+  Add new version for Gnome 2.30.
 
   04 Jun 2010; Markus Meier <maekke@gentoo.org> gnome-themes-2.28.1.ebuild:
   x86 stable, bug #314899
diff --git a/x11-themes/gnome-themes/files/gnome-themes-2.30.1-evolution-workaround.patch b/x11-themes/gnome-themes/files/gnome-themes-2.30.1-evolution-workaround.patch
new file mode 100644
index 000000000000..73abbfff7922
--- /dev/null
+++ b/x11-themes/gnome-themes/files/gnome-themes-2.30.1-evolution-workaround.patch
@@ -0,0 +1,72 @@
+From 9316037f4392249a4f9ef4c9aea89e424b519468 Mon Sep 17 00:00:00 2001
+From: Benjamin Berg <benjamin@sipsolutions.net>
+Date: Sat, 22 May 2010 10:31:56 +0000
+Subject: Fix evolution table header workaround for new evo versions.
+
+---
+diff --git a/gtk-themes/ClearlooksClassic/gtkrc b/gtk-themes/ClearlooksClassic/gtkrc
+index af9f716..96d7316 100644
+--- a/gtk-themes/ClearlooksClassic/gtkrc
++++ b/gtk-themes/ClearlooksClassic/gtkrc
+@@ -376,9 +376,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.
+diff --git a/gtk-themes/ClearlooksTest/gtkrc b/gtk-themes/ClearlooksTest/gtkrc
+index 8a2c4ee..ede08cc 100644
+--- a/gtk-themes/ClearlooksTest/gtkrc
++++ b/gtk-themes/ClearlooksTest/gtkrc
+@@ -398,9 +398,9 @@ widget "gtk-tooltip*" style "clearlooks-tooltips"
+ ##########################################################################
+ 
+ # Workaround for the evolution ETable (bug #527532)
+-widget_class "*.ETable.ECanvas" style "clearlooks-treeview_header"
++widget_class "*.<ETable>.<ECanvas>" style "clearlooks-treeview_header"
+ # Workaround for the evolution ETree
+-widget_class "*.ETree.ECanvas" style "clearlooks-treeview_header"
++widget_class "*.<ETree>.<ECanvas>" style "clearlooks-treeview_header"
+ 
+ # Special case the nautilus-extra-view-widget
+ # ToDo: A more generic approach for all applications that have a widget like this.
+diff --git a/gtk-themes/Glossy/gtkrc b/gtk-themes/Glossy/gtkrc
+index a2e7baa..b15dd6d 100644
+--- a/gtk-themes/Glossy/gtkrc
++++ b/gtk-themes/Glossy/gtkrc
+@@ -377,9 +377,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.
+diff --git a/gtk-themes/Inverted/gtkrc b/gtk-themes/Inverted/gtkrc
+index fd3cccf..9991204 100644
+--- a/gtk-themes/Inverted/gtkrc
++++ b/gtk-themes/Inverted/gtkrc
+@@ -375,9 +375,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/gnome-themes/gnome-themes-2.30.1-r1.ebuild b/x11-themes/gnome-themes/gnome-themes-2.30.1-r1.ebuild
new file mode 100644
index 000000000000..8320b28d73c6
--- /dev/null
+++ b/x11-themes/gnome-themes/gnome-themes-2.30.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes/gnome-themes-2.30.1-r1.ebuild,v 1.1 2010/06/13 16:22:59 pacho Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="A set of GNOME themes, with sets for users with limited or low vision"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="accessibility"
+
+RDEPEND=">=x11-libs/gtk+-2
+	 >=x11-themes/gtk-engines-2.15.3"
+DEPEND="${RDEPEND}
+	>=x11-misc/icon-naming-utils-0.8.7
+	>=dev-util/pkgconfig-0.19
+	>=dev-util/intltool-0.35"
+# dev-perl/XML-LibXML is bug 266136
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+G2CONF="${G2CONF}
+		$(use_enable accessibility all-themes)
+		--disable-test-themes
+		--enable-icon-mapping"
+
+src_prepare() {
+	# Fix bashisms, bug #256337
+	epatch "${FILESDIR}/${PN}-2.24.3-bashism.patch"
+
+	# Fix evolution table header workaround for new evo versions
+	epatch "${FILESDIR}/${P}-evolution-workaround.patch"
+
+	# Do not build/install accessibility themes, bug #274515
+	if ! use accessibility; then
+		sed 's:HighContrast.*\\:\\:g' -i \
+			desktop-themes/Makefile.am desktop-themes/Makefile.in \
+			gtk-themes/Makefile.am gtk-themes/Makefile.in \
+			icon-themes/Makefile.am icon-themes/Makefile.in \
+			|| die "sed 1 failed"
+	fi
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
+		|| die "sed 2 failed"
+}